@quantiya/codevibe-antigravity-plugin 2.0.100 → 2.0.102

package/dist/agy-hook.js

@@ -77,6 +77,7 @@ var FORWARDED_TOOL_ARG_KEYS = [
   "CommandLine",
   "Command",
   "command",
+  "Path",
   "AbsolutePath",
   "TargetFile",
   "FilePath",

package/dist/server.js

@@ -43,6 +43,7 @@ __export(server_exports, {
   commandDigest: () => commandDigest,
   detectActivePromptKind: () => detectActivePromptKind,
   extractFileAccessPrompt: () => extractFileAccessPrompt,
+  extractFileEditPrompt: () => extractFileEditPrompt,
   extractSystemErrorPrompt: () => extractSystemErrorPrompt,
   generateLaunchSessionId: () => generateLaunchSessionId,
   getActiveConversationFromCliLog: () => getActiveConversationFromCliLog,
@@ -57,7 +58,8 @@ __export(server_exports, {
   readTranscriptFirstType: () => readTranscriptFirstType,
   reconstructFooter: () => reconstructFooter,
   runForeignSpawnIdle: () => runForeignSpawnIdle,
-  safeIsoTimestamp: () => safeIsoTimestamp
+  safeIsoTimestamp: () => safeIsoTimestamp,
+  stripAnsiAndExpandRep: () => stripAnsiAndExpandRep
 });
 module.exports = __toCommonJS(server_exports);
 var crypto3 = __toESM(require("crypto"));
@@ -2326,6 +2328,7 @@ function inspectHookRegistration(paths) {
 // src/tool-prompt-match.ts
 var TOOL_COMMAND_KEYS = ["CommandLine", "Command", "command"];
 var TOOL_PATH_KEYS = [
+  "Path",
   "AbsolutePath",
   "TargetFile",
   "FilePath",
@@ -2334,7 +2337,13 @@ var TOOL_PATH_KEYS = [
   "path",
   "DirectoryPath"
 ];
-var EDIT_TOOLS = /* @__PURE__ */ new Set(["WRITE_TO_FILE", "REPLACE_FILE_CONTENT", "MULTI_REPLACE_FILE_CONTENT"]);
+var EDIT_TOOLS = /* @__PURE__ */ new Set([
+  "EDIT_FILE",
+  "WRITE_FILE",
+  "WRITE_TO_FILE",
+  "REPLACE_FILE_CONTENT",
+  "MULTI_REPLACE_FILE_CONTENT"
+]);
 function stripWrappingQuotes(value) {
   return value.length >= 2 && value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1) : value;
 }
@@ -2439,6 +2448,10 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
      *  start()/stop() lifecycle and doesn't distinguish debounce
      *  cycles. (Stage 2 iter-4 R1 HIGH finding 2026-05-21.) */
     this.debounceCycleId = 0;
+    this.clearDebounceTimer = null;
+    this.clearDebounceWindowOpenedAt = null;
+    this.clearDebounceCycleId = 0;
+    this.clearFlushInFlight = false;
     this.pipeFilePath = options.pipeFilePath ?? path6.join(os5.tmpdir(), `codevibe-agy-pane-${process.pid}.log`);
     this.skipTmuxCommands = options.skipTmuxCommands ?? false;
     this.captureFn = options.captureFn ?? null;
@@ -2473,6 +2486,9 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
      *  and they paint atomically. */
     this.QUESTION_SETTLE_DELAY_MS = 100;
   }
+  static {
+    this.CLEAR_CONFIRM_DELAY_MS = 50;
+  }
   /**
    * Start observing the tmux pane targeted by `sessionName`. If sessionName
    * is omitted, read $CODEVIBE_AGY_TMUX_TARGET from env (set by the
@@ -2638,7 +2654,8 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
           const err = extractSystemErrorPrompt(snapshot);
           headerText = err ? err.message : null;
         } else if (kind === "approval") {
-          headerText = extractHeader(snapshot);
+          const fileEdit = extractFileEditPrompt(snapshot);
+          headerText = fileEdit ? fileEdit.identity : extractHeader(snapshot);
         }
       }
       let isChooser = hasPrompt && kind !== "system_error";
@@ -2697,6 +2714,7 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
    * goes idle (e.g. an animated spinner inside the approval UI).
    */
   scheduleDebouncedEmit(candidate) {
+    this.cancelClearDebounce();
     const now = Date.now();
     this.pendingEmitCandidate = candidate;
     if (this.debounceWindowOpenedAt === null) {
@@ -2744,7 +2762,10 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
     let candidate = staged;
     try {
       const freshSnapshot = await this.captureSnapshot();
+      if (this.generation !== scheduledGeneration || !this.started) return;
+      if (this.debounceCycleId !== scheduledCycleId) return;
       if (freshSnapshot && looksLikePromptSnapshot(freshSnapshot)) {
+        this.cancelClearDebounce();
         candidate = {
           rawDelta: staged.rawDelta,
           snapshot: freshSnapshot,
@@ -2764,6 +2785,7 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
           const settledHeader = settled ? extractQuestionHeader(settled) : null;
           const sameBody = !!firstHeader && !!settledHeader && firstHeader.body === settledHeader.body;
           if (settled && looksLikePromptSnapshot(settled) && detectActivePromptKind(settled) === "question" && sameBody) {
+            this.cancelClearDebounce();
             candidate = {
               rawDelta: staged.rawDelta,
               snapshot: settled,
@@ -2781,7 +2803,7 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
     if (candidate.snapshotHash === this.lastPromptHash) return;
     this.lastPromptHash = candidate.snapshotHash;
     this.approvalUIActive = true;
-    this.currentApprovalHeader = extractHeader(candidate.snapshot);
+    this.currentApprovalHeader = extractFileEditPrompt(candidate.snapshot)?.identity ?? extractHeader(candidate.snapshot);
     this.emit("prompt-candidate", candidate);
   }
   /**
@@ -2815,6 +2837,64 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
     this.pendingEmitCandidate = null;
     this.debounceWindowOpenedAt = null;
     this.debounceCycleId += 1;
+    this.cancelClearDebounce();
+  }
+  cancelClearDebounce() {
+    if (this.clearDebounceTimer) {
+      clearTimeout(this.clearDebounceTimer);
+      this.clearDebounceTimer = null;
+    }
+    this.clearDebounceWindowOpenedAt = null;
+    this.clearFlushInFlight = false;
+    this.clearDebounceCycleId += 1;
+  }
+  /**
+   * Schedule a debounced check for whether the active prompt UI has genuinely
+   * cleared from the pane. Ink full-viewport redraws write upper scrollback
+   * chunks (`!looksLikePromptDelta(chunk)`) before repainting the bottom
+   * chooser; capturing immediately mid-redraw would false-fire
+   * `prompt-cleared` and cause the repainted chooser to re-emit a duplicate card.
+   * Bounded by DEBOUNCE_MAX_WAIT_MS (600ms) so continuous post-approval output
+   * never starves `prompt-cleared` (Claude R1-F2, Codex R1-F3).
+   */
+  scheduleDebouncedClear() {
+    if (!this.approvalUIActive || this.clearFlushInFlight) return;
+    const now = Date.now();
+    if (this.clearDebounceWindowOpenedAt === null) {
+      this.clearDebounceWindowOpenedAt = now;
+    }
+    const elapsed = now - this.clearDebounceWindowOpenedAt;
+    const cappedRemaining = Math.max(0, _TmuxPaneObserver.DEBOUNCE_MAX_WAIT_MS - elapsed);
+    if (cappedRemaining === 0 && this.clearDebounceTimer !== null) {
+      return;
+    }
+    const waitMs = Math.min(_TmuxPaneObserver.DEBOUNCE_QUIET_MS, cappedRemaining);
+    if (this.clearDebounceTimer) clearTimeout(this.clearDebounceTimer);
+    this.clearDebounceCycleId += 1;
+    const myGeneration = this.generation;
+    const myCycleId = this.clearDebounceCycleId;
+    this.clearDebounceTimer = setTimeout(() => {
+      void this.flushDebouncedClear(myGeneration, myCycleId);
+    }, waitMs);
+    if (this.clearDebounceTimer.unref) this.clearDebounceTimer.unref();
+  }
+  async flushDebouncedClear(scheduledGeneration, scheduledCycleId) {
+    if (this.generation !== scheduledGeneration || !this.started) return;
+    if (this.clearDebounceCycleId !== scheduledCycleId) return;
+    this.clearDebounceTimer = null;
+    if (!this.approvalUIActive) {
+      this.clearDebounceWindowOpenedAt = null;
+      return;
+    }
+    this.clearFlushInFlight = true;
+    try {
+      await this.checkPromptCleared(scheduledGeneration, scheduledCycleId);
+    } finally {
+      if (this.clearDebounceCycleId === scheduledCycleId) {
+        this.clearFlushInFlight = false;
+        this.clearDebounceWindowOpenedAt = null;
+      }
+    }
   }
   /**
    * Public hook for tests / drivers: trigger a read+process cycle as if
@@ -2836,6 +2916,11 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
       this.debounceTimer = null;
       await this.flushDebouncedEmit(this.generation, this.debounceCycleId);
     }
+    if (this.clearDebounceTimer) {
+      clearTimeout(this.clearDebounceTimer);
+      this.clearDebounceTimer = null;
+      await this.flushDebouncedClear(this.generation, this.clearDebounceCycleId);
+    }
   }
   async processFileChanges() {
     if (this.processing) {
@@ -2853,7 +2938,7 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
         if (!chunk) continue;
         if (!looksLikePromptDelta(chunk)) {
           if (this.approvalUIActive) {
-            await this.checkPromptCleared(myGeneration);
+            this.scheduleDebouncedClear();
           }
           continue;
         }
@@ -2861,10 +2946,11 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
         if (this.generation !== myGeneration || !this.started) return;
         if (!snapshot || !looksLikePromptSnapshot(snapshot)) {
           if (this.approvalUIActive) {
-            await this.checkPromptCleared(myGeneration);
+            this.scheduleDebouncedClear();
           }
           continue;
         }
+        this.cancelClearDebounce();
         const snapshotHash = hashPromptSnapshot(snapshot);
         if (snapshotHash === this.lastPromptHash) {
           continue;
@@ -2888,13 +2974,31 @@ var TmuxPaneObserver = class _TmuxPaneObserver extends import_events2.EventEmitt
     }
   }
   /** Called when we suspect the approval UI may have vanished. Does a
-   *  fresh capture; if the pane no longer shows approval UI, fires
-   *  'prompt-cleared'. Generation-checked to suppress emit after stop(). */
-  async checkPromptCleared(myGeneration) {
+   *  fresh capture; if the pane no longer shows approval UI across two
+   *  consecutive captures, fires 'prompt-cleared'. Generation-checked
+   *  and cycle-checked to suppress emit after stop() or concurrent prompt
+   *  re-assertion (Claude R1-F3, Codex R1-F4). */
+  async checkPromptCleared(myGeneration, expectedClearCycleId) {
     try {
       const snapshot = await this.captureSnapshot();
       if (this.generation !== myGeneration || !this.started) return;
-      if (!looksLikePromptSnapshot(snapshot)) {
+      if (expectedClearCycleId !== void 0 && this.clearDebounceCycleId !== expectedClearCycleId) {
+        return;
+      }
+      if (looksLikePromptSnapshot(snapshot)) {
+        return;
+      }
+      await sleep(_TmuxPaneObserver.CLEAR_CONFIRM_DELAY_MS);
+      if (this.generation !== myGeneration || !this.started) return;
+      if (expectedClearCycleId !== void 0 && this.clearDebounceCycleId !== expectedClearCycleId) {
+        return;
+      }
+      const confirmSnapshot = await this.captureSnapshot();
+      if (this.generation !== myGeneration || !this.started) return;
+      if (expectedClearCycleId !== void 0 && this.clearDebounceCycleId !== expectedClearCycleId) {
+        return;
+      }
+      if (!looksLikePromptSnapshot(confirmSnapshot)) {
         this.approvalUIActive = false;
         this.lastPromptHash = null;
         this.currentApprovalHeader = null;
@@ -2944,6 +3048,19 @@ function isComposerBoxAt(lines, idx) {
   return false;
 }
 var ANSI_ESCAPE_REGEX = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
+var ANSI_NON_REP_ESCAPE_REGEX = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-ac-~])/g;
+function stripAnsiAndExpandRep(input) {
+  if (!input.includes("\x1B")) return input;
+  const withoutNonRep = input.replace(ANSI_NON_REP_ESCAPE_REGEX, "");
+  const expanded = withoutNonRep.replace(
+    /([^\x00-\x1f\x7f])\x1B\[(\d*)b/gu,
+    (_, ch, countStr) => {
+      const count = Math.min(Math.max(Number.parseInt(countStr || "1", 10) || 1, 1), 512);
+      return ch.repeat(1 + count);
+    }
+  );
+  return expanded.replace(ANSI_ESCAPE_REGEX, "");
+}
 function isPaneInputSafetyBlocked(input) {
   const rawText = Array.isArray(input) ? input.join("\n") : input;
   if (!rawText) return { blocked: false, kind: null };
@@ -2962,7 +3079,7 @@ function isPaneInputSafetyBlocked(input) {
     if (isQuestionFooterLine(trimmed)) {
       footerIdx = i;
       break;
-    } else if (/\besc to cancel\b/i.test(trimmed) && !isAgyStatusFooterLine(trimmed)) {
+    } else if ((/\besc to cancel\b/i.test(trimmed) || /(?:↑\/↓|↑|↓)\s*Navigate\b.*\b(?:tab\s+Amend|f\s+full\s+diff|ctrl\+r\s+Review)\b/i.test(trimmed)) && !isAgyStatusFooterLine(trimmed)) {
       footerIdx = i;
       break;
     }
@@ -3048,7 +3165,7 @@ function isPaneInputSafetyBlocked(input) {
       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)) {
+    } else if (/Requesting permission for:/i.test(trimmed) || /Do you want to (?:proceed|run|execute)/i.test(trimmed) || /^(?:Accept this file edit\?|Allow creation of this file\?)$/i.test(trimmed)) {
       candidateHeaders.push({ lineIdx: i, kind: "approval" });
     }
   }
@@ -3116,7 +3233,7 @@ function looksLikePromptDelta(chunk) {
   const text = chunk.includes("\x1B") ? chunk.replace(ANSI_ESCAPE_REGEX, "") : 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(text) || /^\s*[1-9]\. (?:Yes|No)\b/im.test(text) || /\[(?:y\/n|Y\/n|y\/N)\]/.test(chunk) || /^\s*(?:[❯>]\s*)?\?\s+(?!for\s+(?:shortcuts|help|commands))\S/im.test(text) || /Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:/i.test(text) || /\benter\s+(?:to\s+)?(?:select|submit(?:\s+all)?|next)\b/i.test(text) || /\b(?:navigate|use\s+arrow\s+keys)\b/i.test(text) || /\b\d+[\/:of\s]+\d+:\s+\S/i.test(text) || /\bSubmit(?:\s+All)?\b/i.test(text) || /(?:^|[\s·|│])(?:←|<-)\s*Back\b/i.test(text) || /^File access\s*$/im.test(text) || /^\s*Allow access to this file\?\s*$/im.test(text) || /(?:Yes, allow access|No, deny access)/i.test(text) || /(?:↑\/↓\s+Navigate|ctrl\+r\s+Review)/i.test(text) || /Our servers are experiencing/i.test(text) || /Error ID:\s*[0-9a-fA-F-]*/i.test(text) || /(?:⚠️|⚠\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(text)
+    /Requesting permission for:/i.test(chunk) || /Do you want to proceed\?/i.test(chunk) || /\besc to cancel\b/i.test(text) || /^\s*[1-9]\. (?:Yes|No)\b/im.test(text) || /\[(?:y\/n|Y\/n|y\/N)\]/.test(chunk) || /^\s*(?:[❯>]\s*)?\?\s+(?!for\s+(?:shortcuts|help|commands))\S/im.test(text) || /Question\b(?:\s+\d+(?:[\/:of\s]+\d+)?)?:/i.test(text) || /\benter\s+(?:to\s+)?(?:select|submit(?:\s+all)?|next)\b/i.test(text) || /\b(?:navigate|use\s+arrow\s+keys)\b/i.test(text) || /\b\d+[\/:of\s]+\d+:\s+\S/i.test(text) || /\bSubmit(?:\s+All)?\b/i.test(text) || /(?:^|[\s·|│])(?:←|<-)\s*Back\b/i.test(text) || /^File access\s*$/im.test(text) || /^\s*Allow access to this file\?\s*$/im.test(text) || /(?:Yes, allow access|No, deny access)/i.test(text) || /(?:↑\/↓\s+Navigate|ctrl\+r\s+Review)/i.test(text) || /^(?:Pending edit|Create file)\s*$/im.test(text) || /^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/im.test(text) || /(?:Yes, accept this change|No, reject this change|Yes, allow creation|No, deny creation)/i.test(text) || /(?:tab\s+Amend|f\s+full\s+diff)/i.test(text) || /Our servers are experiencing/i.test(text) || /Error ID:\s*[0-9a-fA-F-]*/i.test(text) || /(?:⚠️|⚠\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(text)
   );
 }
 function isNonSystemErrorWarningLine(trimmed) {
@@ -3152,7 +3269,7 @@ function isSystemErrorBannerLineInContext(lines, idx) {
     if (/^[─━│╭╰╮╯\s_-]*$/.test(nextTrimmed)) break;
     if (/^[│\s]*[❯>]/.test(nextTrimmed)) break;
     if (/^(?:⚠️|⚠\uFE0F?)\s+/.test(nextTrimmed)) break;
-    if (/Requesting permission for:|Question \d+\/\d+:|^\s*File access\s*$|^[>\s]*[1-9]\. \S/i.test(nextTrimmed)) break;
+    if (/Requesting permission for:|Question \d+\/\d+:|^\s*(?:File access|Pending edit|Create file)\s*$|^[>\s]*[1-9]\. \S/i.test(nextTrimmed)) break;
     const idMatch = nextTrimmed.match(/^Error ID:\s*([0-9a-fA-F-]*)$/i);
     if (idMatch) {
       if (/[0-9a-fA-F]/.test(idMatch[1])) return true;
@@ -3272,7 +3389,7 @@ function hasTrailingAgyComposer(lines, afterLineIdx, fenceMask) {
   );
   if (hasStatusLine) {
     const nonDecorativeNonStatus = trailingLines.filter(
-      (l) => !isAgyStatusFooterLine(l) && !isQuestionFooterLine(l) && !/^[─━│╭╰╮╯\s_-]{3,}$/.test(l)
+      (l) => !isAgyStatusFooterLine(l) && !isQuestionFooterLine(l) && !/(?:↑\/↓|↑|↓)\s*Navigate\b.*\b(?:tab\s+Amend|f\s+full\s+diff|ctrl\+r\s+Review)\b/i.test(l) && !/^[─━│╭╰╮╯\s_-]{3,}$/.test(l)
     );
     if (nonDecorativeNonStatus.length > 0) {
       return true;
@@ -3344,9 +3461,10 @@ function isSystemErrorActiveFromIndex(lines, errorIdx) {
     if (/^●\s*(?:[A-Za-z_-]+)\(/.test(trimmed)) return false;
     if (/Requesting permission for:/i.test(trimmed)) return false;
     if (/Question \d+\/\d+:/i.test(trimmed)) return false;
-    if (/^\s*File access\s*$/i.test(trimmed)) return false;
+    if (/^\s*(?:File access|Pending edit|Create file)\s*$/i.test(trimmed)) return false;
     if (/^[>\s]*[1-9]\. \S/.test(trimmed)) return false;
     if (/Allow access to this file\?/i.test(trimmed)) return false;
+    if (/^(?:Accept this file edit\?|Allow creation of this file\?)$/i.test(trimmed)) return false;
     if (/Do you want to proceed\?/i.test(trimmed)) return false;
     if (/\benter Select\b/i.test(trimmed)) return false;
     if (/^Error ID:\s*[0-9a-fA-F-]*/i.test(trimmed)) {
@@ -3420,12 +3538,15 @@ function isLegacyYNActiveInLines(lines) {
   return { active: true, lineIdx: ynIdx };
 }
 function looksLikePromptSnapshot(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
+  const stripped = stripAnsiAndExpandRep(snapshot);
   const activeKind = detectActivePromptKind(snapshot);
   if (activeKind !== null) {
     if (activeKind === "system_error") return true;
     const recent = stripped.trimEnd().split("\n").slice(-30).join("\n");
     if (activeKind === "approval") {
+      if (extractFileEditPrompt(snapshot) !== null) {
+        return true;
+      }
       const hasApprovalHeader = /Requesting permission for:/i.test(recent) || /Do you want to proceed\?/i.test(recent);
       const hasApprovalOptions = /^[>\s]*[1-9]\. (?:Yes|No)\b/im.test(recent);
       const hasApprovalFooter = /\besc to cancel\b/i.test(recent);
@@ -3562,14 +3683,333 @@ function extractFileAccessPrompt(snapshot) {
   const fullLine = actionLine ? `Allow access to this file? (${actionLine})` : lines[questionIndex].trim();
   return { identity, fullLine, body };
 }
+function parseInlineDiffLine(rawLine) {
+  if (/^[>\s❯]*[1-9]\d*[.)]\s+/.test(rawLine)) {
+    return null;
+  }
+  const remMatch = rawLine.match(/^\s*(\d+)\s{1,3}-(?:\s{1,2}(.*)|$)/);
+  if (remMatch) {
+    return {
+      type: "remove",
+      lineNum: Number.parseInt(remMatch[1], 10),
+      content: remMatch[2] ?? ""
+    };
+  }
+  const addMatch = rawLine.match(/^\s*(\d+)\s{1,3}\+(?:\s{1,2}(.*)|$)/);
+  if (addMatch) {
+    return {
+      type: "add",
+      lineNum: Number.parseInt(addMatch[1], 10),
+      content: addMatch[2] ?? ""
+    };
+  }
+  const ctxMatch = rawLine.match(/^\s*(\d+)(?:\s{5}(.*)|\s{3,4}(.*)|\s*)$/);
+  if (ctxMatch) {
+    return {
+      type: "context",
+      lineNum: Number.parseInt(ctxMatch[1], 10),
+      content: ctxMatch[2] ?? ctxMatch[3] ?? ""
+    };
+  }
+  return null;
+}
+function isFoldedDiffMarkerLine(trimmed) {
+  return /^@@\s+\d+\s+lines\s+hidden\s+@@$/i.test(trimmed) || /^\(\d+\s+lines\s+hidden\)$/i.test(trimmed) || /^(?:…|\.\.\.)?\s*\d+\s+more\s+lines(?:\s*\(.*\))?$/i.test(trimmed);
+}
+function parseTargetStatSuffix(raw) {
+  const m = raw.match(/^(.*?)\s+((?:\+(\d+)(?:\s+-(\d+))?|-(\d+)))\s*$/);
+  if (!m) {
+    return { cleanPath: raw.trim() };
+  }
+  const added = m[3] !== void 0 ? Number.parseInt(m[3], 10) : m[5] !== void 0 ? 0 : void 0;
+  const removed = m[4] !== void 0 ? Number.parseInt(m[4], 10) : m[5] !== void 0 ? Number.parseInt(m[5], 10) : 0;
+  return {
+    cleanPath: m[1].trim(),
+    stat: m[2].replace(/\s+/g, " ").trim(),
+    added,
+    removed
+  };
+}
+function extractFileEditTargetAndStat(line) {
+  if (parseInlineDiffLine(line) !== null) return null;
+  const trimmed = line.trim();
+  if (!trimmed) return null;
+  const actionMatch = trimmed.match(/^(?:New file|Create file|Delete file|Write|Edit|Create):\s*(\S.*)$/i);
+  if (actionMatch) {
+    const parsed2 = parseTargetStatSuffix(actionMatch[1]);
+    if (!parsed2.cleanPath) return null;
+    return {
+      path: parsed2.cleanPath,
+      stat: parsed2.stat,
+      added: parsed2.added,
+      removed: parsed2.removed
+    };
+  }
+  const parsed = parseTargetStatSuffix(trimmed);
+  if (parsed.stat && parsed.cleanPath) {
+    const candidatePath = parsed.cleanPath;
+    if (!/^[+-]\d+$/.test(candidatePath) && !/^(?:Pending edit|Create file|File access|Question\b|Requesting permission\b)/i.test(candidatePath) && (candidatePath.includes("/") || candidatePath.startsWith("~") || candidatePath.startsWith(".") || /\.[a-z0-9]{1,10}$/i.test(candidatePath) || /^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(candidatePath))) {
+      return {
+        path: candidatePath,
+        stat: parsed.stat,
+        added: parsed.added,
+        removed: parsed.removed
+      };
+    }
+  }
+  return null;
+}
+function matchFileEditTargetLine(line) {
+  return extractFileEditTargetAndStat(line)?.path ?? null;
+}
+function stitchWrappedPathAbove(lines, fromIndex, initialPath) {
+  let stitched = initialPath;
+  let topIndex = fromIndex;
+  for (let prevIdx = fromIndex - 1; prevIdx >= Math.max(0, fromIndex - 3); prevIdx -= 1) {
+    const prevRaw = lines[prevIdx];
+    const prevTrimmed = prevRaw.trim();
+    if (!prevTrimmed) break;
+    if (/^[─━═_-]{3,}$/.test(prevTrimmed)) break;
+    if (/^(?:Pending edit|Create file|File access|Question\b|Requesting permission\b)/i.test(prevTrimmed)) break;
+    if (parseInlineDiffLine(prevRaw) !== null || isFoldedDiffMarkerLine(prevTrimmed)) break;
+    if (/^[▶▸\s]*Thought|^●\s*/i.test(prevTrimmed) || /^[│\s]*[❯>]\s*$/.test(prevTrimmed)) break;
+    const actionPrefix = prevTrimmed.match(/^(?:New file|Create file|Delete file|Write|Edit|Create):\s*(\S.*)$/i);
+    if (actionPrefix) {
+      stitched = `${actionPrefix[1].trim()}${stitched}`;
+      topIndex = prevIdx;
+      break;
+    }
+    const isValidPathSegment = !/\s/.test(prevTrimmed) && (prevTrimmed.includes("/") || prevTrimmed.startsWith("~") || prevTrimmed.startsWith(".") || stitched === "" && /\.[a-z0-9]{1,10}$/i.test(prevTrimmed));
+    if (isValidPathSegment && (stitched === "" || prevTrimmed.length >= 40)) {
+      stitched = `${prevTrimmed}${stitched}`;
+      topIndex = prevIdx;
+      if (stitched.startsWith("/") || stitched.startsWith("~/") || stitched.startsWith("./")) {
+        break;
+      }
+      continue;
+    }
+    break;
+  }
+  return { path: stitched, topIndex };
+}
+function extractFileEditPrompt(snapshot) {
+  const stripped = stripAnsiAndExpandRep(snapshot);
+  const lines = stripped.trimEnd().split("\n");
+  const lineInFence = computeFenceMask(lines);
+  const windowStart = Math.max(0, lines.length - 30);
+  let questionIndex = -1;
+  for (let i = lines.length - 1; i >= windowStart; i -= 1) {
+    if (lineInFence[i]) continue;
+    if (/^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/i.test(lines[i]) && isStandaloneFileEditContext(lines, i, lineInFence)) {
+      questionIndex = i;
+      break;
+    }
+  }
+  if (questionIndex < 0) return null;
+  const questionText = lines[questionIndex].trim();
+  let headingIndex = -1;
+  let headingText = null;
+  let targetIndex = -1;
+  let targetPath = null;
+  let headerStat;
+  let headerAdded;
+  let headerRemoved;
+  let topBodyIndex = questionIndex;
+  const itemsReversed = [];
+  let currentHunkReversed = [];
+  for (let index = questionIndex - 1; index >= 0; index -= 1) {
+    const rawLine = lines[index];
+    const trimmed = rawLine.trim();
+    if (!trimmed) continue;
+    if (/^(?:Pending edit|Create file)$/i.test(trimmed)) {
+      headingIndex = index;
+      headingText = trimmed;
+      topBodyIndex = index + 1;
+      break;
+    }
+    if (/^[─━═_-]{3,}$/.test(trimmed)) {
+      topBodyIndex = index + 1;
+      for (let prevIdx = index - 1; prevIdx >= Math.max(0, index - 4); prevIdx -= 1) {
+        const prevTrimmed = lines[prevIdx].trim();
+        if (!prevTrimmed) continue;
+        if (/^(?:Pending edit|Create file)$/i.test(prevTrimmed)) {
+          headingIndex = prevIdx;
+          headingText = prevTrimmed;
+        }
+        break;
+      }
+      break;
+    }
+    const diffLine = parseInlineDiffLine(rawLine);
+    if (diffLine && targetIndex < 0) {
+      currentHunkReversed.push(diffLine);
+      topBodyIndex = index;
+      continue;
+    }
+    if (isFoldedDiffMarkerLine(trimmed) && targetIndex < 0) {
+      if (currentHunkReversed.length > 0) {
+        itemsReversed.push({ kind: "hunk", lines: currentHunkReversed.reverse() });
+        currentHunkReversed = [];
+      }
+      itemsReversed.push({ kind: "omitted", marker: trimmed });
+      topBodyIndex = index;
+      continue;
+    }
+    if (/^shift\+tab\s+to\s+auto-approve\s+file\s+(?:edits?|writes?)$/i.test(trimmed) || /^Reason:\s*\S/i.test(trimmed) || /^[⚠⚠️]\s*/.test(trimmed) || /^Esc disabled during file edits\b/i.test(trimmed) || /^>\s*Displayed as code block\.\s*Widen terminal to view inline\.$/i.test(trimmed) || /^\(no content\)$/i.test(trimmed)) {
+      topBodyIndex = index;
+      continue;
+    }
+    const extractedTarget = extractFileEditTargetAndStat(rawLine);
+    let matchedTarget = extractedTarget?.path ?? null;
+    let matchedStat = extractedTarget?.stat;
+    let matchedAdded = extractedTarget?.added;
+    let matchedRemoved = extractedTarget?.removed;
+    let targetTopIdx = index;
+    if (!matchedTarget && targetIndex < 0 && /^(?:\+\d+(?:\s+-\d+)?|-\d+)$/.test(trimmed) && index > 0) {
+      const bareStat = parseTargetStatSuffix(`placeholder ${trimmed}`);
+      const stitched = stitchWrappedPathAbove(lines, index, "");
+      if (stitched.path) {
+        matchedTarget = stitched.path;
+        matchedStat = bareStat.stat;
+        matchedAdded = bareStat.added;
+        matchedRemoved = bareStat.removed;
+        targetTopIdx = stitched.topIndex;
+      }
+    } else if (matchedTarget && targetIndex < 0 && !matchedTarget.startsWith("/") && !matchedTarget.startsWith("~/") && !matchedTarget.startsWith("./")) {
+      const stitched = stitchWrappedPathAbove(lines, index, matchedTarget);
+      matchedTarget = stitched.path;
+      targetTopIdx = stitched.topIndex;
+    }
+    if (!matchedTarget && targetIndex < 0 && !/\s/.test(trimmed) && (trimmed.includes("/") || /\.[a-z0-9]{1,8}$/i.test(trimmed)) && !/^[─━═_-]{3,}$/.test(trimmed)) {
+      for (let prevIdx = index - 1; prevIdx >= Math.max(0, index - 4); prevIdx -= 1) {
+        const prevTrimmed = lines[prevIdx].trim();
+        if (!prevTrimmed) continue;
+        if (/^[─━═_-]{3,}$/.test(prevTrimmed)) continue;
+        if (/^(?:Pending edit|Create file)$/i.test(prevTrimmed)) {
+          matchedTarget = trimmed;
+        }
+        break;
+      }
+    }
+    if (matchedTarget && targetIndex < 0) {
+      targetIndex = targetTopIdx;
+      targetPath = matchedTarget;
+      headerStat = matchedStat;
+      headerAdded = matchedAdded;
+      headerRemoved = matchedRemoved;
+      topBodyIndex = targetTopIdx;
+      for (let prevIdx = targetTopIdx - 1; prevIdx >= Math.max(0, targetTopIdx - 6); prevIdx -= 1) {
+        const prevTrimmed = lines[prevIdx].trim();
+        if (!prevTrimmed) continue;
+        if (/^[─━═_-]{3,}$/.test(prevTrimmed)) {
+          continue;
+        }
+        if (/^(?:Pending edit|Create file)$/i.test(prevTrimmed)) {
+          headingIndex = prevIdx;
+          headingText = prevTrimmed;
+        }
+        break;
+      }
+      break;
+    }
+    break;
+  }
+  if (currentHunkReversed.length > 0) {
+    itemsReversed.push({ kind: "hunk", lines: currentHunkReversed.reverse() });
+  }
+  const items = itemsReversed.reverse();
+  const hunks = items.filter((item) => item.kind === "hunk").map((item) => item.lines);
+  const omittedMarkers = items.filter((item) => item.kind === "omitted").map((item) => item.marker);
+  const visibleAdded = hunks.reduce(
+    (sum, hunk) => sum + hunk.filter((l) => l.type === "add").length,
+    0
+  );
+  const visibleRemoved = hunks.reduce(
+    (sum, hunk) => sum + hunk.filter((l) => l.type === "remove").length,
+    0
+  );
+  const partialReasons = [];
+  if (!targetPath && (hunks.length > 0 || omittedMarkers.length > 0)) {
+    partialReasons.push("file header scrolled off-screen");
+  }
+  if (headerStat && (headerAdded !== void 0 && visibleAdded < headerAdded || headerRemoved !== void 0 && visibleRemoved < headerRemoved)) {
+    partialReasons.push(
+      `showing +${visibleAdded} -${visibleRemoved} of ${headerStat} total changes`
+    );
+  }
+  const allOmissionNotes = [...partialReasons, ...omittedMarkers];
+  const isPartial = allOmissionNotes.length > 0;
+  const omissionNote = isPartial ? allOmissionNotes.join("; ") : void 0;
+  const isCreate = /^Allow creation of this file\?$/i.test(questionText) || /^Create file$/i.test(headingText || "");
+  const identity = targetPath || (isCreate ? "create file" : "file edit");
+  const fullLine = targetPath ? `${questionText} (${targetPath})` : questionText;
+  let body = "";
+  if (hunks.length > 0 || omittedMarkers.length > 0) {
+    const allAdditions = hunks.length > 0 && hunks.every((hunk) => hunk.every((l) => l.type === "add"));
+    const diffOut = ["```diff"];
+    if (targetPath) {
+      const fromHeader = isCreate && allAdditions ? "--- /dev/null" : `--- a/${targetPath}`;
+      const toHeader = `+++ b/${targetPath}`;
+      diffOut.push(fromHeader, toHeader);
+    }
+    if (headerStat) {
+      diffOut.push(`# diff-stat: ${headerStat}`);
+    }
+    for (const reason of partialReasons) {
+      diffOut.push(`# partial-diff: ${reason}`);
+    }
+    for (const item of items) {
+      if (item.kind === "omitted") {
+        diffOut.push(`# omitted: ${item.marker}`);
+        continue;
+      }
+      const hunk = item.lines;
+      const oldCount = hunk.filter((l) => l.type === "remove" || l.type === "context").length;
+      const newCount = hunk.filter((l) => l.type === "add" || l.type === "context").length;
+      const firstOld = hunk.find((l) => l.type === "remove" || l.type === "context")?.lineNum ?? (oldCount === 0 ? 0 : 1);
+      const firstNew = hunk.find((l) => l.type === "add" || l.type === "context")?.lineNum ?? (newCount === 0 ? 0 : 1);
+      diffOut.push(`@@ -${firstOld},${oldCount} +${firstNew},${newCount} @@`);
+      for (const l of hunk) {
+        if (l.type === "remove") {
+          diffOut.push(`-${l.content}`);
+        } else if (l.type === "add") {
+          diffOut.push(`+${l.content}`);
+        } else {
+          diffOut.push(` ${l.content}`);
+        }
+      }
+    }
+    diffOut.push("```");
+    body = diffOut.join("\n");
+  } else {
+    const startIdx = headingIndex >= 0 ? headingIndex + 1 : topBodyIndex;
+    const contextLines = lines.slice(startIdx, questionIndex).map((l) => l.trim()).filter((l) => {
+      if (!l) return false;
+      if (/^(?:Pending edit|Create file)$/i.test(l)) return false;
+      if (/^[─━═_-]{3,}$/.test(l)) return false;
+      if (/^shift\+tab\s+to\s+auto-approve\s+file\s+(?:edits?|writes?)$/i.test(l)) return false;
+      return true;
+    });
+    body = contextLines.join("\n").trim();
+  }
+  return {
+    identity,
+    filePath: targetPath ?? void 0,
+    fullLine,
+    body,
+    questionText,
+    ...headerStat ? { diffStat: headerStat } : {},
+    ...isPartial ? { partial: true, ...omissionNote ? { omissionNote } : {} } : {}
+  };
+}
 function extractHeader(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
+  const stripped = stripAnsiAndExpandRep(snapshot);
   const matches = Array.from(stripped.matchAll(/Requesting permission for:\s*([^\n]+)/gi));
   if (matches.length === 0) return null;
   return matches[matches.length - 1][1].trim();
 }
 function extractFullHeaderLine(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
+  const stripped = stripAnsiAndExpandRep(snapshot);
   const matches = Array.from(stripped.matchAll(/Requesting permission for:\s*([^\n]+)/gi));
   if (matches.length === 0) return null;
   return matches[matches.length - 1][0].trim();
@@ -3605,7 +4045,7 @@ function isOpenEnclosingContext(lines, checkTop, topAnchor, boundaryIdx) {
   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)) {
+    if (/Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l) || /^(?:Accept this file edit\?|Allow creation of this file\?)$/i.test(l) || /Question \d+\/\d+:/i.test(l)) {
       const sliceBetween = lines.slice(k + 1, boundaryIdx);
       let optCount = 0;
       let hasFooter = false;
@@ -3613,6 +4053,10 @@ function isOpenEnclosingContext(lines, checkTop, topAnchor, boundaryIdx) {
       for (const raw of sliceBetween) {
         const s = raw.trim();
         if (!s) continue;
+        if (parseInlineDiffLine(raw) !== null || isFoldedDiffMarkerLine(raw)) {
+          inDiff = true;
+          continue;
+        }
         if (inDiff) {
           if (/^[ +\-\\]/.test(raw)) {
             continue;
@@ -3624,7 +4068,7 @@ function isOpenEnclosingContext(lines, checkTop, topAnchor, boundaryIdx) {
             inDiff = false;
             continue;
           }
-          if (/^Do you want to proceed\?/i.test(raw)) {
+          if (/^(?:Do you want to proceed\?|Accept this file edit\?|Allow creation of this file\?)/i.test(raw)) {
             inDiff = false;
             continue;
           }
@@ -3656,7 +4100,7 @@ function isStandaloneFileAccessContext(lines, questionIdx) {
     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)) {
+    if (/Do you want to proceed\?/i.test(l) || /Requesting permission for:/i.test(l) || /^(?:Accept this file edit\?|Allow creation of this file\?)$/i.test(l)) {
       return false;
     }
     if (/\b(?:allow|deny)\s+access\b/i.test(l)) {
@@ -3675,7 +4119,7 @@ function isStandaloneFileAccessContext(lines, questionIdx) {
   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)) {
+    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) || parseInlineDiffLine(lines[j]) !== null || /Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l) || /^(?:Accept this file edit\?|Allow creation of this file\?)$/i.test(l) || /^(?:Pending edit|Create file)$/i.test(l) || /Question \d+\/\d+:/i.test(l)) {
       return false;
     }
     if (/^[─━│╭╰╮╯\s]*$/.test(l) && l.length > 5) {
@@ -3722,10 +4166,10 @@ function isStandaloneFileAccessContext(lines, questionIdx) {
     if (/Question \d+\/\d+:/i.test(l)) {
       return false;
     }
-    if (/Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l)) {
+    if (/Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l) || /^(?:Accept this file edit\?|Allow creation of this file\?)$/i.test(l) || /^(?:Pending edit|Create file)$/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)) {
+    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) || parseInlineDiffLine(lines[j]) !== null) {
       return false;
     }
     if (/^[▶▸\s]*Thought|^●\s*/i.test(l) || /^[│\s]*[❯>]\s*$/.test(l) || /^[─━│╭╰╮╯\s]*$/.test(l) && l.length > 5) {
@@ -3737,11 +4181,100 @@ function isStandaloneFileAccessContext(lines, questionIdx) {
   }
   return true;
 }
+function isStandaloneFileEditContext(lines, questionIdx, fenceMask) {
+  if (fenceMask && fenceMask[questionIdx]) {
+    return false;
+  }
+  const windowEnd = Math.min(lines.length, questionIdx + 15);
+  let optionCount = 0;
+  let hasFileEditOption = false;
+  let hasFooter = false;
+  let promptEndIdx = questionIdx;
+  for (let j = questionIdx + 1; j < windowEnd; j++) {
+    if (fenceMask && fenceMask[j]) continue;
+    const raw = lines[j];
+    const l = raw.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) || /Allow access to this file\?/i.test(l)) {
+      return false;
+    }
+    if (isAgyStatusFooterLine(l) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(l) || isComposerBoxAt(lines, j)) {
+      if (/^esc to cancel\b/i.test(l)) {
+        hasFooter = true;
+      }
+      break;
+    }
+    if (optionCount > 0 && isResumedTurnSignal(l)) {
+      break;
+    }
+    if (/^[>\s❯]*[1-9]\.\s+\S/.test(l)) {
+      optionCount++;
+      promptEndIdx = j;
+      if (/\b(?:accept|reject|allow|deny|create|change|file|yes|no)\b/i.test(l)) {
+        hasFileEditOption = true;
+      }
+      continue;
+    }
+    if (/^(?:↑\/↓|↑|↓)\s*Navigate\b.*\b(?:tab\s+Amend|f\s+full\s+diff|ctrl\+r\s+Review)\b/i.test(l) || /^esc to cancel\b/i.test(l)) {
+      hasFooter = true;
+      promptEndIdx = j;
+      continue;
+    }
+    if (/^[─━│╭╰╮╯\s]*$/.test(l) && l.length > 5) {
+      break;
+    }
+    if (/^[▶▸\s]*Thought|^●\s*/i.test(l) || /^[│\s]*[❯>]\s*$/.test(l)) {
+      break;
+    }
+  }
+  if (optionCount < 2 || !hasFileEditOption || !hasFooter) {
+    return false;
+  }
+  if (hasTrailingAgyComposer(lines, promptEndIdx, fenceMask)) {
+    return false;
+  }
+  const checkTop = Math.max(0, questionIdx - 120);
+  let hasStructuralEditAnchor = false;
+  for (let j = questionIdx - 1; j >= checkTop; j--) {
+    const raw = lines[j];
+    const l = raw.trim();
+    if (!l) continue;
+    if (/^shift\+tab\s+to\s+auto-approve\s+file\s+(?:edits?|writes?)$/i.test(l) || /^>\s*Displayed as code block\.\s*Widen terminal to view inline\.$/i.test(l) || /^\(no content\)$/i.test(l)) {
+      hasStructuralEditAnchor = true;
+      continue;
+    }
+    if (/^(?:Pending edit|Create file)$/i.test(l)) {
+      hasStructuralEditAnchor = true;
+      break;
+    }
+    if (parseInlineDiffLine(raw) !== null || isFoldedDiffMarkerLine(l)) {
+      hasStructuralEditAnchor = true;
+      continue;
+    }
+    if (/^Reason:\s*\S/i.test(l) || /^[⚠⚠️]\s*/.test(l) || /^Esc disabled during file edits\b/i.test(l)) {
+      continue;
+    }
+    const targetCandidate = matchFileEditTargetLine(raw);
+    if (targetCandidate) {
+      hasStructuralEditAnchor = true;
+      break;
+    }
+    if (hasStructuralEditAnchor) {
+      break;
+    }
+    return false;
+  }
+  return hasStructuralEditAnchor;
+}
 function detectActivePromptKind(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
+  const stripped = stripAnsiAndExpandRep(snapshot);
   const lines = stripped.trimEnd().split("\n");
   const windowStart = Math.max(0, lines.length - 30);
   const approvalRe = /Requesting permission for:/i;
+  const fileEditQuestionRe = /^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/i;
   const fileAccessRe = /^\s*File access\s*$/i;
   const fileAccessQuestionRe = /^\s*Allow access to this file\?\s*$/i;
   const lineInFence = computeFenceMask(lines);
@@ -3752,8 +4285,10 @@ function detectActivePromptKind(snapshot) {
   for (let i = lines.length - 1; i >= 0; i--) {
     const line = lines[i];
     if (i >= windowStart) {
-      if (approvalRe.test(line)) {
-        if (!lineInFence[i] && lastApprovalLineIdx < 0) {
+      if (lastApprovalLineIdx < 0 && !lineInFence[i]) {
+        if (approvalRe.test(line)) {
+          lastApprovalLineIdx = i;
+        } else if (fileEditQuestionRe.test(line) && isStandaloneFileEditContext(lines, i, lineInFence)) {
           lastApprovalLineIdx = i;
         }
       }
@@ -3828,7 +4363,9 @@ function detectActivePromptKind(snapshot) {
         }
       } else if (latestChooserIdx === lastApprovalLineIdx) {
         const hasApprovalOptions = /^[>\s]*[1-9]\. (?:Yes|No)\b/im.test(remainingLines);
-        const hasApprovalFooter = /\besc to cancel\b/i.test(remainingLines);
+        const hasApprovalFooter = /\besc to cancel\b|(?:↑\/↓|↑|↓)\s*Navigate\b.*\b(?:tab\s+Amend|f\s+full\s+diff|ctrl\+r\s+Review)\b/i.test(
+          remainingLines
+        );
         if (hasApprovalOptions && hasApprovalFooter) {
           return "approval";
         }
@@ -4134,7 +4671,7 @@ function isDurationToken(word) {
   return /^\d+[dhms](?:\d+[dhms])*$/i.test(word);
 }
 function extractSystemErrorPrompt(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
+  const stripped = stripAnsiAndExpandRep(snapshot);
   const lines = stripped.split("\n");
   let bannerIdx = -1;
   let rawMessage = "";
@@ -4240,7 +4777,7 @@ function isQuestionFooterLine(line) {
   return /^(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip)(?:\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?))?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?)(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip|back))?(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:space|<space>)\s+(?:to\s+)?(?:select|toggle)(?:\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?))?(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip|back))?$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:(?:→|->)\s*Next|(?:←|<-)\s*Back))*(?:\s*[·│,]\s*(?:enter|<enter>)?\s*(?:Select|Submit(?:\s+All)?|to select))(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel|Back))?(?:\s*[·│,]\s*(?:(?:→|->)\s*Next|(?:←|<-)\s*Back))*(?:\s*[·│,]\s*ctrl\+[a-z0-9]+\s+[a-zA-Z]+)*$/i.test(trimmed) || /^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate(?:\s*[·│,]\s*(?:esc|<esc>)?\s*(?:Skip|Cancel|Back))?$/i.test(trimmed) || /^(?:←|<-)\s*Back\s*[·│,]\s*(?:enter|<enter>)\s+(?:to\s+)?(?:select|submit(?:\s+all)?)(?:\s*[·│,]\s*(?:esc|<esc>)\s+(?:to\s+)?(?:cancel|skip))?$/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) || /^(?:[\u2800-\u28FF]+(?:\s*waiting(?:\.\.\.)?)?|waiting(?:\.\.\.)?)$/i.test(trimmed);
 }
 function extractQuestionHeader(snapshot) {
-  const stripped = snapshot.replace(ANSI_ESCAPE_REGEX, "");
+  const stripped = stripAnsiAndExpandRep(snapshot);
   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;
@@ -4257,9 +4794,17 @@ function extractQuestionHeader(snapshot) {
   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();
-  if (detectActivePromptKind(normalized) === "system_error") {
+  let normalized = stripAnsiAndExpandRep(snapshot).replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/[ \t]+\n/g, "\n").trim();
+  const activeKind = detectActivePromptKind(normalized);
+  if (activeKind === "system_error") {
     normalized = normalized.replace(/\bResets\s+in\s+\d+[dhms](?:\s*\d+[dhms])*\.?/gi, "Resets in <duration>");
+  } else if (activeKind === "approval") {
+    const fileEdit = extractFileEditPrompt(snapshot);
+    if (fileEdit?.body) {
+      normalized = `${normalized}
+@@file-edit-body@@
+${fileEdit.body}`;
+    }
   }
   return (0, import_crypto.createHash)("sha256").update(normalized).digest("hex");
 }
@@ -4304,14 +4849,37 @@ function parseApprovalSnapshot(snapshot) {
       return parseSystemErrorSnapshot(stripped, snapshot, systemError);
     }
   }
+  if (kind === "approval") {
+    const lines = stripped.trimEnd().split("\n");
+    const windowStart = Math.max(0, lines.length - 30);
+    let lastCmdApprovalIdx = -1;
+    let lastFileEditIdx = -1;
+    for (let i = lines.length - 1; i >= windowStart; i -= 1) {
+      const l = lines[i];
+      if (lastCmdApprovalIdx < 0 && (/Requesting permission for:/i.test(l) || /Do you want to proceed\?/i.test(l))) {
+        lastCmdApprovalIdx = i;
+      }
+      if (lastFileEditIdx < 0 && /^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/i.test(l)) {
+        lastFileEditIdx = i;
+      }
+    }
+    if (lastFileEditIdx > lastCmdApprovalIdx) {
+      const fileEdit = extractFileEditPrompt(snapshot);
+      if (fileEdit) {
+        return parseFileEditSnapshot(stripped, snapshot, fileEdit);
+      }
+    }
+  }
   return parseApprovalUISnapshot(stripped, snapshot);
 }
 function buildApprovalSemanticKey(candidate) {
   const normalize = (value) => (value ?? "").replace(/\s+/g, " ").trim();
+  const rawBody = (candidate.body ?? "").replace(/\r\n/g, "\n");
+  const isDiffBody = /```diff\b/i.test(rawBody) || /^(?:Accept this file edit\?|Allow creation of this file\?)/i.test(candidate.fullHeaderLine ?? "");
   const payload = {
     kind: candidate.kind,
     headerText: normalize(candidate.headerText),
-    body: normalize(candidate.body),
+    body: isDiffBody ? rawBody.trim() : normalize(rawBody),
     options: (candidate.options ?? []).map((option) => ({
       number: option.number,
       text: normalize(option.text)
@@ -4322,6 +4890,13 @@ function buildApprovalSemanticKey(candidate) {
   };
   return (0, import_crypto2.createHash)("sha256").update(JSON.stringify(payload)).digest("hex");
 }
+function buildApprovalRedrawSemanticKey(candidate) {
+  const rightTrimmedBody = (candidate.body ?? "").replace(/\r\n/g, "\n").split("\n").map((line) => line.replace(/[ \t]+$/g, "")).join("\n");
+  return buildApprovalSemanticKey({
+    ...candidate,
+    body: rightTrimmedBody
+  });
+}
 function hasNegativeApprovalOption(options) {
   return options.some((option) => /^(?:no|deny|reject|cancel)\b/i.test(option.text.trim()));
 }
@@ -4349,6 +4924,30 @@ function parseFileAccessSnapshot(stripped, originalSnapshot, prompt) {
     paneHash: hashPromptSnapshot(originalSnapshot)
   };
 }
+function parseFileEditSnapshot(stripped, originalSnapshot, prompt) {
+  const lines = stripped.split("\n");
+  let questionIndex = -1;
+  for (let index = lines.length - 1; index >= 0; index -= 1) {
+    if (/^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/i.test(lines[index])) {
+      questionIndex = index;
+      break;
+    }
+  }
+  const belowQuestion = questionIndex >= 0 ? lines.slice(questionIndex + 1).join("\n") : stripped;
+  const options = parseOptions(belowQuestion);
+  if (options.length < 2 || !hasNegativeApprovalOption(options)) return null;
+  return {
+    kind: "approval",
+    headerText: prompt.identity,
+    fullHeaderLine: prompt.fullLine,
+    command: void 0,
+    filePath: prompt.filePath,
+    options,
+    submitMap: buildApprovalSubmitMap(options),
+    body: prompt.body,
+    paneHash: hashPromptSnapshot(originalSnapshot)
+  };
+}
 function parseSystemErrorSnapshot(stripped, originalSnapshot, prompt) {
   return {
     kind: "system_error",
@@ -4478,7 +5077,7 @@ function buildQuestionSubmitMap(options) {
 function isWriteInInputActive(paneText, expectedHeader, expectedStep, expectedBodyText) {
   if (!paneText) return false;
   if (detectActivePromptKind(paneText) !== "question") return false;
-  const stripped = paneText.replace(ANSI_ESCAPE_REGEX2, "");
+  const stripped = stripAnsiAndExpandRep(paneText);
   const lines = stripped.trimEnd().split("\n");
   const windowStart = Math.max(0, lines.length - 30);
   let headerIdx = -1;
@@ -4611,12 +5210,13 @@ function extractIdentity(headerText) {
 function guessToolTypeFromIdentity(c) {
   if (c.kind === "question") return "ASK_QUESTION";
   if (c.command) return "RUN_COMMAND";
-  if (c.filePath) return "CODE_ACTION";
+  if (c.filePath || c.headerText === "file edit" || c.headerText === "create file" || c.headerText === "file creation") {
+    return "CODE_ACTION";
+  }
   return "GENERIC";
 }
-var ANSI_ESCAPE_REGEX2 = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
 function stripAnsi(s) {
-  return s.replace(ANSI_ESCAPE_REGEX2, "");
+  return stripAnsiAndExpandRep(s);
 }
 
 // src/event-mapper.ts
@@ -4806,6 +5406,10 @@ function hookToolNameToTranscriptType(hookName) {
   switch (upper) {
     case "LIST_DIR":
       return "LIST_DIRECTORY";
+    case "READ_FILE":
+      return "VIEW_FILE";
+    case "EDIT_FILE":
+    case "WRITE_FILE":
     case "REPLACE_FILE_CONTENT":
     case "MULTI_REPLACE_FILE_CONTENT":
     case "WRITE_TO_FILE":
@@ -4842,6 +5446,8 @@ function extractFilePathFromArgs(toolName, args) {
   if (!args || typeof args !== "object") return void 0;
   const a = args;
   for (const key of [
+    "Path",
+    "AbsolutePath",
     "TargetFile",
     "FilePath",
     "file_path",
@@ -5266,6 +5872,32 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       });
       return null;
     }
+    if (candidate.kind === "approval") {
+      const candidateSemanticKey = buildApprovalSemanticKey(candidate);
+      const candidateRedrawSemanticKey = buildApprovalRedrawSemanticKey(candidate);
+      const existing = [...this.pendingPrompts.values()].find(
+        (p) => p.conversationId === conversationId && p.kind === candidate.kind && (p.paneSemanticKey === candidateSemanticKey || p.paneRedrawSemanticKey !== void 0 && p.paneRedrawSemanticKey === candidateRedrawSemanticKey)
+      );
+      if (existing) {
+        if (existing.paneHash && existing.paneHash !== candidate.paneHash) {
+          this.paneOnlyEmittedHashes.delete(existing.paneHash);
+        }
+        existing.paneHash = candidate.paneHash;
+        if (candidate.paneHash) {
+          this.paneOnlyEmittedHashes.add(candidate.paneHash);
+        }
+        existing.paneSemanticKey = candidateSemanticKey;
+        existing.paneRedrawSemanticKey = candidateRedrawSemanticKey;
+        existing.body = candidate.body;
+        logger.debug("Skipping pane-only re-emit for active approval with matching semantic key", {
+          promptId: existing.promptId,
+          paneSemanticKey: candidateSemanticKey.substring(0, 16),
+          paneRedrawSemanticKey: candidateRedrawSemanticKey.substring(0, 16),
+          paneHash: candidate.paneHash.substring(0, 16)
+        });
+        return null;
+      }
+    }
     if (candidate.kind === "question") {
       const paneQuestionText = candidate.headerText || candidate.fullHeaderLine;
       const candidateSemanticKey = buildApprovalSemanticKey(candidate);
@@ -5478,7 +6110,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       toolType: matchingCall?.toolType ?? guessToolTypeFromIdentity(candidate),
       command: matchingCall?.command ?? candidate.command,
       filePath: matchingCall?.filePath ?? candidate.filePath,
-      rawToolName: matchingCall?.rawToolName ?? (candidate.kind === "question" ? "ask_question" : candidate.command ?? candidate.filePath ?? "unknown"),
+      rawToolName: matchingCall?.rawToolName ?? (candidate.kind === "question" ? "ask_question" : candidate.headerText === "create file" || candidate.headerText === "file creation" ? "write_file" : candidate.headerText === "file edit" ? "edit_file" : candidate.command ?? candidate.filePath ?? "unknown"),
       questionText: synthLineMatch?.stitchedHeaderText ?? (candidate.kind === "question" && candidate.headerText ? candidate.headerText : matchingCall?.questionText),
       // NOTE (Codex R3-F1 / Claude R3-F2): Pane options are authoritative ground truth
       // that directly correspond to desktop keystrokes (submitMap). Transcript options
@@ -5502,6 +6134,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       body: synthLineMatch ? synthLineMatch.remainingBody || void 0 : candidate.body,
       paneOptions: candidate.options,
       paneSemanticKey: buildApprovalSemanticKey(candidate),
+      paneRedrawSemanticKey: buildApprovalRedrawSemanticKey(candidate),
       kind: candidate.kind,
       isHookPrompt: isHookCall,
       // Carry hook ownership forward so pane redraws do not drop it! (Codex S2-Codex-R6-F15)
@@ -5822,6 +6455,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
       body: candidate.body,
       paneOptions: candidate.options,
       paneSemanticKey: buildApprovalSemanticKey(candidate),
+      paneRedrawSemanticKey: buildApprovalRedrawSemanticKey(candidate),
       kind: candidate.kind,
       emittedAt: Date.now(),
       ttlMs: this.promptTtlMs
@@ -6800,8 +7434,11 @@ function friendlyHookToolName(rawName, resultType) {
       return "LS";
     case "GREP_SEARCH":
       return "Grep";
+    case "READ_FILE":
     case "VIEW_FILE":
       return "Read";
+    case "EDIT_FILE":
+    case "WRITE_FILE":
     case "WRITE_TO_FILE":
     case "REPLACE_FILE_CONTENT":
     case "MULTI_REPLACE_FILE_CONTENT":
@@ -9494,14 +10131,19 @@ var McpServer = class _McpServer {
       });
     }
     const toolName = diffParsed ? "Edit" : state.pendingCall?.toolType;
-    const filePath = diffParsed?.filePath ?? state.pendingCall?.filePath;
+    const filePath = state.pendingCall?.filePath ?? diffParsed?.filePath;
     const toolInput = diffParsed ? {
-      file_path: diffParsed.filePath,
+      file_path: filePath,
       old_string: diffParsed.oldString,
       new_string: diffParsed.newString,
       old_start_line: diffParsed.oldStartLine,
       new_start_line: diffParsed.newStartLine,
-      diff: diffParsed.rawDiff
+      diff: diffParsed.rawDiff,
+      ...diffParsed.diffStat ? { diff_stat: diffParsed.diffStat } : {},
+      ...diffParsed.partial ? {
+        partial: true,
+        ...diffParsed.omissionNote ? { omission_note: diffParsed.omissionNote } : {}
+      } : {}
     } : void 0;
     const optionsForMobile = state.pendingCall ? {
       promptId: state.promptId,
@@ -9535,7 +10177,8 @@ var McpServer = class _McpServer {
         })()
       } : {}
     } : { promptId: state.promptId };
-    const content = state.paneDisplayHeader || state.matchedPaneHeader || state.pendingCall?.command || state.pendingCall?.filePath || "approval requested";
+    const baseContent = state.paneDisplayHeader || state.matchedPaneHeader || state.pendingCall?.command || state.pendingCall?.filePath || "approval requested";
+    const content = diffParsed?.partial && diffParsed.omissionNote && !baseContent.includes(diffParsed.omissionNote) ? `${baseContent} \u2014 partial diff (${diffParsed.omissionNote})` : baseContent;
     const input = {
       sessionId: session.sessionId,
       type: import_codevibe_core7.EventType.INTERACTIVE_PROMPT,
@@ -10451,6 +11094,9 @@ function parseFencedDiffFromBody(body, header) {
   const rawDiff = fenceMatch[1];
   const oldLines = [];
   const newLines = [];
+  const omissionNotes = [];
+  let diffStat;
+  let partial = false;
   const hunkHeaderPattern = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
   let currentOldLine = 0;
   let currentNewLine = 0;
@@ -10465,6 +11111,17 @@ function parseFencedDiffFromBody(body, header) {
     return p;
   };
   for (const line of rawDiff.split("\n")) {
+    const statComment = line.match(/^#\s*diff-stat:\s*((?:\+\d+(?:\s+-\d+)?|-\d+))\s*$/i);
+    if (statComment) {
+      diffStat = statComment[1].replace(/\s+/g, " ").trim();
+      continue;
+    }
+    const omissionComment = line.match(/^#\s*(?:partial-diff|omitted):\s*(.+)$/i);
+    if (omissionComment) {
+      partial = true;
+      omissionNotes.push(omissionComment[1].trim());
+      continue;
+    }
     const hunkMatch = line.match(hunkHeaderPattern);
     if (hunkMatch) {
       hunkCount += 1;
@@ -10472,12 +11129,12 @@ function parseFencedDiffFromBody(body, header) {
       currentNewLine = Number.parseInt(hunkMatch[2], 10);
       continue;
     }
-    if (line.startsWith("+++ ")) {
+    if (hunkCount === 0 && line.startsWith("+++ ")) {
       const pathVal = stripPrefix(line.slice(4));
       if (pathVal) filePath = pathVal;
       continue;
     }
-    if (line.startsWith("--- ")) {
+    if (hunkCount === 0 && line.startsWith("--- ")) {
       if (!filePath) {
         const pathVal = stripPrefix(line.slice(4));
         if (pathVal) filePath = pathVal;
@@ -10504,8 +11161,9 @@ function parseFencedDiffFromBody(body, header) {
     oldStartLine = void 0;
     newStartLine = void 0;
   }
+  const isFileEditHeader = /^(?:Accept this file edit\?|Allow creation of this file\?)/i.test(header ?? "");
   if (!filePath) {
-    const searchTargets = [body, header ?? ""];
+    const searchTargets = isFileEditHeader ? [header ?? ""] : [body, header ?? ""];
     for (const target of searchTargets) {
       if (!target) continue;
       const m = target.match(/\[.*?\]\(file:\/\/([^\s\)]+)\)/) || target.match(/file:\/\/([^\s\)]+)/);
@@ -10525,7 +11183,12 @@ function parseFencedDiffFromBody(body, header) {
     newString: newLines.join("\n"),
     oldStartLine,
     newStartLine,
-    rawDiff
+    rawDiff,
+    ...diffStat ? { diffStat } : {},
+    ...partial ? {
+      partial: true,
+      ...omissionNotes.length > 0 ? { omissionNote: omissionNotes.join("; ") } : {}
+    } : {}
   };
 }
 var __testing = {
@@ -10550,6 +11213,7 @@ var __testing = {
   commandDigest,
   detectActivePromptKind,
   extractFileAccessPrompt,
+  extractFileEditPrompt,
   extractSystemErrorPrompt,
   generateLaunchSessionId,
   getActiveConversationFromCliLog,
@@ -10564,5 +11228,6 @@ var __testing = {
   readTranscriptFirstType,
   reconstructFooter,
   runForeignSpawnIdle,
-  safeIsoTimestamp
+  safeIsoTimestamp,
+  stripAnsiAndExpandRep
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.100",
+  "version": "2.0.102",
   "description": "Control Antigravity CLI from your iPhone and Android — real-time sync, approve file edits, send prompts by voice. Part of CodeVibe.",
   "main": "dist/server.js",
   "codevibe": {
@@ -46,7 +46,7 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@quantiya/codevibe-core": "^2.0.88",
+    "@quantiya/codevibe-core": "^2.0.89",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",