@quantiya/codevibe-antigravity-plugin 2.0.11 → 2.0.12

package/dist/server.js

@@ -32,7 +32,9 @@ var server_exports = {};
 __export(server_exports, {
   McpServer: () => McpServer,
   SessionNotFoundError: () => SessionNotFoundError,
+  TERMINAL_SHUTDOWN_SIGNALS: () => TERMINAL_SHUTDOWN_SIGNALS,
   __testing: () => __testing,
+  classifyTmuxHasSessionError: () => classifyTmuxHasSessionError,
   generateLaunchSessionId: () => generateLaunchSessionId,
   getActiveConversationFromCliLog: () => getActiveConversationFromCliLog,
   parseMaybeJson: () => parseMaybeJson
@@ -42,6 +44,8 @@ var crypto3 = __toESM(require("crypto"));
 var path5 = __toESM(require("path"));
 var fs5 = __toESM(require("fs"));
 var os5 = __toESM(require("os"));
+var import_child_process3 = require("child_process");
+var import_util3 = require("util");
 var import_codevibe_core4 = require("@quantiya/codevibe-core");
 
 // src/logger.ts
@@ -2977,6 +2981,27 @@ function truncate(s, maxBytes) {
 // src/server.ts
 var MOBILE_PROMPT_FLOOR_RECENCY_MS = 12e4;
 var LAUNCH_SETTLE_TIMEOUT_MS = 3e3;
+var TMUX_LIFECYCLE_POLL_MS = 1e3;
+var TMUX_LIFECYCLE_INIT_GRACE_MS = 1e4;
+var SESSION_RETIRE_MAX_ATTEMPTS = 3;
+var SESSION_RETIRE_RETRY_MS = 100;
+var execFileAsync = (0, import_util3.promisify)(import_child_process3.execFile);
+var TERMINAL_SHUTDOWN_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+function commandErrorText(error, field) {
+  const value = error?.[field];
+  if (typeof value === "string") return value;
+  if (Buffer.isBuffer(value)) return value.toString("utf8");
+  return "";
+}
+function classifyTmuxHasSessionError(error) {
+  if (typeof error?.code !== "number") return "unknown";
+  const output = `${commandErrorText(error, "stderr")}
+${commandErrorText(error, "stdout")}`;
+  if (/^can't find session:/m.test(output) || /^no server running on /m.test(output) || /^error connecting to .* \((?:No such file or directory|Connection refused)\)$/m.test(output)) {
+    return "absent";
+  }
+  return "unknown";
+}
 var McpServer = class _McpServer {
   constructor(options) {
     /** Per-session causal floor for transcript-event timestamps emitted right
@@ -3117,6 +3142,11 @@ var McpServer = class _McpServer {
     this.signalsRegistered = false;
     this.boundSigintHandler = null;
     this.boundSigtermHandler = null;
+    this.boundSighupHandler = null;
+    this.tmuxLifecycleTimer = null;
+    this.tmuxLifecycleCheckInFlight = false;
+    this.tmuxLifecycleObservedAlive = false;
+    this.tmuxLifecycleInitDeadlineMs = Number.POSITIVE_INFINITY;
     if (!options.bearerToken || options.bearerToken.length < 16) {
       throw new Error("McpServer requires a non-trivial bearerToken");
     }
@@ -3156,6 +3186,8 @@ var McpServer = class _McpServer {
   async start() {
     if (this.started) throw new Error("McpServer.start() called twice");
     this.stopPromise = null;
+    this.stopTmuxLifecycleMonitor();
+    this.tmuxLifecycleObservedAlive = false;
     await fireDaemonBeacon("daemon_init_start", {
       step: "init",
       outcome: "ok",
@@ -3176,6 +3208,7 @@ var McpServer = class _McpServer {
     this.lifecycleGen++;
     this.stopRequestedDuringCreate = false;
     this.registerSignalHandlers();
+    this.startTmuxLifecycleMonitor();
     await (0, import_codevibe_core4.registerDeviceEncryptionKey)(this.appSyncClient, logger);
     if (!this.started) return { httpPort: 0 };
     (0, import_codevibe_core4.startDeviceKeyWatcher)(this.appSyncClient, logger);
@@ -3259,15 +3292,18 @@ var McpServer = class _McpServer {
   }
   async doStop() {
     this.started = false;
-    if (this.launchSessionPromise) {
-      const settled = this.launchSessionPromise.catch(() => void 0);
+    this.stopTmuxLifecycleMonitor();
+    const launchSettlement = this.launchSessionPromise?.catch(() => void 0) ?? null;
+    let mustAwaitLaunchSettlement = false;
+    let hostedRetirementError = null;
+    if (launchSettlement) {
       let timer;
       const timeout = new Promise((resolve3) => {
         timer = setTimeout(resolve3, this.launchSettleTimeoutMs);
         timer.unref?.();
       });
       try {
-        await Promise.race([settled, timeout]);
+        await Promise.race([launchSettlement, timeout]);
       } finally {
         if (timer) clearTimeout(timer);
       }
@@ -3279,8 +3315,9 @@ var McpServer = class _McpServer {
       if (deactivated) {
         if (this.pendingLaunchSessionId === pendingId) this.pendingLaunchSessionId = null;
       } else {
+        mustAwaitLaunchSettlement = launchSettlement !== null;
         logger.error(
-          "doStop: INACTIVE write for the pending launch row FAILED (row may not exist yet \u2014 create still in flight). Keeping the settlement obligation: if the create resolves in-process its tail deactivates the row; if the process exits first, an ACTIVE row may leak (SIGKILL-class residual) (#638 H4)",
+          "doStop: INACTIVE write for the pending launch row FAILED (row may not exist yet \u2014 create still in flight). Keeping the settlement obligation: if the create resolves in-process its tail deactivates the row; the process remains alive so the delayed create tail can settle it (#638 H4)",
           { sessionId: pendingId }
         );
       }
@@ -3304,16 +3341,11 @@ var McpServer = class _McpServer {
         this.appSyncClient.stopHeartbeat(this.session.sessionId);
       } catch {
       }
-      try {
-        await this.appSyncClient.updateSession({
-          sessionId: this.session.sessionId,
-          status: "INACTIVE"
-        });
-      } catch (err) {
-        logger.warn("updateSession INACTIVE failed during shutdown", {
-          sessionId: this.session.sessionId,
-          error: String(err)
-        });
+      const retired = await this.deactivateLaunchRow(this.session.sessionId);
+      if (!retired) {
+        hostedRetirementError = new Error(
+          `Failed to retire hosted Antigravity session ${this.session.sessionId}`
+        );
       }
     }
     this.unregisterSignalHandlers();
@@ -3349,10 +3381,25 @@ var McpServer = class _McpServer {
     this.launchKeyUnavailable = false;
     this.ensureLaunchInFlight = null;
     this.observedMainConversationIds.clear();
+    if (mustAwaitLaunchSettlement && launchSettlement) {
+      await launchSettlement;
+      if (this.pendingLaunchSessionId) {
+        const pendingId = this.pendingLaunchSessionId;
+        const retired = await this.deactivateLaunchRow(pendingId);
+        if (retired) {
+          if (this.pendingLaunchSessionId === pendingId) this.pendingLaunchSessionId = null;
+        } else {
+          hostedRetirementError = new Error(
+            `Failed to settle delayed Antigravity launch session ${pendingId}`
+          );
+        }
+      }
+    }
     await fireDaemonBeacon("daemon_init_step", {
       step: "shutdown",
-      outcome: "ok"
+      outcome: hostedRetirementError ? "fail" : "ok"
     });
+    if (hostedRetirementError) throw hostedRetirementError;
   }
   async handleConversationDiscovered(conversationId) {
     if (!this.started) return;
@@ -3387,16 +3434,30 @@ var McpServer = class _McpServer {
   async deactivateLaunchRow(sessionId) {
     try {
       this.appSyncClient.stopHeartbeat(sessionId);
-      await this.appSyncClient.updateSession({ sessionId, status: "INACTIVE" });
-      logger.info("Marked superseded/interrupted launch session INACTIVE", { sessionId });
-      return true;
-    } catch (err) {
-      logger.warn("Failed to mark superseded/interrupted launch session INACTIVE", {
+    } catch (error) {
+      logger.warn("Failed to stop heartbeat while retiring Antigravity session", {
         sessionId,
-        error: String(err)
+        error: error instanceof Error ? error.message : String(error)
       });
-      return false;
     }
+    for (let attempt = 1; attempt <= SESSION_RETIRE_MAX_ATTEMPTS; attempt += 1) {
+      try {
+        await this.appSyncClient.updateSession({ sessionId, status: "INACTIVE" });
+        logger.info("Marked superseded/interrupted launch session INACTIVE", { sessionId });
+        return true;
+      } catch (err) {
+        logger.warn("Failed to mark superseded/interrupted launch session INACTIVE", {
+          sessionId,
+          attempt,
+          maxAttempts: SESSION_RETIRE_MAX_ATTEMPTS,
+          error: String(err)
+        });
+        if (attempt < SESSION_RETIRE_MAX_ATTEMPTS) {
+          await new Promise((resolve3) => setTimeout(resolve3, SESSION_RETIRE_RETRY_MS * attempt));
+        }
+      }
+    }
+    return false;
   }
   /**
    * v9 launch-session: create the wrapper-lifetime backend session at
@@ -4575,27 +4636,117 @@ var McpServer = class _McpServer {
     return this.session.sessionId === backendSessionId ? this.session : null;
   }
   // ─── Signal handling ────────────────────────────────────────────────────
+  /** Preserve a supported detach, but retire the daemon when its observed tmux owner ends. */
+  startTmuxLifecycleMonitor() {
+    if (this.tmuxLifecycleTimer || !this.tmuxTarget) return;
+    const tmuxTarget = this.tmuxTarget;
+    this.tmuxLifecycleTimer = setInterval(() => {
+      void this.checkTmuxLifecycle(tmuxTarget);
+    }, TMUX_LIFECYCLE_POLL_MS);
+    this.tmuxLifecycleInitDeadlineMs = Date.now() + TMUX_LIFECYCLE_INIT_GRACE_MS;
+    this.tmuxLifecycleTimer.unref?.();
+    void this.checkTmuxLifecycle(tmuxTarget);
+  }
+  async tmuxSessionState(tmuxTarget) {
+    try {
+      await execFileAsync("tmux", ["has-session", "-t", tmuxTarget]);
+      return "alive";
+    } catch (error) {
+      const state = classifyTmuxHasSessionError(error);
+      if (state === "absent") return state;
+      logger.warn("Could not inspect native Antigravity tmux session; preserving daemon", {
+        tmuxTarget,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return "unknown";
+    }
+  }
+  async checkTmuxLifecycle(tmuxTarget) {
+    if (!this.started || this.tmuxLifecycleCheckInFlight) return;
+    this.tmuxLifecycleCheckInFlight = true;
+    try {
+      const state = await this.tmuxSessionState(tmuxTarget);
+      if (state === "alive") {
+        this.tmuxLifecycleObservedAlive = true;
+        return;
+      }
+      const ownershipEstablished = this.tmuxLifecycleObservedAlive || Date.now() >= this.tmuxLifecycleInitDeadlineMs;
+      if (state === "unknown" || !ownershipEstablished || !this.started) return;
+      this.stopTmuxLifecycleMonitor();
+      logger.info("Native Antigravity tmux session ended; stopping companion daemon", {
+        tmuxTarget
+      });
+      void this.stop().then(
+        () => process.exit(0),
+        (error) => {
+          logger.error("Failed to stop companion daemon after native session end", {
+            error: error instanceof Error ? error.message : String(error)
+          });
+          process.exit(1);
+        }
+      );
+    } finally {
+      this.tmuxLifecycleCheckInFlight = false;
+    }
+  }
+  stopTmuxLifecycleMonitor() {
+    if (this.tmuxLifecycleTimer) {
+      clearInterval(this.tmuxLifecycleTimer);
+      this.tmuxLifecycleTimer = null;
+    }
+  }
   registerSignalHandlers() {
     if (this.signalsRegistered) return;
     this.signalsRegistered = true;
     const onSignal = (sig) => {
-      logger.info(`${sig} received \u2014 shutting down`);
-      void this.stop().then(() => process.exit(0)).catch((err) => {
+      logger.info(`${sig} received \u2014 evaluating terminal shutdown`);
+      void this.stopForTerminalSignal(sig).then((stopped) => {
+        if (stopped) process.exit(0);
+      }).catch((err) => {
         logger.error("shutdown error", { error: String(err) });
         process.exit(1);
       });
     };
     this.boundSigintHandler = () => onSignal("SIGINT");
     this.boundSigtermHandler = () => onSignal("SIGTERM");
-    process.on("SIGINT", this.boundSigintHandler);
-    process.on("SIGTERM", this.boundSigtermHandler);
+    this.boundSighupHandler = () => onSignal("SIGHUP");
+    const handlers = {
+      SIGINT: this.boundSigintHandler,
+      SIGTERM: this.boundSigtermHandler,
+      SIGHUP: this.boundSighupHandler
+    };
+    for (const signal of TERMINAL_SHUTDOWN_SIGNALS) {
+      process.on(signal, handlers[signal]);
+    }
+  }
+  /**
+   * A tmux client detach can hang up the wrapper PTY while Antigravity remains
+   * alive in the bound tmux session. Only treat SIGHUP as terminal when tmux
+   * authoritatively reports that target absent; an unknown result preserves the
+   * daemon until the lifecycle monitor retries.
+   */
+  async stopForTerminalSignal(signal) {
+    if (signal === "SIGHUP" && this.tmuxTarget) {
+      const state = await this.tmuxSessionState(this.tmuxTarget);
+      if (state !== "absent") {
+        logger.info("Ignoring SIGHUP while native Antigravity tmux session remains available", {
+          tmuxTarget: this.tmuxTarget,
+          state
+        });
+        return false;
+      }
+    }
+    await this.stop();
+    return true;
   }
   unregisterSignalHandlers() {
     if (!this.signalsRegistered) return;
     if (this.boundSigintHandler) process.off("SIGINT", this.boundSigintHandler);
     if (this.boundSigtermHandler) process.off("SIGTERM", this.boundSigtermHandler);
+    if (this.boundSighupHandler) process.off("SIGHUP", this.boundSighupHandler);
     this.boundSigintHandler = null;
     this.boundSigtermHandler = null;
+    this.boundSighupHandler = null;
     this.signalsRegistered = false;
   }
   // ─── Lookups (test surface) ────────────────────────────────────────────
@@ -4835,7 +4986,9 @@ var __testing = {
 0 && (module.exports = {
   McpServer,
   SessionNotFoundError,
+  TERMINAL_SHUTDOWN_SIGNALS,
   __testing,
+  classifyTmuxHasSessionError,
   generateLaunchSessionId,
   getActiveConversationFromCliLog,
   parseMaybeJson

package/libexec/companion-launcher

@@ -201,6 +201,27 @@ log() {
     echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" >> "$LOG_FILE"
 }
 
+tmux_session_state() {
+    local target="$1"
+    local output
+    local rc
+    output="$(tmux has-session -t "$target" 2>&1)"
+    rc=$?
+    if [ "$rc" -eq 0 ]; then
+        printf '%s\n' "alive"
+        return
+    fi
+    case "$output" in
+        "can't find session:"*|"no server running on "*|"error connecting to "*" (No such file or directory)"|"error connecting to "*" (Connection refused)")
+            printf '%s\n' "absent"
+            ;;
+        *)
+            log "WARN: tmux inspection failed for $target; preserving daemon: $output"
+            printf '%s\n' "unknown"
+            ;;
+    esac
+}
+
 # ─── Reject unsupported invocations ───────────────────────────────────
 # `--print` / `-p` mode bypasses the interactive TUI we depend on. Bail
 # out with a clear message rather than silently producing no mobile sync.
@@ -326,6 +347,22 @@ cleanup() {
     local wrapper_exit_code=$?
     log "Cleanup triggered"
 
+    # Closing or detaching the outer terminal must not disconnect an agy
+    # process that is still alive inside tmux. The daemon monitors this exact
+    # tmux target and owns full cleanup after the native session disappears.
+    if [ "${_CV_TMUX_STARTED:-false}" = "true" ]; then
+        local tmux_state
+        tmux_state="$(tmux_session_state "$SESSION_NAME")"
+        if [ "$tmux_state" = "alive" ]; then
+            log "Tmux client detached while Antigravity remains active; leaving daemon running"
+            return
+        fi
+        if [ "$tmux_state" = "unknown" ]; then
+            log "Tmux state is ambiguous; preserving daemon and native session"
+            return
+        fi
+    fi
+
     # Fire wrapper_exited telemetry BEFORE killing the server so MCP
     # logs are intact. cv_failed sets _CV_EXITED on pre-flight failures,
     # so this block won't double-fire.
@@ -358,21 +395,12 @@ cleanup() {
         cv_telem "wrapper_exited" "\"exit_code\":$wrapper_exit_code,\"lifetime_seconds\":$lifetime,\"agy_exit_code\":\"$agy_exit\",\"agy_lifetime_seconds\":$agy_lifetime,\"tmux_session_started\":$_CV_TMUX_STARTED,\"agent_invoked\":$_CV_AGENT_INVOKED,\"terminal_outcome\":\"$outcome\""
     fi
 
-    # Stop the MCP server — graceful first, then SIGKILL fallback.
-    # The server's SIGTERM handler marks the session INACTIVE.
+    # Stop the MCP server gracefully and wait for product-owned cleanup. Never
+    # force-kill here: stop() must finish its hosted INACTIVE obligation before
+    # the process exits, even when that takes longer than the old 3s bound.
     if [ -n "$MCP_PID" ] && kill -0 "$MCP_PID" 2>/dev/null; then
         log "Stopping MCP server (PID: $MCP_PID)"
         kill -TERM "$MCP_PID" 2>/dev/null || true
-        # Wait up to 3s for graceful shutdown.
-        local i=0
-        while [ $i -lt 30 ] && kill -0 "$MCP_PID" 2>/dev/null; do
-            sleep 0.1
-            i=$((i + 1))
-        done
-        if kill -0 "$MCP_PID" 2>/dev/null; then
-            log "MCP server did not exit cleanly; sending SIGKILL"
-            kill -KILL "$MCP_PID" 2>/dev/null || true
-        fi
         wait "$MCP_PID" 2>/dev/null || true
     fi
 

package/package.json

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