Skip to content

Commit 75c1f57

Browse files
committed
fix(server): type pnpm store directory read failures during cleanup
1 parent bea0ede commit 75c1f57

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

‎apps/server/src/storageCleanup.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,15 @@ class PnpmModulesManifestParseError extends Schema.TaggedError<PnpmModulesManife
7878
}
7979
}
8080

81+
class WorktreeDirectoryReadError extends Schema.TaggedError<WorktreeDirectoryReadError>()(
82+
"WorktreeDirectoryReadError",
83+
{ cause: Schema.Defect() },
84+
) {
85+
override get message(): string {
86+
return "Could not read a worktree directory.";
87+
}
88+
}
89+
8190
const DAY_MS = 86_400_000;
8291
// Give settle scripts time to open terminals that protect the worktree.
8392
const SETTLE_SCRIPT_GRACE_MS = 60_000;
@@ -432,7 +441,10 @@ const make = Effect.gen(function* () {
432441
} else if (stat.type === "Directory") {
433442
const dirents =
434443
skipped !== null && (target === skipped || inside(skipped, target))
435-
? yield* Effect.tryPromise(() => NodeFSP.readdir(target, { withFileTypes: true }))
444+
? yield* Effect.tryPromise({
445+
try: () => NodeFSP.readdir(target, { withFileTypes: true }),
446+
catch: (cause) => new WorktreeDirectoryReadError({ cause }),
447+
})
436448
: null;
437449
const names = dirents?.map((entry) => entry.name) ?? (yield* fs.readDirectory(target));
438450
const markers = inspectRepositories ? names.map((name) => name.toLowerCase()) : [];

0 commit comments

Comments
 (0)