Skip to content

Commit 8db30cb

Browse files
donjorrsi-pr-agent
authored andcommitted
fix(upstream-fixes): fork issue MCP tools declare access through upstream's McpToolAccess
Upstream `2c8be5893eb` registers every `/mcp` tool through `McpToolAccess` declarations and lints raw `McpServer` registration. The fork issue toolkit now declares `actsAsCaller`/`readsAsCaller` and registers through `toolkitRegistration`; the workspace symlink setting read uses `catchTags` per the new lint rule. Fork-Domain: upstream-fixes Fork-Tier: bugfix Fork-Upstreamable: no
1 parent c61de5f commit 8db30cb

5 files changed

Lines changed: 33 additions & 25 deletions

File tree

‎apps/server/src/mcp/McpHttpServer.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ import { WorktreeToolkit } from "./toolkits/worktree/tools.ts";
6868
import * as WorktreeMcpService from "./WorktreeMcpService.ts";
6969
import * as PullRequestsHandlers from "./toolkits/pullRequests/handlers.ts";
7070
import { PullRequestsToolkit } from "./toolkits/pullRequests/tools.ts";
71-
import { IssuesToolkitRegistrationLiveFork } from "./toolkits/issues/handlers.fork.ts"; // fork-hook: github-issues/mcp-issues-toolkit-import
71+
import { IssuesToolkitHandlersLiveFork } from "./toolkits/issues/handlers.fork.ts"; // fork-hook: github-issues/mcp-issues-toolkit-import
72+
import { IssuesToolkitFork } from "./toolkits/issues/tools.fork.ts"; // fork-hook: github-issues/mcp-issues-toolkit-import
7273
import * as DeviceHandlers from "./toolkits/device/handlers.ts";
7374
import {
7475
DeviceScreenshotTool,
@@ -1151,7 +1152,7 @@ export const layerTools = Layer.mergeAll(
11511152
layerPreviewControlsRegistration,
11521153
layerWorktreeToolkitRegistration,
11531154
layerPullRequestsToolkit,
1154-
IssuesToolkitRegistrationLiveFork, // fork-hook: github-issues/mcp-issues-toolkit
1155+
toolkitRegistration(IssuesToolkitFork, IssuesToolkitHandlersLiveFork), // fork-hook: github-issues/mcp-issues-toolkit
11551156
layerDeviceToolkit,
11561157
layerHtmlToolkit,
11571158
);

‎apps/server/src/mcp/toolkits/issues/handlers.fork.test.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ import { McpServer, type Tool } from "effect/ai";
2121
import * as Orchestrator from "../../../orchestration-v2/Orchestrator.ts";
2222
import { v2PullRequestThread } from "../../../orchestration-v2/testkit/pullRequestFixtures.ts";
2323
import * as ProjectService from "../../../project/ProjectService.ts";
24+
import { toolkitRegistration } from "../../McpHttpServer.ts";
2425
import * as McpInvocationContext from "../../McpInvocationContext.ts";
25-
import {
26-
IssuesToolkitHandlersLiveFork,
27-
IssuesToolkitRegistrationLiveFork,
28-
parseGitHubIssueUrlFork,
29-
} from "./handlers.fork.ts";
26+
import * as McpToolAccess from "../../McpToolAccess.ts";
27+
import * as McpToolAccessTestkit from "../../McpToolAccess.testkit.ts";
28+
import { IssuesToolkitHandlersLiveFork, parseGitHubIssueUrlFork } from "./handlers.fork.ts";
3029
import { IssuesToolkitFork } from "./tools.fork.ts";
3130

3231
const PROJECT_ID = ProjectId.make("project-1");
@@ -151,6 +150,7 @@ function harnessDependencies(
151150
dispatch,
152151
}),
153152
Layer.succeed(Crypto.Crypto, testCrypto),
153+
McpToolAccessTestkit.liveThreadsLayer,
154154
);
155155
}
156156

