@quantiya/codevibe-antigravity-plugin 1.0.13 → 1.0.14

package/bin/codevibe-agy

@@ -6,8 +6,10 @@
 # Architecture (DESIGN.md §3 + §5.2):
 #
 #   1. ensureInstalled (idempotent): writes plugin manifest to
-#      ~/.gemini/antigravity-cli/plugins/codevibe-antigravity/ + wires
-#      ~/.gemini/config/mcp_config.json's mcpServers entry.
+#      ~/.gemini/antigravity-cli/plugins/codevibe-antigravity/ and REMOVES any
+#      stale codevibe-antigravity entry from ~/.gemini/config/mcp_config.json
+#      (P42, 2026-09-09: a registered entry made agy spawn a second, argument-
+#      less daemon every few minutes; the daemon is launched by this wrapper only).
 #
 #   2. Generate ephemeral port + bearer token; create runtime dir at
 #      ~/.gemini/antigravity-cli/plugins/codevibe-antigravity/runtime/$$
@@ -240,9 +242,10 @@ fi
 
 # ─── Atomic install of plugin footprint (DESIGN.md §5.1) ───────────────
 # Runs ensureInstalled which writes antigravity-plugin.json to
-# ~/.gemini/antigravity-cli/plugins/codevibe-antigravity/ + adds the
-# mcpServers entry to ~/.gemini/config/mcp_config.json. Idempotent —
-# subsequent runs are no-ops if the manifest hash matches.
+# ~/.gemini/antigravity-cli/plugins/codevibe-antigravity/ and removes any
+# stale codevibe-antigravity entry from ~/.gemini/config/mcp_config.json
+# (P42). Idempotent — subsequent runs are no-ops once the manifest hash
+# matches and no stale entry remains.
 log "Running ensureInstalled"
 if ! node "$PLUGIN_DIR/dist/installer-cli.js"; then
     echo "Error: codevibe-antigravity installer failed."
@@ -340,21 +343,14 @@ 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.
+    # (P42 backport of the 2.0 launcher: a daemon force-terminated 3s after TERM,
+    # mid-write, left an ACTIVE row that only the next launch's 6-minute sweep reaped.)
     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/dist/installer-cli.js

