@quantiya/codevibe-antigravity-plugin 2.0.22 → 2.0.23

package/dist/server.js

@@ -3300,6 +3300,7 @@ var McpServer = class _McpServer {
      *  under this single sessionId. /resume does NOT create a new
      *  session — same row. */
     this.session = null;
+    this.promptPublications = new import_codevibe_core5.PromptPublicationTracker();
     this.transcriptHandlers = /* @__PURE__ */ new Set();
     this.toolActivityKeyRefresh = null;
     // E1 (§4/§6a-4) — per-promptId durable raise entries for the agy producer.
@@ -4154,11 +4155,18 @@ var McpServer = class _McpServer {
   /** Encrypt and send one individual event, refreshing a stale session key once. */
   async createEncryptedEvent(session, input) {
     const lifecycleGen = this.lifecycleGen;
+    const promptId = input.producerKind === "PLUGIN_APPROVAL" ? input.promptId : void 0;
+    const promptEntry = promptId ? this.e1PromptRaises.get(promptId) : void 0;
     const sendOnce = async () => {
+      if (promptId && !(0, import_codevibe_core5.isOpenPromptRaise)(
+        promptEntry,
+        this.e1PromptRaises.get(promptId),
+        this.e1NeedsResolution.has(promptId)
+      )) return null;
       if (lifecycleGen !== this.lifecycleGen || !this.started || this.session !== session || input.sessionId !== session.sessionId) return null;
       const outbound = this.encryptOutbound(session, input);
       if (!outbound) return null;
-      return this.appSyncClient.createEvent(outbound);
+      return promptId ? this.promptPublications.run(promptId, () => this.appSyncClient.createEvent(outbound)) : this.appSyncClient.createEvent(outbound);
     };
     try {
       return await sendOnce();
@@ -4215,9 +4223,11 @@ var McpServer = class _McpServer {
       this.e1NeedsResolution.delete(promptId);
       return true;
     }
+    entry.resolutionStarted = true;
     this.e1NeedsResolution.add(promptId);
     const operation = (async () => {
       try {
+        if (this.promptPublications.isPublishing(promptId)) await this.promptPublications.waitFor(promptId);
         const ack = await this.appSyncClient.createEvent({
           sessionId: entry.record.sessionId || sessionId,
           type: import_codevibe_core5.EventType.NOTIFICATION,
@@ -4353,7 +4363,7 @@ var McpServer = class _McpServer {
       };
       this.e1PromptRaises.set(entry.record.promptId, entry);
       const acked = await this.reRaiseOneE1(replacementSession, entry, opts);
-      if (!acked) unacked.push(snap);
+      if (!acked && !entry.resolutionStarted) unacked.push(snap);
     }
     if (!this.e1TtlRefreshTimer) this.startE1TtlRefresh();
     return unacked;
@@ -4441,11 +4451,20 @@ var McpServer = class _McpServer {
    */
   async reRaiseOneE1(session, entry, opts) {
     const rec = entry.record;
+    if (this.e1NeedsResolution.has(rec.promptId)) return false;
+    if (!(0, import_codevibe_core5.canRecoverPromptRaise)(entry, this.promptPublications.isPublishing(rec.promptId))) {
+      return false;
+    }
     const actionable = rec.mobileActionable && entry.contentPlain !== void 0;
     const retryUntilAck = opts?.retryUntilAck === true;
     const gen = opts?.gen;
     const MAX_ATTEMPTS = 4;
     for (let attempt = 1; ; attempt++) {
+      if (!(0, import_codevibe_core5.isOpenPromptRaise)(
+        entry,
+        this.e1PromptRaises.get(rec.promptId),
+        this.e1NeedsResolution.has(rec.promptId)
+      )) return false;
       if (retryUntilAck && this.reRaiseSuperseded(gen)) {
         this.e1NeedsReRaise.add(rec.promptId);
         logger.warn("E1: block-until-ack re-raise aborted (lifecycle superseded/stopping) \u2014 flagged for retry-until-ack (entry retained)", {
@@ -4466,6 +4485,11 @@ var McpServer = class _McpServer {
             timestamp: (0, import_codevibe_core5.prepareEventTimestamp)({ orderingKey: session.sessionId })
           };
           await this.flushToolActivityAtBoundary(import_codevibe_core5.EventType.INTERACTIVE_PROMPT);
+          if (!(0, import_codevibe_core5.isOpenPromptRaise)(
+            entry,
+            this.e1PromptRaises.get(rec.promptId),
+            this.e1NeedsResolution.has(rec.promptId)
+          )) return false;
           if (!await this.createEncryptedEvent(session, input)) return false;
         } else {
           rec.mobileActionable = false;
@@ -4534,7 +4558,7 @@ var McpServer = class _McpServer {
     const session = this.session;
     if (!session) return;
     const sid = session.sessionId;
-    const promptIds = [...this.e1PromptRaises.values()].filter((e) => e.record.sessionId === sid).map((e) => e.record.promptId);
+    const promptIds = [...this.e1PromptRaises.values()].filter((e) => e.record.sessionId === sid && !this.e1NeedsResolution.has(e.record.promptId) && (0, import_codevibe_core5.canRecoverPromptRaise)(e, this.promptPublications.isPublishing(e.record.promptId))).map((e) => e.record.promptId);
     if (promptIds.length === 0) return;
     try {
       const agedOut = await this.appSyncClient.refreshOpenPromptTtl(promptIds);
@@ -4719,6 +4743,9 @@ var McpServer = class _McpServer {
     return last;
   }
   async handlePendingPrompt(state) {
+    await this.promptPublications.run(state.promptId, () => this.publishPendingPrompt(state));
+  }
+  async publishPendingPrompt(state) {
     if (!this.started) return;
     const session = this.getSessionByConversation(state.conversationId);
     if (!session) {
@@ -4728,7 +4755,6 @@ var McpServer = class _McpServer {
       });
       return;
     }
-    await this.flushToolActivityAtBoundary(import_codevibe_core5.EventType.INTERACTIVE_PROMPT);
     const e1existing = this.e1PromptRaises.get(state.promptId);
     const e1rec = e1existing ? e1existing.record : this.newE1Raise(session.sessionId, true);
     if (!e1existing) state.promptId = e1rec.promptId;
@@ -4784,12 +4810,10 @@ var McpServer = class _McpServer {
       })
     };
     try {
+      this.stashE1RaiseContent(e1rec.promptId, content, optionsForMobile);
+      await this.flushToolActivityAtBoundary(import_codevibe_core5.EventType.INTERACTIVE_PROMPT);
+      if (this.e1NeedsResolution.has(e1rec.promptId) || this.e1PromptRaises.get(e1rec.promptId)?.record !== e1rec) return;
       if (!await this.createEncryptedEvent(session, input)) return;
-      this.stashE1RaiseContent(
-        e1rec.promptId,
-        content,
-        optionsForMobile
-      );
     } catch (err) {
       logger.error("createEvent INTERACTIVE_PROMPT failed", {
         promptId: state.promptId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "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.20",
+    "@quantiya/codevibe-core": "2.0.21",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",