From 8f34bbb6ec6ac742026e511cf65b56951ec32f83 Mon Sep 17 00:00:00 2001 From: Mohamed Boudra Date: Sun, 15 Nov 2026 12:13:59 +0100 Subject: [PATCH] fix(claude): preserve interactive MCP requests in bypass The SDK drops the interaction flag from control requests but forwards the CLI decision reason. Use that reason to preserve requests requiring an answer. --- .../claude/agent.auto-plan-approval.test.ts | 12 +++++++----- .../src/server/agent/providers/claude/agent.ts | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/server/src/server/agent/providers/claude/agent.auto-plan-approval.test.ts b/packages/server/src/server/agent/providers/claude/agent.auto-plan-approval.test.ts index 23b1e79058..4f64f08d93 100644 --- a/packages/server/src/server/agent/providers/claude/agent.auto-plan-approval.test.ts +++ b/packages/server/src/server/agent/providers/claude/agent.auto-plan-approval.test.ts @@ -127,16 +127,18 @@ test("bypass allows execution without publishing permission events and follows l await expect(result).resolves.toMatchObject({ behavior: "allow", updatedInput: input }); expect(events.filter((event) => event.type.startsWith("permission_"))).toEqual([]); - for (const [mode, tool, toolInput] of [ - ["bypassPermissions", "AskUserQuestion", { questions: [] }], - ["bypassPermissions", "ExitPlanMode", { plan: "Review this" }], - ["default", "Bash", input], - ["plan", "Bash", input], + for (const [mode, tool, toolInput, decisionReason] of [ + ["bypassPermissions", "AskUserQuestion", { questions: [] }, undefined], + ["bypassPermissions", "ExitPlanMode", { plan: "Review this" }, undefined], + ["bypassPermissions", "mcp__survey__answer", {}, "requiresUserInteraction"], + ["default", "Bash", input, undefined], + ["plan", "Bash", input, undefined], ] as const) { await session.setMode(mode); const resolution = requestPermission(tool, toolInput, { signal: new AbortController().signal, toolUseID: tool, + decisionReason, }); const requestEvent = events.at(-1); expect(requestEvent?.type).toBe("permission_requested"); diff --git a/packages/server/src/server/agent/providers/claude/agent.ts b/packages/server/src/server/agent/providers/claude/agent.ts index 8e55ea30db..ae68a05088 100644 --- a/packages/server/src/server/agent/providers/claude/agent.ts +++ b/packages/server/src/server/agent/providers/claude/agent.ts @@ -5312,7 +5312,8 @@ class ClaudeAgentSession implements AgentSession { const needsUserAnswer = toolName === "AskUserQuestion" || toolName === "ExitPlanMode" || - ("requiresUserInteraction" in options && options.requiresUserInteraction === true); + // The SDK drops requires_user_interaction but forwards this CLI reason. + options.decisionReason === "requiresUserInteraction"; if (this.currentMode === "bypassPermissions" && !needsUserAnswer) { return { behavior: "allow", updatedInput: input, toolUseID: options.toolUseID }; }