agent-relay-runner 0.94.4 → 0.94.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.94.4",
+  "version": "0.94.6",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {

package/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.94.4",
+  "version": "0.94.6",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/control-server.ts

@@ -7,6 +7,16 @@ import { relayReplyActionText } from "./relay-instructions";
 import { logger, parseLogLevel, LOG_LEVELS } from "./logger";
 import { buildRateLimitProviderState } from "./rate-limit";
 
+// The AskUserQuestion / PermissionRequest hook (runner/plugins/claude/hooks/hooks.json)
+// has a 900s Claude-side timeout. Resolve the server-side wait with a margin UNDER that
+// so the server always returns a deterministic decision before Claude abandons the hook —
+// at exact equality the two timers race with no winner (#693).
+const PERMISSION_WAIT_MS = 880_000;
+// Distinct from a human dismissal ("Dismissed/Denied from Agent Relay dashboard") so the
+// agent can tell "nobody answered in time" (retriable) from "the human said no" (#693).
+const PERMISSION_TIMEOUT_REASON =
+  "No response received within ~15 minutes (timeout, not a dismissal). Re-ask if you still need a decision.";
+
 // A hook that failed in a way it could not handle itself reports here so the
 // failure is never silent (#198 item 5). Phase 1 logs it FATAL to the per-agent
 // log; Phase 2 (#196) will additionally route it through the runner outbox to the
@@ -54,12 +64,19 @@ interface ControlServerOptions {
   // control server already logs it FATAL; this is the seam for Phase 2 to also
   // surface it to the server via the runner outbox.
   onHookFatal?(report: HookFatalReport): void;
+  // Test seam: how long the permission hook waits for a dashboard decision before
+  // resolving as a timeout. Defaults to PERMISSION_WAIT_MS (margin under the 900s hook).
+  permissionWaitMs?: number;
 }
 
 export function startControlServer(options: ControlServerOptions): ControlServer {
   const monitors = new Set<MonitorSocket>();
   const pendingDeliveries = new Map<string, { resolve(ids: number[]): void; timer: Timer }>();
   const pendingPermissionRequests = new Map<string, { resolve(input: ProviderPermissionDecisionInput): void; timer: Timer }>();
+  // approvalIds already resolved, so a duplicate decision (e.g. bus replay after a
+  // reconnect, or both the PreToolUse and PermissionRequest hooks racing one answer)
+  // is an idempotent no-op instead of a silent command failure (#693).
+  const resolvedApprovals = new Set<string>();
   let server!: Server<MonitorSocketData>;
 
   server = Bun.serve<MonitorSocketData>({
@@ -170,9 +187,15 @@ export function startControlServer(options: ControlServerOptions): ControlServer
     },
     resolvePermissionDecision(input: ProviderPermissionDecisionInput): boolean {
       const pending = pendingPermissionRequests.get(input.approvalId);
-      if (!pending) return false;
+      if (!pending) {
+        // Idempotent: a duplicate decision for an already-resolved approval is a
+        // benign no-op, not a dropped answer that fails the command (#693).
+        return resolvedApprovals.has(input.approvalId);
+      }
       clearTimeout(pending.timer);
       pendingPermissionRequests.delete(input.approvalId);
+      resolvedApprovals.add(input.approvalId);
+      if (resolvedApprovals.size > 1024) resolvedApprovals.clear();
       pending.resolve(input);
       options.onStatus({
         status: "busy",
@@ -251,8 +274,8 @@ async function handlePermissionRequest(
   const decision = await new Promise<ProviderPermissionDecisionInput>((resolve) => {
     const timer = setTimeout(() => {
       pendingPermissionRequests.delete(approvalId);
-      resolve({ approvalId, decision: "deny", reason: "permission request timed out" });
-    }, 15 * 60 * 1000);
+      resolve({ approvalId, decision: "deny", reason: PERMISSION_TIMEOUT_REASON });
+    }, options.permissionWaitMs ?? PERMISSION_WAIT_MS);
     pendingPermissionRequests.set(approvalId, { resolve, timer });
   });
 
@@ -346,6 +369,22 @@ function claudePermissionHookResponse(decision: ProviderPermissionDecisionInput,
     };
   }
   const hookEventName = "PermissionRequest";
+  // AskUserQuestion can be gated by the PermissionRequest hook instead of PreToolUse
+  // (e.g. when the PreToolUse hook returned no decision and Claude fell back to the
+  // default permission flow). The answer must still be honored, not turned into a deny
+  // (#693). PermissionRequest supports updatedInput on an allow, same as PreToolUse.
+  if (decision.decision === "answer" && decision.answers && Object.keys(decision.answers).length) {
+    const toolInput = isRecord(body.tool_input) ? body.tool_input : {};
+    return {
+      hookSpecificOutput: {
+        hookEventName,
+        decision: {
+          behavior: "allow",
+          updatedInput: { ...toolInput, answers: decision.answers },
+        },
+      },
+    };
+  }
   if (decision.decision === "approve" || decision.decision === "approve-session") {
     const suggestions = Array.isArray(body.permission_suggestions) ? body.permission_suggestions : [];
     return {