@quantiya/codevibe-antigravity-plugin 2.0.101 → 2.0.103

package/dist/agy-hook.js

@@ -100,8 +100,32 @@ function decodeBoolean(val) {
   if (typeof val === "number") return val !== 0;
   return false;
 }
+function sliceToSerializedBudget(rawText, buildCandidate, maxChars) {
+  if (maxChars <= 0) return null;
+  const emptyCandidate = buildCandidate("");
+  if (emptyCandidate.length > maxChars) {
+    return "[]".length <= maxChars ? "[]" : null;
+  }
+  const fullCandidate = buildCandidate(rawText);
+  if (fullCandidate.length <= maxChars) return fullCandidate;
+  let low = 0;
+  let high = rawText.length;
+  let best = emptyCandidate;
+  while (low <= high) {
+    const mid = low + high >>> 1;
+    const candidate = buildCandidate(rawText.slice(0, mid));
+    if (candidate.length <= maxChars) {
+      best = candidate;
+      low = mid + 1;
+    } else {
+      high = mid - 1;
+    }
+  }
+  return best;
+}
 function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyHint) {
   try {
+    if (maxChars <= 0) return null;
     let parsed = value;
     if (typeof value === "string") {
       const trimmed = value.trim();
@@ -121,15 +145,15 @@ function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyH
       );
       if (isOptionArray) {
         const boundedOptions = parsed.slice(0, 30).map((opt, idx) => {
-          if (typeof opt === "string") return { number: String(idx + 1), text: opt.slice(0, 256) };
+          if (typeof opt === "string") return { number: String(idx + 1), text: opt };
           if (typeof opt === "number") return { number: String(idx + 1), text: String(opt) };
           if (opt && typeof opt === "object") {
             const optObj = opt;
             const num = typeof optObj.number !== "undefined" ? String(optObj.number).slice(0, 16) : String(idx + 1);
-            const txt = typeof optObj.text === "string" ? optObj.text.slice(0, 256) : String(optObj.text ?? optObj.label ?? optObj.value ?? "").slice(0, 256);
+            const txt = typeof optObj.text === "string" ? optObj.text : String(optObj.text ?? optObj.label ?? optObj.value ?? "");
             return { number: num, text: txt };
           }
-          return { number: String(idx + 1), text: String(opt ?? "").slice(0, 256) };
+          return { number: String(idx + 1), text: String(opt ?? "") };
         });
         const str2 = JSON.stringify(boundedOptions);
         if (str2.length <= maxChars) return str2;
@@ -139,38 +163,41 @@ function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyH
         }
         const firstOpt = boundedOptions[0];
         if (firstOpt) {
-          const safeText = firstOpt.text.slice(0, Math.max(0, maxChars - 30));
-          return JSON.stringify([{ number: firstOpt.number, text: safeText }]);
+          return sliceToSerializedBudget(
+            firstOpt.text,
+            (safeText) => JSON.stringify([{ number: firstOpt.number, text: safeText }]),
+            maxChars
+          );
         }
-        return JSON.stringify(boundedOptions.slice(0, 1));
+        return "[]".length <= maxChars ? "[]" : null;
       }
       const bounded = parsed.slice(0, 20).map((item) => {
-        if (typeof item === "string") return { question: item.slice(0, 1024), options: [] };
+        if (typeof item === "string") return { question: item, options: [] };
         if (item && typeof item === "object") {
           const res = {};
           const obj = item;
-          if (typeof obj.question === "string") res.question = obj.question.slice(0, 1024);
+          if (typeof obj.question === "string") res.question = obj.question;
           if (typeof obj.is_multi_select !== "undefined") res.is_multi_select = decodeBoolean(obj.is_multi_select);
           if (typeof obj.isMultiSelect !== "undefined") res.isMultiSelect = decodeBoolean(obj.isMultiSelect);
           if (Array.isArray(obj.options)) {
-            res.options = obj.options.slice(0, 25).map((opt, idx) => {
-              if (typeof opt === "string") return opt.slice(0, 256);
+            res.options = obj.options.slice(0, 25).map((opt) => {
+              if (typeof opt === "string") return opt;
               if (typeof opt === "number") return String(opt);
               if (opt && typeof opt === "object") {
                 const optObj = opt;
                 return {
                   ...typeof optObj.number !== "undefined" ? { number: String(optObj.number).slice(0, 16) } : {},
-                  text: typeof optObj.text === "string" ? optObj.text.slice(0, 256) : String(optObj.text ?? optObj.label ?? optObj.value ?? "").slice(0, 256)
+                  text: typeof optObj.text === "string" ? optObj.text : String(optObj.text ?? optObj.label ?? optObj.value ?? "")
                 };
               }
-              return String(opt ?? "").slice(0, 256);
+              return String(opt ?? "");
             });
           }
           return res;
         }
-        return { question: String(item).slice(0, 1024), options: [] };
+        return { question: String(item), options: [] };
       });
-      let str = JSON.stringify(bounded);
+      const str = JSON.stringify(bounded);
       if (str.length <= maxChars) return str;
       for (let i = bounded.length - 1; i >= 1; i--) {
         const sub = JSON.stringify(bounded.slice(0, i));
@@ -178,11 +205,20 @@ function serializeStructuredArg(value, maxChars = MAX_STRUCTURED_ARG_CHARS, keyH
       }
       const firstQ = bounded[0];
       if (firstQ && typeof firstQ === "object") {
-        const qText = typeof firstQ.question === "string" ? firstQ.question : "";
-        const safeQText = qText.slice(0, Math.max(0, maxChars - 30));
-        return JSON.stringify([{ question: safeQText, options: [] }]);
+        const qObj = firstQ;
+        const qText = typeof qObj.question === "string" ? qObj.question : "";
+        const opts = Array.isArray(qObj.options) ? qObj.options : [];
+        for (let k = opts.length - 1; k >= 1; k--) {
+          const subQ = JSON.stringify([{ ...qObj, options: opts.slice(0, k) }]);
+          if (subQ.length <= maxChars) return subQ;
+        }
+        return sliceToSerializedBudget(
+          qText,
+          (safeQText) => JSON.stringify([{ question: safeQText, options: [] }]),
+          maxChars
+        );
       }
-      return JSON.stringify(bounded.slice(0, 1));
+      return "[]".length <= maxChars ? "[]" : null;
     }
     if (parsed && typeof parsed === "object") {
       const raw = JSON.stringify(parsed);
@@ -216,6 +252,8 @@ function buildBody(raw) {
           if (key === "questions" || key === "options") {
             const serialized = serializeStructuredArg(value, MAX_STRUCTURED_ARG_CHARS, key);
             if (serialized !== null) kept[key] = serialized;
+          } else if (key === "question" || key === "prompt") {
+            kept[key] = value.slice(0, MAX_STRUCTURED_ARG_CHARS);
           } else {
             kept[key] = value.slice(0, MAX_TOOL_ARG_CHARS);
           }

package/dist/server.js

@@ -2448,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;
@@ -2482,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
@@ -2707,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) {
@@ -2754,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,
@@ -2774,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,
@@ -2825,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
@@ -2846,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) {
@@ -2863,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;
         }
@@ -2871,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;
@@ -2898,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;
@@ -3462,8 +3556,9 @@ function looksLikePromptSnapshot(snapshot) {
       const allLines = stripped.trimEnd().split("\n");
       const fenceMask = computeFenceMask(allLines);
       const windowStart = Math.max(0, allLines.length - 30);
+      const questionWindowStart = Math.max(0, allLines.length - 80);
       let headerIdx = -1;
-      for (let i = allLines.length - 1; i >= windowStart; i--) {
+      for (let i = allLines.length - 1; i >= questionWindowStart; i--) {
         if (!fenceMask[i] && isQuestionHeaderLine(allLines[i])) {
           headerIdx = i;
           break;
@@ -3471,9 +3566,16 @@ function looksLikePromptSnapshot(snapshot) {
       }
       if (headerIdx < 0) return false;
       const headerLine = allLines[headerIdx].trim();
+      const isTallHeader = headerIdx < windowStart;
       const optionIndices = [];
       for (let i = headerIdx + 1; i < allLines.length; i++) {
-        if (!fenceMask[i] && /^[>\s❯]*[1-9][.)]\s+\S/.test(allLines[i].trim())) {
+        if (fenceMask[i]) continue;
+        const trimmed = allLines[i].trim();
+        if (!trimmed) continue;
+        if ((isTallHeader || optionIndices.length > 0) && isResumedTurnSignal(trimmed) || isComposerBoxAt(allLines, i) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) {
+          return false;
+        }
+        if (/^(?:[>\s❯]{0,4})[1-9][.)]\s+\S/.test(allLines[i])) {
           optionIndices.push(i);
         }
       }
@@ -3497,7 +3599,7 @@ function looksLikePromptSnapshot(snapshot) {
           }
         }
       }
-      if (!hasQuestionFooter) return false;
+      if (!hasQuestionFooter || footerIdx < windowStart) return false;
       if (hasTrailingAgyComposer(allLines, footerIdx, fenceMask)) {
         return false;
       }
@@ -4216,6 +4318,38 @@ function detectActivePromptKind(snapshot) {
     }
     if (lastApprovalLineIdx >= 0 && lastQuestionLineIdx >= 0 && lastFileAccessLineIdx >= 0 && lastSystemErrorLineIdx >= 0) break;
   }
+  if (lastQuestionLineIdx < 0 && lastApprovalLineIdx < 0 && lastFileAccessLineIdx < 0) {
+    const tallQuestionStart = Math.max(0, lines.length - 80);
+    for (let i = windowStart - 1; i >= tallQuestionStart; i--) {
+      if (lineInFence[i]) continue;
+      if (isQuestionHeaderLine(lines[i])) {
+        let optCount = 0;
+        let footerInBottomWindow = false;
+        let footerIdx = i;
+        let interrupted = false;
+        for (let j = i + 1; j < lines.length; j++) {
+          if (lineInFence[j]) continue;
+          const trimmed = lines[j].trim();
+          if (!trimmed) continue;
+          if (approvalRe.test(trimmed) || fileEditQuestionRe.test(trimmed) || fileAccessRe.test(trimmed) || fileAccessQuestionRe.test(trimmed) || /Do you want to proceed\?/i.test(trimmed) || isResumedTurnSignal(trimmed) || isComposerBoxAt(lines, j) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) {
+            interrupted = true;
+            break;
+          }
+          if (/^(?:[>\s❯]{0,4})[1-9][.)]\s+\S/.test(lines[j])) {
+            optCount += 1;
+          } else if (isQuestionFooterLine(trimmed) && j >= windowStart) {
+            footerInBottomWindow = true;
+            footerIdx = j;
+            break;
+          }
+        }
+        if (!interrupted && optCount >= 2 && footerInBottomWindow && !hasTrailingAgyComposer(lines, footerIdx, lineInFence)) {
+          lastQuestionLineIdx = i;
+        }
+        break;
+      }
+    }
+  }
   if (lastApprovalLineIdx < 0 && lastQuestionLineIdx < 0) {
     for (let i = lines.length - 1; i >= windowStart; i--) {
       if (/Do you want to proceed\?/i.test(lines[i])) {
@@ -4241,7 +4375,7 @@ function detectActivePromptKind(snapshot) {
         for (let j = lastSystemErrorLineIdx + 1; j < lines.length; j++) {
           if (!lineInFence[j]) {
             const trimmed = lines[j].trim();
-            if (hasQuestionOptions && isResumedTurnSignal(trimmed)) {
+            if ((hasQuestionOptions || lastQuestionLineIdx < windowStart) && isResumedTurnSignal(trimmed)) {
               break;
             }
             if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
@@ -4295,7 +4429,7 @@ function detectActivePromptKind(snapshot) {
         if (isAgyStatusFooterLine(trimmed) || /^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help)\b/i.test(trimmed) || isComposerBoxAt(lines, j)) {
           break;
         }
-        if (hasFoundOptions && isResumedTurnSignal(trimmed)) {
+        if ((hasFoundOptions || lastQuestionLineIdx < windowStart) && isResumedTurnSignal(trimmed)) {
           break;
         }
         if (/^[>\s❯]*[1-9][.)]\s+\S/.test(trimmed)) {
@@ -4701,8 +4835,16 @@ function extractQuestionHeader(snapshot) {
 }
 function hashPromptSnapshot(snapshot) {
   let normalized = stripAnsiAndExpandRep(snapshot).replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/[ \t]+\n/g, "\n").trim();
-  if (detectActivePromptKind(normalized) === "system_error") {
+  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");
 }
@@ -4762,7 +4904,7 @@ function parseApprovalSnapshot(snapshot) {
       }
     }
     if (lastFileEditIdx > lastCmdApprovalIdx) {
-      const fileEdit = extractFileEditPrompt(stripped);
+      const fileEdit = extractFileEditPrompt(snapshot);
       if (fileEdit) {
         return parseFileEditSnapshot(stripped, snapshot, fileEdit);
       }
@@ -4780,7 +4922,8 @@ function buildApprovalSemanticKey(candidate) {
     body: isDiffBody ? rawBody.trim() : normalize(rawBody),
     options: (candidate.options ?? []).map((option) => ({
       number: option.number,
-      text: normalize(option.text)
+      text: normalize(option.text),
+      ...option.rawLines && option.rawLines.length > 1 ? { rawLines: option.rawLines.map((line) => normalize(line)) } : {}
     })),
     submitMap: Object.fromEntries(
       Object.entries(candidate.submitMap ?? {}).sort(([left], [right]) => Number(left) - Number(right)).map(([number, keys]) => [number, [...keys]])
@@ -4788,6 +4931,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()));
 }
@@ -4894,7 +5044,7 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
     }
   }
   const belowHeader = headerIdx >= 0 ? lines.slice(headerIdx + 1).join("\n") : stripped;
-  const options = parseOptions(belowHeader);
+  const options = parseOptions(belowHeader, 80);
   if (options.length < 2) return null;
   const normalizedHeader = header.fullLine.replace(/^[❯>\s*•-]+\s*/, "").trim();
   const isMultiSelect = /\bselect\s+(?:all|multiple)\b/i.test(normalizedHeader) || /\bselect\s+(?:all|multiple)\b/i.test(belowHeader) || /(?:<space>|\bspace)\s+(?:to\s+)?(?:select|toggle)\b/i.test(belowHeader) || /\bctrl\+a\s+select\s+all\b/i.test(belowHeader);
@@ -4915,7 +5065,7 @@ function parseQuestionSnapshot(stripped, originalSnapshot, header) {
 }
 function extractBodyBetweenHeaderAndFirstOption(belowHeader) {
   const lines = belowHeader.split("\n");
-  const optionRegex = /^[>\s❯]*([1-9])[.)]\s+(.+?)\s*$/;
+  const optionRegex = /^(?:[>\s❯]{0,4})([1-9])[.)]\s+(.+?)\s*$/;
   const lineInFence = computeFenceMask(lines);
   let firstOptionIdx = -1;
   for (let i = 0; i < lines.length; i++) {
@@ -4928,7 +5078,34 @@ function extractBodyBetweenHeaderAndFirstOption(belowHeader) {
   if (firstOptionIdx <= 0) return "";
   return lines.slice(0, firstOptionIdx).join("\n").trim();
 }
-function parseOptions(snapshot) {
+function isOptionContinuationBoundary(trimmed, rawLine, nextTrimmedLine) {
+  if (!trimmed) return true;
+  if (/^[•‣◦▪▫]\s/.test(trimmed)) return true;
+  if (/^\s{2,4}[-*]\s/.test(rawLine)) return true;
+  if (isQuestionFooterLine(trimmed)) return true;
+  if (isQuestionHeaderLine(trimmed)) return true;
+  if (isResumedTurnSignal(trimmed)) return true;
+  if (/^[─━═-]{4,}$/.test(trimmed)) return true;
+  if (/^\s*esc to cancel\b/i.test(trimmed)) return true;
+  if (/^(?:↑\/↓|↑|↓|\^|v)\s*(?:\/|\s+)?Navigate\b/i.test(trimmed)) return true;
+  if (/^ctrl\+[a-z0-9]+\s+[a-zA-Z]+$/i.test(trimmed)) return true;
+  if (/^\(?use\s+(?:arrow|\S+)\s+keys[^)]*\)?$/i.test(trimmed)) return true;
+  if (!/^ {5,}/.test(rawLine) && /^Your answer:/i.test(trimmed) && (/^Your answer:\s*$/i.test(trimmed) || Boolean(
+    nextTrimmedLine && (isQuestionFooterLine(nextTrimmedLine) || /^\(?Enter to submit(?:\s*,\s*esc to cancel)?\)?\s*$/i.test(nextTrimmedLine) || /^\s*esc to cancel\b/i.test(nextTrimmedLine))
+  ))) {
+    return true;
+  }
+  if (!/^ {5,}/.test(rawLine) && /^\(?Enter to submit(?:\s*,\s*esc to cancel)?\)?\s*$/i.test(trimmed)) {
+    return true;
+  }
+  if (/^\s*(?:[❯>]\s*)?\?\s+for\s+(?:shortcuts|help|commands|options|keybindings|menu)\b/i.test(trimmed)) return true;
+  if (/Requesting permission for:/i.test(trimmed)) return true;
+  if (/Do you want to proceed\?/i.test(trimmed)) return true;
+  if (/^\s*Allow access to this file\?\s*$/i.test(trimmed)) return true;
+  if (/^\s*(?:Accept this file edit\?|Allow creation of this file\?)\s*$/i.test(trimmed)) return true;
+  return false;
+}
+function parseOptions(snapshot, maxRecentLines = 30) {
   const lines = snapshot.split("\n");
   const lineInFence = computeFenceMask(lines);
   const filteredLines = [];
@@ -4940,16 +5117,72 @@ function parseOptions(snapshot) {
   while (filteredLines.length > 0 && filteredLines[filteredLines.length - 1].trim() === "") {
     filteredLines.pop();
   }
-  const recent = filteredLines.slice(-30);
-  const optionRegex = /^[>\s❯]*([1-9])[.)]\s+(.+?)\s*$/;
+  const recent = filteredLines.slice(-Math.max(30, maxRecentLines));
+  const optionRegex = /^(?:[>\s❯]{0,4})([1-9])[.)]\s+(.+?)\s*$/;
   const found = /* @__PURE__ */ new Map();
-  for (const line of recent) {
+  let currentOptionNum = null;
+  let currentOptionTextCol = 5;
+  let prevOptionRawLen = 0;
+  for (let idx = 0; idx < recent.length; idx++) {
+    const line = recent[idx];
     const m = line.match(optionRegex);
-    if (!m) continue;
-    const num = m[1];
-    found.set(num, m[2].trim());
+    if (m) {
+      const num = m[1];
+      const text = m[2].trim();
+      const prefixMatch = line.match(/^(?:[>\s❯]{0,4})[1-9][.)]\s+/);
+      currentOptionTextCol = prefixMatch ? prefixMatch[0].length : 5;
+      prevOptionRawLen = line.trimEnd().length;
+      found.set(num, {
+        text,
+        rawLines: [text],
+        rawLineLengths: [prevOptionRawLen]
+      });
+      currentOptionNum = /^\s*write-?in(?:\s*(?:\.{3}|…))?\s*$/i.test(text) ? null : num;
+      continue;
+    }
+    const trimmed = line.trim();
+    if (currentOptionNum !== null) {
+      let nextTrimmedLine;
+      for (let k = idx + 1; k < recent.length; k++) {
+        const nt = recent[k].trim();
+        if (nt) {
+          nextTrimmedLine = nt;
+          break;
+        }
+      }
+      const leadingSpaces = (line.match(/^\s*/)?.[0] ?? "").length;
+      const isIndentedContinuation = leadingSpaces >= Math.max(4, currentOptionTextCol);
+      const isColumnZeroWrapContinuation = leadingSpaces === 0;
+      if (isOptionContinuationBoundary(trimmed, line, nextTrimmedLine) || !isIndentedContinuation && !isColumnZeroWrapContinuation) {
+        currentOptionNum = null;
+      } else {
+        const entry = found.get(currentOptionNum);
+        if (entry) {
+          const existing = entry.text;
+          entry.text = existing ? `${existing} ${trimmed}` : trimmed;
+          entry.rawLines.push(trimmed);
+          prevOptionRawLen = line.trimEnd().length;
+          entry.rawLineLengths.push(prevOptionRawLen);
+        }
+      }
+    }
   }
-  return Array.from(found.entries()).sort(([a], [b]) => Number(a) - Number(b)).map(([number, text]) => ({ number, text }));
+  return Array.from(found.entries()).sort(([a], [b]) => Number(a) - Number(b)).map(([number, entry]) => {
+    const opt = { number, text: entry.text };
+    if (entry.rawLines.length > 1) {
+      Object.defineProperty(opt, "rawLines", {
+        value: entry.rawLines,
+        enumerable: false,
+        configurable: true
+      });
+      Object.defineProperty(opt, "rawLineLengths", {
+        value: entry.rawLineLengths,
+        enumerable: false,
+        configurable: true
+      });
+    }
+    return opt;
+  });
 }
 function buildApprovalSubmitMap(options) {
   const map = {};
@@ -4970,10 +5203,11 @@ function isWriteInInputActive(paneText, expectedHeader, expectedStep, expectedBo
   if (detectActivePromptKind(paneText) !== "question") return false;
   const stripped = stripAnsiAndExpandRep(paneText);
   const lines = stripped.trimEnd().split("\n");
-  const windowStart = Math.max(0, lines.length - 30);
+  const fenceMask = computeFenceMask(lines);
+  const windowStart = Math.max(0, lines.length - 80);
   let headerIdx = -1;
   for (let i = lines.length - 1; i >= windowStart; i--) {
-    if (isQuestionHeaderLine(lines[i])) {
+    if (!fenceMask[i] && isQuestionHeaderLine(lines[i])) {
       headerIdx = i;
       break;
     }
@@ -5763,6 +5997,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);
@@ -5852,10 +6112,13 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
               this.emit("prompt-upgraded", existing);
               return existing;
             }
+            const hasPriorPaneObservation = Boolean(existing.paneSemanticKey);
             const areControlsMutated = (existingOpts, candidateOpts) => {
               if (!existingOpts || !candidateOpts) return false;
               if (existingOpts.length !== candidateOpts.length) return true;
-              return !existingOpts.every((o, idx) => o.number === candidateOpts[idx].number && (o.text || "").trim() === (candidateOpts[idx].text || "").trim());
+              return !existingOpts.every(
+                (o, idx) => o.number === candidateOpts[idx].number && (o.text || "").trim() === (candidateOpts[idx].text || "").trim() && (!hasPriorPaneObservation || JSON.stringify(o.rawLines ?? []) === JSON.stringify(candidateOpts[idx].rawLines ?? []))
+              );
             };
             const isControlDelta = Boolean(
               existing.paneOptions && existing.paneOptions.length > 0 && candidate.options && candidate.options.length > 0 && areControlsMutated(existing.paneOptions, candidate.options)
@@ -5871,6 +6134,9 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
             } else {
               if (!existing.paneSemanticKey) {
                 existing.paneSemanticKey = candidateSemanticKey;
+                if (candidate.options && candidate.options.length > 0) {
+                  existing.paneOptions = candidate.options;
+                }
               }
               if (stepLineMatch) {
                 existing.matchedPaneHeader = stepLineMatch.stitchedHeaderText;
@@ -5999,6 +6265,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)
@@ -6319,6 +6586,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.101",
+  "version": "2.0.103",
   "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": {