@@ -169,7 +169,11 @@ const makeHarness = Effect.fn("makeIssuesToolkitHarness")(function* (options: Ha
169169
});
170170
const dependencies = harnessDependencies(options, dispatch, state);
171171
const toolkit = yield* IssuesToolkitFork.pipe(
172-
Effect.provide(IssuesToolkitHandlersLiveFork.pipe(Layer.provide(dependencies))),
172+
Effect.provide(
173+
McpToolAccess.HandlersLayer.layer(IssuesToolkitHandlersLiveFork).pipe(
174+
Layer.provide(dependencies),
175+
),
176+
),
173177
);
174178
const call = <Name extends keyof typeof IssuesToolkitFork.tools>(
175179
name: Name,
@@ -199,7 +203,7 @@ describe("issue toolkit handlers", () => {
199203
expect(link?.tool.annotations?.openWorldHint).toBe(false);
200204
}).pipe(
201205
Effect.provide(
202-
IssuesToolkitRegistrationLiveFork.pipe(
206+
toolkitRegistration(IssuesToolkitFork, IssuesToolkitHandlersLiveFork).pipe(
203207
Layer.provideMerge(McpServer.McpServer.layer),
204208
Layer.provide(
205209
Layer.mergeAll(

‎apps/server/src/mcp/toolkits/issues/handlers.fork.ts‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ import {
1616
import * as Cause from "effect/Cause";
1717
import * as Crypto from "effect/Crypto";
1818
import * as Effect from "effect/Effect";
19-
import * as Layer from "effect/Layer";
2019
import * as Option from "effect/Option";
21-
import { McpServer } from "effect/ai";
2220

2321
import * as Orchestrator from "../../../orchestration-v2/Orchestrator.ts";
2422
import {
@@ -27,6 +25,7 @@ import {
2725
} from "../../../orchestration-v2/ThreadIssues.fork.ts";
2826
import * as ProjectService from "../../../project/ProjectService.ts";
2927
import * as McpInvocationContext from "../../McpInvocationContext.ts";
28+
import * as McpToolAccess from "../../McpToolAccess.ts";
3029
import {
3130
IssueHostRequiredError,
3231
IssueLinkFailedError,
@@ -233,8 +232,9 @@ const make = Effect.gen(function* () {
233232
? Effect.failCause(cause as Cause.Cause<never>)
234233
: Effect.fail(new Failure({ cause }));
235234

236-
return IssuesToolkitFork.of({
237-
link_issue: (input) =>
235+
// Each tool acts on or reads the calling thread, so access is the caller's own.
236+
return {
237+
link_issue: McpToolAccess.actsAsCaller((input) =>
238238
Effect.gen(function* () {
239239
const thread = yield* requireThread(IssueLinkFailedError);
240240
const project = yield* projectOf(thread, IssueLinkFailedError);
@@ -262,7 +262,8 @@ const make = Effect.gen(function* () {
262262
}
263263
return { ...target, alreadyLinked: rejection !== null };
264264
}),
265-
unlink_issue: (input) =>
265+
),
266+
unlink_issue: McpToolAccess.actsAsCaller((input) =>
266267
Effect.gen(function* () {
267268
const thread = yield* requireThread(IssueUnlinkFailedError);
268269
const project = yield* projectOf(thread, IssueUnlinkFailedError);
@@ -293,14 +294,12 @@ const make = Effect.gen(function* () {
293294
wasLinked: rejection === null,
294295
};
295296
}),
296-
list_thread_issues: () =>
297+
),
298+
list_thread_issues: McpToolAccess.readsAsCaller(() =>
297299
requireThread(IssueListFailedError).pipe(Effect.map(listThreadIssuesFork)),
298-
});
300+
),
301+
} satisfies McpToolAccess.Handlers<typeof IssuesToolkitFork.tools>;
299302
});
300303

301-
export const IssuesToolkitHandlersLiveFork = IssuesToolkitFork.toLayer(make);
302-
303-
/** Spread into `McpHttpServer.layer` through the marked `github-issues/mcp-issues-toolkit` hook. */
304-
export const IssuesToolkitRegistrationLiveFork = McpServer.toolkit(IssuesToolkitFork).pipe(
305-
Layer.provide(IssuesToolkitHandlersLiveFork),
306-
);
304+
/** Registered on `/mcp` through the marked `github-issues/mcp-issues-toolkit` hook. */
305+
export const IssuesToolkitHandlersLiveFork = McpToolAccess.toLayer(IssuesToolkitFork, make);

‎apps/server/src/mcp/toolkits/issues/tools.fork.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import {
66
GitHubIssueState,
77
McpCapabilityUnavailableError,
8+
OrchestratorMcpFailure,
89
PositiveInt,
910
ThreadIssueLinkSource,
1011
TrimmedNonEmptyString,
@@ -15,10 +16,12 @@ import * as Toolkit from "effect/ai/Toolkit";
1516

1617
import * as McpInvocationContext from "../../McpInvocationContext.ts";
1718
import * as Orchestrator from "../../../orchestration-v2/Orchestrator.ts";
19+
import * as ThreadManagementService from "../../../orchestration-v2/ThreadManagementService.ts";
1820
import * as ProjectService from "../../../project/ProjectService.ts";
1921

2022
const dependencies = [
2123
McpInvocationContext.McpInvocationContext,
24+
ThreadManagementService.ThreadManagementService,
2225
Orchestrator.OrchestratorV2,
2326
ProjectService.ProjectService,
2427
];
@@ -121,6 +124,7 @@ export class IssueListFailedError extends Schema.TaggedError<IssueListFailedErro
121124
}
122125

123126
export const IssueToolError = Schema.Union([
127+
OrchestratorMcpFailure,
124128
McpCapabilityUnavailableError,
125129
IssueUrlInvalidError,
126130
IssueTargetIncompleteError,

‎apps/server/src/workspace/WorkspaceFileSystem.fork.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ export const makeExternalSymlinksFork = (): ExternalSymlinksFork => ({
3333
if (maybeSettings._tag !== "Some") return blocked;
3434
return maybeSettings.value.getSettings.pipe(
3535
Effect.map((settings) => settings.followExternalWorkspaceSymlinks),
36-
Effect.catchTag("ServerSettingsError", (error) =>
37-
Effect.logWarning(error).pipe(Effect.as(false)),
38-
),
36+
Effect.catchTags({
37+
ServerSettingsError: (error) => Effect.logWarning(error).pipe(Effect.as(false)),
38+
}),
3939
);
4040
}),
4141
)

0 commit comments

Comments
 (0)