fix(server): recreate a thread's worktree before starting a turn#7839

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

Merged
t3dotgg merged 2 commits into from
Aug 24, 2026
Merged

fix(server): recreate a thread's worktree before starting a turn #7839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
625fe5c
fix(server): recreate a thread's worktree before starting a turn
mackinleysmith Aug 21, 2026
130bcc4
test(server): keep reactor test within manual-runner lint baseline
mackinleysmith Aug 21, 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
7 changes: 7 additions & 0 deletions apps/server/src/git/GitWorkflowService.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
readonly removeWorktree: (
input: VcsRemoveWorktreeInput,
) => Effect.Effect<void, GitCommandError>;
readonly pruneWorktrees: (input: {
readonly cwd: string;
}) => Effect.Effect<void, GitCommandError>;
readonly createRef: (
input: VcsCreateRefInput,
) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
Effect.andThen(git.removeWorktree(input)),
),
pruneWorktrees: (input) =>
ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
Effect.andThen(git.pruneWorktrees(input)),
),
createRef: (input) =>
ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
Effect.andThen(git.createRef(input)),
Expand Down
53 changes: 53 additions & 0 deletions apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
: "renamed-branch",
}),
);
const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
const createWorktree = vi.fn(
(input: { readonly refName: string; readonly path: string | null }) =>
Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
);
const refreshStatus = vi.fn((_: string) =>
Effect.succeed({
isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
Layer.provideMerge(
Layer.mock(GitWorkflowService.GitWorkflowService)({
renameBranch,
pruneWorktrees,
createWorktree,
} satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
),
Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
respondToUserInput,
stopSession,
renameBranch,
pruneWorktrees,
createWorktree,
refreshStatus,
generateBranchName,
generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
});

it("recreates a missing worktree from the thread branch before starting a turn", async () => {
const harness = await createHarness();
const now = "2026-01-01T00:00:00.000Z";
const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

await harness.runEffect(
harness.engine.dispatch({
type: "thread.meta.update",
commandId: CommandId.make("cmd-thread-missing-worktree"),
threadId: ThreadId.make("thread-1"),
branch: "feature/restore",
worktreePath,
}),
);

await harness.runEffect(
harness.engine.dispatch({
type: "thread.turn.start",
commandId: CommandId.make("cmd-turn-start-missing-worktree"),
threadId: ThreadId.make("thread-1"),
message: {
messageId: asMessageId("user-message-missing-worktree"),
role: "user",
text: "continue",
attachments: [],
},
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
runtimeMode: "approval-required",
createdAt: now,
}),
);

await waitFor(() => harness.startSession.mock.calls.length === 1);
expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
expect(harness.createWorktree).toHaveBeenCalledWith({
cwd: "/tmp/provider-project",
refName: "feature/restore",
path: worktreePath,
});
expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
harness.startSession.mock.invocationCallOrder[0]!,
);
});

it("forwards codex model options through session start and turn send", async () => {
const harness = await createHarness();
const now = "2026-01-01T00:00:00.000Z";
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
const providerService = yield* ProviderService;
const providerRegistry = yield* ProviderRegistry;
const gitWorkflow = yield* GitWorkflowService;
const fileSystem = yield* FileSystem.FileSystem;
const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
const textGeneration = yield* TextGeneration;
const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
.pipe(Effect.map(Option.getOrUndefined));
});

/**
* Recreates a thread's worktree from its branch when the directory has
* disappeared. Provider sessions resume into the persisted cwd, so a missing
* worktree makes every later turn fail as a bogus "session not found".
* Best-effort: on failure the turn proceeds and reports the real error.
*/
const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
readonly id: ThreadId;
readonly projectId: ProjectId;
readonly branch: string | null;
readonly worktreePath: string | null;
}) {
const { worktreePath, branch } = thread;
if (!worktreePath || !branch) {
return;
}
const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
if (exists) {
return;
}
const project = yield* resolveProject(thread.projectId);
if (!project) {
return;
}
const cwd = project.workspaceRoot;
yield* Effect.logWarning("provider command reactor recreating missing worktree", {
threadId: thread.id,
worktreePath,
branch,
});
// A directory deleted without `git worktree remove` leaves an admin entry
// that makes `git worktree add` refuse the path; prune clears it.
yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
Effect.catchCause((cause) =>
Cause.hasInterruptsOnly(cause)
? Effect.failCause(cause)
: Effect.logWarning("provider command reactor failed to recreate worktree", {
threadId: thread.id,
worktreePath,
cause: Cause.pretty(cause),
}),
),
);
});

const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
return yield* projectionSnapshotQuery
.getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
return;
}

yield* ensureThreadWorktree(thread);

