The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 08:30 UTC
fix(server): worktree recovery no longer fails on Windows when the emptied folder is in use (#38163)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Guilherme Bernardes Rodrigues committed
Nov 17, 2026 at 08:48 UTC
56e449ff58ab039f0873cd30b55453abb482614f
2 files changed
+70
-3
apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
+58
-1
@@ -337,6 +337,61 @@ effectIt.effect("restores a missing worktree before a send only under the worksp
337
}).pipe(Effect.provide(layerRestoreLeaseTest)),
338
);
339
340
+effectIt.effect("restores into a leftover worktree folder that cannot itself be removed", () => {
341
+ const worktreePath = `${managedWorktreesDir}/project/feature-restore`;
342
+ // Windows refuses to remove a folder that is still some process's cwd.
343
+ const remove = vi.fn((target: string) =>
344
+ target === worktreePath
345
+ ? Effect.fail(
346
+ PlatformError.systemError({
347
+ _tag: "Busy",
348
+ module: "FileSystem",
349
+ method: "remove",
350
+ pathOrDescriptor: target,
351
+ }),
352
+ )
353
+ : Effect.void,
354
+ );
355
+ const createWorktree = vi.fn(() => Effect.succeed({} as never));
356
+ return Effect.gen(function* () {
357
+ const { restore } = yield* ThreadWorktreeRestore;
358
+ yield* restore({
359
+ id: ThreadId.make("thread_leftover_restore"),
360
+ projectId: ProjectId.make("project_leftover_restore"),
361
+ worktreePath,
362
+ branch: "feature/restore",
363
+ });
364
+ expect(remove).toHaveBeenCalledWith(`${worktreePath}/node_modules`, { recursive: true });
365
+ expect(createWorktree).toHaveBeenCalledTimes(1);
366
+ }).pipe(
367
+ Effect.provide(
368
+ layerThreadWorktreeRestore.pipe(
369
+ Layer.provide(
370
+ Layer.mergeAll(
371
+ Layer.succeed(FileSystem.FileSystem, {
372
+ exists: (target: string) => Effect.succeed(!target.endsWith("/.git")),
373
+ readDirectory: () => Effect.succeed(["node_modules"]),
374
+ stat: () => Effect.succeed({ type: "Directory" }),
375
+ realPath: (target: string) => Effect.succeed(normalize(target)),
376
+ remove,
377
+ } as never),
378
+ layerWorktreeLocation(),
379
+ Layer.mock(GitWorkflow.GitWorkflowService)({
380
+ pruneWorktrees: () => Effect.void,
381
+ createWorktree,
382
+ listLocalBranchNames: () => Effect.succeed(["feature/restore"]),
383
+ }),
384
+ Layer.mock(ProjectService.ProjectService)({
385
+ getById: () =>
386
+ Effect.succeedSome({ workspaceRoot: "/tmp/provider-turn-start-project" } as never),
387
+ }),
388
+ ),
389
+ ),
390
+ ),
391
+ ),
392
+ );
393
+});
394
+
395
it.each([
396
{ label: "directly in the scratch root", folder: "/tmp/t3-home/scratch/notes", recreated: true },
397
{ label: "below another folder", folder: "/tmp/t3-home/scratch/notes/deep", recreated: false },
@@ -2445,7 +2500,9 @@ effectIt.effect.each(["cleanup-first", "startup-first"])(
2500
failReadsAfterRunning: true,
2501
});
2502
harness.createWorktree.mockImplementation(() =>
2448
- fileSystem.makeDirectory(worktreePath).pipe(Effect.as({} as never), Effect.orDie),
2503
+ fileSystem
2504
+ .makeDirectory(worktreePath, { recursive: true })
2505
+ .pipe(Effect.as({} as never), Effect.orDie),
2506
);
2507
const open = harness.open.getMockImplementation()!;
2508
harness.open.mockImplementation(() =>
apps/server/src/workspace/restoreMissingWorktree.ts
+12
-2
@@ -182,8 +182,18 @@ export const makeRestoreMissingWorktree = Effect.gen(function* () {
182
worktreePath,
183
branch,
184
});
185
- // `git worktree add` refuses a non-empty target.
186
- yield* (leftover ? fileSystem.remove(worktreePath, { recursive: true }) : Effect.void).pipe(
185
+ // `git worktree add` refuses a non-empty target but accepts an empty one. Keep the folder
186
+ // itself: Windows cannot remove a folder that is still a terminal's or provider's cwd.
187
+ const clearLeftovers = Effect.suspend(() => fileSystem.readDirectory(worktreePath)).pipe(
188
+ Effect.flatMap((entries) =>
189
+ Effect.forEach(
190
+ entries,
191
+ (entry) => fileSystem.remove(path.join(worktreePath, entry), { recursive: true }),
192
+ { discard: true },
193
+ ),
194
+ ),
195
+ );
196
+ yield* (leftover ? clearLeftovers : Effect.void).pipe(
197
Effect.andThen(recreateMissingWorktree({ cwd: project.workspaceRoot, worktreePath, branch })),
198
Effect.mapError((cause) =>
199
cause._tag === "WorktreeRecreateNoBaseError"