Skip to content

Commit 06c0db5

Browse files
fix(server): compare a stopped session's cwd by path key
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c481a9e commit 06c0db5

1 file changed

Lines changed: 15 additions & 10 deletions

File tree

‎apps/server/src/storageCleanup.ts‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,16 +1282,21 @@ const make = Effect.gen(function* () {
12821282
yield* forkParked(
12831283
Stream.runForEach(events, (event) => {
12841284
if (event.type === "thread.deleted") deletions++;
1285-
return (event.type === "thread.deleted" ||
1286-
(event.type === "provider-session.updated" &&
1287-
(event.payload.status === "stopped" || event.payload.status === "error") &&
1288-
(deletedWorktreeWaits ||
1289-
deletions !== sweptDeletions ||
1290-
keptDeletedWorktrees.some((worktreePath) => {
1291-
const cwd = path.resolve(event.payload.cwd);
1292-
return cwd === worktreePath || inside(worktreePath, cwd);
1293-
})))) &&
1294-
anyWorktreePolicy(lastSettings, (rules) => rules.worktreeOnDelete)
1285+
else if (
1286+
event.type !== "provider-session.updated" ||
1287+
(event.payload.status !== "stopped" && event.payload.status !== "error")
1288+
)
1289+
return Effect.void;
1290+
else if (!deletedWorktreeWaits && deletions === sweptDeletions) {
1291+
const cwd = pathKey(event.payload.cwd);
1292+
if (
1293+
!keptDeletedWorktrees.some(
1294+
(worktreePath) => pathKey(worktreePath) === cwd || inside(worktreePath, cwd),
1295+
)
1296+
)
1297+
return Effect.void;
1298+
}
1299+
return anyWorktreePolicy(lastSettings, (rules) => rules.worktreeOnDelete)
12951300
? requestSweep
12961301
: Effect.void;
12971302
}).pipe(

0 commit comments

Comments
 (0)