const isFirstUserMessageTurn =
thread.messages.filter((entry) => entry.role === "user").length === 1;
if (isFirstUserMessageTurn) {
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/vcs/GitVcsDriver.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
readonly removeWorktree: (
input: VcsRemoveWorktreeInput,
) => Effect.Effect<void, GitCommandError>;
/** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
readonly pruneWorktrees: (input: {
readonly cwd: string;
}) => Effect.Effect<void, GitCommandError>;
readonly renameBranch: (
input: GitRenameBranchInput,
) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down
10 changes: 10 additions & 0 deletions apps/server/src/vcs/GitVcsDriverCore.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
});
});

const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
"pruneWorktrees",
)(function* (input) {
yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
timeoutMs: 15_000,
fallbackErrorDetail: "git worktree prune failed",
});
});

const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
"renameBranch",
)(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(server): recreate a thread's worktree before starting a turn#7839

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

 Merged

t3dotgg
merged 2 commits into

from

Aug 24, 2026
 Merged


fix(server): recreate a thread's worktree before starting a turn
#7839
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
625fe5c

fix(server): recreate a thread's worktree before starting a turn


mackinleysmith Aug 21, 2026
130bcc4

test(server): keep reactor test within manual-runner lint baseline


mackinleysmith Aug 21, 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


7 changes: 7 additions & 0 deletions
apps/server/src/git/GitWorkflowService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ export class GitWorkflowService extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly createRef: (
 input: VcsCreateRefInput,
 ) => Effect.Effect<VcsCreateRefResult, GitCommandError>;
Expand DownExpand Up@@ -319,6 +322,10 @@ export const make = Effect.gen(function* () {
 ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
 Effect.andThen(git.removeWorktree(input)),
 ),
 pruneWorktrees: (input) =>
 ensureGitCommand("GitWorkflowService.pruneWorktrees", input.cwd).pipe(
 Effect.andThen(git.pruneWorktrees(input)),
 ),
 createRef: (input) =>
 ensureGitCommand("GitWorkflowService.createRef", input.cwd).pipe(
 Effect.andThen(git.createRef(input)),
Expand Down

53 changes: 53 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,6 +264,11 @@ describe("ProviderCommandReactor", () => {
 : "renamed-branch",
 }),
 );
 const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
 const createWorktree = vi.fn(
 (input: { readonly refName: string; readonly path: string | null }) =>
 Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
 );
 const refreshStatus = vi.fn((_: string) =>
 Effect.succeed({
 isRepo: true,
Expand DownExpand Up@@ -395,6 +400,8 @@ describe("ProviderCommandReactor", () => {
 Layer.provideMerge(
 Layer.mock(GitWorkflowService.GitWorkflowService)({
 renameBranch,
 pruneWorktrees,
 createWorktree,
 } satisfies Partial<GitWorkflowService.GitWorkflowService["Service"]>),
 ),
 Layer.provideMerge(
Expand DownExpand Up@@ -499,6 +506,8 @@ describe("ProviderCommandReactor", () => {
 respondToUserInput,
 stopSession,
 renameBranch,
 pruneWorktrees,
 createWorktree,
 refreshStatus,
 generateBranchName,
 generateThreadTitle,
Expand DownExpand Up@@ -1510,6 +1519,50 @@ describe("ProviderCommandReactor", () => {
 expect(harness.refreshStatus.mock.calls[0]?.[0]).toBe("/tmp/provider-project-worktree");
 });

 it("recreates a missing worktree from the thread branch before starting a turn", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
 const worktreePath = NodePath.join(harness.stateDir, "missing-worktree");

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.meta.update",
 commandId: CommandId.make("cmd-thread-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 branch: "feature/restore",
 worktreePath,
 }),
 );

 await harness.runEffect(
 harness.engine.dispatch({
 type: "thread.turn.start",
 commandId: CommandId.make("cmd-turn-start-missing-worktree"),
 threadId: ThreadId.make("thread-1"),
 message: {
 messageId: asMessageId("user-message-missing-worktree"),
 role: "user",
 text: "continue",
 attachments: [],
 },
 interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
 runtimeMode: "approval-required",
 createdAt: now,
 }),
 );

 await waitFor(() => harness.startSession.mock.calls.length === 1);
 expect(harness.pruneWorktrees).toHaveBeenCalledWith({ cwd: "/tmp/provider-project" });
 expect(harness.createWorktree).toHaveBeenCalledWith({
 cwd: "/tmp/provider-project",
 refName: "feature/restore",
 path: worktreePath,
 });
 expect(harness.createWorktree.mock.invocationCallOrder[0]).toBeLessThan(
 harness.startSession.mock.invocationCallOrder[0]!,
 );
 });

 it("forwards codex model options through session start and turn send", async () => {
 const harness = await createHarness();
 const now = "2026-01-01T00:00:00.000Z";
Expand Down

50 changes: 50 additions & 0 deletions
apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import * as Crypto from "effect/Crypto";
import * as Duration from "effect/Duration";
import * as Effect from "effect/Effect";
import * as Equal from "effect/Equal";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
Expand DownExpand Up@@ -305,6 +306,7 @@ const make = Effect.gen(function* () {
 const providerService = yield* ProviderService;
 const providerRegistry = yield* ProviderRegistry;
 const gitWorkflow = yield* GitWorkflowService;
 const fileSystem = yield* FileSystem.FileSystem;
 const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
 const textGeneration = yield* TextGeneration;
 const serverSettingsService = yield* ServerSettingsService;
Expand DownExpand Up@@ -428,6 +430,52 @@ const make = Effect.gen(function* () {
 .pipe(Effect.map(Option.getOrUndefined));
 });

 /**
 * Recreates a thread's worktree from its branch when the directory has
 * disappeared. Provider sessions resume into the persisted cwd, so a missing
 * worktree makes every later turn fail as a bogus "session not found".
 * Best-effort: on failure the turn proceeds and reports the real error.
 */
 const ensureThreadWorktree = Effect.fnUntraced(function* (thread: {
 readonly id: ThreadId;
 readonly projectId: ProjectId;
 readonly branch: string | null;
 readonly worktreePath: string | null;
 }) {
 const { worktreePath, branch } = thread;
 if (!worktreePath || !branch) {
 return;
 }
 const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
 if (exists) {
 return;
 }
 const project = yield* resolveProject(thread.projectId);
 if (!project) {
 return;
 }
 const cwd = project.workspaceRoot;
 yield* Effect.logWarning("provider command reactor recreating missing worktree", {
 threadId: thread.id,
 worktreePath,
 branch,
 });
 // A directory deleted without `git worktree remove` leaves an admin entry
 // that makes `git worktree add` refuse the path; prune clears it.
 yield* gitWorkflow.pruneWorktrees({ cwd }).pipe(
 Effect.andThen(gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath })),
 Effect.catchCause((cause) =>
 Cause.hasInterruptsOnly(cause)
 ? Effect.failCause(cause)
 : Effect.logWarning("provider command reactor failed to recreate worktree", {
 threadId: thread.id,
 worktreePath,
 cause: Cause.pretty(cause),
 }),
 ),
 );
 });

 const resolveThread = Effect.fnUntraced(function* (threadId: ThreadId) {
 return yield* projectionSnapshotQuery
 .getThreadDetailById(threadId)
Expand DownExpand Up@@ -1083,6 +1131,8 @@ const make = Effect.gen(function* () {
 return;
 }

 yield* ensureThreadWorktree(thread);

 const isFirstUserMessageTurn =
 thread.messages.filter((entry) => entry.role === "user").length === 1;
 if (isFirstUserMessageTurn) {
Expand Down

4 changes: 4 additions & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,6 +306,10 @@ export class GitVcsDriver extends Context.Service<
 readonly removeWorktree: (
 input: VcsRemoveWorktreeInput,
 ) => Effect.Effect<void, GitCommandError>;
 /** Drops worktree admin entries whose directory is already gone (`git worktree prune`). */
 readonly pruneWorktrees: (input: {
 readonly cwd: string;
 }) => Effect.Effect<void, GitCommandError>;
 readonly renameBranch: (
 input: GitRenameBranchInput,
 ) => Effect.Effect<GitRenameBranchResult, GitCommandError>;
Expand Down

10 changes: 10 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2993,6 +2993,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 });
 });

 const pruneWorktrees: GitVcsDriver.GitVcsDriver["Service"]["pruneWorktrees"] = Effect.fn(
 "pruneWorktrees",
 )(function* (input) {
 yield* executeGit("GitVcsDriver.pruneWorktrees", input.cwd, ["worktree", "prune"], {
 timeoutMs: 15_000,
 fallbackErrorDetail: "git worktree prune failed",
 });
 });

 const renameBranch: GitVcsDriver.GitVcsDriver["Service"]["renameBranch"] = Effect.fn(
 "renameBranch",
 )(function* (input) {
Expand DownExpand Up@@ -3197,6 +3206,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 withListRefsInvalidation(input.cwd, fetchRemoteTrackingBranch(input)),
 setBranchUpstream: (input) => withListRefsInvalidation(input.cwd, setBranchUpstream(input)),
 removeWorktree: (input) => withListRefsInvalidation(input.cwd, removeWorktree(input)),
 pruneWorktrees: (input) => withListRefsInvalidation(input.cwd, pruneWorktrees(input)),
 renameBranch: (input) => withListRefsInvalidation(input.cwd, renameBranch(input)),
 createRef: (input) => withListRefsInvalidation(input.cwd, createRef(input)),
 switchRef: (input) => withListRefsInvalidation(input.cwd, switchRef(input)),
Expand Down
Loading