Skip to content

Commit 4c6ab17

Browse files
committed
fix(server): recheck recovery settings before worktree removal
1 parent 8ecdd49 commit 4c6ab17

2 files changed

Lines changed: 31 additions & 4 deletions

File tree

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,6 +2282,33 @@ describe("storage cleanup reports and local file policies", () => {
22822282
});
22832283

22842284
describe("settled worktree rechecks", () => {
2285+
it.live.each(["autoResumeLimitedThreads", "snoozeLimitedThreads"] as const)(
2286+
"keeps a usage-limited checkout when %s is enabled during measurement",
2287+
(preference) =>
2288+
runCleanupTest(
2289+
Effect.gen(function* () {
2290+
const fixture = yield* pausedMeasurementFixture();
2291+
fixture.setSettings({ autoResumeLimitedThreads: false, snoozeLimitedThreads: false });
2292+
fixture.setThreads([
2293+
shell({
2294+
branch: "feature",
2295+
worktreePath: fixture.worktree,
2296+
status: "failed",
2297+
latestRunId: RunId.make("limited-run"),
2298+
lastErrorClass: "usage_limit",
2299+
usageLimitResetAt: DateTime.formatIso(at(DAY_MS)),
2300+
}),
2301+
]);
2302+
const run = yield* fixture.service.runNow.pipe(Effect.forkChild);
2303+
yield* Deferred.await(fixture.measuring);
2304+
fixture.setSettings({ [preference]: true });
2305+
yield* Deferred.succeed(fixture.resume, undefined);
2306+
const report = yield* Fiber.join(run);
2307+
expect(report.entries[0]?.outcome).toBe("kept");
2308+
expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
2309+
}),
2310+
),
2311+
);
22852312
it.live.each([{ settledAt: null }, { settledAt: at(DAY_MS) }])(
22862313
"keeps a checkout changed during measurement (%j)",
22872314
(change) =>

‎apps/server/src/storageCleanup.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,11 +1048,11 @@ const make = Effect.gen(function* () {
10481048
return keep("commit changed since check");
10491049
const finalChanges = yield* localChangesReason(worktreePath, settings);
10501050
if (finalChanges !== null) return keep(finalChanges);
1051-
const current = resolveWorktreeCleanup(
1052-
yield* settingsService.getSettings,
1053-
thread.projectId,
1054-
);
1051+
const currentSettings = yield* settingsService.getSettings;
1052+
const current = resolveWorktreeCleanup(currentSettings, thread.projectId);
10551053
if (
1054+
currentSettings.autoResumeLimitedThreads !== serverSettings.autoResumeLimitedThreads ||
1055+
currentSettings.snoozeLimitedThreads !== serverSettings.snoozeLimitedThreads ||
10561056
Object.keys(settings).some(
10571057
(key) =>
10581058
current[key as keyof typeof settings] !== settings[key as keyof typeof settings],

0 commit comments

Comments
 (0)