@quantiya/codevibe-antigravity-plugin 2.0.6 → 2.0.8

package/{bin/codevibe-agy → libexec/companion-launcher}

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# codevibe-agy — wrapper that runs Antigravity CLI (agy) inside a tmux
+# Private CodeVibe Companion launcher for Antigravity CLI (agy), using a tmux
 # session bridged to the CodeVibe MCP server for mobile sync.
 #
 # Architecture (DESIGN.md §3 + §5.2):
@@ -34,19 +34,15 @@
 #      server's signal handler), kill MCP server, remove runtime dir.
 #
 # Usage:
-#   codevibe-agy [agy-args...]         # Start agy session
-#   codevibe-agy login                 # Sign in via browser
-#   codevibe-agy logout                # Sign out
-#   codevibe-agy status                # Show auth status
-#   codevibe-agy reset-device          # Reset device key (re-pair)
+#   codevibe --agent agy [-- agy-args...]
 #
 # Environment:
 #   ENVIRONMENT                    Set to 'production' (default) or 'development'
 #   AGY_PATH                       Path to agy binary (default: $(command -v agy))
 #
-# v1.0 limitations:
+# Companion limitations:
 #   - Requires tmux. Print mode (`--print` / `-p`) is NOT supported.
-#   - Requires Node.js ≥ 18 for the MCP server.
+#   - Requires Node.js 22 or newer for the MCP server.
 #
 
 set -e
@@ -62,14 +58,6 @@ case "${ENVIRONMENT:-}" in
 esac
 CODEVIBE_TMPDIR="${TMPDIR:-/tmp}"
 
-# ─── Config dir (agent-detection marker) ──────────────────────────────
-# Ensure ~/.codevibe-antigravity exists on EVERY invocation (including the
-# fast `--version` path and normal sessions). The CodeVibe 2.0 companion
-# agent-detection probe marks agy "healthy" only when this dir exists
-# (matching the claude/codex convention where the config dir signals
-# "set up"). Non-fatal — a mkdir failure must never break the wrapper.
-mkdir -p "$HOME/.codevibe-antigravity" 2>/dev/null || true
-
 # Resolve plugin dir via symlink-aware traversal (npm globals symlink
 # bin/ into /usr/local/bin/).
 SOURCE="${BASH_SOURCE[0]}"
@@ -84,8 +72,8 @@ PLUGIN_DIR="$(dirname "$SCRIPT_DIR")"
 # ─── PATH augmentation ───────────────────────────────────────────────
 # When the install one-liner runs in a fresh terminal, Homebrew's
 # installer writes the shellenv eval into ~/.zprofile (etc.) but the
-# user's current shell hasn't sourced it yet. Subsequent codevibe-*
-# runs in that same terminal then fail tmux/node/agy discovery because
+# user's current shell hasn't sourced it yet. CodeVibe Companion launches
+# in that terminal then fail tmux/node/agy discovery because
 # /opt/homebrew/bin isn't on PATH. Prepend common locations so the
 # wrapper recovers without forcing a new terminal.
 _CV_NEW_PATHS=""
@@ -145,38 +133,45 @@ cv_failed() {
   cv_telem "wrapper_failed" "\"reason\":\"$1\",\"lifetime_seconds\":$(( $(date +%s) - _CV_STARTED_AT ))"
 }
 
