@cubic-dev-ai/cli 0.15.0 → 0.16.0

package/bin/cubic

@@ -57,5 +57,15 @@ fi
 # Handle SIGINT gracefully
 trap '' INT
 
+# Intercept installer command from npx wrapper context
+if [ "$1" = "install" ]; then
+    exec "$resolved" "$@"
+fi
+
+# npx with no args should bootstrap setup flow in exec context
+if [ "$#" -eq 0 ] && [ "${npm_command:-}" = "exec" ]; then
+    exec "$resolved" setup --mode install
+fi
+
 # Execute the binary with all arguments
 exec "$resolved" "$@"

package/bin/cubic.cmd

@@ -52,6 +52,17 @@ echo It seems that your package manager failed to install the right version of t
 exit /b 1
 
 :execute
+rem Intercept installer command from npx wrapper context
+if "%~1"=="install" (
+    start /b /wait "" "%resolved%" %*
+    exit /b !ERRORLEVEL!
+)
+
+if "%~1"=="" if /i "%npm_command%"=="exec" (
+    start /b /wait "" "%resolved%" setup --mode install
+    exit /b !ERRORLEVEL!
+)
+
 rem Execute the binary with all arguments in the same console window
 rem Use start /b /wait to ensure it runs in the current shell context for all shells
 start /b /wait "" "%resolved%" %*

package/bin/cubic.wrapper

