@quantiya/codevibe-antigravity-plugin 1.0.8 → 1.0.10

package/dist/server.js

@@ -2789,6 +2789,7 @@ function truncate(s, maxBytes) {
 
 // src/server.ts
 var MOBILE_PROMPT_FLOOR_RECENCY_MS = 12e4;
+var LAUNCH_SETTLE_TIMEOUT_MS = 3e3;
 var McpServer = class {
   constructor(options) {
     /** Per-session causal floor for transcript-event timestamps emitted right
@@ -2836,6 +2837,19 @@ var McpServer = class {
      *  process.exit before the original stop's cleanup completes.
      *  (Stage 1 MED finding 2026-05-20.) */
     this.stopPromise = null;
+    /** In-flight createLaunchSession() promise. doStop() awaits it so a
+     *  SIGTERM arriving DURING startup (while resumeOrCreateSession is still
+     *  creating the ACTIVE row) doesn't let the signal handler's
+     *  process.exit() fire before the just-created row is marked INACTIVE.
+     *  Resolved (instant) for the normal shutdown path. (#142 ii) */
+    this.launchSessionPromise = null;
+    /** The launch sessionId whose ACTIVE row has been (or is being) created by
+     *  an in-flight createLaunchSession(), until it is either wired into
+     *  this.session (happy path) or marked INACTIVE. doStop() reads it to
+     *  guarantee the INACTIVE write lands even if the Phase-0 create-wait timed
+     *  out mid-cleanup — separating the bounded "wait for create" from the
+     *  always-awaited "mark INACTIVE". (#142 Stage 2 R1 iter-2 HIGH.) */
+    this.pendingLaunchSessionId = null;
     /** Listener references kept so doStop() can detach them. Without this,
      *  a server restart (test mode or future hot-reload) accumulates
      *  listeners on the shared module instances. (Stage 2 HIGH finding
@@ -2853,6 +2867,7 @@ var McpServer = class {
     this.tmuxTarget = options.tmuxTarget ?? process.env.CODEVIBE_AGY_TMUX_TARGET ?? null;
     this.wrapperPid = options.wrapperPid ?? null;
     this.cliLogPath = options.cliLogPath ?? null;
+    this.launchSettleTimeoutMs = options.launchSettleTimeoutMs ?? LAUNCH_SETTLE_TIMEOUT_MS;
     this.appSyncClient = options.appSyncClient ?? new import_codevibe_core4.AppSyncClient();
     this.workingDirectory = process.cwd();
     this.approvalDetector = options.approvalDetector ?? new ApprovalDetector(options.detectorOptions);
@@ -2897,11 +2912,19 @@ var McpServer = class {
     }
     this.started = true;
     this.lifecycleGen++;
+    this.registerSignalHandlers();
     await (0, import_codevibe_core4.registerDeviceEncryptionKey)(this.appSyncClient, logger);
+    if (!this.started) return { httpPort: 0 };
     (0, import_codevibe_core4.startDeviceKeyWatcher)(this.appSyncClient, logger);
     try {
       const swept = await this.appSyncClient.sweepOrphanSessions({
-        agentType: "ANTIGRAVITY"
+        agentType: "ANTIGRAVITY",
+        // 6 min (core default is 15 min). A live daemon heartbeats every
+        // 2 min, so a session stale >6 min has missed 3 beats and is
+        // provably dead — safe to reap without false-positiving a
+        // concurrently-running agy wrapper, while catching orphans on the
+        // next start sooner. (agy orphaned-session fix 2026-05-31.)
+        staleThresholdMs: 6 * 60 * 1e3
       });
       if (swept > 0) {
         logger.info("Orphan sweep: marked stale Antigravity sessions INACTIVE", { swept });
@@ -2911,13 +2934,18 @@ var McpServer = class {
         error: error instanceof Error ? error.message : String(error)
       });
     }
+    if (!this.started) return { httpPort: 0 };
     this.approvalDetector.start();
     this.addListener(this.approvalDetector, "pending-prompt", (state) => {
       void this.handlePendingPrompt(state).catch((err) => {
         logger.error("handlePendingPrompt failed", { error: String(err) });
       });
     });
-    await this.createLaunchSession();
+    this.launchSessionPromise = this.createLaunchSession();
+    await this.launchSessionPromise;
+    if (!this.started) {
+      return { httpPort: 0 };
+    }
     this.addListener(this.transcriptTailer, "event", (emit) => {
       void this.handleTranscriptEmit(emit).catch((err) => {
         logger.error("handleTranscriptEmit failed", { error: String(err) });
@@ -2943,7 +2971,6 @@ var McpServer = class {
       logger.warn("No tmux target \u2014 pane observer disabled (mobile-only mode)");
     }
     const httpPort = await this.httpApi.start();
-    this.registerSignalHandlers();
     await fireDaemonBeacon("daemon_init_step", {
       step: "ready",
       outcome: "ok",
@@ -2966,15 +2993,23 @@ var McpServer = class {
   }
   async doStop() {
     this.started = false;
-    try {
-      await this.transcriptTailer.stop();
-    } catch (err) {
-      logger.warn("transcriptTailer.stop failed", { error: String(err) });
+    if (this.launchSessionPromise) {
+      const settled = this.launchSessionPromise.catch(() => void 0);
+      let timer;
+      const timeout = new Promise((resolve3) => {
+        timer = setTimeout(resolve3, this.launchSettleTimeoutMs);
+        timer.unref?.();
+      });
+      try {
+        await Promise.race([settled, timeout]);
+      } finally {
+        if (timer) clearTimeout(timer);
+      }
     }
-    try {
-      await this.paneObserver.stop();
-    } catch (err) {
-      logger.warn("paneObserver.stop failed", { error: String(err) });
+    if (this.pendingLaunchSessionId) {
+      const pendingId = this.pendingLaunchSessionId;
+      this.pendingLaunchSessionId = null;
+      await this.deactivateLaunchRow(pendingId);
     }
     if (this.subscription) {
       try {
@@ -2990,8 +3025,11 @@ var McpServer = class {
       }
     }
     this.listenerHandles = [];
-    this.unregisterSignalHandlers();
     if (this.session) {
+      try {
+        this.appSyncClient.stopHeartbeat(this.session.sessionId);
+      } catch {
+      }
       try {
         await this.appSyncClient.updateSession({
           sessionId: this.session.sessionId,
@@ -3003,10 +3041,17 @@ var McpServer = class {
           error: String(err)
         });
       }
-      try {
-        this.appSyncClient.stopHeartbeat(this.session.sessionId);
-      } catch {
-      }
+    }
+    this.unregisterSignalHandlers();
+    try {
+      await this.transcriptTailer.stop();
+    } catch (err) {
+      logger.warn("transcriptTailer.stop failed", { error: String(err) });
+    }
+    try {
+      await this.paneObserver.stop();
+    } catch (err) {
+      logger.warn("paneObserver.stop failed", { error: String(err) });
     }
     try {
       await this.approvalDetector.stop();
@@ -3045,6 +3090,27 @@ var McpServer = class {
       launchSessionId: this.session.sessionId
     });
   }
+  /**
+   * Stop the heartbeat and mark a launch row INACTIVE. Best-effort + idempotent:
+   * createLaunchSession's bail and doStop's pending-id guarantee may both call
+   * this for the same id, but both write the SAME terminal status (INACTIVE) on
+   * an unconditional last-writer-wins resolver, so a double/reordered write
+   * can't clobber or resurrect ACTIVE. (Separate from the ACTIVE-vs-INACTIVE
+   * per-session ordering that core 1.0.29's status-write chain handles.)
+   * (#142 Stage 2 R1 iter-2.)
+   */
+  async deactivateLaunchRow(sessionId) {
+    try {
+      this.appSyncClient.stopHeartbeat(sessionId);
+      await this.appSyncClient.updateSession({ sessionId, status: "INACTIVE" });
+      logger.info("Marked superseded/interrupted launch session INACTIVE", { sessionId });
+    } catch (err) {
+      logger.warn("Failed to mark superseded/interrupted launch session INACTIVE", {
+        sessionId,
+        error: String(err)
+      });
+    }
+  }
   /**
    * v9 launch-session: create the wrapper-lifetime backend session at
    * start(). All agy conv UUIDs observed during this lifetime emit
@@ -3057,6 +3123,7 @@ var McpServer = class {
     const sessionId = generateLaunchSessionId(this.wrapperPid ?? process.pid);
     const userId = this.appSyncClient.getCurrentUserId();
     const projectPath = process.cwd();
+    this.pendingLaunchSessionId = sessionId;
     let sessionKey = null;
     try {
       const result = await (0, import_codevibe_core4.resumeOrCreateSession)(
@@ -3072,6 +3139,7 @@ var McpServer = class {
       );
       sessionKey = result.sessionKey ?? null;
     } catch (err) {
+      this.pendingLaunchSessionId = null;
       const msg = String(err);
       if (msg.includes("session-limit-exceeded")) {
         logger.warn("Free-tier session limit reached \u2014 mobile sync disabled for this wrapper", { sessionId });
@@ -3082,7 +3150,11 @@ var McpServer = class {
       logger.error("createLaunchSession failed (non-fatal)", { sessionId, error: msg });
       return;
     }
-    if (gen !== this.lifecycleGen || !this.started) return;
+    if (gen !== this.lifecycleGen || !this.started) {
+      await this.deactivateLaunchRow(sessionId);
+      if (this.pendingLaunchSessionId === sessionId) this.pendingLaunchSessionId = null;
+      return;
+    }
     this.session = {
       sessionId,
       conversationId: "",
@@ -3095,6 +3167,7 @@ var McpServer = class {
       metadata: { wrapperPid: this.wrapperPid ?? void 0, launch: true },
       sessionKey
     };
+    this.pendingLaunchSessionId = null;
     try {
       const stop = this.appSyncClient.subscribeToEvents(
         sessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "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",
   "bin": {
@@ -48,7 +48,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@quantiya/codevibe-core": "^1.0.28",
+    "@quantiya/codevibe-core": "^1.0.29",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",