-# ─── Auth + version commands: short-circuit BEFORE any heavy boot ──────
-case "$1" in
-    version|--version|-v)
-        # Fast, guaranteed-non-fatal version probe. Must NOT boot the MCP
-        # server, run the tmux pre-flight, or spawn anything heavy — the
-        # CodeVibe 2.0 companion agent-detection probe runs `codevibe-agy
-        # --version` and only requires exit 0. Print the plugin version;
-        # also surface the underlying `agy` version when it's on PATH.
-        _CV_VER="$(node -p "require('$PLUGIN_DIR/package.json').version" 2>/dev/null || echo unknown)"
-        echo "codevibe-agy $_CV_VER"
-        _CV_AGY_BIN="${AGY_PATH:-$(command -v agy 2>/dev/null || true)}"
-        if [ -n "$_CV_AGY_BIN" ] && [ -x "$_CV_AGY_BIN" ]; then
-            _CV_AGY_RAW="$("$_CV_AGY_BIN" --version 2>/dev/null | head -1)"
-            [ -n "$_CV_AGY_RAW" ] && echo "agy $_CV_AGY_RAW"
-        fi
-        exit 0
-        ;;
-    login|logout|status|reset-device)
-        CORE_CLI="$PLUGIN_DIR/node_modules/@quantiya/codevibe-core/bin/codevibe.js"
-        # Also check hoisted location (when installed via @quantiya/codevibe meta-package).
-        if [ ! -f "$CORE_CLI" ]; then
-            CORE_CLI="$PLUGIN_DIR/../codevibe-core/bin/codevibe.js"
-        fi
-        if [ -f "$CORE_CLI" ]; then
-            cv_telem "wrapper_started" "\"invocation\":\"auth_$1\",\"os\":\"$(uname -s | cv_sanitize)\",\"arch\":\"$(uname -m | cv_sanitize)\""
-            exec node "$CORE_CLI" "$1"
-        else
-            echo "Error: codevibe-core not found. Try reinstalling: npm install -g @quantiya/codevibe"
-            cv_failed "core_not_found"
-            sleep 1
-            exit 1
+# AGY_PATH is an optional preferred executable, not a poison pill. If it is
+# unset or invalid, fall back to the same PATH lookup used by agent discovery.
+# Requiring a regular executable file keeps this contract aligned with
+# codevibe-core's isExecutableFile() check.
+resolve_agy_bin() {
+    if [ -n "${AGY_PATH:-}" ] && [ -f "$AGY_PATH" ] && [ -x "$AGY_PATH" ]; then
+        printf '%s\n' "$AGY_PATH"
+        return 0
+    fi
+    command -v agy 2>/dev/null || true
+}
+
+# ─── Internal diagnostic: short-circuit before heavy boot ─────────────
+# Keep this off the public argv surface so `codevibe --agent agy -- --version`
+# reaches the vendor CLI unchanged.
+if [ "${CODEVIBE_COMPANION_DIAGNOSTIC:-}" = "version" ]; then
+    _CV_VER="$(node -p "require('$PLUGIN_DIR/package.json').version" 2>/dev/null || echo unknown)"
+    echo "codevibe companion agy $_CV_VER"
+    _CV_AGY_BIN="$(resolve_agy_bin)"
+    if [ -n "$_CV_AGY_BIN" ] && [ -f "$_CV_AGY_BIN" ] && [ -x "$_CV_AGY_BIN" ]; then
+        _CV_AGY_RAW="$("$_CV_AGY_BIN" --version 2>/dev/null | head -1)"
+        [ -n "$_CV_AGY_RAW" ] && echo "agy $_CV_AGY_RAW"
+    fi
+    exit 0
+fi
+
+# Metadata commands are intentionally short-lived and do not create a
+# Companion session. Run them directly in the foreground so a TTY invocation
+# cannot race a detached tmux session that exits before attach. Arguments and
+# the vendor exit status are preserved exactly.
+case "${1:-}" in
+    --version|-v|--help|-h)
+        _CV_DIRECT_AGY_BIN="$(resolve_agy_bin)"
+        if [ -z "$_CV_DIRECT_AGY_BIN" ] || ! [ -f "$_CV_DIRECT_AGY_BIN" ] || ! [ -x "$_CV_DIRECT_AGY_BIN" ]; then
+            echo "Error: Antigravity CLI (`agy`) is not installed or not executable." >&2
+            echo "Install instructions: https://antigravity.google/docs" >&2
+            exit 127
         fi
+        exec "$_CV_DIRECT_AGY_BIN" "$@"
         ;;
 esac
 
