Skip to content

Commit 1dce00c

Browse files
feat(mcp): expose workspace branch inventory
1 parent 3492b15 commit 1dce00c

5 files changed

Lines changed: 65 additions & 1 deletion

File tree

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,36 @@
1+
import { OrchestratorMcpFailure } from "@t3tools/contracts";
2+
import * as Option from "effect/Option";
3+
import * as GitWorkflow from "../../../git/GitWorkflowService.ts";
4+
import * as Project from "../../../project/ProjectService.ts";
5+
import { readCaller, unavailable } from "../../threadAccess.ts";
16
import * as Effect from "effect/Effect";
27

38
import { McpInvocationContext } from "../../McpInvocationContext.ts";
49
import { WorktreeMcpService } from "../../WorktreeMcpService.ts";
510
import { WorktreeToolkit } from "./tools.ts";
611

712
const handlers = {
13+
t3_worktree_list: (input) =>
14+
Effect.gen(function* () {
15+
const context = yield* McpInvocationContext;
16+
if (!context.capabilities.has("worktree"))
17+
return yield* new OrchestratorMcpFailure({
18+
code: "capability_denied",
19+
message: "This credential cannot inspect worktrees.",
20+
});
21+
const { caller } = yield* readCaller();
22+
const projects = yield* Project.ProjectService;
23+
const project = yield* projects.getById(caller.projectId).pipe(Effect.mapError(unavailable));
24+
if (Option.isNone(project))
25+
return yield* new OrchestratorMcpFailure({
26+
code: "invalid_request",
27+
message: "The project was not found.",
28+
});
29+
const git = yield* GitWorkflow.GitWorkflowService;
30+
return yield* git
31+
.listRefs({ ...input, cwd: caller.worktreePath ?? project.value.workspaceRoot })
32+
.pipe(Effect.mapError(unavailable));
33+
}),
834
t3_worktree_handoff: (input) =>
935
Effect.gen(function* () {
1036
const scope = yield* McpInvocationContext;

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
import {
22
WorktreeMcpFailure,
3+
OrchestratorMcpFailure,
4+
VcsListRefsInput,
5+
VcsListRefsResult,
36
WorktreeMcpHandoffInput,
47
WorktreeMcpHandoffResult,
58
WorktreeMcpStatusResult,
69
} from "@t3tools/contracts";
10+
import * as Schema from "effect/Schema";
11+
import { GitWorkflowService } from "../../../git/GitWorkflowService.ts";
12+
import { ProjectService } from "../../../project/ProjectService.ts";
13+
import { ThreadManagementService } from "../../../orchestration-v2/ThreadManagementService.ts";
714
import { Tool, Toolkit } from "effect/unstable/ai";
815

916
import * as McpInvocationContext from "../../McpInvocationContext.ts";
@@ -44,4 +51,30 @@ export const WorktreeStatusTool = Tool.make("t3_worktree_status", {
4451
.annotate(Tool.Idempotent, true)
4552
.annotate(Tool.OpenWorld, false);
4653

47-
export const WorktreeToolkit = Toolkit.make(WorktreeHandoffTool, WorktreeStatusTool);
54+
export const WorktreeListTool = Tool.make("t3_worktree_list", {
55+
description:
56+
"List branch refs and their associated checkout paths for this thread's workspace using the app's ref inventory. Detached worktrees without a branch are not included. Use t3_worktree_status for the thread binding and t3_worktree_handoff to create a new worktree.",
57+
parameters: Schema.Struct({
58+
query: VcsListRefsInput.fields.query,
59+
cursor: VcsListRefsInput.fields.cursor,
60+
limit: VcsListRefsInput.fields.limit,
61+
refKind: VcsListRefsInput.fields.refKind,
62+
includeMatchingRemoteRefs: VcsListRefsInput.fields.includeMatchingRemoteRefs,
63+
}),
64+
success: VcsListRefsResult,
65+
failure: OrchestratorMcpFailure,
66+
failureMode: "return",
67+
dependencies: [
68+
McpInvocationContext.McpInvocationContext,
69+
ThreadManagementService,
70+
ProjectService,
71+
GitWorkflowService,
72+
],
73+
})
74+
.annotate(Tool.Readonly, true)
75+
.annotate(Tool.Destructive, false);
76+
export const WorktreeToolkit = Toolkit.make(
77+
WorktreeHandoffTool,
78+
WorktreeStatusTool,
79+
WorktreeListTool,
80+
);

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
4848
import { PreviewControlsToolkit } from "../../mcp/toolkits/previewControls/tools.ts";
4949
import { EnvironmentToolkit } from "../../mcp/toolkits/environment/tools.ts";
5050
import { ProjectToolkit } from "../../mcp/toolkits/project/tools.ts";
51+
import { WorktreeToolkit } from "../../mcp/toolkits/worktree/tools.ts";
5152
import { ThreadToolkit } from "../../mcp/toolkits/thread/tools.ts";
5253
import { OrchestratorToolkit } from "../../mcp/toolkits/orchestrator/tools.ts";
5354
import type { EventNdjsonLogger } from "../../provider/Layers/EventNdjsonLogger.ts";
@@ -587,6 +588,7 @@ describe("ClaudeAdapterV2 MCP query overrides", () => {
587588
const readOnlyToolNames = [
588589
...Object.values(OrchestratorToolkit.tools),
589590
...Object.values(ThreadToolkit.tools),
591+
...Object.values(WorktreeToolkit.tools),
590592
...Object.values(ProjectToolkit.tools),
591593
...Object.values(EnvironmentToolkit.tools),
592594
...Object.values(PreviewControlsToolkit.tools),

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,8 @@ export const CLAUDE_READ_ONLY_T3_MCP_ALLOWED_TOOLS: ReadonlyArray<string> = [
812812
"mcp__t3-code__t3_pending_request_read",
813813
"mcp__t3-code__t3_thread_configuration",
814814
"mcp__t3-code__t3_thread_transfers",
815+
"mcp__t3-code__t3_worktree_status",
816+
"mcp__t3-code__t3_worktree_list",
815817
"mcp__t3-code__t3_project_list",
816818
"mcp__t3-code__t3_project_read",
817819
"mcp__t3-code__t3_thread_search",

‎packages/shared/src/t3McpToolPresentation.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ const T3_MCP_TOOLS: Record<
7070
t3_thread_wait: { displayName: "Wait for a T3 thread", summaryAction: "thread-wait" },
7171
t3_thread_interrupt: { displayName: "Interrupt a T3 thread", summaryAction: "thread-interrupt" },
7272
t3_worktree_handoff: { displayName: "Hand off thread to a git worktree" },
73+
t3_worktree_list: { displayName: "List workspace branches" },
7374
t3_worktree_status: { displayName: "Get thread worktree status" },
7475
t3_preview_list: { displayName: "List preview tabs" },
7576
t3_preview_close: { displayName: "Close a preview tab" },

0 commit comments

Comments
 (0)