Commit 0150c6a53b409ba3bcb45645709b649cf8708354 | the-knife

apps/server/src/environment/ServerEnvironment.test.ts+1

...	@@ -170,6 +170,7 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {	...	@@ -170,6 +170,7 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
170	expect(second.capabilities.attachmentUploads).toBe(true);	170	expect(second.capabilities.attachmentUploads).toBe(true);
171	expect(second.capabilities.fileAttachments).toEqual({ maxUploadBytes: 50 * 1024 * 1024 });	171	expect(second.capabilities.fileAttachments).toEqual({ maxUploadBytes: 50 * 1024 * 1024 });
172	expect(second.capabilities.pullRequests).toBe(true);	172	expect(second.capabilities.pullRequests).toBe(true);
		173	expect(second.capabilities.requiredWorktreeBootstrap).toBe(true);
173	expect(second.capabilities.usagePriceOverrides).toBe(true);	174	expect(second.capabilities.usagePriceOverrides).toBe(true);
174	expect(second.capabilities.threadActiveReorder).toBe(true);	175	expect(second.capabilities.threadActiveReorder).toBe(true);
175	expect(second.capabilities.threadTitleRegeneration).toBe(true);	176	expect(second.capabilities.threadTitleRegeneration).toBe(true);

apps/server/src/environment/ServerEnvironment.ts+1

...	@@ -222,6 +222,7 @@ export const make = Effect.gen(function* () {	...	@@ -222,6 +222,7 @@ export const make = Effect.gen(function* () {
222	fileAttachments: { maxUploadBytes: PROVIDER_SEND_TURN_MAX_FILE_BYTES },	222	fileAttachments: { maxUploadBytes: PROVIDER_SEND_TURN_MAX_FILE_BYTES },
223	pullRequests: true,	223	pullRequests: true,
224	inlineMessageContext: true,	224	inlineMessageContext: true,
		225	requiredWorktreeBootstrap: true,
225	threadSettlement: true,	226	threadSettlement: true,
226	threadAutoSettlement: true,	227	threadAutoSettlement: true,
227	storageCleanup: true,	228	storageCleanup: true,

apps/server/src/server.test.ts+96

...	@@ -11184,6 +11184,102 @@ it.layer(NodeServices.layer)("server router seam", (it) => {	...	@@ -11184,6 +11184,102 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
11184	}).pipe(Effect.provide(NodeHttpServer.layerTest)),	11184	}).pipe(Effect.provide(NodeHttpServer.layerTest)),
11185	);	11185	);
11186		11186
		11187	it.effect.each([
		11188	{ caseName: "a non-repository", isRepository: false, failFetch: false },
		11189	{ caseName: "a base without a commit", isRepository: true, failFetch: false },
		11190	{ caseName: "a fetch failure", isRepository: true, failFetch: true },
		11191	])(
		11192	"rejects required worktree bootstrap before creating a thread for $caseName",
		11193	({ isRepository, failFetch }) =>
		11194	Effect.gen(function* () {
		11195	const dispatchedCommands: Array<OrchestrationCommand> = [];
		11196	const createWorktree = vi.fn(
		11197	(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
		11198	Effect.die(new Error("createWorktree must not run before a valid base is found")),
		11199	);
		11200
		11201	yield* buildAppUnderTest({
		11202	layers: {
		11203	vcsDriver: {
		11204	isInsideWorkTree: () => Effect.succeed(isRepository),
		11205	},
		11206	gitVcsDriver: {
		11207	execute: () =>
		11208	Effect.succeed({
		11209	...SUCCESSFUL_GIT_EXECUTION,
		11210	exitCode: ChildProcessSpawner.ExitCode(128),
		11211	stderr: "fatal: Needed a single revision",
		11212	}),
		11213	remoteExists: () => Effect.succeed(true),
		11214	fetchRemote: () => Effect.die(new Error("fetch failed before thread creation")),
		11215	createWorktree,
		11216	},
		11217	orchestrationEngine: {
		11218	dispatch: (command) =>
		11219	Effect.sync(() => {
		11220	dispatchedCommands.push(command);
		11221	return { sequence: dispatchedCommands.length };
		11222	}),
		11223	readEvents: () => Stream.empty,
		11224	},
		11225	},
		11226	});
		11227
		11228	const createdAt = "2026-01-01T00:00:00.000Z";
		11229	const wsUrl = yield* getWsServerUrl("/ws");
		11230	const result = yield* Effect.scoped(
		11231	withWsRpcClient(wsUrl, (client) =>
		11232	client[ORCHESTRATION_WS_METHODS.dispatchCommand]({
		11233	type: "thread.turn.start",
		11234	commandId: CommandId.make("cmd-required-worktree"),
		11235	threadId: ThreadId.make("thread-required-worktree"),
		11236	message: {
		11237	messageId: MessageId.make("msg-required-worktree"),
		11238	role: "user",
		11239	text: "hello",
		11240	attachments: [],
		11241	},
		11242	modelSelection: defaultModelSelection,
		11243	runtimeMode: "full-access",
		11244	interactionMode: "default",
		11245	bootstrap: {
		11246	createThread: {
		11247	projectId: defaultProjectId,
		11248	title: "Bootstrap Thread",
		11249	modelSelection: defaultModelSelection,
		11250	runtimeMode: "full-access",
		11251	interactionMode: "default",
		11252	branch: "main",
		11253	worktreePath: null,
		11254	createdAt,
		11255	},
		11256	prepareWorktree: {
		11257	projectCwd: "/tmp/project",
		11258	baseBranch: "main",
		11259	requireWorktree: true,
		11260	startFromOrigin: failFetch,
		11261	},
		11262	},
		11263	createdAt,
		11264	}),
		11265	).pipe(Effect.result),
		11266	);
		11267
		11268	assertTrue(result._tag === "Failure");
		11269	assertTrue(result.failure._tag === "OrchestrationDispatchCommandError");
		11270	assert.strictEqual(result.failure.bootstrapThreadDisposition, "not-created");
		11271	assert.include(
		11272	result.failure.message,
		11273	failFetch ? "fetch failed" : "separate worktree requires",
		11274	);
		11275	assert.equal(createWorktree.mock.calls.length, 0);
		11276	assert.deepEqual(
		11277	dispatchedCommands.map((command) => command.type),
		11278	["thread.activity.append"],
		11279	);
		11280	}).pipe(Effect.provide(NodeHttpServer.layerTest)),
		11281	);
		11282
11187	it.effect("falls back to the project checkout when worktree mode targets a non-repository", () =>	11283	it.effect("falls back to the project checkout when worktree mode targets a non-repository", () =>
11188	Effect.gen(function* () {	11284	Effect.gen(function* () {
11189	const dispatchedCommands: Array<OrchestrationCommand> = [];	11285	const dispatchedCommands: Array<OrchestrationCommand> = [];

apps/server/src/ws.ts+12-3

 @@ -1369,6 +1369,12 @@ const makeWsRpcLayer = (
             }
             if (prepareWorktree && !shouldPrepareWorktree) {
+              if (prepareWorktree.requireWorktree) {
+                return yield* new OrchestrationDispatchCommandError({
+                  message:
+                    "A separate worktree requires a Git repository and a base branch with a commit.",
+                });
+              }
               // Not a git repo, or the base has no commit: the thread runs in
               // the project checkout instead. The card says so and moves on.
               yield* track(
 @@ -1401,8 +1407,8 @@ const makeWsRpcLayer = (
               // every delete for the prior incarnation committed before it.
               // Drain through that event before setup or turn start can own
               // terminals and provider sessions under the reused thread id.
-              yield* threadDeletionReactor.drainThrough(created.sequence);
               createdThread = true;
+              yield* threadDeletionReactor.drainThrough(created.sequence);
               // Persist the send now rather than with the turn: the thread is
               // real from here on, so any client (or a reload) sees the message
               // while the worktree is still being prepared. The turn start
 @@ -1606,13 +1612,16 @@ const makeWsRpcLayer = (
                   ),
                 onSuccess: (threadDeleted) =>
                   Effect.fail(
-                    threadDeleted
+                    threadDeleted ||
+                      (bootstrap?.createThread &&
+                        bootstrap.prepareWorktree?.requireWorktree === true &&
+                        !createdThread)
                       ? new OrchestrationDispatchCommandError({
                           message: dispatchError.message,
                           ...(dispatchError.cause !== undefined
                             ? { cause: dispatchError.cause }
                             : {}),
-                          bootstrapThreadDisposition: "deleted",
+                          bootstrapThreadDisposition: threadDeleted ? "deleted" : "not-created",
                         })
                       : dispatchError,
                   ),

apps/web/src/components/BranchToolbar.tsx+26-10

 @@ -66,6 +66,7 @@ export interface BranchToolbarHandle {
 }
 interface BranchToolbarProps {
+  forceNewWorktree?: boolean;
   ref?: Ref<BranchToolbarHandle>;
   environmentId: EnvironmentId;
   threadId: ThreadId;
 @@ -89,6 +90,7 @@ interface BranchToolbarProps {
 }
 interface MobileRunContextSelectorProps {
+  forceNewWorktree: boolean;
   autoEnvironmentLabel?: string | undefined;
   onAutoEnvironment?: (() => void) | undefined;
   envLocked: boolean;
 @@ -106,6 +108,7 @@ interface MobileRunContextSelectorProps {
 }
 const MobileRunContextSelector = memo(function MobileRunContextSelector({
+  forceNewWorktree,
   autoEnvironmentLabel,
   onAutoEnvironment,
   envLocked,
 @@ -132,11 +135,13 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
       : activeWorktreePath
         ? FolderGitIcon
         : FolderIcon;
-  const workspaceLabel = envModeLocked
+  const workspaceLabel = forceNewWorktree
-    ? resolveLockedWorkspaceLabel(activeWorktreePath)
+    ? resolveEnvModeLabel("worktree")
-    : effectiveEnvMode === "worktree"
+    : envModeLocked
-      ? resolveEnvModeLabel("worktree")
+      ? resolveLockedWorkspaceLabel(activeWorktreePath)
-      : resolveCurrentWorkspaceLabel(activeWorktreePath);
+      : effectiveEnvMode === "worktree"
+        ? resolveEnvModeLabel("worktree")
+        : resolveCurrentWorkspaceLabel(activeWorktreePath);
   const isLocked = envLocked || envModeLocked;
   const workspaceIcon = (
     <Tooltip>
 @@ -269,7 +274,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
               onEnvModeChange(value as EnvMode);
             }}
           >
-            <MenuRadioItem disabled={envModeLocked} value="local">
+            <MenuRadioItem disabled={envModeLocked || forceNewWorktree} value="local">
               <span className="flex min-w-0 items-center gap-1.5">
                 {activeWorktreePath ? (
                   <FolderGitIcon className="size-3" />
 @@ -476,6 +481,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
 }
 export const BranchToolbar = memo(function BranchToolbar({
+  forceNewWorktree = false,
   ref,
   environmentId,
   threadId,
 @@ -514,9 +520,11 @@ export const BranchToolbar = memo(function BranchToolbar({
       : null;
   const activeProject = useProject(activeProjectRef);
   const hasActiveThread = serverThread !== null || draftThread !== null;
-  const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
+  const activeWorktreePath = forceNewWorktree
+    ? null
+    : (serverThread?.worktreePath ?? draftThread?.worktreePath ?? null);
   const effectiveEnvMode =
-    effectiveEnvModeOverride ??
+    (forceNewWorktree ? "worktree" : effectiveEnvModeOverride) ??
     resolveEffectiveEnvMode({
       activeWorktreePath,
       hasServerThread: serverThread !== null,
 @@ -527,7 +535,8 @@ export const BranchToolbar = memo(function BranchToolbar({
   // "Previous worktree" hops a draft into the most recently active worktree
   // of this project — the "keep going where I just was" follow-up flow. Only
   // drafts can hop; started server threads have their workspace pinned.
-  const canUsePreviousWorktree = draftThread !== null && serverThread === null && !envModeLocked;
+  const canUsePreviousWorktree =
+    draftThread !== null && serverThread === null && !envModeLocked && !forceNewWorktree;
   const projectRefsForWorktreeLookup = useMemo(
     () => (canUsePreviousWorktree && activeProjectRef ? [activeProjectRef] : []),
     [canUsePreviousWorktree, activeProjectRef],
 @@ -606,6 +615,7 @@ export const BranchToolbar = memo(function BranchToolbar({
       {showGitControls ? (
         <div className="contents @3xl/composer-surface:hidden">
           <MobileRunContextSelector
+            forceNewWorktree={forceNewWorktree}
             autoEnvironmentLabel={autoEnvironmentLabel}
             onAutoEnvironment={onAutoEnvironment}
             envLocked={envLocked}
 @@ -652,6 +662,7 @@ export const BranchToolbar = memo(function BranchToolbar({
           )}
           {showGitControls ? (
             <BranchToolbarEnvModeSelector
+              forceNewWorktree={forceNewWorktree}
               envLocked={envModeLocked}
               effectiveEnvMode={effectiveEnvMode}
               activeWorktreePath={activeWorktreePath}
 @@ -677,13 +688,18 @@ export const BranchToolbar = memo(function BranchToolbar({
       {showGitControls ? (
         <BranchToolbarBranchSelector
+          forceNewWorktree={forceNewWorktree}
           ref={branchSelectorRef}
           className="min-w-0 flex-initial justify-end @3xl/composer-surface:ml-auto"
           environmentId={environmentId}
           threadId={threadId}
           {...(draftId ? { draftId } : {})}
           envLocked={envLocked}
-          {...(effectiveEnvModeOverride ? { effectiveEnvModeOverride } : {})}
+          {...(forceNewWorktree
+            ? { effectiveEnvModeOverride: "worktree" }
+            : effectiveEnvModeOverride
+              ? { effectiveEnvModeOverride }
+              : {})}
           {...(activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : {})}
           {...(onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : {})}
           startFromOrigin={startFromOrigin}

apps/web/src/components/BranchToolbarBranchSelector.tsx+5-1

...	@@ -79,6 +79,7 @@ export interface BranchToolbarBranchSelectorHandle {	...	@@ -79,6 +79,7 @@ export interface BranchToolbarBranchSelectorHandle {
79	}	79	}
80		80
81	interface BranchToolbarBranchSelectorProps {	81	interface BranchToolbarBranchSelectorProps {
		82	forceNewWorktree?: boolean;
82	ref?: Ref<BranchToolbarBranchSelectorHandle>;	83	ref?: Ref<BranchToolbarBranchSelectorHandle>;
83	className?: string;	84	className?: string;
84	environmentId: EnvironmentId;	85	environmentId: EnvironmentId;
...	@@ -99,6 +100,7 @@ function toBranchActionErrorMessage(error: unknown): string {	...	@@ -99,6 +100,7 @@ function toBranchActionErrorMessage(error: unknown): string {
99	}	100	}
100		101
101	export function BranchToolbarBranchSelector({	102	export function BranchToolbarBranchSelector({
		103	forceNewWorktree = false,
102	ref,	104	ref,
103	className,	105	className,
104	environmentId,	106	environmentId,
...	@@ -152,7 +154,9 @@ export function BranchToolbarBranchSelector({	...	@@ -152,7 +154,9 @@ export function BranchToolbarBranchSelector({
152	activeThreadBranchOverride !== undefined	154	activeThreadBranchOverride !== undefined
153	? activeThreadBranchOverride	155	? activeThreadBranchOverride
154	: (serverThread?.branch ?? draftThread?.branch ?? null);	156	: (serverThread?.branch ?? draftThread?.branch ?? null);
155	const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;	157	const activeWorktreePath = forceNewWorktree
		158	? null
		159	: (serverThread?.worktreePath ?? draftThread?.worktreePath ?? null);
156	const activeProjectCwd = activeProject?.workspaceRoot ?? null;	160	const activeProjectCwd = activeProject?.workspaceRoot ?? null;
157	const branchCwd = activeWorktreePath ?? activeProjectCwd;	161	const branchCwd = activeWorktreePath ?? activeProjectCwd;
158	const hasServerThread = serverThread !== null;	162	const hasServerThread = serverThread !== null;

apps/web/src/components/BranchToolbarEnvModeSelector.tsx+14-4

 @@ -22,6 +22,7 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
 const PREVIOUS_WORKTREE_SELECT_VALUE = "previous-worktree";
 interface BranchToolbarEnvModeSelectorProps {
+  forceNewWorktree?: boolean;
   envLocked: boolean;
   effectiveEnvMode: EnvMode;
   activeWorktreePath: string | null;
 @@ -31,6 +32,7 @@ interface BranchToolbarEnvModeSelectorProps {
 }
 export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
+  forceNewWorktree = false,
   envLocked,
   effectiveEnvMode,
   activeWorktreePath,
 @@ -51,7 +53,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
     [activeWorktreePath, previousWorktreeLabel, showPreviousWorktree],
   );
-  if (envLocked) {
+  if (envLocked || forceNewWorktree) {
     return (
       <Tooltip>
         <TooltipTrigger
 @@ -59,7 +61,9 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
           className="inline-flex h-7 min-w-0 items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
           data-composer-context-control
         >
-          {activeWorktreePath ? (
+          {forceNewWorktree ? (
+            <FolderGit2Icon className="size-3 shrink-0" />
+          ) : activeWorktreePath ? (
             <FolderGitIcon className="size-3 shrink-0" />
           ) : (
             <FolderIcon className="size-3 shrink-0" />
 @@ -72,11 +76,17 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
               data-composer-label-motion
               className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
             >
-              {resolveLockedWorkspaceLabel(activeWorktreePath)}
+              {forceNewWorktree
+                ? resolveEnvModeLabel("worktree")
+                : resolveLockedWorkspaceLabel(activeWorktreePath)}
             </span>
           </span>
         </TooltipTrigger>
-        <TooltipPopup>{resolveLockedWorkspaceLabel(activeWorktreePath)}</TooltipPopup>
+        <TooltipPopup>
+          {forceNewWorktree
+            ? "Each model starts in its own worktree."
+            : resolveLockedWorkspaceLabel(activeWorktreePath)}
+        </TooltipPopup>
       </Tooltip>
     );
   }

apps/web/src/components/ChatView.tsx+389-12

...	@@ -46,7 +46,10 @@ import {	...	@@ -46,7 +46,10 @@ import {
46	type WorktreeSetupSnapshot,	46	type WorktreeSetupSnapshot,
47	} from "@t3tools/contracts";	47	} from "@t3tools/contracts";
48	import { type EnvironmentConnectionPresentation } from "@t3tools/client-runtime/connection";	48	import { type EnvironmentConnectionPresentation } from "@t3tools/client-runtime/connection";
49	import { wasBootstrapThreadDeleted } from "@t3tools/client-runtime/errors";	49	import {
		50	wasBootstrapThreadDeleted,
		51	wasBootstrapThreadNotCreated,
		52	} from "@t3tools/client-runtime/errors";
50	import { readPastedComposerContext } from "./composerInlineTokenPaste";	53	import { readPastedComposerContext } from "./composerInlineTokenPaste";
51	import { isPasteAsTextShortcut } from "@t3tools/client-runtime/text-paste";	54	import { isPasteAsTextShortcut } from "@t3tools/client-runtime/text-paste";
52	import { type CodexArtifactTemplate } from "@t3tools/client-runtime/codex-artifact-templates";	55	import { type CodexArtifactTemplate } from "@t3tools/client-runtime/codex-artifact-templates";
...	@@ -82,9 +85,11 @@ import {	...	@@ -82,9 +85,11 @@ import {
82	} from "@t3tools/shared/terminalLabels";	85	} from "@t3tools/shared/terminalLabels";
83	import { Debouncer } from "@tanstack/react-pacer";	86	import { Debouncer } from "@tanstack/react-pacer";
84	import { useAtomValue } from "@effect/atom-react";	87	import { useAtomValue } from "@effect/atom-react";
		88	import { Atom } from "effect/unstable/reactivity";
85	import {	89	import {
86	lazy,	90	lazy,
87	memo,	91	memo,
		92	type SetStateAction,
88	Suspense,	93	Suspense,
89	useCallback,	94	useCallback,
90	useEffect,	95	useEffect,
...	@@ -265,6 +270,10 @@ import { useRemoveClonedProject } from "../hooks/useRemoveClonedProject";	...	@@ -265,6 +270,10 @@ import { useRemoveClonedProject } from "../hooks/useRemoveClonedProject";
265	import { useOpenPanelPullRequestUrl } from "../hooks/useOpenPanelPullRequestUrl";	270	import { useOpenPanelPullRequestUrl } from "../hooks/useOpenPanelPullRequestUrl";
266	import { useThreadActions } from "../hooks/useThreadActions";	271	import { useThreadActions } from "../hooks/useThreadActions";
267	import { resolveAppModelSelectionForInstance } from "../modelSelection";	272	import { resolveAppModelSelectionForInstance } from "../modelSelection";
		273	import {
		274	getComposerPromptInjectionState,
		275	getComposerProviderState,
		276	} from "./chat/composerProviderState";
268	import { confirmTerminalClose, isTerminalCloseConfirmPending } from "../lib/terminalCloseConfirm";	277	import { confirmTerminalClose, isTerminalCloseConfirmPending } from "../lib/terminalCloseConfirm";
269	import { isPreviewFocused } from "../lib/previewFocus";	278	import { isPreviewFocused } from "../lib/previewFocus";
270	import { getTerminalFocusOwner } from "../lib/terminalFocus";	279	import { getTerminalFocusOwner } from "../lib/terminalFocus";
...	@@ -443,6 +452,7 @@ import {	...	@@ -443,6 +452,7 @@ import {
443	resolveBackgroundDraftWorkspaceOptions,	452	resolveBackgroundDraftWorkspaceOptions,
444	resolveComposerInteractionMode,	453	resolveComposerInteractionMode,
445	resolveComposerProviderSelection,	454	resolveComposerProviderSelection,
		455	getAntigravitySendBlockReason,
446	resolveDraftHeroState,	456	resolveDraftHeroState,
447	findRecordedWorktreeSetup,	457	findRecordedWorktreeSetup,
448	resolveVisibleWorktreeSetup,	458	resolveVisibleWorktreeSetup,
...	@@ -698,6 +708,14 @@ function pasteTextToFocusComposer(event: ClipboardEvent): string \| null {	...	@@ -698,6 +708,14 @@ function pasteTextToFocusComposer(event: ClipboardEvent): string \| null {
698	return text.length > 0 ? text : null;	708	return text.length > 0 ? text : null;
699	}	709	}
700		710
		711	const draftFanoutStateAtom = Atom.family((_routeKey: string) =>
		712	Atom.make({
		713	selections: null as ReadonlyArray<ModelSelection> \| null,
		714	sendInFlight: { current: false },
		715	uncertainSubmissions: { current: new Map<string, ThreadId>() },
		716	}).pipe(Atom.keepAlive),
		717	);
		718
701	function formatOutgoingPrompt(params: {	719	function formatOutgoingPrompt(params: {
702	provider: ProviderDriverKind;	720	provider: ProviderDriverKind;
703	model: string \| null;	721	model: string \| null;
...	@@ -1771,7 +1789,23 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -1771,7 +1789,23 @@ export default function ChatView(props: ChatViewProps) {
1771	const [timelineOverflows, setTimelineOverflows] = useState(false);	1789	const [timelineOverflows, setTimelineOverflows] = useState(false);
1772	const attachmentPreviewHandoffByMessageIdRef = useRef<Record<string, string[]>>({});	1790	const attachmentPreviewHandoffByMessageIdRef = useRef<Record<string, string[]>>({});
1773	const attachmentPreviewPromotionInFlightByMessageIdRef = useRef<Record<string, true>>({});	1791	const attachmentPreviewPromotionInFlightByMessageIdRef = useRef<Record<string, true>>({});
1774	const sendInFlightRef = useRef(false);	1792	const fanoutStateAtom = draftFanoutStateAtom(routeThreadKey);
		1793	const fanoutState = useAtomValue(fanoutStateAtom);
		1794	const sendInFlightRef = fanoutState.sendInFlight;
		1795	const composerSendGenerationRef = useRef(0);
		1796	const multipleModelSelections = fanoutState.selections;
		1797	const setMultipleModelSelections = useCallback(
		1798	(selections: SetStateAction<ReadonlyArray<ModelSelection> \| null>) => {
		1799	appAtomRegistry.update(fanoutStateAtom, (current) => ({
		1800	...current,
		1801	selections: typeof selections === "function" ? selections(current.selections) : selections,
		1802	}));
		1803	},
		1804	[fanoutStateAtom],
		1805	);
		1806	const multipleModelSelectionsRef = useRef(multipleModelSelections);
		1807	multipleModelSelectionsRef.current = multipleModelSelections;
		1808	const uncertainMultipleSubmissionsRef = fanoutState.uncertainSubmissions;
1775	const environmentUnavailableSendToastSlotRef = useRef(0);	1809	const environmentUnavailableSendToastSlotRef = useRef(0);
1776	const feedbackUploadsInFlightRef = useRef(new Set<string>());	1810	const feedbackUploadsInFlightRef = useRef(new Set<string>());
1777	const terminalUiOpenByThreadRef = useRef<Record<string, boolean>>({});	1811	const terminalUiOpenByThreadRef = useRef<Record<string, boolean>>({});
...	@@ -7302,6 +7336,31 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7302,6 +7336,31 @@ export default function ChatView(props: ChatViewProps) {
7302	notifyDirectAnnotationAttached();	7336	notifyDirectAnnotationAttached();
7303	return;	7337	return;
7304	}	7338	}
		7339	const multipleModelSelections = queuedMessage ? null : sendCtx.multipleModelSelections;
		7340	if (
		7341	multipleModelSelections !== null &&
		7342	serverConfig?.environment.capabilities.requiredWorktreeBootstrap !== true
		7343	) {
		7344	setThreadError(activeThread.id, "Update this server before starting multiple models.");
		7345	return;
		7346	}
		7347	if (
		7348	multipleModelSelections !== null &&
		7349	(!isLocalDraftThread \|\|
		7350	!isGitRepo \|\|
		7351	!activeThreadBranch \|\|
		7352	multipleModelSelections.length === 0)
		7353	) {
		7354	toastManager.add(
		7355	stackedThreadToast({
		7356	type: "warning",
		7357	title: "Choose models and a base branch",
		7358	description:
		7359	"Multiple models need a new thread in a Git project. Each gets its own worktree.",
		7360	}),
		7361	);
		7362	return;
		7363	}
7305	const {	7364	const {
7306	images: sendContextImages,	7365	images: sendContextImages,
7307	files: composerFiles,	7366	files: composerFiles,
...	@@ -7379,7 +7438,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7379,7 +7438,7 @@ export default function ChatView(props: ChatViewProps) {
7379	composerReviewComments.length === 0	7438	composerReviewComments.length === 0
7380	? parseCodexFeedbackCommand(trimmed)	7439	? parseCodexFeedbackCommand(trimmed)
7381	: null;	7440	: null;
7382	if (feedbackCommand && !queuedMessage) {	7441	if (feedbackCommand && !queuedMessage && multipleModelSelections === null) {
7383	if (!isServerThread \|\| activeThread.session === null) {	7442	if (!isServerThread \|\| activeThread.session === null) {
7384	toastManager.add(	7443	toastManager.add(
7385	stackedThreadToast({	7444	stackedThreadToast({
...	@@ -7502,7 +7561,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7502,7 +7561,7 @@ export default function ChatView(props: ChatViewProps) {
7502	composerReviewComments.length === 0	7561	composerReviewComments.length === 0
7503	? parseStandaloneComposerSlashCommand(trimmed)	7562	? parseStandaloneComposerSlashCommand(trimmed)
7504	: null;	7563	: null;
7505	if (standaloneSlashCommand && !queuedMessage) {	7564	if (standaloneSlashCommand && !queuedMessage && multipleModelSelections === null) {
7506	handleInteractionModeChange(standaloneSlashCommand);	7565	handleInteractionModeChange(standaloneSlashCommand);
7507	promptRef.current = "";	7566	promptRef.current = "";
7508	clearComposerDraftContent(composerDraftTarget);	7567	clearComposerDraftContent(composerDraftTarget);
...	@@ -7652,7 +7711,53 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7652,7 +7711,53 @@ export default function ChatView(props: ChatViewProps) {
7652	};	7711	};
7653	};	7712	};
7654		7713
		7714	const multipleTargets = [];
		7715	for (const selection of multipleModelSelections ?? []) {
		7716	const provider = providerInstanceEntries.find(
		7717	(entry) => entry.instanceId === selection.instanceId,
		7718	);
		7719	if (!provider?.enabled \|\| !provider.isAvailable \|\| provider.status !== "ready") {
		7720	setThreadError(threadIdForSend, `Provider for ${selection.model} is unavailable.`);
		7721	return;
		7722	}
		7723	const providerBlockReason = getAntigravitySendBlockReason(provider.snapshot, selection.model);
		7724	if (providerBlockReason) {
		7725	setThreadError(threadIdForSend, providerBlockReason);
		7726	return;
		7727	}
		7728	const providerState = getComposerProviderState({
		7729	provider: provider.driverKind,
		7730	model: selection.model,
		7731	models: provider.models,
		7732	modelOptions: selection.options,
		7733	promptInjectionState: getComposerPromptInjectionState(messageTextForSend),
		7734	planModeEnabled: settings.planModeEnabled,
		7735	});
		7736	const text = formatOutgoingPrompt({
		7737	provider: provider.driverKind,
		7738	model: selection.model,
		7739	models: provider.models,
		7740	effort: providerState.promptEffort,
		7741	text: messageTextForSend \|\| ATTACHMENT_ONLY_BOOTSTRAP_PROMPT,
		7742	});
		7743	if (composerRef.current?.validateProviderInput(text) === false) return;
		7744	multipleTargets.push({
		7745	selection: createModelSelection(
		7746	selection.instanceId,
		7747	selection.model,
		7748	providerState.modelOptionsForDispatch,
		7749	),
		7750	text,
		7751	interactionMode: resolveComposerInteractionMode({
		7752	planModeEnabled: settings.planModeEnabled,
		7753	provider: provider.snapshot,
		7754	interactionMode: sendInteractionMode,
		7755	}).interactionMode,
		7756	});
		7757	}
		7758
7655	sendInFlightRef.current = true;	7759	sendInFlightRef.current = true;
		7760	const sendGeneration = ++composerSendGenerationRef.current;
7656	// Every early return above leaves a queued message in the queue for a	7761	// Every early return above leaves a queued message in the queue for a
7657	// later retry. From here on a failure hands it back to the composer.	7762	// later retry. From here on a failure hands it back to the composer.
7658	if (queuedMessage) {	7763	if (queuedMessage) {
...	@@ -7728,7 +7833,9 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7728,7 +7833,9 @@ export default function ChatView(props: ChatViewProps) {
7728	}	7833	}
7729		7834
7730	const resolvedSubmissionIntent =	7835	const resolvedSubmissionIntent =
7731	submissionIntent === "background" && isLocalDraftThread ? "background" : "foreground";	7836	(multipleModelSelections !== null \|\| submissionIntent === "background") && isLocalDraftThread
		7837	? "background"
		7838	: "foreground";
7732	if (	7839	if (
7733	shouldDockDraftHeroForSubmission({	7840	shouldDockDraftHeroForSubmission({
7734	isDraftHeroState,	7841	isDraftHeroState,
...	@@ -7763,7 +7870,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7763,7 +7870,7 @@ export default function ChatView(props: ChatViewProps) {
7763	return;	7870	return;
7764	}	7871	}
7765	beginLocalDispatch({	7872	beginLocalDispatch({
7766	preparingWorktree: Boolean(baseBranchForWorktree),	7873	preparingWorktree: multipleModelSelections !== null \|\| Boolean(baseBranchForWorktree),
7767	submissionIntent: resolvedSubmissionIntent,	7874	submissionIntent: resolvedSubmissionIntent,
7768	});	7875	});
7769		7876
...	@@ -7792,6 +7899,267 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -7792,6 +7899,267 @@ export default function ChatView(props: ChatViewProps) {
7792	};	7899	};
7793	}),	7900	}),
7794	);	7901	);
		7902	if (multipleModelSelections !== null) {
		7903	const failedSelections: ModelSelection[] = [];
		7904	let clearedDraft = false;
		7905	let releasedComposer = false;
		7906	let canRestoreDraft = () => false;
		7907	let startedCount = 0;
		7908	try {
		7909	const attachments = await turnAttachmentsPromise;
		7910	const fileBlockReason = readLiveAttachmentCapabilities().fileBlockReason;
		7911	if (fileBlockReason !== null) throw new Error(fileBlockReason);
		7912	const context = buildOutgoingMessageContext(
		7913	attachments.map((attachment, index) =>
		7914	"id" in attachment && attachment.id !== undefined
		7915	? attachment.id
		7916	: composerAttachmentsSnapshot[index]!.id,
		7917	),
		7918	);
		7919	const title = truncate(
		7920	assistantCitationsToPlainText(stripInlineContextReferences(trimmed)).trim() \|\|
		7921	composerAttachmentsSnapshot[0]?.name \|\|
		7922	"New thread",
		7923	);
		7924	promptRef.current = "";
		7925	clearComposerDraftContent(composerDraftTarget);
		7926	composerRef.current?.resetCursorState();
		7927	clearedDraft = true;
		7928	const clearedDraftSnapshot = useComposerDraftStore
		7929	.getState()
		7930	.getComposerDraft(composerDraftTarget);
		7931	const submittedSelections = multipleModelSelectionsRef.current;
		7932	canRestoreDraft = () =>
		7933	currentRouteThreadKeyRef.current === routeThreadKey &&
		7934	composerSendGenerationRef.current === sendGeneration &&
		7935	useComposerDraftStore.getState().getComposerDraft(composerDraftTarget) ===
		7936	clearedDraftSnapshot &&
		7937	multipleModelSelectionsRef.current === submittedSelections;
		7938	setThreadError(threadIdForSend, null);
		7939	const starts = Promise.all(
		7940	multipleTargets.map(async (target) => {
		7941	const retryKey = JSON.stringify([
		7942	routeThreadKey,
		7943	target.selection.instanceId,
		7944	target.selection.model,
		7945	]);
		7946	const uncertainThreadId = uncertainMultipleSubmissionsRef.current.get(retryKey);
		7947	const targetThreadId = uncertainThreadId ?? newThreadId();
		7948	let requestMayHaveStarted = false;
		7949	try {
		7950	if (uncertainThreadId) {
		7951	throw new Error(
		7952	"The previous request may have started. Open its thread to check before sending again.",
		7953	);
		7954	}
		7955	const supportsInlineMessageContext =
		7956	appAtomRegistry.get(environmentServerConfigsAtom).get(environmentId)?.environment
		7957	.capabilities.inlineMessageContext === true;
		7958	requestMayHaveStarted = true;
		7959	const result = await startThreadTurn({
		7960	environmentId,
		7961	input: {
		7962	threadId: targetThreadId,
		7963	message: {
		7964	messageId: newMessageId(),
		7965	role: "user",
		7966	text:
		7967	context && !supportsInlineMessageContext
		7968	? serializeLegacyContextMessage({
		7969	text: target.text,
		7970	records: context.records,
		7971	})
		7972	: target.text,
		7973	attachments,
		7974	...(context && supportsInlineMessageContext ? { context } : {}),
		7975	},
		7976	modelSelection: target.selection,
		7977	titleSeed: title,
		7978	runtimeMode,
		7979	interactionMode: target.interactionMode,
		7980	bootstrap: {
		7981	createThread: {
		7982	projectId: activeProject.id,
		7983	title,
		7984	modelSelection: target.selection,
		7985	runtimeMode,
		7986	interactionMode: target.interactionMode,
		7987	branch: activeThreadBranch,
		7988	worktreePath: null,
		7989	createdAt: messageCreatedAt,
		7990	},
		7991	prepareWorktree: {
		7992	projectCwd: activeProject.workspaceRoot,
		7993	baseBranch: activeThreadBranch!,
		7994	requireWorktree: true,
		7995	branch: buildTemporaryWorktreeBranchName(randomHex),
		7996	...(startFromOrigin ? { startFromOrigin: true } : {}),
		7997	},
		7998	runSetupScript: true,
		7999	},
		8000	createdAt: messageCreatedAt,
		8001	},
		8002	});
		8003	if (result._tag === "Failure") {
		8004	const error = squashAtomCommandFailure(result);
		8005	if (wasBootstrapThreadDeleted(error) \|\| wasBootstrapThreadNotCreated(error)) {
		8006	requestMayHaveStarted = false;
		8007	}
		8008	throw error;
		8009	}
		8010	startedCount += 1;
		8011	} catch (error) {
		8012	if (requestMayHaveStarted && !uncertainMultipleSubmissionsRef.current.has(retryKey)) {
		8013	uncertainMultipleSubmissionsRef.current.set(retryKey, targetThreadId);
		8014	}
		8015	failedSelections.push(target.selection);
		8016	const retainedThreadId = uncertainMultipleSubmissionsRef.current.get(retryKey);
		8017	const failureToastId = toastManager.add(
		8018	stackedThreadToast({
		8019	type: "error",
		8020	title: `Could not start ${target.selection.model}`,
		8021	description: error instanceof Error ? error.message : "Failed to send message.",
		8022	...(retainedThreadId
		8023	? {
		8024	timeout: 0,
		8025	data: {
		8026	secondaryActionProps: {
		8027	children: "Allow retry",
		8028	onClick: () => {
		8029	void readLocalApi()
		8030	?.dialogs.confirm(
		8031	"The previous request may already be running. Check its thread first. Allow another send that could create a duplicate thread?",
		8032	)
		8033	.then(
		8034	(confirmed) => {
		8035	if (
		8036	confirmed &&
		8037	uncertainMultipleSubmissionsRef.current.get(retryKey) ===
		8038	retainedThreadId
		8039	) {
		8040	uncertainMultipleSubmissionsRef.current.delete(retryKey);
		8041	toastManager.close(failureToastId);
		8042	}
		8043	},
		8044	() => undefined,
		8045	);
		8046	},
		8047	},
		8048	},
		8049	actionProps: {
		8050	children: "Open thread",
		8051	onClick: () => {
		8052	void navigate({
		8053	to: "/$environmentId/$threadId",
		8054	params: buildThreadRouteParams(
		8055	scopeThreadRef(environmentId, retainedThreadId),
		8056	),
		8057	});
		8058	},
		8059	},
		8060	}
		8061	: {}),
		8062	}),
		8063	);
		8064	}
		8065	}),
		8066	);
		8067	// Each request now owns its background thread. The original draft is
		8068	// ready for another prompt while checkout and setup scripts finish.
		8069	sendInFlightRef.current = false;
		8070	resetLocalDispatch();
		8071	releasedComposer = true;
		8072	await starts;
		8073	if (startedCount > 0) {
		8074	toastManager.add(
		8075	stackedThreadToast({
		8076	type: "success",
		8077	title: `Started ${startedCount} ${startedCount === 1 ? "thread" : "threads"} in background`,
		8078	}),
		8079	);
		8080	}
		8081	if (failedSelections.length === 0 && turnUsesAttachmentUploads) {
		8082	releaseDraftAttachments(composerAttachmentsSnapshot);
		8083	}
		8084	} catch (error) {
		8085	failedSelections.push(...multipleModelSelections);
		8086	setThreadError(
		8087	threadIdForSend,
		8088	error instanceof Error ? error.message : "Failed to send messages.",
		8089	);
		8090	} finally {
		8091	const restoreFailedDraft = () => {
		8092	setMultipleModelSelections(failedSelections);
		8093	if (clearedDraft) {
		8094	setComposerDraftPrompt(composerDraftTarget, messageTextForSend);
		8095	addComposerDraftImages(
		8096	composerDraftTarget,
		8097	composerImagesSnapshot.map(cloneComposerImageForRetry),
		8098	);
		8099	addComposerDraftFiles(composerDraftTarget, composerFilesSnapshot);
		8100	setComposerDraftTerminalContexts(composerDraftTarget, composerTerminalContextsSnapshot);
		8101	setComposerDraftPreviewAnnotations(
		8102	composerDraftTarget,
		8103	composerPreviewAnnotationsSnapshot,
		8104	);
		8105	setComposerDraftReviewComments(composerDraftTarget, composerReviewCommentsSnapshot);
		8106	if (composerRef.current && currentRouteThreadKeyRef.current === routeThreadKey) {
		8107	promptRef.current = messageTextForSend;
		8108	composerRef.current.resetCursorState({
		8109	cursor: collapseExpandedComposerCursor(
		8110	messageTextForSend,
		8111	messageTextForSend.length,
		8112	),
		8113	prompt: messageTextForSend,
		8114	detectTrigger: true,
		8115	});
		8116	}
		8117	}
		8118	};
		8119	if (failedSelections.length > 0) {
		8120	if (canRestoreDraft() && composerRef.current) {
		8121	restoreFailedDraft();
		8122	} else if (clearedDraft) {
		8123	const recoveryToastId = toastManager.add(
		8124	stackedThreadToast({
		8125	type: "error",
		8126	title: "A background prompt could not be sent",
		8127	description:
		8128	"Your newer draft is unchanged. Restore the failed prompt when this composer is empty.",
		8129	timeout: 0,
		8130	actionProps: {
		8131	children: "Restore prompt",
		8132	onClick: () => {
		8133	if (
		8134	!draftId \|\|
		8135	!useComposerDraftStore.getState().getDraftSession(draftId) \|\|
		8136	sendInFlightRef.current \|\|
		8137	composerDraftHasUserContent(
		8138	useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
		8139	)
		8140	) {
		8141	toastManager.update(recoveryToastId, {
		8142	description:
		8143	"Return to the original draft and send or clear its current prompt before restoring.",
		8144	});
		8145	return;
		8146	}
		8147	restoreFailedDraft();
		8148	void navigate({ to: "/draft/$draftId", params: { draftId } });
		8149	toastManager.close(recoveryToastId);
		8150	},
		8151	},
		8152	}),
		8153	);
		8154	}
		8155	}
		8156	if (!releasedComposer) {
		8157	sendInFlightRef.current = false;
		8158	resetLocalDispatch();
		8159	}
		8160	}
		8161	return;
		8162	}
7795	const optimisticAttachments = composerAttachmentsSnapshot.map((attachment) =>	8163	const optimisticAttachments = composerAttachmentsSnapshot.map((attachment) =>
7796	attachment.type === "image"	8164	attachment.type === "image"
7797	? {	8165	? {
...	@@ -8868,7 +9236,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8868,7 +9236,7 @@ export default function ChatView(props: ChatViewProps) {
8868	);	9236	);
8869		9237
8870	const onProviderModelSelect = useCallback(	9238	const onProviderModelSelect = useCallback(
8871	(instanceId: ProviderInstanceId, model: string) => {	9239	(instanceId: ProviderInstanceId, model: string, options?: { focusComposer?: boolean }) => {
8872	if (!activeThread) return;	9240	if (!activeThread) return;
8873	// Look up the configured instance so model normalization and custom	9241	// Look up the configured instance so model normalization and custom
8874	// model lookup stay scoped to that exact instance. Unknown instance ids	9242	// model lookup stay scoped to that exact instance. Unknown instance ids
...	@@ -8880,7 +9248,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8880,7 +9248,7 @@ export default function ChatView(props: ChatViewProps) {
8880	resolvedDriverKind !== null &&	9248	resolvedDriverKind !== null &&
8881	resolvedDriverKind !== lockedProvider	9249	resolvedDriverKind !== lockedProvider
8882	) {	9250	) {
8883	scheduleComposerFocus();	9251	if (options?.focusComposer !== false) scheduleComposerFocus();
8884	return;	9252	return;
8885	}	9253	}
8886	if (lockedProvider !== null && activeThread.session?.providerInstanceId) {	9254	if (lockedProvider !== null && activeThread.session?.providerInstanceId) {
...	@@ -8892,7 +9260,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8892,7 +9260,7 @@ export default function ChatView(props: ChatViewProps) {
8892	entry?.continuation?.groupKey &&	9260	entry?.continuation?.groupKey &&
8893	currentEntry.continuation.groupKey !== entry.continuation.groupKey	9261	currentEntry.continuation.groupKey !== entry.continuation.groupKey
8894	) {	9262	) {
8895	scheduleComposerFocus();	9263	if (options?.focusComposer !== false) scheduleComposerFocus();
8896	return;	9264	return;
8897	}	9265	}
8898	}	9266	}
...	@@ -8903,7 +9271,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8903,7 +9271,7 @@ export default function ChatView(props: ChatViewProps) {
8903	model,	9271	model,
8904	);	9272	);
8905	if (!resolvedModel) {	9273	if (!resolvedModel) {
8906	scheduleComposerFocus();	9274	if (options?.focusComposer !== false) scheduleComposerFocus();
8907	return;	9275	return;
8908	}	9276	}
8909	const nextModelSelection: ModelSelection = {	9277	const nextModelSelection: ModelSelection = {
...	@@ -8923,7 +9291,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8923,7 +9291,7 @@ export default function ChatView(props: ChatViewProps) {
8923	title: modelChangeBlockReason.title,	9291	title: modelChangeBlockReason.title,
8924	description: modelChangeBlockReason.description,	9292	description: modelChangeBlockReason.description,
8925	});	9293	});
8926	scheduleComposerFocus();	9294	if (options?.focusComposer !== false) scheduleComposerFocus();
8927	return;	9295	return;
8928	}	9296	}
8929	setComposerDraftModelSelection(	9297	setComposerDraftModelSelection(
...	@@ -8932,7 +9300,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8932,7 +9300,7 @@ export default function ChatView(props: ChatViewProps) {
8932	{ explicit: true },	9300	{ explicit: true },
8933	);	9301	);
8934	setStickyComposerModelSelection(nextModelSelection);	9302	setStickyComposerModelSelection(nextModelSelection);
8935	scheduleComposerFocus();	9303	if (options?.focusComposer !== false) scheduleComposerFocus();
8936	},	9304	},
8937	[	9305	[
8938	activeThread,	9306	activeThread,
...	@@ -8946,6 +9314,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8946,6 +9314,7 @@ export default function ChatView(props: ChatViewProps) {
8946	);	9314	);
8947	const onEnvModeChange = useCallback(	9315	const onEnvModeChange = useCallback(
8948	(mode: DraftThreadEnvMode) => {	9316	(mode: DraftThreadEnvMode) => {
		9317	if (multipleModelSelections !== null) return;
8949	if (canOverrideServerThreadEnvMode) {	9318	if (canOverrideServerThreadEnvMode) {
8950	setPendingServerThreadEnvMode(mode);	9319	setPendingServerThreadEnvMode(mode);
8951	scheduleComposerFocus();	9320	scheduleComposerFocus();
...	@@ -8968,6 +9337,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -8968,6 +9337,7 @@ export default function ChatView(props: ChatViewProps) {
8968	composerDraftTarget,	9337	composerDraftTarget,
8969	draftThread?.worktreePath,	9338	draftThread?.worktreePath,
8970	isLocalDraftThread,	9339	isLocalDraftThread,
		9340	multipleModelSelections,
8971	activeProjectSettings.settings.newWorktreesStartFromOrigin,	9341	activeProjectSettings.settings.newWorktreesStartFromOrigin,
8972	setPendingServerThreadEnvMode,	9342	setPendingServerThreadEnvMode,
8973	scheduleComposerFocus,	9343	scheduleComposerFocus,
...	@@ -9632,6 +10002,12 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -9632,6 +10002,12 @@ export default function ChatView(props: ChatViewProps) {
9632	<ComposerSurface.Host>	10002	<ComposerSurface.Host>
9633	<div ref={attachDraftHeroComposerAnchorRef} className="relative z-10">	10003	<div ref={attachDraftHeroComposerAnchorRef} className="relative z-10">
9634	<ChatComposer	10004	<ChatComposer
		10005	multipleModelSelections={multipleModelSelections}
		10006	supportsMultipleModels={
		10007	serverConfig?.environment.capabilities.requiredWorktreeBootstrap ===
		10008	true
		10009	}
		10010	onMultipleModelSelectionsChange={setMultipleModelSelections}
9635	composerRef={composerRef}	10011	composerRef={composerRef}
9636	composerDraftTarget={composerDraftTarget}	10012	composerDraftTarget={composerDraftTarget}
9637	environmentId={environmentId}	10013	environmentId={environmentId}
...	@@ -9769,6 +10145,7 @@ export default function ChatView(props: ChatViewProps) {	...	@@ -9769,6 +10145,7 @@ export default function ChatView(props: ChatViewProps) {
9769	{mountComposerContextStrip && (	10145	{mountComposerContextStrip && (
9770	<div className="pointer-events-auto">	10146	<div className="pointer-events-auto">
9771	<BranchToolbar	10147	<BranchToolbar
		10148	forceNewWorktree={multipleModelSelections !== null}
9772	ref={branchToolbarRef}	10149	ref={branchToolbarRef}
9773	environmentId={activeThread.environmentId}	10150	environmentId={activeThread.environmentId}
9774	threadId={activeThread.id}	10151	threadId={activeThread.id}

apps/web/src/components/chat/ChatComposer.tsx+77-6

 @@ -245,6 +245,7 @@ import {
 import { useEnvironmentQuery } from "~/state/query";
 import { useDebouncedValue } from "~/state/queries";
 import { ProviderModelPicker } from "./ProviderModelPicker";
+import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
 import { type ComposerCommandItem, ComposerCommandMenu } from "./ComposerCommandMenu";
 import { ComposerPendingApprovalActions } from "./ComposerPendingApprovalActions";
 import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
 @@ -1267,6 +1268,7 @@ export interface ChatComposerHandle {
     selectedPromptEffort: string | null;
     selectedModelOptionsForDispatch: unknown;
     selectedModelSelection: ModelSelection;
+    multipleModelSelections: ReadonlyArray<ModelSelection> | null;
     providerAvailable: boolean;
     selectedProvider: ProviderDriverKind;
     selectedModel: string;
 @@ -1276,6 +1278,7 @@ export interface ChatComposerHandle {
   };
   /** Validate the fully composed text immediately before a provider turn starts. */
   validateProviderInput: (providerInput: string) => boolean;
+  setMultipleModelSelections: (selections: ReadonlyArray<ModelSelection>) => void;
 }
 // --------------------------------------------------------------------------
 @@ -1292,6 +1295,11 @@ export interface ChatComposerProps {
   routeKind: "server" | "draft";
   routeThreadRef: ScopedThreadRef;
   draftId: DraftId | null;
+  multipleModelSelections: ReadonlyArray<ModelSelection> | null;
+  supportsMultipleModels: boolean;
+  onMultipleModelSelectionsChange: React.Dispatch<
+    React.SetStateAction<ReadonlyArray<ModelSelection> | null>
+  >;
   // Thread context
   activeThreadId: ThreadId | null;
 @@ -1420,7 +1428,11 @@ export interface ChatComposerProps {
     cursorAdjacentToMention: boolean,
   ) => void;
-  onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
+  onProviderModelSelect: (
+    instanceId: ProviderInstanceId,
+    model: string,
+    options?: { focusComposer?: boolean },
+  ) => void;
   onOpenProviderSetup: (instanceId: ProviderInstanceId) => void;
   getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
   toggleInteractionMode: () => void;
 @@ -1449,6 +1461,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     routeKind,
     routeThreadRef,
     draftId,
+    multipleModelSelections,
+    supportsMultipleModels,
+    onMultipleModelSelectionsChange: setMultipleModelSelections,
     activeThreadId,
     activeThreadEnvironmentId: _activeThreadEnvironmentId,
     activeThread,
 @@ -1847,7 +1862,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   );
   const selectedInstanceId =
     selectedProviderEntry?.instanceId ?? NO_PROVIDER_MODEL_SELECTION.instanceId;
-  const noProviderAvailable = selectedProviderEntry === undefined;
+  const noProviderAvailable =
+    selectedProviderEntry === undefined && multipleModelSelections === null;
   // Before the catalog arrives, every thread resolves to "no provider". Send
   // stays blocked either way; only the chrome waits, keeping the picker with
   // the thread's own selection instead of swapping in the setup button and
 @@ -1883,9 +1899,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   );
   const sendDisabledReason =
     externalSendDisabledReason ??
+    (multipleModelSelections?.length === 0 ? "Select at least one model." : null) ??
     (activePendingProgress
       ? attachmentBlockReason
-      : (attachmentBlockReason ?? providerSendBlockReason));
+      : (attachmentBlockReason ??
+        (multipleModelSelections === null ? providerSendBlockReason : null)));
   const isSendDisabled = sendDisabledReason !== null;
   const selectedProviderStatus = useMemo(
     () => selectedProviderEntry?.snapshot ?? null,
 @@ -4943,7 +4961,42 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       ) : null}
       <ProviderModelPicker
         isComposerOwned
-        disabled={providerCatalogPending}
+        disabled={providerCatalogPending || isSendBusy}
+        {...(routeKind === "draft" && supportsMultipleModels
+          ? {
+              ...(multipleModelSelections !== null
+                ? { selectedModels: multipleModelSelections }
+                : {}),
+              onToggleModel: (instanceId: ProviderInstanceId, model: string) => {
+                const current = multipleModelSelections ?? [selectedModelSelection];
+                const matchesModel = (selection: ModelSelection) => {
+                  if (selection.instanceId !== instanceId) return false;
+                  const entry = providerInstanceEntries.find(
+                    (entry) => entry.instanceId === selection.instanceId,
+                  );
+                  const resolvedModel = resolveModelPickerSelectedModel({
+                    driverKind: entry?.driverKind,
+                    model: selection.model,
+                    options: modelOptionsByInstance.get(selection.instanceId) ?? [],
+                  });
+                  return (resolvedModel?.slug ?? selection.model) === model;
+                };
+                const exists = current.some(matchesModel);
+                const next = exists
+                  ? current.filter((selection) => !matchesModel(selection))
+                  : [...current, createModelSelection(instanceId, model)];
+                if (next.length > 1) {
+                  setMultipleModelSelections(next);
+                } else {
+                  setMultipleModelSelections(null);
+                  const remaining = next[0] ?? selectedModelSelection;
+                  onProviderModelSelect(remaining.instanceId, remaining.model, {
+                    focusComposer: false,
+                  });
+                }
+              },
+            }
+          : {})}
         activeInstanceId={
           providerCatalogPending
             ? (activeThreadModelSelection?.instanceId ?? selectedInstanceId)
 @@ -4983,7 +5036,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
           : {})}
         onOpenChange={setIsComposerModelPickerOpen}
         getModelDisabledReason={getModelDisabledReason}
-        onInstanceModelChange={onProviderModelSelect}
+        onInstanceModelChange={(instanceId, model) => {
+          setMultipleModelSelections(null);
+          onProviderModelSelect(instanceId, model);
+        }}
         onOpenProviderSetup={onOpenProviderSetup}
       />
 @@ -5902,13 +5958,25 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         selectedPromptEffort,
         selectedModelOptionsForDispatch,
         selectedModelSelection,
-        providerAvailable: !noProviderAvailable && providerSendBlockReason === null,
+        multipleModelSelections:
+          routeKind === "draft" && multipleModelSelections !== null
+            ? multipleModelSelections.map((selection) =>
+                selection.instanceId === selectedModelSelection.instanceId &&
+                selection.model === selectedModelSelection.model
+                  ? selectedModelSelection
+                  : selection,
+              )
+            : null,
+        providerAvailable:
+          multipleModelSelections !== null ||
+          (!noProviderAvailable && providerSendBlockReason === null),
         selectedProvider,
         selectedModel,
         selectedProviderModels,
         interactionMode,
         interactionModeEnabled: planModeUiEnabled,
       }),
+      setMultipleModelSelections,
       validateProviderInput: (providerInput: string) => {
         const validationMessage = getComposerSubmissionValidationMessage({
           prompt: promptRef.current,
 @@ -5951,6 +6019,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       selectedModel,
       selectedModelOptionsForDispatch,
       selectedModelSelection,
+      multipleModelSelections,
+      setMultipleModelSelections,
+      routeKind,
       noProviderAvailable,
       providerSendBlockReason,
       selectedPromptEffort,

apps/web/src/components/chat/ModelListRow.tsx+5-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";	1	import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
2	import { memo } from "react";	2	import { memo } from "react";
3	import { StarIcon } from "lucide-react";	3	import { CheckIcon, StarIcon } from "lucide-react";
4	import {	4	import {
5	getDisplayModelName,	5	getDisplayModelName,
6	getTriggerDisplayModelLabel,	6	getTriggerDisplayModelLabel,
...	@@ -31,6 +31,7 @@ export const ModelListRow = memo(function ModelListRow(props: {	...	@@ -31,6 +31,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
31	providerAccentColor?: string \| undefined;	31	providerAccentColor?: string \| undefined;
32	isFavorite: boolean;	32	isFavorite: boolean;
33	isSelected: boolean;	33	isSelected: boolean;
		34	showSelection?: boolean;
34	showProvider: boolean;	35	showProvider: boolean;
35	preferShortName?: boolean;	36	preferShortName?: boolean;
36	useTriggerLabel?: boolean;	37	useTriggerLabel?: boolean;
...	@@ -94,6 +95,9 @@ export const ModelListRow = memo(function ModelListRow(props: {	...	@@ -94,6 +95,9 @@ export const ModelListRow = memo(function ModelListRow(props: {
94	</div>	95	</div>
95		96
96	<div className="flex shrink-0 items-center gap-1.5">	97	<div className="flex shrink-0 items-center gap-1.5">
		98	{props.showSelection && props.isSelected ? (
		99	<CheckIcon className="size-3.5" aria-hidden="true" />
		100	) : null}
97	{props.jumpLabel ? (	101	{props.jumpLabel ? (
98	<Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>	102	<Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
99	) : null}	103	) : null}

apps/web/src/components/chat/ModelPickerContent.tsx+55-11

 @@ -151,6 +151,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
   /** The instance currently selected in the composer (combobox "value"). */
   activeInstanceId: ProviderInstanceId;
   model: string;
+  selectedModels?: ReadonlyArray<{ instanceId: ProviderInstanceId; model: string }>;
+  onToggleModel?: (instanceId: ProviderInstanceId, model: string) => void;
   /**
    * When set, the picker is locked to the given driver kind — typically
    * because the user is editing a previously-sent message and can't change
 @@ -186,6 +188,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
     instanceEntries,
     getModelDisabledReason,
     onInstanceModelChange,
+    onToggleModel,
   } = props;
   const [searchQuery, setSearchQuery] = useState("");
   const [showTopScrollFade, setShowTopScrollFade] = useState(false);
 @@ -207,6 +210,23 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
   const activeModelKey = activeModelSlug
     ? modelPickerModelKey(props.activeInstanceId, activeModelSlug)
     : null;
+  const selectedModelKeys = useMemo(
+    () =>
+      props.selectedModels?.map((selection) => {
+        const entry = instanceEntries.find((entry) => entry.instanceId === selection.instanceId);
+        const model = resolveModelPickerSelectedModel({
+          driverKind: entry?.driverKind,
+          model: selection.model,
+          options: modelOptionsByInstance.get(selection.instanceId) ?? [],
+        });
+        return modelPickerModelKey(selection.instanceId, model?.slug ?? selection.model);
+      }),
+    [instanceEntries, modelOptionsByInstance, props.selectedModels],
+  );
+  const selectedModelKeySet = useMemo(
+    () => new Set(selectedModelKeys ?? (activeModelKey ? [activeModelKey] : [])),
+    [selectedModelKeys, activeModelKey],
+  );
   const activeInstanceHasSelectableUnavailableModel =
     activeEntry !== undefined &&
     (modelOptionsByInstance.get(props.activeInstanceId) ?? []).some((option) =>
 @@ -575,7 +595,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
   }, []);
   const handleModelSelect = useCallback(
-    (modelSlug: string, instanceId: ProviderInstanceId) => {
+    (modelSlug: string, instanceId: ProviderInstanceId, additive = false) => {
       if (getModelDisabledReason?.(instanceId, modelSlug)) {
         return;
       }
 @@ -592,10 +612,20 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
       // normalization rules, so pass the driver kind here.
       const resolvedModel = resolveSelectableModel(entry.driverKind, modelSlug, options);
       if (resolvedModel) {
-        onInstanceModelChange(instanceId, resolvedModel);
+        if (additive && onToggleModel) {
+          onToggleModel(instanceId, resolvedModel);
+        } else {
+          onInstanceModelChange(instanceId, resolvedModel);
+        }
       }
     },
-    [entryByInstanceId, getModelDisabledReason, modelOptionsByInstance, onInstanceModelChange],
+    [
+      entryByInstanceId,
+      getModelDisabledReason,
+      modelOptionsByInstance,
+      onInstanceModelChange,
+      onToggleModel,
+    ],
   );
   const toggleFavorite = useCallback(
 @@ -701,8 +731,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
     return mapping.size > 0 ? mapping : EMPTY_MODEL_JUMP_LABELS;
   }, [keybindings, modelJumpCommandByKey, modelJumpShortcutContext]);
   const modelListExtraData = useMemo(
-    () => ({ favoritesSet, modelJumpLabelByKey }),
+    () => ({ favoritesSet, modelJumpLabelByKey, activeModelKey, selectedModelKeySet }),
-    [favoritesSet, modelJumpLabelByKey],
+    [favoritesSet, modelJumpLabelByKey, activeModelKey, selectedModelKeySet],
   );
   useEffect(() => {
 @@ -804,7 +834,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
         )}
         {/* Main content area */}
-        <Combobox
+        <Combobox<string, boolean>
           inline
           items={allItemKeys}
           filteredItems={filteredItemKeys}
 @@ -812,7 +842,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
           autoHighlight
           open
           virtualized
-          value={activeModelKey}
+          multiple={onToggleModel !== undefined}
+          value={onToggleModel ? [...selectedModelKeySet] : activeModelKey}
           onItemHighlighted={(modelKey, eventDetails) => {
             highlightedModelKeyRef.current = typeof modelKey === "string" ? modelKey : null;
             if (eventDetails.reason === "keyboard" && eventDetails.index >= 0) {
 @@ -822,7 +853,11 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
               });
             }
           }}
-          onValueChange={(modelKey) => {
+          onValueChange={(value, details) => {
+            const modelKey = Array.isArray(value)
+              ? (value.find((key) => !selectedModelKeySet.has(key)) ??
+                [...selectedModelKeySet].find((key) => !value.includes(key)))
+              : value;
             if (typeof modelKey !== "string") {
               return;
             }
 @@ -833,7 +868,11 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
             }
             const model = parseModelPickerModelKey(modelKey);
             if (model) {
-              handleModelSelect(model.slug, model.instanceId);
+              handleModelSelect(
+                model.slug,
+                model.instanceId,
+                "shiftKey" in details.event && details.event.shiftKey === true,
+              );
             }
           }}
         >
 @@ -901,7 +940,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
                       }
                       const model = parseModelPickerModelKey(highlightedModelKeyRef.current);
                       if (model) {
-                        handleModelSelect(model.slug, model.instanceId);
+                        handleModelSelect(model.slug, model.instanceId, e.shiftKey);
                       }
                       return;
                     }
 @@ -967,7 +1006,12 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
                         isFavorite={favoritesSet.has(
                           providerModelKey(model.instanceId, model.slug),
                         )}
-                        isSelected={modelKey === activeModelKey}
+                        isSelected={
+                          selectedModelKeys !== undefined
+                            ? selectedModelKeySet.has(modelKey)
+                            : modelKey === activeModelKey
+                        }
+                        showSelection={selectedModelKeys !== undefined}
                         showProvider
                         preferShortName={!isLocked}
                         useTriggerLabel={false}

apps/web/src/components/chat/ProviderModelPicker.tsx+66-6

...	@@ -34,6 +34,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {	...	@@ -34,6 +34,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
34	*/	34	*/
35	activeInstanceId: ProviderInstanceId;	35	activeInstanceId: ProviderInstanceId;
36	model: string;	36	model: string;
		37	selectedModels?: ReadonlyArray<{ instanceId: ProviderInstanceId; model: string }>;
		38	onToggleModel?: (instanceId: ProviderInstanceId, model: string) => void;
37	lockedProvider: ProviderDriverKind \| null;	39	lockedProvider: ProviderDriverKind \| null;
38	lockedContinuationGroupKey?: string \| null;	40	lockedContinuationGroupKey?: string \| null;
39	/** Instance entries rendered in the sidebar + used to resolve display name. */	41	/** Instance entries rendered in the sidebar + used to resolve display name. */
...	@@ -158,9 +160,37 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {	...	@@ -158,9 +160,37 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
158	const shortcutLabel = props.keybindings	160	const shortcutLabel = props.keybindings
159	? shortcutLabelForCommand(props.keybindings, "modelPicker.toggle")	161	? shortcutLabelForCommand(props.keybindings, "modelPicker.toggle")
160	: null;	162	: null;
		163	const selectedEntries = props.selectedModels?.map((selection) => {
		164	const entry = props.instanceEntries.find(
		165	(candidate) => candidate.instanceId === selection.instanceId,
		166	);
		167	const model = resolveModelPickerSelectedModel({
		168	driverKind: entry?.driverKind,
		169	model: selection.model,
		170	options: props.modelOptionsByInstance.get(selection.instanceId) ?? [],
		171	});
		172	return {
		173	...selection,
		174	entry,
		175	label: model
		176	? `${getTriggerDisplayModelName(model)}${model.isUnavailable ? " (Unavailable)" : ""}`
		177	: selection.model,
		178	};
		179	});
		180	const multipleLabel = selectedEntries
		181	? selectedEntries.length === 0
		182	? "Choose models"
		183	: `${selectedEntries
		184	.slice(0, 2)
		185	.map((selection) => selection.label)
		186	.join(", ")}${selectedEntries.length > 2 ? `, ${selectedEntries.length - 2} more` : ""}`
		187	: undefined;
		188	const allModelNames = selectedEntries
		189	? selectedEntries.map((selection) => selection.label).join(", ") \|\| "Choose models"
		190	: undefined;
161	const triggerTooltipContent = shortcutLabel	191	const triggerTooltipContent = shortcutLabel
162	? `${props.triggerLabel ?? triggerLabel} · ${shortcutLabel}`	192	? `${props.triggerLabel ?? allModelNames ?? triggerLabel} · ${shortcutLabel}`
163	: (props.triggerLabel ?? triggerLabel);	193	: (props.triggerLabel ?? allModelNames ?? triggerLabel);
164		194
165	return (	195	return (
166	<Popover	196	<Popover
...	@@ -176,7 +206,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {	...	@@ -176,7 +206,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
176	<PopoverTrigger	206	<PopoverTrigger
177	render={	207	render={
178	<ComposerControl	208	<ComposerControl
179	aria-label={props.triggerAriaLabel}	209	aria-label={props.triggerAriaLabel ?? allModelNames}
180	variant={props.triggerVariant ?? "ghost"}	210	variant={props.triggerVariant ?? "ghost"}
181	size={size}	211	size={size}
182	data-chat-provider-model-picker="true"	212	data-chat-provider-model-picker="true"
...	@@ -192,7 +222,29 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {	...	@@ -192,7 +222,29 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
192	<span	222	<span
193	className={cn("flex min-w-0 flex-1 items-center", size === "xs" ? "gap-1" : "gap-1.5")}	223	className={cn("flex min-w-0 flex-1 items-center", size === "xs" ? "gap-1" : "gap-1.5")}
194	>	224	>
195	{activeEntry && props.triggerLabel === undefined ? (	225	{selectedEntries && props.triggerLabel === undefined ? (
		226	<span className="flex shrink-0 items-center -space-x-1" aria-hidden="true">
		227	{selectedEntries
		228	.slice(0, 3)
		229	.map((selection) =>
		230	selection.entry ? (
		231	<ProviderInstanceIcon
		232	key={`${selection.instanceId}:${selection.model}`}
		233	driverKind={selection.entry.driverKind}
		234	displayName={selection.entry.displayName}
		235	accentColor={selection.entry.accentColor}
		236	className="size-4 rounded-full bg-[var(--chat-composer-glass-surface,var(--background))] ring-2 ring-[var(--chat-composer-glass-surface,var(--background))]"
		237	iconClassName="size-4"
		238	/>
		239	) : null,
		240	)}
		241	{selectedEntries.length > 3 ? (
		242	<span className="relative z-30 flex size-4 items-center justify-center rounded-full bg-[var(--chat-composer-glass-surface,var(--background))] text-[9px] ring-2 ring-[var(--chat-composer-glass-surface,var(--background))]">
		243	+{selectedEntries.length - 3}
		244	</span>
		245	) : null}
		246	</span>
		247	) : activeEntry && props.triggerLabel === undefined ? (
196	<ProviderInstanceIcon	248	<ProviderInstanceIcon
197	driverKind={activeEntry.driverKind}	249	driverKind={activeEntry.driverKind}
198	displayName={activeEntry.displayName}	250	displayName={activeEntry.displayName}
...	@@ -216,11 +268,11 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {	...	@@ -216,11 +268,11 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
216	/>	268	/>
217	}	269	}
218	>	270	>
219	{props.triggerLabel ?? triggerTitle}	271	{props.triggerLabel ?? multipleLabel ?? triggerTitle}
220	</TooltipTrigger>	272	</TooltipTrigger>
221	<TooltipPopup side="top">{triggerTooltipContent}</TooltipPopup>	273	<TooltipPopup side="top">{triggerTooltipContent}</TooltipPopup>
222	</Tooltip>	274	</Tooltip>
223	{selectedModel?.isUnavailable && props.triggerLabel === undefined ? (	275	{selectedModel?.isUnavailable && !selectedEntries && props.triggerLabel === undefined ? (
224	<Badge variant="outline" size="sm">	276	<Badge variant="outline" size="sm">
225	Unavailable	277	Unavailable
226	</Badge>	278	</Badge>
...	@@ -239,6 +291,14 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {	...	@@ -239,6 +291,14 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
239	<ModelPickerContent	291	<ModelPickerContent
240	activeInstanceId={activeInstanceId}	292	activeInstanceId={activeInstanceId}
241	model={props.model}	293	model={props.model}
		294	{...(props.selectedModels !== undefined ? { selectedModels: props.selectedModels } : {})}
		295	{...(props.onToggleModel
		296	? {
		297	onToggleModel: (instanceId: ProviderInstanceId, model: string) => {
		298	if (!props.disabled) props.onToggleModel?.(instanceId, model);
		299	},
		300	}
		301	: {})}
242	lockedProvider={props.lockedProvider}	302	lockedProvider={props.lockedProvider}
243	lockedContinuationGroupKey={props.lockedContinuationGroupKey ?? null}	303	lockedContinuationGroupKey={props.lockedContinuationGroupKey ?? null}
244	instanceEntries={props.instanceEntries}	304	instanceEntries={props.instanceEntries}

docs/user/thread-sidebar.md+5

...	@@ -20,6 +20,11 @@ on Windows and Linux to start a new thread and immediately open another draft. T	...	@@ -20,6 +20,11 @@ on Windows and Linux to start a new thread and immediately open another draft. T
20	next draft keeps the workspace mode and base branch you selected. With **New	20	next draft keeps the workspace mode and base branch you selected. With **New
21	worktree**, each background submission creates its own worktree.	21	worktree**, each background submission creates its own worktree.
22		22
		23	To send the same prompt to several models on web or desktop, Shift-click models
		24	in a new thread's model picker to add or remove them. A regular click returns to a
		25	single model. Choose a base branch and send. Each selection starts a separate thread
		26	and worktree while you stay in the new thread composer. This requires a Git project.
		27
23	## Pin and reorder threads	28	## Pin and reorder threads
24		29
25	Pin a thread from its menu to keep it above your active work.	30	Pin a thread from its menu to keep it above your active work.

packages/client-runtime/src/errors/orchestration.test.ts+28-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	import { OrchestrationDispatchCommandError } from "@t3tools/contracts";	1	import { OrchestrationDispatchCommandError } from "@t3tools/contracts";
2	import { describe, expect, it } from "vite-plus/test";	2	import { describe, expect, it } from "vite-plus/test";
3		3
4	import { wasBootstrapThreadDeleted } from "./orchestration.ts";	4	import { wasBootstrapThreadDeleted, wasBootstrapThreadNotCreated } from "./orchestration.ts";
5		5
6	describe("wasBootstrapThreadDeleted", () => {	6	describe("wasBootstrapThreadDeleted", () => {
7	it("accepts only a confirmed deleted bootstrap thread", () => {	7	it("accepts only a confirmed deleted bootstrap thread", () => {
...	@@ -21,3 +21,30 @@ describe("wasBootstrapThreadDeleted", () => {	...	@@ -21,3 +21,30 @@ describe("wasBootstrapThreadDeleted", () => {
21	expect(wasBootstrapThreadDeleted(new Error("connection lost"))).toBe(false);	21	expect(wasBootstrapThreadDeleted(new Error("connection lost"))).toBe(false);
22	});	22	});
23	});	23	});
		24
		25	describe("wasBootstrapThreadNotCreated", () => {
		26	it("accepts only a confirmed never-created bootstrap thread", () => {
		27	const notCreated = new OrchestrationDispatchCommandError({
		28	message: "A separate worktree requires a base commit.",
		29	bootstrapThreadDisposition: "not-created",
		30	});
		31	expect(wasBootstrapThreadNotCreated(notCreated)).toBe(true);
		32	expect(wasBootstrapThreadDeleted(notCreated)).toBe(false);
		33	expect(
		34	wasBootstrapThreadNotCreated(
		35	new OrchestrationDispatchCommandError({
		36	message: "Failed to create worktree.",
		37	bootstrapThreadDisposition: "deleted",
		38	}),
		39	),
		40	).toBe(false);
		41	expect(
		42	wasBootstrapThreadNotCreated(
		43	new OrchestrationDispatchCommandError({
		44	message: "Failed to create worktree.",
		45	}),
		46	),
		47	).toBe(false);
		48	expect(wasBootstrapThreadNotCreated(new Error("connection lost"))).toBe(false);
		49	});
		50	});

packages/client-runtime/src/errors/orchestration.ts+6

...	@@ -8,3 +8,9 @@ export function wasBootstrapThreadDeleted(error: unknown): boolean {	...	@@ -8,3 +8,9 @@ export function wasBootstrapThreadDeleted(error: unknown): boolean {
8	isOrchestrationDispatchCommandError(error) && error.bootstrapThreadDisposition === "deleted"	8	isOrchestrationDispatchCommandError(error) && error.bootstrapThreadDisposition === "deleted"
9	);	9	);
10	}	10	}
		11
		12	export function wasBootstrapThreadNotCreated(error: unknown): boolean {
		13	return (
		14	isOrchestrationDispatchCommandError(error) && error.bootstrapThreadDisposition === "not-created"
		15	);
		16	}

packages/contracts/src/environment.test.ts+10

...	@@ -14,6 +14,16 @@ const descriptor = {	...	@@ -14,6 +14,16 @@ const descriptor = {
14	} as const;	14	} as const;
15		15
16	describe("ExecutionEnvironmentDescriptor", () => {	16	describe("ExecutionEnvironmentDescriptor", () => {
		17	it("requires an advertised required-worktree bootstrap capability", () => {
		18	expect(decodeDescriptor(descriptor).capabilities.requiredWorktreeBootstrap).toBeUndefined();
		19	expect(
		20	decodeDescriptor({
		21	...descriptor,
		22	capabilities: { ...descriptor.capabilities, requiredWorktreeBootstrap: true },
		23	}).capabilities.requiredWorktreeBootstrap,
		24	).toBe(true);
		25	});
		26
17	it("treats a missing pull-request capability as unsupported under version skew", () => {	27	it("treats a missing pull-request capability as unsupported under version skew", () => {
18	expect(decodeDescriptor(descriptor).capabilities.pullRequests).toBeUndefined();	28	expect(decodeDescriptor(descriptor).capabilities.pullRequests).toBeUndefined();
19	});	29	});

packages/contracts/src/environment.ts+2

...	@@ -99,6 +99,8 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({	...	@@ -99,6 +99,8 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({
99	Absent on servers from before inline context shipped, which drop the records and forward	99	Absent on servers from before inline context shipped, which drop the records and forward
100	the links as literal text -- so a client must serialize context the legacy way for them. */	100	the links as literal text -- so a client must serialize context the legacy way for them. */
101	inlineMessageContext: Schema.optionalKey(Schema.Boolean),	101	inlineMessageContext: Schema.optionalKey(Schema.Boolean),
		102	/** Server rejects required worktrees instead of falling back to the project checkout. */
		103	requiredWorktreeBootstrap: Schema.optionalKey(Schema.Boolean),
102	/** Server understands thread.settle / thread.unsettle commands. Absent on	104	/** Server understands thread.settle / thread.unsettle commands. Absent on
103	pre-settlement servers, so clients treat missing as unsupported and	105	pre-settlement servers, so clients treat missing as unsupported and
104	never send the commands under version skew. */	106	never send the commands under version skew. */

packages/contracts/src/orchestration.test.ts+14

 @@ -84,6 +84,18 @@ it.effect("decodes a dispatch error after its bootstrap thread was deleted", ()
   }),
 );
+it.effect("decodes a dispatch error before its bootstrap thread was created", () =>
+  Effect.gen(function* () {
+    const error = yield* decodeDispatchCommandError({
+      _tag: "OrchestrationDispatchCommandError",
+      message: "A separate worktree requires a base commit.",
+      bootstrapThreadDisposition: "not-created",
+    });
+    assert.strictEqual(error.bootstrapThreadDisposition, "not-created");
+  }),
+);
 it.effect("parses turn diff input when fromTurnCount <= toTurnCount", () =>
   Effect.gen(function* () {
     const parsed = yield* decodeTurnDiffInput({
 @@ -545,6 +557,7 @@ it.effect("accepts bootstrap metadata in thread.turn.start", () =>
           baseBranch: "main",
           branch: "t3code/example",
           startFromOrigin: true,
+          requireWorktree: true,
         },
         runSetupScript: true,
       },
 @@ -553,6 +566,7 @@ it.effect("accepts bootstrap metadata in thread.turn.start", () =>
     assert.strictEqual(parsed.bootstrap?.createThread?.projectId, "project-1");
     assert.strictEqual(parsed.bootstrap?.prepareWorktree?.baseBranch, "main");
     assert.strictEqual(parsed.bootstrap?.prepareWorktree?.startFromOrigin, true);
+    assert.strictEqual(parsed.bootstrap?.prepareWorktree?.requireWorktree, true);
     assert.strictEqual(parsed.bootstrap?.runSetupScript, true);
   }),
 );

packages/contracts/src/orchestration.ts+2-1

...	@@ -1271,6 +1271,7 @@ const ThreadTurnStartBootstrapPrepareWorktree = Schema.Struct({	...	@@ -1271,6 +1271,7 @@ const ThreadTurnStartBootstrapPrepareWorktree = Schema.Struct({
1271	baseBranch: TrimmedNonEmptyString,	1271	baseBranch: TrimmedNonEmptyString,
1272	branch: Schema.optional(TrimmedNonEmptyString),	1272	branch: Schema.optional(TrimmedNonEmptyString),
1273	startFromOrigin: Schema.optional(Schema.Boolean),	1273	startFromOrigin: Schema.optional(Schema.Boolean),
		1274	requireWorktree: Schema.optional(Schema.Boolean),
1274	});	1275	});
1275		1276
1276	const ThreadTurnStartBootstrap = Schema.Struct({	1277	const ThreadTurnStartBootstrap = Schema.Struct({
...	@@ -2381,7 +2382,7 @@ export class OrchestrationDispatchCommandError extends Schema.TaggedError<Orches	...	@@ -2381,7 +2382,7 @@ export class OrchestrationDispatchCommandError extends Schema.TaggedError<Orches
2381	{	2382	{
2382	message: TrimmedNonEmptyString,	2383	message: TrimmedNonEmptyString,
2383	cause: Schema.optional(Schema.Defect()),	2384	cause: Schema.optional(Schema.Defect()),
2384	bootstrapThreadDisposition: Schema.optional(Schema.Literal("deleted")),	2385	bootstrapThreadDisposition: Schema.optional(Schema.Literals(["deleted", "not-created"])),
2385	},	2386	},
2386	) {}	2387	) {}
2387		2388

author	maria <maria@kuuro.net> 2026-09-17 03:30:06-03:00
committer	GitHub <noreply@github.com> 2026-09-17 03:30:06-03:00
log	0150c6a53b409ba3bcb45645709b649cf8708354
tree	a5602edb54156195c884c0189570dae4d31c2eff
parent	c0dded88b1fc8c1c86d65f684fbfa520139e58dc
signature	Signed by PGP key B5690EEEBB952194

feat(web): start new threads with multiple models in separate worktrees (#12179)