Skip to content

Commit 44b14f4

Browse files
juliusmarmingecodex
andcommitted
fix(web): finalize provider defaults for PR #4117
Preserve valid stored selections, recover stale selections deterministically, and make the no-provider composer state explicit and non-dispatchable. Co-authored-by: codex <[email protected]>
1 parent 2d2fb36 commit 44b14f4

7 files changed

Lines changed: 317 additions & 128 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: 11 additions & 12 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,
@@ -112,10 +110,7 @@ import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons"
112110
import { ProjectFavicon } from "./ProjectFavicon";
113111
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
114112
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
115-
import {
116-
getDefaultProviderInstanceModel,
117-
resolveSelectableProviderInstance,
118-
} from "../providerInstances";
113+
import { resolveDefaultProviderModelSelection } from "../providerInstances";
119114
import { resolveShortcutCommand } from "../keybindings";
120115
import {
121116
Command,
@@ -1154,19 +1149,21 @@ function OpenCommandPaletteDialog(props: {
11541149
}
11551150

11561151
const projectId = newProjectId();
1157-
const defaultInstanceId =
1158-
resolveSelectableProviderInstance(providers, undefined) ?? ProviderInstanceId.make("codex");
1152+
const targetEnvironmentProviders =
1153+
environments.find((environment) => environment.environmentId === input.environmentId)
1154+
?.serverConfig?.providers ??
1155+
(input.environmentId === primaryEnvironmentId ? providers : []);
11591156
const createResult = await createProject({
11601157
environmentId: input.environmentId,
11611158
input: {
11621159
projectId,
11631160
title: inferProjectTitleFromPath(cwd),
11641161
workspaceRoot: cwd,
11651162
createWorkspaceRootIfMissing: true,
1166-
defaultModelSelection: {
1167-
instanceId: defaultInstanceId,
1168-
model: getDefaultProviderInstanceModel(providers, defaultInstanceId) ?? DEFAULT_MODEL,
1169-
},
1163+
defaultModelSelection: resolveDefaultProviderModelSelection(
1164+
targetEnvironmentProviders,
1165+
null,
1166+
),
11701167
},
11711168
});
11721169
if (createResult._tag === "Failure") {
@@ -1202,7 +1199,9 @@ function OpenCommandPaletteDialog(props: {
12021199
[
12031200
handleNewThread,
12041201
createProject,
1202+
environments,
12051203
navigate,
1204+
primaryEnvironmentId,
12061205
projects,
12071206
providers,
12081207
setOpen,

0 commit comments

Comments
 (0)