Skip to content

Commit 0150c6a

Browse files
authored
feat(web): start new threads with multiple models in separate worktrees (#12179)
Co-authored-by: maria-rcks <[email protected]>
1 parent c0dded8 commit 0150c6a

19 files changed

Lines changed: 814 additions & 56 deletions

‎apps/server/src/environment/ServerEnvironment.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
170170
expect(second.capabilities.attachmentUploads).toBe(true);
171171
expect(second.capabilities.fileAttachments).toEqual({ maxUploadBytes: 50 * 1024 * 1024 });
172172
expect(second.capabilities.pullRequests).toBe(true);
173+
expect(second.capabilities.requiredWorktreeBootstrap).toBe(true);
173174
expect(second.capabilities.usagePriceOverrides).toBe(true);
174175
expect(second.capabilities.threadActiveReorder).toBe(true);
175176
expect(second.capabilities.threadTitleRegeneration).toBe(true);

‎apps/server/src/environment/ServerEnvironment.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ export const make = Effect.gen(function* () {
222222
fileAttachments: { maxUploadBytes: PROVIDER_SEND_TURN_MAX_FILE_BYTES },
223223
pullRequests: true,
224224
inlineMessageContext: true,
225+
requiredWorktreeBootstrap: true,
225226
threadSettlement: true,
226227
threadAutoSettlement: true,
227228
storageCleanup: true,

‎apps/server/src/server.test.ts‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11184,6 +11184,102 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
1118411184
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
1118511185
);
1118611186

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+
1118711283
it.effect("falls back to the project checkout when worktree mode targets a non-repository", () =>
1118811284
Effect.gen(function* () {
1118911285
const dispatchedCommands: Array<OrchestrationCommand> = [];

‎apps/server/src/ws.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,12 @@ const makeWsRpcLayer = (
13691369
}
13701370

13711371
if (prepareWorktree && !shouldPrepareWorktree) {
1372+
if (prepareWorktree.requireWorktree) {
1373+
return yield* new OrchestrationDispatchCommandError({
1374+
message:
1375+
"A separate worktree requires a Git repository and a base branch with a commit.",
1376+
});
1377+
}
13721378
// Not a git repo, or the base has no commit: the thread runs in
13731379
// the project checkout instead. The card says so and moves on.
13741380
yield* track(
@@ -1401,8 +1407,8 @@ const makeWsRpcLayer = (
14011407
// every delete for the prior incarnation committed before it.
14021408
// Drain through that event before setup or turn start can own
14031409
// terminals and provider sessions under the reused thread id.
1404-
yield* threadDeletionReactor.drainThrough(created.sequence);
14051410
createdThread = true;
1411+
yield* threadDeletionReactor.drainThrough(created.sequence);
14061412
// Persist the send now rather than with the turn: the thread is
14071413
// real from here on, so any client (or a reload) sees the message
14081414
// while the worktree is still being prepared. The turn start
@@ -1606,13 +1612,16 @@ const makeWsRpcLayer = (
16061612
),
16071613
onSuccess: (threadDeleted) =>
16081614
Effect.fail(
1609-
threadDeleted
1615+
threadDeleted ||
1616+
(bootstrap?.createThread &&
1617+
bootstrap.prepareWorktree?.requireWorktree === true &&
1618+
!createdThread)
16101619
? new OrchestrationDispatchCommandError({
16111620
message: dispatchError.message,
16121621
...(dispatchError.cause !== undefined
16131622
? { cause: dispatchError.cause }
16141623
: {}),
1615-
bootstrapThreadDisposition: "deleted",
1624+
bootstrapThreadDisposition: threadDeleted ? "deleted" : "not-created",
16161625
})
16171626
: dispatchError,
16181627
),

‎apps/web/src/components/BranchToolbar.tsx‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export interface BranchToolbarHandle {
6666
}
6767

6868
interface BranchToolbarProps {
69+
forceNewWorktree?: boolean;
6970
ref?: Ref<BranchToolbarHandle>;
7071
environmentId: EnvironmentId;
7172
threadId: ThreadId;
@@ -89,6 +90,7 @@ interface BranchToolbarProps {
8990
}
9091

9192
interface MobileRunContextSelectorProps {
93+
forceNewWorktree: boolean;
9294
autoEnvironmentLabel?: string | undefined;
9395
onAutoEnvironment?: (() => void) | undefined;
9496
envLocked: boolean;
@@ -106,6 +108,7 @@ interface MobileRunContextSelectorProps {
106108
}
107109

108110
const MobileRunContextSelector = memo(function MobileRunContextSelector({
111+
forceNewWorktree,
109112
autoEnvironmentLabel,
110113
onAutoEnvironment,
111114
envLocked,
@@ -132,11 +135,13 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
132135
: activeWorktreePath
133136
? FolderGitIcon
134137
: FolderIcon;
135-
const workspaceLabel = envModeLocked
136-
? resolveLockedWorkspaceLabel(activeWorktreePath)
137-
: effectiveEnvMode === "worktree"
138-
? resolveEnvModeLabel("worktree")
139-
: resolveCurrentWorkspaceLabel(activeWorktreePath);
138+
const workspaceLabel = forceNewWorktree
139+
? resolveEnvModeLabel("worktree")
140+
: envModeLocked
141+
? resolveLockedWorkspaceLabel(activeWorktreePath)
142+
: effectiveEnvMode === "worktree"
143+
? resolveEnvModeLabel("worktree")
144+
: resolveCurrentWorkspaceLabel(activeWorktreePath);
140145
const isLocked = envLocked || envModeLocked;
141146
const workspaceIcon = (
142147
<Tooltip>
@@ -269,7 +274,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
269274
onEnvModeChange(value as EnvMode);
270275
}}
271276
>
272-
<MenuRadioItem disabled={envModeLocked} value="local">
277+
<MenuRadioItem disabled={envModeLocked || forceNewWorktree} value="local">
273278
<span className="flex min-w-0 items-center gap-1.5">
274279
{activeWorktreePath ? (
275280
<FolderGitIcon className="size-3" />
@@ -476,6 +481,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
476481
}
477482

478483
export const BranchToolbar = memo(function BranchToolbar({
484+
forceNewWorktree = false,
479485
ref,
480486
environmentId,
481487
threadId,
@@ -514,9 +520,11 @@ export const BranchToolbar = memo(function BranchToolbar({
514520
: null;
515521
const activeProject = useProject(activeProjectRef);
516522
const hasActiveThread = serverThread !== null || draftThread !== null;
517-
const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
523+
const activeWorktreePath = forceNewWorktree
524+
? null
525+
: (serverThread?.worktreePath ?? draftThread?.worktreePath ?? null);
518526
const effectiveEnvMode =
519-
effectiveEnvModeOverride ??
527+
(forceNewWorktree ? "worktree" : effectiveEnvModeOverride) ??
520528
resolveEffectiveEnvMode({
521529
activeWorktreePath,
522530
hasServerThread: serverThread !== null,
@@ -527,7 +535,8 @@ export const BranchToolbar = memo(function BranchToolbar({
527535
// "Previous worktree" hops a draft into the most recently active worktree
528536
// of this project — the "keep going where I just was" follow-up flow. Only
529537
// drafts can hop; started server threads have their workspace pinned.
530-
const canUsePreviousWorktree = draftThread !== null && serverThread === null && !envModeLocked;
538+
const canUsePreviousWorktree =
539+
draftThread !== null && serverThread === null && !envModeLocked && !forceNewWorktree;
531540
const projectRefsForWorktreeLookup = useMemo(
532541
() => (canUsePreviousWorktree && activeProjectRef ? [activeProjectRef] : []),
533542
[canUsePreviousWorktree, activeProjectRef],
@@ -606,6 +615,7 @@ export const BranchToolbar = memo(function BranchToolbar({
606615
{showGitControls ? (
607616
<div className="contents @3xl/composer-surface:hidden">
608617
<MobileRunContextSelector
618+
forceNewWorktree={forceNewWorktree}
609619
autoEnvironmentLabel={autoEnvironmentLabel}
610620
onAutoEnvironment={onAutoEnvironment}
611621
envLocked={envLocked}
@@ -652,6 +662,7 @@ export const BranchToolbar = memo(function BranchToolbar({
652662
)}
653663
{showGitControls ? (
654664
<BranchToolbarEnvModeSelector
665+
forceNewWorktree={forceNewWorktree}
655666
envLocked={envModeLocked}
656667
effectiveEnvMode={effectiveEnvMode}
657668
activeWorktreePath={activeWorktreePath}
@@ -677,13 +688,18 @@ export const BranchToolbar = memo(function BranchToolbar({
677688

678689
{showGitControls ? (
679690
<BranchToolbarBranchSelector
691+
forceNewWorktree={forceNewWorktree}
680692
ref={branchSelectorRef}
681693
className="min-w-0 flex-initial justify-end @3xl/composer-surface:ml-auto"
682694
environmentId={environmentId}
683695
threadId={threadId}
684696
{...(draftId ? { draftId } : {})}
685697
envLocked={envLocked}
686-
{...(effectiveEnvModeOverride ? { effectiveEnvModeOverride } : {})}
698+
{...(forceNewWorktree
699+
? { effectiveEnvModeOverride: "worktree" }
700+
: effectiveEnvModeOverride
701+
? { effectiveEnvModeOverride }
702+
: {})}
687703
{...(activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : {})}
688704
{...(onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : {})}
689705
startFromOrigin={startFromOrigin}

‎apps/web/src/components/BranchToolbarBranchSelector.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ export interface BranchToolbarBranchSelectorHandle {
7979
}
8080

8181
interface BranchToolbarBranchSelectorProps {
82+
forceNewWorktree?: boolean;
8283
ref?: Ref<BranchToolbarBranchSelectorHandle>;
8384
className?: string;
8485
environmentId: EnvironmentId;
@@ -99,6 +100,7 @@ function toBranchActionErrorMessage(error: unknown): string {
99100
}
100101

101102
export function BranchToolbarBranchSelector({
103+
forceNewWorktree = false,
102104
ref,
103105
className,
104106
environmentId,
@@ -152,7 +154,9 @@ export function BranchToolbarBranchSelector({
152154
activeThreadBranchOverride !== undefined
153155
? activeThreadBranchOverride
154156
: (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);
156160
const activeProjectCwd = activeProject?.workspaceRoot ?? null;
157161
const branchCwd = activeWorktreePath ?? activeProjectCwd;
158162
const hasServerThread = serverThread !== null;

‎apps/web/src/components/BranchToolbarEnvModeSelector.tsx‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
2222
const PREVIOUS_WORKTREE_SELECT_VALUE = "previous-worktree";
2323

2424
interface BranchToolbarEnvModeSelectorProps {
25+
forceNewWorktree?: boolean;
2526
envLocked: boolean;
2627
effectiveEnvMode: EnvMode;
2728
activeWorktreePath: string | null;
@@ -31,6 +32,7 @@ interface BranchToolbarEnvModeSelectorProps {
3132
}
3233

3334
export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
35+
forceNewWorktree = false,
3436
envLocked,
3537
effectiveEnvMode,
3638
activeWorktreePath,
@@ -51,15 +53,17 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
5153
[activeWorktreePath, previousWorktreeLabel, showPreviousWorktree],
5254
);
5355

54-
if (envLocked) {
56+
if (envLocked || forceNewWorktree) {
5557
return (
5658
<Tooltip>
5759
<TooltipTrigger
5860
render={<span />}
5961
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"
6062
data-composer-context-control
6163
>
62-
{activeWorktreePath ? (
64+
{forceNewWorktree ? (
65+
<FolderGit2Icon className="size-3 shrink-0" />
66+
) : activeWorktreePath ? (
6367
<FolderGitIcon className="size-3 shrink-0" />
6468
) : (
6569
<FolderIcon className="size-3 shrink-0" />
@@ -72,11 +76,17 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
7276
data-composer-label-motion
7377
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"
7478
>
75-
{resolveLockedWorkspaceLabel(activeWorktreePath)}
79+
{forceNewWorktree
80+
? resolveEnvModeLabel("worktree")
81+
: resolveLockedWorkspaceLabel(activeWorktreePath)}
7682
</span>
7783
</span>
7884
</TooltipTrigger>
79-
<TooltipPopup>{resolveLockedWorkspaceLabel(activeWorktreePath)}</TooltipPopup>
85+
<TooltipPopup>
86+
{forceNewWorktree
87+
? "Each model starts in its own worktree."
88+
: resolveLockedWorkspaceLabel(activeWorktreePath)}
89+
</TooltipPopup>
8090
</Tooltip>
8191
);
8292
}

0 commit comments

Comments
 (0)