@quantiya/codevibe-antigravity-plugin 2.0.78 → 2.0.80

package/dist/server.js

@@ -34,16 +34,19 @@ __export(server_exports, {
   SessionNotFoundError: () => SessionNotFoundError,
   StoredAuthFailureError: () => StoredAuthFailureError,
   TERMINAL_SHUTDOWN_SIGNALS: () => TERMINAL_SHUTDOWN_SIGNALS,
+  TmuxPaneObserver: () => TmuxPaneObserver,
   __testing: () => __testing,
   classifyEntrypoint: () => classifyEntrypoint,
   classifyTmuxHasSessionError: () => classifyTmuxHasSessionError,
   commandDigest: () => commandDigest,
   detectActivePromptKind: () => detectActivePromptKind,
+  extractFileAccessPrompt: () => extractFileAccessPrompt,
   extractSystemErrorPrompt: () => extractSystemErrorPrompt,
   generateLaunchSessionId: () => generateLaunchSessionId,
   getActiveConversationFromCliLog: () => getActiveConversationFromCliLog,
   isAgyStatusFooterLine: () => isAgyStatusFooterLine,
   isComposedStatusFooter: () => isComposedStatusFooter,
+  isPaneInputSafetyBlocked: () => isPaneInputSafetyBlocked,
   isSystemErrorActiveFromIndex: () => isSystemErrorActiveFromIndex,
   looksLikePromptSnapshot: () => looksLikePromptSnapshot,
   parseApprovalSnapshot: () => parseApprovalSnapshot,
@@ -59,7 +62,7 @@ var fs7 = __toESM(require("fs"));
 var os7 = __toESM(require("os"));
 var import_child_process3 = require("child_process");
 var import_util3 = require("util");
-var import_codevibe_core6 = require("@quantiya/codevibe-core");
+var import_codevibe_core7 = require("@quantiya/codevibe-core");
 
 // src/logger.ts
 var import_os = __toESM(require("os"));
@@ -400,6 +403,7 @@ var fs2 = __toESM(require("fs"));
 var os3 = __toESM(require("os"));
 var path3 = __toESM(require("path"));
 var import_chokidar = require("chokidar");
+var import_codevibe_core4 = require("@quantiya/codevibe-core");
 
 // src/shutdown-bounds.ts
 var TEARDOWN_STEP_TIMEOUT_MS = 3e3;
@@ -466,7 +470,12 @@ function readAdmittedTranscript(options) {
       return parsed && typeof parsed === "object" && !Array.isArray(parsed) && Number.isFinite(parsed.step_index) && typeof parsed.type === "string" ? parsed : null;
     },
     admission: {
-      restore: (source, initial) => options.admission.restore(stream(source), initial),
+      restore: (source, initial) => options.admission.restore(stream(source), initial, () => {
+        const expected = options.initialFileIdentity;
+        if (expected && (source.fileIdentity.dev !== expected.dev || source.fileIdentity.ino !== expected.ino)) {
+          throw Error("SYNC_TOOL_INITIAL_SOURCE_CHANGED");
+        }
+      }),
       skip: (gap, source) => options.admission.skip(gap, stream(source)),
       admit: (event, source) => options.admission.admit({
         conversationId: options.conversationId,
@@ -553,6 +562,11 @@ var TranscriptTailer = class extends import_events.EventEmitter {
     /** Last swept stat of each unfollowed conversation's transcript (null when
      *  absent), for the resume sweep. */
     this.transcriptSnapshots = /* @__PURE__ */ new Map();
+    /** Immutable startup boundary; discovery snapshots keep moving. */
+    this.nativeLaunchBaselines = /* @__PURE__ */ new Map();
+    this.nativeLaunchTime = null;
+    this.nativeInitialBoundaries = /* @__PURE__ */ new Map();
+    this.nativeSeededPaths = /* @__PURE__ */ new Set();
     this.rootMtimeMs = 0;
     this.discoveryTimer = null;
     this.discoveryTickCount = 0;
@@ -590,12 +604,34 @@ var TranscriptTailer = class extends import_events.EventEmitter {
    * snapshots the brain, then runs the discovery tick. Opens no directory
    * watch (see the file header).
    */
+  /** Capture only; no readers, listeners, timers or cloud activity. The server
+   * calls this before its first startup await, then activates the tailer later. */
+  captureLaunchBaselines() {
+    this.nativeLaunchTime = Date.now();
+    this.nativeLaunchBaselines.clear();
+    this.nativeSeededPaths.clear();
+    for (const id of this.listConversationDirs() ?? []) {
+      this.nativeLaunchBaselines.set(id, this.snapshotTranscript(this.transcriptPathFor(id)));
+    }
+  }
+  /** Called after the retired owner's readers are joined, before its successor
+   * starts cloud bootstrap. Keep old scoped journals; only fresh seeds change. */
+  refreshNativeOwnerBoundary() {
+    this.captureLaunchBaselines();
+    this.nativeInitialBoundaries.clear();
+    for (const timer of this.retryTimers.values()) clearTimeout(timer);
+    this.retryTimers.clear();
+    this.readGeneration++;
+    this.activeReads.clear();
+    this.pendingReads.clear();
+  }
   start() {
     if (this.isWatching) {
       logger.warn("TranscriptTailer.start called while already watching");
       return;
     }
-    this.startTime = Date.now();
+    if (this.nativeLaunchTime === null) this.captureLaunchBaselines();
+    this.startTime = this.nativeLaunchTime;
     this.readGeneration++;
     for (const timer of this.retryTimers.values()) clearTimeout(timer);
     this.retryTimers.clear();
@@ -615,15 +651,14 @@ var TranscriptTailer = class extends import_events.EventEmitter {
     this.knownConversationDirs.clear();
     this.pendingTranscripts.clear();
     this.transcriptSnapshots.clear();
+    this.nativeInitialBoundaries.clear();
+    this.nativeSeededPaths.clear();
     this.releasedConversations.clear();
     this.discoveryTickCount = 0;
     this.rootMtimeMs = this.statMtimeMs(this.brainRoot) ?? 0;
     for (const conversationId of this.listConversationDirs() ?? []) {
       this.knownConversationDirs.add(conversationId);
-      this.transcriptSnapshots.set(
-        conversationId,
-        this.snapshotTranscript(this.transcriptPathFor(conversationId))
-      );
+      this.transcriptSnapshots.set(conversationId, this.nativeLaunchBaselines.get(conversationId) ?? null);
     }
     logger.info("Starting transcript tailer", {
       brainRoot: this.brainRoot,
@@ -677,6 +712,10 @@ var TranscriptTailer = class extends import_events.EventEmitter {
    * Idempotent.
    */
   async stop() {
+    this.nativeLaunchBaselines.clear();
+    this.nativeLaunchTime = null;
+    this.nativeInitialBoundaries.clear();
+    this.nativeSeededPaths.clear();
     if (!this.isWatching) return;
     this.isShuttingDown = true;
     this.readGeneration++;
@@ -1034,7 +1073,7 @@ var TranscriptTailer = class extends import_events.EventEmitter {
   snapshotTranscript(transcriptPath) {
     try {
       const stat = fs2.statSync(transcriptPath);
-      return stat.isFile() ? { size: stat.size, mtimeMs: stat.mtimeMs, ino: stat.ino } : null;
+      return stat.isFile() ? { size: stat.size, mtimeMs: stat.mtimeMs, ino: stat.ino, dev: stat.dev } : null;
     } catch {
       return null;
     }
@@ -1225,6 +1264,7 @@ var TranscriptTailer = class extends import_events.EventEmitter {
   }
   async readNewLines(filePath, conversationId, generation) {
     if (generation !== this.readGeneration) return;
+    if (this.admission && !this.nativeSeededPaths.has(filePath)) this.ensureOffset(filePath);
     const entry = this.offsets.get(filePath);
     if (!entry) {
       logger.warn("No offset entry \u2014 skipping read", { filePath });
@@ -1235,6 +1275,7 @@ var TranscriptTailer = class extends import_events.EventEmitter {
         filePath,
         conversationId,
         initialOffset: entry.byteOffset,
+        initialFileIdentity: this.nativeInitialBoundaries.get(filePath)?.fileIdentity,
         admission: this.admission,
         isCurrent: () => generation === this.readGeneration && !this.isShuttingDown
       });
@@ -1361,8 +1402,8 @@ var TranscriptTailer = class extends import_events.EventEmitter {
   }
   // ─── Offset persistence ─────────────────────────────────────────────────
   ensureOffset(filePath) {
-    if (this.offsets.has(filePath)) return;
-    if (this.offsets.size >= LRU_CAP) {
+    if (this.offsets.has(filePath) && (!this.admission || this.nativeSeededPaths.has(filePath))) return;
+    if (!this.offsets.has(filePath) && this.offsets.size >= LRU_CAP) {
       this.evictOldestOffset();
     }
     let stat = null;
@@ -1370,12 +1411,24 @@ var TranscriptTailer = class extends import_events.EventEmitter {
       stat = fs2.statSync(filePath);
     } catch {
     }
+    const conversationId = this.extractConversationId(filePath);
+    const baseline = conversationId ? this.nativeLaunchBaselines.get(conversationId) : void 0;
+    let initialOffset = 0;
+    if (this.admission && stat && baseline && baseline.dev === stat.dev && baseline.ino === stat.ino && stat.size >= baseline.size) {
+      const boundary = (0, import_codevibe_core4.captureToolReplayBoundary)(filePath, baseline.size);
+      if (boundary.fileIdentity.dev !== baseline.dev || boundary.fileIdentity.ino !== baseline.ino) {
+        throw Error("SYNC_TOOL_INITIAL_SOURCE_CHANGED");
+      }
+      initialOffset = boundary.byteOffset;
+      this.nativeInitialBoundaries.set(filePath, boundary);
+    }
     this.offsets.set(filePath, {
-      byteOffset: 0,
+      byteOffset: initialOffset,
       carryover: "",
       lastKnownSize: stat?.size ?? 0,
       lastModifiedMs: stat?.mtimeMs ?? Date.now()
     });
+    this.nativeSeededPaths.add(filePath);
   }
   /**
    * Pick the oldest-mtime offset entry that is NOT for a currently-active
@@ -2293,7 +2346,9 @@ function promptMatchesCompletedTool(state, toolName, toolArgs) {
   const promptPaths = /* @__PURE__ */ new Set();
   const declared = normalizePath(state.pendingCall?.filePath);
   if (declared) promptPaths.add(declared);
-  for (const link of fileLinks(state.paneDisplayHeader)) promptPaths.add(link);
+  if (!isFileAccessPrompt(state) || !declared) {
+    for (const link of fileLinks(state.paneDisplayHeader)) promptPaths.add(link);
+  }
   if (promptPaths.size === 0) return false;
   for (const key of TOOL_PATH_KEYS) {
     const toolPath = normalizePath(toolArgs[key]);
@@ -2553,8 +2608,24 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
           headerText = extractHeader(snapshot);
         }
       }
-      const isChooser = hasPrompt && kind !== "system_error";
-      return { active: isChooser, headerText, probeSucceeded: true, kind };
+      let isChooser = hasPrompt && kind !== "system_error";
+      let reportedKind = kind;
+      let isAmbiguous = false;
+      if (!isChooser && kind !== "system_error") {
+        const safety = isPaneInputSafetyBlocked(snapshot);
+        if (safety.blocked) {
+          isChooser = true;
+          reportedKind = safety.kind;
+          isAmbiguous = true;
+        }
+      }
+      return {
+        active: isChooser,
+        headerText,
+        probeSucceeded: true,
+        kind: reportedKind,
+        ...isAmbiguous ? { ambiguous: true } : {}
+      };
     } catch {
       return { active: false, headerText: null, probeSucceeded: false, kind: null };
     }
@@ -2814,10 +2885,203 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
     }
   }
 };
+function isComposerBoxAt(lines, idx) {
+  if (idx < 0 || idx >= lines.length) return false;
+  const line0 = lines[idx].trim();
+  if (!/^[─━│╭╰╮╯\s_-]{3,}$/.test(line0)) return false;
+  let cursorIdx = -1;
+  for (let k = idx + 1; k < Math.min(lines.length, idx + 4); k++) {
+    const t = lines[k].trim();
+    if (!t) continue;
+    if (/^[│\s]*[❯>]\s*$/.test(t)) {
+      cursorIdx = k;
+      break;
+    }
+    break;
+  }
+  if (cursorIdx < 0) return false;
+  for (let k = cursorIdx + 1; k < Math.min(lines.length, cursorIdx + 4); k++) {
+    const t = lines[k].trim();
+    if (!t) continue;
+    if (/^[─━│╭╰╮╯\s_-]{3,}$/.test(t)) {
+      return true;
+    }
+    break;
+  }
+  return false;
+}
+function isPaneInputSafetyBlocked(input) {
+  const rawText = Array.isArray(input) ? input.join("\n") : input;
+  if (!rawText) return { blocked: false, kind: null };
+  const plainText = rawText.replace(ANSI_ESCAPE_REGEX, "").trimEnd();
+  if (!plainText) return { blocked: false, kind: null };
+  const lines = plainText.split(/\r?\n/);
+  if (lines.length === 0) return { blocked: false, kind: null };
+  const startIdx = Math.max(0, lines.length - 40);
+  let footerIdx = -1;
+  for (let i = lines.length - 1; i >= startIdx; i--) {
+    const trimmed = lines[i].trim();
+    if (!trimmed) continue;
+    if (/^(`{3,}|~{3,})\s*$/.test(lines[i])) {
+      break;
+    }
+    if (isQuestionFooterLine(trimmed)) {
+      footerIdx = i;
+      break;
+    } else if (/\besc to cancel\b/i.test(trimmed) && !isAgyStatusFooterLine(trimmed)) {
+      footerIdx = i;
+      break;
+    }
+  }
+  if (footerIdx < 0) {
+    const candidateHeaderIndices = [];
+    for (let i = lines.length - 1; i >= startIdx; i--) {
+      const trimmed = lines[i].trim();
+      if (!trimmed) continue;
+      if (isQuestionHeaderLine(trimmed) && /\((?:Use\s+arrow\s+keys|Use\s+\S+\s+keys)[^)]*\)/i.test(trimmed)) {
+        candidateHeaderIndices.push(i);
+      }
+    }
+    for (const headerIdx of candidateHeaderIndices) {
+      let optCount = 0;
+      let cursorCount = 0;
+      let lastOptionIdx = -1;
+      let inInnerFence = false;
+      let innerFenceChar = "";
+      let innerFenceLen = 0;
+      let composerEncountered = false;
+      for (let j = headerIdx + 1; j < lines.length; j++) {
+        const lineJ = lines[j];
+        const trimmed = lineJ.trim();
+        if (!trimmed) continue;
+        const fenceMatch = lineJ.match(/^(`{3,}|~{3,})(.*)$/);
+        if (fenceMatch) {
+          const matchedFence = fenceMatch[1];
+          const matchedChar = matchedFence[0];
+          const matchedLen = matchedFence.length;
+          const fenceInfo = fenceMatch[2].trim();
+          if (inInnerFence) {
+            if (matchedChar === innerFenceChar && matchedLen >= innerFenceLen && fenceInfo === "") {
+              inInnerFence = false;
+              innerFenceChar = "";
+              innerFenceLen = 0;
+              optCount = 0;
+              cursorCount = 0;
+              lastOptionIdx = -1;
+            }
+            continue;
+          }
+          inInnerFence = true;
+          innerFenceChar = matchedChar;
+          innerFenceLen = matchedLen;
+          optCount = 0;
+          cursorCount = 0;
+          lastOptionIdx = -1;
+          continue;
+        }
+        if (inInnerFence) {
+          continue;
+        }
+        if (isAgyStatusFooterLine(trimmed) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(trimmed) || isComposerBoxAt(lines, j)) {
+          composerEncountered = true;
+          break;
+        }
+        if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
+          if (/^[>\s❯]*1[.)]/.test(trimmed) && optCount > 0) {
+            optCount = 0;
+            cursorCount = 0;
+          }
+          optCount++;
+          if (/^[>❯]/.test(trimmed)) {
+            cursorCount++;
+          }
+          lastOptionIdx = j;
+          continue;
+        }
+      }
+      const isValidOptionGroup = optCount >= 2 && cursorCount <= 1;
+      if (!inInnerFence && !composerEncountered && isValidOptionGroup && lastOptionIdx >= 0 && !hasTrailingAgyComposer(lines, lastOptionIdx)) {
+        return { blocked: true, kind: "question" };
+      }
+    }
+    return { blocked: false, kind: null };
+  }
+  const candidateHeaders = [];
+  for (let i = footerIdx - 1; i >= startIdx; i--) {
+    const trimmed = lines[i].trim();
+    if (!trimmed) continue;
+    if (isQuestionHeaderLine(trimmed)) {
+      candidateHeaders.push({ lineIdx: i, kind: "question" });
+    } else if (/Allow access to this file\?/i.test(trimmed)) {
+      candidateHeaders.push({ lineIdx: i, kind: "file_access" });
+    } else if (/Requesting permission for:/i.test(trimmed) || /Do you want to (?:proceed|run|execute)/i.test(trimmed)) {
+      candidateHeaders.push({ lineIdx: i, kind: "approval" });
+    }
+  }
+  for (const candidate of candidateHeaders) {
+    let optCount = 0;
+    let cursorCount = 0;
+    let inInnerFence = false;
+    let innerFenceChar = "";
+    let innerFenceLen = 0;
+    let composerEncountered = false;
+    for (let j = candidate.lineIdx + 1; j < footerIdx; j++) {
+      const lineJ = lines[j];
+      const trimmed = lineJ.trim();
+      if (!trimmed) continue;
+      const fenceMatch = lineJ.match(/^(`{3,}|~{3,})(.*)$/);
+      if (fenceMatch) {
+        const marker = fenceMatch[1];
+        const rest = fenceMatch[2].trim();
+        const fChar = marker[0];
+        const fLen = marker.length;
+        if (inInnerFence) {
+          if (fChar === innerFenceChar && fLen >= innerFenceLen && rest === "") {
+            inInnerFence = false;
+            innerFenceChar = "";
+            innerFenceLen = 0;
+            optCount = 0;
+            cursorCount = 0;
+          }
+          continue;
+        }
+        inInnerFence = true;
+        innerFenceChar = fChar;
+        innerFenceLen = fLen;
+        optCount = 0;
+        cursorCount = 0;
+        continue;
+      }
+      if (inInnerFence) {
+        continue;
+      }
+      if (isAgyStatusFooterLine(trimmed) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(trimmed) || isComposerBoxAt(lines, j)) {
+        composerEncountered = true;
+        break;
+      }
+      if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
+        if (/^[>\s❯]*1[.)]/.test(trimmed) && optCount > 0) {
+          optCount = 0;
+          cursorCount = 0;
+        }
+        optCount++;
+        if (/^[>❯]/.test(trimmed)) {
+          cursorCount++;
+        }
+        continue;
+      }
+    }
+    const isValidOptionGroup = optCount >= 2 && cursorCount <= 1;
+    if (!inInnerFence && !composerEncountered && isValidOptionGroup && !hasTrailingAgyComposer(lines, footerIdx)) {
+      return { blocked: true, kind: candidate.kind };
+    }
+  }
+  return { blocked: false, kind: null };
+}
 function looksLikePromptDelta(chunk) {
   return (
     // Approval UI signatures
-    /Requesting permission for:/i.test(chunk) || /Do you want to proceed\?/i.test(chunk) || /\besc to cancel\b/i.test(chunk) || /^\s*[1-9]\. (?:Yes|No)\b/im.test(chunk) || /\[(?:y\/n|Y\/n|y\/N)\]/.test(chunk) || /Question \d+\/\d+:/i.test(chunk) || /\benter Select\b/i.test(chunk) || /^File access\s*$/im.test(chunk) || /Allow access to this file\?/i.test(chunk) || /No, deny access/i.test(chunk) || /Our servers are experiencing/i.test(chunk) || /Error ID:\s*[0-9a-fA-F-]*/i.test(chunk) || /(?:⚠️|⚠\uFE0F?)\s+.*(?:high[- ]traffic|try again in a minute|try again later|stream was interrupted|stream interrupted|overloaded|unexpected error|quota\b|upgrade your subscription|increase your limits|resets in\s+\d|credits balance is too low|out of credits|rate[- ]limit|capacity exhausted|exhausted your quota|internal error|currently unreachable|network issue connecting|authentication expired|authentication issue|terminated due to error|invalid output|invalid tool call)/i.test(chunk)
+    /Requesting permission for:/i.test(chunk) || /Do you want to proceed\?/i.test(chunk) || /\besc to cancel\b/i.test(chunk) || /^\s*[1-9]\. (?:Yes|No)\b/im.test(chunk) || /\[(?:y\/n|Y\/n|y\/N)\]/.test(chunk) || /^\s*(?:[❯>]\s*)?\?\s+(?!for\s+(?:shortcuts|help|commands))\S/im.test(chunk) || /Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:/i.test(chunk) || /\benter\s+(?:to\s+)?select\b/i.test(chunk) || /\b(?:navigate|use\s+arrow\s+keys)\b/i.test(chunk) || /^File access\s*$/im.test(chunk) || /^\s*Allow access to this file\?\s*$/im.test(chunk) || /(?:Yes, allow access|No, deny access)/i.test(chunk) || /(?:↑\/↓\s+Navigate|ctrl\+r\s+Review)/i.test(chunk) || /Our servers are experiencing/i.test(chunk) || /Error ID:\s*[0-9a-fA-F-]*/i.test(chunk) || /(?:⚠️|⚠\uFE0F?)\s+.*(?:high[- ]traffic|try again in a minute|try again later|stream was interrupted|stream interrupted|overloaded|unexpected error|quota\b|upgrade your subscription|increase your limits|resets in\s+\d|credits balance is too low|out of credits|rate[- ]limit|capacity exhausted|exhausted your quota|internal error|currently unreachable|network issue connecting|authentication expired|authentication issue|terminated due to error|invalid output|invalid tool call)/i.test(chunk)
   );
 }
 function isNonSystemErrorWarningLine(trimmed) {
@@ -2886,7 +3150,13 @@ function isComposedStatusFooter(trimmed) {
 }
 function isAgyStatusFooterLine(trimmed) {
   if (!trimmed) return false;
-  if (/^\s*(?:\?\s+for shortcuts|esc to cancel)\b/i.test(trimmed)) {
+  if (/(?:\benter|<enter>)\s+(?:to\s+)?select\b/i.test(trimmed) || /\bNavigate\b/i.test(trimmed)) {
+    return false;
+  }
+  if (/^\s*(?:[❯>]\s*)?\?\s+for shortcuts\b/i.test(trimmed)) {
+    return true;
+  }
+  if (/^\s*esc to cancel\b/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)) {
@@ -2897,6 +3167,68 @@ function isAgyStatusFooterLine(trimmed) {
   }
   return false;
 }
+function computeFenceMask(lines) {
+  const inFence = new Array(lines.length).fill(false);
+  let inside = false;
+  let activeFenceChar = "";
+  let activeFenceLen = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const match = line.match(/^(`{3,}|~{3,})(.*)$/);
+    if (match) {
+      const marker = match[1];
+      const rest = match[2];
+      const fenceChar = marker[0];
+      const fenceLen = marker.length;
+      if (!inside) {
+        inside = true;
+        activeFenceChar = fenceChar;
+        activeFenceLen = fenceLen;
+        inFence[i] = true;
+        continue;
+      } else {
+        if (fenceChar === activeFenceChar && fenceLen >= activeFenceLen && rest.trim() === "") {
+          inside = false;
+          activeFenceChar = "";
+          activeFenceLen = 0;
+          inFence[i] = true;
+          continue;
+        }
+      }
+    }
+    inFence[i] = inside;
+  }
+  return inFence;
+}
+function hasTrailingAgyComposer(lines, afterLineIdx, fenceMask) {
+  if (afterLineIdx < -1 || afterLineIdx >= lines.length - 1) return false;
+  const trailingLines = [];
+  for (let i = afterLineIdx + 1; i < lines.length; i++) {
+    if (fenceMask && fenceMask[i]) continue;
+    const trimmed = lines[i].trim();
+    if (trimmed.length > 0) {
+      trailingLines.push(trimmed);
+    }
+  }
+  if (trailingLines.length === 0) return false;
+  if (trailingLines.some((l) => /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(l))) {
+    return true;
+  }
+  for (let i = 0; i < trailingLines.length; i++) {
+    const l = trailingLines[i];
+    if (/^[─━│╭╰╮╯\s_-]{3,}$/.test(l)) {
+      if (i + 1 < trailingLines.length && /^[│\s]*[❯>]\s*$/.test(trailingLines[i + 1])) {
+        if (i + 2 < trailingLines.length && /^[─━│╭╰╮╯\s_-]{3,}$/.test(trailingLines[i + 2])) {
+          return true;
+        }
+      }
+    }
+  }
+  if (trailingLines.some((l) => isAgyStatusFooterLine(l) && /(?:Gemini|Flash|Pro|Claude|Sonnet|Opus|GPT|auto|high|low|medium)/i.test(l))) {
+    return true;
+  }
+  return false;
+}
 function reconstructFooter(rawLines) {
   const cleaned = rawLines.map((l) => l.trim()).filter(Boolean);
   if (cleaned.length === 0) return "";
@@ -3048,17 +3380,62 @@ function looksLikePromptSnapshot(snapshot) {
       return hasApprovalHeader && hasApprovalOptions && hasApprovalFooter;
     }
     if (activeKind === "question") {
-      const hasQuestionHeader = /Question \d+\/\d+:/i.test(recent);
-      const hasQuestionOptions = /^[>\s]*[1-9]\. \S/im.test(recent);
-      const hasQuestionFooter = /\benter Select\b/i.test(recent);
-      return hasQuestionHeader && hasQuestionOptions && hasQuestionFooter;
+      const allLines = stripped.trimEnd().split("\n");
+      const fenceMask = computeFenceMask(allLines);
+      const windowStart = Math.max(0, allLines.length - 30);
+      let headerIdx = -1;
+      for (let i = allLines.length - 1; i >= windowStart; i--) {
+        if (!fenceMask[i] && isQuestionHeaderLine(allLines[i])) {
+          headerIdx = i;
+          break;
+        }
+      }
+      if (headerIdx < 0) return false;
+      const headerLine = allLines[headerIdx].trim();
+      const optionIndices = [];
+      for (let i = headerIdx + 1; i < allLines.length; i++) {
+        if (!fenceMask[i] && /^[>\s❯]*[1-9][.)]\s+\S/.test(allLines[i].trim())) {
+          optionIndices.push(i);
+        }
+      }
+      if (optionIndices.length < 2) return false;
+      const lastOptionIdx = optionIndices[optionIndices.length - 1];
+      const hasHeaderHint = /\((?:Use\s+arrow\s+keys|Use\s+\S+\s+keys)[^)]*\)/i.test(headerLine);
+      let hasQuestionFooter = hasHeaderHint;
+      let footerIdx = lastOptionIdx;
+      if (!hasQuestionFooter) {
+        for (let i = lastOptionIdx + 1; i < allLines.length; i++) {
+          if (!fenceMask[i] && isQuestionFooterLine(allLines[i].trim())) {
+            hasQuestionFooter = true;
+            footerIdx = i;
+            break;
+          }
+        }
+      }
+      if (!hasQuestionFooter) return false;
+      if (hasTrailingAgyComposer(allLines, footerIdx, fenceMask)) {
+        return false;
+      }
+      return true;
     }
     if (activeKind === "file_access") {
-      const hasFileAccessHeader = /^File access\s*$/im.test(recent);
-      const hasFileAccessQuestion = /Allow access to this file\?/i.test(recent);
-      const hasApprovalOptions = /^[>\s]*[1-9]\. (?:Yes|No)\b/im.test(recent);
-      const hasApprovalFooter = /\besc to cancel\b/i.test(recent);
-      return hasFileAccessHeader && hasFileAccessQuestion && hasApprovalOptions && hasApprovalFooter;
+      const hasFileAccessHeader = /^File access\s*$/im.test(recent) || /^\s*(?:Read|Write|Edit|Access):\s*\S/im.test(recent);
+      const questionMatches = Array.from(recent.matchAll(/^\s*Allow access to this file\?\s*$/gim));
+      if (!hasFileAccessHeader || questionMatches.length === 0) {
+        return false;
+      }
+      const lastQuestionMatch = questionMatches[questionMatches.length - 1];
+      if (lastQuestionMatch.index === void 0) {
+        return false;
+      }
+      const belowQuestion = recent.slice(lastQuestionMatch.index);
+      if (/\?\s+for shortcuts/i.test(belowQuestion)) {
+        return false;
+      }
+      const hasApprovalOptions = /^[>\s]*[1-9]\. (?:Yes|No)\b/im.test(belowQuestion);
+      const hasApprovalFooter = /^\s*(?:esc to cancel\b|[↑↓/\s]*Navigate\b|ctrl\+r\s+Review\b)/im.test(belowQuestion);
+      const hasQuestionFooter = /\benter\s+Select\b/i.test(belowQuestion);
+      return hasApprovalOptions && hasApprovalFooter && !hasQuestionFooter;
     }
     return true;
   }
@@ -3069,21 +3446,62 @@ function looksLikePromptSnapshot(snapshot) {
 function extractFileAccessPrompt(snapshot) {
   const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
   const lines = stripped.split("\n");
-  let headingIndex = -1;
+  let questionIndex = -1;
   for (let index = lines.length - 1; index >= 0; index -= 1) {
-    if (/^\s*File access\s*$/i.test(lines[index])) {
-      headingIndex = index;
+    if (/^\s*Allow access to this file\?\s*$/i.test(lines[index])) {
+      questionIndex = index;
       break;
     }
   }
-  if (headingIndex < 0) return null;
-  const block = lines.slice(headingIndex, headingIndex + 20);
-  const questionIndex = block.findIndex((line) => /Allow access to this file\?/i.test(line));
   if (questionIndex < 0) return null;
-  const readLine = block.slice(0, questionIndex + 1).find((line) => /^\s*Read:\s*\S/i.test(line));
-  const identity = readLine?.replace(/^\s*Read:\s*/i, "").trim() || "non-workspace file access";
-  const fullLine = block[questionIndex].trim();
-  const body = block.slice(1, questionIndex).join("\n").trim();
+  const scanStart = Math.max(0, questionIndex - 15);
+  let headingIndex = -1;
+  let actionIndex = -1;
+  let actionLine = null;
+  let targetPath = null;
+  for (let index = questionIndex - 1; index >= scanStart; index -= 1) {
+    const line = lines[index].trim();
+    if (!line) continue;
+    const actionMatch = line.match(/^\s*((?:Read|Write|Edit|Access):\s*(\S.*))$/i);
+    if (actionMatch && actionIndex < 0) {
+      actionIndex = index;
+      actionLine = actionMatch[1].trim();
+      targetPath = actionMatch[2].trim();
+      for (let prevIdx = index - 1; prevIdx >= scanStart; prevIdx -= 1) {
+        const prevLine = lines[prevIdx].trim();
+        if (!prevLine) continue;
+        if (/^\s*File access\s*$/i.test(prevLine)) {
+          headingIndex = prevIdx;
+        }
+        break;
+      }
+      break;
+    }
+    if (/^\s*Reason:\s*\S.*/i.test(line) && actionIndex < 0) {
+      continue;
+    }
+    if (/^[⚠⚠️]\s*/.test(line) && actionIndex < 0) {
+      continue;
+    }
+    if (/^\s*File access\s*$/i.test(line)) {
+      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)) {
+      break;
+    }
+    break;
+  }
+  const identity = targetPath || "non-workspace file access";
+  const bodyStart = headingIndex >= 0 ? headingIndex + 1 : actionIndex >= 0 ? actionIndex : questionIndex;
+  const contextLines = lines.slice(bodyStart, questionIndex).map((line) => line.trim()).filter((line) => {
+    if (!line) return false;
+    if (/^\s*File access\s*$/i.test(line)) return false;
+    if (actionIndex < 0 && /^\s*Reason:\s*/i.test(line)) return false;
+    return true;
+  });
+  const body = contextLines.join("\n").trim();
+  const fullLine = actionLine ? `Allow access to this file? (${actionLine})` : lines[questionIndex].trim();
   return { identity, fullLine, body };
 }
 function extractHeader(snapshot) {
@@ -3098,13 +3516,177 @@ function extractFullHeaderLine(snapshot) {
   if (matches.length === 0) return null;
   return matches[matches.length - 1][0].trim();
 }
+function isOpenEnclosingContext(lines, checkTop, topAnchor, boundaryIdx) {
+  let activeFence = null;
+  for (let k = checkTop; k < topAnchor; k++) {
+    const raw = lines[k];
+    if (!activeFence) {
+      const openMatch = raw.match(/^ {0,3}(`{3,}|~{3,})(.*)$/);
+      if (openMatch) {
+        const fenceStr = openMatch[1];
+        const rest = openMatch[2];
+        const char = fenceStr[0];
+        if (char === "`" && rest.includes("`")) {
+        } else {
+          activeFence = { char, length: fenceStr.length };
+        }
+      }
+    } else {
+      const closeMatch = raw.match(/^ {0,3}(`{3,}|~{3,})\s*$/);
+      if (closeMatch) {
+        const fenceStr = closeMatch[1];
+        if (fenceStr[0] === activeFence.char && fenceStr.length >= activeFence.length) {
+          activeFence = null;
+        }
+      }
+    }
+  }
+  if (activeFence !== null) {
+    return true;
+  }
+  for (let k = boundaryIdx - 1; k >= checkTop; k--) {
+    const l = lines[k].trim();
+    if (!l) continue;
+    if (/Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l) || /Question \d+\/\d+:/i.test(l)) {
+      const sliceBetween = lines.slice(k + 1, boundaryIdx);
+      let optCount = 0;
+      let hasFooter = false;
+      let inDiff = false;
+      for (const raw of sliceBetween) {
+        const s = raw.trim();
+        if (!s) continue;
+        if (inDiff) {
+          if (/^[ +\-\\]/.test(raw)) {
+            continue;
+          }
+          if (/^(?:diff\s+--git\b|@@\s+-\d+|---\s+(?:[ab]\/|\/dev\/null)|\+\+\+\s+(?:[ab]\/|\/dev\/null)|index\s+[0-9a-f]{7,})/i.test(s)) {
+            continue;
+          }
+          if (/^●\s+(?:Edit completed|[A-Z])/i.test(raw)) {
+            inDiff = false;
+            continue;
+          }
+          if (/^Do you want to proceed\?/i.test(raw)) {
+            inDiff = false;
+            continue;
+          }
+          inDiff = false;
+        }
+        if (/^(?:diff\s+--git\b|@@\s+-\d+|---\s+(?:[ab]\/|\/dev\/null)|\+\+\+\s+(?:[ab]\/|\/dev\/null)|index\s+[0-9a-f]{7,})/i.test(s)) {
+          inDiff = true;
+          continue;
+        }
+        if (/^●\s+(?:Edit completed|[A-Z])/i.test(raw)) {
+          continue;
+        }
+        if (/^[>\s]*[1-9]\.\s+\S/.test(s)) optCount++;
+        if (/esc to cancel\b|enter Select\b|[↑↓/\s]*Navigate\b/i.test(s)) hasFooter = true;
+      }
+      if (optCount < 2 || !hasFooter) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function isStandaloneFileAccessContext(lines, questionIdx) {
+  const windowEnd = Math.min(lines.length, questionIdx + 15);
+  let hasFileAccessOption = false;
+  for (let j = questionIdx + 1; j < windowEnd; j++) {
+    const l = lines[j].trim();
+    if (!l) continue;
+    if (/\benter\s+Select\b/i.test(l) || /\benter\s+to\s+(?:select|submit)\b/i.test(l)) {
+      return false;
+    }
+    if (/Do you want to proceed\?/i.test(l) || /Requesting permission for:/i.test(l)) {
+      return false;
+    }
+    if (/\b(?:allow|deny)\s+access\b/i.test(l)) {
+      hasFileAccessOption = true;
+    }
+    if (/^[─━│╭╰╮╯\s]*$/.test(l) && l.length > 5) {
+      break;
+    }
+    if (/^[▶▸\s]*Thought|^●\s*/i.test(l) || /^[│\s]*[❯>]\s*$/.test(l)) {
+      break;
+    }
+  }
+  const start = Math.max(0, questionIdx - 15);
+  let actionIdx = -1;
+  let headingIdx = -1;
+  for (let j = questionIdx - 1; j >= start; j--) {
+    const l = lines[j].trim();
+    if (!l) continue;
+    if (/^(?:diff\s+--git|index\s+[0-9a-f]{7,}|---\s+(?:[ab]\/|\/dev\/null)|\+\+\+\s+(?:[ab]\/|\/dev\/null)|@@\s+-\d+)/i.test(l) || /^ {0,3}(`{3,}|~{3,})(?:[a-z0-9_+-]+)?\s*$/i.test(l) || /Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l) || /Question \d+\/\d+:/i.test(l)) {
+      return false;
+    }
+    if (/^[─━│╭╰╮╯\s]*$/.test(l) && l.length > 5) {
+      break;
+    }
+    if (/^[│\s]*[❯>]\s*$/.test(l)) {
+      break;
+    }
+    if (/^\s*(?:Read|Write|Edit|Access):\s*\S/i.test(l)) {
+      actionIdx = j;
+      for (let k = j - 1; k >= start; k--) {
+        const prev = lines[k].trim();
+        if (!prev) continue;
+        if (/^\s*File access\s*$/i.test(prev)) {
+          headingIdx = k;
+        }
+        break;
+      }
+      break;
+    }
+    if (/^\s*Reason:\s*\S/i.test(l)) {
+      continue;
+    }
+    if (/^[⚠⚠️]\s*/.test(l)) {
+      continue;
+    }
+    if (/^\s*File access\s*$/i.test(l)) {
+      headingIdx = j;
+      break;
+    }
+    return false;
+  }
+  if (actionIdx < 0 && headingIdx < 0) {
+    return false;
+  }
+  if (headingIdx < 0 && !hasFileAccessOption) {
+    return false;
+  }
+  const topAnchor = headingIdx >= 0 ? headingIdx : actionIdx;
+  const checkTop = Math.max(0, topAnchor - 25);
+  for (let j = topAnchor - 1; j >= checkTop; j--) {
+    const l = lines[j].trim();
+    if (!l) continue;
+    if (/Question \d+\/\d+:/i.test(l)) {
+      return false;
+    }
+    if (/Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l)) {
+      return false;
+    }
+    if (/^(?:diff\s+--git|index\s+[0-9a-f]{7,}|---\s+(?:[ab]\/|\/dev\/null)|\+\+\+\s+(?:[ab]\/|\/dev\/null)|@@\s+-\d+)/i.test(l) || /^ {0,3}(`{3,}|~{3,})(?:[a-z0-9_+-]+)?\s*$/i.test(l)) {
+      return false;
+    }
+    if (/^[▶▸\s]*Thought|^●\s*/i.test(l) || /^[│\s]*[❯>]\s*$/.test(l) || /^[─━│╭╰╮╯\s]*$/.test(l) && l.length > 5) {
+      if (isOpenEnclosingContext(lines, checkTop, topAnchor, j)) {
+        return false;
+      }
+      break;
+    }
+  }
+  return true;
+}
 function detectActivePromptKind(snapshot) {
   const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
   const lines = stripped.trimEnd().split("\n");
   const windowStart = Math.max(0, lines.length - 30);
   const approvalRe = /Requesting permission for:/i;
-  const questionRe = /Question \d+\/\d+:/i;
   const fileAccessRe = /^\s*File access\s*$/i;
+  const fileAccessQuestionRe = /^\s*Allow access to this file\?\s*$/i;
+  const lineInFence = computeFenceMask(lines);
   let lastApprovalLineIdx = -1;
   let lastQuestionLineIdx = -1;
   let lastFileAccessLineIdx = -1;
@@ -3112,14 +3694,22 @@ function detectActivePromptKind(snapshot) {
   for (let i = lines.length - 1; i >= 0; i--) {
     const line = lines[i];
     if (i >= windowStart) {
-      if (lastApprovalLineIdx < 0 && approvalRe.test(line)) {
-        lastApprovalLineIdx = i;
+      if (approvalRe.test(line)) {
+        if (!lineInFence[i] && lastApprovalLineIdx < 0) {
+          lastApprovalLineIdx = i;
+        }
       }
-      if (lastQuestionLineIdx < 0 && questionRe.test(line)) {
-        lastQuestionLineIdx = i;
+      if (isQuestionHeaderLine(line)) {
+        if (!lineInFence[i] && lastQuestionLineIdx < 0) {
+          lastQuestionLineIdx = i;
+        }
       }
-      if (lastFileAccessLineIdx < 0 && fileAccessRe.test(line)) {
-        lastFileAccessLineIdx = i;
+      if (lastFileAccessLineIdx < 0 && !lineInFence[i]) {
+        if (fileAccessRe.test(line)) {
+          lastFileAccessLineIdx = i;
+        } else if (fileAccessQuestionRe.test(line) && isStandaloneFileAccessContext(lines, i)) {
+          lastFileAccessLineIdx = i;
+        }
       }
     }
     if (lastSystemErrorLineIdx < 0 && isSystemErrorBannerLineInContext(lines, i)) {
@@ -3130,12 +3720,14 @@ function detectActivePromptKind(snapshot) {
   if (lastApprovalLineIdx < 0 && lastQuestionLineIdx < 0) {
     for (let i = lines.length - 1; i >= windowStart; i--) {
       if (/Do you want to proceed\?/i.test(lines[i])) {
-        lastApprovalLineIdx = i;
-        break;
+        if (!lineInFence[i]) {
+          lastApprovalLineIdx = i;
+          break;
+        }
       }
     }
   }
-  const latestChooserIdx = Math.max(
+  let latestChooserIdx = Math.max(
     lastApprovalLineIdx,
     lastQuestionLineIdx,
     lastFileAccessLineIdx
@@ -3144,15 +3736,32 @@ function detectActivePromptKind(snapshot) {
     if (latestChooserIdx >= 0) {
       const remainingLines = lines.slice(lastSystemErrorLineIdx + 1).join("\n");
       if (latestChooserIdx === lastQuestionLineIdx) {
-        const hasQuestionOptions = /^[>\s]*[1-9]\. \S/im.test(remainingLines);
-        const hasQuestionFooter = /\benter Select\b/i.test(remainingLines);
-        if (hasQuestionOptions && hasQuestionFooter) {
+        let hasQuestionOptions = false;
+        let hasQuestionFooter = false;
+        let promptEndIdx = lastSystemErrorLineIdx;
+        for (let j = lastSystemErrorLineIdx + 1; j < lines.length; j++) {
+          if (!lineInFence[j]) {
+            const trimmed = lines[j].trim();
+            if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
+              hasQuestionOptions = true;
+              promptEndIdx = j;
+            } else if (isQuestionFooterLine(lines[j])) {
+              hasQuestionFooter = true;
+              promptEndIdx = j;
+            }
+          }
+        }
+        const headerLine = lines[lastQuestionLineIdx].trim();
+        const hasHeaderHint = /\((?:Use\s+arrow\s+keys|Use\s+\S+\s+keys)[^)]*\)/i.test(headerLine);
+        const footerSatisfied = hasQuestionFooter || hasHeaderHint;
+        const hasComposer = hasTrailingAgyComposer(lines, promptEndIdx, lineInFence);
+        if (hasQuestionOptions && footerSatisfied && !hasComposer) {
           return "question";
         }
       } else if (latestChooserIdx === lastFileAccessLineIdx) {
-        const hasFileAccessQuestion = /Allow access to this file\?/i.test(remainingLines);
+        const hasFileAccessQuestion = /^\s*Allow access to this file\?\s*$/im.test(remainingLines);
         const hasApprovalOptions = /^[>\s]*[1-9]\. (?:Yes|No)\b/im.test(remainingLines);
-        const hasApprovalFooter = /\besc to cancel\b/i.test(remainingLines);
+        const hasApprovalFooter = /^\s*(?:esc to cancel\b|[↑↓/\s]*Navigate\b|ctrl\+r\s+Review\b)/im.test(remainingLines);
         if (hasFileAccessQuestion && hasApprovalOptions && hasApprovalFooter) {
           return "file_access";
         }
@@ -3174,6 +3783,20 @@ function detectActivePromptKind(snapshot) {
     return "file_access";
   }
   if (latestChooserIdx === lastQuestionLineIdx) {
+    let promptEndIdx = lastQuestionLineIdx;
+    for (let j = lastQuestionLineIdx + 1; j < lines.length; j++) {
+      if (!lineInFence[j]) {
+        if (isAgyStatusFooterLine(lines[j].trim()) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(lines[j].trim()) || isComposerBoxAt(lines, j)) {
+          break;
+        }
+        if (/^[>\s❯]*[1-9][.)]\s+\S/.test(lines[j].trim()) || isQuestionFooterLine(lines[j])) {
+          promptEndIdx = j;
+        }
+      }
+    }
+    if (hasTrailingAgyComposer(lines, promptEndIdx, lineInFence)) {
+      return null;
+    }
     return "question";
   }
   return "approval";
@@ -3524,12 +4147,45 @@ function extractSystemErrorPrompt(snapshot) {
   const fullLine = errorId ? `\u26A0\uFE0F Antigravity error: ${message} (Error ID: ${errorId})` : `\u26A0\uFE0F Antigravity error: ${message}`;
   return { message, errorId, fullLine };
 }
+function isQuestionHeaderLine(line) {
+  if (!line) return false;
+  const trimmed = line.trim();
+  if (isAgyStatusFooterLine(trimmed)) return false;
+  if (/^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) {
+    return false;
+  }
+  return /^\s*(?:[❯>]\s*)?\?\s+(?!for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b)\S/i.test(trimmed) || /^\s*(?:[❯>]\s*)?(?:\?\s*)?Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:\s*\S/i.test(trimmed);
+}
+function isQuestionFooterLine(line) {
+  if (!line) return false;
+  const trimmed = line.trim();
+  if (/^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) {
+    return false;
+  }
+  if (isComposedStatusFooter(trimmed)) return false;
+  if (/^\s*esc to cancel\b/i.test(trimmed) && /(?:Gemini|Flash|Pro|Claude|Sonnet|Opus|GPT|auto|high|low|medium|credits|tasks|subagents?|quota)/i.test(trimmed)) {
+    return false;
+  }
+  if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) return false;
+  if (isQuestionHeaderLine(trimmed)) return false;
+  return /^(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip)(?:\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?select)?$/i.test(trimmed) || /^(?:enter|<enter>)\s+(?:to\s+)?select(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip))?$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:enter|<enter>)?\s*(?:Select|to select))?(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel))?$/i.test(trimmed) || /^press\s+<?(?:enter|return|space)>?\s+to\s+select$/i.test(trimmed) || /^space\s+to\s+select$/i.test(trimmed) || /^(?:\(?use\s+arrow\s+keys(?:\s+to\s+navigate)?\)?)$/i.test(trimmed) || /^waiting(?:\.\.\.)?$/i.test(trimmed);
+}
 function extractQuestionHeader(snapshot) {
   const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
-  const matches = Array.from(stripped.matchAll(/Question \d+\/\d+:\s*([^\n]+)/gi));
-  if (matches.length === 0) return null;
-  const last = matches[matches.length - 1];
-  return { fullLine: last[0].trim(), body: last[1].trim() };
+  const lines = stripped.split("\n");
+  const lineInFence = computeFenceMask(lines);
+  const prefixRe = /^\s*(?:[❯>]\s*)?(?:\?\s*(?:Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:\s*)?|Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:\s*)/i;
+  for (let i = lines.length - 1; i >= 0; i--) {
+    if (lineInFence[i]) continue;
+    const line = lines[i];
+    if (isQuestionHeaderLine(line)) {
+      const fullLine = line.trim();
+      let body = fullLine.replace(prefixRe, "").trim();
+      body = body.replace(/\s*\((?:Use\s+arrow\s+keys|Use\s+\S+\s+keys)[^)]*\)\s*$/i, "").trim();
+      return { fullLine, body };
+    }
+  }
+  return null;
 }
 function hashPromptSnapshot(snapshot) {
   let normalized = snapshot.replace(ANSI_ESCAPE_REGEX, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/[ \t]+\n/g, "\n").trim();
@@ -3549,8 +4205,7 @@ function sleep(ms) {
   });
 }
 function isQuestionUISnapshot(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
-  return /Question \d+\/\d+:/i.test(stripped);
+  return extractQuestionHeader(snapshot) !== null;
 }
 
 // src/approval-detector.ts
@@ -3606,7 +4261,7 @@ function parseFileAccessSnapshot(stripped, originalSnapshot, prompt) {
   const lines = stripped.split("\n");
   let questionIndex = -1;
   for (let index = lines.length - 1; index >= 0; index -= 1) {
-    if (/Allow access to this file\?/i.test(lines[index])) {
+    if (/^\s*Allow access to this file\?\s*$/i.test(lines[index])) {
       questionIndex = index;
       break;
     }
@@ -3671,9 +4326,11 @@ function parseApprovalUISnapshot(stripped, originalSnapshot) {
 }
 function parseQuestionSnapshot(stripped, originalSnapshot, header) {
   const lines = stripped.split("\n");
+  const lineInFence = computeFenceMask(lines);
   let headerIdx = -1;
   for (let i = lines.length - 1; i >= 0; i--) {
-    if (/Question \d+\/\d+:/i.test(lines[i])) {
+    if (lineInFence[i]) continue;
+    if (isQuestionHeaderLine(lines[i])) {
       headerIdx = i;
       break;
     }
@@ -3681,7 +4338,10 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
   const belowHeader = headerIdx >= 0 ? lines.slice(headerIdx + 1).join("\n") : stripped;
   const options = parseOptions(belowHeader);
   if (options.length < 2) return null;
-  const submitMap = buildQuestionSubmitMap(options);
+  const normalizedHeader = header.fullLine.replace(/^[❯>\s*•-]+\s*/, "").trim();
+  const hasArrowKeyHint = /\((?:Use\s+arrow\s+keys|Use\s+\S+\s+keys)[^)]*\)/i.test(normalizedHeader);
+  const isBaseNumberedWizard = /^Question\s+\d+\/\d+:/i.test(normalizedHeader) && !hasArrowKeyHint;
+  const submitMap = isBaseNumberedWizard ? buildQuestionSubmitMap(options) : {};
   const body = extractBodyBetweenHeaderAndFirstOption(belowHeader);
   return {
     kind: "question",
@@ -3697,16 +4357,11 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
 }
 function extractBodyBetweenHeaderAndFirstOption(belowHeader) {
   const lines = belowHeader.split("\n");
-  const optionRegex = /^[>\s]*([1-9])\. (.+?)\s*$/;
-  const fenceRegex = /^```/;
+  const optionRegex = /^[>\s❯]*([1-9])[.)]\s+(.+?)\s*$/;
+  const lineInFence = computeFenceMask(lines);
   let firstOptionIdx = -1;
-  let inFence = false;
   for (let i = 0; i < lines.length; i++) {
-    if (fenceRegex.test(lines[i])) {
-      inFence = !inFence;
-      continue;
-    }
-    if (inFence) continue;
+    if (lineInFence[i]) continue;
     if (optionRegex.test(lines[i])) {
       firstOptionIdx = i;
       break;
@@ -3716,8 +4371,19 @@ function extractBodyBetweenHeaderAndFirstOption(belowHeader) {
   return lines.slice(0, firstOptionIdx).join("\n").trim();
 }
 function parseOptions(snapshot) {
-  const recent = snapshot.split("\n").slice(-30);
-  const optionRegex = /^[>\s]*([1-9])\. (.+?)\s*$/;
+  const lines = snapshot.split("\n");
+  const lineInFence = computeFenceMask(lines);
+  const filteredLines = [];
+  for (let i = 0; i < lines.length; i++) {
+    if (!lineInFence[i]) {
+      filteredLines.push(lines[i]);
+    }
+  }
+  while (filteredLines.length > 0 && filteredLines[filteredLines.length - 1].trim() === "") {
+    filteredLines.pop();
+  }
+  const recent = filteredLines.slice(-30);
+  const optionRegex = /^[>\s❯]*([1-9])[.)]\s+(.+?)\s*$/;
   const found = /* @__PURE__ */ new Map();
   for (const line of recent) {
     const m = line.match(optionRegex);
@@ -3821,6 +4487,7 @@ function extractIdentity(headerText) {
   return { command: trimmed };
 }
 function guessToolTypeFromIdentity(c) {
+  if (c.kind === "question") return "ASK_QUESTION";
   if (c.command) return "RUN_COMMAND";
   if (c.filePath) return "CODE_ACTION";
   return "GENERIC";
@@ -3927,11 +4594,12 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       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. Default: GENERIC.
+      // path → CODE_ACTION. For questions → ASK_QUESTION. Default: GENERIC.
       toolType: guessToolTypeFromIdentity(candidate),
       command: candidate.command,
       filePath: candidate.filePath,
-      rawToolName: candidate.command ?? candidate.filePath ?? "unknown",
+      rawToolName: candidate.kind === "question" ? "ask_question" : candidate.command ?? candidate.filePath ?? "unknown",
+      questionText: candidate.kind === "question" ? candidate.headerText : void 0,
       promptId,
       startedAt: Date.now(),
       intentCreatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -4253,6 +4921,21 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
     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.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 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];
@@ -4555,6 +5238,33 @@ var PromptResponder = class {
       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();
@@ -4835,7 +5545,7 @@ function fireDaemonBeacon(name, params) {
 
 // src/event-mapper.ts
 var import_uuid2 = require("uuid");
-var import_codevibe_core4 = require("@quantiya/codevibe-core");
+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;
@@ -4843,10 +5553,10 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
   const { event } = emit;
   const base = {
     sessionId,
-    source: import_codevibe_core4.EventSource.DESKTOP
+    source: import_codevibe_core5.EventSource.DESKTOP
   };
   const orderingKey = `${sessionId}:${emit.conversationId}`;
-  const nextTimestamp = () => (0, import_codevibe_core4.prepareEventTimestamp)({ orderingKey, agentClock: event.created_at, notBeforeMs });
+  const nextTimestamp = () => (0, import_codevibe_core5.prepareEventTimestamp)({ orderingKey, agentClock: event.created_at, notBeforeMs });
   const baseMetadata = {
     step_index: event.step_index,
     agy_source: event.source,
@@ -4886,7 +5596,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
         {
           ...base,
           timestamp: nextTimestamp(),
-          type: import_codevibe_core4.EventType.USER_PROMPT,
+          type: import_codevibe_core5.EventType.USER_PROMPT,
           content: truncate(cleaned, CONTENT_MAX),
           metadata: { ...baseMetadata }
         }
@@ -4901,7 +5611,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
       events.push({
         ...base,
         timestamp: nextTimestamp(),
-        type: import_codevibe_core4.EventType.REASONING,
+        type: import_codevibe_core5.EventType.REASONING,
         content: truncate(event.thinking, CONTENT_MAX),
         metadata: { ...baseMetadata }
       });
@@ -4910,7 +5620,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
       events.push({
         ...base,
         timestamp: nextTimestamp(),
-        type: import_codevibe_core4.EventType.ASSISTANT_RESPONSE,
+        type: import_codevibe_core5.EventType.ASSISTANT_RESPONSE,
         content: truncate(event.content, CONTENT_MAX),
         metadata: { ...baseMetadata }
       });
@@ -4931,6 +5641,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
           conversationId: emit.conversationId,
           command: extractCommandFromArgs(name, args),
           filePath: extractFilePathFromArgs(name, args),
+          questionText: extractQuestionFromArgs(name, args),
           cwd: extractCwdFromArgs(args),
           rawToolName: name,
           startedAt: Date.now(),
@@ -4947,7 +5658,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
         {
           ...base,
           timestamp: nextTimestamp(),
-          type: import_codevibe_core4.EventType.NOTIFICATION,
+          type: import_codevibe_core5.EventType.NOTIFICATION,
           content: truncate(content, CONTENT_MAX),
           metadata: {
             ...baseMetadata,
@@ -4967,7 +5678,7 @@ function mapTranscriptEvent(emit, sessionId, notBeforeMs) {
       {
         ...base,
         timestamp: nextTimestamp(),
-        type: import_codevibe_core4.EventType.TOOL_USE,
+        type: import_codevibe_core5.EventType.TOOL_USE,
         content: formatToolResultContent(event.type, toolName, truncatedContent, isErrorStatus),
         metadata: {
           ...baseMetadata,
@@ -5032,8 +5743,9 @@ function hookToolNameToTranscriptType(hookName) {
     case "MANAGE_TASK":
     case "SCHEDULE":
     case "ASK_PERMISSION":
-    case "ASK_QUESTION":
       return "GENERIC";
+    case "ASK_QUESTION":
+      return "ASK_QUESTION";
     default:
       return upper;
   }
@@ -5069,6 +5781,32 @@ function extractFilePathFromArgs(toolName, args) {
   }
   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());
+  }
+  if (Array.isArray(a.questions) && a.questions.length > 0) {
+    const first = a.questions[0];
+    if (typeof first === "string" && first.trim().length > 0) {
+      return stripWrappingQuotes2(first.trim());
+    }
+    if (first && typeof first === "object") {
+      const q = first.question;
+      if (typeof q === "string" && q.trim().length > 0) {
+        return stripWrappingQuotes2(q.trim());
+      }
+    }
+  }
+  return void 0;
+}
 function extractCwdFromArgs(args) {
   if (!args || typeof args !== "object") return void 0;
   const a = args;
@@ -5125,7 +5863,7 @@ function truncate(s, maxBytes) {
 }
 
 // src/tool-activity-integration.ts
-var import_codevibe_core5 = require("@quantiya/codevibe-core");
+var import_codevibe_core6 = require("@quantiya/codevibe-core");
 var TOOL_ACTIVITY_CONTENT = "tool_activity";
 var DEFAULT_WINDOW_MS = 1e4;
 var DEFAULT_MAX_OCCURRENCES = 50;
@@ -5192,9 +5930,9 @@ function agyOccurrenceId(emit, matchedCall) {
     createdAt: emit.event.created_at,
     stepIndex: emit.event.step_index,
     type: emit.event.type,
-    contentDigest: (0, import_codevibe_core5.digestOf)(emit.event.content ?? "")
+    contentDigest: (0, import_codevibe_core6.digestOf)(emit.event.content ?? "")
   };
-  return `agy:${(0, import_codevibe_core5.digestOf)(identity).slice("sha256:".length)}`;
+  return `agy:${(0, import_codevibe_core6.digestOf)(identity).slice("sha256:".length)}`;
 }
 var AgyToolActivityIntegration = class {
   constructor(deps) {
@@ -5209,12 +5947,12 @@ var AgyToolActivityIntegration = class {
   async start(sessionId) {
     if (this.consolidator && this.backendSessionId === sessionId) return;
     if (this.consolidator) await this.stop();
-    const outbox = new import_codevibe_core5.ToolActivityOutbox({
+    const outbox = new import_codevibe_core6.ToolActivityOutbox({
       agent: "agy",
       logger: this.deps.logger,
       root: this.deps.root
     });
-    const ledger = new import_codevibe_core5.ToolActivityLedger({
+    const ledger = new import_codevibe_core6.ToolActivityLedger({
       agent: "agy",
       sessionId,
       logger: this.deps.logger,
@@ -5224,7 +5962,7 @@ var AgyToolActivityIntegration = class {
     const legacyTransport = this.buildTransport();
     const transport = this.deps.selectTransport ? await this.deps.selectTransport(sessionId, legacyTransport) : legacyTransport;
     if (transport.protocol !== "SYNC_V2") await this.rehomePendingWindows(outbox, sessionId);
-    const consolidator = new import_codevibe_core5.ToolActivityConsolidator({
+    const consolidator = new import_codevibe_core6.ToolActivityConsolidator({
       agent: "agy",
       sessionId,
       logger: this.deps.logger,
@@ -5262,7 +6000,7 @@ var AgyToolActivityIntegration = class {
       ...target ? { normalizedTarget: target } : {},
       ts: emit.event.created_at,
       byteOffset: emit.byteOffset,
-      ...inputIdentity ? { digest: (0, import_codevibe_core5.digestOf)(inputIdentity) } : {}
+      ...inputIdentity ? { digest: (0, import_codevibe_core6.digestOf)(inputIdentity) } : {}
     });
   }
   async flush() {
@@ -5332,7 +6070,7 @@ var AgyToolActivityIntegration = class {
       if (!session || session.sessionId !== sessionId) {
         throw terminalSessionError(sessionId);
       }
-      const encrypted = (0, import_codevibe_core5.encryptForEmit)(
+      const encrypted = (0, import_codevibe_core6.encryptForEmit)(
         override?.sessionKey ?? session.sessionKey ?? null,
         session.sessionIsEncrypted ?? false,
         TOOL_ACTIVITY_CONTENT,
@@ -5344,8 +6082,8 @@ var AgyToolActivityIntegration = class {
       const sessionKeyGen = override?.sessionKeyGen ?? session.sessionKeyGen;
       const input = {
         sessionId,
-        type: import_codevibe_core5.EventType.TOOL_ACTIVITY,
-        source: import_codevibe_core5.EventSource.DESKTOP,
+        type: import_codevibe_core6.EventType.TOOL_ACTIVITY,
+        source: import_codevibe_core6.EventSource.DESKTOP,
         content: encrypted.content,
         metadata: encrypted.metadata,
         timestamp: envelope.windowStart,
@@ -5360,10 +6098,10 @@ var AgyToolActivityIntegration = class {
         try {
           await sendOnce(sessionId, envelope);
         } catch (error) {
-          if ((0, import_codevibe_core5.isTerminalSessionError)(error)) {
+          if ((0, import_codevibe_core6.isTerminalSessionError)(error)) {
             throw new Error(`[tool-activity] Agy session ${sessionId} retired; awaiting replacement`);
           }
-          if ((0, import_codevibe_core5.isSessionKeyStaleError)(error) && this.deps.refreshSessionKey) {
+          if ((0, import_codevibe_core6.isSessionKeyStaleError)(error) && this.deps.refreshSessionKey) {
             const refreshed = await this.deps.refreshSessionKey(sessionId);
             if (refreshed) {
               await sendOnce(sessionId, envelope, refreshed);
@@ -5472,7 +6210,7 @@ var McpServer = class _McpServer {
      *  under this single sessionId. /resume does NOT create a new
      *  session — same row. */
     this.session = null;
-    this.promptPublications = new import_codevibe_core6.PromptPublicationTracker();
+    this.promptPublications = new import_codevibe_core7.PromptPublicationTracker();
     this.transcriptHandlers = /* @__PURE__ */ new Set();
     this.nativeSourceSelection = null;
     this.nativeSources = /* @__PURE__ */ new Map();
@@ -5636,7 +6374,7 @@ var McpServer = class _McpServer {
     this.wrapperPid = options.wrapperPid ?? null;
     this.cliLogPath = options.cliLogPath ?? null;
     this.launchSettleTimeoutMs = options.launchSettleTimeoutMs ?? LAUNCH_SETTLE_TIMEOUT_MS;
-    this.appSyncClient = options.appSyncClient ?? new import_codevibe_core6.AppSyncClient();
+    this.appSyncClient = options.appSyncClient ?? new import_codevibe_core7.AppSyncClient();
     this.toolActivity = options.toolActivityIntegration === void 0 ? new AgyToolActivityIntegration({
       logger,
       selectTransport: async (sessionId, legacyTransport) => {
@@ -5669,7 +6407,7 @@ var McpServer = class _McpServer {
     this.approvalDetector = options.approvalDetector ?? new ApprovalDetector(options.detectorOptions);
     this.paneObserver = options.paneObserver ?? new TmuxPaneObserver();
     this.transcriptTailer = options.transcriptTailer ?? new TranscriptTailer({ admission: {
-      restore: (source, initial) => this.restoreNativeSource(source, initial),
+      restore: (source, initial, validateInitial) => this.restoreNativeSource(source, initial, validateInitial),
       admit: (emit, source) => this.admitNativeSource(emit, source),
       skip: (gap, source) => this.skipNativeSource(gap, source)
     } });
@@ -5714,6 +6452,7 @@ var McpServer = class _McpServer {
   // ─── Lifecycle ──────────────────────────────────────────────────────────
   async start() {
     if (this.started) throw new Error("McpServer.start() called twice");
+    this.transcriptTailer.captureLaunchBaselines();
     this.stopPromise = null;
     this.stopTmuxLifecycleMonitor();
     this.tmuxLifecycleObservedAlive = false;
@@ -5725,7 +6464,7 @@ var McpServer = class _McpServer {
     const authed = await this.appSyncClient.authenticateWithStoredTokens();
     if (!authed) {
       const kind = this.appSyncClient.getLastAuthFailureKind();
-      const failure = (0, import_codevibe_core6.describeStoredAuthFailure)(
+      const failure = (0, import_codevibe_core7.describeStoredAuthFailure)(
         kind,
         this.appSyncClient.getLastAuthFailureDetail()
       );
@@ -5752,6 +6491,8 @@ var McpServer = class _McpServer {
         () => reject(new Error("status read timed out")),
         { once: true }
       ));
+      timeout.catch(() => {
+      });
       const subscription = await Promise.race([this.appSyncClient.getSubscriptionStatus(signal), timeout]);
       if (this.appSyncClient.getCurrentUserId() !== statusUserId) throw new Error("account changed during read");
       const sync = await Promise.race([this.appSyncClient.getCompanionSyncState(signal), timeout]);
@@ -5767,9 +6508,9 @@ var McpServer = class _McpServer {
       logger.warn("Standalone Companion sync status unavailable; cloud admission remains authoritative");
     }
     if (!this.started) return { httpPort: 0 };
-    await (0, import_codevibe_core6.registerDeviceEncryptionKey)(this.appSyncClient, logger);
+    await (0, import_codevibe_core7.registerDeviceEncryptionKey)(this.appSyncClient, logger);
     if (!this.started) return { httpPort: 0 };
-    (0, import_codevibe_core6.startDeviceKeyWatcher)(this.appSyncClient, logger);
+    (0, import_codevibe_core7.startDeviceKeyWatcher)(this.appSyncClient, logger);
     try {
       const swept = await this.appSyncClient.sweepOrphanSessions({
         agentType: "ANTIGRAVITY",
@@ -5842,7 +6583,10 @@ var McpServer = class _McpServer {
   }
   async stop() {
     if (this.stopPromise) return this.stopPromise;
-    if (!this.started) return;
+    if (!this.started) {
+      await this.transcriptTailer.stop();
+      return;
+    }
     this.stopPromise = this.doStop();
     try {
       await this.stopPromise;
@@ -6015,7 +6759,10 @@ var McpServer = class _McpServer {
       try {
         const retired = await this.appSyncClient.updateSession({ sessionId, status: "INACTIVE" });
         if (quiescentSession && retired?.sessionGenerationId) {
-          await this.appSyncClient.completeDesktopSyncRetirement({ sessionId }, retired, async () => {
+          await this.appSyncClient.completeDesktopSyncRetirement({
+            sessionId,
+            toolOutbox: new import_codevibe_core7.ToolActivityOutbox({ agent: "agy", logger })
+          }, retired, async () => {
             await Promise.allSettled([...this.transcriptHandlers]);
             await this.nativeAdmissionChain;
             await this.stopNativeSources(quiescentSession);
@@ -6064,7 +6811,7 @@ var McpServer = class _McpServer {
     let sessionKey = null;
     let sessionKeyGen = null;
     try {
-      const result = await (0, import_codevibe_core6.resumeOrCreateSession)(
+      const result = await (0, import_codevibe_core7.resumeOrCreateSession)(
         {
           sessionId,
           userId,
@@ -6152,7 +6899,7 @@ var McpServer = class _McpServer {
         (evt) => {
           return this.handleMobileEvent(evt).catch((err) => {
             logger.error("handleMobileEvent failed", { error: String(err) });
-            if ((0, import_codevibe_core6.requiresSyncInputDeliveryReceipt)(evt)) throw err;
+            if ((0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) throw err;
           });
         },
         (err) => logger.warn("AppSync subscription error", { error: String(err) }),
@@ -6428,11 +7175,11 @@ var McpServer = class _McpServer {
       this.approvalDetector.registerPendingCall(reg);
     }
     for (const [index, input] of mapped.events.entries()) {
-      if (input.type === import_codevibe_core6.EventType.USER_PROMPT || input.type === import_codevibe_core6.EventType.ASSISTANT_RESPONSE || input.type === import_codevibe_core6.EventType.NOTIFICATION) {
+      if (input.type === import_codevibe_core7.EventType.USER_PROMPT || input.type === import_codevibe_core7.EventType.ASSISTANT_RESPONSE || input.type === import_codevibe_core7.EventType.NOTIFICATION) {
         if (admission) await this.toolActivity.flush();
         else await this.flushToolActivityAtBoundary(input.type);
       }
-      if (input.type === import_codevibe_core6.EventType.TOOL_USE && typeof input.metadata === "object" && input.metadata) {
+      if (input.type === import_codevibe_core7.EventType.TOOL_USE && typeof input.metadata === "object" && input.metadata) {
         const meta = input.metadata;
         const resultStep = typeof meta.step_index === "number" ? meta.step_index : void 0;
         const agyType = typeof meta.agy_type === "string" ? meta.agy_type : void 0;
@@ -6459,7 +7206,7 @@ var McpServer = class _McpServer {
           }
         }
       }
-      if (input.type === import_codevibe_core6.EventType.USER_PROMPT && input.source === import_codevibe_core6.EventSource.DESKTOP) {
+      if (input.type === import_codevibe_core7.EventType.USER_PROMPT && input.source === import_codevibe_core7.EventSource.DESKTOP) {
         const inputObservedAtMs = this.transcriptObservedAt.get(emit);
         const clearedPromptIds = this.approvalDetector.onPanePromptCleared(inputObservedAtMs);
         await this.resolveAcceptedInputPrompts(session, clearedPromptIds, inputObservedAtMs);
@@ -6549,10 +7296,10 @@ var McpServer = class _McpServer {
     this.nativeSources.set(key, owner);
     return owner;
   }
-  async restoreNativeSource(source, initial) {
+  async restoreNativeSource(source, initial, validateInitial) {
     const owner = await this.nativeOwner(source);
     if (!owner) return null;
-    const position = await owner.cursor.open(initial);
+    const position = await owner.cursor.open(initial, validateInitial);
     this.assertNativeOwner(owner);
     await owner.selection.writer.mobileEchoes("agy").reconcile(owner.streamSha256, position.byteOffset);
     this.drainNativeSource(owner);
@@ -6583,7 +7330,7 @@ var McpServer = class _McpServer {
       const echoes = owner.selection.writer.mobileEchoes("agy");
       for (let index = 0; index < admission.outputs.length; index++) {
         const input = admission.outputs[index];
-        if (input?.type === import_codevibe_core6.EventType.USER_PROMPT && await echoes.claim(echoFrame, input.content, emit.event.created_at)) admission.outputs[index] = null;
+        if (input?.type === import_codevibe_core7.EventType.USER_PROMPT && await echoes.claim(echoFrame, input.content, emit.event.created_at)) admission.outputs[index] = null;
       }
       const factory = (index) => {
         const input = admission.outputs[index];
@@ -6675,18 +7422,18 @@ var McpServer = class _McpServer {
     const expectedSession = this.session;
     try {
       const session = await this.appSyncClient.getSession(sessionId);
-      if (session?.status === import_codevibe_core6.SessionStatus.INACTIVE) {
+      if (session?.status === import_codevibe_core7.SessionStatus.INACTIVE) {
         const terminal = new Error(`Antigravity session is no longer active: ${sessionId}`);
         terminal.errorType = "SessionTerminal";
         throw terminal;
       }
-      if (!session || session.status !== import_codevibe_core6.SessionStatus.ACTIVE || !session.isEncrypted) {
+      if (!session || session.status !== import_codevibe_core7.SessionStatus.ACTIVE || !session.isEncrypted) {
         return null;
       }
       const sessionKeyGen = session.sessionKeyGen ?? null;
       const encryptedKeys = session.encryptedKeys ?? [];
       if (encryptedKeys.length === 0) return null;
-      const sessionKey = await import_codevibe_core6.keychainManager.getSessionKey(
+      const sessionKey = await import_codevibe_core7.keychainManager.getSessionKey(
         sessionId,
         encryptedKeys,
         sessionKeyGen
@@ -6699,7 +7446,7 @@ var McpServer = class _McpServer {
       liveSession.sessionIsEncrypted = true;
       return { sessionKey, sessionKeyGen };
     } catch (error) {
-      if ((0, import_codevibe_core6.isTerminalSessionError)(error)) throw error;
+      if ((0, import_codevibe_core7.isTerminalSessionError)(error)) throw error;
       logger.warn("[tool-activity] Agy session-key refresh failed; window remains retryable", {
         sessionId,
         error: String(error)
@@ -6719,7 +7466,7 @@ var McpServer = class _McpServer {
    * an encrypted keyless one (drop).
    */
   encryptOutbound(session, input) {
-    const enc = (0, import_codevibe_core6.encryptForEmit)(
+    const enc = (0, import_codevibe_core7.encryptForEmit)(
       session.sessionKey ?? null,
       session.sessionIsEncrypted ?? false,
       input.content,
@@ -6749,7 +7496,7 @@ var McpServer = class _McpServer {
     const promptId = input.producerKind === "PLUGIN_APPROVAL" ? input.promptId : void 0;
     const promptEntry = promptId ? this.e1PromptRaises.get(promptId) : void 0;
     const sendOnce = async () => {
-      if (promptId && !(0, import_codevibe_core6.isOpenPromptRaise)(
+      if (promptId && !(0, import_codevibe_core7.isOpenPromptRaise)(
         promptEntry,
         this.e1PromptRaises.get(promptId),
         this.e1NeedsResolution.has(promptId)
@@ -6762,7 +7509,7 @@ var McpServer = class _McpServer {
     try {
       return await sendOnce();
     } catch (error) {
-      if (!(0, import_codevibe_core6.isSessionKeyStaleError)(error)) throw error;
+      if (!(0, import_codevibe_core7.isSessionKeyStaleError)(error)) throw error;
       const refreshed = await this.refreshToolActivitySessionKey(session.sessionId);
       if (!refreshed) throw error;
       return sendOnce();
@@ -6783,7 +7530,7 @@ var McpServer = class _McpServer {
    * NOTIFICATION carrier, no fabricated options).
    */
   newE1Raise(sessionId, mobileActionable, title) {
-    const { record } = (0, import_codevibe_core6.newPromptRaise)({
+    const { record } = (0, import_codevibe_core7.newPromptRaise)({
       sessionId,
       producerKind: "PLUGIN_APPROVAL",
       mobileActionable,
@@ -6883,26 +7630,26 @@ var McpServer = class _McpServer {
     const bannerText = customBannerText || "\u26A0\uFE0F A prompt is waiting in your desktop terminal, but its options could not be shown here. Please answer it on your desktop.";
     const input = {
       sessionId: session.sessionId,
-      type: import_codevibe_core6.EventType.NOTIFICATION,
-      source: import_codevibe_core6.EventSource.DESKTOP,
+      type: import_codevibe_core7.EventType.NOTIFICATION,
+      source: import_codevibe_core7.EventSource.DESKTOP,
       content: bannerText,
       metadata: {
         e1SuppressedPrompt: true
       },
-      ...(0, import_codevibe_core6.raiseFieldsFromRecord)(record),
+      ...(0, import_codevibe_core7.raiseFieldsFromRecord)(record),
       notificationText: bannerText,
-      timestamp: (0, import_codevibe_core6.prepareEventTimestamp)({ orderingKey: session.sessionId })
+      timestamp: (0, import_codevibe_core7.prepareEventTimestamp)({ orderingKey: session.sessionId })
     };
-    await this.flushToolActivityAtBoundary(import_codevibe_core6.EventType.NOTIFICATION);
+    await this.flushToolActivityAtBoundary(import_codevibe_core7.EventType.NOTIFICATION);
     return this.publishE1Prompt(session, input, reRaiseToken);
   }
   async publishE1Prompt(session, input, reRaiseToken) {
     const promptId = input.promptId, entry = promptId ? this.e1PromptRaises.get(promptId) : void 0;
-    if (!promptId || !(0, import_codevibe_core6.isOpenPromptRaise)(entry, this.e1PromptRaises.get(promptId), this.e1NeedsResolution.has(promptId))) return "CLOSED";
+    if (!promptId || !(0, import_codevibe_core7.isOpenPromptRaise)(entry, this.e1PromptRaises.get(promptId), this.e1NeedsResolution.has(promptId))) return "CLOSED";
     if (!this.started || this.session !== session || input.sessionId !== session.sessionId) return "RETRY";
     const { notificationText: _legacyHint, ...plain } = input;
     const settle = (disposition) => {
-      if ((0, import_codevibe_core6.isOpenPromptRaise)(entry, this.e1PromptRaises.get(promptId), this.e1NeedsResolution.has(promptId))) {
+      if ((0, import_codevibe_core7.isOpenPromptRaise)(entry, this.e1PromptRaises.get(promptId), this.e1NeedsResolution.has(promptId))) {
         if (disposition === "RETRY") this.e1NeedsReRaise.add(promptId);
         else if (disposition === "RERAISED" || disposition === "OMITTED") this.e1NeedsReRaise.delete(promptId);
       }
@@ -7077,7 +7824,7 @@ var McpServer = class _McpServer {
   async reRaiseOneE1(session, entry, opts) {
     const rec = entry.record;
     if (this.e1NeedsResolution.has(rec.promptId)) return "CLOSED";
-    if (!(0, import_codevibe_core6.canRecoverPromptRaise)(entry, this.promptPublications.isPublishing(rec.promptId))) {
+    if (!(0, import_codevibe_core7.canRecoverPromptRaise)(entry, this.promptPublications.isPublishing(rec.promptId))) {
       return "RETRY";
     }
     const actionable = rec.mobileActionable && entry.contentPlain !== void 0;
@@ -7085,7 +7832,7 @@ var McpServer = class _McpServer {
     const gen = opts?.gen;
     const MAX_ATTEMPTS = 4;
     for (let attempt = 1; ; attempt++) {
-      if (!(0, import_codevibe_core6.isOpenPromptRaise)(
+      if (!(0, import_codevibe_core7.isOpenPromptRaise)(
         entry,
         this.e1PromptRaises.get(rec.promptId),
         this.e1NeedsResolution.has(rec.promptId)
@@ -7103,15 +7850,15 @@ var McpServer = class _McpServer {
         if (actionable) {
           const input = {
             sessionId: session.sessionId,
-            type: import_codevibe_core6.EventType.INTERACTIVE_PROMPT,
-            source: import_codevibe_core6.EventSource.DESKTOP,
+            type: import_codevibe_core7.EventType.INTERACTIVE_PROMPT,
+            source: import_codevibe_core7.EventSource.DESKTOP,
             content: entry.contentPlain,
             metadata: entry.metadataPlain ?? {},
-            ...(0, import_codevibe_core6.raiseFieldsFromRecord)(rec),
-            timestamp: (0, import_codevibe_core6.prepareEventTimestamp)({ orderingKey: session.sessionId })
+            ...(0, import_codevibe_core7.raiseFieldsFromRecord)(rec),
+            timestamp: (0, import_codevibe_core7.prepareEventTimestamp)({ orderingKey: session.sessionId })
           };
-          await this.flushToolActivityAtBoundary(import_codevibe_core6.EventType.INTERACTIVE_PROMPT);
-          if (!(0, import_codevibe_core6.isOpenPromptRaise)(
+          await this.flushToolActivityAtBoundary(import_codevibe_core7.EventType.INTERACTIVE_PROMPT);
+          if (!(0, import_codevibe_core7.isOpenPromptRaise)(
             entry,
             this.e1PromptRaises.get(rec.promptId),
             this.e1NeedsResolution.has(rec.promptId)
@@ -7191,7 +7938,7 @@ var McpServer = class _McpServer {
     const session = this.session;
     if (!session) return;
     const sid = session.sessionId;
-    const promptIds = [...this.e1PromptRaises.values()].filter((e) => e.record.sessionId === sid && !this.e1NeedsResolution.has(e.record.promptId) && (0, import_codevibe_core6.canRecoverPromptRaise)(e, this.promptPublications.isPublishing(e.record.promptId))).map((e) => e.record.promptId);
+    const promptIds = [...this.e1PromptRaises.values()].filter((e) => e.record.sessionId === sid && !this.e1NeedsResolution.has(e.record.promptId) && (0, import_codevibe_core7.canRecoverPromptRaise)(e, this.promptPublications.isPublishing(e.record.promptId))).map((e) => e.record.promptId);
     if (promptIds.length === 0) return;
     try {
       await this.appSyncClient.refreshSessionOpenPromptTtl({ sessionId: sid, promptIds }, async (promptId, reRaiseToken) => {
@@ -7268,6 +8015,7 @@ var McpServer = class _McpServer {
           error: String(error)
         });
       }
+      this.transcriptTailer.refreshNativeOwnerBoundary();
       this.session = null;
       await this.ensureLaunchSession();
       if (this.session) await this.drainE1RetirementPark();
@@ -7302,10 +8050,10 @@ var McpServer = class _McpServer {
     }
     const result = { ...evt };
     try {
-      result.content = import_codevibe_core6.cryptoService.decryptContent(evt.content, session.sessionKey);
+      result.content = import_codevibe_core7.cryptoService.decryptContent(evt.content, session.sessionKey);
       const rawMeta = parseMaybeJson(evt.metadata);
       if (rawMeta && typeof rawMeta === "object" && typeof rawMeta.encrypted === "string") {
-        const decryptedMeta = import_codevibe_core6.cryptoService.decryptMetadata(
+        const decryptedMeta = import_codevibe_core7.cryptoService.decryptMetadata(
           rawMeta.encrypted,
           session.sessionKey
         );
@@ -7351,7 +8099,8 @@ var McpServer = class _McpServer {
       this.raiseSuppressedBadge(session, cand.snapshotHash);
       return;
     }
-    const e1rec = this.newE1Raise(session.sessionId, true);
+    const isActionable = Object.keys(parsed.submitMap || {}).length > 0;
+    const e1rec = this.newE1Raise(session.sessionId, isActionable);
     const emitted = this.approvalDetector.emitPaneOnlyPrompt(parsed, activeConvId, e1rec.promptId);
     if (emitted) {
       if (cand.snapshotHash) {
@@ -7400,10 +8149,11 @@ var McpServer = class _McpServer {
       });
       return;
     }
+    const isDisplayOnly = Object.keys(state.submitMap || {}).length === 0;
     const e1existing = this.e1PromptRaises.get(state.promptId);
-    const e1rec = e1existing ? e1existing.record : this.newE1Raise(session.sessionId, true);
+    const e1rec = e1existing ? e1existing.record : this.newE1Raise(session.sessionId, !isDisplayOnly);
     if (!e1existing) state.promptId = e1rec.promptId;
-    const optionsArr = state.paneOptions ? state.paneOptions.map((o) => ({ number: o.number, text: o.text })) : Object.keys(state.submitMap).map((n) => ({ number: n }));
+    const optionsArr = isDisplayOnly ? [] : state.paneOptions ? state.paneOptions.map((o) => ({ number: o.number, text: o.text })) : Object.keys(state.submitMap).map((n) => ({ number: n }));
     const diffParsed = parseFencedDiffFromBody(
       state.body,
       state.paneDisplayHeader
@@ -7438,25 +8188,25 @@ var McpServer = class _McpServer {
     const content = state.paneDisplayHeader || state.matchedPaneHeader || state.pendingCall?.command || state.pendingCall?.filePath || "approval requested";
     const input = {
       sessionId: session.sessionId,
-      type: import_codevibe_core6.EventType.INTERACTIVE_PROMPT,
-      source: import_codevibe_core6.EventSource.DESKTOP,
+      type: import_codevibe_core7.EventType.INTERACTIVE_PROMPT,
+      source: import_codevibe_core7.EventSource.DESKTOP,
       content,
       metadata: optionsForMobile,
       // E1 (§4) — raise identity top-level: promptId + ownerToken/producerKind/
       // mobileActionable (the backend's classifyRaise upserts the open-prompt row).
-      ...(0, import_codevibe_core6.raiseFieldsFromRecord)(e1rec),
+      ...(0, import_codevibe_core7.raiseFieldsFromRecord)(e1rec),
       // Per-conversation monotonic timestamp (event-timestamp-ordering fix
       // v5.4, 2026-05-24). orderingKey scopes the counter to this conv so
       // INTERACTIVE_PROMPT can't be forced to lastMs+1 by a newer event
       // from a sibling conversation under v9's multi-conv-per-session
       // model.
-      timestamp: (0, import_codevibe_core6.prepareEventTimestamp)({
+      timestamp: (0, import_codevibe_core7.prepareEventTimestamp)({
         orderingKey: `${session.sessionId}:${state.conversationId}`
       })
     };
     try {
       this.stashE1RaiseContent(e1rec.promptId, content, optionsForMobile);
-      await this.flushToolActivityAtBoundary(import_codevibe_core6.EventType.INTERACTIVE_PROMPT);
+      await this.flushToolActivityAtBoundary(import_codevibe_core7.EventType.INTERACTIVE_PROMPT);
       if (this.e1NeedsResolution.has(e1rec.promptId) || this.e1PromptRaises.get(e1rec.promptId)?.record !== e1rec) return;
       await this.publishE1Prompt(session, input);
     } catch (err) {
@@ -7504,7 +8254,7 @@ var McpServer = class _McpServer {
       if (shouldDecrypt && sessionKey) {
         try {
           logger.info("Decrypting attachment", { id: attachment.id });
-          buffer = import_codevibe_core6.cryptoService.decryptData(buffer, sessionKey);
+          buffer = import_codevibe_core7.cryptoService.decryptData(buffer, sessionKey);
           logger.info("Attachment decrypted successfully", {
             id: attachment.id,
             decryptedSize: buffer.length
@@ -7560,7 +8310,7 @@ var McpServer = class _McpServer {
     await this.ensureLaunchSession();
     if (!this.session) return;
     const session = this.session;
-    if (evt.source !== import_codevibe_core6.EventSource.MOBILE) return;
+    if (evt.source !== import_codevibe_core7.EventSource.MOBILE) return;
     if (evt.sessionId !== session.sessionId) {
       logger.warn("Dropping mobile event with mismatched sessionId", {
         expected: session.sessionId,
@@ -7572,19 +8322,19 @@ var McpServer = class _McpServer {
     try {
       decrypted = this.decryptInbound(session, evt);
     } catch (error) {
-      if ((0, import_codevibe_core6.requiresSyncInputDeliveryReceipt)(evt)) throw error;
+      if ((0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) throw error;
       return;
     }
     evt = decrypted;
     if (!await this.markDelivered(evt)) return;
-    if (evt.type === import_codevibe_core6.EventType.USER_PROMPT || evt.type === import_codevibe_core6.EventType.PROMPT_RESPONSE) {
+    if (evt.type === import_codevibe_core7.EventType.USER_PROMPT || evt.type === import_codevibe_core7.EventType.PROMPT_RESPONSE) {
       const mobileFloorMs = Date.parse(evt.timestamp);
       this.mobilePromptFloorBySession.set(session.sessionId, {
         floorMs: Number.isNaN(mobileFloorMs) ? Date.now() : mobileFloorMs,
         setAtWallMs: Date.now()
       });
     }
-    if (evt.type === import_codevibe_core6.EventType.USER_PROMPT || evt.type === import_codevibe_core6.EventType.PROMPT_RESPONSE) {
+    if (evt.type === import_codevibe_core7.EventType.USER_PROMPT || evt.type === import_codevibe_core7.EventType.PROMPT_RESPONSE) {
       let promptContent = evt.content;
       const attachments = evt.attachments ?? [];
       if (attachments.length > 0) {
@@ -7625,16 +8375,16 @@ var McpServer = class _McpServer {
       const rawMeta = parseMaybeJson(evt.metadata);
       const meta = rawMeta && typeof rawMeta === "object" ? rawMeta : {};
       const evtAny = evt;
-      const responsePromptId = evt.type === import_codevibe_core6.EventType.PROMPT_RESPONSE ? typeof meta.promptId === "string" && meta.promptId || typeof meta.prompt_id === "string" && meta.prompt_id || typeof evtAny.promptId === "string" && evtAny.promptId || typeof evtAny.prompt_id === "string" && evtAny.prompt_id || null : null;
+      const responsePromptId = evt.type === import_codevibe_core7.EventType.PROMPT_RESPONSE ? typeof meta.promptId === "string" && meta.promptId || typeof meta.prompt_id === "string" && meta.prompt_id || typeof evtAny.promptId === "string" && evtAny.promptId || typeof evtAny.prompt_id === "string" && evtAny.prompt_id || null : null;
       const advertisedOptionNumbers = Array.from(new Set(
         pendingPrompts.flatMap((prompt) => Object.keys(prompt.submitMap))
       ));
-      const intent = (0, import_codevibe_core6.classifyMobilePromptInput)(
+      const intent = (0, import_codevibe_core7.classifyMobilePromptInput)(
         promptContent,
         advertisedOptionNumbers
       );
       if (intent.kind === "option") {
-        const activePrompt = evt.type === import_codevibe_core6.EventType.PROMPT_RESPONSE ? pendingPrompts.find((prompt) => prompt.promptId === responsePromptId) ?? null : pendingPrompts.length === 1 ? pendingPrompts[0] : null;
+        const activePrompt = evt.type === import_codevibe_core7.EventType.PROMPT_RESPONSE ? pendingPrompts.find((prompt) => prompt.promptId === responsePromptId) ?? null : pendingPrompts.length === 1 ? pendingPrompts[0] : null;
         if (!activePrompt || !Object.prototype.hasOwnProperty.call(activePrompt.submitMap, intent.option)) {
           logger.warn("Numeric input does not identify one current advertised prompt; dropping", {
             sessionId: session.sessionId,
@@ -7644,7 +8394,7 @@ var McpServer = class _McpServer {
           });
           return;
         }
-        if (evt.type === import_codevibe_core6.EventType.PROMPT_RESPONSE) {
+        if (evt.type === import_codevibe_core7.EventType.PROMPT_RESPONSE) {
           if (responsePromptId !== activePrompt.promptId) {
             logger.warn("PROMPT_RESPONSE does not identify the current advertised prompt; dropping", {
               sessionId: session.sessionId,
@@ -7660,7 +8410,7 @@ var McpServer = class _McpServer {
           intent.option
         );
         if (!optionResult.ok) {
-          if (!(0, import_codevibe_core6.requiresSyncInputDeliveryReceipt)(evt)) this.mobileDeduper.forget(session.sessionId, intent.option);
+          if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) this.mobileDeduper.forget(session.sessionId, intent.option);
           return;
         }
         await this.resolveE1PluginApproval(session.sessionId, activePrompt.promptId);
@@ -7671,6 +8421,49 @@ var McpServer = class _McpServer {
         promptContent = intent.followUpText;
         await new Promise((resolve2) => setTimeout(resolve2, 250));
       } else {
+        const hasDisplayOnlyPrompt = pendingPrompts.some(
+          (p) => Object.keys(p.submitMap || {}).length === 0
+        );
+        let livePaneDisplayOnly = false;
+        let livePaneBlockedReason = null;
+        if (!hasDisplayOnlyPrompt && this.paneObserver) {
+          try {
+            const probe = await this.paneObserver.probeApprovalUIActive();
+            if (!probe.probeSucceeded) {
+              livePaneBlockedReason = "Live terminal state could not be verified safely. Please interact directly in your terminal.";
+            } else if (probe.ambiguous) {
+              livePaneBlockedReason = "An ambiguous prompt is active in your terminal. Please interact directly in your terminal.";
+            } else if (probe.active && probe.kind === "question") {
+              let isActionableWizard = false;
+              try {
+                const liveSnapshot = await this.paneObserver.captureSnapshot();
+                if (liveSnapshot) {
+                  const parsed = parseApprovalSnapshot(liveSnapshot);
+                  if (parsed && parsed.kind === "question" && Object.keys(parsed.submitMap || {}).length > 0) {
+                    isActionableWizard = true;
+                  }
+                }
+              } catch {
+              }
+              if (!isActionableWizard) {
+                livePaneDisplayOnly = true;
+              }
+            }
+          } catch {
+            livePaneBlockedReason = "Live terminal state could not be verified safely. Please interact directly in your terminal.";
+          }
+        }
+        if (livePaneBlockedReason) {
+          await this.emitPromptSafetyNotification(session, livePaneBlockedReason);
+          return;
+        }
+        if (hasDisplayOnlyPrompt || livePaneDisplayOnly) {
+          await this.emitPromptSafetyNotification(
+            session,
+            "The active terminal question prompt is display-only on mobile. Please select an option directly in your terminal."
+          );
+          return;
+        }
         const dismissal = await this.promptResponder.dismissActivePrompt();
         if (!dismissal.ok) {
           await this.emitPromptSafetyNotification(
@@ -7687,7 +8480,7 @@ var McpServer = class _McpServer {
         () => this.trackDurableMobileEcho(session, evt, promptContent, "free_form")
       );
       if (!result.ok) {
-        if (!(0, import_codevibe_core6.requiresSyncInputDeliveryReceipt)(evt)) this.mobileDeduper.forget(session.sessionId, promptContent);
+        if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) this.mobileDeduper.forget(session.sessionId, promptContent);
         logger.warn("sendFreeForm failed", { reason: result.reason, details: result.details });
         return;
       }
@@ -7696,7 +8489,7 @@ var McpServer = class _McpServer {
     }
   }
   async trackDurableMobileEcho(session, event, content, lane) {
-    if (!(0, import_codevibe_core6.requiresSyncInputDeliveryReceipt)(event)) {
+    if (!(0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(event)) {
       this.mobileDeduper.track(session.sessionId, content);
       return;
     }
@@ -7712,13 +8505,13 @@ var McpServer = class _McpServer {
   async emitPromptSafetyNotification(session, content) {
     const input = {
       sessionId: session.sessionId,
-      type: import_codevibe_core6.EventType.NOTIFICATION,
-      source: import_codevibe_core6.EventSource.DESKTOP,
+      type: import_codevibe_core7.EventType.NOTIFICATION,
+      source: import_codevibe_core7.EventSource.DESKTOP,
       content,
       metadata: { promptSafetyBlocked: true },
-      timestamp: (0, import_codevibe_core6.prepareEventTimestamp)({ orderingKey: session.sessionId })
+      timestamp: (0, import_codevibe_core7.prepareEventTimestamp)({ orderingKey: session.sessionId })
     };
-    await this.flushToolActivityAtBoundary(import_codevibe_core6.EventType.NOTIFICATION);
+    await this.flushToolActivityAtBoundary(import_codevibe_core7.EventType.NOTIFICATION);
     try {
       if (!this.started || this.sessionDisabled || this.session !== session) return;
       const result = await this.appSyncClient.publishCompanionNotice(
@@ -7740,14 +8533,14 @@ var McpServer = class _McpServer {
    */
   async markDelivered(evt) {
     try {
-      return await (0, import_codevibe_core6.acknowledgeMobileInputDelivery)(this.appSyncClient.updateEventStatus.bind(this.appSyncClient), evt);
+      return await (0, import_codevibe_core7.acknowledgeMobileInputDelivery)(this.appSyncClient.updateEventStatus.bind(this.appSyncClient), evt);
     } catch (err) {
       logger.warn("updateEventStatus(DELIVERED) failed", {
         eventId: evt.eventId,
         sessionId: evt.sessionId,
         error: String(err)
       });
-      if ((0, import_codevibe_core6.requiresSyncInputDeliveryReceipt)(evt)) throw err;
+      if ((0, import_codevibe_core7.requiresSyncInputDeliveryReceipt)(evt)) throw err;
       return true;
     }
   }
@@ -7761,7 +8554,7 @@ var McpServer = class _McpServer {
    */
   async markExecuted(evt) {
     try {
-      await (0, import_codevibe_core6.acknowledgeMobileInputExecution)(this.appSyncClient.updateEventStatus.bind(this.appSyncClient), evt);
+      await (0, import_codevibe_core7.acknowledgeMobileInputExecution)(this.appSyncClient.updateEventStatus.bind(this.appSyncClient), evt);
     } catch (err) {
       logger.warn("updateEventStatus(EXECUTED) failed", {
         eventId: evt.eventId,
@@ -7792,7 +8585,7 @@ var McpServer = class _McpServer {
       // orderingKey is session-scoped. Slightly coarser than the
       // per-conv key used by transcript emits, but acceptable because
       // hook-script pushes are off the hot transcript path.
-      timestamp: (0, import_codevibe_core6.prepareEventTimestamp)({ orderingKey: payload.sessionId })
+      timestamp: (0, import_codevibe_core7.prepareEventTimestamp)({ orderingKey: payload.sessionId })
     };
     return this.appSyncClient.publishCompanionEvent(input, async () => {
       assertOwner();
@@ -8166,7 +8959,7 @@ async function main() {
     tmuxTarget: process.env.CODEVIBE_AGY_TMUX_TARGET ?? void 0,
     wrapperPid: process.env.CODEVIBE_AGY_WRAPPER_PID ? parseInt(process.env.CODEVIBE_AGY_WRAPPER_PID, 10) : void 0
   });
-  (0, import_codevibe_core6.installDaemonProcessGuards)(logger, {
+  (0, import_codevibe_core7.installDaemonProcessGuards)(logger, {
     onFatal: () => {
       void server.stop().finally(() => process.exit(1));
     }
@@ -8299,16 +9092,19 @@ var __testing = {
   SessionNotFoundError,
   StoredAuthFailureError,
   TERMINAL_SHUTDOWN_SIGNALS,
+  TmuxPaneObserver,
   __testing,
   classifyEntrypoint,
   classifyTmuxHasSessionError,
   commandDigest,
   detectActivePromptKind,
+  extractFileAccessPrompt,
   extractSystemErrorPrompt,
   generateLaunchSessionId,
   getActiveConversationFromCliLog,
   isAgyStatusFooterLine,
   isComposedStatusFooter,
+  isPaneInputSafetyBlocked,
   isSystemErrorActiveFromIndex,
   looksLikePromptSnapshot,
   parseApprovalSnapshot,