@@ -0,0 +1,71 @@
+#!/bin/sh
+set -e
+
+if [ -n "$CUBIC_BIN_PATH" ]; then
+    resolved="$CUBIC_BIN_PATH"
+else
+    # Get the real path of this script, resolving any symlinks
+    script_path="$0"
+    while [ -L "$script_path" ]; do
+        link_target="$(readlink "$script_path")"
+        case "$link_target" in
+            /*) script_path="$link_target" ;;
+            *) script_path="$(dirname "$script_path")/$link_target" ;;
+        esac
+    done
+    script_dir="$(dirname "$script_path")"
+    script_dir="$(cd "$script_dir" && pwd)"
+
+    # Map platform names
+    case "$(uname -s)" in
+        Darwin) platform="darwin" ;;
+        Linux) platform="linux" ;;
+        MINGW*|CYGWIN*|MSYS*) platform="win32" ;;
+        *) platform="$(uname -s | tr '[:upper:]' '[:lower:]')" ;;
+    esac
+
+    # Map architecture names
+    case "$(uname -m)" in
+        x86_64|amd64) arch="x64" ;;
+        aarch64) arch="arm64" ;;
+        armv7l) arch="arm" ;;
+        *) arch="$(uname -m)" ;;
+    esac
+
+    name="@cubic-dev-ai/cli-${platform}-${arch}"
+    binary="cubic"
+    [ "$platform" = "win32" ] && binary="cubic.exe"
+
+    # Search for the binary starting from real script location
+    resolved=""
+    current_dir="$script_dir"
+    while [ "$current_dir" != "/" ]; do
+        candidate="$current_dir/node_modules/$name/bin/$binary"
+        if [ -f "$candidate" ]; then
+            resolved="$candidate"
+            break
+        fi
+        current_dir="$(dirname "$current_dir")"
+    done
+
+    if [ -z "$resolved" ]; then
+        printf "It seems that your package manager failed to install the right version of the cubic CLI for your platform. You can try manually installing the \"%s\" package\n" "$name" >&2
+        exit 1
+    fi
+fi
+
+# Handle SIGINT gracefully
+trap '' INT
+
+# Intercept installer command from npx wrapper context
+if [ "$1" = "install" ]; then
+    exec "$resolved" "$@"
+fi
+
+# npx with no args should bootstrap setup flow in exec context
+if [ "$#" -eq 0 ] && [ "${npm_command:-}" = "exec" ]; then
+    exec "$resolved" setup --mode install
+fi
+
+# Execute the binary with all arguments
+exec "$resolved" "$@"

package/package.json

@@ -7,18 +7,18 @@
     "preinstall": "bun ./preinstall.mjs || node ./preinstall.mjs",
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "0.15.0",
+  "version": "0.16.0",
   "optionalDependencies": {
-    "@cubic-dev-ai/cli-linux-arm64": "0.15.0",
-    "@cubic-dev-ai/cli-linux-x64": "0.15.0",
-    "@cubic-dev-ai/cli-linux-x64-baseline": "0.15.0",
-    "@cubic-dev-ai/cli-linux-arm64-musl": "0.15.0",
-    "@cubic-dev-ai/cli-linux-x64-musl": "0.15.0",
-    "@cubic-dev-ai/cli-linux-x64-baseline-musl": "0.15.0",
-    "@cubic-dev-ai/cli-darwin-arm64": "0.15.0",
-    "@cubic-dev-ai/cli-darwin-x64": "0.15.0",
-    "@cubic-dev-ai/cli-darwin-x64-baseline": "0.15.0",
-    "@cubic-dev-ai/cli-windows-x64": "0.15.0",
-    "@cubic-dev-ai/cli-windows-x64-baseline": "0.15.0"
+    "@cubic-dev-ai/cli-linux-arm64": "0.16.0",
+    "@cubic-dev-ai/cli-linux-x64": "0.16.0",
+    "@cubic-dev-ai/cli-linux-x64-baseline": "0.16.0",
+    "@cubic-dev-ai/cli-linux-arm64-musl": "0.16.0",
+    "@cubic-dev-ai/cli-linux-x64-musl": "0.16.0",
+    "@cubic-dev-ai/cli-linux-x64-baseline-musl": "0.16.0",
+    "@cubic-dev-ai/cli-darwin-arm64": "0.16.0",
+    "@cubic-dev-ai/cli-darwin-x64": "0.16.0",
+    "@cubic-dev-ai/cli-darwin-x64-baseline": "0.16.0",
+    "@cubic-dev-ai/cli-windows-x64": "0.16.0",
+    "@cubic-dev-ai/cli-windows-x64-baseline": "0.16.0"
   }
 }

package/postinstall.mjs

@@ -5,7 +5,26 @@ import path from "path"
 import os from "os"
 import { fileURLToPath } from "url"
 import { createRequire } from "module"
-import { execSync } from "child_process"
+import { execFileSync, execSync } from "child_process"
+
+const CUBIC_WRAPPER_MODE = process.env.CUBIC_WRAPPER_MODE !== "0"
+
+function packagePrefix() {
+  return process.env.CUBIC_PACKAGE_PREFIX || "@cubic-dev-ai/cli-"
+}
+
+function shouldRunInstallWizard() {
+  if (process.env.CUBIC_DISABLE_INSTALL_WIZARD === "true") return false
+  if (process.env.npm_config_ignore_scripts === "true") return false
+  if (process.env.CI && process.env.CI !== "false") return false
+  if (process.env.npm_config_yes === "true") return false
+  if (process.env.TERM === "dumb") return false
+  if (!process.stdin.isTTY) return false
+  if (!process.stdout.isTTY) return false
+  if (process.platform === "win32") return false
+  if (!fs.existsSync("/dev/tty")) return false
+  return true
+}
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const require = createRequire(import.meta.url)
@@ -26,9 +45,9 @@ try {
   // Use fallback
 }
 
-// Validate version format to prevent command injection (must be vX.Y.Z format)
+// Validate version format to prevent command injection (must be [v]X.Y.Z format)
 function isValidVersion(version) {
-  return /^v\d+\.\d+\.\d+$/.test(version)
+  return /^v?\d+\.\d+\.\d+$/.test(version)
 }
 
 if (!isValidVersion(GIT_AI_VERSION)) {
@@ -76,7 +95,7 @@ function detectPlatformAndArch() {
 
 function findBinary() {
   const { platform, arch } = detectPlatformAndArch()
-  const packageName = `@cubic-dev-ai/cli-${platform}-${arch}`
+  const packageName = `${packagePrefix()}${platform}-${arch}`
   const binary = platform === "windows" ? "cubic.exe" : "cubic"
 
   try {
@@ -123,52 +142,93 @@ async function regenerateWindowsCmdWrappers() {
   }
 }
 
-// Install git-ai using official installer
+// Install git-ai silently using official installer
 // 2 minute timeout to prevent indefinite hangs during npm install
 const GIT_AI_INSTALL_TIMEOUT = 120000
+const GIT_AI_COMPATIBLE_MAJOR = 1
+const GIT_AI_REPO_URL = "https://github.com/git-ai-project/git-ai"
+
+function getGitAiBinary() {
+  return path.join(os.homedir(), ".git-ai", "bin", os.platform() === "win32" ? "git-ai.exe" : "git-ai")
+}
+
+// Returns "none", "compatible", or "incompatible"
+function checkGitAiVersion() {
+  const binary = getGitAiBinary()
+  try {
+    fs.accessSync(binary, fs.constants.X_OK)
+  } catch {
+    return "none"
+  }
+
+  try {
+    const version = execSync(`"${binary}" --version`, { stdio: ["pipe", "pipe", "pipe"], timeout: 5000 })
+      .toString()
+      .trim()
+    const match = version.match(/^v?(\d+)\./)
+    if (!match) return "none"
+    return parseInt(match[1], 10) === GIT_AI_COMPATIBLE_MAJOR ? "compatible" : "incompatible"
+  } catch {
+    return "none"
+  }
+}
 
 function setupGitAi() {
   // Allow users to opt-out of automatic git-ai installation
   if (process.env.CUBIC_DISABLE_GIT_AI === "true") {
-    console.log("Skipping git-ai installation (CUBIC_DISABLE_GIT_AI=true)")
-    console.log("You can install it later with: cubic stats enable")
     return
   }
 
-  console.log(`Installing git-ai ${GIT_AI_VERSION} for AI code tracking...`)
+  const status = checkGitAiVersion()
+
+  // Already have a compatible version — nothing to do
+  if (status === "compatible") return
 
+  // Incompatible version — warn and skip
+  if (status === "incompatible") {
+    console.warn(
+      "git-ai is already installed, but this version is incompatible with cubic AI stats. " +
+        "Please uninstall git-ai and run `cubic stats enable` to install a compatible version. " +
+        GIT_AI_REPO_URL,
+    )
+    return
+  }
+
+  // Not installed — install silently
   try {
     if (os.platform() === "win32") {
-      // PowerShell installer for Windows
       execSync(
         `powershell -NoProfile -ExecutionPolicy Bypass -Command "$env:GIT_AI_RELEASE_TAG='${GIT_AI_VERSION}'; irm https://usegitai.com/install.ps1 | iex"`,
-        { stdio: "inherit", shell: true, timeout: GIT_AI_INSTALL_TIMEOUT },
+        { stdio: "ignore", shell: true, timeout: GIT_AI_INSTALL_TIMEOUT },
       )
     } else {
-      // Bash installer for macOS/Linux
       execSync(`export GIT_AI_RELEASE_TAG="${GIT_AI_VERSION}" && curl -sSL https://usegitai.com/install.sh | bash`, {
-        stdio: "inherit",
+        stdio: "ignore",
         shell: "/bin/bash",
         timeout: GIT_AI_INSTALL_TIMEOUT,
       })
     }
 
-    console.log("git-ai installed successfully")
-
-    // Configure git-ai to run in quiet mode (suppress chart output after commits)
-    const gitAiBinary = path.join(os.homedir(), ".git-ai", "bin", os.platform() === "win32" ? "git-ai.exe" : "git-ai")
+    // Configure git-ai to run in quiet mode
+    const binary = getGitAiBinary()
     try {
-      execSync(`"${gitAiBinary}" config set quiet true`, { stdio: "ignore", timeout: 5000 })
+      execSync(`"${binary}" config set quiet true`, { stdio: "ignore", timeout: 5000 })
     } catch {
       // Ignore if config fails - git-ai will work without quiet mode
     }
+
+    console.log("Close and reopen your IDE and terminal sessions in order to use AI attribution stats.")
   } catch (error) {
-    console.warn("git-ai installation failed, continuing without it:", error.message)
-    console.log("You can install it later with: cubic stats enable")
+    console.warn(
+      "cubic AI stats use git-ai under the hood. git-ai failed to install. " +
+        "Make sure git-ai installation succeeds in order to use cubic AI stats. " +
+        GIT_AI_REPO_URL,
+    )
   }
 }
 
 async function main() {
+  let binaryPath = ""
   try {
     if (os.platform() === "win32") {
       // NPM eg format - npm/11.4.2 node/v24.4.1 win32 x64
@@ -178,29 +238,65 @@ async function main() {
       } else {
         console.log("Windows detected but not npm, skipping binary symlink")
       }
-      // Install git-ai on Windows too
-      setupGitAi()
-      return
-    }
+    } else {
+      try {
+        binaryPath = findBinary()
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
+        console.log(
+          `cubic: setup skipped (${message}) - run \`npm i -g @cubic-plugin/cli-manila-test\` again in a minute`,
+        )
+        return
+      }
+      const binScript = path.join(__dirname, "bin", "cubic")
+      const wrapperPath = path.join(__dirname, "bin", "cubic.wrapper")
 
-    const binaryPath = findBinary()
-    const binScript = path.join(__dirname, "bin", "cubic")
+      if (CUBIC_WRAPPER_MODE && fs.existsSync(wrapperPath)) {
+        if (fs.existsSync(binScript)) {
+          fs.unlinkSync(binScript)
+        }
+        fs.copyFileSync(wrapperPath, binScript)
+        fs.chmodSync(binScript, 0o755)
+        process.env.CUBIC_BIN_PATH = binaryPath
+        console.log(`cubic wrapper configured: ${binScript} -> ${binaryPath}`)
+      } else {
+        // Remove existing bin script if it exists
+        if (fs.existsSync(binScript)) {
+          fs.unlinkSync(binScript)
+        }
 
-    // Remove existing bin script if it exists
-    if (fs.existsSync(binScript)) {
-      fs.unlinkSync(binScript)
+        // Create symlink to the actual binary
+        fs.symlinkSync(binaryPath, binScript)
+        console.log(`cubic binary symlinked: ${binScript} -> ${binaryPath}`)
+      }
     }
 
-    // Create symlink to the actual binary
-    fs.symlinkSync(binaryPath, binScript)
-    console.log(`cubic binary symlinked: ${binScript} -> ${binaryPath}`)
-
-    // Install git-ai
-    setupGitAi()
+    // Install-time wizard (opt-in)
+    if (shouldRunInstallWizard()) {
+      console.log("\n◆ Optional: connect cubic to your coding agent")
+      try {
+        execFileSync(binaryPath, ["setup", "--mode", "install-time"], {
+          stdio: "inherit",
+          timeout: 60000,
+          env: {
+            ...process.env,
+            CUBIC_INSTALL_TTY: "0",
+          },
+        })
+      } catch (error) {
+        const m = error instanceof Error ? error.message : String(error)
+        console.log(`cubic: setup skipped (${m}) - run \`cubic setup\` later`)
+      }
+    } else {
+      console.log("cubic: Run `cubic setup` to connect your coding agent")
+    }
   } catch (error) {
     console.error("Failed to create cubic binary symlink:", error.message)
     process.exit(1)
   }
+
+  // Only install git-ai after cubic binary is confirmed working
+  setupGitAi()
 }
 
 try {