Skip to content

Commit 3f58d40

Browse files
committed
fix(mcp): authorize existing thread worktrees and narrow request reads
1 parent bcb2b2e commit 3f58d40

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,4 @@ export const layer = Layer.mergeAll(
783783
layerDeviceToolkit,
784784
layerHtmlToolkit,
785785
layerReviewToolkit,
786-
).pipe(
787-
Layer.provide(OrchestratorMcpService.layer),
788-
Layer.provideMerge(layerMcpTransport),
789-
);
786+
).pipe(Layer.provide(OrchestratorMcpService.layer), Layer.provideMerge(layerMcpTransport));

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,10 +1424,11 @@ const make = Effect.gen(function* () {
14241424
yield* resolveRuntimeMode(limits.runtimeMode, shell.runtimeMode);
14251425
yield* resolveInteractionMode(limits.interactionMode, shell.interactionMode);
14261426
const projection = yield* threadManagement
1427-
.getProjectThreadRecords({ projectId: shell.projectId, threadId }, [
1428-
"runtimeRequests",
1429-
"turnItems",
1430-
])
1427+
.getProjectThreadRecords(
1428+
{ projectId: shell.projectId, threadId },
1429+
["runtimeRequests", "turnItems"],
1430+
{ turnItemTypes: ["approval_request", "user_input_request"] },
1431+
)
14311432
.pipe(Effect.mapError(threadManagementFailure));
14321433
const request = projection.runtimeRequests.find(
14331434
(request) =>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const layer = ReviewToolkit.toLayer({
2525
const preview = yield* review
2626
.getScopedDiffPreview({
2727
cwd: thread.worktreePath ?? project.value.workspaceRoot,
28-
workspaceRoot: project.value.workspaceRoot,
28+
workspaceRoot: thread.worktreePath ?? project.value.workspaceRoot,
2929
baseRef: input.baseRef,
3030
source: input.source,
3131
file: input.file,

0 commit comments

Comments
 (0)