The best way to control Claude Code, Codex and more from any computer or phone
fix(server): deleted projects keep their worktree cleanup policy (#36649)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Wout Stiens committed
Nov 14, 2026 at 11:56 UTC
071ae4e9514c46b2607d40053b31007077fcd900
3 files changed
+75
-22
apps/server/src/project/ProjectService.deletion.test.ts
+42
-6
@@ -28,6 +28,7 @@ import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
28
import * as ThreadCommandExecutor from "../orchestration-v2/ThreadCommandExecutor.ts";
29
import { planThreadDeletion } from "../orchestration-v2/ThreadDeletion.ts";
30
import * as SqlitePersistence from "../persistence/Sqlite.ts";
31
+import * as ProjectSettingsOverrideSweep from "../provider/ProjectSettingsOverrideSweep.ts";
32
import * as ServerSettings from "../serverSettings.ts";
33
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
34
import * as ProjectEnrichmentService from "./ProjectEnrichmentService.ts";
@@ -501,9 +502,13 @@ it.effect("deletes a project without force once its imported threads were delete
502
}).pipe(Effect.provide(layerDatabase)),
503
);
504
504
-it.effect(
505
- "clears a deleted project's settings overrides so a machine-disabled instance cannot stay alive",
506
- () =>
505
+it.effect.each([
506
+ { policy: "no", worktreeCleanup: undefined },
507
+ { policy: "its off", worktreeCleanup: { mode: "off" } as const },
508
+ { policy: "its legacy", worktreeCleanup: null },
509
+])(
510
+ "clears a deleted project's settings overrides, keeping $policy worktree cleanup policy, so a machine-disabled instance cannot stay alive",
511
+ ({ worktreeCleanup }) =>
512
Effect.gen(function* () {
513
const projectId = ProjectId.make("project:overrides-cleanup");
514
const instanceId = ProviderInstanceId.make("codex_work");
@@ -514,7 +519,11 @@ it.effect(
519
const serverSettings = yield* ServerSettings.ServerSettingsService;
520
yield* serverSettings.updateSettings({
521
projectSettingsOverrides: {
517
- [projectId]: { providerInstances: { [instanceId]: { enabled: true } } },
522
+ [projectId]: {
523
+ providerInstances: { [instanceId]: { enabled: true } },
524
+ defaultAutoPull: true,
525
+ ...(worktreeCleanup === undefined ? {} : { worktreeCleanup }),
526
+ },
527
},
528
});
529
@@ -523,8 +532,35 @@ it.effect(
532
projectId,
533
});
534
526
- const settingsAfterDelete = yield* serverSettings.getSettings;
527
- assert.isUndefined(settingsAfterDelete.projectSettingsOverrides[projectId]);
535
+ const entry = (yield* serverSettings.getSettings).projectSettingsOverrides[projectId];
536
+ if (worktreeCleanup === undefined) {
537
+ assert.isUndefined(entry);
538
+ } else {
539
+ assert.deepStrictEqual(entry, { worktreeCleanup, providerInstances: {} });
540
+ }
541
+
542
+ const liveProjectId = ProjectId.make("project:still-live");
543
+ const missingProjectId = ProjectId.make("project:missing");
544
+ yield* seedProject(liveProjectId);
545
+ // Older deletions or interrupted best-effort cleanup can leave the original overrides on restart.
546
+ yield* serverSettings.updateSettings({
547
+ projectSettingsOverrides: {
548
+ [projectId]: {
549
+ providerInstances: { [instanceId]: { enabled: true } },
550
+ defaultAutoPull: true,
551
+ ...(worktreeCleanup === undefined ? {} : { worktreeCleanup }),
552
+ },
553
+ [liveProjectId]: { defaultAutoPull: true },
554
+ [missingProjectId]: { worktreeCleanup: { mode: "off" } },
555
+ },
556
+ });
557
+ yield* ProjectSettingsOverrideSweep.sweep;
558
+ assert.deepStrictEqual((yield* serverSettings.getSettings).projectSettingsOverrides, {
559
+ [liveProjectId]: { defaultAutoPull: true },
560
+ ...(worktreeCleanup === undefined
561
+ ? {}
562
+ : { [projectId]: { worktreeCleanup, providerInstances: {} } }),
563
+ });
564
}).pipe(Effect.provide(layerServices));
565
}).pipe(Effect.provide(layerDatabase)),
566
);
apps/server/src/project/ProjectService.ts
+9
-1
@@ -33,6 +33,7 @@ import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
33
import * as ThreadCommandExecutor from "../orchestration-v2/ThreadCommandExecutor.ts";
34
import { planThreadDeletion } from "../orchestration-v2/ThreadDeletion.ts";
35
import * as ServerSettings from "../serverSettings.ts";
36
+import { deletedProjectOverridePatch } from "../provider/ProjectSettingsOverrideSweep.ts";
37
import { makeIsManagedWorktreePath } from "../worktreesDirectory.ts";
38
import * as ProcessRunner from "../processRunner.ts";
39
import * as ProjectEnrichmentService from "./ProjectEnrichmentService.ts";
@@ -550,7 +551,14 @@ export const make = Effect.gen(function* () {
551
552
// Best-effort cleanup releases disabled instances kept alive by overrides; crashes have no replay to revisit deletion.
553
const clearProjectSettingsOverrides = (projectId: ProjectId) =>
553
- serverSettings.updateSettings({ projectSettingsOverrides: { [projectId]: null } }).pipe(
554
+ serverSettings.getSettings.pipe(
555
+ Effect.flatMap(({ projectSettingsOverrides }) =>
556
+ serverSettings.updateSettings({
557
+ projectSettingsOverrides: {
558
+ [projectId]: deletedProjectOverridePatch(projectSettingsOverrides[projectId]),
559
+ },
560
+ }),
561
+ ),
562
Effect.asVoid,
563
Effect.catchCause((cause) =>
564
Effect.logWarning(
apps/server/src/provider/ProjectSettingsOverrideSweep.ts
+24
-15
@@ -1,32 +1,41 @@
1
-import { type ProjectId, type ServerSettings } from "@t3tools/contracts";
1
+import * as NodeUtil from "node:util";
2
+
3
+import { type ProjectSettingsOverrides } from "@t3tools/contracts";
4
import * as Effect from "effect/Effect";
5
6
import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
7
import * as Settings from "../serverSettings.ts";
8
7
-const findOrphanedProjectIds = (
8
- settings: Pick<ServerSettings, "projectSettingsOverrides">,
9
- liveProjectIds: ReadonlySet<ProjectId>,
10
-): ReadonlyArray<ProjectId> =>
11
- Object.keys(settings.projectSettingsOverrides)
12
- .map((projectId) => projectId as ProjectId)
13
- .filter((projectId) => !liveProjectIds.has(projectId));
9
+export function deletedProjectOverridePatch(entry: ProjectSettingsOverrides | undefined) {
10
+ // Keep cleanup policy for deleted threads; omitting providerInstances would preserve obsolete references in the merge.
11
+ return entry?.worktreeCleanup !== undefined
12
+ ? { worktreeCleanup: entry.worktreeCleanup, providerInstances: {} }
13
+ : null;
14
+}
15
16
export const sweep = Effect.gen(function* () {
17
const serverSettings = yield* Settings.ServerSettingsService;
18
const projectStore = yield* ProjectStore.ProjectStoreV2;
19
20
const settings = yield* serverSettings.getSettings;
20
- const liveShells = yield* projectStore.listShells();
21
- const liveProjectIds = new Set(liveShells.map((shell) => shell.id));
21
+ const projects = yield* projectStore.list({ includeDeleted: true });
22
+ const projectsById = new Map<string, ProjectStore.ProjectRow>(
23
+ projects.map((project) => [project.projectId, project]),
24
+ );
25
23
- const orphanedProjectIds = findOrphanedProjectIds(settings, liveProjectIds);
24
- if (orphanedProjectIds.length === 0) return;
26
+ const overrides = Object.entries(settings.projectSettingsOverrides).flatMap(
27
+ ([projectId, entry]) => {
28
+ const project = projectsById.get(projectId);
29
+ if (project?.deletedAt === null) return [];
30
+ const patch = project ? deletedProjectOverridePatch(entry) : null;
31
+ if (NodeUtil.isDeepStrictEqual(entry, patch)) return [];
32
+ return [[projectId, patch] as const];
33
+ },
34
+ );
35
+ if (overrides.length === 0) return;
36
37
yield* serverSettings.updateSettings({
27
- projectSettingsOverrides: Object.fromEntries(
28
- orphanedProjectIds.map((projectId) => [projectId, null]),
29
- ),
38
+ projectSettingsOverrides: Object.fromEntries(overrides),
39
});
40
}).pipe(
41
Effect.asVoid,