Commit e259dd23c7ef67a7f215389762a1ef5622c79088 | the-knife

apps/mobile/src/features/threads/NewTaskDraftScreen.tsx+18-4

 @@ -42,7 +42,8 @@ import {
   restoreComposerDraftSnapshot,
   type ComposerDraft,
 } from "../../state/use-composer-drafts";
-import { useProjects } from "../../state/entities";
+import { useEnvironmentServerConfig, useProjects } from "../../state/entities";
+import { resolveSelectableModelSelection } from "../../lib/modelOptions";
 import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
 import { armAgentAwarenessLiveActivityForLocalWork } from "../agent-awareness/remoteRegistration";
 import { enqueueThreadOutboxMessage, removeThreadOutboxMessage } from "../../state/thread-outbox";
 @@ -90,6 +91,9 @@ export function NewTaskDraftScreen(props: {
   const controlsBottomPadding = isKeyboardVisible ? 8 : Math.max(insets.bottom, 10);
   const { logicalProjects, selectedProject, setProject } = flow;
   const { connectedEnvironments } = useRemoteConnectionStatus();
+  const selectedEnvironmentServerConfig = useEnvironmentServerConfig(
+    selectedProject?.environmentId ?? null,
+  );
   const environmentConnected =
     selectedProject !== null &&
     connectedEnvironments.find(
 @@ -795,7 +799,14 @@ export function NewTaskDraftScreen(props: {
       return;
     }
     const draft = getComposerDraftSnapshot(draftKey);
-    const modelSelection = draft.modelSelection ?? flow.selectedModel;
+    // Snapshot read keeps just-typed selector state; the availability gate
+    // still applies so a stored selection on a disabled provider falls back
+    // to the flow's resolved model.
+    const modelSelection =
+      resolveSelectableModelSelection(
+        selectedEnvironmentServerConfig,
+        draft.modelSelection ?? null,
+      ) ?? flow.selectedModel;
     const workspaceMode = draft.workspaceSelection?.mode ?? flow.workspaceMode;
     const selectedBranchName = draft.workspaceSelection?.branch ?? flow.selectedBranchName;
     const selectedWorktreePath =
 @@ -847,7 +858,10 @@ export function NewTaskDraftScreen(props: {
       if (editingPendingTask) {
         flow.finishEditingPendingTask();
       } else {
-        clearComposerDraftContent(draftKey);
+        // Drop the workspace selection with the content: the next task should
+        // re-resolve mode/branch/origin from the server's configured defaults
+        // instead of resurrecting this task's picks.
+        clearComposerDraftContent(draftKey, { clearWorkspaceSelection: true });
       }
       navigation.getParent()?.goBack();
       return;
 @@ -905,7 +919,7 @@ export function NewTaskDraftScreen(props: {
       }
       flow.finishEditingPendingTask();
     } else {
-      clearComposerDraftContent(draftKey);
+      clearComposerDraftContent(draftKey, { clearWorkspaceSelection: true });
     }
     navigation.dispatch(
       StackActions.replace("Thread", {

apps/mobile/src/features/threads/new-task-flow-provider.tsx+37-12

 @@ -22,7 +22,11 @@ import { useEnvironmentServerConfig, useProjects, useThreadShells } from "../../
 import type { TurnCommandMetadata } from "../../lib/commandMetadata";
 import type { DraftComposerImageAttachment } from "../../lib/composerImages";
 import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
-import { buildModelOptions, groupByProvider } from "../../lib/modelOptions";
+import {
+  buildModelOptions,
+  groupByProvider,
+  resolveSelectableModelSelection,
+} from "../../lib/modelOptions";
 import { groupProjectsByRepository } from "../../lib/repositoryGroups";
 import { scopedProjectKey } from "../../lib/scopedEntities";
 import { appAtomRegistry } from "../../state/atom-registry";
 @@ -347,7 +351,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
   const selectedProjectDraft = useComposerDraft(selectedProjectDraftKey);
   const prompt = selectedProjectDraft.text;
   const attachments = selectedProjectDraft.attachments;
-  const workspaceMode = selectedProjectDraft.workspaceSelection?.mode ?? "local";
+  // The server's configured default decides the mode until the user picks one
+  // explicitly — same resolution web uses for new draft threads.
+  const defaultWorkspaceMode: WorkspaceMode =
+    selectedEnvironmentServerConfig?.settings.defaultThreadEnvMode ?? "local";
+  const workspaceMode = selectedProjectDraft.workspaceSelection?.mode ?? defaultWorkspaceMode;
   const selectedBranchName = selectedProjectDraft.workspaceSelection?.branch ?? null;
   const selectedWorktreePath = selectedProjectDraft.workspaceSelection?.worktreePath ?? null;
   // Keep the user's explicit choice separate from the resolved display value:
 @@ -361,22 +369,29 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
   const runtimeMode = selectedProjectDraft.runtimeMode ?? DEFAULT_RUNTIME_MODE;
   const interactionMode = selectedProjectDraft.interactionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE;
+  // Stored selections (draft and project default) only count while their
+  // provider is usable on the server; otherwise the server's default model
+  // wins instead of silently targeting a disabled provider.
+  const draftModelSelection = resolveSelectableModelSelection(
+    selectedEnvironmentServerConfig,
+    selectedProjectDraft.modelSelection ?? null,
+  );
+  const projectDefaultModelSelection = resolveSelectableModelSelection(
+    selectedEnvironmentServerConfig,
+    selectedProject?.defaultModelSelection ?? null,
+  );
   const modelOptions = useMemo(
     () =>
       buildModelOptions(
         selectedEnvironmentServerConfig,
-        selectedProjectDraft.modelSelection ?? selectedProject?.defaultModelSelection ?? null,
+        draftModelSelection ?? projectDefaultModelSelection,
       ),
-    [
+    [selectedEnvironmentServerConfig, draftModelSelection, projectDefaultModelSelection],
-      selectedEnvironmentServerConfig,
-      selectedProject?.defaultModelSelection,
-      selectedProjectDraft.modelSelection,
-    ],
   );
   const selectedModel =
-    selectedProjectDraft.modelSelection ??
+    draftModelSelection ??
-    selectedProject?.defaultModelSelection ??
+    projectDefaultModelSelection ??
     modelOptions.find((option) => option.isDefault)?.selection ??
     modelOptions[0]?.selection ??
     null;
 @@ -675,12 +690,20 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
       }
       const draft = getComposerDraftSnapshot(selectedProjectDraftKey);
       const text = draft.text.trim();
-      const draftModelSelection = draft.modelSelection ?? selectedModel;
+      // Same availability gate the composer display applies: a stored
+      // selection targeting a disabled provider must not ride into the queue.
+      const draftModelSelection =
+        resolveSelectableModelSelection(
+          selectedEnvironmentServerConfig,
+          draft.modelSelection ?? null,
+        ) ?? selectedModel;
       if (text.length === 0 || !draftModelSelection) {
         return null;
       }
       const workspaceSelection = draft.workspaceSelection;
-      const mode = workspaceSelection?.mode ?? "local";
+      // Fall back to the resolved mode (server default) so queued tasks drain
+      // with the same mode the composer displayed.
+      const mode = workspaceSelection?.mode ?? workspaceMode;
       // When the selection is the stand-in built from the queued snapshot,
       // persist the original (possibly absent) snapshot values — the
       // stand-in's placeholder title/workspaceRoot must never be written back
 @@ -722,10 +745,12 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
     [
       editingPendingProject,
       editingPendingTask,
+      selectedEnvironmentServerConfig,
       selectedModel,
       selectedProject,
       selectedProjectDraftKey,
       startFromOrigin,
+      workspaceMode,
     ],
   );

apps/mobile/src/lib/modelOptions.test.ts+43-1

...	@@ -2,7 +2,7 @@ import { describe, expect, it } from "vite-plus/test";	...	@@ -2,7 +2,7 @@ import { describe, expect, it } from "vite-plus/test";
2		2
3	import { ProviderInstanceId, type ServerConfig } from "@t3tools/contracts";	3	import { ProviderInstanceId, type ServerConfig } from "@t3tools/contracts";
4		4
5	import { buildModelOptions } from "./modelOptions";	5	import { buildModelOptions, resolveSelectableModelSelection } from "./modelOptions";
6		6
7	describe("mobile model options", () => {	7	describe("mobile model options", () => {
8	it("normalizes a legacy fallback selection against current capabilities", () => {	8	it("normalizes a legacy fallback selection against current capabilities", () => {
...	@@ -49,4 +49,46 @@ describe("mobile model options", () => {	...	@@ -49,4 +49,46 @@ describe("mobile model options", () => {
49	expect(option?.capabilities?.optionDescriptors?.[0]?.id).toBe("serviceTier");	49	expect(option?.capabilities?.optionDescriptors?.[0]?.id).toBe("serviceTier");
50	expect(option?.selection.options).toEqual([{ id: "serviceTier", value: "default" }]);	50	expect(option?.selection.options).toEqual([{ id: "serviceTier", value: "default" }]);
51	});	51	});
		52
		53	it("rejects stored selections whose provider is not usable", () => {
		54	const config = {
		55	providers: [
		56	{
		57	instanceId: "codex",
		58	driver: "codex",
		59	enabled: true,
		60	installed: true,
		61	auth: { status: "authenticated" },
		62	models: [],
		63	},
		64	{
		65	instanceId: "claudeAgent",
		66	driver: "claudeAgent",
		67	enabled: false,
		68	installed: true,
		69	auth: { status: "authenticated" },
		70	models: [],
		71	},
		72	],
		73	} as unknown as ServerConfig;
		74
		75	const usable = {
		76	instanceId: ProviderInstanceId.make("codex"),
		77	model: "gpt-5.6-sol",
		78	};
		79	const disabled = {
		80	instanceId: ProviderInstanceId.make("claudeAgent"),
		81	model: "claude-sonnet-5",
		82	};
		83	const removed = {
		84	instanceId: ProviderInstanceId.make("codex_personal"),
		85	model: "gpt-5.6-sol",
		86	};
		87
		88	expect(resolveSelectableModelSelection(config, usable)).toBe(usable);
		89	expect(resolveSelectableModelSelection(config, disabled)).toBeNull();
		90	expect(resolveSelectableModelSelection(config, removed)).toBeNull();
		91	// No config (environment offline) — nothing to validate against.
		92	expect(resolveSelectableModelSelection(null, disabled)).toBe(disabled);
		93	});
52	});	94	});

apps/mobile/src/lib/modelOptions.ts+25

...	@@ -58,6 +58,31 @@ function normalizeSelectionOptions(	...	@@ -58,6 +58,31 @@ function normalizeSelectionOptions(
58	};	58	};
59	}	59	}
60		60
		61	/**
		62	* A stored model selection is only usable when its provider instance is
		63	* currently enabled, installed, and authenticated on the server. Returns the
		64	* selection unchanged when usable, otherwise `null` so callers fall through to
		65	* the server's default model. A missing config (environment offline) cannot be
		66	* validated, so stored selections pass through untouched.
		67	*/
		68	export function resolveSelectableModelSelection(
		69	config: T3ServerConfig \| null \| undefined,
		70	selection: ModelSelection \| null,
		71	): ModelSelection \| null {
		72	if (!selection \|\| !config) {
		73	return selection;
		74	}
		75	const provider = config.providers.find(
		76	(candidate) => candidate.instanceId === selection.instanceId,
		77	);
		78	return provider &&
		79	provider.enabled &&
		80	provider.installed &&
		81	provider.auth.status !== "unauthenticated"
		82	? selection
		83	: null;
		84	}
		85
61	export function buildModelOptions(	86	export function buildModelOptions(
62	config: T3ServerConfig \| null \| undefined,	87	config: T3ServerConfig \| null \| undefined,
63	fallbackModelSelection: ModelSelection \| null,	88	fallbackModelSelection: ModelSelection \| null,

apps/mobile/src/state/use-composer-drafts.test.ts+30

...	@@ -119,6 +119,36 @@ describe("mobile composer drafts", () => {	...	@@ -119,6 +119,36 @@ describe("mobile composer drafts", () => {
119	});	119	});
120	});	120	});
121		121
		122	it("drops the workspace selection when clearing a sent new-task draft", () => {
		123	const draftKey = "new-task:environment-1:project-1";
		124	const draft: ComposerDraft = {
		125	text: "send this",
		126	attachments: [],
		127	modelSelection: {
		128	instanceId: ProviderInstanceId.make("codex"),
		129	model: "gpt-5.4",
		130	},
		131	workspaceSelection: {
		132	mode: "worktree",
		133	branch: "main",
		134	worktreePath: null,
		135	startFromOrigin: false,
		136	},
		137	};
		138
		139	expect(
		140	clearComposerDraftContentState({ [draftKey]: draft }, draftKey, {
		141	clearWorkspaceSelection: true,
		142	}),
		143	).toEqual({
		144	[draftKey]: {
		145	modelSelection: draft.modelSelection,
		146	text: "",
		147	attachments: [],
		148	},
		149	});
		150	});
		151
122	it("reads the latest selector state synchronously for send", () => {	152	it("reads the latest selector state synchronously for send", () => {
123	const draftKey = "environment-1:thread-1";	153	const draftKey = "environment-1:thread-1";
124	const selectedDraft: ComposerDraft = {	154	const selectedDraft: ComposerDraft = {

apps/mobile/src/state/use-composer-drafts.ts+10-3

 @@ -372,14 +372,18 @@ export function updateComposerDraftSettings(
 export function clearComposerDraftContentState(
   current: Record<string, ComposerDraft>,
   draftKey: string,
+  options?: { readonly clearWorkspaceSelection?: boolean },
 ): Record<string, ComposerDraft> {
   const existing = current[draftKey];
   if (!existing) {
     return current;
   }
-  const { importedShareIds: _importedShareIds, ...retained } = existing;
+  const { importedShareIds: _importedShareIds, workspaceSelection, ...retained } = existing;
   const draft = {
     ...retained,
+    ...(options?.clearWorkspaceSelection || workspaceSelection === undefined
+      ? {}
+      : { workspaceSelection }),
     text: "",
     attachments: [],
   };
 @@ -526,8 +530,11 @@ export async function restoreComposerDraftSnapshot(
   await persistenceQueue.run(() => writePersistedComposerDrafts(next));
 }
-export function clearComposerDraftContent(draftKey: string): void {
+export function clearComposerDraftContent(
-  updateComposerDrafts((current) => clearComposerDraftContentState(current, draftKey));
+  draftKey: string,
+  options?: { readonly clearWorkspaceSelection?: boolean },
+): void {
+  updateComposerDrafts((current) => clearComposerDraftContentState(current, draftKey, options));
 }
 export function clearComposerDraft(draftKey: string): void {

author	Theo Browne <me@t3.gg> 2026-07-30 21:21:39-07:00
committer	GitHub <noreply@github.com> 2026-07-30 21:21:39-07:00
log	e259dd23c7ef67a7f215389762a1ef5622c79088
tree	4bcae525c9094cae664e8fce2189d872653ae1c1
parent	df78cda8bf9c0971300e1bf35251774d9fbc833a
signature	Signed by PGP key B5690EEEBB952194

fix(mobile): server model, worktree, and origin preferences now apply to new tasks (#5064)