Skip to content

Commit bf70431

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 31cd998 commit bf70431

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
@@ -22,6 +22,7 @@ import * as ThreadManagement from "../../../orchestration-v2/ThreadManagementSer
2222
import * as ServerConfig from "../../../config.ts";
2323
import * as ServerSettings from "../../../serverSettings.ts";
2424
import * as Project from "../../../project/ProjectService.ts";
25+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
2526
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
2627
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
2728
import * as VcsProcess from "../../../vcs/VcsProcess.ts";
@@ -302,3 +303,47 @@ it.effect("a launch into a new worktree creates nothing when its base ref has no
302303
expect(launched).toHaveLength(1);
303304
}),
304305
);
306+
307+
it.effect("deleting a project through MCP also discards its clone record", () =>
308+
Effect.gen(function* () {
309+
const discarded: Array<ProjectId> = [];
310+
const harness = clientLaunchHarness({ runtimeModeCeiling: "full-access", launched: [] });
311+
const dependencies = Layer.merge(
312+
harness.dependencies,
313+
Layer.mergeAll(
314+
Layer.mock(Project.ProjectService)({
315+
delete: (input) =>
316+
Effect.succeed({
317+
id: input.projectId,
318+
title: "client-target",
319+
workspaceRoot: "/projects/client-target",
320+
repositoryIdentity: null,
321+
faviconPath: null,
322+
defaultModelSelection: null,
323+
defaultThreadEnvMode: null,
324+
autoPull: false,
325+
projectIcon: null,
326+
scripts: [],
327+
createdAt: "2026-01-01T00:00:00.000Z",
328+
updatedAt: "2026-01-01T00:00:00.000Z",
329+
deletedAt: "2026-01-01T00:00:00.000Z",
330+
}),
331+
}),
332+
Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({
333+
discard: (projectId) => Effect.sync(() => void discarded.push(projectId)),
334+
}),
335+
),
336+
);
337+
const toolkit = yield* ProjectToolkit.pipe(
338+
Effect.provide(
339+
McpToolAccess.HandlersLayer.layer(ProjectHandlers.layer).pipe(Layer.provide(dependencies)),
340+
),
341+
);
342+
343+
yield* toolkit
344+
.handle("t3_project_delete", { projectId: harness.projectId })
345+
.pipe(Stream.unwrap, Stream.runCollect, Effect.provide(dependencies));
346+
347+
expect(discarded).toEqual([harness.projectId]);
348+
}),
349+
);

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import * as ThreadLaunch from "../../../orchestration-v2/ThreadLaunchService.ts"
66
import * as ThreadMessageIntake from "../../../orchestration-v2/ThreadMessageIntake.ts";
77
import * as Claims from "../../../orchestration-v2/AttachmentClaims.ts";
88
import * as Project from "../../../project/ProjectService.ts";
9+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
10+
import { mutateProjectWithClone } from "../../../project/ProjectMutation.ts";
911
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
1012
import * as Repositories from "../../../sourceControl/SourceControlRepositoryService.ts";
1113
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
@@ -282,9 +284,12 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
282284
t3_project_delete: McpToolAccess.writesEnvironment((input) =>
283285
Effect.gen(function* () {
284286
const projects = yield* Project.ProjectService;
285-
return yield* projects
286-
.delete({ ...input, commandId: yield* newCommandId() })
287-
.pipe(Effect.mapError(projectFailure));
287+
const clones = yield* ProjectCloneTracker.ProjectCloneTracker;
288+
return yield* mutateProjectWithClone(projects, clones, {
289+
...input,
290+
type: "project.delete",
291+
commandId: yield* newCommandId(),
292+
}).pipe(Effect.mapError(projectFailure));
288293
}),
289294
),
290295
t3_project_clone: McpToolAccess.writesEnvironment((input) =>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import * as Crypto from "effect/Crypto";
2626
import * as Schema from "effect/Schema";
2727
import { Tool, Toolkit } from "effect/ai";
2828
import * as ProjectService from "../../../project/ProjectService.ts";
29+
import * as ProjectCloneTracker from "../../../project/ProjectCloneTracker.ts";
2930
import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.ts";
3031
import * as ThreadManagementService from "../../../orchestration-v2/ThreadManagementService.ts";
3132
import * as SourceControlRepositoryService from "../../../sourceControl/SourceControlRepositoryService.ts";
@@ -84,6 +85,7 @@ const ProjectDeleteTool = Tool.make("t3_project_delete", {
8485
...shared,
8586
description: "Delete one project. Nonempty needs `force: true`. Folder on disk stays.",
8687
parameters: Schema.Struct({ projectId: ProjectId, force: Schema.optionalKey(Schema.Boolean) }),
88+
dependencies: [...shared.dependencies, ProjectCloneTracker.ProjectCloneTracker],
8789
}).annotate(Tool.Destructive, true);
8890
const ProjectCloneTool = Tool.make("t3_project_clone", {
8991
...shared,

0 commit comments

Comments
 (0)