Skip to content

Commit 329d8f3

Browse files
Lenoridevclaude
andcommitted
fix(server): worktree dev servers no longer clean up real worktrees
A worktree's dev home is seeded from the developer's real database, so its threads point at real checkouts. If copied settings also name the real worktrees folder and turn on a cleanup rule, StorageCleanup removes those checkouts. In a git worktree's dev home, only treat that home's own worktrees folder as managed. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 41443e5 commit 329d8f3

2 files changed

Lines changed: 64 additions & 6 deletions

File tree

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,6 +1755,57 @@ describe("orphan worktree reports", () => {
17551755
),
17561756
);
17571757

1758+
it.live.each([
1759+
{ home: "an installed", worktreeHome: false, customFolderOutcome: "removed" },
1760+
{ home: "a git worktree's dev", worktreeHome: true, customFolderOutcome: "kept" },
1761+
] as const)(
1762+
"on $home home, a custom worktrees folder ends $customFolderOutcome",
1763+
({ worktreeHome, customFolderOutcome }) =>
1764+
runCleanupTest(
1765+
Effect.gen(function* () {
1766+
const fs = yield* FileSystem.FileSystem;
1767+
const config = yield* ServerConfig.ServerConfig;
1768+
const checkout = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-dev-checkout-" });
1769+
yield* fs.writeFileString(`${checkout}/.git`, "gitdir: /repo/.git/worktrees/dev\n");
1770+
const baseDir = worktreeHome ? `${checkout}/.t3` : config.baseDir;
1771+
const fixture = yield* cleanupFixture().pipe(
1772+
Effect.provideService(ServerConfig.ServerConfig, {
1773+
...config,
1774+
baseDir,
1775+
worktreesDir: `${baseDir}/worktrees`,
1776+
}),
1777+
);
1778+
const customFolder = yield* fs.realPath(
1779+
yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-real-worktrees-" }),
1780+
);
1781+
const realWorktree = `${customFolder}/seeded`;
1782+
yield* fixture.command(fixture.repo, ["worktree", "add", "-b", "seeded", realWorktree]);
1783+
fixture.setSettings({ worktreesDirectory: customFolder });
1784+
fixture.setThreads([
1785+
shell({ branch: "feature", worktreePath: fixture.worktree }),
1786+
shell({
1787+
id: ThreadId.make("seeded"),
1788+
lineage: {
1789+
rootThreadId: ThreadId.make("seeded"),
1790+
parentThreadId: null,
1791+
relationshipToParent: null,
1792+
},
1793+
branch: "seeded",
1794+
worktreePath: realWorktree,
1795+
}),
1796+
]);
1797+
1798+
const { entries } = yield* fixture.service.runNow;
1799+
1800+
expect(entries.find((entry) => entry.path === realWorktree)?.outcome).toBe(
1801+
customFolderOutcome,
1802+
);
1803+
expect(yield* fs.exists(realWorktree)).toBe(customFolderOutcome === "kept");
1804+
expect(yield* fs.exists(fixture.worktree)).toBe(false);
1805+
}),
1806+
),
1807+
);
1808+
17581809
it.live("skips symbolic links at both directory levels and disabled cleanup", () =>
17591810
runCleanupTest(
17601811
Effect.gen(function* () {

‎apps/server/src/storageCleanup.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type {
1717
ThreadId,
1818
} from "@t3tools/contracts";
1919
import { resolveWorktreeCleanup } from "@t3tools/shared/projectSettings";
20+
import { resolveWorktreeT3Home } from "@t3tools/shared/devHome";
2021
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
2122
import * as Context from "effect/Context";
2223
import * as Deferred from "effect/Deferred";
@@ -824,12 +825,18 @@ const make = Effect.gen(function* () {
824825
let waiting = false;
825826
const kept: string[] = [];
826827
const roots: Array<string> = [];
827-
for (const directory of managedWorktreesDirectories(
828-
serverSettings,
829-
config.worktreesDir,
830-
path,
831-
yield* HostProcess.HomeDirectory,
832-
)) {
828+
// A git worktree's dev home is seeded from real data, so its threads and any
829+
// copied settings can point at the developer's real worktrees.
830+
const isWorktreeDevHome =
831+
(yield* resolveWorktreeT3Home(config.baseDir)) === path.resolve(config.baseDir);
832+
for (const directory of isWorktreeDevHome
833+
? [config.worktreesDir]
834+
: managedWorktreesDirectories(
835+
serverSettings,
836+
config.worktreesDir,
837+
path,
838+
yield* HostProcess.HomeDirectory,
839+
)) {
833840
const root = yield* fs.exists(directory).pipe(
834841
Effect.flatMap((exists) => (exists ? fs.realPath(directory) : Effect.succeed(null))),
835842
Effect.orElseSucceed(() => null),

0 commit comments

Comments
 (0)