Skip to content

Commit 22c7039

Browse files
dw3105chief-archivistclaudemaria-rcks
authored
fix(server): removing a failed clone no longer leaves a stuck banner (#24915)
Co-authored-by: chief-archivist <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 3f75a0e commit 22c7039

11 files changed

Lines changed: 164 additions & 10 deletions

File tree

‎apps/server/src/mcp/linkOrigin.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import * as ThreadManagement from "../orchestration-v2/ThreadManagementService.t
3131
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
3232
import * as SqlitePersistence from "../persistence/Sqlite.ts";
3333
import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
34+
import * as ProjectCloneTracker from "../project/ProjectCloneTracker.ts";
3435
import * as ProjectService from "../project/ProjectService.ts";
3536
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
3637
import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts";
@@ -157,6 +158,7 @@ const layerTools = Layer.mergeAll(
157158
}),
158159
}),
159160
),
161+
Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
160162
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
161163
Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
162164
Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),

‎apps/server/src/mcp/toolkits/project/handlers.test.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import * as ThreadManagement from "../../../orchestration-v2/ThreadManagementSer
2828
import * as ServerConfig from "../../../config.ts";
2929
import * as ServerSettings from "../../../serverSettings.ts";
3030
import * as Project from "../../../project/ProjectService.ts";
31+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
3132
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
3233
import * as PeerForwarding from "../../../peer/PeerForwarding.ts";
3334
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
@@ -531,3 +532,47 @@ it.effect("a client launches with the fallback for an exhausted default", () =>
531532
expect(launched[0]?.modelSelection).toEqual(fallbackModel);
532533
}),
533534
);
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‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import * as ThreadLaunch from "../../../orchestration-v2/ThreadLaunchService.ts"
1414
import * as ThreadMessageIntake from "../../../orchestration-v2/ThreadMessageIntake.ts";
1515
import * as Claims from "../../../orchestration-v2/AttachmentClaims.ts";
1616
import * as Project from "../../../project/ProjectService.ts";
17+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
18+
import { mutateProjectWithClone } from "../../../project/ProjectMutation.ts";
1719
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
1820
import * as Repositories from "../../../sourceControl/SourceControlRepositoryService.ts";
1921
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
@@ -343,9 +345,12 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
343345
t3_project_delete: McpToolAccess.writesEnvironment((input) =>
344346
Effect.gen(function* () {
345347
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));
349354
}),
350355
),
351356
t3_project_clone: McpToolAccess.writesEnvironment(

‎apps/server/src/mcp/toolkits/project/tools.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import * as Crypto from "effect/Crypto";
3030
import * as Schema from "effect/Schema";
3131
import { Tool, Toolkit } from "effect/ai";
3232
import * as ProjectService from "../../../project/ProjectService.ts";
33+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
3334
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
3435
import * as ThreadManagementService from "../../../orchestration-v2/ThreadManagementService.ts";
3536
import * as SourceControlRepositoryService from "../../../sourceControl/SourceControlRepositoryService.ts";
@@ -101,6 +102,7 @@ const ProjectDeleteTool = Tool.make("t3_project_delete", {
101102
projectId: ProjectId,
102103
force: Schema.optionalKey(Schema.Boolean),
103104
}),
105+
dependencies: [...shared.dependencies, ProjectCloneTracker.ProjectCloneTracker],
104106
}).annotate(Tool.Destructive, true);
105107
const ProjectCloneTool = Tool.make("t3_project_clone", {
106108
...shared,

‎apps/server/src/peer/PeerForwarding.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
2727
import * as SourceControlRepositoryService from "../sourceControl/SourceControlRepositoryService.ts";
2828
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
2929
import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts";
30+
import * as ProjectCloneTracker from "../project/ProjectCloneTracker.ts";
3031
import * as ProjectService from "../project/ProjectService.ts";
3132
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
3233
import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts";
@@ -227,6 +228,7 @@ const serveBox = (seen: Ref.Ref<Seen>, linkSession: Ref.Ref<string>) =>
227228
Layer.provide(Layer.mock(ProviderRegistry.ProviderRegistry)({})),
228229
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
229230
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
231+
Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
230232
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
231233
Layer.provide(ServerSettings.layerTest()),
232234
Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
@@ -307,6 +309,7 @@ const makeLaptop = Effect.gen(function* () {
307309
Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({}),
308310
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
309311
Layer.mock(ProjectService.ProjectService)({}),
312+
Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({}),
310313
Layer.mock(SecretRequests.SecretRequests)({}),
311314
ServerSettings.layerTest(),
312315
Layer.mock(RemoteDelegation.RemoteDelegation)({}),

‎apps/server/src/peer/RemoteDelegation.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import * as ThreadManagement from "../orchestration-v2/ThreadManagementService.t
4949
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
5050
import * as SqlitePersistence from "../persistence/Sqlite.ts";
5151
import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
52+
import * as ProjectCloneTracker from "../project/ProjectCloneTracker.ts";
5253
import * as ProjectService from "../project/ProjectService.ts";
5354
import * as RepositoryIdentityResolver from "../project/RepositoryIdentityResolver.ts";
5455
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
@@ -495,6 +496,7 @@ const boxToolkitLayer = (thread: BoxThread) => {
495496
}),
496497
}),
497498
),
499+
Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
498500
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
499501
Layer.provide(ServerSettings.layerTest()),
500502
Layer.provide(NodeServices.layer),
@@ -594,6 +596,7 @@ const makeLaptop = (
594596
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
595597
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
596598
Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
599+
Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),
597600
Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
598601
Layer.provide(Layer.mock(ThreadLaunch.ThreadLaunchService)({})),
599602
Layer.provide(Layer.mock(GitVcsDriver.GitVcsDriver)({})),
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { type ProjectMutation } from "@t3tools/contracts";
22
import * as Effect from "effect/Effect";
33

