Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit b6e1b39

Browse files
mfazekasjuliusmarmingecodex
authored
fix(web): default provider selection for users without Codex (pingdotgg#4117)
Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: codex <[email protected]>
1 parent c7b21ff commit b6e1b39

7 files changed

Lines changed: 458 additions & 97 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ import {
152152
} from "~/projectScripts";
153153
import { newDraftId, newMessageId, newThreadId } from "~/lib/utils";
154154
import { getProviderModelCapabilities, resolveSelectableProvider } from "../providerModels";
155+
import { NO_PROVIDER_MODEL_SELECTION } from "../providerInstances";
155156
import { useEnvironmentSettings } from "../hooks/useSettings";
156157
import { resolveAppModelSelectionForInstance } from "../modelSelection";
157158
import { getTerminalFocusOwner } from "../lib/terminalFocus";
@@ -1361,10 +1362,7 @@ function ChatViewContent(props: ChatViewProps) {
13611362
? buildLocalDraftThread(
13621363
threadId,
13631364
draftThread,
1364-
fallbackDraftProject?.defaultModelSelection ?? {
1365-
instanceId: ProviderInstanceId.make("codex"),
1366-
model: DEFAULT_MODEL,
1367-
},
1365+
fallbackDraftProject?.defaultModelSelection ?? NO_PROVIDER_MODEL_SELECTION,
13681366
)
13691367
: undefined,
13701368
[draftThread, fallbackDraftProject?.defaultModelSelection, threadId],
@@ -1856,7 +1854,7 @@ function ChatViewContent(props: ChatViewProps) {
18561854
const providerStatuses = serverConfig?.providers ?? EMPTY_PROVIDERS;
18571855
const unlockedSelectedProvider = resolveSelectableProvider(
18581856
providerStatuses,
1859-
selectedProviderByThreadId ?? threadProvider ?? ProviderDriverKind.make("codex"),
1857+
selectedProviderByThreadId ?? threadProvider,
18601858
);
18611859
const selectedProvider: ProviderDriverKind = lockedProvider ?? unlockedSelectedProvider;
18621860
const phase = derivePhase(activeThread?.session ?? null);
@@ -4038,7 +4036,7 @@ function ChatViewContent(props: ChatViewProps) {
40384036
return;
40394037
}
40404038
const sendCtx = composerRef.current?.getSendContext();
4041-
if (!sendCtx) return;
4039+
if (!sendCtx?.providerAvailable) return;
40424040
const {
40434041
images: composerImages,
40444042
terminalContexts: composerTerminalContexts,
@@ -4614,7 +4612,7 @@ function ChatViewContent(props: ChatViewProps) {
46144612
}
46154613

46164614
const sendCtx = composerRef.current?.getSendContext();
4617-
if (!sendCtx) {
4615+
if (!sendCtx?.providerAvailable) {
46184616
return;
46194617
}
46204618
const {
@@ -4773,7 +4771,7 @@ function ChatViewContent(props: ChatViewProps) {
47734771
}
47744772

47754773
const sendCtx = composerRef.current?.getSendContext();
4776-
if (!sendCtx) {
4774+
if (!sendCtx?.providerAvailable) {
47774775
return;
47784776
}
47794777
const {

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ import {
77
squashAtomCommandFailure,
88
} from "@t3tools/client-runtime/state/runtime";
99
import {
10-
DEFAULT_MODEL,
1110
type DesktopWslState,
1211
type EnvironmentId,
1312
type FilesystemBrowseResult,
1413
type ProjectId,
15-
ProviderInstanceId,
1614
type SourceControlDiscoveryResult,
1715
type SourceControlProviderKind,
1816
type SourceControlRepositoryInfo,
@@ -111,7 +109,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
111109
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
112110
import { ProjectFavicon } from "./ProjectFavicon";
113111
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
114-
import { primaryServerKeybindingsAtom } from "../state/server";
112+
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
113+
import { resolveDefaultProviderModelSelection } from "../providerInstances";
115114
import { resolveShortcutCommand } from "../keybindings";
116115
import {
117116
Command,
@@ -476,6 +475,7 @@ function OpenCommandPaletteDialog(props: {
476475
const projects = useProjects();
477476
const threads = useThreadShells();
478477
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
478+
const providers = useAtomValue(primaryServerProvidersAtom);
479479
const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
480480
const currentView = viewStack.at(-1) ?? null;
481481
const [browseGeneration, setBrowseGeneration] = useState(0);
@@ -1149,17 +1149,21 @@ function OpenCommandPaletteDialog(props: {
11491149
}
11501150

11511151
const projectId = newProjectId();
1152+
const targetEnvironmentProviders =
1153+
environments.find((environment) => environment.environmentId === input.environmentId)
1154+
?.serverConfig?.providers ??
1155+
(input.environmentId === primaryEnvironmentId ? providers : []);
11521156
const createResult = await createProject({
11531157
environmentId: input.environmentId,
11541158
input: {
11551159
projectId,
11561160
title: inferProjectTitleFromPath(cwd),
11571161
workspaceRoot: cwd,
11581162
createWorkspaceRootIfMissing: true,
1159-
defaultModelSelection: {
1160-
instanceId: ProviderInstanceId.make("codex"),
1161-
model: DEFAULT_MODEL,
1162-
},
1163+
defaultModelSelection: resolveDefaultProviderModelSelection(
1164+
targetEnvironmentProviders,
1165+
null,
1166+
),
11631167
},
11641168
});
11651169
if (createResult._tag === "Failure") {
@@ -1195,8 +1199,11 @@ function OpenCommandPaletteDialog(props: {
11951199
[
11961200
handleNewThread,
11971201
createProject,
1202+
environments,
11981203
navigate,
1204+
primaryEnvironmentId,
11991205
projects,
1206+
providers,
12001207
setOpen,
12011208
clientSettings.sidebarThreadSortOrder,
12021209
threads,

0 commit comments

Comments
 (0)