Skip to content

Commit a33a32c

Browse files
fix(server): deleting a project through MCP also clears its failed clone
t3_project_delete called ProjectService.delete directly, so an agent removing a project left its clone record behind and the stale banner stayed. Route it through mutateProjectWithClone like the WebSocket and HTTP transports. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent b0bd720 commit a33a32c

3 files changed

Lines changed: 55 additions & 3 deletions

File tree

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import * as ThreadManagement from "../../../orchestration-v2/ThreadManagementSer
2525
import * as ServerConfig from "../../../config.ts";
2626
import * as ServerSettings from "../../../serverSettings.ts";
2727
import * as Project from "../../../project/ProjectService.ts";
28+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
2829
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
2930
import * as PeerForwarding from "../../../peer/PeerForwarding.ts";
3031
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
@@ -463,3 +464,47 @@ it.effect("a retried worktree launch replays after its base ref is gone", () =>
463464
]);
464465
}),
465466
);
467+
468+
it.effect("deleting a project through MCP also discards its clone record", () =>
469+
Effect.gen(function* () {
470+
const discarded: Array<ProjectId> = [];
471+
const harness = clientLaunchHarness({ runtimeModeCeiling: "full-access", launched: [] });
472+
const dependencies = Layer.merge(
473+
harness.dependencies,
474+
Layer.mergeAll(
475+
Layer.mock(Project.ProjectService)({
476+
delete: (input) =>
477+
Effect.succeed({
478+
id: input.projectId,
479+
title: "client-target",
480+
workspaceRoot: "/projects/client-target",
481+
repositoryIdentity: null,
482+
faviconPath: null,
483+
defaultModelSelection: null,
484+
defaultThreadEnvMode: null,
485+
autoPull: false,
486+
projectIcon: null,
487+
scripts: [],
488+
createdAt: "2026-01-01T00:00:00.000Z",
489+
updatedAt: "2026-01-01T00:00:00.000Z",
490+
deletedAt: "2026-01-01T00:00:00.000Z",
491+
}),
492+
}),
493+
Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({
494+
discard: (projectId) => Effect.sync(() => void discarded.push(projectId)),
495+
}),
496+
),
497+
);
498+
const toolkit = yield* ProjectToolkit.pipe(
499+
Effect.provide(
500+
McpToolAccess.HandlersLayer.layer(ProjectHandlers.layer).pipe(Layer.provide(dependencies)),
501+
),
502+
);
503+
504+
yield* toolkit
505+
.handle("t3_project_delete", { projectId: harness.projectId })
506+
.pipe(Stream.unwrap, Stream.runCollect, Effect.provide(dependencies));
507+
508+
expect(discarded).toEqual([harness.projectId]);
509+
}),
510+
);

‎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";
@@ -330,9 +332,12 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
330332
t3_project_delete: McpToolAccess.writesEnvironment((input) =>
331333
Effect.gen(function* () {
332334
const projects = yield* Project.ProjectService;
333-
return yield* projects
334-
.delete({ ...input, commandId: yield* newCommandId() })
335-
.pipe(Effect.mapError(projectFailure));
335+
const clones = yield* ProjectCloneTracker.ProjectCloneTracker;
336+
return yield* mutateProjectWithClone(projects, clones, {
337+
...input,
338+
type: "project.delete",
339+
commandId: yield* newCommandId(),
340+
}).pipe(Effect.mapError(projectFailure));
336341
}),
337342
),
338343
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
@@ -29,6 +29,7 @@ import * as Crypto from "effect/Crypto";
2929
import * as Schema from "effect/Schema";
3030
import { Tool, Toolkit } from "effect/ai";
3131
import * as ProjectService from "../../../project/ProjectService.ts";
32+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
3233
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
3334
import * as ThreadManagementService from "../../../orchestration-v2/ThreadManagementService.ts";
3435
import * as SourceControlRepositoryService from "../../../sourceControl/SourceControlRepositoryService.ts";
@@ -100,6 +101,7 @@ const ProjectDeleteTool = Tool.make("t3_project_delete", {
100101
projectId: ProjectId,
101102
force: Schema.optionalKey(Schema.Boolean),
102103
}),
104+
dependencies: [...shared.dependencies, ProjectCloneTracker.ProjectCloneTracker],
103105
}).annotate(Tool.Destructive, true);
104106
const ProjectCloneTool = Tool.make("t3_project_clone", {
105107
...shared,

0 commit comments

Comments
 (0)