@quantiya/codevibe-antigravity-plugin 2.0.15 → 2.0.16

package/dist/server.js

@@ -2092,7 +2092,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
    */
   onPanePromptCleared() {
     if (this.pendingPrompts.size === 0 && this.paneOnlyEmittedHashes.size === 0) {
-      return;
+      return [];
     }
     const now = Date.now();
     const cleared = [];
@@ -2107,6 +2107,7 @@ var ApprovalDetector = class extends import_events3.EventEmitter {
         count: cleared.length
       });
     }
+    return cleared;
   }
   resolvePrompt(promptId) {
     const state = this.pendingPrompts.get(promptId);
@@ -2439,6 +2440,37 @@ var PromptResponder = class {
       };
     }
   }
+  /** Dismiss whichever approval UI is active without binding to a stale promptId. */
+  async dismissActivePrompt() {
+    const target = this.resolveTmuxTarget();
+    if (!target) return { ok: false, reason: "no-tmux-target" };
+    if (!this.paneObserver) {
+      return { ok: false, reason: "prompt-probe-failed" };
+    }
+    try {
+      const before = await this.paneObserver.probeApprovalUIActive();
+      if (!before.probeSucceeded) return { ok: false, reason: "prompt-probe-failed" };
+      if (!before.active) return { ok: true };
+      await this.sendKey(target, "Escape");
+      await delay(250);
+      const after = await this.paneObserver.probeApprovalUIActive();
+      if (!after.probeSucceeded) return { ok: false, reason: "prompt-probe-failed" };
+      if (after.active) {
+        return {
+          ok: false,
+          reason: "prompt-superseded",
+          details: "approval chooser remained active after Escape"
+        };
+      }
+      return { ok: true };
+    } catch (error) {
+      return {
+        ok: false,
+        reason: "tmux-failed",
+        details: error instanceof Error ? error.message : String(error)
+      };
+    }
+  }
   // ─── Tmux primitives ────────────────────────────────────────────────────
   async typeLiteral(target, text) {
     const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\$/g, "\\$").replace(/`/g, "\\`");
@@ -3051,6 +3083,8 @@ var McpServer = class _McpServer {
     // refreshE1Ttls finds it → refreshes → returns no aged-out → never re-fires,
     // leaving the backend row permanently pointed at the RETIRED session = under-nag.
     this.e1NeedsReRaise = /* @__PURE__ */ new Set();
+    this.e1NeedsResolution = /* @__PURE__ */ new Set();
+    this.e1ResolutionInFlight = /* @__PURE__ */ new Map();
     // E1 (§6a-4 / F2) — bounded exponential backoff for the BLOCK-UNTIL-ACK
     // retirement re-raise (the pre-heartbeat drain in createLaunchSession, which must
     // ACK before the replacement's heartbeat advertises liveness — design line 93).
@@ -3263,7 +3297,15 @@ var McpServer = class _McpServer {
         });
       });
       this.addListener(this.paneObserver, "prompt-cleared", () => {
-        this.approvalDetector.onPanePromptCleared();
+        const promptIds = this.approvalDetector.onPanePromptCleared();
+        const session = this.session;
+        if (!session) return;
+        void this.resolveAcceptedInputPrompts(session, promptIds).catch((error) => {
+          logger.warn("Failed to resolve backend prompts after pane cleared", {
+            sessionId: session.sessionId,
+            error: String(error)
+          });
+        });
       });
       await this.paneObserver.start(this.tmuxTarget);
     } else {
@@ -3681,6 +3723,8 @@ var McpServer = class _McpServer {
         }
       }
       if (input.type === import_codevibe_core4.EventType.USER_PROMPT && input.source === import_codevibe_core4.EventSource.DESKTOP) {
+        const clearedPromptIds = this.approvalDetector.onPanePromptCleared();
+        await this.resolveAcceptedInputPrompts(session, clearedPromptIds);
         const dedupe = this.mobileDeduper.consumeIfDuplicate(session.sessionId, input.content);
         if (dedupe) {
           logger.info("Suppressed desktop echo of mobile prompt", {
@@ -3776,6 +3820,69 @@ var McpServer = class _McpServer {
     entry.contentPlain = contentPlain;
     entry.metadataPlain = metadataPlain;
   }
+  async resolveE1PluginApproval(sessionId, promptId) {
+    const inFlight = this.e1ResolutionInFlight.get(promptId);
+    if (inFlight) return inFlight;
+    const entry = this.e1PromptRaises.get(promptId);
+    if (!entry) {
+      this.e1NeedsResolution.delete(promptId);
+      return true;
+    }
+    this.e1NeedsResolution.add(promptId);
+    const operation = (async () => {
+      try {
+        const ack = await this.appSyncClient.createEvent({
+          sessionId: entry.record.sessionId || sessionId,
+          type: import_codevibe_core4.EventType.NOTIFICATION,
+          source: import_codevibe_core4.EventSource.DESKTOP,
+          resolvedPromptId: promptId,
+          ownerToken: entry.record.ownerToken
+        });
+        if (ack?.promptId !== promptId) return false;
+        this.e1NeedsResolution.delete(promptId);
+        this.e1NeedsReRaise.delete(promptId);
+        this.e1PromptRaises.delete(promptId);
+        for (const [key, indexedPromptId] of this.e1ContentKeyIndex.entries()) {
+          if (indexedPromptId === promptId) this.e1ContentKeyIndex.delete(key);
+        }
+        return true;
+      } catch (error) {
+        logger.warn("E1: plugin prompt resolution failed; retained for retry", {
+          sessionId,
+          promptId,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        return false;
+      }
+    })();
+    this.e1ResolutionInFlight.set(promptId, operation);
+    try {
+      return await operation;
+    } finally {
+      if (this.e1ResolutionInFlight.get(promptId) === operation) {
+        this.e1ResolutionInFlight.delete(promptId);
+      }
+    }
+  }
+  async resolveAcceptedInputPrompts(session, observedPromptIds = []) {
+    const promptIds = new Set(observedPromptIds);
+    for (const entry of this.e1PromptRaises.values()) {
+      if (entry.record.sessionId === session.sessionId) promptIds.add(entry.record.promptId);
+    }
+    for (const promptId of promptIds) {
+      await this.resolveE1PluginApproval(session.sessionId, promptId);
+    }
+  }
+  async drainPendingE1Resolutions() {
+    for (const promptId of [...this.e1NeedsResolution]) {
+      const entry = this.e1PromptRaises.get(promptId);
+      if (!entry) {
+        this.e1NeedsResolution.delete(promptId);
+        continue;
+      }
+      await this.resolveE1PluginApproval(entry.record.sessionId, promptId);
+    }
+  }
   /**
    * E1 (§6a-2b) — emit the badge-only carrier for a SUPPRESSED prompt (options
    * couldn't be parsed → mobile must NOT fabricate any). A NOTIFICATION carrying
@@ -4036,6 +4143,7 @@ var McpServer = class _McpServer {
    * re-materialized via reRaiseOneE1 (return-driven re-raise).
    */
   async refreshE1Ttls() {
+    await this.drainPendingE1Resolutions();
     await this.drainPendingE1ReRaises();
     await this.drainE1RetirementPark();
     const session = this.session;
@@ -4413,7 +4521,7 @@ var McpServer = class _McpServer {
         setAtWallMs: Date.now()
       });
     }
-    if (evt.type === import_codevibe_core4.EventType.USER_PROMPT) {
+    if (evt.type === import_codevibe_core4.EventType.USER_PROMPT || evt.type === import_codevibe_core4.EventType.PROMPT_RESPONSE) {
       let promptContent = evt.content;
       const attachments = evt.attachments ?? [];
       if (attachments.length > 0) {
@@ -4449,57 +4557,65 @@ var McpServer = class _McpServer {
       const pendingPrompts = this.approvalDetector.getPendingPromptsForConversation(
         session.conversationId
       );
-      if (pendingPrompts.length === 0) {
-        const probe = await this.paneObserver.probeApprovalUIActive();
-        if (!probe.probeSucceeded) {
-          await this.emitPromptSafetyNotification(
-            session,
-            "Your message was not sent because the desktop approval state could not be verified. Try again or resolve the prompt on the desktop."
-          );
+      const rawMeta = parseMaybeJson(evt.metadata);
+      const meta = rawMeta && typeof rawMeta === "object" ? rawMeta : {};
+      const evtAny = evt;
+      const responsePromptId = evt.type === import_codevibe_core4.EventType.PROMPT_RESPONSE ? typeof meta.promptId === "string" && meta.promptId || typeof meta.prompt_id === "string" && meta.prompt_id || typeof evtAny.promptId === "string" && evtAny.promptId || typeof evtAny.prompt_id === "string" && evtAny.prompt_id || null : null;
+      const advertisedOptionNumbers = Array.from(new Set(
+        pendingPrompts.flatMap((prompt) => Object.keys(prompt.submitMap))
+      ));
+      const intent = (0, import_codevibe_core4.classifyMobilePromptInput)(
+        promptContent,
+        advertisedOptionNumbers
+      );
+      if (intent.kind === "option") {
+        const activePrompt = evt.type === import_codevibe_core4.EventType.PROMPT_RESPONSE ? pendingPrompts.find((prompt) => prompt.promptId === responsePromptId) ?? null : pendingPrompts.length === 1 ? pendingPrompts[0] : null;
+        if (!activePrompt || !Object.prototype.hasOwnProperty.call(activePrompt.submitMap, intent.option)) {
+          logger.warn("Numeric input does not identify one current advertised prompt; dropping", {
+            sessionId: session.sessionId,
+            eventPromptId: responsePromptId,
+            pendingPromptCount: pendingPrompts.length,
+            option: intent.option
+          });
           return;
         }
-        if (probe.active) {
-          await this.emitPromptSafetyNotification(
-            session,
-            "Your message was not sent because a desktop approval is active but its options are not yet available on mobile. Resolve it on the desktop and send the message again."
-          );
+        if (evt.type === import_codevibe_core4.EventType.PROMPT_RESPONSE) {
+          if (responsePromptId !== activePrompt.promptId) {
+            logger.warn("PROMPT_RESPONSE does not identify the current advertised prompt; dropping", {
+              sessionId: session.sessionId,
+              eventPromptId: responsePromptId,
+              activePromptId: activePrompt.promptId
+            });
+            return;
+          }
+        }
+        this.mobileDeduper.track(session.sessionId, intent.option);
+        const optionResult = await this.promptResponder.sendApprovalReply(
+          activePrompt.promptId,
+          intent.option
+        );
+        if (!optionResult.ok) {
+          this.mobileDeduper.forget(session.sessionId, intent.option);
           return;
         }
-      }
-      if (pendingPrompts.length > 0) {
-        if (pendingPrompts.length !== 1) {
-          await this.emitPromptSafetyNotification(
-            session,
-            "Your message was not sent because more than one desktop approval is pending. Resolve the approvals and send it again."
-          );
+        await this.resolveE1PluginApproval(session.sessionId, activePrompt.promptId);
+        if (!intent.followUpText) {
+          await this.markExecuted(evt);
           return;
         }
-        const activePrompt = pendingPrompts[0];
-        const rejectOption = activePrompt.paneOptions?.find(
-          (option) => /^(?:no|deny|reject|cancel)\b/i.test(option.text.trim()) && (activePrompt.submitMap[option.number]?.length ?? 0) > 0
-        );
-        if (!rejectOption) {
+        promptContent = intent.followUpText;
+        await new Promise((resolve3) => setTimeout(resolve3, 250));
+      } else {
+        const dismissal = await this.promptResponder.dismissActivePrompt();
+        if (!dismissal.ok) {
           await this.emitPromptSafetyNotification(
             session,
-            "Your message was not sent because the active desktop approval has no verified reject option. Resolve it on the desktop and send the message again."
+            "Your message was not sent because the desktop approval could not be dismissed safely. Try again or resolve it on the desktop."
           );
           return;
         }
-        this.mobileDeduper.track(session.sessionId, rejectOption.number);
-        const rejectResult = await this.promptResponder.sendApprovalReply(
-          activePrompt.promptId,
-          rejectOption.number
-        );
-        if (!rejectResult.ok) {
-          this.mobileDeduper.forget(session.sessionId, rejectOption.number);
-          logger.warn("Reject-before-free-form failed", {
-            promptId: activePrompt.promptId,
-            reason: rejectResult.reason,
-            details: rejectResult.details
-          });
-          return;
-        }
-        await new Promise((resolve3) => setTimeout(resolve3, 250));
+        const clearedPromptIds = this.approvalDetector.onPanePromptCleared();
+        await this.resolveAcceptedInputPrompts(session, clearedPromptIds);
       }
       this.mobileDeduper.track(session.sessionId, promptContent);
       const result = await this.promptResponder.sendFreeFormWhenNoApprovalActive(promptContent);
@@ -4511,31 +4627,6 @@ var McpServer = class _McpServer {
       await this.markExecuted(evt);
       return;
     }
-    if (evt.type === import_codevibe_core4.EventType.PROMPT_RESPONSE) {
-      const rawMeta = parseMaybeJson(evt.metadata);
-      const meta = rawMeta && typeof rawMeta === "object" ? rawMeta : {};
-      const evtAny = evt;
-      const promptId = typeof meta.promptId === "string" && meta.promptId || typeof meta.prompt_id === "string" && meta.prompt_id || typeof evtAny.promptId === "string" && evtAny.promptId || typeof evtAny.prompt_id === "string" && evtAny.prompt_id || null;
-      if (!promptId) {
-        logger.warn("PROMPT_RESPONSE missing promptId metadata; dropping", {
-          sessionId: session.sessionId
-        });
-        return;
-      }
-      const optionNumber = (evt.content || "").trim();
-      this.mobileDeduper.track(session.sessionId, optionNumber);
-      const result = await this.promptResponder.sendApprovalReply(promptId, optionNumber);
-      if (!result.ok) {
-        this.mobileDeduper.forget(session.sessionId, optionNumber);
-        logger.warn("sendApprovalReply failed", {
-          promptId,
-          reason: result.reason,
-          details: result.details
-        });
-        return;
-      }
-      await this.markExecuted(evt);
-    }
   }
   async emitPromptSafetyNotification(session, content) {
     const input = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "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": {
@@ -48,7 +48,7 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@quantiya/codevibe-core": "2.0.14",
+    "@quantiya/codevibe-core": "2.0.15",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",