@stigmer/runner 3.0.8-dev.20260613085218 → 3.0.9-dev.20260615145121

package/dist/shared/status.js

@@ -10,23 +10,116 @@
 import { create, toJson } from "@bufbuild/protobuf";
 import { AgentExecutionStatusSchema, SetupProgressSchema, } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/api_pb";
 import { ExecutionControlSignal, ExecutionPhase, } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
+import { offloadOversizedToolOutputs, enforceStatusSizeLimit, STATUS_PAYLOAD_HARD_LIMIT_BYTES, } from "./status-offload.js";
+import { isRetryableError, isTerminalError, } from "./grpc-retry.js";
 export function utcTimestamp() {
     return new Date().toISOString().replace("+00:00", "Z");
 }
+/**
+ * A connect-rpc `resource_exhausted` (gRPC code 8) — the payload exceeded the
+ * server's receive cap. Matched by code and, defensively, by the message buf's
+ * size check emits ("exceeds maximum size").
+ */
+function isPayloadTooLarge(err) {
+    if (typeof err === "object" && err !== null && "code" in err) {
+        if (err.code === 8)
+            return true;
+    }
+    const msg = err instanceof Error ? err.message : String(err);
+    return /resource_exhausted|exceeds maximum size/i.test(msg);
+}
+/**
+ * Default transient-retry policy: three attempts with exponential backoff.
+ * Applied to every persist so a transient drop (server restart, brief
+ * unavailability) recovers silently instead of dropping a status update.
+ */
+const DEFAULT_PERSIST_RETRY = {
+    baseDelayMs: 100,
+    backoffFactor: 2,
+    maxRetries: 3,
+};
+function defaultDelay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 /**
  * Persist execution status via gRPC. Returns the control signal from the
- * backend (e.g. STOP to abort the execution). Errors are logged and
- * swallowed — a failed status update should not crash the activity.
+ * backend (e.g. STOP to abort the execution).
+ *
+ * This is the single, unforgeable chokepoint for status persistence across
+ * every harness (streaming and terminal, native and Cursor). Routing all
+ * persistence through here guarantees three invariants that must never be
+ * skipped by an individual call site:
+ *
+ *   1. Size bounding — when `offload` is supplied, oversized tool outputs are
+ *      spilled to artifact storage first (the path that makes screenshots
+ *      render); an aggregate backstop then runs unconditionally so callers
+ *      without storage are still protected from the 4 MiB gRPC cap.
+ *   2. Transient resilience — `Unavailable`/`DeadlineExceeded` back off and
+ *      retry (default three attempts); terminal errors never retry.
+ *   3. Oversize recovery — a `resource_exhausted` rejection is never silently
+ *      swallowed: we hard-elide and retry once, so an oversized payload can
+ *      never freeze persistence invisibly (the bug that stalled the UI).
  */
