@quantiya/codevibe-antigravity-plugin 2.0.83 → 2.0.85

package/dist/server.js

@@ -88,19 +88,19 @@ var os2 = __toESM(require("os"));
 var path2 = __toESM(require("path"));
 var HOOK_ENTRY_NAME = "codevibe-antigravity";
 var HOOK_ROUTE_PREFIX = "/agy-hook/v1/";
-var HOOK_EVENTS = ["PreInvocation", "PostToolUse"];
+var HOOK_EVENTS = ["PreInvocation", "PostToolUse", "PreToolUse", "Stop"];
 var HOOK_SHELL_BASENAME = "agy-hook.sh";
 var HOOK_SCRIPT_BASENAME = "agy-hook.js";
 function isHookEvent(value) {
   return typeof value === "string" && HOOK_EVENTS.includes(value);
 }
-function codevibeAgyDir(home = os2.homedir()) {
+function codevibeAgyDir(home = process.env.HOME || os2.homedir()) {
   return path2.join(home, ".codevibe", "codevibe-agy");
 }
-function hooksDir(home = os2.homedir()) {
+function hooksDir(home = process.env.HOME || os2.homedir()) {
   return path2.join(codevibeAgyDir(home), "hooks");
 }
-function globalHooksConfigPath(home = os2.homedir()) {
+function globalHooksConfigPath(home = process.env.HOME || os2.homedir()) {
   return path2.join(home, ".gemini", "config", "hooks.json");
 }
 
@@ -1987,7 +1987,7 @@ var ConversationRouter = class {
         dropped: entry.overflowed
       });
     }
-    if (decision) this.options.onRelease(entry.items, decision);
+    if (decision) this.options.onRelease(entry.items, decision, conversationId);
   }
   expire(conversationId) {
     const entry = this.held.get(conversationId);
@@ -2019,7 +2019,7 @@ var ConversationRouter = class {
       entry.items = entry.items.slice(tailStart);
       if (earlier.length > 0) {
         if (this.roles.get(conversationId) === "main" && !this.movedElsewhere(conversationId) && !entry.moved) {
-          this.options.onRelease(earlier, "process");
+          this.options.onRelease(earlier, "process", conversationId);
         } else {
           this.options.onLog?.("Dropping agy events held from an earlier turn of another session", {
             conversationId,
@@ -2224,6 +2224,14 @@ function buildHookEntry(hooksFolder) {
     PreInvocation: [
       { type: "command", command: `${shell} PreInvocation`, timeout: HOOK_TIMEOUT_SECONDS }
     ],
+    PreToolUse: [
+      {
+        matcher: "^(?:ask_question|question|ask)$",
+        hooks: [
+          { type: "command", command: `${shell} PreToolUse`, timeout: HOOK_TIMEOUT_SECONDS }
+        ]
+      }
+    ],
     PostToolUse: [
       {
         matcher: "*",
@@ -2231,6 +2239,9 @@ function buildHookEntry(hooksFolder) {
           { type: "command", command: `${shell} PostToolUse`, timeout: HOOK_TIMEOUT_SECONDS }
         ]
       }
+    ],
+    Stop: [
+      { type: "command", command: `${shell} Stop`, timeout: HOOK_TIMEOUT_SECONDS }
     ]
   };
 }
@@ -3159,7 +3170,7 @@ function isAgyStatusFooterLine(trimmed) {
   if (/^\s*(?:[❯>]\s*)?\?\s+for shortcuts\b/i.test(trimmed)) {
     return true;
   }
-  if (/^\s*esc to cancel\b/i.test(trimmed)) {
+  if (/^\s*esc to cancel/i.test(trimmed)) {
     return true;
   }
   if (/^(?:\(initializing\.\.\.\)|\d+\s+task\(s\)\s+·\s+\/tasks|\d+\s+subagent\s*\(s\)|AI:\s+(?:\d+\s+\(\/credits to add more\)|Out of credits)|AI Credits:\s+\d+|Quota:\s*\d+(?:\.\d+)?%)$/i.test(trimmed)) {
@@ -3258,7 +3269,7 @@ function reconstructFooter(rawLines) {
   }
   const hasMiddleDot = cleaned.some((l) => l.includes("\xB7"));
   const hasFooterKeyword = cleaned.some(
-    (l) => /^\s*(?:\?\s+for shortcuts|esc to cancel)\b/i.test(l) || /\b(?:auto|accept-edits|plan|Gemini|Claude|GPT|Gemma|high|low|subagent|quota|credits)\b/i.test(l)
+    (l) => /^\s*(?:\?\s+for shortcuts|esc to cancel)/i.test(l) || /\b(?:auto|accept-edits|plan|Gemini|Claude|GPT|Gemma|high|low|subagent|quota|credits)\b/i.test(l)
   );
   if (!hasMiddleDot && !hasFooterKeyword) {
     return cleaned.join(" ").replace(/\s*·\s*/g, " \xB7 ").trim();
@@ -3346,7 +3357,7 @@ function isSystemErrorActiveFromIndex(lines, errorIdx) {
           }
           if (remainingRaw.length <= 4) {
             const hasFooterMarkers = remainingRaw.some(
-              (l) => l.includes("\xB7") || /^\s*(?:\?\s+for shortcuts|esc to cancel)\b/i.test(l.trim()) || /\b(?:auto|accept-edits|plan|Gemini|Claude|GPT|Gemma|high|low|subagent|quota|credits)\b/i.test(l)
+              (l) => l.includes("\xB7") || /^\s*(?:\?\s+for shortcuts|esc to cancel)/i.test(l.trim()) || /\b(?:auto|accept-edits|plan|Gemini|Claude|GPT|Gemma|high|low|subagent|quota|credits)\b/i.test(l)
             );
             if (hasFooterMarkers) {
               const reconstructed = reconstructFooter(remainingRaw);
@@ -3382,7 +3393,7 @@ function isLegacyYNActiveInLines(lines) {
     const trimmed = lines[j].trim();
     if (!trimmed) continue;
     if (/^[─━│╭╰╮╯\s_-]*$/.test(trimmed)) continue;
-    if (/^\s*(?:\?\s+for shortcuts|esc to cancel)\b/i.test(trimmed)) continue;
+    if (/^\s*(?:\?\s+for shortcuts|esc to cancel)/i.test(trimmed)) continue;
     return { active: false, lineIdx: -1 };
   }
   return { active: true, lineIdx: ynIdx };
@@ -3513,7 +3524,7 @@ function extractFileAccessPrompt(snapshot) {
       headingIndex = index;
       break;
     }
-    if (/^[─━│╭╰╮╯\s_-]*$/.test(line) || /^[│\s]*[❯>]\s+\S/.test(line) || /^\s*(?:Requesting permission for:|Question \d+\/\d+:|Allow access to this file\?|Do you want to proceed\?)/i.test(line) || /^[▶▸\s]*Thought|^●\s*/i.test(line) || /^\s*(?:\?\s+for shortcuts|esc to cancel)\b/i.test(line) || /^\s*(?:[↑↓/\s]*Navigate\b|ctrl\+r\s+Review\b)/i.test(line)) {
+    if (/^[─━│╭╰╮╯\s_-]*$/.test(line) || /^[│\s]*[❯>]\s+\S/.test(line) || /^\s*(?:Requesting permission for:|Question \d+\/\d+:|Allow access to this file\?|Do you want to proceed\?)/i.test(line) || /^[▶▸\s]*Thought|^●\s*/i.test(line) || /^\s*(?:\?\s+for shortcuts|esc to cancel)/i.test(line) || /^\s*(?:[↑↓/\s]*Navigate\b|ctrl\+r\s+Review\b)/i.test(line)) {
       break;
     }
     break;
@@ -4247,7 +4258,7 @@ function isQuestionUISnapshot(snapshot) {
 
 // src/approval-detector.ts
 var import_events3 = require("events");
-var import_uuid = require("uuid");
+var import_uuid2 = require("uuid");
 
 // src/prompt-parser.ts
 var import_crypto2 = require("crypto");
@@ -4276,17 +4287,17 @@ function parseApprovalSnapshot(snapshot) {
   return parseApprovalUISnapshot(stripped, snapshot);
 }
 function buildApprovalSemanticKey(candidate) {
-  const normalize = (value) => value.replace(/\s+/g, " ").trim();
+  const normalize = (value) => (value ?? "").replace(/\s+/g, " ").trim();
   const payload = {
     kind: candidate.kind,
     headerText: normalize(candidate.headerText),
     body: normalize(candidate.body),
-    options: candidate.options.map((option) => ({
+    options: (candidate.options ?? []).map((option) => ({
       number: option.number,
       text: normalize(option.text)
     })),
     submitMap: Object.fromEntries(
-      Object.entries(candidate.submitMap).sort(([left], [right]) => Number(left) - Number(right)).map(([number, keys]) => [number, [...keys]])
+      Object.entries(candidate.submitMap ?? {}).sort(([left], [right]) => Number(left) - Number(right)).map(([number, keys]) => [number, [...keys]])
     )
   };
   return (0, import_crypto2.createHash)("sha256").update(JSON.stringify(payload)).digest("hex");
@@ -4561,1428 +4572,1885 @@ function stripAnsi(s) {
   return s.replace(ANSI_ESCAPE_REGEX2, "");
 }
 
-// src/approval-detector.ts
-var DEFAULT_PROMPT_TTL_MS = 6e4;
-var PENDING_CALL_TTL_MS = 5 * 6e4;
-var SWEEP_INTERVAL_MS = 3e4;
-var PASS3_MIN_IDENTITY_LEN = 4;
-var PENDING_CANDIDATE_BUFFER_MS = 5e3;
-var ApprovalDetector = class extends import_events3.EventEmitter {
-  constructor(options = {}) {
-    super();
-    this.pendingCalls = /* @__PURE__ */ new Map();
-    this.pendingPrompts = /* @__PURE__ */ new Map();
-    /** Track recently-resolved promptIds so a duplicate candidate-emit
-     *  doesn't re-fire INTERACTIVE_PROMPT. Maps promptId → ms-epoch when
-     *  resolved. Pruned by sweep. */
-    this.resolvedPrompts = /* @__PURE__ */ new Map();
-    /** Pre-transcript candidate buffer keyed by `${conversationId}|${paneHash}`
-     *  (composite key prevents collision when two conversations on the same
-     *  tmux pane produce identical paneHashes — agy R2 Stage 2 round-3 MED).
-     *  When a candidate arrives with no matching pending call, we park it
-     *  here for pendingCandidateBufferMs and re-try the match each time
-     *  registerPendingCall fires. */
-    this.pendingCandidates = /* @__PURE__ */ new Map();
-    this.sweepTimer = null;
-    // ─── Pane-only prompt emission (v9.1 — bypasses pending-call match) ─────
-    /** Set of pane-snapshot hashes we've already emitted INTERACTIVE_PROMPT
-     *  for. Belt-and-suspenders dedupe against the case where paneObserver
-     *  somehow re-fires `prompt-candidate` with the same snapshot bytes
-     *  for the same prompt. The primary dedupe for cosmetic redraws of a
-     *  single approval (spinner ticks, cursor blink, partial repaints)
-     *  lives in tmux-pane-observer's debounce window — by the time a
-     *  candidate reaches this layer, the pane has settled. */
-    this.paneOnlyEmittedHashes = /* @__PURE__ */ new Set();
-    this.promptTtlMs = options.promptTtlMs ?? DEFAULT_PROMPT_TTL_MS;
-    this.pendingCallTtlMs = options.pendingCallTtlMs ?? PENDING_CALL_TTL_MS;
-    this.sweepIntervalMs = options.sweepIntervalMs ?? SWEEP_INTERVAL_MS;
-    this.pendingCandidateBufferMs = options.pendingCandidateBufferMs ?? PENDING_CANDIDATE_BUFFER_MS;
+// src/event-mapper.ts
+var import_uuid = require("uuid");
+var import_codevibe_core5 = require("@quantiya/codevibe-core");
+var CONTENT_MAX = 150 * 1024;
+var TOOL_OUTPUT_MAX = 50 * 1024;
+var TOOL_DIFF_MAX = 100 * 1024;
+function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
+  const { event } = emit;
+  const base = {
+    sessionId,
+    source: import_codevibe_core5.EventSource.DESKTOP
+  };
+  const orderingKey = `${sessionId}:${emit.conversationId}`;
+  const nextTimestamp = () => (0, import_codevibe_core5.prepareEventTimestamp)({ orderingKey, agentClock: event.created_at, notBeforeMs });
+  const baseMetadata = {
+    step_index: event.step_index,
+    agy_source: event.source,
+    agy_status: event.status,
+    agy_created_at: event.created_at,
+    agy_type: event.type,
+    agy_conversation_id: emit.conversationId
+  };
+  if (event.source === "SYSTEM") {
+    if (event.type === "CONVERSATION_HISTORY" || event.type === "SYSTEM_MESSAGE") {
+      logger.debug("Dropping internal transcript event", {
+        type: event.type,
+        stepIndex: event.step_index
+      });
+      return { events: [], pendingCallRegistrations: [] };
+    }
+    if (event.type !== "ERROR_MESSAGE") {
+      logger.warn("Dropping unknown SYSTEM-source transcript event (safety)", {
+        type: event.type,
+        stepIndex: event.step_index
+      });
+      return { events: [], pendingCallRegistrations: [] };
+    }
   }
-  start() {
-    if (this.sweepTimer) return;
-    this.sweepTimer = setInterval(() => this.sweep(), this.sweepIntervalMs);
-    if (this.sweepTimer.unref) this.sweepTimer.unref();
-    logger.info("Approval detector started", {
-      promptTtlMs: this.promptTtlMs,
-      pendingCallTtlMs: this.pendingCallTtlMs
+  if (event.type === "CONVERSATION_HISTORY" || event.type === "SYSTEM_MESSAGE") {
+    logger.debug("Dropping internal transcript event (non-SYSTEM source)", {
+      type: event.type,
+      source: event.source,
+      stepIndex: event.step_index
     });
+    return { events: [], pendingCallRegistrations: [] };
   }
-  async stop() {
-    if (this.sweepTimer) {
-      clearInterval(this.sweepTimer);
-      this.sweepTimer = null;
-    }
-    this.pendingCalls.clear();
-    this.pendingPrompts.clear();
-    this.resolvedPrompts.clear();
-    this.pendingCandidates.clear();
-    this.paneOnlyEmittedHashes.clear();
-    logger.info("Approval detector stopped");
+  if (event.type === "USER_INPUT") {
+    const cleaned = stripUserRequestWrapper(event.content || "");
+    return {
+      events: [
+        {
+          ...base,
+          timestamp: nextTimestamp(),
+          type: import_codevibe_core5.EventType.USER_PROMPT,
+          content: truncate(cleaned, CONTENT_MAX),
+          metadata: { ...baseMetadata }
+        }
+      ],
+      pendingCallRegistrations: []
+    };
   }
-  /**
-   * Emit INTERACTIVE_PROMPT directly from a pane snapshot, WITHOUT
-   * requiring a matching PendingToolCall from a transcript PLANNER_RESPONSE.
-   *
-   * Background (v9.1, 2026-05-21): agy does NOT write tool_call entries
-   * to the transcript BEFORE rendering the approval UI for shell
-   * commands. It only writes them AFTER the user approves. So the
-   * transcript-based pending-call matching path deadlocks for shell
-   * commands: paneObserver sees the UI, but no pending call exists →
-   * candidate buffered → user can't approve from mobile (no prompt
-   * shown) → no transcript write → buffer expires.
-   *
-   * Solution: pane is authoritative for "approval UI is showing right
-   * now." Skip the pending-call requirement and emit directly. The
-   * parsed candidate has everything needed (command, options, submitMap).
-   *
-   * Synthesizes a minimal PendingToolCall from the candidate so the
-   * existing handlePendingPrompt code path doesn't need to branch on
-   * `pendingCall: null`.
-   *
-   * Returns the emitted state, or null if dedupe (already emitted for
-   * this paneHash) or disabled.
-   */
-  emitPaneOnlyPrompt(candidate, conversationId, forcedPromptId) {
-    if (this.paneOnlyEmittedHashes.has(candidate.paneHash)) {
-      logger.debug("Skipping pane-only re-emit for duplicate paneHash", {
-        paneHash: candidate.paneHash.substring(0, 16)
+  if (event.type === "PLANNER_RESPONSE") {
+    const events = [];
+    const pendingCallRegistrations = [];
+    if (typeof event.thinking === "string" && event.thinking.trim().length > 0) {
+      events.push({
+        ...base,
+        timestamp: nextTimestamp(),
+        type: import_codevibe_core5.EventType.REASONING,
+        content: truncate(event.thinking, CONTENT_MAX),
+        metadata: { ...baseMetadata }
       });
-      return null;
-    }
-    const promptId = forcedPromptId ?? (0, import_uuid.v4)();
-    const matchingCall = candidate.kind === "question" ? this.findMatchingPendingCall(candidate, conversationId) : null;
-    if (matchingCall) {
-      matchingCall.matchedPromptId = promptId;
     }
-    const syntheticCall = {
-      conversationId,
-      intentStepIndex: matchingCall?.intentStepIndex ?? -1,
-      // sentinel: "no transcript origin"
-      toolCallIndex: matchingCall?.toolCallIndex ?? 0,
-      intentByteOffset: matchingCall?.intentByteOffset ?? 0,
-      // Best-effort tool-type inference from the candidate. For shell
-      // commands → RUN_COMMAND. For edit-style headers with a file
-      // path → CODE_ACTION. For questions → ASK_QUESTION. Default: GENERIC.
-      toolType: matchingCall?.toolType ?? guessToolTypeFromIdentity(candidate),
-      command: matchingCall?.command ?? candidate.command,
-      filePath: matchingCall?.filePath ?? candidate.filePath,
-      rawToolName: matchingCall?.rawToolName ?? (candidate.kind === "question" ? "ask_question" : candidate.command ?? candidate.filePath ?? "unknown"),
-      questionText: candidate.kind === "question" && candidate.headerText ? candidate.headerText : matchingCall?.questionText,
-      // NOTE (Codex R3-F1 / Claude R3-F2): Pane options are authoritative ground truth
-      // that directly correspond to desktop keystrokes (submitMap). Transcript options
-      // serve solely as fallback when pane options cannot be parsed.
-      questionOptions: candidate.kind === "question" && candidate.options && candidate.options.length > 0 ? candidate.options : matchingCall?.questionOptions,
-      promptId,
-      startedAt: matchingCall?.startedAt ?? Date.now(),
-      intentCreatedAt: matchingCall?.intentCreatedAt ?? (/* @__PURE__ */ new Date()).toISOString()
-    };
-    const state = {
-      promptId,
-      conversationId,
-      pendingCall: syntheticCall,
-      submitMap: candidate.submitMap,
-      matchedPaneHeader: candidate.headerText,
-      paneDisplayHeader: candidate.fullHeaderLine,
-      body: candidate.body,
-      paneOptions: candidate.options,
-      paneSemanticKey: buildApprovalSemanticKey(candidate),
-      kind: candidate.kind,
-      emittedAt: Date.now(),
-      ttlMs: this.promptTtlMs,
-      // E1 (§6a-2b / F5) — carry the consumed pane hash so an emit-failure
-      // rollback can reset the observer's lastPromptHash and let the unchanged
-      // live pane re-emit.
-      paneHash: candidate.paneHash
-    };
-    this.pendingPrompts.set(promptId, state);
-    this.paneOnlyEmittedHashes.add(candidate.paneHash);
-    logger.info("Emitting pane-only INTERACTIVE_PROMPT", {
-      promptId,
-      command: candidate.command,
-      filePath: candidate.filePath,
-      optionsCount: candidate.options.length
-    });
-    this.emit("pending-prompt", state);
-    return state;
-  }
-  // ─── Pending-call registration (called from event-mapper hook) ──────────
-  /**
-   * Register a tool-call intent from a PLANNER_RESPONSE.tool_calls[].
-   * Indexed by composite key so agy rollback (which can replay
-   * step_index values) doesn't cause collisions.
-   */
-  registerPendingCall(call) {
-    const key = this.callKey(call);
-    if (this.pendingCalls.has(key)) {
-      logger.debug("Pending call already registered, skipping", {
-        key,
-        intentStepIndex: call.intentStepIndex,
-        toolType: call.toolType
+    if (typeof event.content === "string" && event.content.trim().length > 0) {
+      events.push({
+        ...base,
+        timestamp: nextTimestamp(),
+        type: import_codevibe_core5.EventType.ASSISTANT_RESPONSE,
+        content: truncate(event.content, CONTENT_MAX),
+        metadata: { ...baseMetadata }
       });
-      return;
     }
-    this.pendingCalls.set(key, call);
-    logger.debug("Pending tool call registered", {
-      key,
-      toolType: call.toolType,
-      command: call.command,
-      filePath: call.filePath
-    });
-    this.drainBufferedCandidates(call.conversationId);
-  }
-  drainBufferedCandidates(conversationId) {
-    if (this.pendingCandidates.size === 0) return;
-    const now = Date.now();
-    for (const [key, buffered] of this.pendingCandidates.entries()) {
-      if (buffered.conversationId !== conversationId) continue;
-      if (now - buffered.queuedAt > this.pendingCandidateBufferMs) {
-        this.pendingCandidates.delete(key);
-        continue;
-      }
-      const state = this.matchCandidateInternal(buffered.candidate, buffered.conversationId);
-      if (state) {
-        this.pendingCandidates.delete(key);
-        logger.info("Drained buffered candidate after pending-call arrived", {
-          key,
-          ageMs: now - buffered.queuedAt
-        });
+    const toolCalls = event.tool_calls;
+    if (Array.isArray(toolCalls)) {
+      for (let i = 0; i < toolCalls.length; i++) {
+        const tc = toolCalls[i];
+        if (!tc || typeof tc !== "object") continue;
+        const name = tc.name;
+        if (typeof name !== "string") continue;
+        const args = tc.args;
+        pendingCallRegistrations.push({
+          intentStepIndex: event.step_index,
+          toolCallIndex: i,
+          intentByteOffset: emit.byteOffset,
+          toolType: hookToolNameToTranscriptType(name),
+          conversationId: emit.conversationId,
+          command: extractCommandFromArgs(name, args),
+          filePath: extractFilePathFromArgs(name, args),
+          questionText: extractQuestionFromArgs(name, args),
+          questionOptions: extractQuestionOptionsFromArgs(name, args),
+          cwd: extractCwdFromArgs(args),
+          rawToolName: name,
+          startedAt: Date.now(),
+          intentCreatedAt: event.created_at
+        });
       }
     }
+    return { events, pendingCallRegistrations };
   }
-  /** Composite key for the pre-transcript buffer. Scoping by
-   *  conversationId prevents the collision case where two simultaneous
-   *  conversations on the same tmux pane (contract-discouraged but not
-   *  contract-impossible) produce identical paneHashes — without
-   *  conversation scoping, conv-B's candidate would be silently dropped
-   *  at the same-key dedupe check. (agy R2 Stage 2 round-3 MED finding
-   *  2026-05-20.) */
-  candidateKey(conversationId, paneHash) {
-    return `${conversationId}|${paneHash}`;
+  if (event.type === "ERROR_MESSAGE") {
+    const content = stripTimestampPrefix(event.content || "Agy error");
+    return {
+      events: [
+        {
+          ...base,
+          timestamp: nextTimestamp(),
+          type: import_codevibe_core5.EventType.NOTIFICATION,
+          content: truncate(content, CONTENT_MAX),
+          metadata: {
+            ...baseMetadata,
+            severity: "error"
+          }
+        }
+      ],
+      pendingCallRegistrations: []
+    };
   }
-  /**
-   * Clear a pending call when its matching RESULT event arrives in the
-   * transcript. event-mapper.ts calls this from its tool-result handlers.
-   *
-   * The result event's step_index = intentStepIndex + toolCallIndex + 1
-   * per agy R2 v2 (the deterministic correlation formula). We try to
-   * match by (conversationId, expected step_index, toolType) — when one
-   * matches, clear it. If multiple pending calls match (rollback edge),
-   * clear the earliest by intentStepIndex.
-   */
-  clearOnResultEvent(args) {
-    let matched = null;
-    let matchedKey = null;
-    for (const [key, call] of this.pendingCalls.entries()) {
-      if (call.conversationId !== args.conversationId) continue;
-      if (args.toolType !== "GENERIC" && call.toolType !== args.toolType) continue;
-      const expected = call.intentStepIndex + call.toolCallIndex + 1;
-      if (expected !== args.resultStepIndex) continue;
-      if (typeof args.resultByteOffset === "number") {
-        if (call.intentByteOffset >= args.resultByteOffset) continue;
-        if (!matched || call.intentByteOffset > matched.intentByteOffset) {
-          matched = call;
-          matchedKey = key;
+  const toolName = transcriptTypeToFriendlyToolName(event.type);
+  const isErrorStatus = event.status === "ERROR";
+  const rawContent = stripTimestampPrefix(event.content || "");
+  const truncatedContent = truncate(rawContent, TOOL_OUTPUT_MAX);
+  return {
+    events: [
+      {
+        ...base,
+        timestamp: nextTimestamp(),
+        type: import_codevibe_core5.EventType.TOOL_USE,
+        content: formatToolResultContent(event.type, toolName, truncatedContent, isErrorStatus),
+        metadata: {
+          ...baseMetadata,
+          tool_name: toolName,
+          tool_output: truncatedContent,
+          success: !isErrorStatus
         }
-      } else if (!matched || call.intentStepIndex < matched.intentStepIndex) {
-        matched = call;
-        matchedKey = key;
       }
+    ],
+    pendingCallRegistrations: []
+  };
+}
+function stripUserRequestWrapper(content) {
+  const match = content.match(/<USER_REQUEST>([\s\S]*?)<\/USER_REQUEST>/);
+  if (match && match[1] !== void 0) {
+    return match[1].trim();
+  }
+  return content.trim();
+}
+function stripTimestampPrefix(content) {
+  return content.replace(
+    /^Created At:[^\n]*\nCompleted At:[^\n]*\n+(?:\s*\n)?/,
+    ""
+  ).trim();
+}
+function transcriptTypeToFriendlyToolName(type) {
+  switch (type) {
+    case "RUN_COMMAND":
+      return "Bash";
+    case "LIST_DIRECTORY":
+      return "LS";
+    case "GREP_SEARCH":
+      return "Grep";
+    case "VIEW_FILE":
+      return "Read";
+    case "CODE_ACTION":
+      return "Edit";
+    case "SEARCH_WEB":
+      return "WebSearch";
+    case "GENERIC":
+      return "Other";
+    default:
+      return "Other";
+  }
+}
+function hookToolNameToTranscriptType(hookName) {
+  const upper = hookName.toUpperCase();
+  switch (upper) {
+    case "LIST_DIR":
+      return "LIST_DIRECTORY";
+    case "REPLACE_FILE_CONTENT":
+    case "MULTI_REPLACE_FILE_CONTENT":
+    case "WRITE_TO_FILE":
+      return "CODE_ACTION";
+    case "GENERATE_IMAGE":
+    case "READ_URL_CONTENT":
+    case "INVOKE_SUBAGENT":
+    case "DEFINE_SUBAGENT":
+    case "MANAGE_SUBAGENTS":
+    case "SEND_MESSAGE":
+    case "LIST_PERMISSIONS":
+    case "MANAGE_TASK":
+    case "SCHEDULE":
+    case "ASK_PERMISSION":
+      return "GENERIC";
+    case "ASK_QUESTION":
+      return "ASK_QUESTION";
+    default:
+      return upper;
+  }
+}
+function extractCommandFromArgs(toolName, args) {
+  if (!args || typeof args !== "object") return void 0;
+  const a = args;
+  for (const key of ["CommandLine", "Command", "command", "cmd", "exec"]) {
+    const v = a[key];
+    if (typeof v === "string" && v.trim().length > 0) {
+      return stripWrappingQuotes2(v.trim());
     }
-    if (matched && matchedKey) {
-      matched.resultStepIndex = args.resultStepIndex;
-      this.pendingCalls.delete(matchedKey);
-      if (matched.promptId) {
-        this.resolvedPrompts.set(matched.promptId, Date.now());
-        this.pendingPrompts.delete(matched.promptId);
-      }
-      logger.debug("Pending tool call cleared on result event", {
-        intentStepIndex: matched.intentStepIndex,
-        toolCallIndex: matched.toolCallIndex,
-        resultStepIndex: args.resultStepIndex,
-        toolType: args.toolType
-      });
+  }
+  return void 0;
+}
+function extractFilePathFromArgs(toolName, args) {
+  if (!args || typeof args !== "object") return void 0;
+  const a = args;
+  for (const key of [
+    "TargetFile",
+    "FilePath",
+    "file_path",
+    "filePath",
+    "path",
+    "DirectoryPath",
+    "directory",
+    "Directory"
+  ]) {
+    const v = a[key];
+    if (typeof v === "string" && v.trim().length > 0) {
+      return stripWrappingQuotes2(v.trim());
     }
-    return matched;
   }
-  // ─── Candidate matching (called from tmux-pane-observer's prompt-candidate) ─
-  /**
-   * Cross-reference a parsed ApprovalCandidate against the pending-call
-   * list. Returns the matched PendingPromptState (which the MCP server
-   * uses to create the INTERACTIVE_PROMPT event), or null if no match
-   * (stale scrollback).
-   *
-   * Match algorithm:
-   *   1. Filter pendingCalls by candidate.command (if set) — exact match
-   *      against PendingToolCall.command.
-   *   2. Fallback: filter by candidate.filePath (if set) — exact match
-   *      against PendingToolCall.filePath.
-   *   3. If multiple candidates match (rare), prefer the earliest
-   *      intentStepIndex.
-   *   4. If a match exists AND it already has a promptId AND that
-   *      promptId is in resolvedPrompts → null (don't re-emit).
-   *   5. If a match exists AND has a promptId BUT NOT resolved → return
-   *      the existing PendingPromptState (idempotent re-emit on the same
-   *      promptId for a duplicate candidate hash).
-   *   6. Otherwise: create a fresh promptId + PendingPromptState, attach
-   *      to the matched call, store in pendingPrompts, return it.
-   */
-  matchCandidate(candidate, conversationId) {
-    const state = this.matchCandidateInternal(candidate, conversationId);
-    if (state) return state;
-    const existing = this.pendingCandidates.get(this.candidateKey(conversationId, candidate.paneHash));
-    if (existing) {
-      logger.debug("Candidate already buffered (same paneHash)", { paneHash: this.candidateKey(conversationId, candidate.paneHash) });
-    } else {
-      this.pendingCandidates.set(this.candidateKey(conversationId, candidate.paneHash), {
-        candidate,
-        conversationId,
-        queuedAt: Date.now()
-      });
-      logger.debug("No pending tool-call matched \u2014 buffering candidate for pre-transcript window", {
-        candidateCommand: candidate.command,
-        candidateFilePath: candidate.filePath,
-        pendingCount: this.pendingCalls.size,
-        bufferSize: this.pendingCandidates.size
-      });
+  return void 0;
+}
+function extractQuestionFromArgs(toolName, args) {
+  if (!args || typeof args !== "object") return void 0;
+  const tn = (toolName || "").toLowerCase().trim();
+  const isQuestionTool = tn === "ask_question" || tn === "question" || tn === "ask";
+  if (!isQuestionTool) return void 0;
+  const a = args;
+  if (typeof a.question === "string" && a.question.trim().length > 0) {
+    return stripWrappingQuotes2(a.question.trim());
+  }
+  if (typeof a.prompt === "string" && a.prompt.trim().length > 0) {
+    return stripWrappingQuotes2(a.prompt.trim());
+  }
+  let questions = a.questions;
+  if (typeof questions === "string") {
+    try {
+      questions = JSON.parse(questions.trim());
+    } catch {
     }
-    return null;
   }
-  /** Internal match logic — does NOT buffer on miss. Used both by the
-   *  public matchCandidate (which buffers on miss) and by
-   *  drainBufferedCandidates (which doesn't re-buffer; misses just stay
-   *  in the buffer until their TTL expires). */
-  matchCandidateInternal(candidate, conversationId) {
-    const matched = this.findMatchingPendingCall(candidate, conversationId);
-    if (!matched) {
-      return null;
-    }
-    if (matched.promptId && this.resolvedPrompts.has(matched.promptId)) {
-      logger.debug("Skipping re-emit for already-resolved prompt", {
-        promptId: matched.promptId
-      });
-      return null;
+  if (Array.isArray(questions) && questions.length > 0) {
+    const first = questions[0];
+    if (typeof first === "string" && first.trim().length > 0) {
+      return stripWrappingQuotes2(first.trim());
     }
-    if (matched.promptId && this.pendingPrompts.has(matched.promptId)) {
-      return this.pendingPrompts.get(matched.promptId) ?? null;
+    if (first && typeof first === "object") {
+      const q = first.question;
+      if (typeof q === "string" && q.trim().length > 0) {
+        return stripWrappingQuotes2(q.trim());
+      }
     }
-    const promptId = (0, import_uuid.v4)();
-    matched.promptId = promptId;
-    const state = {
-      promptId,
-      conversationId,
-      pendingCall: matched,
-      submitMap: candidate.submitMap,
-      matchedPaneHeader: candidate.headerText,
-      paneDisplayHeader: candidate.fullHeaderLine,
-      body: candidate.body,
-      paneOptions: candidate.options,
-      paneSemanticKey: buildApprovalSemanticKey(candidate),
-      kind: candidate.kind,
-      emittedAt: Date.now(),
-      ttlMs: this.promptTtlMs
-    };
-    this.pendingPrompts.set(promptId, state);
-    logger.info("Emitting INTERACTIVE_PROMPT for matched candidate", {
-      promptId,
-      command: matched.command,
-      filePath: matched.filePath,
-      intentStepIndex: matched.intentStepIndex,
-      toolCallIndex: matched.toolCallIndex
-    });
-    this.emit("pending-prompt", state);
-    return state;
   }
-  /** Resolve a pending prompt — called from MCP server when mobile sends
-   *  the option-number reply with metadata.promptId. */
-  /**
-   * Called from the MCP server when paneObserver emits 'prompt-cleared'
-   * — i.e. the approval UI disappeared from the pane (desktop user
-   * picked an option, agy timed out the prompt, or the dispatcher
-   * answered). Resolves ALL outstanding pane-only pending prompts and
-   * releases the paneOnly dedup hashes so a subsequent approval can
-   * fresh-emit. Without this, mobile prompt state dangles until TTL
-   * AND the next identical approval is forever-suppressed by stale
-   * dedup. (Stage 2 R1 MED finding 2026-05-21.)
-   *
-   * `emittedBeforeMs` (F1, Stage 2 R1-F2): a desktop input that waited in the
-   * routing hold proves only that prompts raised BEFORE it was typed are gone.
-   * A prompt emitted after that moment stays pending, and so does its dedup
-   * hash (clearing it would re-emit the still-visible chooser).
-   */
-  onPanePromptCleared(emittedBeforeMs) {
-    if (this.pendingPrompts.size === 0 && this.paneOnlyEmittedHashes.size === 0) {
-      return [];
+  return void 0;
+}
+function extractQuestionOptionsFromArgs(toolName, args) {
+  if (!args || typeof args !== "object") return void 0;
+  const tn = (toolName || "").toLowerCase().trim();
+  const isQuestionTool = tn === "ask_question" || tn === "question" || tn === "ask";
+  if (!isQuestionTool) return void 0;
+  const a = args;
+  let questions = a.questions;
+  if (typeof questions === "string") {
+    try {
+      questions = JSON.parse(questions.trim());
+    } catch {
     }
-    const now = Date.now();
-    const cleared = [];
-    let retained = false;
-    for (const [promptId, state] of this.pendingPrompts.entries()) {
-      if (emittedBeforeMs !== void 0 && state.emittedAt >= emittedBeforeMs) {
-        retained = true;
-        continue;
+  }
+  if (Array.isArray(questions) && questions.length > 0) {
+    const first = questions[0];
+    if (first && typeof first === "object" && Array.isArray(first.options)) {
+      const rawOptions = first.options;
+      const result = [];
+      for (let i = 0; i < rawOptions.length; i++) {
+        const opt = rawOptions[i];
+        if (typeof opt === "string" && opt.trim().length > 0) {
+          result.push({ number: String(i + 1), text: stripWrappingQuotes2(opt.trim()) });
+        } else if (opt && typeof opt === "object" && typeof opt.text === "string") {
+          result.push({
+            number: String(opt.number ?? i + 1),
+            text: stripWrappingQuotes2(String(opt.text).trim())
+          });
+        }
       }
-      this.resolvedPrompts.set(promptId, now);
-      cleared.push(promptId);
+      if (result.length > 0) return result;
     }
-    if (!retained) {
-      this.pendingPrompts.clear();
-      this.paneOnlyEmittedHashes.clear();
-    } else {
-      for (const promptId of cleared) {
-        const state = this.pendingPrompts.get(promptId);
-        if (state?.paneHash) this.paneOnlyEmittedHashes.delete(state.paneHash);
-        this.pendingPrompts.delete(promptId);
+  }
+  if (Array.isArray(a.options) || typeof a.options === "string") {
+    let topOptions = a.options;
+    if (typeof topOptions === "string") {
+      try {
+        topOptions = JSON.parse(topOptions.trim());
+      } catch {
       }
     }
-    if (cleared.length > 0) {
-      logger.info("Pane prompt cleared \u2014 resolved pending prompts", {
-        count: cleared.length
-      });
+    if (Array.isArray(topOptions)) {
+      const result = [];
+      for (let i = 0; i < topOptions.length; i++) {
+        const opt = topOptions[i];
+        if (typeof opt === "string" && opt.trim().length > 0) {
+          result.push({ number: String(i + 1), text: stripWrappingQuotes2(opt.trim()) });
+        } else if (opt && typeof opt === "object" && typeof opt.text === "string") {
+          result.push({
+            number: String(opt.number ?? i + 1),
+            text: stripWrappingQuotes2(String(opt.text).trim())
+          });
+        }
+      }
+      if (result.length > 0) return result;
     }
-    return cleared;
   }
-  resolvePrompt(promptId) {
-    const state = this.pendingPrompts.get(promptId);
-    if (!state) return null;
-    this.resolvedPrompts.set(promptId, Date.now());
-    this.pendingPrompts.delete(promptId);
-    this.paneOnlyEmittedHashes.clear();
-    return state;
+  return void 0;
+}
+function decodeBoolean(val) {
+  if (typeof val === "boolean") return val;
+  if (typeof val === "string") {
+    const s = val.trim().toLowerCase();
+    return s === "true" || s === "1" || s === "yes";
   }
-  /**
-   * Roll back a pending prompt WITHOUT marking it as resolved. Used by
-   * the MCP server when the INTERACTIVE_PROMPT createEvent fails — the
-   * prompt was never delivered to mobile, so a future tmux pane
-   * candidate for the same pending tool-call should be eligible to
-   * re-emit. `resolvePrompt` is the WRONG call there because it adds
-   * the promptId to `resolvedPrompts`, which the stale-scrollback guard
-   * uses to suppress re-emit forever. This method instead detaches the
-   * promptId from the pending call + removes from pendingPrompts +
-   * leaves resolvedPrompts UNTOUCHED so the fresh-emit path runs on
-   * the next match. (agy R2 Stage 2 round-2 MED finding 2026-05-20.)
-   */
-  rollbackPrompt(promptId) {
-    const state = this.pendingPrompts.get(promptId);
-    if (!state) return null;
-    this.pendingPrompts.delete(promptId);
-    if (state.pendingCall.promptId === promptId) {
-      state.pendingCall.promptId = void 0;
+  if (typeof val === "number") return val !== 0;
+  return false;
+}
+function extractAllQuestionsFromArgs(toolName, args) {
+  if (!args || typeof args !== "object") return void 0;
+  const tn = (toolName || "").toLowerCase().trim();
+  const isQuestionTool = tn === "ask_question" || tn === "question" || tn === "ask";
+  if (!isQuestionTool) return void 0;
+  const a = args;
+  let questions = a.questions;
+  if (typeof questions === "string") {
+    try {
+      questions = JSON.parse(questions.trim());
+    } catch {
     }
-    for (const call of this.pendingCalls.values()) {
-      if (call.matchedPromptId === promptId) {
-        call.matchedPromptId = void 0;
+  }
+  const items = [];
+  if (Array.isArray(questions) && questions.length > 0) {
+    for (const qItem of questions) {
+      if (typeof qItem === "string" && qItem.trim().length > 0) {
+        items.push({ question: stripWrappingQuotes2(qItem.trim()), options: [] });
+      } else if (qItem && typeof qItem === "object") {
+        const qObj = qItem;
+        const qText = typeof qObj.question === "string" ? stripWrappingQuotes2(qObj.question.trim()) : "Question";
+        const opts = [];
+        if (Array.isArray(qObj.options)) {
+          for (let i = 0; i < qObj.options.length; i++) {
+            const opt = qObj.options[i];
+            if (typeof opt === "string" && opt.trim().length > 0) {
+              opts.push({ number: String(i + 1), text: stripWrappingQuotes2(opt.trim()) });
+            } else if (opt && typeof opt === "object" && typeof opt.text === "string") {
+              opts.push({
+                number: String(opt.number ?? i + 1),
+                text: stripWrappingQuotes2(String(opt.text).trim())
+              });
+            }
+          }
+        }
+        const isMulti = decodeBoolean(qObj.is_multi_select ?? qObj.isMultiSelect);
+        items.push({ question: qText, options: opts, isMultiSelect: isMulti });
       }
     }
-    this.paneOnlyEmittedHashes.clear();
-    return state;
+  } else if (typeof a.question === "string" || typeof a.prompt === "string") {
+    const qText = stripWrappingQuotes2(String(a.question ?? a.prompt).trim());
+    const opts = extractQuestionOptionsFromArgs(toolName, args) ?? [];
+    const isMulti = decodeBoolean(a.is_multi_select ?? a.isMultiSelect);
+    items.push({ question: qText, options: opts, isMultiSelect: isMulti });
   }
-  /** Returns the current pending-prompt state by id, or null if expired /
-   *  unknown. Used by prompt-responder for the active-prompt-identity
-   *  guard right before send-keys. */
-  getPendingPrompt(promptId) {
-    return this.pendingPrompts.get(promptId) ?? null;
-  }
-  getPendingPromptsForConversation(conversationId) {
-    const pending = Array.from(this.pendingPrompts.values());
-    return conversationId ? pending.filter((state) => state.conversationId === conversationId) : pending;
+  return items.length > 0 ? items : void 0;
+}
+function extractCwdFromArgs(args) {
+  if (!args || typeof args !== "object") return void 0;
+  const a = args;
+  for (const key of ["Cwd", "cwd", "workingDirectory", "WorkingDirectory"]) {
+    const v = a[key];
+    if (typeof v === "string" && v.trim().length > 0) {
+      return stripWrappingQuotes2(v.trim());
+    }
   }
-  // ─── Read-only accessors ────────────────────────────────────────────────
-  getPendingCalls() {
-    return Array.from(this.pendingCalls.values());
+  return void 0;
+}
+function stripWrappingQuotes2(s) {
+  if (s.length >= 2 && s.startsWith('"') && s.endsWith('"')) {
+    return s.slice(1, -1);
   }
-  getActivePromptCount() {
-    return this.pendingPrompts.size;
+  return s;
+}
+function formatToolResultContent(agyType, toolName, output, isError) {
+  const prefix = isError ? "\u26A0 " : "";
+  const firstLine = output.split("\n", 1)[0]?.trim();
+  switch (agyType) {
+    case "RUN_COMMAND":
+      return `${prefix}Bash: ${firstLine || "command executed"}`;
+    case "LIST_DIRECTORY":
+      return `${prefix}LS: ${firstLine || "directory listed"}`;
+    case "GREP_SEARCH":
+      return `${prefix}Grep: ${firstLine || "search executed"}`;
+    case "VIEW_FILE":
+      return `${prefix}Read: ${firstLine || "file read"}`;
+    case "CODE_ACTION":
+      return `${prefix}Edit: ${firstLine || "file edited"}`;
+    case "SEARCH_WEB":
+      return `${prefix}WebSearch: ${firstLine || "search executed"}`;
+    case "GENERIC":
+      return `${prefix}${toolName}: ${firstLine || "tool executed"}`;
+    default:
+      return `${prefix}${toolName} (${agyType}): ${firstLine || "unknown event"}`;
   }
-  // ─── Internals ──────────────────────────────────────────────────────────
-  callKey(call) {
-    return `${call.conversationId}|${call.intentStepIndex}|${call.toolCallIndex}|${call.intentByteOffset}`;
+}
+function truncate(s, maxBytes) {
+  if (!s) return "";
+  if (Buffer.byteLength(s, "utf-8") <= maxBytes) return s;
+  let lo = 0;
+  let hi = s.length;
+  while (lo < hi) {
+    const mid = lo + hi + 1 >>> 1;
+    if (Buffer.byteLength(s.slice(0, mid), "utf-8") <= maxBytes - 32) {
+      lo = mid;
+    } else {
+      hi = mid - 1;
+    }
   }
-  findMatchingPendingCall(candidate, conversationId) {
-    if (candidate.kind === "question") {
-      const questionCalls = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.resultStepIndex === void 0).filter((c) => {
-        const associatedPromptId = c.matchedPromptId || c.promptId;
-        if (!associatedPromptId) return true;
-        return !this.resolvedPrompts.has(associatedPromptId) && !this.pendingPrompts.has(associatedPromptId);
-      }).filter(
-        (c) => c.toolType === "ASK_QUESTION" || c.rawToolName?.toLowerCase() === "ask_question"
-      ).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
-      if (questionCalls.length > 0 && candidate.headerText) {
-        const normHeader = candidate.headerText.toLowerCase().trim();
-        const textMatch = questionCalls.find((c) => {
-          if (!c.questionText) return false;
-          const normQ = c.questionText.toLowerCase().trim();
-          return normHeader === normQ || normHeader.includes(normQ) || normQ.includes(normHeader);
-        });
-        if (textMatch) return textMatch;
+  return s.slice(0, lo) + ` [...truncated ${s.length - lo} chars]`;
+}
+
+// src/approval-detector.ts
+var DEFAULT_PROMPT_TTL_MS = 6e4;
+var PENDING_CALL_TTL_MS = 5 * 6e4;
+var SWEEP_INTERVAL_MS = 3e4;
+var PASS3_MIN_IDENTITY_LEN = 4;
+var PENDING_CANDIDATE_BUFFER_MS = 5e3;
+function normalizeQuestionText(q) {
+  if (!q) return "";
+  return q.normalize("NFKC").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
+}
+function questionsMatch(hookText, paneText) {
+  const h = normalizeQuestionText(hookText);
+  const p = normalizeQuestionText(paneText);
+  if (!h || !p) return false;
+  return h === p;
+}
+function correlatesQuestionInvocation(call, delivery) {
+  if (!call) return false;
+  const tn = (delivery.toolName ?? "").toLowerCase().trim();
+  if (!["ask_question", "question", "ask"].includes(tn)) {
+    return false;
+  }
+  const hasPromptStep = call.intentStepIndex !== void 0 && call.intentStepIndex >= 0;
+  const hasDeliveryStep = delivery.stepIdx !== void 0 && delivery.stepIdx >= 0;
+  if (hasPromptStep && !hasDeliveryStep) {
+    return false;
+  }
+  if (hasPromptStep && hasDeliveryStep) {
+    const stepDiff = delivery.stepIdx - call.intentStepIndex;
+    if (stepDiff < 0 || stepDiff > 1) return false;
+  } else {
+    if (!delivery.toolArgs) return false;
+  }
+  if (delivery.toolArgs) {
+    const completedQ = extractQuestionFromArgs(delivery.toolName ?? "", delivery.toolArgs);
+    const allCompleted = extractAllQuestionsFromArgs(delivery.toolName ?? "", delivery.toolArgs);
+    if (completedQ || allCompleted && allCompleted.length > 0) {
+      const matchesCurrent = completedQ ? questionsMatch(call.questionText, completedQ) : false;
+      const matchesStructured = call.structuredQuestions?.some(
+        (sq) => completedQ && questionsMatch(sq.question, completedQ) || allCompleted?.some((ac) => questionsMatch(sq.question, ac.question))
+      ) ?? false;
+      const matchesAllCompleted = allCompleted?.some(
+        (ac) => questionsMatch(call.questionText, ac.question)
+      ) ?? false;
+      if (!matchesCurrent && !matchesStructured && !matchesAllCompleted) {
+        return false;
       }
-      return null;
-    }
-    if (candidate.command) {
-      const matches = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.command && c.command === candidate.command).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
-      if (matches.length > 0) return matches[0];
-    }
-    if (candidate.filePath) {
-      const matches = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.filePath && c.filePath === candidate.filePath).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
-      if (matches.length > 0) return matches[0];
-    }
-    const allFields = (candidate.command ?? "") + " " + (candidate.filePath ?? "");
-    if (allFields.trim()) {
-      const matches = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => {
-        const cmd = (c.command ?? "").trim();
-        const fp = (c.filePath ?? "").trim();
-        if (!cmd && !fp) return false;
-        const cmdOk = cmd.length >= PASS3_MIN_IDENTITY_LEN && containsAsWord(allFields, cmd);
-        const fpOk = fp.length >= PASS3_MIN_IDENTITY_LEN && containsAsWord(allFields, fp);
-        return cmdOk || fpOk;
-      }).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
-      if (matches.length > 0) return matches[0];
+    } else if (!hasPromptStep || !hasDeliveryStep) {
+      return false;
     }
-    return null;
   }
-  sweep() {
-    const now = Date.now();
-    for (const [key, call] of this.pendingCalls.entries()) {
-      if (now - call.startedAt > this.pendingCallTtlMs) {
-        this.pendingCalls.delete(key);
-        if (call.promptId) {
-          this.pendingPrompts.delete(call.promptId);
-          this.resolvedPrompts.set(call.promptId, now);
-        }
-        logger.warn("Pending tool call expired (no matching result event)", {
-          intentStepIndex: call.intentStepIndex,
-          toolCallIndex: call.toolCallIndex,
-          command: call.command,
-          filePath: call.filePath,
-          ageMs: now - call.startedAt
-        });
-        this.emit("pending-call-expired", call);
-      }
+  return true;
+}
+var ApprovalDetector = class extends import_events3.EventEmitter {
+  constructor(options = {}) {
+    super();
+    this.pendingCalls = /* @__PURE__ */ new Map();
+    this.pendingPrompts = /* @__PURE__ */ new Map();
+    /** Track recently-resolved promptIds so a duplicate candidate-emit
+     *  doesn't re-fire INTERACTIVE_PROMPT. Maps promptId → ms-epoch when
+     *  resolved. Pruned by sweep. */
+    this.resolvedPrompts = /* @__PURE__ */ new Map();
+    /** Pre-transcript candidate buffer keyed by `${conversationId}|${paneHash}`
+     *  (composite key prevents collision when two conversations on the same
+     *  tmux pane produce identical paneHashes — agy R2 Stage 2 round-3 MED).
+     *  When a candidate arrives with no matching pending call, we park it
+     *  here for pendingCandidateBufferMs and re-try the match each time
+     *  registerPendingCall fires. */
+    this.pendingCandidates = /* @__PURE__ */ new Map();
+    /** Authoritative live wizard invocations keyed by conversationId (Codex S2-Codex-R6-F15).
+     *  Retains invocation identity and structured questions independently of transcript TTL sweeps. */
+    this.liveWizardInvocations = /* @__PURE__ */ new Map();
+    this.sweepTimer = null;
+    // ─── Pane-only prompt emission (v9.1 — bypasses pending-call match) ─────
+    /** Set of pane-snapshot hashes we've already emitted INTERACTIVE_PROMPT
+     *  for. Belt-and-suspenders dedupe against the case where paneObserver
+     *  somehow re-fires `prompt-candidate` with the same snapshot bytes
+     *  for the same prompt. The primary dedupe for cosmetic redraws of a
+     *  single approval (spinner ticks, cursor blink, partial repaints)
+     *  lives in tmux-pane-observer's debounce window — by the time a
+     *  candidate reaches this layer, the pane has settled. */
+    this.paneOnlyEmittedHashes = /* @__PURE__ */ new Set();
+    this.promptTtlMs = options.promptTtlMs ?? DEFAULT_PROMPT_TTL_MS;
+    this.pendingCallTtlMs = options.pendingCallTtlMs ?? PENDING_CALL_TTL_MS;
+    this.sweepIntervalMs = options.sweepIntervalMs ?? SWEEP_INTERVAL_MS;
+    this.pendingCandidateBufferMs = options.pendingCandidateBufferMs ?? PENDING_CANDIDATE_BUFFER_MS;
+  }
+  start() {
+    if (this.sweepTimer) return;
+    this.sweepTimer = setInterval(() => this.sweep(), this.sweepIntervalMs);
+    if (this.sweepTimer.unref) this.sweepTimer.unref();
+    logger.info("Approval detector started", {
+      promptTtlMs: this.promptTtlMs,
+      pendingCallTtlMs: this.pendingCallTtlMs
+    });
+  }
+  async stop() {
+    if (this.sweepTimer) {
+      clearInterval(this.sweepTimer);
+      this.sweepTimer = null;
     }
-    for (const [promptId, resolvedAt] of this.resolvedPrompts.entries()) {
-      if (now - resolvedAt > 5 * 6e4) {
-        this.resolvedPrompts.delete(promptId);
+    this.pendingCalls.clear();
+    this.pendingPrompts.clear();
+    this.resolvedPrompts.clear();
+    this.pendingCandidates.clear();
+    this.paneOnlyEmittedHashes.clear();
+    this.liveWizardInvocations.clear();
+    logger.info("Approval detector stopped");
+  }
+  /** Explicitly retire a live wizard invocation upon completion (PostToolUse / Stop). (Codex S2-Codex-R6-F15) */
+  retireLiveWizard(conversationId) {
+    const live = this.liveWizardInvocations.get(conversationId);
+    if (live) {
+      if (live.promptId) {
+        this.resolvedPrompts.set(live.promptId, Date.now());
       }
-    }
-    for (const [key, buffered] of this.pendingCandidates.entries()) {
-      if (now - buffered.queuedAt > this.pendingCandidateBufferMs) {
-        this.pendingCandidates.delete(key);
-        logger.debug("Buffered candidate expired without ever matching a pending call", {
-          key,
-          candidateCommand: buffered.candidate.command,
-          ageMs: now - buffered.queuedAt
-        });
+      const callKey = this.callKey(live.call);
+      const call = this.pendingCalls.get(callKey);
+      if (call) {
+        call.resultStepIndex = call.intentStepIndex;
       }
+      this.liveWizardInvocations.delete(conversationId);
     }
   }
-};
-function containsAsWord(haystack, needle) {
-  const escaped = needle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(^|[\\s"'\`])${escaped}([\\s"'\`]|$)`).test(haystack);
-}
-
-// src/prompt-responder.ts
-var import_child_process2 = require("child_process");
-var import_util2 = require("util");
-var execAsync2 = (0, import_util2.promisify)(import_child_process2.exec);
-var ENTER_DELAY_MS = 100;
-var CODEVIBE_AGY_ESCAPE_INPUT = "__CODEVIBE_AGY_KEY_ESCAPE__";
-var PromptResponder = class {
-  constructor(options = {}) {
-    this.tmuxTargetOverride = options.tmuxTarget;
-    this.execFn = options.execFn ?? (async (cmd) => execAsync2(cmd));
-    this.paneObserver = options.paneObserver ?? null;
-    this.detector = options.detector ?? null;
-    if (this.detector && !this.paneObserver) {
-      throw new Error(
-        "PromptResponder misconfigured: detector wired without paneObserver. Approval-reply identity guard requires the observer to re-probe the pane before send. Either wire both, or wire neither."
-      );
+  /** Explicitly retire a live wizard invocation matching a completed tool delivery (PostToolUse) (Codex S2-Codex-R6-F15, Claude R8-F6).
+   *  Runs synchronously before any async backend awaits, using the shared invocation correlation predicate. */
+  retireLiveWizardMatching(conversationId, delivery) {
+    const live = this.liveWizardInvocations.get(conversationId);
+    if (!live) return false;
+    if (!correlatesQuestionInvocation(live.call, delivery)) {
+      return false;
     }
-  }
-  /**
-   * Send free-form text to the agy session. The text is typed (via
-   * `send-keys -l`) then Enter is sent after a short delay so agy's
-   * input handler has time to process the buffer.
-   */
-  async sendFreeForm(text) {
-    const target = this.resolveTmuxTarget();
-    if (!target) {
-      return { ok: false, reason: "no-tmux-target" };
+    if (live.promptId) {
+      this.resolvedPrompts.set(live.promptId, Date.now());
     }
-    try {
-      if (text === CODEVIBE_AGY_ESCAPE_INPUT) {
-        await this.sendKey(target, "Escape");
-      } else {
-        await this.typeLiteral(target, text);
-        await delay(ENTER_DELAY_MS);
-        await this.sendKey(target, "Enter");
-      }
-      logger.info("Sent free-form input to agy", {
-        target,
-        textLength: text.length
-      });
-      return { ok: true };
-    } catch (error) {
-      logger.error("tmux send-keys failed for free-form input", { target, error });
-      return {
-        ok: false,
-        reason: "tmux-failed",
-        details: error instanceof Error ? error.message : String(error)
-      };
+    const callKey = this.callKey(live.call);
+    const call = this.pendingCalls.get(callKey);
+    if (call) {
+      call.resultStepIndex = call.intentStepIndex;
     }
+    this.liveWizardInvocations.delete(conversationId);
+    logger.info("Retired live wizard invocation matching completed tool", {
+      conversationId,
+      toolName: delivery.toolName,
+      stepIdx: delivery.stepIdx,
+      intentStepIndex: live.call.intentStepIndex
+    });
+    return true;
   }
   /**
-   * Resolve a pending approval prompt with the mobile-user's chosen
-   * option number. Uses the submitMap from the PendingPromptState to
-   * translate option-number → terminal keystrokes (digit alone for agy's
-   * 4-numbered UI; future Y/N prompts would use 'y'/'n'/'Escape').
+   * Emit INTERACTIVE_PROMPT directly from a pane snapshot, WITHOUT
+   * requiring a matching PendingToolCall from a transcript PLANNER_RESPONSE.
    *
-   * Active-prompt-identity guard (DESIGN.md §3.4):
-   *   1. Detector check: is `promptId` still in pendingPrompts? If not
-   *      (expired or already-resolved), drop with `prompt-expired`.
-   *   2. Pane-observer check: probeApprovalUIActive() — does the pane
-   *      STILL show an approval UI whose header matches our pending
-   *      call's identity? If active-UI is gone OR header differs,
-   *      drop with `prompt-superseded`.
-   *   3. submitMap lookup: is `optionNumber` a valid key? If not (e.g.
-   *      mobile sent "5" for a 4-option prompt), drop with
-   *      `invalid-option`.
-   *   4. Send the keystrokes via tmux send-keys.
+   * Background (v9.1, 2026-05-21): agy does NOT write tool_call entries
+   * to the transcript BEFORE rendering the approval UI for shell
+   * commands. It only writes them AFTER the user approves. So the
+   * transcript-based pending-call matching path deadlocks for shell
+   * commands: paneObserver sees the UI, but no pending call exists →
+   * candidate buffered → user can't approve from mobile (no prompt
+   * shown) → no transcript write → buffer expires.
+   *
+   * Solution: pane is authoritative for "approval UI is showing right
+   * now." Skip the pending-call requirement and emit directly. The
+   * parsed candidate has everything needed (command, options, submitMap).
+   *
+   * Synthesizes a minimal PendingToolCall from the candidate so the
+   * existing handlePendingPrompt code path doesn't need to branch on
+   * `pendingCall: null`.
+   *
+   * Returns the emitted state, or null if dedupe (already emitted for
+   * this paneHash) or disabled.
    */
-  async sendApprovalReply(promptId, optionNumber) {
-    const target = this.resolveTmuxTarget();
-    if (!target) {
-      return { ok: false, reason: "no-tmux-target" };
+  emitPaneOnlyPrompt(candidate, conversationId, forcedPromptId) {
+    if (this.paneOnlyEmittedHashes.has(candidate.paneHash)) {
+      logger.debug("Skipping pane-only re-emit for duplicate paneHash", {
+        paneHash: candidate.paneHash.substring(0, 16)
+      });
+      return null;
     }
-    if (this.detector) {
-      const state = this.detector.getPendingPrompt(promptId);
-      if (!state) {
-        logger.warn("Mobile reply for unknown / expired promptId", { promptId, optionNumber });
-        return {
-          ok: false,
-          reason: "prompt-expired",
-          details: `promptId ${promptId} is not in pendingPrompts`
+    if (candidate.kind === "question") {
+      const paneQuestionText = candidate.headerText || candidate.fullHeaderLine;
+      const candidateSemanticKey = buildApprovalSemanticKey(candidate);
+      const liveWizard2 = this.liveWizardInvocations.get(conversationId);
+      if (liveWizard2 && liveWizard2.call.structuredQuestions && liveWizard2.call.structuredQuestions.length > 0) {
+        const sqs = liveWizard2.call.structuredQuestions;
+        const currentActiveIdx = liveWizard2.activeStepIndex ?? 0;
+        const scoreStep = (stepIdx) => {
+          if (stepIdx < 0 || stepIdx >= sqs.length) return { score: -1, textMatch: false };
+          const targetQ = sqs[stepIdx];
+          const textMatch = questionsMatch(targetQ.question, paneQuestionText);
+          if (!textMatch) return { score: -1, textMatch: false };
+          const qOptTexts = (targetQ.options || []).map((o) => (typeof o === "string" ? o : o.text).toLowerCase().trim());
+          const cOptTexts = (candidate.options || []).map((o) => (typeof o === "string" ? o : o.text).toLowerCase().trim());
+          if (cOptTexts.length > 0 && qOptTexts.length > 0) {
+            const matchedQCount = qOptTexts.filter((q) => cOptTexts.includes(q)).length;
+            const matchedCCount = cOptTexts.filter((c) => qOptTexts.includes(c)).length;
+            const qRatio = matchedQCount / qOptTexts.length;
+            if (cOptTexts.length !== qOptTexts.length || matchedQCount !== qOptTexts.length || matchedCCount !== cOptTexts.length) {
+              return { score: -1, textMatch: true };
+            }
+            const posMatches = qOptTexts.filter((q, idx) => idx < cOptTexts.length && cOptTexts[idx] === q).length;
+            const posRatio = posMatches / qOptTexts.length;
+            const score = qRatio * 0.5 + posRatio * 0.5;
+            return { score, textMatch: true };
+          }
+          if (cOptTexts.length === 0 && qOptTexts.length === 0) {
+            return { score: 1, textMatch: true };
+          }
+          return { score: -1, textMatch: true };
         };
-      }
-      if (this.paneObserver) {
-        if (!state.paneSemanticKey) {
-          return {
-            ok: false,
-            reason: "prompt-probe-failed",
-            details: "pending prompt has no exact semantic identity"
-          };
+        const allScores = sqs.map((_, idx) => ({ stepIdx: idx, ...scoreStep(idx) })).filter((res) => res.score > 0);
+        let bestStepIdx = -1;
+        if (allScores.length > 0) {
+          const maxScore = Math.max(...allScores.map((s) => s.score));
+          const topSteps = allScores.filter((s) => Math.abs(s.score - maxScore) < 1e-3);
+          if (topSteps.length > 1) {
+            logger.warn("Ambiguous pane options match: multiple wizard steps tied with score", {
+              maxScore,
+              tiedSteps: topSteps.map((s) => s.stepIdx)
+            });
+            bestStepIdx = -1;
+          } else {
+            bestStepIdx = topSteps[0].stepIdx;
+          }
         }
-      }
-      const keys = state.submitMap[optionNumber];
-      if (!keys || keys.length === 0) {
-        return {
-          ok: false,
-          reason: "invalid-option",
-          details: `option '${optionNumber}' not in submitMap (valid: ${Object.keys(state.submitMap).join(",")})`
-        };
-      }
-      try {
-        for (const key of keys) {
-          if (!this.detector || !this.paneObserver) {
-            return {
-              ok: false,
-              reason: "prompt-probe-failed",
-              details: "approval responder is missing its detector or pane observer"
-            };
+        if (bestStepIdx === -1) {
+          logger.debug("Pane candidate did not match any step of active live wizard", {
+            paneQuestionText,
+            currentActiveIdx,
+            totalSteps: sqs.length
+          });
+          return null;
+        }
+        const isAdvancement = bestStepIdx !== currentActiveIdx;
+        if (!isAdvancement) {
+          const existing = [...this.pendingPrompts.values()].find(
+            (p) => p.conversationId === conversationId && p.kind === "question"
+          );
+          if (existing) {
+            const isInitialUpgrade = existing.isHookPrompt && Object.keys(existing.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0;
+            if (isInitialUpgrade) {
+              existing.submitMap = candidate.submitMap;
+              if (candidate.options && candidate.options.length > 0) {
+                existing.paneOptions = candidate.options;
+              }
+              existing.paneSemanticKey = candidateSemanticKey;
+              existing.paneHash = candidate.paneHash;
+              if (candidate.headerText) existing.matchedPaneHeader = candidate.headerText;
+              if (candidate.fullHeaderLine) existing.paneDisplayHeader = candidate.fullHeaderLine;
+              if (candidate.body) existing.body = candidate.body;
+              if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
+              logger.info("Upgraded hook-driven question prompt to actionable from pane observer", {
+                promptId: existing.promptId,
+                optionsCount: existing.paneOptions?.length ?? 0
+              });
+              this.emit("prompt-upgraded", existing);
+              return existing;
+            }
+            if (!existing.paneSemanticKey) {
+              existing.paneSemanticKey = candidateSemanticKey;
+            }
+            if (candidate.body) existing.body = candidate.body;
+            if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
+            return null;
           }
-          if (this.detector.getPendingPrompt(promptId) !== state) {
-            return { ok: false, reason: "prompt-expired" };
+        } else {
+          liveWizard2.activeStepIndex = bestStepIdx;
+          for (const p of [...this.pendingPrompts.values()]) {
+            if (p.conversationId === conversationId && p.kind === "question") {
+              logger.info("Resolving older question prompt on wizard step progression", {
+                oldPromptId: p.promptId,
+                fromStep: currentActiveIdx,
+                toStep: bestStepIdx
+              });
+              this.resolvePrompt(p.promptId, { advanceWizard: false });
+              this.emit("prompt-resolved", p.promptId);
+            }
           }
-          let liveSemanticKey = null;
-          try {
-            const snapshot = await this.paneObserver.captureSnapshot();
-            const live = parseApprovalSnapshot(snapshot);
-            if (!live) {
-              if (detectActivePromptKind(snapshot) === null) {
-                this.detector.resolvePrompt(promptId);
-                return {
-                  ok: false,
-                  reason: "prompt-superseded",
-                  details: "the approval chooser is no longer active"
-                };
+        }
+      } else {
+        for (const p of [...this.pendingPrompts.values()]) {
+          if (p.conversationId === conversationId && p.kind === "question") {
+            const hookQuestionText = p.pendingCall?.questionText || p.matchedPaneHeader || p.paneDisplayHeader;
+            const isSameQuestion = questionsMatch(hookQuestionText, paneQuestionText);
+            if (isSameQuestion) {
+              const isInitialUpgrade = p.isHookPrompt && Object.keys(p.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0;
+              const isControlDelta = !isInitialUpgrade && Boolean(
+                p.paneSemanticKey && candidateSemanticKey !== p.paneSemanticKey
+              );
+              if (!isControlDelta) {
+                if (p.isHookPrompt && Object.keys(p.submitMap || {}).length === 0 && Object.keys(candidate.submitMap || {}).length > 0) {
+                  p.submitMap = candidate.submitMap;
+                  if (candidate.options && candidate.options.length > 0) {
+                    p.paneOptions = candidate.options;
+                  }
+                  p.paneSemanticKey = candidateSemanticKey;
+                  p.paneHash = candidate.paneHash;
+                  if (candidate.headerText) p.matchedPaneHeader = candidate.headerText;
+                  if (candidate.fullHeaderLine) p.paneDisplayHeader = candidate.fullHeaderLine;
+                  if (candidate.body) p.body = candidate.body;
+                  if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
+                  logger.info("Upgraded hook-driven question prompt to actionable from pane observer", {
+                    promptId: p.promptId,
+                    optionsCount: p.paneOptions?.length ?? 0
+                  });
+                  this.emit("prompt-upgraded", p);
+                  return p;
+                }
+                if (!p.paneSemanticKey) {
+                  p.paneSemanticKey = candidateSemanticKey;
+                }
+                if (candidate.paneHash) this.paneOnlyEmittedHashes.add(candidate.paneHash);
+                return null;
               }
-              return {
-                ok: false,
-                reason: "prompt-probe-failed",
-                details: "the active chooser could not be parsed exactly"
-              };
             }
-            liveSemanticKey = live ? buildApprovalSemanticKey(live) : null;
-          } catch (error) {
-            return {
-              ok: false,
-              reason: "prompt-probe-failed",
-              details: error instanceof Error ? error.message : String(error)
-            };
-          }
-          if (liveSemanticKey !== state.paneSemanticKey) {
-            this.detector.resolvePrompt(promptId);
-            return {
-              ok: false,
-              reason: "prompt-superseded",
-              details: "active chooser semantics differ from the mobile prompt"
-            };
+            this.resolvePrompt(p.promptId);
+            this.emit("prompt-resolved", p.promptId);
           }
-          if (isNamedKey(key)) {
-            await this.sendKey(target, key);
+        }
+      }
+    }
+    const promptId = forcedPromptId ?? (0, import_uuid2.v4)();
+    const liveWizard = candidate.kind === "question" ? this.liveWizardInvocations.get(conversationId) : void 0;
+    const matchingCall = liveWizard ? liveWizard.call : candidate.kind === "question" ? this.findMatchingPendingCall(candidate, conversationId) : null;
+    if (liveWizard) {
+      liveWizard.promptId = promptId;
+    } else if (matchingCall) {
+      matchingCall.matchedPromptId = promptId;
+    }
+    const syntheticCall = {
+      conversationId,
+      intentStepIndex: matchingCall?.intentStepIndex ?? -1,
+      // sentinel: "no transcript origin"
+      toolCallIndex: matchingCall?.toolCallIndex ?? 0,
+      intentByteOffset: matchingCall?.intentByteOffset ?? 0,
+      // Best-effort tool-type inference from the candidate. For shell
+      // commands → RUN_COMMAND. For edit-style headers with a file
+      // path → CODE_ACTION. For questions → ASK_QUESTION. Default: GENERIC.
+      toolType: matchingCall?.toolType ?? guessToolTypeFromIdentity(candidate),
+      command: matchingCall?.command ?? candidate.command,
+      filePath: matchingCall?.filePath ?? candidate.filePath,
+      rawToolName: matchingCall?.rawToolName ?? (candidate.kind === "question" ? "ask_question" : candidate.command ?? candidate.filePath ?? "unknown"),
+      questionText: candidate.kind === "question" && candidate.headerText ? candidate.headerText : matchingCall?.questionText,
+      // NOTE (Codex R3-F1 / Claude R3-F2): Pane options are authoritative ground truth
+      // that directly correspond to desktop keystrokes (submitMap). Transcript options
+      // serve solely as fallback when pane options cannot be parsed.
+      questionOptions: candidate.kind === "question" && candidate.options && candidate.options.length > 0 ? candidate.options : matchingCall?.questionOptions,
+      structuredQuestions: matchingCall?.structuredQuestions,
+      promptId,
+      startedAt: matchingCall?.startedAt ?? Date.now(),
+      intentCreatedAt: matchingCall?.intentCreatedAt ?? (/* @__PURE__ */ new Date()).toISOString()
+    };
+    const isHookCall = Boolean(
+      matchingCall?.structuredQuestions && matchingCall.structuredQuestions.length > 0
+    );
+    const state = {
+      promptId,
+      conversationId,
+      pendingCall: syntheticCall,
+      submitMap: candidate.submitMap,
+      matchedPaneHeader: candidate.headerText,
+      paneDisplayHeader: candidate.fullHeaderLine,
+      body: candidate.body,
+      paneOptions: candidate.options,
+      paneSemanticKey: buildApprovalSemanticKey(candidate),
+      kind: candidate.kind,
+      isHookPrompt: isHookCall,
+      // Carry hook ownership forward so pane redraws do not drop it! (Codex S2-Codex-R6-F15)
+      wizardStepIndex: liveWizard ? liveWizard.activeStepIndex : void 0,
+      emittedAt: Date.now(),
+      ttlMs: this.promptTtlMs,
+      // E1 (§6a-2b / F5) — carry the consumed pane hash so an emit-failure
+      // rollback can reset the observer's lastPromptHash and let the unchanged
+      // live pane re-emit.
+      paneHash: candidate.paneHash
+    };
+    this.pendingPrompts.set(promptId, state);
+    this.paneOnlyEmittedHashes.add(candidate.paneHash);
+    logger.info("Emitting pane-only INTERACTIVE_PROMPT", {
+      promptId,
+      command: candidate.command,
+      filePath: candidate.filePath,
+      optionsCount: candidate.options.length
+    });
+    this.emit("pending-prompt", state);
+    return state;
+  }
+  /**
+   * Emit an INTERACTIVE_PROMPT for a question tool call directly from the PreToolUse hook.
+   * This guarantees prompt delivery to mobile without relying on fragile TUI terminal screen-scraping.
+   */
+  emitHookQuestionPrompt(call, forcedPromptId) {
+    const questionText = call.questionText ?? "Question";
+    if (!call.questionOptions && call.structuredQuestions && call.structuredQuestions[0]?.options) {
+      call.questionOptions = call.structuredQuestions[0].options;
+    }
+    for (const [id, p] of this.pendingPrompts.entries()) {
+      if (p.conversationId === call.conversationId && p.kind === "question") {
+        const existingText = p.pendingCall?.questionText || p.matchedPaneHeader || p.paneDisplayHeader;
+        const isSameInvocation = !p.pendingCall || p.pendingCall.intentStepIndex === -1 || call.intentStepIndex === -1 || p.pendingCall.intentStepIndex === call.intentStepIndex;
+        if (isSameInvocation && questionsMatch(existingText, questionText)) {
+          if (p.pendingCall) {
+            p.pendingCall.structuredQuestions = call.structuredQuestions;
+            if (call.intentStepIndex !== -1) {
+              p.pendingCall.intentStepIndex = call.intentStepIndex;
+            }
+            p.pendingCall.rawToolName = call.rawToolName;
+            p.pendingCall.toolType = call.toolType;
           } else {
-            await this.typeLiteral(target, key);
+            p.pendingCall = call;
+          }
+          p.isHookPrompt = true;
+          call.matchedPromptId = p.promptId;
+          if (call.structuredQuestions && call.structuredQuestions.length > 0) {
+            this.liveWizardInvocations.set(call.conversationId, {
+              call,
+              activeStepIndex: 0,
+              promptId: p.promptId,
+              registeredAt: Date.now()
+            });
           }
+          logger.info("emitHookQuestionPrompt: reusing existing matching prompt", {
+            promptId: p.promptId,
+            isActionable: Object.keys(p.submitMap || {}).length > 0
+          });
+          return p;
         }
-        this.detector.resolvePrompt(promptId);
-        logger.info("Sent approval reply via tmux", {
-          promptId,
-          optionNumber,
-          keysSent: keys
+        logger.info("Replacing older question prompt with new hook question", {
+          oldPromptId: id,
+          oldStep: p.pendingCall?.intentStepIndex,
+          newStep: call.intentStepIndex,
+          conversationId: call.conversationId
         });
-        return { ok: true };
-      } catch (error) {
-        return {
-          ok: false,
-          reason: "tmux-failed",
-          details: error instanceof Error ? error.message : String(error)
-        };
+        this.resolvePrompt(id);
+        this.emit("prompt-resolved", id);
       }
     }
-    try {
-      await this.typeLiteral(target, optionNumber);
-      return { ok: true };
-    } catch (error) {
-      return {
-        ok: false,
-        reason: "tmux-failed",
-        details: error instanceof Error ? error.message : String(error)
-      };
+    const promptId = forcedPromptId ?? (0, import_uuid2.v4)();
+    this.registerPendingCall(call);
+    call.matchedPromptId = promptId;
+    const state = {
+      promptId,
+      conversationId: call.conversationId,
+      pendingCall: call,
+      submitMap: {},
+      matchedPaneHeader: call.questionText ?? "Question",
+      paneDisplayHeader: call.questionText ?? "Question",
+      body: void 0,
+      paneOptions: call.questionOptions,
+      paneSemanticKey: buildApprovalSemanticKey({
+        kind: "question",
+        headerText: call.questionText ?? "Question",
+        fullHeaderLine: call.questionText ?? "Question",
+        options: call.questionOptions ?? [],
+        submitMap: {},
+        body: "",
+        paneHash: ""
+      }),
+      kind: "question",
+      isHookPrompt: true,
+      wizardStepIndex: 0,
+      emittedAt: Date.now(),
+      ttlMs: this.promptTtlMs
+    };
+    if (call.structuredQuestions && call.structuredQuestions.length > 0) {
+      this.liveWizardInvocations.set(call.conversationId, {
+        call,
+        activeStepIndex: 0,
+        promptId,
+        registeredAt: Date.now()
+      });
     }
+    this.pendingPrompts.set(promptId, state);
+    logger.info("Emitting hook-driven INTERACTIVE_PROMPT for question", {
+      promptId,
+      conversationId: call.conversationId,
+      questionText: call.questionText,
+      optionsCount: call.questionOptions?.length ?? 0
+    });
+    this.emit("pending-prompt", state);
+    return state;
   }
-  async sendFreeFormWhenNoApprovalActive(text, beforeType) {
-    const target = this.resolveTmuxTarget();
-    if (!target) return { ok: false, reason: "no-tmux-target" };
-    if (!this.paneObserver) {
-      return {
-        ok: false,
-        reason: "prompt-probe-failed",
-        details: "pane observer is required for safe free-form input"
-      };
+  // ─── Pending-call registration (called from event-mapper hook) ──────────
+  /**
+   * Register a tool-call intent from a PLANNER_RESPONSE.tool_calls[].
+   * Indexed by composite key so agy rollback (which can replay
+   * step_index values) doesn't cause collisions.
+   */
+  registerPendingCall(call) {
+    const key = this.callKey(call);
+    if (this.pendingCalls.has(key)) {
+      logger.debug("Pending call already registered, skipping", {
+        key,
+        intentStepIndex: call.intentStepIndex,
+        toolType: call.toolType
+      });
+      return;
     }
-    const chooserIsAbsent = async () => {
-      const probe = await this.paneObserver.probeApprovalUIActive();
-      if (!probe.probeSucceeded) {
-        return { ok: false, reason: "prompt-probe-failed" };
-      }
-      if (probe.active) {
-        return { ok: false, reason: "prompt-superseded" };
+    this.pendingCalls.set(key, call);
+    logger.debug("Pending tool call registered", {
+      key,
+      toolType: call.toolType,
+      command: call.command,
+      filePath: call.filePath
+    });
+    this.drainBufferedCandidates(call.conversationId);
+  }
+  drainBufferedCandidates(conversationId) {
+    if (this.pendingCandidates.size === 0) return;
+    const now = Date.now();
+    for (const [key, buffered] of this.pendingCandidates.entries()) {
+      if (buffered.conversationId !== conversationId) continue;
+      if (now - buffered.queuedAt > this.pendingCandidateBufferMs) {
+        this.pendingCandidates.delete(key);
+        continue;
       }
-      return null;
-    };
-    let preparationFailed = false;
-    try {
-      const beforeText = await chooserIsAbsent();
-      if (beforeText) return beforeText;
-      if (beforeType) {
-        try {
-          await beforeType();
-        } catch (error) {
-          preparationFailed = true;
-          throw error;
-        }
-        const afterPreparation = await chooserIsAbsent();
-        if (afterPreparation) return afterPreparation;
+      const state = this.matchCandidateInternal(buffered.candidate, buffered.conversationId);
+      if (state) {
+        this.pendingCandidates.delete(key);
+        logger.info("Drained buffered candidate after pending-call arrived", {
+          key,
+          ageMs: now - buffered.queuedAt
+        });
       }
-      await this.typeLiteral(target, text);
-      await delay(ENTER_DELAY_MS);
-      const beforeEnter = await chooserIsAbsent();
-      if (beforeEnter) return beforeEnter;
-      await this.sendKey(target, "Enter");
-      return { ok: true };
-    } catch (error) {
-      if (preparationFailed) throw error;
-      return {
-        ok: false,
-        reason: "tmux-failed",
-        details: error instanceof Error ? error.message : String(error)
-      };
     }
   }
-  /** Dismiss whichever approval UI is active without binding to a stale promptId. */
-  async dismissActivePrompt() {
-    const target = this.resolveTmuxTarget();
-    if (!target) return { ok: false, reason: "no-tmux-target" };
-    if (!this.paneObserver) {
-      return { ok: false, reason: "prompt-probe-failed" };
-    }
-    try {
-      const before = await this.paneObserver.probeApprovalUIActive();
-      if (!before.probeSucceeded) return { ok: false, reason: "prompt-probe-failed" };
-      if (!before.active) return { ok: true };
-      if (before.ambiguous) {
-        return {
-          ok: false,
-          reason: "ambiguous-prompt-active",
-          details: "masked/ambiguous prompt cannot be dismissed via Escape from mobile"
-        };
-      }
-      if (before.kind === "question") {
-        let isActionableWizard = false;
-        try {
-          const snapshot = await this.paneObserver.captureSnapshot();
-          if (snapshot) {
-            const parsed = parseApprovalSnapshot(snapshot);
-            if (parsed && parsed.kind === "question" && Object.keys(parsed.submitMap || {}).length > 0) {
-              isActionableWizard = true;
-            }
-          }
-        } catch {
-        }
-        if (!isActionableWizard) {
-          return {
-            ok: false,
-            reason: "display-only-question-active",
-            details: "active question prompt cannot be dismissed via Escape from mobile"
-          };
-        }
-      }
-      await this.sendKey(target, "Escape");
-      await delay(250);
-      const after = await this.paneObserver.probeApprovalUIActive();
-      if (!after.probeSucceeded) return { ok: false, reason: "prompt-probe-failed" };
-      if (after.active) {
-        return {
-          ok: false,
-          reason: "prompt-superseded",
-          details: "approval chooser remained active after Escape"
-        };
-      }
-      return { ok: true };
-    } catch (error) {
-      return {
-        ok: false,
-        reason: "tmux-failed",
-        details: error instanceof Error ? error.message : String(error)
-      };
-    }
-  }
-  // ─── Tmux primitives ────────────────────────────────────────────────────
-  async typeLiteral(target, text) {
-    const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\$/g, "\\$").replace(/`/g, "\\`");
-    const safeTarget = escapeShellArg2(target);
-    const cmd = `tmux send-keys -t '${safeTarget}' -l "${escaped}"`;
-    await this.execFn(cmd);
-  }
-  async sendKey(target, key) {
-    const safeTarget = escapeShellArg2(target);
-    const cmd = `tmux send-keys -t '${safeTarget}' ${key}`;
-    await this.execFn(cmd);
-  }
-  resolveTmuxTarget() {
-    return this.tmuxTargetOverride ?? process.env.CODEVIBE_AGY_TMUX_TARGET ?? null;
-  }
-};
-function escapeShellArg2(value) {
-  return value.replace(/'/g, `'\\''`);
-}
-function isNamedKey(key) {
-  return /^[A-Z][A-Za-z0-9]+$/.test(key);
-}
-function delay(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-
-// src/mobile-prompt-dedupe.ts
-var DEFAULT_EXPIRY_MS = 15e3;
-var DEFAULT_MIN_FUZZY_ECHO_LENGTH = 16;
-var DEFAULT_MIN_FUZZY_ECHO_RATIO = 0.35;
-var MobilePromptDeduper = class {
-  constructor(options = {}) {
-    this.pendingBySession = /* @__PURE__ */ new Map();
-    this.expiryMs = options.expiryMs ?? DEFAULT_EXPIRY_MS;
-    this.minFuzzyEchoLength = options.minFuzzyEchoLength ?? DEFAULT_MIN_FUZZY_ECHO_LENGTH;
-    this.minFuzzyEchoRatio = options.minFuzzyEchoRatio ?? DEFAULT_MIN_FUZZY_ECHO_RATIO;
-    this.now = options.now ?? Date.now;
-  }
-  /** Called by the MCP server immediately BEFORE prompt-responder
-   *  performs the tmux send-keys. Records the normalized text + timestamp
-   *  for future echo-suppression. */
-  track(sessionId, prompt) {
-    this.sweep();
-    const normalized = this.normalize(prompt);
-    if (!normalized) return;
-    const entries = this.validEntries(sessionId);
-    entries.push({ normalized, timestamp: this.now() });
-    this.pendingBySession.set(sessionId, entries);
-  }
-  /** Symmetric helper for callers that want to retract a tracked entry
-   *  WITHOUT consuming it via dedupe (e.g. responder bailed before send). */
-  forget(sessionId, prompt) {
-    this.sweep();
-    const normalized = this.normalize(prompt);
-    if (!normalized) return;
-    let removed = false;
-    const entries = this.validEntries(sessionId).filter((entry) => {
-      if (!removed && entry.normalized === normalized) {
-        removed = true;
-        return false;
-      }
-      return true;
-    });
-    this.replaceEntries(sessionId, entries);
+  /** Composite key for the pre-transcript buffer. Scoping by
+   *  conversationId prevents the collision case where two simultaneous
+   *  conversations on the same tmux pane (contract-discouraged but not
+   *  contract-impossible) produce identical paneHashes — without
+   *  conversation scoping, conv-B's candidate would be silently dropped
+   *  at the same-key dedupe check. (agy R2 Stage 2 round-3 MED finding
+   *  2026-05-20.) */
+  candidateKey(conversationId, paneHash) {
+    return `${conversationId}|${paneHash}`;
   }
   /**
-   * Called by event-mapper / MCP server immediately BEFORE forwarding a
-   * USER_PROMPT to AppSync. If the echo matches a recently-tracked mobile
-   * prompt, returns the match metadata + CONSUMES the tracked entry (so a
-   * second similar echo doesn't suppress an actual second mobile prompt).
-   * Returns null when no match → caller proceeds with the AppSync emit.
+   * Clear a pending call when its matching RESULT event arrives in the
+   * transcript. event-mapper.ts calls this from its tool-result handlers.
+   *
+   * The result event's step_index = intentStepIndex + toolCallIndex + 1
+   * per agy R2 v2 (the deterministic correlation formula). We try to
+   * match by (conversationId, expected step_index, toolType) — when one
+   * matches, clear it. If multiple pending calls match (rollback edge),
+   * clear the earliest by intentStepIndex.
    */
-  consumeIfDuplicate(sessionId, echo) {
-    this.sweep();
-    const normalizedEcho = this.normalize(echo);
-    if (!normalizedEcho) return null;
-    let match = null;
-    const entries = this.validEntries(sessionId).filter((entry) => {
-      if (!match) {
-        const matchType = this.matchType(entry.normalized, normalizedEcho);
-        if (matchType) {
-          match = {
-            matchType,
-            originalLength: entry.normalized.length,
-            echoLength: normalizedEcho.length
-          };
-          return false;
+  clearOnResultEvent(args) {
+    let matched = null;
+    let matchedKey = null;
+    for (const [key, call] of this.pendingCalls.entries()) {
+      if (call.conversationId !== args.conversationId) continue;
+      if (args.toolType !== "GENERIC" && call.toolType !== args.toolType) continue;
+      const expected = call.intentStepIndex + call.toolCallIndex + 1;
+      if (expected !== args.resultStepIndex) continue;
+      if (typeof args.resultByteOffset === "number") {
+        if (call.intentByteOffset >= args.resultByteOffset) continue;
+        if (!matched || call.intentByteOffset > matched.intentByteOffset) {
+          matched = call;
+          matchedKey = key;
         }
+      } else if (!matched || call.intentStepIndex < matched.intentStepIndex) {
+        matched = call;
+        matchedKey = key;
       }
-      return true;
-    });
-    this.replaceEntries(sessionId, entries);
-    return match;
-  }
-  /** Inspect without spending the token before durable native admission. */
-  peekIfDuplicate(sessionId, echo) {
-    const normalized = this.normalize(echo);
-    if (!normalized) return null;
-    for (const entry of this.validEntries(sessionId)) {
-      const matchType = this.matchType(entry.normalized, normalized);
-      if (matchType) return { matchType, originalLength: entry.normalized.length, echoLength: normalized.length };
     }
-    return null;
-  }
-  // ─── Internals ──────────────────────────────────────────────────────────
-  sweep() {
-    const cutoff = this.now() - this.expiryMs;
-    for (const [sessId, entries] of this.pendingBySession.entries()) {
-      const valid = entries.filter((entry) => entry.timestamp >= cutoff);
-      if (valid.length > 0) {
-        this.pendingBySession.set(sessId, valid);
-      } else {
-        this.pendingBySession.delete(sessId);
+    if (matched && matchedKey) {
+      matched.resultStepIndex = args.resultStepIndex;
+      this.pendingCalls.delete(matchedKey);
+      if (matched.promptId) {
+        this.resolvedPrompts.set(matched.promptId, Date.now());
+        this.pendingPrompts.delete(matched.promptId);
       }
+      logger.debug("Pending tool call cleared on result event", {
+        intentStepIndex: matched.intentStepIndex,
+        toolCallIndex: matched.toolCallIndex,
+        resultStepIndex: args.resultStepIndex,
+        toolType: args.toolType
+      });
     }
+    return matched;
   }
-  validEntries(sessionId) {
-    const cutoff = this.now() - this.expiryMs;
-    return (this.pendingBySession.get(sessionId) || []).filter((entry) => entry.timestamp >= cutoff);
-  }
-  replaceEntries(sessionId, entries) {
-    if (entries.length > 0) {
-      this.pendingBySession.set(sessionId, entries);
+  // ─── Candidate matching (called from tmux-pane-observer's prompt-candidate) ─
+  /**
+   * Cross-reference a parsed ApprovalCandidate against the pending-call
+   * list. Returns the matched PendingPromptState (which the MCP server
+   * uses to create the INTERACTIVE_PROMPT event), or null if no match
+   * (stale scrollback).
+   *
+   * Match algorithm:
+   *   1. Filter pendingCalls by candidate.command (if set) — exact match
+   *      against PendingToolCall.command.
+   *   2. Fallback: filter by candidate.filePath (if set) — exact match
+   *      against PendingToolCall.filePath.
+   *   3. If multiple candidates match (rare), prefer the earliest
+   *      intentStepIndex.
+   *   4. If a match exists AND it already has a promptId AND that
+   *      promptId is in resolvedPrompts → null (don't re-emit).
+   *   5. If a match exists AND has a promptId BUT NOT resolved → return
+   *      the existing PendingPromptState (idempotent re-emit on the same
+   *      promptId for a duplicate candidate hash).
+   *   6. Otherwise: create a fresh promptId + PendingPromptState, attach
+   *      to the matched call, store in pendingPrompts, return it.
+   */
+  matchCandidate(candidate, conversationId) {
+    const state = this.matchCandidateInternal(candidate, conversationId);
+    if (state) return state;
+    const existing = this.pendingCandidates.get(this.candidateKey(conversationId, candidate.paneHash));
+    if (existing) {
+      logger.debug("Candidate already buffered (same paneHash)", { paneHash: this.candidateKey(conversationId, candidate.paneHash) });
     } else {
-      this.pendingBySession.delete(sessionId);
-    }
-  }
-  matchType(original, echo) {
-    if (original === echo) {
-      return "exact";
-    }
-    const longEnough = echo.length >= this.minFuzzyEchoLength;
-    const enoughOfOriginal = echo.length / original.length >= this.minFuzzyEchoRatio;
-    if (longEnough && enoughOfOriginal && original.endsWith(echo)) {
-      return "suffix";
+      this.pendingCandidates.set(this.candidateKey(conversationId, candidate.paneHash), {
+        candidate,
+        conversationId,
+        queuedAt: Date.now()
+      });
+      logger.debug("No pending tool-call matched \u2014 buffering candidate for pre-transcript window", {
+        candidateCommand: candidate.command,
+        candidateFilePath: candidate.filePath,
+        pendingCount: this.pendingCalls.size,
+        bufferSize: this.pendingCandidates.size
+      });
     }
     return null;
   }
-  normalize(text) {
-    return text.replace(/\s+/g, " ").trim();
+  /** Internal match logic — does NOT buffer on miss. Used both by the
+   *  public matchCandidate (which buffers on miss) and by
+   *  drainBufferedCandidates (which doesn't re-buffer; misses just stay
+   *  in the buffer until their TTL expires). */
+  matchCandidateInternal(candidate, conversationId) {
+    const matched = this.findMatchingPendingCall(candidate, conversationId);
+    if (!matched) {
+      return null;
+    }
+    if (matched.promptId && this.resolvedPrompts.has(matched.promptId)) {
+      logger.debug("Skipping re-emit for already-resolved prompt", {
+        promptId: matched.promptId
+      });
+      return null;
+    }
+    if (matched.promptId && this.pendingPrompts.has(matched.promptId)) {
+      return this.pendingPrompts.get(matched.promptId) ?? null;
+    }
+    const promptId = (0, import_uuid2.v4)();
+    matched.promptId = promptId;
+    const state = {
+      promptId,
+      conversationId,
+      pendingCall: matched,
+      submitMap: candidate.submitMap,
+      matchedPaneHeader: candidate.headerText,
+      paneDisplayHeader: candidate.fullHeaderLine,
+      body: candidate.body,
+      paneOptions: candidate.options,
+      paneSemanticKey: buildApprovalSemanticKey(candidate),
+      kind: candidate.kind,
+      emittedAt: Date.now(),
+      ttlMs: this.promptTtlMs
+    };
+    this.pendingPrompts.set(promptId, state);
+    logger.info("Emitting INTERACTIVE_PROMPT for matched candidate", {
+      promptId,
+      command: matched.command,
+      filePath: matched.filePath,
+      intentStepIndex: matched.intentStepIndex,
+      toolCallIndex: matched.toolCallIndex
+    });
+    this.emit("pending-prompt", state);
+    return state;
   }
-};
-
-// src/daemon-telemetry.ts
-var crypto2 = __toESM(require("crypto"));
-var fs6 = __toESM(require("fs"));
-var https = __toESM(require("https"));
-var os6 = __toESM(require("os"));
-var path7 = __toESM(require("path"));
-var MEASUREMENT_ID = "G-GS74YEQTB8";
-var API_SECRET = "lAfOF6OxRzSQ-NsLBRjhAg";
-var GA4_HOSTNAME = "www.google-analytics.com";
-var GA4_PATH = `/mp/collect?measurement_id=${MEASUREMENT_ID}&api_secret=${API_SECRET}`;
-var BEACON_TOTAL_TIMEOUT_MS = 800;
-function readPluginVersion() {
-  try {
-    const pkgPath = path7.resolve(__dirname, "..", "package.json");
-    const raw = fs6.readFileSync(pkgPath, "utf-8");
-    const pkg = JSON.parse(raw);
-    if (typeof pkg.version === "string" && pkg.version.length > 0 && pkg.version.length < 30) {
-      return pkg.version;
+  /** Resolve a pending prompt — called from MCP server when mobile sends
+   *  the option-number reply with metadata.promptId. */
+  /**
+   * Called from the MCP server when paneObserver emits 'prompt-cleared'
+   * — i.e. the approval UI disappeared from the pane (desktop user
+   * picked an option, agy timed out the prompt, or the dispatcher
+   * answered). Resolves ALL outstanding pane-only pending prompts and
+   * releases the paneOnly dedup hashes so a subsequent approval can
+   * fresh-emit. Without this, mobile prompt state dangles until TTL
+   * AND the next identical approval is forever-suppressed by stale
+   * dedup. (Stage 2 R1 MED finding 2026-05-21.)
+   *
+   * `emittedBeforeMs` (F1, Stage 2 R1-F2): a desktop input that waited in the
+   * routing hold proves only that prompts raised BEFORE it was typed are gone.
+   * A prompt emitted after that moment stays pending, and so does its dedup
+   * hash (clearing it would re-emit the still-visible chooser).
+   */
+  onPanePromptCleared(emittedBeforeMs) {
+    if (this.pendingPrompts.size === 0 && this.paneOnlyEmittedHashes.size === 0) {
+      return [];
     }
-  } catch {
+    const now = Date.now();
+    const cleared = [];
+    let retained = false;
+    for (const [promptId, state] of this.pendingPrompts.entries()) {
+      if (emittedBeforeMs !== void 0 && state.emittedAt >= emittedBeforeMs) {
+        retained = true;
+        continue;
+      }
+      if (state.isHookPrompt) {
+        retained = true;
+        continue;
+      }
+      this.resolvedPrompts.set(promptId, now);
+      cleared.push(promptId);
+    }
+    if (!retained) {
+      this.pendingPrompts.clear();
+      this.paneOnlyEmittedHashes.clear();
+    } else {
+      for (const promptId of cleared) {
+        const state = this.pendingPrompts.get(promptId);
+        if (state?.paneHash) this.paneOnlyEmittedHashes.delete(state.paneHash);
+        this.pendingPrompts.delete(promptId);
+      }
+    }
+    if (cleared.length > 0) {
+      logger.info("Pane prompt cleared \u2014 resolved pending prompts", {
+        count: cleared.length
+      });
+    }
+    return cleared;
   }
-  return "unknown";
-}
-var PLUGIN_VERSION = readPluginVersion();
-function getClientId() {
-  const uid = typeof process.getuid === "function" ? process.getuid() : 0;
-  return crypto2.createHash("sha256").update(`${os6.hostname()}-${uid}`).digest("hex").substring(0, 36);
-}
-function sanitizeErrorMessage(msg) {
-  if (!msg) return "";
-  const homedir5 = os6.homedir();
-  let out = msg.replace(/[\n\r\t]/g, " ");
-  if (homedir5 && homedir5.length > 0) {
-    const safeHome = homedir5.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    out = out.replace(new RegExp(safeHome, "g"), "~");
+  resolvePrompt(promptId, options) {
+    const state = this.pendingPrompts.get(promptId);
+    if (!state) return null;
+    this.resolvedPrompts.set(promptId, Date.now());
+    this.pendingPrompts.delete(promptId);
+    const advanceWizard = options?.advanceWizard !== false;
+    const liveWizard = this.liveWizardInvocations.get(state.conversationId);
+    if (liveWizard && liveWizard.promptId === promptId) {
+      if (advanceWizard) {
+        const maxStep = (liveWizard.call.structuredQuestions?.length ?? 1) - 1;
+        liveWizard.activeStepIndex = Math.min(liveWizard.activeStepIndex + 1, maxStep);
+      }
+      liveWizard.promptId = "";
+    }
+    this.paneOnlyEmittedHashes.clear();
+    return state;
   }
-  out = out.replace(/\/Users\/[^/\s"'`]+/g, "/Users/<user>").replace(/\/home\/[^/\s"'`]+/g, "/home/<user>").replace(/[A-Za-z]:\\Users\\[^\\\s"'`]+/gi, "C:\\Users\\<user>").replace(/[^\x20-\x7E]/g, "");
-  return out.trim().substring(0, 100);
-}
-function fireDaemonBeacon(name, params) {
-  return new Promise((resolve2) => {
-    let req;
-    let settled = false;
-    const settle = () => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(overall);
-      resolve2();
-    };
-    const overall = setTimeout(() => {
-      try {
-        req?.destroy();
-      } catch {
+  /**
+   * Roll back a pending prompt WITHOUT marking it as resolved. Used by
+   * the MCP server when the INTERACTIVE_PROMPT createEvent fails — the
+   * prompt was never delivered to mobile, so a future tmux pane
+   * candidate for the same pending tool-call should be eligible to
+   * re-emit. `resolvePrompt` is the WRONG call there because it adds
+   * the promptId to `resolvedPrompts`, which the stale-scrollback guard
+   * uses to suppress re-emit forever. This method instead detaches the
+   * promptId from the pending call + removes from pendingPrompts +
+   * leaves resolvedPrompts UNTOUCHED so the fresh-emit path runs on
+   * the next match. (agy R2 Stage 2 round-2 MED finding 2026-05-20.)
+   */
+  rollbackPrompt(promptId) {
+    const state = this.pendingPrompts.get(promptId);
+    if (!state) return null;
+    this.pendingPrompts.delete(promptId);
+    if (state.pendingCall.promptId === promptId) {
+      state.pendingCall.promptId = void 0;
+    }
+    for (const call of this.pendingCalls.values()) {
+      if (call.matchedPromptId === promptId) {
+        call.matchedPromptId = void 0;
       }
-      settle();
-    }, BEACON_TOTAL_TIMEOUT_MS);
-    if (typeof overall.unref === "function") {
-      overall.unref();
     }
-    try {
-      const sanitizedParams = {};
-      for (const [key, value] of Object.entries(params)) {
-        if (typeof value === "string") {
-          sanitizedParams[key] = sanitizeErrorMessage(value);
-        } else {
-          sanitizedParams[key] = value;
+    this.paneOnlyEmittedHashes.clear();
+    return state;
+  }
+  /**
+   * Rekey a pending prompt in the detector's internal map and associated pending calls.
+   * Keeps map keys and state.promptId synchronized when a server layer adopts an admission identity.
+   */
+  rekeyPrompt(oldPromptId, newPromptId) {
+    if (oldPromptId === newPromptId) return;
+    const state = this.pendingPrompts.get(oldPromptId);
+    if (!state) return;
+    this.pendingPrompts.delete(oldPromptId);
+    state.promptId = newPromptId;
+    if (state.pendingCall) {
+      if (state.pendingCall.promptId === oldPromptId) state.pendingCall.promptId = newPromptId;
+      if (state.pendingCall.matchedPromptId === oldPromptId) state.pendingCall.matchedPromptId = newPromptId;
+    }
+    for (const call of this.pendingCalls.values()) {
+      if (call.promptId === oldPromptId) call.promptId = newPromptId;
+      if (call.matchedPromptId === oldPromptId) call.matchedPromptId = newPromptId;
+    }
+    this.pendingPrompts.set(newPromptId, state);
+  }
+  /** Returns the current pending-prompt state by id, or null if expired /
+   *  unknown. Used by prompt-responder for the active-prompt-identity
+   *  guard right before send-keys. */
+  getPendingPrompt(promptId) {
+    return this.pendingPrompts.get(promptId) ?? null;
+  }
+  getPendingPromptsForConversation(conversationId) {
+    const pending = Array.from(this.pendingPrompts.values());
+    return conversationId ? pending.filter((state) => state.conversationId === conversationId) : pending;
+  }
+  // ─── Read-only accessors ────────────────────────────────────────────────
+  getPendingCalls() {
+    return Array.from(this.pendingCalls.values());
+  }
+  getActivePromptCount() {
+    return this.pendingPrompts.size;
+  }
+  // ─── Internals ──────────────────────────────────────────────────────────
+  callKey(call) {
+    return `${call.conversationId}|${call.intentStepIndex}|${call.toolCallIndex}|${call.intentByteOffset}`;
+  }
+  findMatchingPendingCall(candidate, conversationId) {
+    if (candidate.kind === "question") {
+      const questionCalls = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.resultStepIndex === void 0).filter((c) => {
+        if (c.structuredQuestions && candidate.headerText) {
+          const matchesStructured = c.structuredQuestions.some((sq) => questionsMatch(sq.question, candidate.headerText));
+          if (matchesStructured) return true;
         }
-      }
-      const payload = JSON.stringify({
-        client_id: getClientId(),
-        events: [
-          {
-            name,
-            params: {
-              agent: "antigravity",
-              plugin_version: PLUGIN_VERSION,
-              platform: process.platform,
-              source: process.env.CODEVIBE_TELEMETRY_SOURCE || "production",
-              ...sanitizedParams
-            }
+        const associatedPromptId = c.matchedPromptId || c.promptId;
+        if (!associatedPromptId) return true;
+        return !this.resolvedPrompts.has(associatedPromptId) && !this.pendingPrompts.has(associatedPromptId);
+      }).filter(
+        (c) => c.toolType === "ASK_QUESTION" || ["ask_question", "question", "ask"].includes(c.rawToolName?.toLowerCase() ?? "")
+      ).sort((a, b) => (b.intentStepIndex ?? 0) - (a.intentStepIndex ?? 0));
+      if (questionCalls.length > 0 && candidate.headerText) {
+        const textMatch = questionCalls.find((c) => {
+          if (!c.questionText) return false;
+          if (questionsMatch(c.questionText, candidate.headerText)) return true;
+          if (c.structuredQuestions) {
+            return c.structuredQuestions.some((sq) => questionsMatch(sq.question, candidate.headerText));
           }
-        ]
-      });
-      req = https.request(
-        {
-          hostname: GA4_HOSTNAME,
-          path: GA4_PATH,
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          timeout: BEACON_TOTAL_TIMEOUT_MS
-        },
-        (res) => {
-          res.resume();
-          res.on("end", settle);
-          res.on("close", settle);
-          res.on("error", settle);
-        }
-      );
-      req.on("error", settle);
-      req.on("timeout", () => {
-        try {
-          req?.destroy();
-        } catch {
+          return false;
+        });
+        if (textMatch) return textMatch;
+      }
+      return null;
+    }
+    if (candidate.command) {
+      const matches = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.command && c.command === candidate.command).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
+      if (matches.length > 0) return matches[0];
+    }
+    if (candidate.filePath) {
+      const matches = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => c.filePath && c.filePath === candidate.filePath).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
+      if (matches.length > 0) return matches[0];
+    }
+    const allFields = (candidate.command ?? "") + " " + (candidate.filePath ?? "");
+    if (allFields.trim()) {
+      const matches = Array.from(this.pendingCalls.values()).filter((c) => c.conversationId === conversationId).filter((c) => {
+        const cmd = (c.command ?? "").trim();
+        const fp = (c.filePath ?? "").trim();
+        if (!cmd && !fp) return false;
+        const cmdOk = cmd.length >= PASS3_MIN_IDENTITY_LEN && containsAsWord(allFields, cmd);
+        const fpOk = fp.length >= PASS3_MIN_IDENTITY_LEN && containsAsWord(allFields, fp);
+        return cmdOk || fpOk;
+      }).sort((a, b) => a.intentStepIndex - b.intentStepIndex);
+      if (matches.length > 0) return matches[0];
+    }
+    return null;
+  }
+  sweep() {
+    const now = Date.now();
+    for (const [key, call] of this.pendingCalls.entries()) {
+      if (now - call.startedAt > this.pendingCallTtlMs) {
+        this.pendingCalls.delete(key);
+        if (call.promptId) {
+          this.pendingPrompts.delete(call.promptId);
+          this.resolvedPrompts.set(call.promptId, now);
         }
-        settle();
-      });
-      req.on("close", settle);
-      req.write(payload);
-      req.end();
-    } catch {
-      settle();
+        logger.warn("Pending tool call expired (no matching result event)", {
+          intentStepIndex: call.intentStepIndex,
+          toolCallIndex: call.toolCallIndex,
+          command: call.command,
+          filePath: call.filePath,
+          ageMs: now - call.startedAt
+        });
+        this.emit("pending-call-expired", call);
+      }
     }
-  });
+    for (const [promptId, resolvedAt] of this.resolvedPrompts.entries()) {
+      if (now - resolvedAt > 5 * 6e4) {
+        this.resolvedPrompts.delete(promptId);
+      }
+    }
+    for (const [key, buffered] of this.pendingCandidates.entries()) {
+      if (now - buffered.queuedAt > this.pendingCandidateBufferMs) {
+        this.pendingCandidates.delete(key);
+        logger.debug("Buffered candidate expired without ever matching a pending call", {
+          key,
+          candidateCommand: buffered.candidate.command,
+          ageMs: now - buffered.queuedAt
+        });
+      }
+    }
+  }
+};
+function containsAsWord(haystack, needle) {
+  const escaped = needle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`(^|[\\s"'\`])${escaped}([\\s"'\`]|$)`).test(haystack);
 }
 
-// src/event-mapper.ts
-var import_uuid2 = require("uuid");
-var import_codevibe_core5 = require("@quantiya/codevibe-core");
-var CONTENT_MAX = 150 * 1024;
-var TOOL_OUTPUT_MAX = 50 * 1024;
-var TOOL_DIFF_MAX = 100 * 1024;
-function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
-  const { event } = emit;
-  const base = {
-    sessionId,
-    source: import_codevibe_core5.EventSource.DESKTOP
-  };
-  const orderingKey = `${sessionId}:${emit.conversationId}`;
-  const nextTimestamp = () => (0, import_codevibe_core5.prepareEventTimestamp)({ orderingKey, agentClock: event.created_at, notBeforeMs });
-  const baseMetadata = {
-    step_index: event.step_index,
-    agy_source: event.source,
-    agy_status: event.status,
-    agy_created_at: event.created_at,
-    agy_type: event.type,
-    agy_conversation_id: emit.conversationId
-  };
-  if (event.source === "SYSTEM") {
-    if (event.type === "CONVERSATION_HISTORY" || event.type === "SYSTEM_MESSAGE") {
-      logger.debug("Dropping internal transcript event", {
-        type: event.type,
-        stepIndex: event.step_index
+// src/prompt-responder.ts
+var import_child_process2 = require("child_process");
+var import_util2 = require("util");
+var execAsync2 = (0, import_util2.promisify)(import_child_process2.exec);
+var ENTER_DELAY_MS = 100;
+var CODEVIBE_AGY_ESCAPE_INPUT = "__CODEVIBE_AGY_KEY_ESCAPE__";
+var PromptResponder = class {
+  constructor(options = {}) {
+    this.tmuxTargetOverride = options.tmuxTarget;
+    this.execFn = options.execFn ?? (async (cmd) => execAsync2(cmd));
+    this.paneObserver = options.paneObserver ?? null;
+    this.detector = options.detector ?? null;
+    if (this.detector && !this.paneObserver) {
+      throw new Error(
+        "PromptResponder misconfigured: detector wired without paneObserver. Approval-reply identity guard requires the observer to re-probe the pane before send. Either wire both, or wire neither."
+      );
+    }
+  }
+  /**
+   * Send free-form text to the agy session. The text is typed (via
+   * `send-keys -l`) then Enter is sent after a short delay so agy's
+   * input handler has time to process the buffer.
+   */
+  async sendFreeForm(text) {
+    const target = this.resolveTmuxTarget();
+    if (!target) {
+      return { ok: false, reason: "no-tmux-target" };
+    }
+    try {
+      if (text === CODEVIBE_AGY_ESCAPE_INPUT) {
+        await this.sendKey(target, "Escape");
+      } else {
+        await this.typeLiteral(target, text);
+        await delay(ENTER_DELAY_MS);
+        await this.sendKey(target, "Enter");
+      }
+      logger.info("Sent free-form input to agy", {
+        target,
+        textLength: text.length
       });
-      return { events: [], pendingCallRegistrations: [] };
+      return { ok: true };
+    } catch (error) {
+      logger.error("tmux send-keys failed for free-form input", { target, error });
+      return {
+        ok: false,
+        reason: "tmux-failed",
+        details: error instanceof Error ? error.message : String(error)
+      };
+    }
+  }
+  /**
+   * Resolve a pending approval prompt with the mobile-user's chosen
+   * option number. Uses the submitMap from the PendingPromptState to
+   * translate option-number → terminal keystrokes (digit alone for agy's
+   * 4-numbered UI; future Y/N prompts would use 'y'/'n'/'Escape').
+   *
+   * Active-prompt-identity guard (DESIGN.md §3.4):
+   *   1. Detector check: is `promptId` still in pendingPrompts? If not
+   *      (expired or already-resolved), drop with `prompt-expired`.
+   *   2. Pane-observer check: probeApprovalUIActive() — does the pane
+   *      STILL show an approval UI whose header matches our pending
+   *      call's identity? If active-UI is gone OR header differs,
+   *      drop with `prompt-superseded`.
+   *   3. submitMap lookup: is `optionNumber` a valid key? If not (e.g.
+   *      mobile sent "5" for a 4-option prompt), drop with
+   *      `invalid-option`.
+   *   4. Send the keystrokes via tmux send-keys.
+   */
+  async sendApprovalReply(promptId, optionNumber) {
+    const target = this.resolveTmuxTarget();
+    if (!target) {
+      return { ok: false, reason: "no-tmux-target" };
+    }
+    if (this.detector) {
+      const state = this.detector.getPendingPrompt(promptId);
+      if (!state) {
+        logger.warn("Mobile reply for unknown / expired promptId", { promptId, optionNumber });
+        return {
+          ok: false,
+          reason: "prompt-expired",
+          details: `promptId ${promptId} is not in pendingPrompts`
+        };
+      }
+      if (this.paneObserver) {
+        if (!state.paneSemanticKey) {
+          return {
+            ok: false,
+            reason: "prompt-probe-failed",
+            details: "pending prompt has no exact semantic identity"
+          };
+        }
+      }
+      const keys = state.submitMap[optionNumber];
+      if (!keys || keys.length === 0) {
+        return {
+          ok: false,
+          reason: "invalid-option",
+          details: `option '${optionNumber}' not in submitMap (valid: ${Object.keys(state.submitMap).join(",")})`
+        };
+      }
+      try {
+        for (const key of keys) {
+          if (!this.detector || !this.paneObserver) {
+            return {
+              ok: false,
+              reason: "prompt-probe-failed",
+              details: "approval responder is missing its detector or pane observer"
+            };
+          }
+          if (this.detector.getPendingPrompt(promptId) !== state) {
+            return { ok: false, reason: "prompt-expired" };
+          }
+          let liveSemanticKey = null;
+          try {
+            const snapshot = await this.paneObserver.captureSnapshot();
+            const live = parseApprovalSnapshot(snapshot);
+            if (!live) {
+              if (detectActivePromptKind(snapshot) === null) {
+                this.detector.resolvePrompt(promptId);
+                return {
+                  ok: false,
+                  reason: "prompt-superseded",
+                  details: "the approval chooser is no longer active"
+                };
+              }
+              return {
+                ok: false,
+                reason: "prompt-probe-failed",
+                details: "the active chooser could not be parsed exactly"
+              };
+            }
+            liveSemanticKey = live ? buildApprovalSemanticKey(live) : null;
+          } catch (error) {
+            return {
+              ok: false,
+              reason: "prompt-probe-failed",
+              details: error instanceof Error ? error.message : String(error)
+            };
+          }
+          if (liveSemanticKey !== state.paneSemanticKey) {
+            this.detector.resolvePrompt(promptId);
+            return {
+              ok: false,
+              reason: "prompt-superseded",
+              details: "active chooser semantics differ from the mobile prompt"
+            };
+          }
+          if (isNamedKey(key)) {
+            await this.sendKey(target, key);
+          } else {
+            await this.typeLiteral(target, key);
+          }
+        }
+        this.detector.resolvePrompt(promptId);
+        logger.info("Sent approval reply via tmux", {
+          promptId,
+          optionNumber,
+          keysSent: keys
+        });
+        return { ok: true };
+      } catch (error) {
+        return {
+          ok: false,
+          reason: "tmux-failed",
+          details: error instanceof Error ? error.message : String(error)
+        };
+      }
     }
-    if (event.type !== "ERROR_MESSAGE") {
-      logger.warn("Dropping unknown SYSTEM-source transcript event (safety)", {
-        type: event.type,
-        stepIndex: event.step_index
-      });
-      return { events: [], pendingCallRegistrations: [] };
+    try {
+      await this.typeLiteral(target, optionNumber);
+      return { ok: true };
+    } catch (error) {
+      return {
+        ok: false,
+        reason: "tmux-failed",
+        details: error instanceof Error ? error.message : String(error)
+      };
     }
   }
-  if (event.type === "CONVERSATION_HISTORY" || event.type === "SYSTEM_MESSAGE") {
-    logger.debug("Dropping internal transcript event (non-SYSTEM source)", {
-      type: event.type,
-      source: event.source,
-      stepIndex: event.step_index
-    });
-    return { events: [], pendingCallRegistrations: [] };
-  }
-  if (event.type === "USER_INPUT") {
-    const cleaned = stripUserRequestWrapper(event.content || "");
-    return {
-      events: [
-        {
-          ...base,
-          timestamp: nextTimestamp(),
-          type: import_codevibe_core5.EventType.USER_PROMPT,
-          content: truncate(cleaned, CONTENT_MAX),
-          metadata: { ...baseMetadata }
-        }
-      ],
-      pendingCallRegistrations: []
-    };
-  }
-  if (event.type === "PLANNER_RESPONSE") {
-    const events = [];
-    const pendingCallRegistrations = [];
-    if (typeof event.thinking === "string" && event.thinking.trim().length > 0) {
-      events.push({
-        ...base,
-        timestamp: nextTimestamp(),
-        type: import_codevibe_core5.EventType.REASONING,
-        content: truncate(event.thinking, CONTENT_MAX),
-        metadata: { ...baseMetadata }
-      });
-    }
-    if (typeof event.content === "string" && event.content.trim().length > 0) {
-      events.push({
-        ...base,
-        timestamp: nextTimestamp(),
-        type: import_codevibe_core5.EventType.ASSISTANT_RESPONSE,
-        content: truncate(event.content, CONTENT_MAX),
-        metadata: { ...baseMetadata }
-      });
+  async sendFreeFormWhenNoApprovalActive(text, beforeType) {
+    const target = this.resolveTmuxTarget();
+    if (!target) return { ok: false, reason: "no-tmux-target" };
+    if (!this.paneObserver) {
+      return {
+        ok: false,
+        reason: "prompt-probe-failed",
+        details: "pane observer is required for safe free-form input"
+      };
     }
-    const toolCalls = event.tool_calls;
-    if (Array.isArray(toolCalls)) {
-      for (let i = 0; i < toolCalls.length; i++) {
-        const tc = toolCalls[i];
-        if (!tc || typeof tc !== "object") continue;
-        const name = tc.name;
-        if (typeof name !== "string") continue;
-        const args = tc.args;
-        pendingCallRegistrations.push({
-          intentStepIndex: event.step_index,
-          toolCallIndex: i,
-          intentByteOffset: emit.byteOffset,
-          toolType: hookToolNameToTranscriptType(name),
-          conversationId: emit.conversationId,
-          command: extractCommandFromArgs(name, args),
-          filePath: extractFilePathFromArgs(name, args),
-          questionText: extractQuestionFromArgs(name, args),
-          questionOptions: extractQuestionOptionsFromArgs(name, args),
-          cwd: extractCwdFromArgs(args),
-          rawToolName: name,
-          startedAt: Date.now(),
-          intentCreatedAt: event.created_at
-        });
+    const chooserIsAbsent = async () => {
+      const probe = await this.paneObserver.probeApprovalUIActive();
+      if (!probe.probeSucceeded) {
+        return { ok: false, reason: "prompt-probe-failed" };
+      }
+      if (probe.active) {
+        return { ok: false, reason: "prompt-superseded" };
+      }
+      return null;
+    };
+    let preparationFailed = false;
+    try {
+      const beforeText = await chooserIsAbsent();
+      if (beforeText) return beforeText;
+      if (beforeType) {
+        try {
+          await beforeType();
+        } catch (error) {
+          preparationFailed = true;
+          throw error;
+        }
+        const afterPreparation = await chooserIsAbsent();
+        if (afterPreparation) return afterPreparation;
       }
+      await this.typeLiteral(target, text);
+      await delay(ENTER_DELAY_MS);
+      const beforeEnter = await chooserIsAbsent();
+      if (beforeEnter) return beforeEnter;
+      await this.sendKey(target, "Enter");
+      return { ok: true };
+    } catch (error) {
+      if (preparationFailed) throw error;
+      return {
+        ok: false,
+        reason: "tmux-failed",
+        details: error instanceof Error ? error.message : String(error)
+      };
     }
-    return { events, pendingCallRegistrations };
   }
-  if (event.type === "ERROR_MESSAGE") {
-    const content = stripTimestampPrefix(event.content || "Agy error");
-    return {
-      events: [
-        {
-          ...base,
-          timestamp: nextTimestamp(),
-          type: import_codevibe_core5.EventType.NOTIFICATION,
-          content: truncate(content, CONTENT_MAX),
-          metadata: {
-            ...baseMetadata,
-            severity: "error"
+  /** Dismiss whichever approval UI is active without binding to a stale promptId. */
+  async dismissActivePrompt() {
+    const target = this.resolveTmuxTarget();
+    if (!target) return { ok: false, reason: "no-tmux-target" };
+    if (!this.paneObserver) {
+      return { ok: false, reason: "prompt-probe-failed" };
+    }
+    try {
+      const before = await this.paneObserver.probeApprovalUIActive();
+      if (!before.probeSucceeded) return { ok: false, reason: "prompt-probe-failed" };
+      if (!before.active) return { ok: true };
+      if (before.ambiguous) {
+        return {
+          ok: false,
+          reason: "ambiguous-prompt-active",
+          details: "masked/ambiguous prompt cannot be dismissed via Escape from mobile"
+        };
+      }
+      if (before.kind === "question") {
+        let isActionableWizard = false;
+        try {
+          const snapshot = await this.paneObserver.captureSnapshot();
+          if (snapshot) {
+            const parsed = parseApprovalSnapshot(snapshot);
+            if (parsed && parsed.kind === "question" && Object.keys(parsed.submitMap || {}).length > 0) {
+              isActionableWizard = true;
+            }
           }
+        } catch {
         }
-      ],
-      pendingCallRegistrations: []
-    };
-  }
-  const toolName = transcriptTypeToFriendlyToolName(event.type);
-  const isErrorStatus = event.status === "ERROR";
-  const rawContent = stripTimestampPrefix(event.content || "");
-  const truncatedContent = truncate(rawContent, TOOL_OUTPUT_MAX);
-  return {
-    events: [
-      {
-        ...base,
-        timestamp: nextTimestamp(),
-        type: import_codevibe_core5.EventType.TOOL_USE,
-        content: formatToolResultContent(event.type, toolName, truncatedContent, isErrorStatus),
-        metadata: {
-          ...baseMetadata,
-          tool_name: toolName,
-          tool_output: truncatedContent,
-          success: !isErrorStatus
+        if (!isActionableWizard) {
+          return {
+            ok: false,
+            reason: "display-only-question-active",
+            details: "active question prompt cannot be dismissed via Escape from mobile"
+          };
         }
       }
-    ],
-    pendingCallRegistrations: []
-  };
-}
-function stripUserRequestWrapper(content) {
-  const match = content.match(/<USER_REQUEST>([\s\S]*?)<\/USER_REQUEST>/);
-  if (match && match[1] !== void 0) {
-    return match[1].trim();
-  }
-  return content.trim();
-}
-function stripTimestampPrefix(content) {
-  return content.replace(
-    /^Created At:[^\n]*\nCompleted At:[^\n]*\n+(?:\s*\n)?/,
-    ""
-  ).trim();
-}
-function transcriptTypeToFriendlyToolName(type) {
-  switch (type) {
-    case "RUN_COMMAND":
-      return "Bash";
-    case "LIST_DIRECTORY":
-      return "LS";
-    case "GREP_SEARCH":
-      return "Grep";
-    case "VIEW_FILE":
-      return "Read";
-    case "CODE_ACTION":
-      return "Edit";
-    case "SEARCH_WEB":
-      return "WebSearch";
-    case "GENERIC":
-      return "Other";
-    default:
-      return "Other";
+      await this.sendKey(target, "Escape");
+      await delay(250);
+      const after = await this.paneObserver.probeApprovalUIActive();
+      if (!after.probeSucceeded) return { ok: false, reason: "prompt-probe-failed" };
+      if (after.active) {
+        return {
+          ok: false,
+          reason: "prompt-superseded",
+          details: "approval chooser remained active after Escape"
+        };
+      }
+      return { ok: true };
+    } catch (error) {
+      return {
+        ok: false,
+        reason: "tmux-failed",
+        details: error instanceof Error ? error.message : String(error)
+      };
+    }
   }
-}
-function hookToolNameToTranscriptType(hookName) {
-  const upper = hookName.toUpperCase();
-  switch (upper) {
-    case "LIST_DIR":
-      return "LIST_DIRECTORY";
-    case "REPLACE_FILE_CONTENT":
-    case "MULTI_REPLACE_FILE_CONTENT":
-    case "WRITE_TO_FILE":
-      return "CODE_ACTION";
-    case "GENERATE_IMAGE":
-    case "READ_URL_CONTENT":
-    case "INVOKE_SUBAGENT":
-    case "DEFINE_SUBAGENT":
-    case "MANAGE_SUBAGENTS":
-    case "SEND_MESSAGE":
-    case "LIST_PERMISSIONS":
-    case "MANAGE_TASK":
-    case "SCHEDULE":
-    case "ASK_PERMISSION":
-      return "GENERIC";
-    case "ASK_QUESTION":
-      return "ASK_QUESTION";
-    default:
-      return upper;
+  // ─── Tmux primitives ────────────────────────────────────────────────────
+  async typeLiteral(target, text) {
+    const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\$/g, "\\$").replace(/`/g, "\\`");
+    const safeTarget = escapeShellArg2(target);
+    const cmd = `tmux send-keys -t '${safeTarget}' -l "${escaped}"`;
+    await this.execFn(cmd);
   }
-}
-function extractCommandFromArgs(toolName, args) {
-  if (!args || typeof args !== "object") return void 0;
-  const a = args;
-  for (const key of ["CommandLine", "Command", "command", "cmd", "exec"]) {
-    const v = a[key];
-    if (typeof v === "string" && v.trim().length > 0) {
-      return stripWrappingQuotes2(v.trim());
-    }
+  async sendKey(target, key) {
+    const safeTarget = escapeShellArg2(target);
+    const cmd = `tmux send-keys -t '${safeTarget}' ${key}`;
+    await this.execFn(cmd);
   }
-  return void 0;
-}
-function extractFilePathFromArgs(toolName, args) {
-  if (!args || typeof args !== "object") return void 0;
-  const a = args;
-  for (const key of [
-    "TargetFile",
-    "FilePath",
-    "file_path",
-    "filePath",
-    "path",
-    "DirectoryPath",
-    "directory",
-    "Directory"
-  ]) {
-    const v = a[key];
-    if (typeof v === "string" && v.trim().length > 0) {
-      return stripWrappingQuotes2(v.trim());
-    }
+  resolveTmuxTarget() {
+    return this.tmuxTargetOverride ?? process.env.CODEVIBE_AGY_TMUX_TARGET ?? null;
   }
-  return void 0;
+};
+function escapeShellArg2(value) {
+  return value.replace(/'/g, `'\\''`);
 }
-function extractQuestionFromArgs(toolName, args) {
-  if (!args || typeof args !== "object") return void 0;
-  const tn = (toolName || "").toLowerCase().trim();
-  const isQuestionTool = tn === "ask_question" || tn === "question" || tn === "ask";
-  if (!isQuestionTool) return void 0;
-  const a = args;
-  if (typeof a.question === "string" && a.question.trim().length > 0) {
-    return stripWrappingQuotes2(a.question.trim());
+function isNamedKey(key) {
+  return /^[A-Z][A-Za-z0-9]+$/.test(key);
+}
+function delay(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+
+// src/mobile-prompt-dedupe.ts
+var DEFAULT_EXPIRY_MS = 15e3;
+var DEFAULT_MIN_FUZZY_ECHO_LENGTH = 16;
+var DEFAULT_MIN_FUZZY_ECHO_RATIO = 0.35;
+var MobilePromptDeduper = class {
+  constructor(options = {}) {
+    this.pendingBySession = /* @__PURE__ */ new Map();
+    this.expiryMs = options.expiryMs ?? DEFAULT_EXPIRY_MS;
+    this.minFuzzyEchoLength = options.minFuzzyEchoLength ?? DEFAULT_MIN_FUZZY_ECHO_LENGTH;
+    this.minFuzzyEchoRatio = options.minFuzzyEchoRatio ?? DEFAULT_MIN_FUZZY_ECHO_RATIO;
+    this.now = options.now ?? Date.now;
   }
-  if (typeof a.prompt === "string" && a.prompt.trim().length > 0) {
-    return stripWrappingQuotes2(a.prompt.trim());
+  /** Called by the MCP server immediately BEFORE prompt-responder
+   *  performs the tmux send-keys. Records the normalized text + timestamp
+   *  for future echo-suppression. */
+  track(sessionId, prompt) {
+    this.sweep();
+    const normalized = this.normalize(prompt);
+    if (!normalized) return;
+    const entries = this.validEntries(sessionId);
+    entries.push({ normalized, timestamp: this.now() });
+    this.pendingBySession.set(sessionId, entries);
   }
-  let questions = a.questions;
-  if (typeof questions === "string") {
-    try {
-      questions = JSON.parse(questions.trim());
-    } catch {
-    }
+  /** Symmetric helper for callers that want to retract a tracked entry
+   *  WITHOUT consuming it via dedupe (e.g. responder bailed before send). */
+  forget(sessionId, prompt) {
+    this.sweep();
+    const normalized = this.normalize(prompt);
+    if (!normalized) return;
+    let removed = false;
+    const entries = this.validEntries(sessionId).filter((entry) => {
+      if (!removed && entry.normalized === normalized) {
+        removed = true;
+        return false;
+      }
+      return true;
+    });
+    this.replaceEntries(sessionId, entries);
   }
-  if (Array.isArray(questions) && questions.length > 0) {
-    const first = questions[0];
-    if (typeof first === "string" && first.trim().length > 0) {
-      return stripWrappingQuotes2(first.trim());
+  /**
+   * Called by event-mapper / MCP server immediately BEFORE forwarding a
+   * USER_PROMPT to AppSync. If the echo matches a recently-tracked mobile
+   * prompt, returns the match metadata + CONSUMES the tracked entry (so a
+   * second similar echo doesn't suppress an actual second mobile prompt).
+   * Returns null when no match → caller proceeds with the AppSync emit.
+   */
+  consumeIfDuplicate(sessionId, echo) {
+    this.sweep();
+    const normalizedEcho = this.normalize(echo);
+    if (!normalizedEcho) return null;
+    let match = null;
+    const entries = this.validEntries(sessionId).filter((entry) => {
+      if (!match) {
+        const matchType = this.matchType(entry.normalized, normalizedEcho);
+        if (matchType) {
+          match = {
+            matchType,
+            originalLength: entry.normalized.length,
+            echoLength: normalizedEcho.length
+          };
+          return false;
+        }
+      }
+      return true;
+    });
+    this.replaceEntries(sessionId, entries);
+    return match;
+  }
+  /** Inspect without spending the token before durable native admission. */
+  peekIfDuplicate(sessionId, echo) {
+    const normalized = this.normalize(echo);
+    if (!normalized) return null;
+    for (const entry of this.validEntries(sessionId)) {
+      const matchType = this.matchType(entry.normalized, normalized);
+      if (matchType) return { matchType, originalLength: entry.normalized.length, echoLength: normalized.length };
     }
-    if (first && typeof first === "object") {
-      const q = first.question;
-      if (typeof q === "string" && q.trim().length > 0) {
-        return stripWrappingQuotes2(q.trim());
+    return null;
+  }
+  // ─── Internals ──────────────────────────────────────────────────────────
+  sweep() {
+    const cutoff = this.now() - this.expiryMs;
+    for (const [sessId, entries] of this.pendingBySession.entries()) {
+      const valid = entries.filter((entry) => entry.timestamp >= cutoff);
+      if (valid.length > 0) {
+        this.pendingBySession.set(sessId, valid);
+      } else {
+        this.pendingBySession.delete(sessId);
       }
     }
   }
-  return void 0;
-}
-function extractQuestionOptionsFromArgs(toolName, args) {
-  if (!args || typeof args !== "object") return void 0;
-  const tn = (toolName || "").toLowerCase().trim();
-  const isQuestionTool = tn === "ask_question" || tn === "question" || tn === "ask";
-  if (!isQuestionTool) return void 0;
-  const a = args;
-  let questions = a.questions;
-  if (typeof questions === "string") {
-    try {
-      questions = JSON.parse(questions.trim());
-    } catch {
+  validEntries(sessionId) {
+    const cutoff = this.now() - this.expiryMs;
+    return (this.pendingBySession.get(sessionId) || []).filter((entry) => entry.timestamp >= cutoff);
+  }
+  replaceEntries(sessionId, entries) {
+    if (entries.length > 0) {
+      this.pendingBySession.set(sessionId, entries);
+    } else {
+      this.pendingBySession.delete(sessionId);
     }
   }
-  if (Array.isArray(questions) && questions.length > 0) {
-    const first = questions[0];
-    if (first && typeof first === "object" && Array.isArray(first.options)) {
-      const rawOptions = first.options;
-      const result = [];
-      for (let i = 0; i < rawOptions.length; i++) {
-        const opt = rawOptions[i];
-        if (typeof opt === "string" && opt.trim().length > 0) {
-          result.push({ number: String(i + 1), text: stripWrappingQuotes2(opt.trim()) });
-        } else if (opt && typeof opt === "object" && typeof opt.text === "string") {
-          result.push({
-            number: String(opt.number ?? i + 1),
-            text: stripWrappingQuotes2(String(opt.text).trim())
-          });
-        }
-      }
-      if (result.length > 0) return result;
+  matchType(original, echo) {
+    if (original === echo) {
+      return "exact";
+    }
+    const longEnough = echo.length >= this.minFuzzyEchoLength;
+    const enoughOfOriginal = echo.length / original.length >= this.minFuzzyEchoRatio;
+    if (longEnough && enoughOfOriginal && original.endsWith(echo)) {
+      return "suffix";
     }
+    return null;
   }
-  return void 0;
-}
-function extractCwdFromArgs(args) {
-  if (!args || typeof args !== "object") return void 0;
-  const a = args;
-  for (const key of ["Cwd", "cwd", "workingDirectory", "WorkingDirectory"]) {
-    const v = a[key];
-    if (typeof v === "string" && v.trim().length > 0) {
-      return stripWrappingQuotes2(v.trim());
+  normalize(text) {
+    return text.replace(/\s+/g, " ").trim();
+  }
+};
+
+// src/daemon-telemetry.ts
+var crypto2 = __toESM(require("crypto"));
+var fs6 = __toESM(require("fs"));
+var https = __toESM(require("https"));
+var os6 = __toESM(require("os"));
+var path7 = __toESM(require("path"));
+var MEASUREMENT_ID = "G-GS74YEQTB8";
+var API_SECRET = "lAfOF6OxRzSQ-NsLBRjhAg";
+var GA4_HOSTNAME = "www.google-analytics.com";
+var GA4_PATH = `/mp/collect?measurement_id=${MEASUREMENT_ID}&api_secret=${API_SECRET}`;
+var BEACON_TOTAL_TIMEOUT_MS = 800;
+function readPluginVersion() {
+  try {
+    const pkgPath = path7.resolve(__dirname, "..", "package.json");
+    const raw = fs6.readFileSync(pkgPath, "utf-8");
+    const pkg = JSON.parse(raw);
+    if (typeof pkg.version === "string" && pkg.version.length > 0 && pkg.version.length < 30) {
+      return pkg.version;
     }
+  } catch {
   }
-  return void 0;
+  return "unknown";
 }
-function stripWrappingQuotes2(s) {
-  if (s.length >= 2 && s.startsWith('"') && s.endsWith('"')) {
-    return s.slice(1, -1);
-  }
-  return s;
+var PLUGIN_VERSION = readPluginVersion();
+function getClientId() {
+  const uid = typeof process.getuid === "function" ? process.getuid() : 0;
+  return crypto2.createHash("sha256").update(`${os6.hostname()}-${uid}`).digest("hex").substring(0, 36);
 }
-function formatToolResultContent(agyType, toolName, output, isError) {
-  const prefix = isError ? "\u26A0 " : "";
-  const firstLine = output.split("\n", 1)[0]?.trim();
-  switch (agyType) {
-    case "RUN_COMMAND":
-      return `${prefix}Bash: ${firstLine || "command executed"}`;
-    case "LIST_DIRECTORY":
-      return `${prefix}LS: ${firstLine || "directory listed"}`;
-    case "GREP_SEARCH":
-      return `${prefix}Grep: ${firstLine || "search executed"}`;
-    case "VIEW_FILE":
-      return `${prefix}Read: ${firstLine || "file read"}`;
-    case "CODE_ACTION":
-      return `${prefix}Edit: ${firstLine || "file edited"}`;
-    case "SEARCH_WEB":
-      return `${prefix}WebSearch: ${firstLine || "search executed"}`;
-    case "GENERIC":
-      return `${prefix}${toolName}: ${firstLine || "tool executed"}`;
-    default:
-      return `${prefix}${toolName} (${agyType}): ${firstLine || "unknown event"}`;
+function sanitizeErrorMessage(msg) {
+  if (!msg) return "";
+  const homedir5 = os6.homedir();
+  let out = msg.replace(/[\n\r\t]/g, " ");
+  if (homedir5 && homedir5.length > 0) {
+    const safeHome = homedir5.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    out = out.replace(new RegExp(safeHome, "g"), "~");
   }
+  out = out.replace(/\/Users\/[^/\s"'`]+/g, "/Users/<user>").replace(/\/home\/[^/\s"'`]+/g, "/home/<user>").replace(/[A-Za-z]:\\Users\\[^\\\s"'`]+/gi, "C:\\Users\\<user>").replace(/[^\x20-\x7E]/g, "");
+  return out.trim().substring(0, 100);
 }
-function truncate(s, maxBytes) {
-  if (!s) return "";
-  if (Buffer.byteLength(s, "utf-8") <= maxBytes) return s;
-  let lo = 0;
-  let hi = s.length;
-  while (lo < hi) {
-    const mid = lo + hi + 1 >>> 1;
-    if (Buffer.byteLength(s.slice(0, mid), "utf-8") <= maxBytes - 32) {
-      lo = mid;
-    } else {
-      hi = mid - 1;
+function fireDaemonBeacon(name, params) {
+  return new Promise((resolve2) => {
+    let req;
+    let settled = false;
+    const settle = () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(overall);
+      resolve2();
+    };
+    const overall = setTimeout(() => {
+      try {
+        req?.destroy();
+      } catch {
+      }
+      settle();
+    }, BEACON_TOTAL_TIMEOUT_MS);
+    if (typeof overall.unref === "function") {
+      overall.unref();
     }
-  }
-  return s.slice(0, lo) + ` [...truncated ${s.length - lo} chars]`;
+    try {
+      const sanitizedParams = {};
+      for (const [key, value] of Object.entries(params)) {
+        if (typeof value === "string") {
+          sanitizedParams[key] = sanitizeErrorMessage(value);
+        } else {
+          sanitizedParams[key] = value;
+        }
+      }
+      const payload = JSON.stringify({
+        client_id: getClientId(),
+        events: [
+          {
+            name,
+            params: {
+              agent: "antigravity",
+              plugin_version: PLUGIN_VERSION,
+              platform: process.platform,
+              source: process.env.CODEVIBE_TELEMETRY_SOURCE || "production",
+              ...sanitizedParams
+            }
+          }
+        ]
+      });
+      req = https.request(
+        {
+          hostname: GA4_HOSTNAME,
+          path: GA4_PATH,
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          timeout: BEACON_TOTAL_TIMEOUT_MS
+        },
+        (res) => {
+          res.resume();
+          res.on("end", settle);
+          res.on("close", settle);
+          res.on("error", settle);
+        }
+      );
+      req.on("error", settle);
+      req.on("timeout", () => {
+        try {
+          req?.destroy();
+        } catch {
+        }
+        settle();
+      });
+      req.on("close", settle);
+      req.write(payload);
+      req.end();
+    } catch {
+      settle();
+    }
+  });
 }
 
 // src/tool-activity-integration.ts
@@ -6437,6 +6905,20 @@ var McpServer = class _McpServer {
      *  bounded by TTL. (Codex Stage 2 R1 v12 HIGH.) */
     this.observedMainConversationIds = /* @__PURE__ */ new Set();
     this.hookRegistrationCache = null;
+    /** Tracks generation numbers per conversation to invalidate in-flight async PreToolUse callbacks upon turn transition, Stop, or PostToolUse. (Codex S2-Codex-F6) */
+    this.conversationGenerations = /* @__PURE__ */ new Map();
+    /** Tracks turn transition and Stop generations per conversation to distinguish turn boundaries from tool completions. (Codex S2-Codex-F6, S2-Codex-R12-F2) */
+    this.conversationTurnGenerations = /* @__PURE__ */ new Map();
+    /** Monotonic sequence counter for hook lifecycle events (PreToolUse arrival, PostToolUse completion, Stop). (Claude R13-F2, Codex S2-Codex-R13-F1) */
+    this.hookEventSeq = 0;
+    /** Tracks Stop sequence per conversation to invalidate in-flight async bootstrap across stop events. (Codex S2-Codex-F6, Claude R13-N1) */
+    this.conversationStopSeq = /* @__PURE__ */ new Map();
+    /** Tracks completed PostToolUse deliveries per conversation with monotonic sequence watermarks to affirmatively correlate concurrent in-flight bootstrap work. (Codex S2-Codex-F6, S2-Codex-R13-F1, Claude R13-F2) */
+    this.conversationCompletedPostDeliveries = /* @__PURE__ */ new Map();
+    /** Tracks the latest turn initialNumSteps to filter stale in-flight or held deliveries from earlier turns. (Codex S2-Codex-F6) */
+    this.conversationInitialNumSteps = /* @__PURE__ */ new Map();
+    /** Bounded buffer for PreToolUse deliveries arriving while conversation routing is in 'hold'. (Codex S2-Codex-F6) */
+    this.heldHookDeliveries = /* @__PURE__ */ new Map();
     this.started = false;
     /** Monotonically-increasing counter incremented on every start(). Captured
      *  by async callbacks at entry; mismatch after an await means stop()→start()
@@ -6563,8 +7045,16 @@ var McpServer = class _McpServer {
       isClaimedElsewhere: (conversationId) => this.claims.isClaimedElsewhere(conversationId),
       otherInvokedAt: (conversationId) => this.claims.otherInvokedAt(conversationId),
       readTranscriptFirstType: (conversationId) => this.readConversationFirstType(conversationId),
-      onRelease: (emits, decision) => {
+      onRelease: (emits, decision, convId) => {
         for (const emit of emits) this.dispatchTranscriptEmit(emit, decision);
+        const targetConvId = convId ?? (emits.length > 0 ? emits[0].conversationId : void 0);
+        if (targetConvId) {
+          const turnStep = emits.find((e) => e.event?.type === "USER_INPUT")?.event?.step_index;
+          const minStep = this.conversationInitialNumSteps.get(targetConvId) ?? (typeof turnStep === "number" ? turnStep : void 0);
+          void this.drainHeldHookDeliveries(targetConvId, decision, minStep).catch((err) => {
+            logger.warn("Failed draining held hook deliveries onRelease", { error: String(err) });
+          });
+        }
       },
       isModelOutput: (emit) => emit.event?.source === "MODEL",
       turnStep: (emit) => emit.event?.type === "USER_INPUT" ? typeof emit.event.step_index === "number" ? emit.event.step_index : -1 : null,
@@ -6572,6 +7062,7 @@ var McpServer = class _McpServer {
       onLog: (message, data) => logger.info(message, data),
       holdMs: options.conversationHoldMs
     });
+    this.conversationHoldMs = options.conversationHoldMs;
     this.httpApi.setHandlers({
       pushEvent: (p) => this.handleHttpPushEvent(p),
       getActiveSession: () => this.getAnySession(),
@@ -6581,6 +7072,9 @@ var McpServer = class _McpServer {
   static {
     this.E1_TTL_REFRESH_MS = 5 * 60 * 1e3;
   }
+  static {
+    this.MAX_HELD_CONVERSATIONS = 50;
+  }
   // ─── Lifecycle ──────────────────────────────────────────────────────────
   async start() {
     if (this.started) throw new Error("McpServer.start() called twice");
@@ -6668,6 +7162,18 @@ var McpServer = class _McpServer {
         logger.error("handlePendingPrompt failed", { error: String(err) });
       });
     });
+    this.addListener(this.approvalDetector, "prompt-upgraded", (state) => {
+      void this.handlePendingPrompt(state).catch((err) => {
+        logger.error("handlePendingPrompt failed on prompt-upgraded", { error: String(err) });
+      });
+    });
+    this.addListener(this.approvalDetector, "prompt-resolved", (promptId) => {
+      const session = this.session;
+      if (!session) return;
+      void this.resolveE1PluginApproval(session.sessionId, promptId).catch((err) => {
+        logger.warn("resolveE1PluginApproval failed on prompt-resolved", { promptId, error: String(err) });
+      });
+    });
     this.launchSessionPromise = this.createLaunchSession();
     await this.launchSessionPromise;
     if (!this.started) {
@@ -6812,6 +7318,12 @@ var McpServer = class _McpServer {
     await this.boundedTeardownStep("paneObserver.stop", () => this.paneObserver.stop());
     await this.boundedTeardownStep("approvalDetector.stop", () => this.approvalDetector.stop());
     await this.boundedTeardownStep("httpApi.stop", () => this.httpApi.stop());
+    for (const [, list] of this.heldHookDeliveries) {
+      for (const entry of list) {
+        clearTimeout(entry.timer);
+      }
+    }
+    this.heldHookDeliveries.clear();
     this.removeOrphanedRuntimeDir();
     try {
       this.appSyncClient.cleanupSubscriptions();
@@ -7163,16 +7675,38 @@ var McpServer = class _McpServer {
     ));
   }
   // ─── agy hooks (F1) ─────────────────────────────────────────────────────
+  dropHeldHookDeliveries(conversationId, reason) {
+    const list = this.heldHookDeliveries.get(conversationId);
+    if (!list) return;
+    for (const entry of list) {
+      clearTimeout(entry.timer);
+    }
+    this.heldHookDeliveries.delete(conversationId);
+    logger.info("Dropped held hook deliveries", { conversationId, reason, count: list.length });
+  }
   /**
    * One hook delivery from OUR agy (agy-hook.js only posts here when the
    * launcher's inline CODEVIBE_AGY_HOOK_OWNER names this daemon's runtime
    * dir). Updates routing state synchronously; network work runs afterwards so
    * the HTTP reply — which agy is waiting for — goes out at once.
    */
-  handleAgyHook(delivery) {
+  async handleAgyHook(delivery) {
     if (!this.started) return;
     const { conversationId } = delivery;
     if (delivery.event === "PreInvocation") {
+      const isTurnStart = delivery.invocationNum === void 0 || delivery.invocationNum === 0;
+      const wasAlreadyAdmitted = this.router.roleOf(conversationId) === "main" || this.observedMainConversationIds.has(conversationId);
+      if (isTurnStart && wasAlreadyAdmitted) {
+        this.conversationGenerations.set(conversationId, (this.conversationGenerations.get(conversationId) ?? 0) + 1);
+        this.conversationTurnGenerations.set(conversationId, (this.conversationTurnGenerations.get(conversationId) ?? 0) + 1);
+        this.approvalDetector.retireLiveWizard(conversationId);
+        this.resolveLingeringQuestionPrompts(conversationId);
+        this.dropHeldHookDeliveries(conversationId, "turn-transition");
+        this.conversationCompletedPostDeliveries.delete(conversationId);
+      }
+      if (delivery.initialNumSteps !== void 0) {
+        this.conversationInitialNumSteps.set(conversationId, delivery.initialNumSteps);
+      }
       const previousBound = this.router.getBound();
       const { role, bound } = this.router.onPreInvocation({
         conversationId,
@@ -7181,6 +7715,9 @@ var McpServer = class _McpServer {
       });
       if (role === "main") {
         this.observedMainConversationIds.add(conversationId);
+        if (!wasAlreadyAdmitted) {
+          await this.drainHeldHookDeliveries(conversationId, "process", delivery.initialNumSteps);
+        }
       } else {
         this.observedMainConversationIds.delete(conversationId);
       }
@@ -7193,10 +7730,264 @@ var McpServer = class _McpServer {
       }
       return;
     }
-    this.router.onPostToolUse(conversationId);
+    if (delivery.event === "Stop") {
+      this.conversationGenerations.set(conversationId, (this.conversationGenerations.get(conversationId) ?? 0) + 1);
+      this.conversationTurnGenerations.set(conversationId, (this.conversationTurnGenerations.get(conversationId) ?? 0) + 1);
+      this.conversationStopSeq.set(conversationId, ++this.hookEventSeq);
+      this.dropHeldHookDeliveries(conversationId, "stop-hook");
+      this.conversationCompletedPostDeliveries.delete(conversationId);
+      this.approvalDetector.retireLiveWizard(conversationId);
+      this.resolveLingeringQuestionPrompts(conversationId);
+      return;
+    }
+    if (delivery.event === "PreToolUse") {
+      void this.handlePreToolUse(delivery).catch((error) => {
+        logger.warn("PreToolUse hook handling failed", { error: String(error) });
+      });
+      return;
+    }
+    const tn = (delivery.toolName ?? "").toLowerCase().trim();
+    const isQuestionTool = ["ask_question", "question", "ask"].includes(tn);
+    if (isQuestionTool) {
+      this.conversationGenerations.set(delivery.conversationId, (this.conversationGenerations.get(delivery.conversationId) ?? 0) + 1);
+      let list = this.conversationCompletedPostDeliveries.get(delivery.conversationId);
+      if (!list) {
+        list = [];
+        this.conversationCompletedPostDeliveries.set(delivery.conversationId, list);
+      }
+      list.push({ toolName: delivery.toolName, stepIdx: delivery.stepIdx, toolArgs: delivery.toolArgs, seq: ++this.hookEventSeq });
+      this.dropHeldHookDeliveries(delivery.conversationId, "post-tool-use-completion");
+      this.approvalDetector.retireLiveWizardMatching(delivery.conversationId, delivery);
+    }
     void this.resolvePromptsForCompletedTool(delivery).catch((error) => {
       logger.warn("PostToolUse prompt resolution failed", { error: String(error) });
     });
+    this.router.onPostToolUse(conversationId);
+  }
+  resolveLingeringQuestionPrompts(conversationId) {
+    const lingeringPrompts = this.approvalDetector.getPendingPromptsForConversation(conversationId).filter((p) => p.kind === "question");
+    for (const p of lingeringPrompts) {
+      this.approvalDetector.resolvePrompt(p.promptId);
+      if (this.session) {
+        void this.resolveE1PluginApproval(this.session.sessionId, p.promptId).catch(() => {
+        });
+      }
+    }
+  }
+  async drainHeldHookDeliveries(conversationId, decision, initialNumSteps) {
+    const list = this.heldHookDeliveries.get(conversationId);
+    if (!list || list.length === 0) return;
+    for (const entry of list) {
+      clearTimeout(entry.timer);
+    }
+    this.heldHookDeliveries.delete(conversationId);
+    if (decision === "drop") {
+      logger.info("Disposing held hook deliveries for foreign conversation", {
+        conversationId,
+        count: list.length
+      });
+      return;
+    }
+    logger.info("Replaying held hook deliveries after affirmative admission", {
+      conversationId,
+      count: list.length,
+      decision
+    });
+    const now = Date.now();
+    const HELD_TTL_MS = 3e4;
+    const capturedGen = this.conversationGenerations.get(conversationId) ?? 0;
+    for (const entry of list) {
+      if (now - entry.receivedAt > HELD_TTL_MS) {
+        logger.info("Discarding expired held hook delivery", {
+          conversationId,
+          toolName: entry.delivery.toolName,
+          ageMs: now - entry.receivedAt
+        });
+        continue;
+      }
+      if (initialNumSteps !== void 0 && entry.delivery.stepIdx !== void 0 && entry.delivery.stepIdx < initialNumSteps - 1) {
+        logger.info("Discarding held delivery from prior step before initialNumSteps", {
+          conversationId,
+          stepIdx: entry.delivery.stepIdx,
+          initialNumSteps
+        });
+        continue;
+      }
+      if (capturedGen !== (this.conversationGenerations.get(conversationId) ?? 0)) {
+        logger.info("Aborting drain of held hook delivery due to generation advance", {
+          conversationId
+        });
+        break;
+      }
+      try {
+        await this.handlePreToolUse(entry.delivery);
+      } catch (err) {
+        logger.warn("Failed replaying held hook delivery", { error: String(err) });
+      }
+    }
+  }
+  async handlePreToolUse(delivery) {
+    if (!this.started || !delivery.toolName) return;
+    logger.info("PreToolUse hook delivery received", {
+      conversationId: delivery.conversationId,
+      toolName: delivery.toolName,
+      stepIdx: delivery.stepIdx
+    });
+    const tn = delivery.toolName.toLowerCase().trim();
+    if (tn === "ask_question" || tn === "question" || tn === "ask") {
+      const capturedTurnGen = this.conversationTurnGenerations.get(delivery.conversationId) ?? 0;
+      const startedSeq = ++this.hookEventSeq;
+      await this.ensureLaunchSession();
+      if (!this.session && !this.sessionDisabled && !this.launchKeyUnavailable) {
+        for (let attempt = 0; attempt < 2 && !this.session; attempt++) {
+          await this.ensureLaunchSession();
+          if (this.sessionDisabled || this.launchKeyUnavailable) break;
+          if (!this.session) await new Promise((r) => setTimeout(r, 150));
+        }
+      }
+      if (this.sessionDisabled || this.launchKeyUnavailable) {
+        logger.warn("PreToolUse dropped due to terminal session state", {
+          conversationId: delivery.conversationId
+        });
+        return;
+      }
+      const completedPosts = this.conversationCompletedPostDeliveries.get(delivery.conversationId) ?? [];
+      const qText = extractQuestionFromArgs(delivery.toolName ?? "ask_question", delivery.toolArgs ?? {});
+      const structQuestions = extractAllQuestionsFromArgs(delivery.toolName ?? "ask_question", delivery.toolArgs ?? {});
+      const candidateCall = {
+        intentStepIndex: delivery.stepIdx,
+        questionText: qText,
+        structuredQuestions: structQuestions,
+        rawToolName: delivery.toolName ?? "ask_question"
+      };
+      const isAlreadyCompleted = completedPosts.some(
+        (post) => post.seq > startedSeq && correlatesQuestionInvocation(candidateCall, post)
+      );
+      if (isAlreadyCompleted) {
+        logger.info("PreToolUse already completed during async bootstrap await", {
+          conversationId: delivery.conversationId,
+          stepIdx: delivery.stepIdx
+        });
+        return;
+      }
+      const stoppedSeq = this.conversationStopSeq.get(delivery.conversationId) ?? 0;
+      if (stoppedSeq > startedSeq) {
+        logger.info("PreToolUse invalidated by Stop during async bootstrap await", {
+          conversationId: delivery.conversationId,
+          stepIdx: delivery.stepIdx
+        });
+        return;
+      }
+      const currentTurnGen = this.conversationTurnGenerations.get(delivery.conversationId) ?? 0;
+      if (capturedTurnGen !== currentTurnGen) {
+        const minStep2 = this.conversationInitialNumSteps.get(delivery.conversationId);
+        const isCurrentTurn = minStep2 !== void 0 && delivery.stepIdx !== void 0 && delivery.stepIdx >= minStep2 - 1;
+        if (!isCurrentTurn) {
+          logger.info("PreToolUse invalidated by turn transition during async bootstrap await", {
+            conversationId: delivery.conversationId,
+            capturedTurnGen,
+            currentTurnGen,
+            stepIdx: delivery.stepIdx,
+            minStep: minStep2
+          });
+          return;
+        }
+        logger.info("PreToolUse correlated with admitted current turn across bootstrap await", {
+          conversationId: delivery.conversationId,
+          stepIdx: delivery.stepIdx,
+          minStep: minStep2
+        });
+      }
+      const minStep = this.conversationInitialNumSteps.get(delivery.conversationId);
+      if (minStep !== void 0 && delivery.stepIdx !== void 0 && delivery.stepIdx < minStep - 1) {
+        logger.info("PreToolUse dropped as stale prior step before initialNumSteps", {
+          conversationId: delivery.conversationId,
+          stepIdx: delivery.stepIdx,
+          minStep
+        });
+        return;
+      }
+      const decision = this.router.route(delivery.conversationId);
+      if (decision === "drop") {
+        logger.debug("PreToolUse dropped for conversation outside session", {
+          conversationId: delivery.conversationId
+        });
+        return;
+      }
+      if (decision === "hold") {
+        if (!this.heldHookDeliveries.has(delivery.conversationId) && this.heldHookDeliveries.size >= _McpServer.MAX_HELD_CONVERSATIONS) {
+          const oldestConv = this.heldHookDeliveries.keys().next().value;
+          if (oldestConv) {
+            this.dropHeldHookDeliveries(oldestConv, "global-capacity-exceeded");
+          }
+        }
+        let held = this.heldHookDeliveries.get(delivery.conversationId);
+        if (!held) {
+          held = [];
+          this.heldHookDeliveries.set(delivery.conversationId, held);
+        }
+        if (held.length < 10) {
+          const timer = setTimeout(() => {
+            this.dropHeldHookDeliveries(delivery.conversationId, "hold-timeout");
+          }, this.conversationHoldMs ?? 3e4);
+          held.push({ delivery, receivedAt: Date.now(), timer });
+        }
+        this.registerHeldConversationBeforeFirstHook(delivery.conversationId);
+        return;
+      }
+      const structuredQuestions = extractAllQuestionsFromArgs(delivery.toolName, delivery.toolArgs);
+      const questionText = extractQuestionFromArgs(delivery.toolName, delivery.toolArgs);
+      const questionOptions = extractQuestionOptionsFromArgs(delivery.toolName, delivery.toolArgs);
+      logger.info("PreToolUse received ask_question hook", {
+        conversationId: delivery.conversationId,
+        questionText: questionText ? questionText.slice(0, 100) : null,
+        optionCount: questionOptions ? questionOptions.length : 0,
+        structuredQuestionsCount: structuredQuestions ? structuredQuestions.length : 0
+      });
+      const pendingCall = {
+        intentStepIndex: delivery.stepIdx ?? -1,
+        toolCallIndex: 0,
+        intentByteOffset: 0,
+        toolType: "ASK_QUESTION",
+        conversationId: delivery.conversationId,
+        rawToolName: delivery.toolName,
+        questionText,
+        questionOptions,
+        structuredQuestions,
+        startedAt: Date.now(),
+        intentCreatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      this.approvalDetector.registerPendingCall(pendingCall);
+      this.emitQuestionPromptFromHook(delivery.conversationId, pendingCall);
+    }
+  }
+  emitQuestionPromptFromHook(conversationId, pendingCall) {
+    const decision = this.router.route(conversationId);
+    if (decision !== "process" && decision !== "legacy") {
+      logger.debug("emitQuestionPromptFromHook skipped for non-admitted conversation", { conversationId, decision });
+      return;
+    }
+    let session = this.getSessionByConversation(conversationId);
+    if (!session && this.session) {
+      if (decision === "process" || decision === "legacy" && this.legacyAcceptsConversation(conversationId)) {
+        this.observedMainConversationIds.add(conversationId);
+        session = this.session;
+      }
+    }
+    if (!session) {
+      logger.warn("PreToolUse ask_question hook fired but conversation not owned or no session known", {
+        conversationId,
+        decision
+      });
+      return;
+    }
+    const e1rec = this.newE1Raise(session.sessionId, false);
+    const emitted = this.approvalDetector.emitHookQuestionPrompt(pendingCall, e1rec.promptId);
+    if (!emitted) {
+      this.e1PromptRaises.delete(e1rec.promptId);
+    } else if (emitted.promptId !== e1rec.promptId) {
+      this.e1PromptRaises.delete(e1rec.promptId);
+    }
   }
   /**
    * A tool our agy just ran was blocked on its approval prompt, so a pending
@@ -7206,8 +7997,14 @@ var McpServer = class _McpServer {
   async resolvePromptsForCompletedTool(delivery) {
     const session = this.session;
     if (!session) return;
-    const pending = this.approvalDetector.getPendingPromptsForConversation();
-    const matched = pending.filter((state) => promptMatchesCompletedTool(state, delivery.toolName, delivery.toolArgs));
+    const pending = this.approvalDetector.getPendingPromptsForConversation(delivery.conversationId);
+    const matched = pending.filter((state) => {
+      if (state.conversationId !== delivery.conversationId) return false;
+      if (state.kind === "question") {
+        return correlatesQuestionInvocation(state.pendingCall, delivery);
+      }
+      return promptMatchesCompletedTool(state, delivery.toolName, delivery.toolArgs);
+    });
     logger.info("PostToolUse checked pending prompts", {
       conversationId: delivery.conversationId,
       toolName: delivery.toolName ?? null,
@@ -8235,11 +9032,14 @@ var McpServer = class _McpServer {
     const e1rec = this.newE1Raise(session.sessionId, isActionable);
     const emitted = this.approvalDetector.emitPaneOnlyPrompt(parsed, activeConvId, e1rec.promptId);
     if (emitted) {
+      if (emitted.promptId !== e1rec.promptId) {
+        this.e1PromptRaises.delete(e1rec.promptId);
+      }
       if (cand.snapshotHash) {
-        this.e1ContentKeyIndex.set(`${session.sessionId}::${cand.snapshotHash}`, e1rec.promptId);
+        this.e1ContentKeyIndex.set(`${session.sessionId}::${cand.snapshotHash}`, emitted.promptId);
       }
       logger.info("Pane prompt identity", {
-        promptId: e1rec.promptId,
+        promptId: emitted.promptId,
         conversationId: activeConvId,
         commandDigest: commandDigest(parsed.command)
       });
@@ -8283,8 +9083,18 @@ var McpServer = class _McpServer {
     }
     const isDisplayOnly = Object.keys(state.submitMap || {}).length === 0;
     const e1existing = this.e1PromptRaises.get(state.promptId);
-    const e1rec = e1existing ? e1existing.record : this.newE1Raise(session.sessionId, !isDisplayOnly);
-    if (!e1existing) state.promptId = e1rec.promptId;
+    let e1rec;
+    if (e1existing) {
+      e1rec = e1existing.record;
+      if (!isDisplayOnly && !e1rec.mobileActionable) {
+        e1rec.mobileActionable = true;
+      }
+    } else {
+      e1rec = this.newE1Raise(session.sessionId, !isDisplayOnly);
+      const oldPromptId = state.promptId;
+      state.promptId = e1rec.promptId;
+      this.approvalDetector.rekeyPrompt(oldPromptId, e1rec.promptId);
+    }
     const resolvedOptions = state.paneOptions && state.paneOptions.length > 0 ? state.paneOptions : state.pendingCall?.questionOptions && state.pendingCall.questionOptions.length > 0 ? state.pendingCall.questionOptions : void 0;
     const optionsArr = isDisplayOnly ? [] : resolvedOptions ? resolvedOptions.map((o) => ({ number: o.number, text: o.text })) : Object.keys(state.submitMap).map((n) => ({ number: n }));
     const diffParsed = parseFencedDiffFromBody(
@@ -8317,12 +9127,29 @@ var McpServer = class _McpServer {
       file_path: filePath,
       options: optionsArr,
       ...toolInput ? { tool_input: toolInput } : {},
-      ...state.kind === "question" && resolvedOptions && resolvedOptions.length > 0 ? {
-        questions: [{
-          question: state.pendingCall?.questionText || state.matchedPaneHeader || state.paneDisplayHeader || "Question",
-          options: resolvedOptions,
-          ...isDisplayOnly ? { instructions: "Answer this question in your desktop terminal" } : {}
-        }]
+      ...state.kind === "question" ? {
+        questions: (() => {
+          if (!state.pendingCall?.structuredQuestions || state.pendingCall.structuredQuestions.length === 0) {
+            return resolvedOptions && resolvedOptions.length > 0 ? [{
+              question: state.pendingCall?.questionText || state.matchedPaneHeader || state.paneDisplayHeader || "Question",
+              options: resolvedOptions,
+              ...isDisplayOnly ? { instructions: "Answer this question in your desktop terminal" } : {}
+            }] : void 0;
+          }
+          const activeQuestionText = state.matchedPaneHeader || state.paneDisplayHeader || state.pendingCall?.questionText || "";
+          let activeIdx = state.wizardStepIndex !== void 0 ? state.wizardStepIndex : state.pendingCall.structuredQuestions.findIndex((sq) => questionsMatch(sq.question, activeQuestionText));
+          if (activeIdx < 0 || activeIdx >= state.pendingCall.structuredQuestions.length) activeIdx = 0;
+          const activeQ = state.pendingCall.structuredQuestions[activeIdx] ?? {
+            question: activeQuestionText || "Question",
+            options: resolvedOptions || []
+          };
+          return [{
+            question: activeQ.question,
+            options: resolvedOptions && resolvedOptions.length > 0 ? resolvedOptions : activeQ.options,
+            ...activeQ.isMultiSelect !== void 0 ? { is_multi_select: activeQ.isMultiSelect } : {},
+            ...isDisplayOnly ? { instructions: "Answer this question in your desktop terminal" } : {}
+          }];
+        })()
       } : {}
     } : { promptId: state.promptId };
     const content = state.paneDisplayHeader || state.matchedPaneHeader || state.pendingCall?.command || state.pendingCall?.filePath || "approval requested";