@devries-cameron20 / t3code Mirror · read-only / commits / 50b885e036
Fork 0

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, 09:45 UTC

fix(web): switching a draft's machine uses that machine's default model (#37593)

Radek Maňák committed Nov 16, 2026 at 11:43 UTC 50b885e03617e84d85d64e8a3bf599daee1345cd
6 files changed +93 -56
apps/web/src/components/AddProjectToMachineDialog.tsx
+2
@@ -32,6 +32,7 @@ import {
32 isDefaultCopiedFile,
33 } from "../lib/addProjectToMachine";
34 import { formatBytes } from "../lib/formatBytes";
35 +import { seedDraftModelSelection } from "../lib/seedDraftModelSelection";
36 import { newProjectId } from "../lib/utils";
37 import { readProject, subscribeProject, useProject } from "../state/entities";
38 import { useEnvironments } from "../state/environments";
@@ -201,6 +202,7 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
202 environmentSelection: "manual",
203 loadBalancedEnvironmentId: null,
204 });
205 + seedDraftModelSelection(draftId, targetRef);
206 return;
207 }
208 void handleNewThread(targetRef);
apps/web/src/components/chat/DraftHeroHeadline.tsx
+7 -55
@@ -16,7 +16,7 @@ import { useProjectPin } from "~/hooks/useProjectGroupUpdate";
16 import { useScratchProject } from "~/hooks/useScratchProject";
17 import { isTriagePrompt } from "@t3tools/shared/triagePrompt";
18 import { useClientSettings } from "~/hooks/useSettings";
19 -import { hasExplicitComposerModelSelection } from "~/lib/chatThreadActions";
19 +import { seedDraftModelSelection } from "~/lib/seedDraftModelSelection";
20 import {
21 deriveLogicalProjectKeyFromSettings,
22 pickableProjectGroups,
@@ -27,11 +27,7 @@ import {
27 projectGroupsSpanEnvironments,
28 } from "~/sidebarProjectGrouping";
29 import { useProjects } from "~/state/entities";
30 -import {
31 - useEnvironments,
32 - usePrimaryEnvironmentId,
33 - useEnvironmentProviders,
34 -} from "~/state/environments";
30 +import { useEnvironments, usePrimaryEnvironmentId } from "~/state/environments";
31 import { ProjectEnvironmentBadge } from "../ProjectEnvironmentBadge";
32 import { ProjectFavicon } from "../ProjectFavicon";
33 import { isProjectPinShortcut, ProjectPinButton } from "../ProjectPinButton";
@@ -51,9 +47,6 @@ import { InlineButton } from "../ui/button";
47 import { DraftProjectName } from "./DraftProjectName";
48 import { DraftHeroProjectHeading } from "./DraftHeroProjectHeading";
49 import { TriageDraftHero } from "./TriageDraftHero";
54 -import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
55 -import { resolveProjectDefaultProviderModelSelection } from "../../providerInstances";
56 -import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
50
51 const ADD_PROJECT_VALUE = "add-project";
52
@@ -75,7 +68,6 @@ export function DraftHeroHeadline({
68 }: DraftHeroHeadlineProps) {
69 const projects = useProjects();
70 const { environments } = useEnvironments();
78 - const providersByEnvironment = useEnvironmentProviders();
71 const primaryEnvironmentId = usePrimaryEnvironmentId();
72 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
73 const setLogicalProjectDraftThreadId = useComposerDraftStore(
@@ -86,8 +78,6 @@ export function DraftHeroHeadline({
78 const isTriageDraftPrompt = useComposerDraftStore((store) =>
79 draftId ? isTriagePrompt(store.getComposerDraft(draftId)?.prompt ?? "") : false,
80 );
89 - const applyStickyState = useComposerDraftStore((store) => store.applyStickyState);
90 - const setModelSelection = useComposerDraftStore((store) => store.setModelSelection);
81 const openAddProject = () => openCommandPalette({ open: "add-project" });
82 const { scratchEnvironmentId, scratchWorkspaceRootFor, openScratchProject } = useScratchProject();
83 const openProjectDraft = useNewThreadHandler();
@@ -186,51 +176,13 @@ export function DraftHeroHeadline({
176 return;
177 }
178 pendingScratchRef.current = null;
189 - const currentDraft = getComposerDraft(draftId);
190 - if (!composerDraftHasUserContent(currentDraft)) {
191 - void openProjectDraft(scopeProjectRef(project.environmentId, project.id));
179 + const projectRef = scopeProjectRef(project.environmentId, project.id);
180 + if (!composerDraftHasUserContent(getComposerDraft(draftId))) {
181 + void openProjectDraft(projectRef);
182 return;
183 }
194 - setLogicalProjectDraftThreadId(
195 - logicalProjectKey,
196 - scopeProjectRef(project.environmentId, project.id),
197 - draftId,
198 - );
199 - if (!hasExplicitComposerModelSelection(currentDraft)) {
200 - applyStickyState(draftId);
201 - const environmentConfig = environments.find(
202 - (environment) => environment.environmentId === project.environmentId,
203 - )?.serverConfig;
204 - const environmentSettings = environmentConfig?.settings;
205 - const defaultSelection = environmentSettings
206 - ? resolveProjectSettings(environmentSettings, project.id, project).settings
207 - .defaultModelSelection
208 - : project.defaultModelSelection;
209 - const fallbackResolution = resolveNewThreadModelSelection({
210 - defaultSelection:
211 - defaultSelection ??
212 - (useComposerDraftStore.getState().stickyActiveProvider !== null || !environmentSettings
213 - ? null
214 - : resolveProjectDefaultProviderModelSelection(
215 - providersByEnvironment.get(project.environmentId) ?? [],
216 - environmentSettings,
217 - project.id,
218 - )),
219 - fallbackSelection: environmentSettings?.fallbackModelSelection ?? null,
220 - providers: providersByEnvironment.get(project.environmentId) ?? [],
221 - ...(environmentSettings ? { settings: environmentSettings } : {}),
222 - projectId: project.id,
223 - now: Date.now(),
224 - });
225 - const defaultModelSelection = fallbackResolution.fallback
226 - ? fallbackResolution.selection
227 - : defaultSelection;
228 - if (defaultModelSelection) {
229 - setModelSelection(draftId, defaultModelSelection, {
230 - replaceOptions: true,
231 - });
232 - }
233 - }
184 + setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, draftId);
185 + seedDraftModelSelection(draftId, projectRef);
186 };
187 const startScratch = async (): Promise<boolean> => {
188 if (scratchTargetEnvironmentId === null || isScratchDraft) {
apps/web/src/components/chat/useDraftEnvironmentRouting.browser.test.tsx
+39 -1
@@ -39,7 +39,13 @@ vi.mock("../../hooks/useLoadBalancedEnvironment", () => ({
39 refreshSelection: resources.refreshSelection,
40 }),
41 }));
42 -vi.mock("../../state/entities", () => ({ useProjects: () => resources.projects }));
42 +vi.mock("../../state/entities", () => ({
43 + useProjects: () => resources.projects,
44 + readProject: (ref: { environmentId: EnvironmentId; projectId: ProjectId }) =>
45 + resources.projects.find(
46 + (project) => project.environmentId === ref.environmentId && project.id === ref.projectId,
47 + ) ?? null,
48 +}));
49 vi.mock("../../hooks/useScratchProject", () => ({ useScratchProject: () => ({}) }));
50
51 function setup() {
@@ -314,3 +320,35 @@ it("keeps the selected models when automatic routing picks another machine", asy
320 await expect.element(screen.getByText(b)).toBeInTheDocument();
321 await expect.element(screen.getByText("gpt-6.1-sol, gpt-6.1-luna")).toBeInTheDocument();
322 });
323 +
324 +it.each([
325 + { name: "takes the destination default", explicit: false, remoteDefault: true, model: "luna" },
326 + { name: "keeps a model the user picked", explicit: true, remoteDefault: true, model: "sol" },
327 + {
328 + name: "keeps the last-used model without a default",
329 + explicit: false,
330 + remoteDefault: false,
331 + model: "sol",
332 + },
333 +])("$name when the draft switches machine by hand", async ({ explicit, remoteDefault, model }) => {
334 + const { b, draftId, input, store } = fanoutSetup();
335 + const codex = ProviderInstanceId.make("codex");
336 + resources.projects = resources.projects.map((project) =>
337 + project.environmentId === b && remoteDefault
338 + ? { ...project, defaultModelSelection: createModelSelection(codex, "luna") }
339 + : project,
340 + );
341 + store.setStickyModelSelection(createModelSelection(codex, "sol"));
342 + store.setModelSelection(draftId, createModelSelection(codex, "sol"), { explicit });
343 + await using screen = await render(
344 + <Harness
345 + input={{ ...input, automaticEnvironment: false, draftThread: store.getDraftSession(draftId) }}
346 + />,
347 + );
348 + await screen.getByRole("button", { name: `Switch to ${b}` }).click();
349 + await expect.element(screen.getByText(b)).toBeInTheDocument();
350 + const draft = store.getComposerDraft(draftId);
351 + expect(draft?.activeProvider).toBe(codex);
352 + expect(draft?.modelSelectionByProvider[codex]?.model).toBe(model);
353 + expect(draft?.modelSelectionExplicit === true).toBe(explicit);
354 +});
apps/web/src/components/chat/useDraftEnvironmentRouting.ts
+2
@@ -35,6 +35,7 @@ import { useAtomCommand } from "../../state/use-atom-command";
35 import type { DraftSessionState } from "../../composerDraftStore";
36 import { loadBalancingSendWarning } from "./composerSend.logic";
37 import { appAtomRegistry } from "../../rpc/atomRegistry";
38 +import { seedDraftModelSelection } from "../../lib/seedDraftModelSelection";
39 import { draftFanoutSelectionsAtom } from "./chatViewSend";
40
41 interface DraftEnvironmentRoutingInput {
@@ -337,6 +338,7 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
338 loadBalancedEnvironmentId: null,
339 });
340 }
341 + seedDraftModelSelection(draftId, projectRef);
342 };
343 const finish = () => {
344 if (environmentChangeRef.current === request) environmentChangeRef.current = null;
apps/web/src/lib/seedDraftModelSelection.ts new
+37
@@ -0,0 +1,37 @@
1 +import type { ScopedProjectRef } from "@t3tools/contracts";
2 +import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
3 +import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
4 +
5 +import { type DraftId, useComposerDraftStore } from "../composerDraftStore";
6 +import { resolveProjectDefaultProviderModelSelection } from "../providerInstances";
7 +import { readProject } from "../state/entities";
8 +import { readEnvironment, readEnvironmentProviders } from "../state/environments";
9 +import { hasExplicitComposerModelSelection } from "./chatThreadActions";
10 +
11 +/** Gives a draft that moved project or machine the model a new thread there would start with. */
12 +export function seedDraftModelSelection(draftId: DraftId, projectRef: ScopedProjectRef): void {
13 + const store = useComposerDraftStore.getState();
14 + if (hasExplicitComposerModelSelection(store.getComposerDraft(draftId))) return;
15 + store.applyStickyState(draftId);
16 + const project = readProject(projectRef);
17 + const settings = readEnvironment(projectRef.environmentId)?.serverConfig?.settings;
18 + const providers = readEnvironmentProviders(projectRef.environmentId) ?? [];
19 + const defaultSelection = settings
20 + ? resolveProjectSettings(settings, projectRef.projectId, project ?? undefined).settings
21 + .defaultModelSelection
22 + : (project?.defaultModelSelection ?? null);
23 + const resolution = resolveNewThreadModelSelection({
24 + defaultSelection:
25 + defaultSelection ??
26 + (useComposerDraftStore.getState().stickyActiveProvider !== null || !settings
27 + ? null
28 + : resolveProjectDefaultProviderModelSelection(providers, settings, projectRef.projectId)),
29 + fallbackSelection: settings?.fallbackModelSelection ?? null,
30 + providers,
31 + ...(settings ? { settings } : {}),
32 + projectId: projectRef.projectId,
33 + now: Date.now(),
34 + });
35 + const selection = resolution.fallback ? resolution.selection : defaultSelection;
36 + if (selection) store.setModelSelection(draftId, selection, { replaceOptions: true });
37 +}
apps/web/src/state/environments.ts
+6
@@ -61,6 +61,12 @@ export function useEnvironmentProviders() {
61 return useAtomValue(environmentPresentations.providersByEnvironmentAtom);
62 }
63
64 +export function readEnvironmentProviders(environmentId: EnvironmentId) {
65 + return appAtomRegistry
66 + .get(environmentPresentations.providersByEnvironmentAtom)
67 + .get(environmentId);
68 +}
69 +
70 export function usePrimaryEnvironmentId(): EnvironmentId | null {
71 return useAtomValue(primaryEnvironmentIdAtom);
72 }