Skip to content

fix(web): default provider selection for users without Codex #4117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 3 commits into from
Jul 22, 2026
+458 −97
Merged

fix(web): default provider selection for users without Codex #4117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
111ee3e
fix(web): default provider selection for users without Codex
mfazekas Jul 18, 2026
2d2fb36
fix(web): tier provider fallback and respect thread locks in composer…
mfazekas Jul 18, 2026
44b14f4
fix(web): finalize provider defaults for PR #4117
juliusmarminge Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ import {
} from "~/projectScripts";
import { newDraftId, newMessageId, newThreadId } from "~/lib/utils";
import { getProviderModelCapabilities, resolveSelectableProvider } from "../providerModels";
import { NO_PROVIDER_MODEL_SELECTION } from "../providerInstances";
import { useEnvironmentSettings } from "../hooks/useSettings";
import { resolveAppModelSelectionForInstance } from "../modelSelection";
import { getTerminalFocusOwner } from "../lib/terminalFocus";
Expand Down Expand Up @@ -1361,10 +1362,7 @@ function ChatViewContent(props: ChatViewProps) {
? buildLocalDraftThread(
threadId,
draftThread,
fallbackDraftProject?.defaultModelSelection ?? {
instanceId: ProviderInstanceId.make("codex"),
model: DEFAULT_MODEL,
},
fallbackDraftProject?.defaultModelSelection ?? NO_PROVIDER_MODEL_SELECTION,
)
: undefined,
[draftThread, fallbackDraftProject?.defaultModelSelection, threadId],
Expand Down Expand Up @@ -1856,7 +1854,7 @@ function ChatViewContent(props: ChatViewProps) {
const providerStatuses = serverConfig?.providers ?? EMPTY_PROVIDERS;
const unlockedSelectedProvider = resolveSelectableProvider(
providerStatuses,
selectedProviderByThreadId ?? threadProvider ?? ProviderDriverKind.make("codex"),
selectedProviderByThreadId ?? threadProvider,
);
const selectedProvider: ProviderDriverKind = lockedProvider ?? unlockedSelectedProvider;
const phase = derivePhase(activeThread?.session ?? null);
Expand Down Expand Up @@ -4038,7 +4036,7 @@ function ChatViewContent(props: ChatViewProps) {
return;
}
const sendCtx = composerRef.current?.getSendContext();
if (!sendCtx) return;
if (!sendCtx?.providerAvailable) return;
const {
images: composerImages,
terminalContexts: composerTerminalContexts,
Expand Down Expand Up @@ -4614,7 +4612,7 @@ function ChatViewContent(props: ChatViewProps) {
}

const sendCtx = composerRef.current?.getSendContext();
if (!sendCtx) {
if (!sendCtx?.providerAvailable) {
return;
}
const {
Expand Down Expand Up @@ -4773,7 +4771,7 @@ function ChatViewContent(props: ChatViewProps) {
}

const sendCtx = composerRef.current?.getSendContext();
if (!sendCtx) {
if (!sendCtx?.providerAvailable) {
return;
}
const {
Expand Down
21 changes: 14 additions & 7 deletions apps/web/src/components/CommandPalette.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ import {
squashAtomCommandFailure,
} from "@t3tools/client-runtime/state/runtime";
import {
DEFAULT_MODEL,
type DesktopWslState,
type EnvironmentId,
type FilesystemBrowseResult,
type ProjectId,
ProviderInstanceId,
type SourceControlDiscoveryResult,
type SourceControlProviderKind,
type SourceControlRepositoryInfo,
Expand Down Expand Up @@ -111,7 +109,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom } from "../state/server";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand } from "../keybindings";
import {
Command,
Expand Down Expand Up @@ -476,6 +475,7 @@ function OpenCommandPaletteDialog(props: {
const projects = useProjects();
const threads = useThreadShells();
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const providers = useAtomValue(primaryServerProvidersAtom);
const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
const currentView = viewStack.at(-1) ?? null;
const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down Expand Up @@ -1149,17 +1149,21 @@ function OpenCommandPaletteDialog(props: {
}

const projectId = newProjectId();
const targetEnvironmentProviders =
environments.find((environment) => environment.environmentId === input.environmentId)
?.serverConfig?.providers ??
(input.environmentId === primaryEnvironmentId ? providers : []);
const createResult = await createProject({
environmentId: input.environmentId,
input: {
projectId,
title: inferProjectTitleFromPath(cwd),
workspaceRoot: cwd,
createWorkspaceRootIfMissing: true,
defaultModelSelection: {
instanceId: ProviderInstanceId.make("codex"),
model: DEFAULT_MODEL,
},
defaultModelSelection: resolveDefaultProviderModelSelection(
targetEnvironmentProviders,
null,
),

@cursor cursor Bot Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Defaults ignore settings overlay

Medium Severity

New project defaults call resolveDefaultProviderModelSelection on raw serverConfig.providers (or the primary providers atom) without applying applyProviderInstanceSettings. A provider disabled in settings can still look enabled in the probe snapshot, so palette-created projects can be persisted back onto that instance—the same failure mode this PR aims to fix.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 44b14f4. Configure here.

},
});
if (createResult._tag === "Failure") {
Expand Down Expand Up @@ -1195,8 +1199,11 @@ function OpenCommandPaletteDialog(props: {
[
handleNewThread,
createProject,
environments,
navigate,
primaryEnvironmentId,
projects,
providers,
setOpen,
clientSettings.sidebarThreadSortOrder,
threads,
Expand Down
Loading
Loading