The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 16:00 UTC
fix(web): seeded models yield to started thread selections (#24619)
Julius Marminge committed
Nov 14, 2026 at 00:00 UTC
ac180919a67fa99bc34dba6c3ad0a970c22764c9
13 files changed
+267
-31
apps/web/src/components/ChatView.logic.ts
+1
-4
@@ -73,6 +73,7 @@ import {
73
type DraftThreadState,
74
} from "../composerDraftStore";
75
import * as Schema from "effect/Schema";
76
+import { threadHasStarted } from "../lib/chatThreadActions";
77
import { appAtomRegistry } from "../rpc/atomRegistry";
78
import { environmentThreadDetails } from "../state/threads";
79
import {
@@ -825,10 +826,6 @@ export function recallCheckoutIsRepo(
826
: sessionCheckoutIsRepo.get(checkoutIsRepoKey(environmentId, cwd));
827
}
828
828
-function threadHasStarted(thread: Thread | null | undefined): boolean {
829
- return Boolean(thread && (thread.latestRun !== null || thread.itemCount > 0 || thread.runtime));
830
-}
831
-
829
// Imported history lacks a session until its first prompt; resolve its instance before locking the driver.
830
export function deriveLockedProvider(input: {
831
thread: Thread | null | undefined;
apps/web/src/components/ChatView.tsx
+12
-5
@@ -226,6 +226,7 @@ import { useNewThreadHandler } from "../hooks/useHandleNewThread";
226
import { useOpenPanelPullRequestUrl } from "../hooks/useOpenPanelPullRequestUrl";
227
import { isPreviewFocused } from "../lib/previewFocus";
228
import { getTerminalFocusOwner } from "../lib/terminalFocus";
229
+import { draftModelSelectionApplies, threadHasStarted } from "../lib/chatThreadActions";
230
import {
231
deriveLogicalProjectKeyFromSettings,
232
selectProjectGroupingSettings,
@@ -608,15 +609,15 @@ export default function ChatView(props: ChatViewProps) {
609
const composerActiveProvider = useComposerDraftStore(
610
(store) => store.getComposerDraft(composerDraftTarget)?.activeProvider ?? null,
611
);
612
+ const composerModelSelectionExplicit = useComposerDraftStore(
613
+ (store) => store.getComposerDraft(composerDraftTarget)?.modelSelectionExplicit === true,
614
+ );
615
const composerSelectedModelSelection = useComposerDraftStore((store) => {
616
const draft = store.getComposerDraft(composerDraftTarget);
617
return draft?.activeProvider
618
? (draft.modelSelectionByProvider[draft.activeProvider] ?? null)
619
: null;
620
});
617
- const composerModelSelectionExplicit = useComposerDraftStore(
618
- (store) => store.getComposerDraft(composerDraftTarget)?.modelSelectionExplicit === true,
619
- );
621
const composerHasAttachments = useComposerDraftStore((store) => {
622
const draft = store.getComposerDraft(composerDraftTarget);
623
return (draft?.images.length ?? 0) > 0 || (draft?.files.length ?? 0) > 0;
@@ -1264,7 +1265,11 @@ export default function ChatView(props: ChatViewProps) {
1265
: providersByEnvironment.get(providerEnvironmentId)) ?? EMPTY_PROVIDERS,
1266
gitCwd,
1267
);
1267
- const selectedProviderByThreadId = composerActiveProvider ?? null;
1268
+ const composerModelSelectionApplies = draftModelSelectionApplies(
1269
+ { modelSelectionExplicit: composerModelSelectionExplicit },
1270
+ threadHasStarted(activeThread),
1271
+ );
1272
+ const selectedProviderByThreadId = composerModelSelectionApplies ? composerActiveProvider : null;
1273
const threadProvider =
1274
activeThread?.modelSelection.instanceId ??
1275
activeProjectDefaultModelSelection?.instanceId ??
@@ -2480,7 +2485,9 @@ export default function ChatView(props: ChatViewProps) {
2485
item.type === "user_message" &&
2486
(item.text.trim().toLowerCase() !== "/compact" || item.attachments.length > 0),
2487
);
2483
- const pendingHandoffSelection = composerSelectedModelSelection ?? activeThread?.modelSelection;
2488
+ const pendingHandoffSelection =
2489
+ (composerModelSelectionApplies ? composerSelectedModelSelection : null) ??
2490
+ activeThread?.modelSelection;
2491
const pendingHandoffSelectionUsable = providerInstanceEntries.some(
2492
(entry) =>
2493
entry.instanceId === pendingHandoffSelection?.instanceId &&
apps/web/src/components/CommandPalette.tsx
+6
-1
@@ -146,7 +146,11 @@ import {
146
waitForProject,
147
} from "../state/entities";
148
import { visibleLinkedThreads } from "@t3tools/client-runtime/state/threads";
149
-import { resolveThreadActionProjectRef, startNewThreadFromContext } from "../lib/chatThreadActions";
149
+import {
150
+ resolveThreadActionProjectRef,
151
+ startNewThreadFromContext,
152
+ threadHasStarted,
153
+} from "../lib/chatThreadActions";
154
import {
155
appendBrowsePathSegment,
156
ensureBrowseDirectoryPath,
@@ -1397,6 +1401,7 @@ function OpenCommandPaletteDialog(props: {
1401
? providersByEnvironment.get(promptLinkProjectRef.environmentId)
1402
: undefined) ?? [],
1403
threadModelSelection: activeThread?.modelSelection ?? null,
1404
+ threadStarted: threadHasStarted(activeThread),
1405
};
1406
const plainPromptLink = promptLinkInput
1407
? composerPromptLink({ ...promptLinkInput, withContext: false })
apps/web/src/components/chat/ChatComposer.tsx
+2
-1
@@ -86,6 +86,7 @@ import {
86
} from "../../composer-logic";
87
import { DEFAULT_COMPOSER_PLACEHOLDER } from "../../composerPlaceholder";
88
import { deriveComposerSendState, getAntigravitySendBlockReason } from "../ChatView.logic";
89
+import { threadHasStarted } from "../../lib/chatThreadActions";
90
import {
91
dataTransferHasComposerMention,
92
makeComposerMentionDragHandlers,
@@ -888,8 +889,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
889
threadModelSelection: activeThreadModelSelection,
890
projectModelSelection: activeProjectDefaultModelSelection,
891
promptInjectionState: getComposerPromptInjectionState(prompt),
892
+ threadStarted: threadHasStarted(activeThread),
893
candidateInstanceIds: [
892
- composerDraft.activeProvider ?? null,
894
activeThread?.runtime?.providerInstanceId,
895
activeThreadModelSelection?.instanceId,
896
activeProjectDefaultModelSelection?.instanceId,
apps/web/src/components/chat/useComposerProviderModel.ts
+10
-1
@@ -3,6 +3,7 @@ import {
3
deriveEffectiveComposerModelState,
4
useComposerDraftModelState,
5
} from "../../composerDraftStore";
6
+import { draftModelSelectionApplies } from "../../lib/chatThreadActions";
7
import {
8
type ModelSelection,
9
type ProjectId,
@@ -35,6 +36,7 @@ export function useComposerProviderModel(
36
readonly threadModelSelection: ModelSelection | null | undefined;
37
readonly projectModelSelection: ModelSelection | null | undefined;
38
readonly promptInjectionState: ReturnType<typeof getComposerPromptInjectionState>;
39
+ readonly threadStarted: boolean;
40
},
41
) {
42
const {
@@ -48,6 +50,7 @@ export function useComposerProviderModel(
50
candidateInstanceIds,
51
lockedProvider,
52
lockedInstanceId,
53
+ threadStarted,
54
} = input;
55
const draftModelState = useComposerDraftModelState(threadRef);
56
const providerInstanceEntries: ReadonlyArray<ProviderInstanceEntry> = providerInstanceEntriesFor(
@@ -57,7 +60,12 @@ export function useComposerProviderModel(
60
);
61
const selection = resolveComposerProviderSelection({
62
entries: providerInstanceEntries,
60
- candidateInstanceIds,
63
+ candidateInstanceIds: [
64
+ draftModelSelectionApplies(draftModelState, threadStarted)
65
+ ? draftModelState.activeProvider
66
+ : null,
67
+ ...candidateInstanceIds,
68
+ ],
69
lockedProvider,
70
lockedInstanceId,
71
});
@@ -67,6 +75,7 @@ export function useComposerProviderModel(
75
selection.selectedProviderEntry?.driverKind ?? selection.requestedDriverKind;
76
const modelState = deriveEffectiveComposerModelState({
77
draft: draftModelState,
78
+ threadStarted,
79
providers: providerStatuses,
80
selectedProvider,
81
selectedInstanceId,
apps/web/src/components/chat/useComposerSelection.browser.test.tsx
+31
@@ -139,6 +139,7 @@ it("switches back to the thread's stored model while the session runs on another
139
expect(
140
deriveEffectiveComposerModelState({
141
draft,
142
+ threadStarted: true,
143
providers,
144
selectedProvider: ProviderDriverKind.make("cursor"),
145
selectedInstanceId: cursor,
@@ -175,3 +176,33 @@ it("saves a re-picked model again when its first save failed", async () => {
176
});
177
await vi.waitFor(() => expect(setModelSelection.mock.calls).toEqual([[autoSave], [autoSave]]));
178
});
179
+
180
+it("saves a pick of a seeded model the started thread does not show", async () => {
181
+ const { setModelSelection } = setup();
182
+ setModelSelection.mockResolvedValue(AsyncResult.success(undefined));
183
+ const thread = cursorThread("thread-cursor-seeded");
184
+ appAtomRegistry.set(shellAtom(thread.id), thread);
185
+ useComposerDraftStore
186
+ .getState()
187
+ .setModelSelection(
188
+ scopeThreadRef(environmentId, thread.id),
189
+ createModelSelection(cursor, "auto-smart"),
190
+ );
191
+ await using _screen = await render(
192
+ <AppAtomRegistryProvider>
193
+ <Picker thread={thread} runtime={null} model="auto-smart" />
194
+ </AppAtomRegistryProvider>,
195
+ );
196
+ await page.getByRole("button", { name: "Pick the model" }).click();
197
+
198
+ await vi.waitFor(() =>
199
+ expect(setModelSelection).toHaveBeenCalledWith(
200
+ expect.objectContaining({
201
+ input: {
202
+ threadId: thread.id,
203
+ modelSelection: expect.objectContaining({ instanceId: cursor, model: "auto-smart" }),
204
+ },
205
+ }),
206
+ ),
207
+ );
208
+});
apps/web/src/components/chat/useComposerSelection.ts
+9
-2
@@ -18,7 +18,11 @@ import { type SetStateAction } from "react";
18
import { useNavigate } from "@tanstack/react-router";
19
import { toastManager } from "../ui/toast";
20
import { resolveAppModelSelectionForInstance } from "../../modelSelection";
21
-import { resolveNewDraftStartFromOrigin } from "../../lib/chatThreadActions";
21
+import {
22
+ draftModelSelectionApplies,
23
+ resolveNewDraftStartFromOrigin,
24
+ threadHasStarted,
25
+} from "../../lib/chatThreadActions";
26
import { type DraftThreadEnvMode, useComposerDraftStore } from "../../composerDraftStore";
27
import {
28
getStartedThreadModelChangeBlockReason,
@@ -161,7 +165,10 @@ export function useComposerSelection(input: ComposerSelectionInput) {
165
{ preserveUnavailableSelection: true },
166
);
167
const threadRef = scopeThreadRef(activeThread.environmentId, activeThread.id);
164
- const draft = useComposerDraftStore.getState().getComposerDraft(threadRef);
168
+ const storedDraft = useComposerDraftStore.getState().getComposerDraft(threadRef);
169
+ const draft = draftModelSelectionApplies(storedDraft, threadHasStarted(activeThread))
170
+ ? storedDraft
171
+ : null;
172
const shownInstanceId =
173
draft?.activeProvider ??
174
activeRuntime?.providerInstanceId ??
apps/web/src/components/promptLinks/copyPromptLink.ts
+5
-2
@@ -15,6 +15,7 @@ import {
15
import { type ComposerThreadTarget, useComposerDraftStore } from "~/composerDraftStore";
16
import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";
17
import { configuredHostedAppUrl } from "~/hostedPairing";
18
+import { draftModelSelectionApplies } from "~/lib/chatThreadActions";
19
20
import { stackedThreadToast, toastManager } from "../ui/toast";
21
@@ -48,14 +49,16 @@ export function composerPromptLink(input: {
49
readonly project: EnvironmentProject | undefined;
50
readonly providers: ReadonlyArray<ServerProvider>;
51
readonly threadModelSelection: ModelSelection | null;
52
+ readonly threadStarted: boolean;
53
readonly withContext: boolean;
54
}): string | null {
55
const draft = useComposerDraftStore.getState().getComposerDraft(input.target);
56
if (!draft) return null;
57
if (!input.withContext) return promptLinkFor(draft.prompt);
58
const selection =
57
- (draft.activeProvider ? draft.modelSelectionByProvider[draft.activeProvider] : undefined) ??
58
- input.threadModelSelection;
59
+ (draft.activeProvider && draftModelSelectionApplies(draft, input.threadStarted)
60
+ ? draft.modelSelectionByProvider[draft.activeProvider]
61
+ : undefined) ?? input.threadModelSelection;
62
const provider = selection
63
? (input.providers.find((candidate) => candidate.instanceId === selection.instanceId)?.driver ??
64
null)
apps/web/src/composerDraftStore.test.ts
+120
@@ -34,6 +34,7 @@ import {
34
type PreviewAnnotationPayload,
35
type ProviderOptionSelection,
36
type ScopedThreadRef,
37
+ type ServerProvider,
38
} from "@t3tools/contracts";
39
import { createModelSelection } from "@t3tools/shared/model";
40
@@ -1704,6 +1705,7 @@ describe("composerDraftStore modelSelection", () => {
1705
const remoteModel = DEFAULT_MODEL_BY_PROVIDER[CLAUDE_AGENT_DRIVER]!;
1706
h.update({ modelSelection: modelSelection(CLAUDE_AGENT_DRIVER, remoteModel) });
1707
const effective = deriveEffectiveComposerModelState({
1708
+ threadStarted: false,
1709
draft: draftFor(threadId, TEST_ENVIRONMENT_ID),
1710
providers: [
1711
{
@@ -1744,6 +1746,7 @@ describe("composerDraftStore modelSelection", () => {
1746
const h = modelReconciliationHarness(TEST_ENVIRONMENT_ID, threadId);
1747
h.update({ modelSelection: primary });
1748
const fallback = deriveEffectiveComposerModelState({
1749
+ threadStarted: false,
1750
draft: before,
1751
providers: [],
1752
selectedProvider: CODEX_DRIVER,
@@ -1850,6 +1853,91 @@ describe("composerDraftStore modelSelection", () => {
1853
).toEqual(modelSelection(CODEX_DRIVER, "gpt-5.4", { reasoningEffort: "xhigh" }));
1854
});
1855
1856
+ describe("seeded draft model on a started thread", () => {
1857
+ const providers: ReadonlyArray<ServerProvider> = [
1858
+ {
1859
+ instanceId: CODEX_INSTANCE,
1860
+ driver: CODEX_DRIVER,
1861
+ enabled: true,
1862
+ installed: true,
1863
+ version: null,
1864
+ status: "ready",
1865
+ auth: { status: "authenticated" },
1866
+ checkedAt: "2026-01-01T00:00:00.000Z",
1867
+ models: ["gpt-5.4", "gpt-5.3-codex"].map((slug) => ({
1868
+ slug,
1869
+ name: slug,
1870
+ isCustom: false,
1871
+ capabilities: {},
1872
+ })),
1873
+ slashCommands: [],
1874
+ skills: [],
1875
+ },
1876
+ ];
1877
+ const threadSelection = modelSelection(CODEX_DRIVER, "gpt-5.3-codex", {
1878
+ reasoningEffort: "low",
1879
+ });
1880
+ const effective = (threadStarted: boolean) => {
1881
+ const state = deriveEffectiveComposerModelState({
1882
+ draft: useComposerDraftStore.getState().getComposerDraft(threadRef),
1883
+ threadStarted,
1884
+ providers,
1885
+ selectedProvider: CODEX_DRIVER,
1886
+ selectedInstanceId: CODEX_INSTANCE,
1887
+ threadModelSelection: threadSelection,
1888
+ projectModelSelection: null,
1889
+ settings: DEFAULT_UNIFIED_SETTINGS,
1890
+ });
1891
+ return {
1892
+ model: state.selectedModel,
1893
+ options: state.modelOptions?.[CODEX_INSTANCE] ?? [],
1894
+ };
1895
+ };
1896
+
1897
+ it("applies the seed only until the thread starts, then only an explicit pick wins", () => {
1898
+ const store = useComposerDraftStore.getState();
1899
+ store.setModelSelection(
1900
+ threadRef,
1901
+ modelSelection(CODEX_DRIVER, "gpt-5.4", { reasoningEffort: "high" }),
1902
+ );
1903
+
1904
+ expect(effective(false)).toEqual({
1905
+ model: "gpt-5.4",
1906
+ options: toSelections({ reasoningEffort: "high" }),
1907
+ });
1908
+ expect(effective(true)).toEqual({
1909
+ model: "gpt-5.3-codex",
1910
+ options: toSelections({ reasoningEffort: "low" }),
1911
+ });
1912
+
1913
+ store.setModelSelection(
1914
+ threadRef,
1915
+ modelSelection(CODEX_DRIVER, "gpt-5.4", { reasoningEffort: "high" }),
1916
+ { explicit: true },
1917
+ );
1918
+ expect(effective(true)).toEqual({
1919
+ model: "gpt-5.4",
1920
+ options: toSelections({ reasoningEffort: "high" }),
1921
+ });
1922
+ });
1923
+
1924
+ it("keeps the thread's model when traits change over a seed", () => {
1925
+ const store = useComposerDraftStore.getState();
1926
+ store.setModelSelection(threadRef, modelSelection(CODEX_DRIVER, "gpt-5.4"));
1927
+ store.setProviderModelOptions(
1928
+ threadRef,
1929
+ CODEX_DRIVER,
1930
+ toSelections({ reasoningEffort: "high" }),
1931
+ { instanceId: CODEX_INSTANCE, model: "gpt-5.3-codex" },
1932
+ );
1933
+
1934
+ expect(effective(true)).toEqual({
1935
+ model: "gpt-5.3-codex",
1936
+ options: toSelections({ reasoningEffort: "high" }),
1937
+ });
1938
+ });
1939
+ });
1940
+
1941
it("stores provider option changes on a selected custom instance", () => {
1942
const store = useComposerDraftStore.getState();
1943
@@ -1934,6 +2022,38 @@ describe("composerDraftStore per-model sticky options", () => {
2022
);
2023
});
2024
2025
+ it("keeps the sticky model's own traits when traits change on another shown model", () => {
2026
+ const store = useComposerDraftStore.getState();
2027
+ store.setStickyModelSelection(
2028
+ modelSelection(CODEX_DRIVER, "gpt-5.3-codex", { reasoningEffort: "xhigh" }),
2029
+ );
2030
+
2031
+ store.setProviderModelOptions(
2032
+ threadRef,
2033
+ CODEX_DRIVER,
2034
+ toSelections({ reasoningEffort: "low" }),
2035
+ { instanceId: CODEX_INSTANCE, model: "gpt-5.4", persistSticky: true },
2036
+ );
2037
+ expect(useComposerDraftStore.getState().stickyModelSelectionByProvider[CODEX_INSTANCE]).toEqual(
2038
+ modelSelection(CODEX_DRIVER, "gpt-5.3-codex", { reasoningEffort: "xhigh" }),
2039
+ );
2040
+ expect(
2041
+ useComposerDraftStore.getState().stickyOptionsByModelByProvider[CODEX_INSTANCE]?.["gpt-5.4"],
2042
+ ).toEqual(toSelections({ reasoningEffort: "low" }));
2043
+
2044
+ store.setProviderModelOptions(threadRef, CODEX_DRIVER, null, {
2045
+ instanceId: CODEX_INSTANCE,
2046
+ model: "gpt-5.4",
2047
+ persistSticky: true,
2048
+ });
2049
+
2050
+ const state = useComposerDraftStore.getState();
2051
+ expect(state.stickyModelSelectionByProvider[CODEX_INSTANCE]).toEqual(
2052
+ modelSelection(CODEX_DRIVER, "gpt-5.3-codex", { reasoningEffort: "xhigh" }),
2053
+ );
2054
+ expect(state.stickyOptionsByModelByProvider[CODEX_INSTANCE]?.["gpt-5.4"]).toBeUndefined();
2055
+ });
2056
+
2057
it("seeds per-model memory from a persisted sticky selection on upgrade", () => {
2058
const persistApi = useComposerDraftStore.persist as unknown as {
2059
getOptions: () => {
apps/web/src/composerDraftStore.ts
+33
-14
@@ -95,6 +95,7 @@ import {
95
import { create } from "zustand";
96
import { persist, type PersistStorage, type StorageValue } from "zustand/middleware";
97
import { useShallow } from "zustand/react/shallow";
98
+import { draftModelSelectionApplies } from "./lib/chatThreadActions";
99
import { createDeferredStorage, createMemoryStorage } from "./lib/storage";
100
import { getDefaultServerModel } from "./providerModels";
101
import {
@@ -768,6 +769,7 @@ export interface EffectiveComposerModelState {
769
interface ComposerDraftModelState {
770
activeProvider: ProviderInstanceId | null;
771
modelSelectionByProvider: Partial<Record<ProviderInstanceId, ModelSelection>>;
772
+ modelSelectionExplicit: boolean;
773
}
774
775
function selectionsByInstance(
@@ -870,6 +872,7 @@ const EMPTY_MODEL_SELECTION_BY_PROVIDER: Partial<Record<ProviderDriverKind, Mode
872
const EMPTY_COMPOSER_DRAFT_MODEL_STATE = Object.freeze<ComposerDraftModelState>({
873
activeProvider: null,
874
modelSelectionByProvider: EMPTY_MODEL_SELECTION_BY_PROVIDER,
875
+ modelSelectionExplicit: false,
876
});
877
878
const EMPTY_THREAD_DRAFT = Object.freeze<ComposerThreadDraftState>({
@@ -1222,9 +1225,13 @@ function legacyToModelSelectionByProvider(
1225
1226
export function deriveEffectiveComposerModelState(input: {
1227
draft:
1225
- | Pick<ComposerThreadDraftState, "modelSelectionByProvider" | "activeProvider">
1228
+ | Pick<
1229
+ ComposerThreadDraftState,
1230
+ "modelSelectionByProvider" | "activeProvider" | "modelSelectionExplicit"
1231
+ >
1232
| null
1233
| undefined;
1234
+ threadStarted: boolean;
1235
providers: ReadonlyArray<ServerProvider>;
1236
selectedProvider: ProviderDriverKind;
1237
selectedInstanceId?: ProviderInstanceId | null | undefined;
@@ -1234,6 +1241,7 @@ export function deriveEffectiveComposerModelState(input: {
1241
projectModelSelection: ModelSelection | null | undefined;
1242
settings: UnifiedSettings;
1243
}): EffectiveComposerModelState {
1244
+ const draft = draftModelSelectionApplies(input.draft, input.threadStarted) ? input.draft : null;
1245
const baseModelCandidate =
1246
input.threadModelSelection?.model ?? input.projectModelSelection?.model ?? null;
1247
const preserveThreadModel =
@@ -1261,14 +1269,14 @@ export function deriveEffectiveComposerModelState(input: {
1269
normalizeModelSlug(baseModelCandidate, input.selectedProvider) ??
1270
getDefaultServerModel(input.providers, input.selectedProvider);
1271
const instanceSelection = input.selectedInstanceId
1264
- ? input.draft?.modelSelectionByProvider?.[input.selectedInstanceId]
1272
+ ? draft?.modelSelectionByProvider?.[input.selectedInstanceId]
1273
: undefined;
1274
// Legacy driver-keyed drafts belong to the default instance.
1275
const legacySelection =
1276
input.selectedInstanceId &&
1277
input.selectedInstanceId !== defaultInstanceIdForDriver(input.selectedProvider)
1278
? undefined
1271
- : input.draft?.modelSelectionByProvider?.[ProviderInstanceId.make(input.selectedProvider)];
1279
+ : draft?.modelSelectionByProvider?.[ProviderInstanceId.make(input.selectedProvider)];
1280
const activeSelection = instanceSelection ?? legacySelection;
1281
const activeSelectionInstanceId = instanceSelection
1282
? (input.selectedInstanceId ?? ProviderInstanceId.make(input.selectedProvider))
@@ -1293,7 +1301,7 @@ export function deriveEffectiveComposerModelState(input: {
1301
// Selections stay with them, so a fallback instance can check which model the options belong to.
1302
const optionSelections =
1303
[
1296
- input.draft?.modelSelectionByProvider,
1304
+ draft?.modelSelectionByProvider,
1305
selectionsByInstance(input.threadModelSelection ?? input.projectModelSelection),
1306
].find((selections) => modelSelectionByProviderToOptions(selections) !== null) ?? null;
1307
const modelOptions = modelSelectionByProviderToOptions(optionSelections);
@@ -3307,10 +3315,13 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
3315
const base = existing ?? createEmptyThreadDraft();
3316
3317
const nextMap = { ...base.modelSelectionByProvider };
3310
- const currentForProvider = nextMap[instanceKey];
3318
+ // Traits apply to the model the composer shows, which on a started
3319
+ // thread is the thread's model rather than a stored seed.
3320
nextMap[instanceKey] = createModelSelection(
3321
instanceKey,
3313
- currentForProvider?.model ?? fallbackModel,
3322
+ normalizeCustomModelSlug(options?.model) ??
3323
+ nextMap[instanceKey]?.model ??
3324
+ fallbackModel,
3325
providerOpts,
3326
);
3327
@@ -3324,12 +3335,17 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
3335
base.modelSelectionByProvider[instanceKey] ??
3336
createModelSelection(instanceKey, fallbackModel);
3337
const rememberedModel = normalizeCustomModelSlug(options?.model) ?? stickyBase.model;
3338
+ // Traits for another shown model belong in per-model memory only;
3339
+ // the sticky selection keeps its own model's traits.
3340
+ const appliesToSticky = rememberedModel === stickyBase.model;
3341
if (providerOpts) {
3328
- nextStickyMap[instanceKey] = createModelSelection(
3329
- instanceKey,
3330
- stickyBase.model,
3331
- providerOpts,
3332
- );
3342
+ if (appliesToSticky) {
3343
+ nextStickyMap[instanceKey] = createModelSelection(
3344
+ instanceKey,
3345
+ stickyBase.model,
3346
+ providerOpts,
3347
+ );
3348
+ }
3349
nextOptionsByModel = {
3350
...state.stickyOptionsByModelByProvider,
3351
[instanceKey]: {
@@ -3337,9 +3353,11 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
3353
[rememberedModel]: providerOpts,
3354
},
3355
};
3340
- } else if ((stickyBase.options?.length ?? 0) > 0) {
3341
- const { options: _, ...rest } = stickyBase;
3342
- nextStickyMap[instanceKey] = rest as ModelSelection;
3356
+ } else {
3357
+ if (appliesToSticky && (stickyBase.options?.length ?? 0) > 0) {
3358
+ const { options: _, ...rest } = stickyBase;
3359
+ nextStickyMap[instanceKey] = rest as ModelSelection;
3360
+ }
3361
const rememberedByModel = {
3362
...state.stickyOptionsByModelByProvider[instanceKey],
3363
};
@@ -4651,6 +4669,7 @@ export function useComposerDraftModelState(
4669
? {
4670
activeProvider: draft.activeProvider,
4671
modelSelectionByProvider: draft.modelSelectionByProvider,
4672
+ modelSelectionExplicit: draft.modelSelectionExplicit === true,
4673
}
4674
: EMPTY_COMPOSER_DRAFT_MODEL_STATE;
4675
}),
apps/web/src/hooks/useHandleNewThread.ts
+8
-1
@@ -30,9 +30,11 @@ import {
30
useQuietThreadShell,
31
} from "../state/entities";
32
import {
33
+ draftModelSelectionApplies,
34
hasExplicitComposerModelSelection,
35
resolveNewDraftStartFromOrigin,
36
resolveNewThreadModelSelectionOverride,
37
+ threadHasStarted,
38
} from "../lib/chatThreadActions";
39
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
40
import { readT3ProjectFile } from "../lib/t3ProjectFileDefaults";
@@ -139,7 +141,12 @@ export function createNewThreadHandler(router: AnyRouter) {
141
: currentRouteTarget.draftId,
142
)
143
: null;
142
- const composerActiveProvider = carrySourceComposer?.activeProvider ?? null;
144
+ const composerActiveProvider = draftModelSelectionApplies(
145
+ carrySourceComposer,
146
+ threadHasStarted(carrySourceShell),
147
+ )
148
+ ? (carrySourceComposer?.activeProvider ?? null)
149
+ : null;
150
const composerModelSelection = composerActiveProvider
151
? (carrySourceComposer?.modelSelectionByProvider[composerActiveProvider] ?? null)
152
: null;
apps/web/src/lib/chatThreadActions.ts
+19
@@ -1,4 +1,5 @@
1
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
2
+import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
3
import type {
4
EnvironmentId,
5
ModelSelection,
@@ -67,6 +68,24 @@ export function hasExplicitComposerModelSelection(
68
);
69
}
70
71
+export function threadHasStarted(
72
+ thread: Pick<EnvironmentThreadShell, "latestRun" | "itemCount" | "runtime"> | null | undefined,
73
+): boolean {
74
+ return Boolean(thread && (thread.latestRun !== null || thread.itemCount > 0 || thread.runtime));
75
+}
76
+
77
+/**
78
+ * A draft is seeded from sticky state, project defaults, prompt links, or a carried selection.
79
+ * That seed is what an unstarted thread sends; once the thread has started, its own selection
80
+ * wins unless the user picked a model or traits for it.
81
+ */
82
+export function draftModelSelectionApplies(
83
+ draft: Pick<ComposerThreadDraftState, "modelSelectionExplicit"> | null | undefined,
84
+ threadStarted: boolean,
85
+): boolean {
86
+ return !threadStarted || draft?.modelSelectionExplicit === true;
87
+}
88
+
89
export function resolveThreadActionProjectRef(
90
context: ChatThreadActionContext,
91
): ScopedProjectRef | null {
apps/web/src/modelSelection.test.ts
+11
@@ -489,6 +489,7 @@ describe("instance-scoped model selection", () => {
489
const driver = ProviderDriverKind.make("codex");
490
const providers = [provider({ provider: driver, instanceId, models: ["gpt-5.6-sol"] })];
491
const state = deriveEffectiveComposerModelState({
492
+ threadStarted: false,
493
draft: {
494
activeProvider: instanceId,
495
modelSelectionByProvider: {
@@ -523,6 +524,7 @@ describe("instance-scoped model selection", () => {
524
]);
525
const providers = [provider({ provider: driver, instanceId, models: ["auto-smart"] })];
526
const state = deriveEffectiveComposerModelState({
527
+ threadStarted: false,
528
draft: null,
529
providers,
530
selectedProvider: driver,
@@ -552,6 +554,7 @@ describe("instance-scoped model selection", () => {
554
]);
555
const providers = [provider({ provider: driver, instanceId, models: [] })];
556
const state = deriveEffectiveComposerModelState({
557
+ threadStarted: false,
558
draft: {
559
activeProvider: instanceId,
560
modelSelectionByProvider: { [instanceId]: draftSelection },
@@ -584,6 +587,7 @@ describe("instance-scoped model selection", () => {
587
{ activeProvider: instanceId, modelSelectionByProvider: { [instanceId]: saved } },
588
]) {
589
const state = deriveEffectiveComposerModelState({
590
+ threadStarted: false,
591
draft,
592
providers,
593
selectedProvider: driver,
@@ -616,6 +620,7 @@ describe("instance-scoped model selection", () => {
620
},
621
]) {
622
const state = deriveEffectiveComposerModelState({
623
+ threadStarted: false,
624
draft,
625
providers,
626
selectedProvider: driver,
@@ -727,6 +732,7 @@ describe("instance-scoped model selection", () => {
732
{ id: "agent", value: "build" },
733
]);
734
const state = deriveEffectiveComposerModelState({
735
+ threadStarted: false,
736
draft: null,
737
providers,
738
selectedProvider: driver,
@@ -780,6 +786,7 @@ describe("instance-scoped model selection", () => {
786
threadModelSelection: ReturnType<typeof createModelSelection> | null,
787
) => {
788
const state = deriveEffectiveComposerModelState({
789
+ threadStarted: false,
790
draft: null,
791
providers,
792
selectedProvider: driver,
@@ -832,6 +839,7 @@ describe("instance-scoped model selection", () => {
839
{ id: "effort", value: "max" },
840
]);
841
const state = deriveEffectiveComposerModelState({
842
+ threadStarted: false,
843
draft: {
844
activeProvider: instanceId,
845
modelSelectionByProvider: { [instanceId]: draftSelection },
@@ -869,6 +877,7 @@ describe("instance-scoped model selection", () => {
877
provider({ provider: driver, instanceId: kimiInstanceId, models: [kimiModel] }),
878
];
879
const state = deriveEffectiveComposerModelState({
880
+ threadStarted: false,
881
draft: {
882
activeProvider: kimiInstanceId,
883
modelSelectionByProvider: {
@@ -1089,6 +1098,7 @@ describe("default model settings and new-thread composer parity", () => {
1098
};
1099
// ChatView builds the local draft with the project default as its thread selection.
1100
const composer = deriveEffectiveComposerModelState({
1101
+ threadStarted: false,
1102
draft: null,
1103
providers,
1104
selectedProvider: driver,
@@ -1188,6 +1198,7 @@ describe("composer fallback to another instance of the same driver", () => {
1198
const selectedInstanceId = selection.selectedProviderEntry!.instanceId;
1199
const selectedProvider = selection.selectedProviderEntry!.driverKind;
1200
const state = deriveEffectiveComposerModelState({
1201
+ threadStarted: false,
1202
draft: input.draft ?? null,
1203
providers: input.providers,
1204
selectedProvider,