The best way to control Claude Code, Codex and more from any computer or phone
fix(server): removing a failed clone no longer leaves a stuck banner (#24915)
Co-authored-by: chief-archivist <thecradlearchives@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
dw3105 committed
Oct 30, 2026 at 22:09 UTC
22c70398dedf9ade968a2bc78ff80f60de1f5ee9
11 files changed
+164
-10
apps/server/src/mcp/linkOrigin.test.ts
+2
@@ -31,6 +31,7 @@ import * as ThreadManagement from "../orchestration-v2/ThreadManagementService.t
31
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
32
import * as SqlitePersistence from "../persistence/Sqlite.ts";
33
import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
34
+import * as ProjectCloneTracker from "../project/ProjectCloneTracker.ts";
35
import * as ProjectService from "../project/ProjectService.ts";
36
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
37
import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts";
@@ -157,6 +158,7 @@ const layerTools = Layer.mergeAll(
158
}),
159
}),
160
),
161
+ Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
162
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
163
Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
164
Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),
apps/server/src/mcp/toolkits/project/handlers.test.ts
+45
@@ -28,6 +28,7 @@ import * as ThreadManagement from "../../../orchestration-v2/ThreadManagementSer
28
import * as ServerConfig from "../../../config.ts";
29
import * as ServerSettings from "../../../serverSettings.ts";
30
import * as Project from "../../../project/ProjectService.ts";
31
+import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
32
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
33
import * as PeerForwarding from "../../../peer/PeerForwarding.ts";
34
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
@@ -531,3 +532,47 @@ it.effect("a client launches with the fallback for an exhausted default", () =>
532
expect(launched[0]?.modelSelection).toEqual(fallbackModel);
533
}),
534
);
535
+
536
+it.effect("deleting a project through MCP also discards its clone record", () =>
537
+ Effect.gen(function* () {
538
+ const discarded: Array<ProjectId> = [];
539
+ const harness = clientLaunchHarness({ runtimeModeCeiling: "full-access", launched: [] });
540
+ const dependencies = Layer.merge(
541
+ harness.dependencies,
542
+ Layer.mergeAll(
543
+ Layer.mock(Project.ProjectService)({
544
+ delete: (input) =>
545
+ Effect.succeed({
546
+ id: input.projectId,
547
+ title: "client-target",
548
+ workspaceRoot: "/projects/client-target",
549
+ repositoryIdentity: null,
550
+ faviconPath: null,
551
+ defaultModelSelection: null,
552
+ defaultThreadEnvMode: null,
553
+ autoPull: false,
554
+ projectIcon: null,
555
+ scripts: [],
556
+ createdAt: "2026-01-01T00:00:00.000Z",
557
+ updatedAt: "2026-01-01T00:00:00.000Z",
558
+ deletedAt: "2026-01-01T00:00:00.000Z",
559
+ }),
560
+ }),
561
+ Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({
562
+ discard: (projectId) => Effect.sync(() => void discarded.push(projectId)),
563
+ }),
564
+ ),
565
+ );
566
+ const toolkit = yield* ProjectToolkit.pipe(
567
+ Effect.provide(
568
+ McpToolAccess.HandlersLayer.layer(ProjectHandlers.layer).pipe(Layer.provide(dependencies)),
569
+ ),
570
+ );
571
+
572
+ yield* toolkit
573
+ .handle("t3_project_delete", { projectId: harness.projectId })
574
+ .pipe(Stream.unwrap, Stream.runCollect, Effect.provide(dependencies));
575
+
576
+ expect(discarded).toEqual([harness.projectId]);
577
+ }),
578
+);
apps/server/src/mcp/toolkits/project/handlers.ts
+8
-3
@@ -14,6 +14,8 @@ import * as ThreadLaunch from "../../../orchestration-v2/ThreadLaunchService.ts"
14
import * as ThreadMessageIntake from "../../../orchestration-v2/ThreadMessageIntake.ts";
15
import * as Claims from "../../../orchestration-v2/AttachmentClaims.ts";
16
import * as Project from "../../../project/ProjectService.ts";
17
+import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
18
+import { mutateProjectWithClone } from "../../../project/ProjectMutation.ts";
19
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
20
import * as Repositories from "../../../sourceControl/SourceControlRepositoryService.ts";
21
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
@@ -343,9 +345,12 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
345
t3_project_delete: McpToolAccess.writesEnvironment((input) =>
346
Effect.gen(function* () {
347
const projects = yield* Project.ProjectService;
346
- return yield* projects
347
- .delete({ ...input, commandId: yield* newCommandId() })
348
- .pipe(Effect.mapError(projectFailure));
348
+ const clones = yield* ProjectCloneTracker.ProjectCloneTracker;
349
+ return yield* mutateProjectWithClone(projects, clones, {
350
+ ...input,
351
+ type: "project.delete",
352
+ commandId: yield* newCommandId(),
353
+ }).pipe(Effect.mapError(projectFailure));
354
}),
355
),
356
t3_project_clone: McpToolAccess.writesEnvironment(
apps/server/src/mcp/toolkits/project/tools.ts
+2
@@ -30,6 +30,7 @@ import * as Crypto from "effect/Crypto";
30
import * as Schema from "effect/Schema";
31
import { Tool, Toolkit } from "effect/ai";
32
import * as ProjectService from "../../../project/ProjectService.ts";
33
+import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
34
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
35
import * as ThreadManagementService from "../../../orchestration-v2/ThreadManagementService.ts";
36
import * as SourceControlRepositoryService from "../../../sourceControl/SourceControlRepositoryService.ts";
@@ -101,6 +102,7 @@ const ProjectDeleteTool = Tool.make("t3_project_delete", {
102
projectId: ProjectId,
103
force: Schema.optionalKey(Schema.Boolean),
104
}),
105
+ dependencies: [...shared.dependencies, ProjectCloneTracker.ProjectCloneTracker],
106
}).annotate(Tool.Destructive, true);
107
const ProjectCloneTool = Tool.make("t3_project_clone", {
108
...shared,
apps/server/src/peer/PeerForwarding.test.ts
+3
@@ -27,6 +27,7 @@ import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
27
import * as SourceControlRepositoryService from "../sourceControl/SourceControlRepositoryService.ts";
28
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
29
import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts";
30
+import * as ProjectCloneTracker from "../project/ProjectCloneTracker.ts";
31
import * as ProjectService from "../project/ProjectService.ts";
32
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
33
import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts";
@@ -227,6 +228,7 @@ const serveBox = (seen: Ref.Ref<Seen>, linkSession: Ref.Ref<string>) =>
228
Layer.provide(Layer.mock(ProviderRegistry.ProviderRegistry)({})),
229
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
230
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
231
+ Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
232
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
233
Layer.provide(ServerSettings.layerTest()),
234
Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
@@ -307,6 +309,7 @@ const makeLaptop = Effect.gen(function* () {
309
Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({}),
310
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
311
Layer.mock(ProjectService.ProjectService)({}),
312
+ Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({}),
313
Layer.mock(SecretRequests.SecretRequests)({}),
314
ServerSettings.layerTest(),
315
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
apps/server/src/peer/RemoteDelegation.test.ts
+3
@@ -49,6 +49,7 @@ import * as ThreadManagement from "../orchestration-v2/ThreadManagementService.t
49
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
50
import * as SqlitePersistence from "../persistence/Sqlite.ts";
51
import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
52
+import * as ProjectCloneTracker from "../project/ProjectCloneTracker.ts";
53
import * as ProjectService from "../project/ProjectService.ts";
54
import * as RepositoryIdentityResolver from "../project/RepositoryIdentityResolver.ts";
55
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
@@ -495,6 +496,7 @@ const boxToolkitLayer = (thread: BoxThread) => {
496
}),
497
}),
498
),
499
+ Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
500
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
501
Layer.provide(ServerSettings.layerTest()),
502
Layer.provide(NodeServices.layer),
@@ -594,6 +596,7 @@ const makeLaptop = (
596
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
597
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
598
Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
599
+ Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
600
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
601
Layer.provide(Layer.mock(ThreadLaunch.ThreadLaunchService)({})),
602
Layer.provide(Layer.mock(GitVcsDriver.GitVcsDriver)({})),
apps/server/src/project/ProjectMutation.test.ts
new
+78
@@ -0,0 +1,78 @@
1
+import { describe, expect, it } from "@effect/vitest";
2
+import { CommandId, type Project, ProjectId } from "@t3tools/contracts";
3
+import * as Deferred from "effect/Deferred";
4
+import * as Effect from "effect/Effect";
5
+import * as Fiber from "effect/Fiber";
6
+
7
+import { ProjectNotEmptyError } from "./ProjectService.ts";
8
+import { mutateProjectWithClone } from "./ProjectMutation.ts";
9
+
10
+const projectId = ProjectId.make("project-1");
11
+const deletedProject: Project = {
12
+ id: projectId,
13
+ title: "kh-frontend",
14
+ workspaceRoot: "/workspace/kh-frontend",
15
+ repositoryIdentity: null,
16
+ faviconPath: null,
17
+ defaultModelSelection: null,
18
+ defaultThreadEnvMode: null,
19
+ autoPull: false,
20
+ projectIcon: null,
21
+ scripts: [],
22
+ createdAt: "2026-01-01T00:00:00.000Z",
23
+ updatedAt: "2026-01-01T00:00:00.000Z",
24
+ deletedAt: "2026-01-01T00:00:00.000Z",
25
+};
26
+
27
+describe("mutateProjectWithClone", () => {
28
+ it.effect("keeps the clone when deletion is rejected", () =>
29
+ Effect.gen(function* () {
30
+ const rejected = new ProjectNotEmptyError({ projectId });
31
+ const result = yield* mutateProjectWithClone(
32
+ {
33
+ create: () => Effect.die("unused"),
34
+ update: () => Effect.die("unused"),
35
+ delete: () => Effect.fail(rejected),
36
+ },
37
+ { discard: () => Effect.die("must not discard a project that still exists") },
38
+ { type: "project.delete", commandId: CommandId.make("rejected-delete"), projectId },
39
+ ).pipe(Effect.flip);
40
+
41
+ expect(result).toBe(rejected);
42
+ }),
43
+ );
44
+
45
+ it.effect("discards the clone record even when the caller disconnects mid-delete", () =>
46
+ Effect.gen(function* () {
47
+ const committed = yield* Deferred.make<void>();
48
+ const finishDelete = yield* Deferred.make<void>();
49
+ const discarded: Array<ProjectId> = [];
50
+ const projects = {
51
+ create: () => Effect.die("unused"),
52
+ update: () => Effect.die("unused"),
53
+ // The delete event is already durable while its post-commit cleanup runs.
54
+ delete: () =>
55
+ Deferred.succeed(committed, undefined).pipe(
56
+ Effect.andThen(Deferred.await(finishDelete)),
57
+ Effect.as(deletedProject),
58
+ ),
59
+ };
60
+ const clones = {
61
+ discard: (id: ProjectId) => Effect.sync(() => void discarded.push(id)),
62
+ };
63
+
64
+ const request = yield* mutateProjectWithClone(projects, clones, {
65
+ type: "project.delete",
66
+ commandId: CommandId.make("command-1"),
67
+ projectId,
68
+ }).pipe(Effect.forkChild);
69
+ yield* Deferred.await(committed);
70
+ // Delivered synchronously so it lands before the delete can finish.
71
+ request.interruptUnsafe();
72
+ yield* Deferred.succeed(finishDelete, undefined);
73
+ yield* Fiber.await(request);
74
+
75
+ expect(discarded).toEqual([projectId]);
76
+ }),
77
+ );
78
+});
apps/server/src/project/ProjectMutation.ts
+15
@@ -1,6 +1,7 @@
1
import { type ProjectMutation } from "@t3tools/contracts";
2
import * as Effect from "effect/Effect";
3
4
+import { type ProjectCloneTracker } from "./ProjectCloneTracker.ts";
5
import { type ProjectService } from "./ProjectService.ts";
6
7
type ProjectMutations = Pick<ProjectService["Service"], "create" | "delete" | "update">;
@@ -51,3 +52,17 @@ export const projectMutationOperation = Effect.fn("projectMutationOperation")(fu
52
});
53
}
54
});
55
+
56
+// A disconnect after deletion commits must not leave the in-memory clone record behind.
57
+export const mutateProjectWithClone = Effect.fn("mutateProjectWithClone")(function* (
58
+ projects: ProjectMutations,
59
+ clones: Pick<ProjectCloneTracker["Service"], "discard">,
60
+ mutation: ProjectMutation,
61
+) {
62
+ if (mutation.type !== "project.delete")
63
+ return yield* projectMutationOperation(projects, mutation);
64
+ return yield* projectMutationOperation(projects, mutation).pipe(
65
+ Effect.tap(() => clones.discard(mutation.projectId)),
66
+ Effect.uninterruptible,
67
+ );
68
+});
apps/server/src/project/http.ts
+4
-2
@@ -14,8 +14,9 @@ import {
14
} from "../auth/http.ts";
15
import { traceLocalHandlerWork } from "../cloud/traceRelayRequest.ts";
16
import * as ServerRuntimeStartup from "../serverRuntimeStartup.ts";
17
+import * as ProjectCloneTracker from "./ProjectCloneTracker.ts";
18
import * as ProjectService from "./ProjectService.ts";
18
-import { projectMutationOperation } from "./ProjectMutation.ts";
19
+import { mutateProjectWithClone } from "./ProjectMutation.ts";
20
21
const failProjectMutation = Effect.fn("environment.projects.failMutation")(function* (
22
cause: ProjectService.ProjectServiceError | ServerRuntimeStartup.ServerRuntimeStartupError,
@@ -36,6 +37,7 @@ export const layer = HttpApiBuilder.group(
37
Effect.fnUntraced(function* (handlers) {
38
const projects = yield* ProjectService.ProjectService;
39
const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
40
+ const projectClones = yield* ProjectCloneTracker.ProjectCloneTracker;
41
42
return handlers
43
.handle(
@@ -56,7 +58,7 @@ export const layer = HttpApiBuilder.group(
58
for (const scope of requiredScopesForProjectMutation(args.payload)) {
59
yield* requireEnvironmentScope(scope);
60
}
59
- const operation = projectMutationOperation(projects, args.payload);
61
+ const operation = mutateProjectWithClone(projects, projectClones, args.payload);
62
return yield* startup
63
.enqueueCommand(operation)
64
.pipe(traceLocalHandlerWork, Effect.catch(failProjectMutation));
apps/server/src/provider/AgentContextBudget.test.ts
+2
@@ -29,6 +29,7 @@ import { RemoteDelegation } from "../peer/RemoteDelegation.ts";
29
import { PreviewManager } from "../preview/Manager.ts";
30
import { PreviewBrowser } from "../preview/PreviewBrowser.ts";
31
import { ManagedProjectFolders } from "../project/ManagedProjectFolders.ts";
32
+import { ProjectCloneTracker } from "../project/ProjectCloneTracker.ts";
33
import { ProjectService } from "../project/ProjectService.ts";
34
import { ProjectSetupScriptRunner } from "../project/ProjectSetupScriptRunner.ts";
35
import { PullRequestReviewGuideService } from "../pullRequest/PullRequestReviewGuideService.ts";
@@ -58,6 +59,7 @@ const toolHandlerServices = Layer.mergeAll(
59
Layer.mock(PreviewAutomationBroker)({}),
60
Layer.mock(PreviewBrowser)({}),
61
Layer.mock(PreviewManager)({}),
62
+ Layer.mock(ProjectCloneTracker)({}),
63
Layer.mock(ProjectService)({}),
64
Layer.mock(ProjectSetupScriptRunner)({}),
65
Layer.mock(ProviderAdapterRegistryV2)({}),
apps/server/src/ws.ts
+2
-5
@@ -214,7 +214,7 @@ import * as ProjectService from "./project/ProjectService.ts";
214
import { threadWorkspaceRoot } from "./project/threadWorkspaceRoot.ts";
215
import * as ManagedProjectFolders from "./project/ManagedProjectFolders.ts";
216
import * as ScratchThreadPromotion from "./project/ScratchThreadPromotion.ts";
217
-import { projectMutationOperation } from "./project/ProjectMutation.ts";
217
+import { mutateProjectWithClone } from "./project/ProjectMutation.ts";
218
import * as ProjectCloneTracker from "./project/ProjectCloneTracker.ts";
219
import * as RepositoryIdentityResolver from "./project/RepositoryIdentityResolver.ts";
220
import * as WorktreeSetupTracker from "./project/WorktreeSetupTracker.ts";
@@ -1858,10 +1858,7 @@ export const layerWsRpc = (
1858
);
1859
1860
const mutateProject = Effect.fn("ws.projects.mutate")(function* (mutation: ProjectMutation) {
1861
- const result = yield* projectMutationOperation(projectService, mutation);
1862
- if (mutation.type === "project.delete")
1863
- yield* projectCloneTracker.discard(mutation.projectId);
1864
- return result;
1861
+ return yield* mutateProjectWithClone(projectService, projectCloneTracker, mutation);
1862
});
1863
1864
const handlers = ServerWsRpcGroup.of({