Skip to content

fix(server): deleted worktrees no longer break thread turns #6585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Deepusleepy wants to merge 4 commits into from
Closed

fix(server): deleted worktrees no longer break thread turns #6585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c5b058
fix(server): recover deleted thread worktrees
Deepusleepy Aug 14, 2026
1a687ee
fix(server): keep recovered threads on their branch
Deepusleepy Aug 14, 2026
4fd03cf
fix(server): preserve checkout error causes
Deepusleepy Aug 14, 2026
ca37fde
fix(server): recover before first-turn helpers
Deepusleepy Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 245 additions & 11 deletions apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ describe("ProviderCommandReactor", () => {
readonly threadModelSelection?: ModelSelection;
readonly sessionModelSwitch?: "unsupported" | "in-session";
readonly requiresNewThreadForModelChange?: boolean;
readonly currentBranch?: string;
readonly titleRegenerationCompletionDispatchFailures?: number;
readonly titleRegenerationBeforeStart?: "one" | "two";
readonly startSessionEffect?: (
Expand All @@ -160,8 +161,13 @@ describe("ProviderCommandReactor", () => {
createdBaseDirs.add(baseDir);
const { stateDir } = deriveServerPathsSync(baseDir, undefined);
createdStateDirs.add(stateDir);
const workspaceRoot = NodePath.join(baseDir, "provider-project");
const worktreePath = NodePath.join(baseDir, "provider-project-worktree");
NodeFS.mkdirSync(workspaceRoot, { recursive: true });
NodeFS.mkdirSync(worktreePath, { recursive: true });
const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());
let nextSessionIndex = 1;
let currentBranch = input?.currentBranch ?? "main";
const runtimeSessions: Array<ProviderSession> = [];
const modelSelection = input?.threadModelSelection ?? {
instanceId: ProviderInstanceId.make("codex"),
Expand Down Expand Up @@ -282,6 +288,20 @@ describe("ProviderCommandReactor", () => {
pr: null,
}),
);
const refreshLocalStatus = vi.fn((_: string) =>
Effect.succeed({
isRepo: true,
hasPrimaryRemote: true,
isDefaultRef: false,
refName: currentBranch,
hasWorkingTreeChanges: false,
workingTree: {
files: [],
insertions: 0,
deletions: 0,
},
}),
);
const generateBranchName = vi.fn<TextGenerationShape["generateBranchName"]>((_) =>
Effect.fail(
new TextGenerationError({
Expand Down Expand Up @@ -400,8 +420,7 @@ describe("ProviderCommandReactor", () => {
Layer.provideMerge(
Layer.succeed(VcsStatusBroadcaster, {
getStatus: () => Effect.die("getStatus should not be called in this test"),
refreshLocalStatus: () =>
Effect.die("refreshLocalStatus should not be called in this test"),
refreshLocalStatus,
refreshStatus,
streamStatus: () => Stream.die("streamStatus should not be called in this test"),
}),
Expand Down Expand Up @@ -429,7 +448,7 @@ describe("ProviderCommandReactor", () => {
commandId: CommandId.make("cmd-project-create"),
projectId: asProjectId("project-1"),
title: "Provider Project",
workspaceRoot: "/tmp/provider-project",
workspaceRoot,
defaultModelSelection: modelSelection,
createdAt: now,
}),
Expand Down Expand Up @@ -500,9 +519,15 @@ describe("ProviderCommandReactor", () => {
stopSession,
renameBranch,
refreshStatus,
refreshLocalStatus,
generateBranchName,
generateThreadTitle,
runtimeSessions,
setCurrentBranch: (branch: string) => {
currentBranch = branch;
},
workspaceRoot,
worktreePath,
stateDir,
drain,
runEffect,
Expand Down Expand Up @@ -537,7 +562,7 @@ describe("ProviderCommandReactor", () => {
await waitFor(() => harness.sendTurn.mock.calls.length === 1);
expect(harness.startSession.mock.calls[0]?.[0]).toEqual(ThreadId.make("thread-1"));
expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
cwd: "/tmp/provider-project",
cwd: harness.workspaceRoot,
modelSelection: {
instanceId: ProviderInstanceId.make("codex"),
model: "gpt-5-codex",
Expand All @@ -552,6 +577,215 @@ describe("ProviderCommandReactor", () => {
expect(thread?.session?.runtimeMode).toBe("approval-required");
});

it("repairs a deleted worktree before starting first-turn helpers", async () => {
const recoveredBranch = "t3code/1234abcd";
const harness = await createHarness({ currentBranch: recoveredBranch });
const missingWorktreePath = NodePath.join(harness.workspaceRoot, "deleted-worktree");
const now = "2026-01-01T00:00:00.000Z";
harness.generateBranchName.mockReturnValue(Effect.succeed({ branch: "recovered branch" }));
harness.generateThreadTitle.mockReturnValue(Effect.succeed({ title: "Recovered title" }));

await Effect.runPromise(
harness.engine.dispatch({
type: "thread.meta.update",
commandId: CommandId.make("cmd-thread-deleted-worktree"),
threadId: ThreadId.make("thread-1"),
branch: recoveredBranch,
worktreePath: missingWorktreePath,
}),
);
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
commandId: CommandId.make("cmd-turn-start-deleted-worktree"),
threadId: ThreadId.make("thread-1"),
message: {
messageId: asMessageId("user-message-deleted-worktree"),
role: "user",
text: "continue from the project checkout",
attachments: [],
},
titleSeed: "Thread",
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
runtimeMode: "approval-required",
createdAt: now,
}),
);

await waitFor(() => harness.sendTurn.mock.calls.length === 1);
await waitFor(() => harness.generateBranchName.mock.calls.length === 1);
await waitFor(() => harness.generateThreadTitle.mock.calls.length === 1);
await waitFor(() => harness.renameBranch.mock.calls.length === 1);
expect(harness.refreshLocalStatus).toHaveBeenCalledWith(harness.workspaceRoot);
expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
cwd: harness.workspaceRoot,
});
expect(harness.generateBranchName.mock.calls[0]?.[0]).toMatchObject({
cwd: harness.workspaceRoot,
});
expect(harness.generateThreadTitle.mock.calls[0]?.[0]).toMatchObject({
cwd: harness.workspaceRoot,
});
expect(harness.renameBranch.mock.calls[0]?.[0]).toMatchObject({
cwd: harness.workspaceRoot,
oldBranch: recoveredBranch,
});
await waitFor(async () => {
const readModel = await harness.readModel();
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
return (
thread?.branch === "t3code/recovered-branch" &&
thread.worktreePath === null &&
thread.title === "Recovered title"
);
});
const readModel = await harness.readModel();
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
expect(thread?.branch).toBe("t3code/recovered-branch");
expect(thread?.worktreePath).toBeNull();
expect(thread?.title).toBe("Recovered title");
});

it("refuses to repair a deleted worktree onto a different branch", async () => {
const harness = await createHarness({ currentBranch: "main" });
const missingWorktreePath = NodePath.join(harness.workspaceRoot, "deleted-worktree");
const now = "2026-01-01T00:00:00.000Z";

await Effect.runPromise(
harness.engine.dispatch({
type: "thread.meta.update",
commandId: CommandId.make("cmd-thread-deleted-worktree-wrong-branch"),
threadId: ThreadId.make("thread-1"),
branch: "feature/original-worktree",
worktreePath: missingWorktreePath,
}),
);
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
commandId: CommandId.make("cmd-turn-start-deleted-worktree-wrong-branch"),
threadId: ThreadId.make("thread-1"),
message: {
messageId: asMessageId("user-message-deleted-worktree-wrong-branch"),
role: "user",
text: "do not run on the wrong branch",
attachments: [],
},
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
runtimeMode: "approval-required",
createdAt: now,
}),
);

await waitFor(async () => {
if (harness.startSession.mock.calls.length > 0) return true;
const readModel = await harness.readModel();
return (
readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"))?.session
?.status === "error"
);
});
expect(harness.startSession).not.toHaveBeenCalled();
expect(harness.sendTurn).not.toHaveBeenCalled();
const readModel = await harness.readModel();
const thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
expect(thread?.session?.lastError).toContain(missingWorktreePath);
expect(thread?.session?.lastError).toContain("feature/original-worktree");
expect(thread?.session?.lastError).toContain("main");
});

it("keeps validating the branch after recovering a deleted worktree", async () => {
let failStartup = true;
const harness = await createHarness({
currentBranch: "main",
startSessionEffect: (session) =>
failStartup
? Effect.fail(
new ProviderAdapterRequestError({
provider: "codex",
method: "thread.start",
detail: "deterministic startup failure",
}),
)
: Effect.succeed(session),
});
const missingWorktreePath = NodePath.join(harness.workspaceRoot, "deleted-worktree");
const now = "2026-01-01T00:00:00.000Z";

await Effect.runPromise(
harness.engine.dispatch({
type: "thread.meta.update",
commandId: CommandId.make("cmd-thread-deleted-worktree-follow-up"),
threadId: ThreadId.make("thread-1"),
branch: "main",
worktreePath: missingWorktreePath,
}),
);
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
commandId: CommandId.make("cmd-turn-start-deleted-worktree-failed-startup"),
threadId: ThreadId.make("thread-1"),
message: {
messageId: asMessageId("user-message-deleted-worktree-failed-startup"),
role: "user",
text: "recover, then fail to start",
attachments: [],
},
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
runtimeMode: "approval-required",
createdAt: now,
}),
);

await waitFor(async () => {
const readModel = await harness.readModel();
return (
readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"))?.session
?.status === "error"
);
});
let readModel = await harness.readModel();
let thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
expect(thread?.worktreePath).toBeNull();
expect(harness.startSession).toHaveBeenCalledTimes(1);

harness.setCurrentBranch("feature/other");
failStartup = false;
await Effect.runPromise(
harness.engine.dispatch({
type: "thread.turn.start",
commandId: CommandId.make("cmd-turn-start-deleted-worktree-branch-drift"),
threadId: ThreadId.make("thread-1"),
message: {
messageId: asMessageId("user-message-deleted-worktree-branch-drift"),
role: "user",
text: "do not retry on a different branch",
attachments: [],
},
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
runtimeMode: "approval-required",
createdAt: "2026-01-01T00:00:01.000Z",
}),
);

await waitFor(async () => {
if (harness.startSession.mock.calls.length > 1) return true;
const currentReadModel = await harness.readModel();
return (
currentReadModel.threads
.find((entry) => entry.id === ThreadId.make("thread-1"))
?.session?.lastError?.includes("feature/other") ?? false
);
});
expect(harness.startSession).toHaveBeenCalledTimes(1);
expect(harness.sendTurn).not.toHaveBeenCalled();
readModel = await harness.readModel();
thread = readModel.threads.find((entry) => entry.id === ThreadId.make("thread-1"));
expect(thread?.session?.lastError).toContain("main");
expect(thread?.session?.lastError).toContain("feature/other");
});

effectIt.effect("projects starting before a slow provider session finishes", () =>
Effect.gen(function* () {
const releaseStart = yield* Deferred.make<void>();
Expand Down Expand Up @@ -775,7 +1009,7 @@ describe("ProviderCommandReactor", () => {

expect(harness.generateThreadTitle).toHaveBeenCalledTimes(1);
expect(harness.generateThreadTitle.mock.calls[0]?.[0]).toMatchObject({
cwd: "/tmp/provider-project",
cwd: harness.workspaceRoot,
previousTitle: "Investigate reconnect regressions",
message: [
"USER:",
Expand Down Expand Up @@ -1466,7 +1700,7 @@ describe("ProviderCommandReactor", () => {
commandId: CommandId.make("cmd-thread-branch"),
threadId: ThreadId.make("thread-1"),
branch: "t3code/1234abcd",
worktreePath: "/tmp/provider-project-worktree",
worktreePath: harness.worktreePath,
}),
);

Expand Down Expand Up @@ -1507,7 +1741,7 @@ describe("ProviderCommandReactor", () => {
expect(harness.generateBranchName.mock.calls[0]?.[0]).toMatchObject({
message: "Add a safer reconnect backoff.",
});
expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe(harness.worktreePath);
});

it("forwards codex model options through session start and turn send", async () => {
Expand Down Expand Up @@ -2000,15 +2234,15 @@ describe("ProviderCommandReactor", () => {
await waitFor(() => harness.startSession.mock.calls.length === 1);
await waitFor(() => harness.sendTurn.mock.calls.length === 1);
expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
cwd: "/tmp/provider-project",
cwd: harness.workspaceRoot,
});

await Effect.runPromise(
harness.engine.dispatch({
type: "thread.meta.update",
commandId: CommandId.make("cmd-thread-worktree-change"),
threadId: ThreadId.make("thread-1"),
worktreePath: "/tmp/provider-project-worktree",
worktreePath: harness.worktreePath,
}),
);

Expand All @@ -2034,7 +2268,7 @@ describe("ProviderCommandReactor", () => {
expect(harness.stopSession.mock.calls.length).toBe(0);
expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({
threadId: ThreadId.make("thread-1"),
cwd: "/tmp/provider-project-worktree",
cwd: harness.worktreePath,
resumeCursor: { opaque: "resume-1" },
modelSelection: {
instanceId: ProviderInstanceId.make("claudeAgent"),
Expand Down Expand Up @@ -2567,7 +2801,7 @@ describe("ProviderCommandReactor", () => {
status: "ready",
runtimeMode: "approval-required",
threadId: ThreadId.make("thread-1"),
cwd: "/tmp/provider-project",
cwd: harness.workspaceRoot,
resumeCursor: { opaque: "resume-without-instance" },
createdAt: now,
updatedAt: now,
Expand Down
Loading
Loading