@@ -59,8 +59,7 @@ async function ensureInstalled(options) {
   const {
     pluginJsonSourcePath,
     installDir,
-    mcpConfigPath,
-    serverScriptPath
+    mcpConfigPath
   } = options;
   const pid = options.pidOverride ?? process.pid;
   let manifestContent;
@@ -94,7 +93,7 @@ async function ensureInstalled(options) {
     await crashRecoverySweep(installDir, logger);
     const currentHash = await tryReadCurrentHash(installDir);
     if (currentHash === expectedManifestHash) {
-      await ensureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger);
+      await ensureMcpConfigCourtesy(mcpConfigPath, logger);
       return { installed: false, upToDate: true, installDir, manifestHash: currentHash };
     }
     await stageAndInstall({
@@ -105,7 +104,7 @@ async function ensureInstalled(options) {
       pid,
       logger
     });
-    await ensureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger);
+    await ensureMcpConfigCourtesy(mcpConfigPath, logger);
     logger.info("codevibe-antigravity-plugin installed", {
       installDir,
       manifestHash: expectedManifestHash
@@ -200,7 +199,7 @@ async function crashRecoverySweep(installDir, logger) {
     await rmRecursive(dir);
   }
 }
-async function ensureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger) {
+async function ensureMcpConfigCourtesy(mcpConfigPath, logger) {
   try {
     await fs.promises.mkdir(path.dirname(mcpConfigPath), { recursive: true });
   } catch (err) {
@@ -215,14 +214,15 @@ async function ensureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger) {
   const lockPath = `${mcpConfigPath}.lock`;
   const releaseLock = await acquireLock(lockPath, LOCK_ACQUIRE_TIMEOUT_MS, logger, "mcp-config");
   try {
-    await doEnsureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger);
+    await doEnsureMcpConfigCourtesy(mcpConfigPath, logger);
   } finally {
     await releaseLock();
   }
 }
-async function doEnsureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger) {
+async function doEnsureMcpConfigCourtesy(mcpConfigPath, logger) {
   let config = {};
   let existingMode = null;
+  let onDiskWasValid = false;
   try {
     const stat = await fs.promises.stat(mcpConfigPath);
     existingMode = stat.mode & 511;
@@ -232,6 +232,7 @@ async function doEnsureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger) {
         const parsed = JSON.parse(raw);
         if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
           config = parsed;
+          onDiskWasValid = !!config.mcpServers && typeof config.mcpServers === "object" && !Array.isArray(config.mcpServers);
         } else {
           logger.warn("mcp_config.json root is not a plain object; overwriting", {
             mcpConfigPath
@@ -250,23 +251,18 @@ async function doEnsureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger) {
   if (!config.mcpServers || typeof config.mcpServers !== "object" || Array.isArray(config.mcpServers)) {
     config.mcpServers = {};
   }
-  const expected = {
-    command: "node",
-    args: [serverScriptPath]
-  };
-  const current = config.mcpServers[MCP_SERVERS_KEY];
-  if (current?.env && typeof current.env === "object" && !Array.isArray(current.env)) {
-    expected.env = current.env;
+  const hadStaleEntry = Object.prototype.hasOwnProperty.call(config.mcpServers, MCP_SERVERS_KEY);
+  if (hadStaleEntry) {
+    delete config.mcpServers[MCP_SERVERS_KEY];
   }
-  const envEqual = !current?.env && !expected.env ? true : JSON.stringify(current?.env ?? null) === JSON.stringify(expected.env ?? null);
-  const needsWrite = !current || current.command !== expected.command || !arraysEqual(current.args ?? [], expected.args) || !envEqual;
+  const needsWrite = hadStaleEntry || !onDiskWasValid;
   if (!needsWrite) return;
-  config.mcpServers[MCP_SERVERS_KEY] = expected;
   const targetMode = existingMode ?? 420;
   const randSuffix = `${process.pid}.${Date.now()}.${crypto.randomBytes(6).toString("hex")}`;
   const tmpPath = `${mcpConfigPath}.tmp.${randSuffix}`;
   const tmpFd = await fs.promises.open(tmpPath, "wx", targetMode);
   try {
+    if (existingMode !== null) await tmpFd.chmod(existingMode);
     await tmpFd.writeFile(JSON.stringify(config, null, 2) + "\n", "utf8");
     await tmpFd.close();
   } catch (writeErr) {
@@ -289,10 +285,10 @@ async function doEnsureMcpConfigEntry(mcpConfigPath, serverScriptPath, logger) {
     }
     throw err;
   }
-  logger.info("Updated mcp_config.json with codevibe-antigravity entry", {
-    mcpConfigPath,
-    serverScriptPath
-  });
+  logger.info(
+    hadStaleEntry ? "Removed the stale codevibe-antigravity MCP server entry from mcp_config.json (the daemon is launched by the wrapper only)" : "Wrote the mcp_config.json courtesy object",
+    { mcpConfigPath, removedStaleEntry: hadStaleEntry }
+  );
 }
 function sha256Hex(s) {
   return crypto.createHash("sha256").update(s, "utf8").digest("hex");
@@ -425,11 +421,6 @@ async function rmRecursive(p) {
   } catch {
   }
 }
-function arraysEqual(a, b) {
-  if (a.length !== b.length) return false;
-  for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
-  return true;
-}
 function defaultLogger() {
   return {
     info: () => {

package/dist/server.js

@@ -33,9 +33,11 @@ __export(server_exports, {
   McpServer: () => McpServer,
   SessionNotFoundError: () => SessionNotFoundError,
   __testing: () => __testing,
+  classifyEntrypoint: () => classifyEntrypoint,
   generateLaunchSessionId: () => generateLaunchSessionId,
   getActiveConversationFromCliLog: () => getActiveConversationFromCliLog,
-  parseMaybeJson: () => parseMaybeJson
+  parseMaybeJson: () => parseMaybeJson,
+  runForeignSpawnIdle: () => runForeignSpawnIdle
 });
 module.exports = __toCommonJS(server_exports);
 var crypto3 = __toESM(require("crypto"));
@@ -3828,8 +3830,51 @@ function getActiveConversationFromCliLog(cliLogPath) {
     return null;
   }
 }
+function classifyEntrypoint(args) {
+  return args.runtimeDir ? "wrapper" : "foreign";
+}
+function runForeignSpawnIdle(io) {
+  let done = false;
+  const finish = () => {
+    if (done) return;
+    done = true;
+    io.exit(0);
+  };
+  io.writeStderr(
+    "codevibe-antigravity-plugin: started without --runtime-dir, so not by the codevibe-agy wrapper (an agy mcp_config.json entry from an earlier release?). Refusing to start the daemon: no session, no backend calls. Run `codevibe-agy` once to remove the stale entry. Idling until the spawner closes stdin.\n"
+  );
+  void io.beacon().catch(() => void 0);
+  io.onSignal(finish);
+  io.stdin.on("end", finish);
+  io.stdin.on("close", finish);
+  io.stdin.on("error", finish);
+  io.stdin.resume();
+  return () => {
+    done = true;
+  };
+}
 async function main() {
   const args = parseArgs(process.argv.slice(2));
+  if (classifyEntrypoint(args) === "foreign") {
+    runForeignSpawnIdle({
+      stdin: process.stdin,
+      writeStderr: (line) => {
+        process.stderr.write(line);
+      },
+      onSignal: (cb) => {
+        process.once("SIGINT", cb);
+        process.once("SIGTERM", cb);
+      },
+      exit: (code) => process.exit(code),
+      beacon: () => fireDaemonBeacon("daemon_init_step", {
+        step: "foreign_spawn",
+        outcome: "refused",
+        has_wrapper_pid: process.env.CODEVIBE_AGY_WRAPPER_PID ? "yes" : "no",
+        has_tmux_target: process.env.CODEVIBE_AGY_TMUX_TARGET ? "yes" : "no"
+      })
+    });
+    return;
+  }
   const bearerToken = process.env.CODEVIBE_AGY_MCP_TOKEN || args.token;
   if (!bearerToken) {
     console.error("codevibe-antigravity-plugin: bearer token required via $CODEVIBE_AGY_MCP_TOKEN or --token");
@@ -3965,7 +4010,9 @@ var __testing = {
   McpServer,
   SessionNotFoundError,
   __testing,
+  classifyEntrypoint,
   generateLaunchSessionId,
   getActiveConversationFromCliLog,
-  parseMaybeJson
+  parseMaybeJson,
+  runForeignSpawnIdle
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "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": {
@@ -18,8 +18,6 @@
     "build": "rm -rf dist && npm run typecheck && esbuild src/server.ts src/installer-cli.ts --bundle --platform=node --target=node18 --packages=external --outdir=dist",
     "prepack": "npm run build",
     "postpack": "echo '[codevibe-antigravity-plugin] postpack: noop'",
-    "dev": "node dist/server.js",
-    "start": "node dist/server.js",
     "test": "jest --config jest.config.js --forceExit"
   },
   "keywords": [