-export async function persistStatus(client, executionId, status) {
-    try {
-        const response = await client.updateStatus(executionId, status);
-        return response.signal;
+export async function persistStatus(client, executionId, status, options = {}) {
+    const { offload, retry } = options;
+    if (offload) {
+        try {
+            await offloadOversizedToolOutputs(status, offload);
+        }
+        catch (err) {
+            console.warn(`[persistStatus] ${executionId}: tool-output offload failed (non-fatal): ${err}`);
+        }
+    }
+    if (enforceStatusSizeLimit(status)) {
+        console.warn(`[persistStatus] ${executionId}: status exceeded the soft size limit; ` +
+            `elided oversized inline fields to fit under the gRPC cap`);
     }
-    catch (err) {
-        console.error(`Failed to persist status for ${executionId}:`, err);
-        return ExecutionControlSignal.UNSPECIFIED;
+    const baseDelayMs = retry?.baseDelayMs ?? DEFAULT_PERSIST_RETRY.baseDelayMs;
+    const backoffFactor = retry?.backoffFactor ?? DEFAULT_PERSIST_RETRY.backoffFactor;
+    const maxRetries = retry?.maxRetries ?? DEFAULT_PERSIST_RETRY.maxRetries;
+    const delay = retry?.delayFn ?? defaultDelay;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        try {
+            const response = await client.updateStatus(executionId, status);
+            return response.signal;
+        }
+        catch (err) {
+            // Oversize rejection is recoverable exactly once and out-of-band from the
+            // transient budget: hard-elide the largest inline fields and retry now.
+            if (isPayloadTooLarge(err)) {
+                console.error(`[persistStatus] ${executionId}: payload rejected as too large despite ` +
+                    `the size guard; hard-eliding and retrying once`);
+                enforceStatusSizeLimit(status, STATUS_PAYLOAD_HARD_LIMIT_BYTES);
+                try {
+                    const response = await client.updateStatus(executionId, status);
+                    return response.signal;
+                }
+                catch (retryErr) {
+                    console.error(`[persistStatus] ${executionId}: still failing after hard elide:`, retryErr);
+                    return ExecutionControlSignal.UNSPECIFIED;
+                }
+            }
+            // Terminal errors (invalid argument, not found, permission denied) are
+            // deterministic — retrying cannot help.
+            if (isTerminalError(err)) {
+                console.error(`[persistStatus] ${executionId}: terminal error persisting status ` +
+                    `(attempt ${attempt + 1}/${maxRetries + 1}): ${err}`);
+                return ExecutionControlSignal.UNSPECIFIED;
+            }
+            // Transient errors back off and retry until the budget is exhausted.
+            if (isRetryableError(err) && attempt < maxRetries) {
+                const delayMs = baseDelayMs * Math.pow(backoffFactor, attempt);
+                console.warn(`[persistStatus] ${executionId}: retryable error ` +
+                    `(attempt ${attempt + 1}/${maxRetries + 1}, retry in ${delayMs}ms): ${err}`);
+                await delay(delayMs);
+                continue;
+            }
+            // Non-retryable, non-terminal (e.g. a bare Error), or retries exhausted.
+            console.error(`Failed to persist status for ${executionId}:`, err);
+            return ExecutionControlSignal.UNSPECIFIED;
+        }
     }
+    return ExecutionControlSignal.UNSPECIFIED;
 }
 /**
  * Report a setup progress phase (e.g. "Resolving MCP servers") so the

package/dist/shared/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/shared/status.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,6DAA6D,CAAC;AAErE,OAAO,EACL,sBAAsB,EACtB,cAAc,GACf,MAAM,8DAA8D,CAAC;AAGtE,MAAM,UAAU,YAAY;IAC1B,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAqB,EACrB,WAAmB,EACnB,MAA4B;IAE5B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,gCAAgC,WAAW,GAAG,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,sBAAsB,CAAC,WAAW,CAAC;IAC5C,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MAAqB,EACrB,WAAmB,EACnB,KAAa;IAEb,MAAM,MAAM,GAAG,MAAM,CAAC,0BAA0B,EAAE;QAChD,KAAK,EAAE,cAAc,CAAC,qBAAqB;QAC3C,aAAa,EAAE,MAAM,CAAC,mBAAmB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;KACpE,CAAC,CAAC;IACH,MAAM,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU,CAAC,IAA0B;IACnD,MAAM,IAAI,GAAG,MAAM,CAAC,0BAA0B,EAAE;QAC9C,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;KACxC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;IACtD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,IAA+B,CAAC;QAChD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,OAAO,CAAC;QAC/C,OAAO,CAAC,GAAG,CACT,+CAA+C;YAC/C,yCAAyC,QAAQ,IAAI;YACrD,cAAc,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC/C,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/shared/status.ts"],"names":[],"mappings":"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"}

package/dist/{activities/execute-deep-agent → shared}/streaming-scheduler.d.ts

@@ -13,6 +13,10 @@
  *     OR firstUpdate
  *
  * Ported from Python StreamingUpdateScheduler.
+ *
+ * Shared infrastructure: both the native deep-agent harness and the Cursor
+ * harness drive their incremental status persistence through this scheduler so
+ * the live stream cadence is identical across harnesses.
  */
 export declare enum UpdateReason {
     TIME_THRESHOLD = "time_threshold",

package/dist/{activities/execute-deep-agent → shared}/streaming-scheduler.js

@@ -13,6 +13,10 @@
  *     OR firstUpdate
  *
  * Ported from Python StreamingUpdateScheduler.
+ *
+ * Shared infrastructure: both the native deep-agent harness and the Cursor
+ * harness drive their incremental status persistence through this scheduler so
+ * the live stream cadence is identical across harnesses.
  */
 export var UpdateReason;
 (function (UpdateReason) {

package/dist/shared/streaming-scheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streaming-scheduler.js","sourceRoot":"","sources":["../../src/shared/streaming-scheduler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stigmer/runner",
-  "version": "3.0.8-dev.20260613085218",
+  "version": "3.0.9-dev.20260615145121",
   "description": "Embeddable Temporal worker for the Stigmer AI agent platform — handles agent execution, workflow orchestration, and MCP server management",
   "license": "Apache-2.0",
   "type": "module",
@@ -86,7 +86,7 @@
     "@opentelemetry/resources": "^2.0.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",
-    "@stigmer/protos": "3.0.8-dev.20260613085218",
+    "@stigmer/protos": "3.0.9-dev.20260615145121",
     "@temporalio/activity": "^1.11.0",
     "@temporalio/client": "^1.11.0",
     "@temporalio/common": "^1.11.0",

package/src/__tests__/config.test.ts

@@ -32,6 +32,14 @@ describe("loadConfig", () => {
     expect(config.cursorApiKey).toBe("test-key");
     expect(config.proxyEndpoint).toBeNull();
     expect(config.maxConcurrentActivities).toBe(5);
+    expect(config.cursorStreamStallTimeoutMs).toBe(180000);
+  });
+
+  it("respects CURSOR_STREAM_STALL_TIMEOUT_MS", () => {
+    process.env.CURSOR_API_KEY = "test-key";
+    process.env.CURSOR_STREAM_STALL_TIMEOUT_MS = "90000";
+    const config = loadConfig();
+    expect(config.cursorStreamStallTimeoutMs).toBe(90000);
   });
 
   it("respects STIGMER_TASK_QUEUE", () => {

package/src/__tests__/in-flight.test.ts

@@ -0,0 +1,84 @@
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import {
+  activityStartedOnQueue,
+  activityFinishedOnQueue,
+  inFlightCountForQueue,
+  setQueueDrainCallback,
+  forgetQueue,
+  __resetInFlightRegistryForTests,
+} from "../in-flight.js";
+
+const Q = "session:abc";
+
+describe("in-flight activity registry", () => {
+  beforeEach(() => {
+    __resetInFlightRegistryForTests();
+  });
+
+  it("counts concurrent activities up and down per queue", () => {
+    expect(inFlightCountForQueue(Q)).toBe(0);
+    activityStartedOnQueue(Q);
+    activityStartedOnQueue(Q);
+    expect(inFlightCountForQueue(Q)).toBe(2);
+    activityFinishedOnQueue(Q);
+    expect(inFlightCountForQueue(Q)).toBe(1);
+    activityFinishedOnQueue(Q);
+    expect(inFlightCountForQueue(Q)).toBe(0);
+  });
+
+  it("isolates counts across queues", () => {
+    activityStartedOnQueue("session:a");
+    activityStartedOnQueue("session:b");
+    activityStartedOnQueue("session:b");
+    expect(inFlightCountForQueue("session:a")).toBe(1);
+    expect(inFlightCountForQueue("session:b")).toBe(2);
+  });
+
+  it("never goes negative on an unbalanced finish", () => {
+    activityFinishedOnQueue(Q);
+    expect(inFlightCountForQueue(Q)).toBe(0);
+  });
+
+  it("fires the drain callback exactly once when the last activity finishes", () => {
+    const onDrained = vi.fn();
+    activityStartedOnQueue(Q);
+    activityStartedOnQueue(Q);
+    setQueueDrainCallback(Q, onDrained);
+
+    activityFinishedOnQueue(Q);
+    expect(onDrained).not.toHaveBeenCalled(); // still 1 in flight
+
+    activityFinishedOnQueue(Q);
+    expect(onDrained).toHaveBeenCalledTimes(1);
+
+    // A subsequent start/finish cycle does not re-fire the consumed callback.
+    activityStartedOnQueue(Q);
+    activityFinishedOnQueue(Q);
+    expect(onDrained).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not fire a drain callback that was cleared (session re-opened)", () => {
+    const onDrained = vi.fn();
+    activityStartedOnQueue(Q);
+    setQueueDrainCallback(Q, onDrained);
+    setQueueDrainCallback(Q, undefined); // re-open cancels the deferred teardown
+
+    activityFinishedOnQueue(Q);
+    expect(onDrained).not.toHaveBeenCalled();
+  });
+
+  it("forgetQueue resets tracking for a torn-down worker", () => {
+    activityStartedOnQueue(Q);
+    forgetQueue(Q);
+    expect(inFlightCountForQueue(Q)).toBe(0);
+  });
+
+  it("setQueueDrainCallback is a no-op for an idle (unknown) queue", () => {
+    const onDrained = vi.fn();
+    setQueueDrainCallback("session:idle", onDrained);
+    // No entry exists, so nothing will ever fire it — caller tears down inline.
+    activityStartedOnQueue("session:idle");
+    activityFinishedOnQueue("session:idle");
+    expect(onDrained).not.toHaveBeenCalled();
+  });
+});

package/src/activities/__tests__/classify-tool-approvals.test.ts

@@ -414,6 +414,7 @@ function makeConfig() {
     checkpointerType: "memory" as const,
     checkpointerProxyEndpoint: null,
     primaryModel: "gpt-4.1",
+    cursorStreamStallTimeoutMs: 180000,
   };
 }
 

package/src/activities/__tests__/discover-mcp-server.test.ts

@@ -570,6 +570,7 @@ function makeConfig() {
     checkpointerType: "memory" as const,
     checkpointerProxyEndpoint: null,
     primaryModel: "gpt-4.1",
+    cursorStreamStallTimeoutMs: 180000,
   };
 }
 

package/src/activities/execute-cursor/__tests__/build-prompt.test.ts

@@ -14,6 +14,7 @@ import { PendingApprovalSchema } from "@stigmer/protos/ai/stigmer/agentic/agente
 
 import { buildPrompt } from "../index.js";
 import type { BuildPromptInput } from "../index.js";
+import { buildReinvocationPrompt, formatToolApprovalProtocol } from "../prompt-builder.js";
 import type { AgentResolution, AgentResolutionReason } from "../session-lifecycle.js";
 
 const USER_MESSAGE = "What was the secret token I told you?";
@@ -109,3 +110,76 @@ describe("buildPrompt", () => {
     expect(prompt).not.toContain("tool-call-1");
   });
 });
+
+describe("tool-approval protocol injection", () => {
+  it("includes the tool-approval protocol on the first execution", () => {
+    const prompt = buildPrompt(
+      input({ resolution: resolution("local", "created_first_execution") }),
+    );
+    expect(prompt).toContain("<tool_approval_protocol>");
+    // The decisive override against a server's "ask first" guidance.
+    expect(prompt).toContain("calling the appropriate tool directly");
+    expect(prompt).toContain("Invoke the tool and let the platform");
+  });
+
+  it("places the protocol after the agent instructions, before the user request", () => {
+    const prompt = buildPrompt(
+      input({ resolution: resolution("local", "created_first_execution") }),
+    );
+    const protocolIdx = prompt.indexOf("<tool_approval_protocol>");
+    const requestIdx = prompt.indexOf("<user_request>");
+    expect(protocolIdx).toBeGreaterThan(prompt.indexOf("<agent_instructions>"));
+    expect(protocolIdx).toBeLessThan(requestIdx);
+  });
+
+  it("also injects the protocol for a fresh agent after a resume failure", () => {
+    const prompt = buildPrompt(
+      input({ resolution: resolution("local", "created_after_resume_failure") }),
+    );
+    expect(prompt).toContain("<tool_approval_protocol>");
+  });
+});
+
+describe("formatToolApprovalProtocol", () => {
+  it("instructs the agent to invoke tools and never ask for permission in prose", () => {
+    const section = formatToolApprovalProtocol();
+    expect(section).toContain("<tool_approval_protocol>");
+    expect(section).toContain("</tool_approval_protocol>");
+    expect(section.toLowerCase()).toContain("never ask the");
+    // Explicit override of MCP-server "confirm before acting" guidance.
+    expect(section.toLowerCase()).toContain("even if a tool or mcp server");
+    expect(section).toContain("Invoke the tool and let the platform");
+  });
+
+  it("contains no characters that would break the prompt assembly", () => {
+    // Sanity: the protocol is plain prose joined into the user-message prompt.
+    expect(formatToolApprovalProtocol()).not.toContain("undefined");
+  });
+});
+
+describe("buildReinvocationPrompt", () => {
+  function pending(toolCallId: string, message: string) {
+    return create(PendingApprovalSchema, { toolCallId, toolName: "Write", message });
+  }
+
+  it("tells the agent to carry out approved actions and keep invoking tools", () => {
+    const decisions = new Map<string, ApprovalAction>([
+      ["tc-1", ApprovalAction.APPROVE],
+    ]);
+    const prompt = buildReinvocationPrompt([pending("tc-1", "Write file: a.txt")], decisions);
+    expect(prompt).toContain("APPROVED");
+    expect(prompt).toContain("Write file: a.txt");
+    // The continuation + override directive must be present.
+    expect(prompt).toContain("Continue the rest of the task");
+    expect(prompt.toLowerCase()).toContain("do not ask the user for permission in prose");
+  });
+
+  it("still carries the continuation/override when every action was skipped", () => {
+    const decisions = new Map<string, ApprovalAction>([
+      ["tc-1", ApprovalAction.SKIP],
+    ]);
+    const prompt = buildReinvocationPrompt([pending("tc-1", "Write file: a.txt")], decisions);
+    expect(prompt).toContain("SKIPPED");
+    expect(prompt).toContain("Continue the rest of the task");
+  });
+});

package/src/activities/execute-cursor/__tests__/hook-script.test.ts

@@ -89,13 +89,26 @@ function setup(opts: {
   };
 }
 
-// Real hook-input shapes (PascalCase name, file_path/command in tool_input).
+// Real preToolUse hook-input shapes (PascalCase name, file_path/command in
+// tool_input). These omit hook_event_name on purpose: a payload with no event
+// must still take the built-in arm (the script only diverts to the MCP arm on an
+// explicit beforeMCPExecution).
 const hookWrite = (filePath: string) => ({ tool_name: "Write", tool_input: { file_path: filePath, content: "x" } });
 const hookShell = (command: string) => ({ tool_name: "Shell", tool_input: { command, cwd: "/x", timeout: 30000 } });
 const hookDelete = (filePath: string) => ({ tool_name: "Delete", tool_input: { file_path: filePath } });
 const hookRead = (filePath: string) => ({ tool_name: "Read", tool_input: { file_path: filePath } });
 
-d("generated preToolUse hook", () => {
+// Real beforeMCPExecution shape (captured live): bare tool_name, tool_input as a
+// JSON STRING, server identity, and the hook_event_name discriminator.
+const hookMcp = (name: string, input: Record<string, unknown> = {}) => ({
+  tool_name: name,
+  tool_input: JSON.stringify(input),
+  mcp_server_name: "srv",
+  command: "npx -y srv mcp",
+  hook_event_name: "beforeMCPExecution",
+});
+
+d("generated approval hook (preToolUse + beforeMCPExecution)", () => {
   it("denies gated built-ins (Write/Shell/Delete) and records a category+salient token", () => {
     const h = setup({});
 
@@ -134,24 +147,86 @@ d("generated preToolUse hook", () => {
     expect(h.decide(hookWrite("/x/OTHER.txt")).permission).toBe("deny");
   });
 
-  it("denies require-approval MCP tools and allows them once granted (name-only)", () => {
-    const mcpPolicies = { apply_x: { requiresApproval: true, message: "Apply X" } };
-    const denyH = setup({ mcpPolicies });
-    expect(denyH.decide({ tool_name: "apply_x", tool_input: {} }).permission).toBe("deny");
-    expect(denyH.ledger()[0].token).toBe(grantToken("apply_x", ""));
-
-    const grantH = setup({
-      mcpPolicies,
-      grants: [{ toolName: "apply_x", mcpServerSlug: "srv", key: "apply_x", salient: "" }],
-    });
-    expect(grantH.decide({ tool_name: "apply_x", tool_input: {} }).permission).toBe("allow");
-  });
-
   it("fails closed (deny) when the state file is missing", () => {
     const h = setup({ noStateFile: true });
     expect(h.decide(hookWrite("/x/a.txt")).permission).toBe("deny");
   });
 
+  // MCP gating runs ONLY on the beforeMCPExecution event (preToolUse does not
+  // enforce MCP), so a denial is recorded in exactly one place. The identity is
+  // name-only (base64("<tool>\n")) because the bare tool name is identical on the
+  // hook input and the runner's stream event.
+  describe("MCP tools (beforeMCPExecution event)", () => {
+    it("denies a require-approval MCP tool and surfaces its policy message", () => {
+      const h = setup({ mcpPolicies: { click: { requiresApproval: true, message: "Approve click?" } } });
+      const res = h.decide(hookMcp("click", { app: "Slack", element_index: "59" }));
+      expect(res.permission).toBe("deny");
+      expect(res.raw).toContain("Approve click?");
+      expect(h.ledger()).toHaveLength(1);
+      expect(h.ledger()[0].token).toBe(grantToken("click", ""));
+    });
+
+    it("denial agent_message frames approval as automatic and never trains ask-in-prose", () => {
+      const h = setup({ mcpPolicies: { click: { requiresApproval: true, message: "Approve click?" } } });
+      const res = h.decide(hookMcp("click"));
+      // The agent_message must tell the model approval is handled automatically
+      // and that it should continue, NOT stop and wait or ask for permission.
+      expect(res.raw).toContain("submitted to the user for approval automatically");
+      expect(res.raw).toContain("continue with the rest of the task");
+      // The old propose-then-wait framing and internal sentinel must be gone.
+      expect(res.raw).not.toContain("STIGMER_APPROVAL_REQUIRED");
+      expect(res.raw).not.toContain("Stop and wait");
+    });
+
+    it("allows a require-approval MCP tool once it has been granted (reinvocation)", () => {
+      const h = setup({
+        mcpPolicies: { click: { requiresApproval: true } },
+        grants: [{ toolName: "click", mcpServerSlug: "srv", key: "click", salient: "" }],
+      });
+      expect(h.decide(hookMcp("click")).permission).toBe("allow");
+      expect(h.ledger()).toEqual([]);
+    });
+
+    it("allows an auto-approved MCP tool (absent from mcpToolPolicies)", () => {
+      const h = setup({ mcpPolicies: { click: { requiresApproval: true } } });
+      expect(h.decide(hookMcp("list_apps")).permission).toBe("allow");
+      expect(h.ledger()).toEqual([]);
+    });
+
+    it("allows an MCP tool whose policy is explicitly requiresApproval:false", () => {
+      const h = setup({ mcpPolicies: { click: { requiresApproval: false } } });
+      expect(h.decide(hookMcp("click")).permission).toBe("allow");
+    });
+
+    it("auto-approve-all allows a require-approval MCP tool", () => {
+      const h = setup({ autoApproveAll: true, mcpPolicies: { click: { requiresApproval: true } } });
+      expect(h.decide(hookMcp("click")).permission).toBe("allow");
+    });
+
+    it("fails closed (deny) when the state file is missing", () => {
+      const h = setup({ noStateFile: true });
+      expect(h.decide(hookMcp("click")).permission).toBe("deny");
+    });
+
+    it("does NOT gate the same MCP tool delivered on preToolUse (no double-gating)", () => {
+      const h = setup({ mcpPolicies: { click: { requiresApproval: true } } });
+      // preToolUse must fall through to allow for MCP — gating belongs to
+      // beforeMCPExecution alone, so the denial is never recorded twice.
+      const res = h.decide({ tool_name: "click", tool_input: "{}", hook_event_name: "preToolUse" });
+      expect(res.permission).toBe("allow");
+      expect(h.ledger()).toEqual([]);
+    });
+
+    it("scope guard: a foreign MCP invocation is allowed and never recorded", () => {
+      const h = setup({
+        mcpPolicies: { click: { requiresApproval: true } },
+        runnerPid: 2_147_483_600,
+      });
+      expect(h.decide(hookMcp("click")).permission).toBe("allow");
+      expect(h.ledger()).toEqual([]);
+    });
+  });
+
   // Regression: the original grep-based extraction truncated string values at
   // the first JSON-escaped character, so a shell command containing double
   // quotes (e.g. `printf '%s' 'x' > "file"`) produced a ledger token that never