From 230dc8d00d4510163158404f32b414da682e911b Mon Sep 17 00:00:00 2001 From: Mohamed Boudra Date: Fri, 20 Nov 2026 13:08:51 +0100 Subject: [PATCH] fix(acp): reject permission requests from stopped tools --- .../src/server/acp-internal/connection.ts | 25 ++++++++++--------- packages/plugin/src/server/acp.test.ts | 11 ++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/packages/plugin/src/server/acp-internal/connection.ts b/packages/plugin/src/server/acp-internal/connection.ts index f4e19da0f4..a182577cc0 100644 --- a/packages/plugin/src/server/acp-internal/connection.ts +++ b/packages/plugin/src/server/acp-internal/connection.ts @@ -1149,7 +1149,7 @@ class AcpRuntime { this.closing || this.processFailed || interrupt?.sent || - this.toolCalls.get(request.toolCall.toolCallId)?.settlement === "canceled" || + this.toolCalls.get(request.toolCall.toolCallId)?.stopped || this.activePrompt?.cancelling || this.autonomousTurn?.cancelling ) { @@ -1278,7 +1278,7 @@ class AcpRuntime { ): void { const previous = this.toolCalls.get(update.toolCallId); // A stopped tool can still report output and terminal echoes after the next prompt. - if (previous?.stopped || previous?.settlement === "canceled") return; + if (previous?.stopped) return; if (update.sessionUpdate === "tool_call") this.fallbackChunkIds.clear(); const previousStatus = previous?.snapshot.status; const backgroundProgress = @@ -1420,19 +1420,20 @@ class AcpRuntime { options?: { preserveInProgressTools?: boolean; turnId?: string }, ): void { for (const [id, record] of this.toolCalls) { - const { snapshot, turnId, settlement } = record; + const { snapshot, turnId, settlement, stopped } = record; + if (stopped) continue; if (snapshot.status !== "pending" && snapshot.status !== "in_progress") continue; if (options?.turnId && options.turnId !== turnId) continue; if (options?.preserveInProgressTools && snapshot.status === "in_progress") continue; - if (settlement) { - // Antigravity can acknowledge Stop for a tool whose row already settled. - if (state === "canceled" && this.outOfTurnActivity && settlement !== "canceled") { - this.toolCalls.set(id, { ...record, stopped: true }); - } - continue; - } - this.toolCalls.set(id, { ...record, settlement: state }); - this.emitToolCall(terminalToolItem(toolTimelineItem(snapshot), state), turnId); + // Antigravity can send more tool input after Stop even if its row already settled. + if (settlement && (state !== "canceled" || !this.outOfTurnActivity)) continue; + this.toolCalls.set(id, { + ...record, + settlement: settlement ?? state, + stopped: state === "canceled", + }); + if (!settlement) + this.emitToolCall(terminalToolItem(toolTimelineItem(snapshot), state), turnId); } for (const item of this.vendorToolCalls.values()) { this.emit({ diff --git a/packages/plugin/src/server/acp.test.ts b/packages/plugin/src/server/acp.test.ts index 2ba2575ad3..b180de06d3 100644 --- a/packages/plugin/src/server/acp.test.ts +++ b/packages/plugin/src/server/acp.test.ts @@ -3071,6 +3071,17 @@ describe("ACP out-of-turn background activity", () => { : [], ), ).toEqual(["running", "completed"]); + + const permission = agent.request("session/request_permission", { + sessionId: "connector-session", + toolCall: { toolCallId: "pending-before-stop", title: "Pending command", rawInput: {} }, + options: [{ optionId: "allow", name: "Allow", kind: "allow_once" }], + }); + await expect(permission).resolves.toEqual({ outcome: { outcome: "cancelled" } }); + expect(events.some((event) => event.type === "session.permission")).toBe(false); + expect(events.filter((event) => event.type === "session.turn")).toHaveLength( + turnCountAfterCancel, + ); } finally { await connection.close(); }