@@ -187,7 +182,7 @@ command -v node >/dev/null 2>&1 && _CV_NODE_VER="$(node -v 2>/dev/null | cv_sani
 _CV_TMUX_VER="missing"
 command -v tmux >/dev/null 2>&1 && _CV_TMUX_VER="$(tmux -V 2>/dev/null | cv_sanitize)"
 [ -z "$_CV_TMUX_VER" ] && _CV_TMUX_VER="unknown"
-_CV_AGY_BIN="${AGY_PATH:-$(command -v agy 2>/dev/null || true)}"
+_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)"
 [ -z "$_CV_AGY_VER" ] && _CV_AGY_VER="unknown"
@@ -213,7 +208,7 @@ log() {
 for arg in "$@"; do
     case "$arg" in
         --print|-p|--prompt|--print=*|--prompt=*|-p=*)
-            echo "Error: codevibe-agy does not support --print / -p / --prompt in v1.0."
+            echo "Error: the Antigravity Companion route does not support --print / -p / --prompt."
             echo "Run \"agy ...\" directly for non-interactive use; mobile sync is interactive-only."
             cv_failed "print_mode_unsupported"
             sleep 1
@@ -231,7 +226,7 @@ if ! command -v tmux &> /dev/null; then
     exit 1
 fi
 
-if [ -z "$_CV_AGY_BIN" ] || ! [ -x "$_CV_AGY_BIN" ]; then
+if [ -z "$_CV_AGY_BIN" ] || ! [ -f "$_CV_AGY_BIN" ] || ! [ -x "$_CV_AGY_BIN" ]; then
     echo "Error: Antigravity CLI (\`agy\`) is not installed or not executable."
     echo "Install instructions: https://antigravity.google/docs"
     cv_failed "agy_missing"
@@ -241,7 +236,7 @@ fi
 
 if ! command -v node &> /dev/null; then
     echo "Error: Node.js is required but not installed."
-    echo "Install Node.js 18+ from: https://nodejs.org"
+    echo "Install Node.js 22+ from: https://nodejs.org"
     cv_failed "node_missing"
     sleep 1
     exit 1
@@ -459,8 +454,8 @@ while [ \$i -lt 100 ] && [ ! -f '$escaped_conn_file' ]; do
   i=\$((i + 1))
 done
 if [ ! -f '$escaped_conn_file' ]; then
-  echo 'codevibe-agy: MCP server not ready after 10s; running agy without mobile sync.' >&2
-  echo 'codevibe-agy: see $escaped_mcp_log for details.' >&2
+  echo 'CodeVibe Antigravity Companion: MCP server not ready after 10s; running agy without mobile sync.' >&2
+  echo 'CodeVibe Antigravity Companion: see $escaped_mcp_log for details.' >&2
 fi
 export ENVIRONMENT='$ENVIRONMENT'
 $AGY_CMD
@@ -517,7 +512,7 @@ if ! kill -0 "$MCP_PID" 2>/dev/null; then
     tail -3 "$MCP_LOG_FILE" 2>/dev/null | grep -v '^\[' | head -3
     echo ""
     echo "Server failed to start. Check $MCP_LOG_FILE for details."
-    echo "Common causes: not signed in (\`codevibe-agy login\`), port in use, ENV mismatch."
+    echo "Common causes: not signed in (\`codevibe login\`), port in use, ENV mismatch."
     # tmux session is already created — destroy it so the user doesn't
     # attach to a degraded session that will time-out waiting for conn.json.
     tmux kill-session -t "$SESSION_NAME" 2>/dev/null || true

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@quantiya/codevibe-antigravity-plugin",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "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": {
-    "codevibe-agy": "./bin/codevibe-agy"
+  "codevibe": {
+    "companionLauncher": "./libexec/companion-launcher"
   },
   "files": [
     "dist/**/*.js",
-    "bin",
+    "libexec",
     "antigravity-plugin.json",
     "README.md",
     ".env.example"
@@ -48,7 +48,7 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@quantiya/codevibe-core": "2.0.6",
+    "@quantiya/codevibe-core": "2.0.8",
     "chokidar": "^5.0.0",
     "dotenv": "^16.6.1",
     "express": "^5.1.0",