@quantiya/codevibe-antigravity-plugin 2.0.101 → 2.0.102

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;
@@ -4701,8 +4795,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 +4864,7 @@ function parseApprovalSnapshot(snapshot) {
       }
     }
     if (lastFileEditIdx > lastCmdApprovalIdx) {
-      const fileEdit = extractFileEditPrompt(stripped);
+      const fileEdit = extractFileEditPrompt(snapshot);
       if (fileEdit) {
         return parseFileEditSnapshot(stripped, snapshot, fileEdit);
       }
@@ -4788,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()));
 }
@@ -5763,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);
@@ -5999,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)
@@ -6319,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

package/package.json

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