@buildautomaton/cli 0.1.70 → 0.1.72

package/dist/index.js

@@ -22367,14 +22367,14 @@ var init_access = __esm({
 
 // src/sqlite/read-migration-sql.ts
 import { existsSync, readFileSync as readFileSync2 } from "node:fs";
-import { dirname as dirname2, join } from "node:path";
+import { dirname as dirname2, join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function readMigrationSql(filename, ...searchSubdirs) {
   const moduleDir = dirname2(fileURLToPath2(import.meta.url));
   const candidates = searchSubdirs.flatMap((sub) => [
-    join(moduleDir, sub, filename),
-    join(moduleDir, "..", sub, filename),
-    join(moduleDir, "..", "..", "dist", sub, filename)
+    join2(moduleDir, sub, filename),
+    join2(moduleDir, "..", sub, filename),
+    join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
   const resolved = candidates.find((path82) => existsSync(path82));
   if (!resolved) {
@@ -25255,26 +25255,26 @@ var init_member_access = __esm({
 
 // src/code-nav/tree-sitter-assets-dir.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { dirname as dirname3, join as join2 } from "node:path";
+import { dirname as dirname3, join as join3 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function repoNodeModulesDir(fromDir) {
-  return join2(fromDir, "..", "..", "..", "node_modules");
+  return join3(fromDir, "..", "..", "..", "node_modules");
 }
 function firstDirWithWebTreeSitterWasm(candidates) {
   for (const dir of candidates) {
-    if (existsSync2(join2(dir, "web-tree-sitter.wasm"))) return dir;
+    if (existsSync2(join3(dir, "web-tree-sitter.wasm"))) return dir;
   }
   return null;
 }
 function getTreeSitterAssetsDir() {
   const moduleDir = dirname3(fileURLToPath3(import.meta.url));
   const fromModule = firstDirWithWebTreeSitterWasm([
-    join2(moduleDir, "tree-sitter"),
-    join2(moduleDir, "..", "tree-sitter"),
-    join2(moduleDir, "..", "..", "dist", "tree-sitter")
+    join3(moduleDir, "tree-sitter"),
+    join3(moduleDir, "..", "tree-sitter"),
+    join3(moduleDir, "..", "..", "dist", "tree-sitter")
   ]);
   if (fromModule) return fromModule;
-  const fromNodeModules = firstDirWithWebTreeSitterWasm([join2(repoNodeModulesDir(moduleDir), "web-tree-sitter")]);
+  const fromNodeModules = firstDirWithWebTreeSitterWasm([join3(repoNodeModulesDir(moduleDir), "web-tree-sitter")]);
   if (fromNodeModules) return fromNodeModules;
   throw new Error(
     "Missing web-tree-sitter.wasm. Run `pnpm build` in packages/cli to copy tree-sitter assets into dist/tree-sitter."
@@ -25288,7 +25288,7 @@ var init_tree_sitter_assets_dir = __esm({
 
 // src/code-nav/parser/tree-sitter-runtime.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
-import { dirname as dirname4, join as join3 } from "node:path";
+import { dirname as dirname4, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { Parser, Language, Query, LANGUAGE_VERSION, MIN_COMPATIBLE_VERSION } from "web-tree-sitter";
 function withTreeSitterRuntimeLock(fn) {
@@ -25303,7 +25303,7 @@ async function ensureParserInit() {
   if (!initPromise2) {
     const assetsDir = getTreeSitterAssetsDir();
     initPromise2 = Parser.init({
-      locateFile: (scriptName) => join3(assetsDir, scriptName)
+      locateFile: (scriptName) => join4(assetsDir, scriptName)
     }).catch((e) => {
       initPromise2 = null;
       throw e;
@@ -25313,9 +25313,9 @@ async function ensureParserInit() {
 }
 function resolveWasmPath(assetsDir, wasmFile) {
   const candidates = [
-    join3(assetsDir, wasmFile),
-    join3(assetsDir, "..", "..", "dist", "tree-sitter", wasmFile),
-    join3(assetsDir, "..", "..", "..", "node_modules", wasmFile.replace(".wasm", ""), wasmFile)
+    join4(assetsDir, wasmFile),
+    join4(assetsDir, "..", "..", "dist", "tree-sitter", wasmFile),
+    join4(assetsDir, "..", "..", "..", "node_modules", wasmFile.replace(".wasm", ""), wasmFile)
   ];
   const hit = candidates.find((p) => existsSync3(p));
   if (!hit) throw new Error(`Missing tree-sitter wasm: ${wasmFile}`);
@@ -25324,10 +25324,10 @@ function resolveWasmPath(assetsDir, wasmFile) {
 function resolveTagsPath(assetsDir, tagsQueryFile) {
   const pkgName = tagsQueryFile.split("/")[0] ?? "";
   const candidates = [
-    join3(CODE_NAV_QUERIES_ROOT, tagsQueryFile),
-    join3(assetsDir, tagsQueryFile),
-    join3(assetsDir, "..", "..", "dist", "tree-sitter", tagsQueryFile),
-    join3(assetsDir, "..", "..", "..", "node_modules", pkgName, "queries", "tags.scm")
+    join4(CODE_NAV_QUERIES_ROOT, tagsQueryFile),
+    join4(assetsDir, tagsQueryFile),
+    join4(assetsDir, "..", "..", "dist", "tree-sitter", tagsQueryFile),
+    join4(assetsDir, "..", "..", "..", "node_modules", pkgName, "queries", "tags.scm")
   ];
   const hit = candidates.find((p) => existsSync3(p));
   if (!hit) throw new Error(`Missing tags query: ${tagsQueryFile}`);
@@ -25365,7 +25365,7 @@ var init_tree_sitter_runtime = __esm({
     loadedByKey = /* @__PURE__ */ new Map();
     failedLanguageKeys = /* @__PURE__ */ new Set();
     runtimeChain = Promise.resolve();
-    CODE_NAV_QUERIES_ROOT = join3(dirname4(fileURLToPath4(import.meta.url)), "..", "queries");
+    CODE_NAV_QUERIES_ROOT = join4(dirname4(fileURLToPath4(import.meta.url)), "..", "queries");
   }
 });
 
@@ -26936,7 +26936,7 @@ var init_in_process_bridge = __esm({
 });
 
 // src/code-nav/symbol-index/worker/lifecycle/state.ts
-import { dirname as dirname5, join as join4 } from "node:path";
+import { dirname as dirname5, join as join5 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function getWorker() {
   return worker;
@@ -26955,7 +26955,7 @@ function shouldUseInProcessWorker() {
 }
 function resolveWorkerScriptPath() {
   const moduleDir = dirname5(fileURLToPath5(import.meta.url));
-  return join4(moduleDir, "..", "worker.js");
+  return join5(moduleDir, "..", "worker.js");
 }
 function resetLifecycleStateForTests() {
   terminatePromise = null;
@@ -30586,7 +30586,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.70".length > 0 ? "0.1.70" : "0.0.0-dev";
+var CLI_VERSION = "0.1.72".length > 0 ? "0.1.72" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -31708,6 +31708,46 @@ function runPendingAuth(options) {
 // src/run-bridge-connected.ts
 init_log();
 
+// src/agents/acp/clients/bridge-agent-path.ts
+import { execFileSync as execFileSync2 } from "node:child_process";
+import { homedir } from "node:os";
+import { join } from "node:path";
+function getBridgeAgentPathEntries(home = process.env.HOME ?? homedir()) {
+  const entries = [
+    join(home, ".local", "bin"),
+    join(home, ".npm-global", "bin"),
+    "/usr/local/bin"
+  ];
+  const prefix = process.env.NPM_CONFIG_PREFIX;
+  if (prefix) entries.push(join(prefix, "bin"));
+  try {
+    const npmBin = execFileSync2("npm", ["bin", "-g"], { encoding: "utf8", timeout: 2e3 }).trim();
+    if (npmBin) entries.push(npmBin);
+  } catch {
+  }
+  return entries;
+}
+function augmentPath(pathValue, extra) {
+  const current = pathValue ?? "";
+  const parts = current.split(":").filter(Boolean);
+  const seen = new Set(parts);
+  const prefix = [];
+  for (const entry of extra) {
+    if (!entry || seen.has(entry)) continue;
+    seen.add(entry);
+    prefix.push(entry);
+  }
+  if (prefix.length === 0) return current;
+  return current ? `${prefix.join(":")}:${current}` : prefix.join(":");
+}
+function ensureBridgeAgentPathInProcessEnv() {
+  const extra = getBridgeAgentPathEntries();
+  process.env.PATH = augmentPath(process.env.PATH, extra);
+}
+function bridgeAgentPathEnv(base = process.env) {
+  return { ...base, PATH: augmentPath(base.PATH, getBridgeAgentPathEntries()) };
+}
+
 // src/files/watch-file-index.ts
 import path25 from "node:path";
 
@@ -32992,7 +33032,11 @@ __export(claude_code_acp_client_exports, {
 
 // src/agents/acp/clients/detect-command-on-path.ts
 init_cli_process_interrupt();
+import { constants } from "node:fs";
+import { access } from "node:fs/promises";
 import { execFile as execFile6 } from "node:child_process";
+import { homedir as homedir2 } from "node:os";
+import { join as join6 } from "node:path";
 import { promisify as promisify7 } from "node:util";
 var execFileAsync5 = promisify7(execFile6);
 var COMMAND_ON_PATH_PROBE_TIMEOUT_MS = 750;
@@ -33009,15 +33053,43 @@ async function execFileShutdownAware(file2, args, timeoutMs) {
     clearInterval(shutdownPoll);
   }
 }
+async function isExecutableFile(filePath) {
+  try {
+    await access(filePath, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function isCommandInBridgeAgentDirs(command) {
+  const home = process.env.HOME ?? homedir2();
+  for (const dir of getBridgeAgentPathEntries(home)) {
+    if (await isExecutableFile(join6(dir, command))) return true;
+  }
+  return false;
+}
 async function isCommandOnPath(command, timeoutMs = COMMAND_ON_PATH_PROBE_TIMEOUT_MS) {
   if (isCliImmediateShutdownRequested()) return false;
   try {
-    await execFileShutdownAware("which", [command], timeoutMs);
+    await execFileAsync5("which", [command], {
+      timeout: timeoutMs,
+      env: bridgeAgentPathEnv()
+    });
     return true;
   } catch {
-    return false;
+    return isCommandInBridgeAgentDirs(command);
   }
 }
+async function waitForCommandOnPath(command, opts = {}) {
+  const maxAttempts = opts.maxAttempts ?? 8;
+  const delayMs = opts.delayMs ?? 400;
+  const timeoutMs = opts.timeoutMs ?? COMMAND_ON_PATH_PROBE_TIMEOUT_MS;
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    if (await isCommandOnPath(command, timeoutMs)) return true;
+    if (attempt < maxAttempts - 1) await new Promise((r) => setTimeout(r, delayMs));
+  }
+  return false;
+}
 async function execProbeShutdownAware(file2, args, timeoutMs) {
   if (isCliImmediateShutdownRequested()) return false;
   try {
@@ -33704,15 +33776,15 @@ function resolveAgentCommand(preferredAgentType) {
 }
 
 // src/agents/acp/session-file-change-path-kind.ts
-import { execFileSync as execFileSync4 } from "node:child_process";
+import { execFileSync as execFileSync5 } from "node:child_process";
 import { existsSync as existsSync4, statSync } from "node:fs";
 
 // src/git/get-git-repo-root-sync.ts
-import { execFileSync as execFileSync2 } from "node:child_process";
+import { execFileSync as execFileSync3 } from "node:child_process";
 import * as path27 from "node:path";
 function getGitRepoRootSync(startDir) {
   try {
-    const out = execFileSync2("git", ["rev-parse", "--show-toplevel"], {
+    const out = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
       cwd: path27.resolve(startDir),
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
@@ -33725,7 +33797,7 @@ function getGitRepoRootSync(startDir) {
 }
 
 // src/agents/acp/workspace-files.ts
-import { execFileSync as execFileSync3 } from "node:child_process";
+import { execFileSync as execFileSync4 } from "node:child_process";
 import { readFileSync as readFileSync4 } from "node:fs";
 import * as path28 from "node:path";
 function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
@@ -33786,7 +33858,7 @@ function readGitHeadBlob(sessionParentPath, displayPath) {
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   const execCwd = gitRoot ?? sessionParentPath;
   try {
-    return execFileSync3("git", ["show", `HEAD:${displayPath}`], {
+    return execFileSync4("git", ["show", `HEAD:${displayPath}`], {
       cwd: execCwd,
       encoding: "utf8",
       maxBuffer: 50 * 1024 * 1024
@@ -33802,7 +33874,7 @@ function gitHeadPathObjectType(sessionParentPath, displayPath) {
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (!gitRoot) return null;
   try {
-    return execFileSync4("git", ["cat-file", "-t", `HEAD:${displayPath}`], {
+    return execFileSync5("git", ["cat-file", "-t", `HEAD:${displayPath}`], {
       cwd: gitRoot,
       encoding: "utf8"
     }).trim();
@@ -34657,11 +34729,11 @@ init_cli_process_interrupt();
 var BRIDGE_MCP_SERVER_NAME2 = "buildautomaton-bridge";
 
 // src/mcp/resolve-bridge-mcp-server-path.ts
-import { dirname as dirname7, join as join5 } from "node:path";
+import { dirname as dirname7, join as join7 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function resolveBridgeMcpServerScriptPath() {
   const cliDir = dirname7(fileURLToPath7(import.meta.url));
-  return join5(cliDir, "bridge-mcp-server.js");
+  return join7(cliDir, "bridge-mcp-server.js");
 }
 
 // src/mcp/build-acp-mcp-servers.ts
@@ -49681,9 +49753,22 @@ var handleInstallSkillsMessage = (msg, deps) => {
 // src/agents/install/commands/run-npm-global-install.ts
 import { execFile as execFile9 } from "node:child_process";
 import { promisify as promisify10 } from "node:util";
+
+// src/agents/install/format-command-output.ts
+function formatCommandOutput(stdout, stderr) {
+  const parts = [String(stdout ?? "").trimEnd(), String(stderr ?? "").trimEnd()].filter(Boolean);
+  return parts.join("\n");
+}
+
+// src/agents/install/commands/run-npm-global-install.ts
 var execFileAsync8 = promisify10(execFile9);
 async function runNpmGlobalInstall(packageName, env, timeoutMs = 3e5) {
-  await execFileAsync8("npm", ["install", "-g", packageName], { timeout: timeoutMs, env });
+  const { stdout, stderr } = await execFileAsync8("npm", ["install", "-g", packageName], {
+    timeout: timeoutMs,
+    env: bridgeAgentPathEnv(env),
+    maxBuffer: 10 * 1024 * 1024
+  });
+  return formatCommandOutput(stdout, stderr);
 }
 
 // src/agents/install/commands/claude-code.ts
@@ -49691,11 +49776,11 @@ var claudeCodeInstallCommand = {
   agentType: "claude-code",
   detectCommand: "claude",
   async install(ctx) {
-    ctx.onProgress?.("Installing Anthropic Claude Code");
-    await runNpmGlobalInstall("@anthropic-ai/claude-code", {
+    const logOutput = await runNpmGlobalInstall("@anthropic-ai/claude-code", {
       ...ctx.env,
       ANTHROPIC_API_KEY: ctx.authToken
     });
+    ctx.onProgress?.("Installing Anthropic Claude Code", logOutput || void 0);
   }
 };
 
@@ -49704,11 +49789,11 @@ var codexAcpInstallCommand = {
   agentType: "codex-acp",
   detectCommand: "codex",
   async install(ctx) {
-    ctx.onProgress?.("Installing Codex");
-    await runNpmGlobalInstall("@openai/codex", {
+    const logOutput = await runNpmGlobalInstall("@openai/codex", {
       ...ctx.env,
       OPENAI_API_KEY: ctx.authToken
     });
+    ctx.onProgress?.("Installing Codex", logOutput || void 0);
   }
 };
 
@@ -49719,12 +49804,19 @@ var execFileAsync9 = promisify11(execFile10);
 var cursorCliInstallCommand = {
   agentType: "cursor-cli",
   detectCommand: "agent",
+  alternateDetectCommands: ["cursor-agent"],
   async install(ctx) {
-    ctx.onProgress?.("Installing Cursor CLI");
-    await execFileAsync9("bash", ["-lc", "curl -fsSL https://cursor.com/install | bash"], {
-      timeout: 3e5,
-      env: { ...ctx.env, CURSOR_API_KEY: ctx.authToken }
-    });
+    const { stdout, stderr } = await execFileAsync9(
+      "bash",
+      ["-lc", "curl -fsSL https://cursor.com/install | bash"],
+      {
+        timeout: 3e5,
+        env: { ...bridgeAgentPathEnv(ctx.env), CURSOR_API_KEY: ctx.authToken },
+        maxBuffer: 10 * 1024 * 1024
+      }
+    );
+    const logOutput = formatCommandOutput(stdout, stderr);
+    ctx.onProgress?.("Installing Cursor CLI", logOutput || void 0);
   }
 };
 
@@ -49733,11 +49825,11 @@ var opencodeInstallCommand = {
   agentType: "opencode",
   detectCommand: "opencode",
   async install(ctx) {
-    ctx.onProgress?.("Installing OpenCode");
-    await runNpmGlobalInstall("opencode-ai", {
+    const logOutput = await runNpmGlobalInstall("opencode-ai", {
       ...ctx.env,
       OPENCODE_API_KEY: ctx.authToken
     });
+    ctx.onProgress?.("Installing OpenCode", logOutput || void 0);
   }
 };
 
@@ -49770,7 +49862,18 @@ async function installLocalAgentOnBridge(params) {
     const msg = e instanceof Error ? e.message : String(e);
     return { success: false, error: msg };
   }
-  const found = await isCommandOnPath(command.detectCommand);
+  ensureBridgeAgentPathInProcessEnv();
+  const detectNames = [
+    command.detectCommand,
+    ...command.alternateDetectCommands ?? []
+  ];
+  let found = false;
+  for (const name of detectNames) {
+    if (await waitForCommandOnPath(name)) {
+      found = true;
+      break;
+    }
+  }
   if (!found) {
     return { success: false, error: `${command.detectCommand} not found on PATH after install` };
   }
@@ -49787,7 +49890,7 @@ var handleInstallAgentMessage = (msg, deps) => {
   if (!processId || !agentId || !tokenId || !agentType || !authToken) return;
   void (async () => {
     const socket = deps.getWs();
-    const report = (step, message) => {
+    const report = (step, message, logOutput) => {
       if (socket) {
         sendWsMessage(socket, {
           type: "install_agent_progress",
@@ -49796,14 +49899,15 @@ var handleInstallAgentMessage = (msg, deps) => {
           tokenId,
           agentType,
           step,
-          message
+          message,
+          ...logOutput ? { logOutput } : {}
         });
       }
     };
     const result = await installLocalAgentOnBridge({
       agentType,
       authToken,
-      onProgress: (message) => report("agent_install_package", message)
+      onProgress: (message, logOutput) => report("agent_install_package", message, logOutput)
     });
     if (socket) {
       sendWsMessage(socket, {
@@ -49816,6 +49920,9 @@ var handleInstallAgentMessage = (msg, deps) => {
         error: result.error
       });
     }
+    if (result.success) {
+      await deps.reportAutoDetectedAgents?.();
+    }
     if (!result.success) {
       deps.log(`[Bridge service] Install agent failed: ${result.error ?? "unknown"}`);
     }
@@ -50501,6 +50608,7 @@ init_log();
 async function createBridgeConnection(options) {
   const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
   const logFn = options.log ?? log;
+  ensureBridgeAgentPathInProcessEnv();
   await ensureBridgeConnectionDatabases(logFn);
   const { state, getWs } = createMainBridgeReconnectState();
   const runtime = await createBridgeConnectionRuntime(options, { state, getWs, logFn });