@quantiya/codevibe-antigravity-plugin 2.0.86 → 2.0.87

package/README.md

@@ -45,7 +45,7 @@ install the unified `codevibe --agent` interface yet.
 - **macOS, Linux, or WSL Ubuntu** — Windows without WSL is not supported
 - **Node.js** 22.0.0+
 - **tmux** — `brew install tmux` on macOS, `apt install tmux` on Linux/WSL
-- **Antigravity CLI (`agy`)** — install from [Google's documentation](https://antigravity.google/docs)
+- **Antigravity CLI (`agy`) 1.4.3+** with `--log-file` advertised by `agy --help` — install from [Google's documentation](https://antigravity.google/docs). Companion checks this before creating a session and tells unsupported clients to update; direct `agy` is unchanged.
 
 > Antigravity CLI is distributed by Google as a binary; it is not on npm. After installing `agy`, run `codevibe --agent agy` and the plugin handles the rest.
 
@@ -66,7 +66,7 @@ All agy sessions on a computer write to the same folders. CodeVibe tells them ap
 
 On each launch, `codevibe --agent agy` registers one named entry, `codevibe-antigravity`, in `~/.gemini/config/hooks.json`, and keeps the hook scripts in `~/.codevibe/codevibe-agy/hooks/`:
 - Other entries in that file are left as they are.
-- A file that is not valid JSON, or is a symlink, is never changed. CodeVibe then falls back to agy's log files, which cannot tell concurrent sessions apart.
+- A file that is not valid JSON, or is a symlink, is never changed. Without hooks, CodeVibe uses only this launch's pinned native log and a `USER_INPUT`-first main transcript; unknown ownership waits, and `SYSTEM_MESSAGE`-first subagents are excluded.
 - For other agy sessions on the machine, `PreToolUse` immediately permits execution with `{"decision":"allow"}`, and other hook events are skipped.
 - To switch it off, add `"enabled": false` to the `codevibe-antigravity` entry. CodeVibe leaves a switched-off entry alone. Deleting the entry only lasts until the next `codevibe --agent agy` launch, which writes it again. After uninstalling CodeVibe you can delete the entry; see INSTALLATION.md.
 

package/antigravity-plugin.json

@@ -6,6 +6,6 @@
   "implementation": {
     "architecture": "transcript+tmux+approval-heuristic",
     "schema_version": "v1.0",
-    "note": "Monitors ~/.gemini/antigravity-cli/brain/<UUID>/.system_generated/logs/transcript.jsonl and the tmux pane. Where agy JSON hooks fire (agy 1.3.1+, hook gate on), the companion launcher registers a `codevibe-antigravity` entry in ~/.gemini/config/hooks.json (PreInvocation + PostToolUse) so each session routes only its own conversations; otherwise it falls back to agy's CLI log."
+    "note": "Requires native agy 1.4.3+ advertising --log-file; checked before Companion session creation. Monitors ~/.gemini/antigravity-cli/brain/<UUID>/.system_generated/logs/transcript.jsonl and the tmux pane. Own agy JSON hooks identify main conversations. Without hooks, ownership requires this launch's pinned native log and a USER_INPUT-first main transcript; SYSTEM_MESSAGE-first subagents and shared/newest logs are excluded. Unknown ownership defers sync."
   }
 }

package/dist/server.js

@@ -790,6 +790,20 @@ var TranscriptTailer = class extends import_events.EventEmitter {
   getActiveConversations() {
     return Array.from(this.activeConversations);
   }
+  /** Retry a deferred native read after THIS launcher's hook proves ownership.
+   * No offset reset or legacy fallback. Join an in-flight read first so a late
+   * hook cannot lose its wakeup in that read's rejection/finally cleanup. */
+  retryOwnedConversation(conversationId) {
+    if (!this.admission || !this.isWatching || !CONVERSATION_DIR_REGEX.test(conversationId)) return;
+    const generation = this.readGeneration, filePath = this.transcriptPathFor(conversationId);
+    const pending = this.activeReads.get(filePath) ?? Promise.resolve();
+    void pending.then(() => {
+      if (!this.isWatching || generation !== this.readGeneration) return;
+      if (!fs2.existsSync(filePath)) return;
+      this.ensureOffset(filePath);
+      void this.scheduleReadNewLines(filePath, conversationId);
+    }).catch((error) => logger.warn("Owned transcript wakeup failed", { conversationId, error: String(error) }));
+  }
   // ─── follower event handlers ─────────────────────────────────────────────
   onFileAdded(filePath) {
     if (this.isShuttingDown) return;
@@ -1234,6 +1248,10 @@ var TranscriptTailer = class extends import_events.EventEmitter {
     }
     const generation = this.readGeneration;
     const read = this.drainReadQueue(filePath, conversationId, generation).catch((error) => {
+      if (error?.code === "SYNC_SOURCE_OWNERSHIP_PENDING") {
+        logger.debug("Transcript waiting for its own hook or process-bound log", { conversationId });
+        return;
+      }
       logger.error("Transcript read chain failed (non-fatal) \u2014 next change event retries", {
         filePath,
         conversationId,
@@ -7018,6 +7036,7 @@ ${commandErrorText(error, "stdout")}`;
 }
 var McpServer = class _McpServer {
   constructor(options) {
+    this.lastNativeLogConversation = null;
     /** Per-session causal floor for transcript-event timestamps emitted right
      *  after a MOBILE prompt. The mobile USER_PROMPT is created by the iOS app
      *  (real ms clock) and never flows through prepareEventTimestamp, while the
@@ -7210,6 +7229,15 @@ var McpServer = class _McpServer {
     this.tmuxTarget = options.tmuxTarget ?? process.env.CODEVIBE_AGY_TMUX_TARGET ?? null;
     this.wrapperPid = options.wrapperPid ?? null;
     this.cliLogPath = options.cliLogPath ?? null;
+    this.nativeCliLogPath = options.nativeCliLogPath ?? null;
+    this.nativeCliLogIdentity = null;
+    if (this.nativeCliLogPath) {
+      const st = fs7.lstatSync(this.nativeCliLogPath);
+      if (!st.isFile() || st.isSymbolicLink() || st.nlink !== 1 || st.uid !== process.getuid?.()) {
+        throw Error("AGY_NATIVE_LOG_NOT_OWNED");
+      }
+      this.nativeCliLogIdentity = { dev: st.dev, ino: st.ino };
+    }
     this.launchSettleTimeoutMs = options.launchSettleTimeoutMs ?? LAUNCH_SETTLE_TIMEOUT_MS;
     this.appSyncClient = options.appSyncClient ?? new import_codevibe_core7.AppSyncClient();
     this.toolActivity = options.toolActivityIntegration === void 0 ? new AgyToolActivityIntegration({
@@ -7837,13 +7865,14 @@ var McpServer = class _McpServer {
     }
   }
   /**
-   * The pre-F1 rule, now only the fallback for conversations no hook has
-   * claimed when hooks do not fire (see conversation-router.ts): the newest
-   * agy CLI log names the active conversation. F1 amendment: a conversation
-   * another live CodeVibe daemon has claimed is never "the active one" here,
-   * so another session's busy log cannot make us drop our own turn.
+   * Production launchers supply a pinned native log. Hookless routing admits
+   * only its positively identified main transcript. The unbound pre-F1 rule
+   * below remains for legacy/test callers, not durable source allocation.
    */
   legacyAcceptsConversation(conversationId) {
+    if (this.nativeCliLogPath) {
+      return !this.claims.isClaimedElsewhere(conversationId) && this.boundNativeLogConversation() === conversationId;
+    }
     if (process.env.JEST_WORKER_ID && !this.cliLogPath) {
       return true;
     }
@@ -7857,6 +7886,38 @@ var McpServer = class _McpServer {
     }
     return activeId === conversationId;
   }
+  /** Never resolve the shared cli.log symlink or scan for another process's log. */
+  boundNativeLogConversation() {
+    if (!this.nativeCliLogPath || !this.nativeCliLogIdentity) return null;
+    let fd;
+    try {
+      fd = fs7.openSync(this.nativeCliLogPath, fs7.constants.O_RDONLY | fs7.constants.O_NOFOLLOW);
+      const st = fs7.fstatSync(fd), expected = this.nativeCliLogIdentity;
+      if (!st.isFile() || st.nlink !== 1 || st.dev !== expected.dev || st.ino !== expected.ino) return null;
+      const matches = [...fs7.readFileSync(fd, "utf8").matchAll(/(?:Created conversation|Streaming conversation|Starting conversation update stream for)\s+([0-9a-fA-F-]{36})/g)];
+      const checked = /* @__PURE__ */ new Set();
+      for (let i = matches.length - 1; i >= 0; i--) {
+        const conversationId = matches[i][1];
+        if (checked.has(conversationId)) continue;
+        checked.add(conversationId);
+        if (this.router.roleOf(conversationId) !== "subagent" && !this.claims.isClaimedElsewhere(conversationId) && this.readConversationFirstType(conversationId) === "USER_INPUT") return conversationId;
+      }
+      return null;
+    } catch {
+      return null;
+    } finally {
+      if (fd !== void 0) fs7.closeSync(fd);
+    }
+  }
+  refreshNativeLogOwnership() {
+    const conversationId = this.boundNativeLogConversation();
+    if (!conversationId || conversationId === this.lastNativeLogConversation) return;
+    this.lastNativeLogConversation = conversationId;
+    if (this.router.roleOf(conversationId) !== "subagent" && !this.claims.isClaimedElsewhere(conversationId)) {
+      logger.info("Agy launch log identified its native conversation", { conversationId, ownership: "process-bound-log" });
+      this.transcriptTailer.retryOwnedConversation(conversationId);
+    }
+  }
   /**
    * F1 moved the runtime dir under ~/.codevibe, so it outlives reboots. The
    * wrapper's EXIT trap removes it, except when the outer terminal closed while
@@ -7867,6 +7928,12 @@ var McpServer = class _McpServer {
   removeOrphanedRuntimeDir() {
     if (!this.runtimeDir || this.wrapperPid === null || isPidAlive(this.wrapperPid)) return;
     try {
+      if (this.nativeCliLogPath && this.nativeCliLogIdentity) {
+        const st = fs7.lstatSync(this.nativeCliLogPath);
+        if (st.isFile() && !st.isSymbolicLink() && st.nlink === 1 && st.dev === this.nativeCliLogIdentity.dev && st.ino === this.nativeCliLogIdentity.ino) {
+          fs7.unlinkSync(this.nativeCliLogPath);
+        }
+      }
       fs7.rmdirSync(this.runtimeDir);
       logger.info("Removed runtime dir left by a closed terminal", { runtimeDir: this.runtimeDir });
     } catch (error) {
@@ -7938,6 +8005,7 @@ var McpServer = class _McpServer {
       });
       if (role === "main") {
         this.observedMainConversationIds.add(conversationId);
+        this.transcriptTailer.retryOwnedConversation(conversationId);
         if (!wasAlreadyAdmitted) {
           await this.drainHeldHookDeliveries(conversationId, "process", delivery.initialNumSteps);
         }
@@ -7986,6 +8054,7 @@ var McpServer = class _McpServer {
       logger.warn("PostToolUse prompt resolution failed", { error: String(error) });
     });
     this.router.onPostToolUse(conversationId);
+    if (this.router.roleOf(conversationId) === "main") this.transcriptTailer.retryOwnedConversation(conversationId);
   }
   resolveLingeringQuestionPrompts(conversationId) {
     const lingeringPrompts = this.approvalDetector.getPendingPromptsForConversation(conversationId).filter((p) => p.kind === "question");
@@ -8411,8 +8480,9 @@ var McpServer = class _McpServer {
     const selection = await this.selectNativeSource(session);
     if (!this.started || this.session !== session) throw Error("SYNC_SOURCE_OWNER_CHANGED");
     if (selection.protocol === "LEGACY") return null;
-    if (!this.legacyAcceptsConversation(source.conversationId) || this.router.roleOf(source.conversationId) === "subagent") {
-      throw Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE");
+    const ownsConversation = () => !this.claims.isClaimedElsewhere(source.conversationId) && (this.router.roleOf(source.conversationId) === "main" || this.router.roleOf(source.conversationId) === void 0 && this.boundNativeLogConversation() === source.conversationId);
+    if (!ownsConversation()) {
+      throw Object.assign(Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE"), { code: "SYNC_SOURCE_OWNERSHIP_PENDING" });
     }
     if (!this.toolActivity?.isActive(session.sessionId)) {
       if (this.nativeToolStart && this.nativeToolStart.session !== session) throw Error("SYNC_SOURCE_OWNER_CHANGED");
@@ -8426,7 +8496,12 @@ var McpServer = class _McpServer {
       }
       await this.nativeToolStart.pending;
     }
-    if (!this.toolActivity?.isActive(session.sessionId) || this.session !== session || !this.started) throw Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE");
+    if (!ownsConversation()) {
+      throw Object.assign(Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE"), { code: "SYNC_SOURCE_OWNERSHIP_PENDING" });
+    }
+    if (!this.toolActivity?.isActive(session.sessionId) || this.session !== session || !this.started) {
+      throw Error("SYNC_SOURCE_OWNERSHIP_UNAVAILABLE");
+    }
     const streamSha256 = crypto3.createHash("sha256").update(JSON.stringify([source.filePath, source.conversationId])).digest("hex");
     const key = `${selection.sessionScope.sessionId}:${selection.sessionScope.sessionGenerationId}:${streamSha256}`;
     const existing = this.nativeSources.get(key);
@@ -8470,7 +8545,7 @@ var McpServer = class _McpServer {
       this.assertNativeOwner(owner);
       if ((await owner.cursor.open(0)).byteOffset >= source.endOffset) return;
       const admission = { outputs: [null, null] };
-      await this.handleTranscriptEmit(emit, "legacy", admission);
+      await this.handleTranscriptEmit(emit, "process", admission);
       this.assertNativeOwner(owner);
       const echoFrame = {
         streamSha256: owner.streamSha256,
@@ -9283,7 +9358,7 @@ var McpServer = class _McpServer {
     if (bound && this.observedMainConversationIds.has(bound)) return bound;
     if (this.observedMainConversationIds.size === 0) return null;
     const cliLogPath = this.cliLogPath ?? path8.join(os7.homedir(), ".gemini", "antigravity-cli", "cli.log");
-    const cliActive = getActiveConversationFromCliLog(cliLogPath);
+    const cliActive = this.nativeCliLogPath ? this.boundNativeLogConversation() : getActiveConversationFromCliLog(cliLogPath);
     if (cliActive && this.observedMainConversationIds.has(cliActive)) {
       return cliActive;
     }
@@ -9914,6 +9989,7 @@ var McpServer = class _McpServer {
       const state = await this.tmuxSessionState(tmuxTarget);
       if (state === "alive") {
         this.tmuxLifecycleObservedAlive = true;
+        this.refreshNativeLogOwnership();
         return;
       }
       const ownershipEstablished = this.tmuxLifecycleObservedAlive || Date.now() >= this.tmuxLifecycleInitDeadlineMs;
@@ -10241,6 +10317,7 @@ async function main() {
     bearerToken,
     preferredPort: args.port,
     runtimeDir: args.runtimeDir,
+    nativeCliLogPath: args.runtimeDir ? path8.join(args.runtimeDir, "native-cli.log") : void 0,
     tmuxTarget: process.env.CODEVIBE_AGY_TMUX_TARGET ?? void 0,
     wrapperPid: process.env.CODEVIBE_AGY_WRAPPER_PID ? parseInt(process.env.CODEVIBE_AGY_WRAPPER_PID, 10) : void 0
   });

package/libexec/companion-launcher

@@ -50,6 +50,7 @@
 # Companion limitations:
 #   - Requires tmux. Print mode (`--print` / `-p`) is NOT supported.
 #   - Requires Node.js 22 or newer for the MCP server.
+#   - Requires agy 1.4.3+ advertising --log-file for launch ownership.
 #
 
 set -e
@@ -182,6 +183,37 @@ case "${1:-}" in
         ;;
 esac
 
+# Companion owns the log used as native transcript ownership proof. Do not
+# silently override a user's log or let a second flag redirect that proof.
+for _CV_ARG in "$@"; do
+    case "$_CV_ARG" in
+        --log-file|--log-file=*|-log-file|-log-file=*)
+            echo 'Error: CodeVibe Companion owns --log-file for session isolation. Run agy directly to use a custom log.' >&2
+            exit 2
+            ;;
+    esac
+done
+unset _CV_ARG
+
+# Require the tested native contract before installer, runtime, or session work.
+# Metadata passthrough above and direct `agy` use remain unchanged.
+require_native_sync_support() {
+    local version="$1" binary="$2" help major minor patch
+    if [[ "$version" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
+        major=$((10#${BASH_REMATCH[1]}))
+        minor=$((10#${BASH_REMATCH[2]}))
+        patch=$((10#${BASH_REMATCH[3]}))
+        if (( major > 1 || (major == 1 && (minor > 4 || (minor == 4 && patch >= 3))) )); then
+            if help="$("$binary" --help 2>&1)" &&
+                [[ "$help" =~ (^|[[:space:]])--log-file([=[:space:]]|$) ]]; then
+                return 0
+            fi
+        fi
+    fi
+    echo 'Error: CodeVibe Companion requires Antigravity CLI 1.4.3+ with --log-file support. Update agy, then retry. Direct agy use is unchanged.' >&2
+    return 1
+}
+
 # ─── Environment probes ───────────────────────────────────────────────
 _CV_NODE_VER="missing"
 command -v node >/dev/null 2>&1 && _CV_NODE_VER="$(node -v 2>/dev/null | cv_sanitize)"
@@ -191,7 +223,7 @@ command -v tmux >/dev/null 2>&1 && _CV_TMUX_VER="$(tmux -V 2>/dev/null | cv_sani
 [ -z "$_CV_TMUX_VER" ] && _CV_TMUX_VER="unknown"
 _CV_AGY_BIN="$(resolve_agy_bin)"
 _CV_AGY_VER="missing"
-[ -n "$_CV_AGY_BIN" ] && _CV_AGY_VER="$("$_CV_AGY_BIN" --version 2>/dev/null | cv_sanitize)"
+[ -n "$_CV_AGY_BIN" ] && _CV_AGY_VER="$(cv_sanitize "$("$_CV_AGY_BIN" --version 2>/dev/null)")"
 [ -z "$_CV_AGY_VER" ] && _CV_AGY_VER="unknown"
 _CV_OS_VER="$(uname -s | cv_sanitize)"
 [ -z "$_CV_OS_VER" ] && _CV_OS_VER="unknown"
@@ -262,6 +294,11 @@ if [ -z "$_CV_AGY_BIN" ] || ! [ -f "$_CV_AGY_BIN" ] || ! [ -x "$_CV_AGY_BIN" ];
     exit 1
 fi
 
+if ! require_native_sync_support "$_CV_AGY_VER" "$_CV_AGY_BIN"; then
+    cv_failed "agy_sync_contract_unsupported"
+    exit 2
+fi
+
 if ! command -v node &> /dev/null; then
     echo "Error: Node.js is required but not installed."
     echo "Install Node.js 22+ from: https://nodejs.org"
@@ -348,6 +385,14 @@ rm -f "$RUNTIME_DIR/conn.json" "$RUNTIME_DIR/claims.json"
 # Also tighten the runtime base — best-effort, no fatal on failure.
 chmod 0700 "$RUNTIME_BASE" 2>/dev/null || true
 
+# The native process and daemon share only this launch's fresh regular log.
+# Refuse a stale PID-reuse file rather than trusting its conversation identity.
+NATIVE_CLI_LOG="$RUNTIME_DIR/native-cli.log"
+if ! (umask 077; set -o noclobber; : > "$NATIVE_CLI_LOG"); then
+    echo 'Error: this Companion runtime already contains a native log; refusing ambiguous ownership.' >&2
+    exit 1
+fi
+
 log "Wrapper PID=$WRAPPER_PID; token=$(printf '%s' "$BEARER_TOKEN" | cut -c1-8)...; port=$MCP_PORT; runtime=$RUNTIME_DIR"
 
 # Export env vars consumed by the MCP server + any in-tree tooling.
@@ -481,7 +526,8 @@ escaped_exit_file="$(escape_sq "$_CV_AGY_EXIT_FILE")"
 escaped_conn_file="$(escape_sq "$RUNTIME_DIR/conn.json")"
 escaped_mcp_log="$(escape_sq "$MCP_LOG_FILE")"
 escaped_node_bin="$(escape_sq "$(command -v node)")"
-AGY_CMD="'$escaped_bin'"
+escaped_native_log="$(escape_sq "$NATIVE_CLI_LOG")"
+AGY_CMD="'$escaped_bin' --log-file '$escaped_native_log'"
 for arg in "$@"; do
     escaped_arg="$(escape_sq "$arg")"
     AGY_CMD="$AGY_CMD '$escaped_arg'"

package/package.json

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