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, 18:30 UTC
fix(server): worktree dev servers no longer clean up real worktrees (#33902)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Lenori committed
Nov 12, 2026 at 21:07 UTC
18188ba0b81a5db804ea26757eca85bd084d6b97
2 files changed
+64
-6
apps/server/src/storageCleanup.test.ts
+51
@@ -1762,6 +1762,57 @@ describe("orphan worktree reports", () => {
1762
),
1763
);
1764
1765
+ it.live.each([
1766
+ { home: "an installed", worktreeHome: false, customFolderOutcome: "removed" },
1767
+ { home: "a git worktree's dev", worktreeHome: true, customFolderOutcome: "kept" },
1768
+ ] as const)(
1769
+ "on $home home, a custom worktrees folder ends $customFolderOutcome",
1770
+ ({ worktreeHome, customFolderOutcome }) =>
1771
+ runCleanupTest(
1772
+ Effect.gen(function* () {
1773
+ const fs = yield* FileSystem.FileSystem;
1774
+ const config = yield* ServerConfig.ServerConfig;
1775
+ const checkout = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-dev-checkout-" });
1776
+ yield* fs.writeFileString(`${checkout}/.git`, "gitdir: /repo/.git/worktrees/dev\n");
1777
+ const baseDir = worktreeHome ? `${checkout}/.t3` : config.baseDir;
1778
+ const fixture = yield* cleanupFixture().pipe(
1779
+ Effect.provideService(ServerConfig.ServerConfig, {
1780
+ ...config,
1781
+ baseDir,
1782
+ worktreesDir: `${baseDir}/worktrees`,
1783
+ }),
1784
+ );
1785
+ const customFolder = yield* fs.realPath(
1786
+ yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-real-worktrees-" }),
1787
+ );
1788
+ const realWorktree = `${customFolder}/seeded`;
1789
+ yield* fixture.command(fixture.repo, ["worktree", "add", "-b", "seeded", realWorktree]);
1790
+ fixture.setSettings({ worktreesDirectory: customFolder });
1791
+ fixture.setThreads([
1792
+ shell({ branch: "feature", worktreePath: fixture.worktree }),
1793
+ shell({
1794
+ id: ThreadId.make("seeded"),
1795
+ lineage: {
1796
+ rootThreadId: ThreadId.make("seeded"),
1797
+ parentThreadId: null,
1798
+ relationshipToParent: null,
1799
+ },
1800
+ branch: "seeded",
1801
+ worktreePath: realWorktree,
1802
+ }),
1803
+ ]);
1804
+
1805
+ const { entries } = yield* fixture.service.runNow;
1806
+
1807
+ expect(entries.find((entry) => entry.path === realWorktree)?.outcome).toBe(
1808
+ customFolderOutcome,
1809
+ );
1810
+ expect(yield* fs.exists(realWorktree)).toBe(customFolderOutcome === "kept");
1811
+ expect(yield* fs.exists(fixture.worktree)).toBe(false);
1812
+ }),
1813
+ ),
1814
+ );
1815
+
1816
it.live("skips symbolic links at both directory levels and disabled cleanup", () =>
1817
runCleanupTest(
1818
Effect.gen(function* () {
apps/server/src/storageCleanup.ts
+13
-6
@@ -17,6 +17,7 @@ import type {
17
ThreadId,
18
} from "@t3tools/contracts";
19
import { resolveWorktreeCleanup } from "@t3tools/shared/projectSettings";
20
+import { resolveWorktreeT3Home } from "@t3tools/shared/devHome";
21
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
22
import * as Context from "effect/Context";
23
import * as Deferred from "effect/Deferred";
@@ -925,12 +926,18 @@ const make = Effect.gen(function* () {
926
let waiting = false;
927
const kept: string[] = [];
928
const roots: Array<string> = [];
928
- for (const directory of managedWorktreesDirectories(
929
- serverSettings,
930
- config.worktreesDir,
931
- path,
932
- yield* HostProcess.HomeDirectory,
933
- )) {
929
+ // A git worktree's dev home is seeded from real data, so its threads and any
930
+ // copied settings can point at the developer's real worktrees.
931
+ const isWorktreeDevHome =
932
+ (yield* resolveWorktreeT3Home(config.baseDir)) === path.resolve(config.baseDir);
933
+ for (const directory of isWorktreeDevHome
934
+ ? [config.worktreesDir]
935
+ : managedWorktreesDirectories(
936
+ serverSettings,
937
+ config.worktreesDir,
938
+ path,
939
+ yield* HostProcess.HomeDirectory,
940
+ )) {
941
const root = yield* fs.exists(directory).pipe(
942
Effect.flatMap((exists) => (exists ? fs.realPath(directory) : Effect.succeed(null))),
943
Effect.orElseSucceed(() => null),