4+
import { type ProjectCloneTracker } from "./ProjectCloneTracker.ts";
45
import { type ProjectService } from "./ProjectService.ts";
56

67
type ProjectMutations = Pick<ProjectService["Service"], "create" | "delete" | "update">;
@@ -51,3 +52,17 @@ export const projectMutationOperation = Effect.fn("projectMutationOperation")(fu
5152
});
5253
}
5354
});
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‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import {
1414
} from "../auth/http.ts";
1515
import { traceLocalHandlerWork } from "../cloud/traceRelayRequest.ts";
1616
import * as ServerRuntimeStartup from "../serverRuntimeStartup.ts";
17+
import * as ProjectCloneTracker from "./ProjectCloneTracker.ts";
1718
import * as ProjectService from "./ProjectService.ts";
18-
import { projectMutationOperation } from "./ProjectMutation.ts";
19+
import { mutateProjectWithClone } from "./ProjectMutation.ts";
1920

2021
const failProjectMutation = Effect.fn("environment.projects.failMutation")(function* (
2122
cause: ProjectService.ProjectServiceError | ServerRuntimeStartup.ServerRuntimeStartupError,
@@ -36,6 +37,7 @@ export const layer = HttpApiBuilder.group(
3637
Effect.fnUntraced(function* (handlers) {
3738
const projects = yield* ProjectService.ProjectService;
3839
const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
40+
const projectClones = yield* ProjectCloneTracker.ProjectCloneTracker;
3941

4042
return handlers
4143
.handle(
@@ -56,7 +58,7 @@ export const layer = HttpApiBuilder.group(
5658
for (const scope of requiredScopesForProjectMutation(args.payload)) {
5759
yield* requireEnvironmentScope(scope);
5860
}
59-
const operation = projectMutationOperation(projects, args.payload);
61+
const operation = mutateProjectWithClone(projects, projectClones, args.payload);
6062
return yield* startup
6163
.enqueueCommand(operation)
6264
.pipe(traceLocalHandlerWork, Effect.catch(failProjectMutation));

‎apps/server/src/provider/AgentContextBudget.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { RemoteDelegation } from "../peer/RemoteDelegation.ts";
2929
import { PreviewManager } from "../preview/Manager.ts";
3030
import { PreviewBrowser } from "../preview/PreviewBrowser.ts";
3131
import { ManagedProjectFolders } from "../project/ManagedProjectFolders.ts";
32+
import { ProjectCloneTracker } from "../project/ProjectCloneTracker.ts";
3233
import { ProjectService } from "../project/ProjectService.ts";
3334
import { ProjectSetupScriptRunner } from "../project/ProjectSetupScriptRunner.ts";
3435
import { PullRequestReviewGuideService } from "../pullRequest/PullRequestReviewGuideService.ts";
@@ -58,6 +59,7 @@ const toolHandlerServices = Layer.mergeAll(
5859
Layer.mock(PreviewAutomationBroker)({}),
5960
Layer.mock(PreviewBrowser)({}),
6061
Layer.mock(PreviewManager)({}),
62+
Layer.mock(ProjectCloneTracker)({}),
6163
Layer.mock(ProjectService)({}),
6264
Layer.mock(ProjectSetupScriptRunner)({}),
6365
Layer.mock(ProviderAdapterRegistryV2)({}),

0 commit comments

Comments
 (0)