@buildautomaton/cli 0.1.71 → 0.1.73

package/dist/index.js

@@ -29997,12 +29997,32 @@ function attachSdkStdioStderrAuthWatch(options) {
 
 // src/agents/acp/clients/sdk/spawn-sdk-stdio-process.ts
 import { spawn } from "node:child_process";
+
+// src/agents/acp/clients/bridge-installed-agent-auth-env.ts
+var authEnv = /* @__PURE__ */ new Map();
+function setBridgeInstalledAgentAuthEnv(entries) {
+  authEnv.clear();
+  for (const entry of entries) {
+    const envVar = typeof entry.envVar === "string" ? entry.envVar.trim() : "";
+    const token = typeof entry.token === "string" ? entry.token.trim() : "";
+    if (envVar && token) authEnv.set(envVar, token);
+  }
+}
+function bridgeInstalledAgentAuthProcessEnv(base = process.env) {
+  if (authEnv.size === 0) return base;
+  return { ...base, ...Object.fromEntries(authEnv) };
+}
+function cursorAgentUsesApiKeyAuth(env = process.env) {
+  return Boolean(env.CURSOR_API_KEY?.trim() || env.CURSOR_AUTH_TOKEN?.trim());
+}
+
+// src/agents/acp/clients/sdk/spawn-sdk-stdio-process.ts
 function spawnSdkStdioProcess(options) {
   const isWindows = process.platform === "win32";
   const child = spawn(options.command[0], options.command.slice(1), {
     cwd: options.cwd,
     stdio: ["pipe", "pipe", "pipe"],
-    env: process.env,
+    env: bridgeInstalledAgentAuthProcessEnv(process.env),
     shell: isWindows
   });
   const stderrCapture = createStderrCapture(child);
@@ -30586,7 +30606,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.71".length > 0 ? "0.1.71" : "0.0.0-dev";
+var CLI_VERSION = "0.1.73".length > 0 ? "0.1.73" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -33032,7 +33052,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;
@@ -33049,6 +33073,21 @@ 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 {
@@ -33058,8 +33097,18 @@ async function isCommandOnPath(command, timeoutMs = COMMAND_ON_PATH_PROBE_TIMEOU
     });
     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;
@@ -33440,10 +33489,11 @@ function createCursorAcpIncomingLineHandler(deps) {
 
 // src/agents/acp/clients/cursor/cursor-json-rpc-acp-transport.ts
 function createCursorJsonRpcAcpTransport(deps) {
-  const { send, cancelSessionNotification } = deps;
+  const { send, cancelSessionNotification, skipBrowserAuthenticate } = deps;
   return {
     initialize: (request) => send("initialize", request),
     afterInitialize: async () => {
+      if (skipBrowserAuthenticate) return;
       await send("authenticate", { methodId: "cursor_login" });
     },
     resumeSession: (p) => send("session/resume", p),
@@ -33552,7 +33602,8 @@ async function initCursorAcpWire(options) {
   rl.on("line", (line) => incoming.handleLine(line));
   const transport = createCursorJsonRpcAcpTransport({
     send: wire.send,
-    cancelSessionNotification: wire.cancelSessionNotification
+    cancelSessionNotification: wire.cancelSessionNotification,
+    skipBrowserAuthenticate: options.skipBrowserAuthenticate
   });
   const established = await bootstrapAcpWireSession(transport, options.sessionCtx, CURSOR_ACP_CLIENT_INFO);
   return { wire, transport, established, incoming, pendingRequests: pendingRequests2 };
@@ -33565,7 +33616,7 @@ function spawnCursorAcpProcess(options) {
   const child = spawn3(options.command[0], options.command.slice(1), {
     cwd: options.cwd,
     stdio: ["pipe", "pipe", "pipe"],
-    env: process.env,
+    env: bridgeInstalledAgentAuthProcessEnv(process.env),
     shell: isWindows
   });
   const stderrCapture = createStderrCapture(child);
@@ -33597,11 +33648,13 @@ async function createCursorAcpClient(options) {
     onAgentSubprocessExit
   } = options;
   const dbgFs = process.env.BUILDAUTOMATON_DEBUG_ACP_FS === "1";
+  const spawnEnv = bridgeInstalledAgentAuthProcessEnv(process.env);
   const { child, stderrCapture } = spawnCursorAcpProcess({
     command,
     cwd,
     onAgentSubprocessExit
   });
+  const skipBrowserAuthenticate = cursorAgentUsesApiKeyAuth(spawnEnv);
   const sessionCtx = createCursorAcpSessionContext({
     cwd,
     mcpServers: options.mcpServers,
@@ -33624,6 +33677,7 @@ async function createCursorAcpClient(options) {
         const { wire, transport, established, incoming, pendingRequests: pendingRequests2 } = await initCursorAcpWire({
           child,
           sessionCtx,
+          skipBrowserAuthenticate,
           incomingDeps: { dbgFs, sessionCtx, onSessionUpdate, onRequest }
         });
         resolve35(
@@ -34700,11 +34754,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 join6 } 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 join6(cliDir, "bridge-mcp-server.js");
+  return join7(cliDir, "bridge-mcp-server.js");
 }
 
 // src/mcp/build-acp-mcp-servers.ts
@@ -48479,6 +48533,7 @@ function buildBridgeUrl(apiUrl, workspaceId, authToken) {
 var API_TO_BRIDGE_MESSAGE_TYPES = [
   "auth_token",
   "bridge_identified",
+  "installed_agent_auth_sync",
   "ha",
   "preview_environments_config",
   "preview_environment_control",
@@ -48567,6 +48622,16 @@ var handleBridgeIdentified = (msg, deps) => {
   });
 };
 
+// src/routing/handlers/installed-agent-auth-sync.ts
+var handleInstalledAgentAuthSync = (msg) => {
+  const entries = Array.isArray(msg.entries) ? msg.entries : [];
+  setBridgeInstalledAgentAuthEnv(
+    entries.filter(
+      (e) => e != null && typeof e === "object" && typeof e.envVar === "string" && typeof e.token === "string"
+    )
+  );
+};
+
 // src/connection/heartbeat/ack.ts
 var handleBridgeHeartbeatAck = (msg, deps) => {
   const raw = msg.s;
@@ -48583,6 +48648,9 @@ function dispatchBridgeConnectionMessage(msg, deps) {
     case "bridge_identified":
       handleBridgeIdentified(msg, deps);
       break;
+    case "installed_agent_auth_sync":
+      handleInstalledAgentAuthSync(msg, deps);
+      break;
     case "ha":
       handleBridgeHeartbeatAck(msg, deps);
       break;
@@ -49724,9 +49792,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: bridgeAgentPathEnv(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
@@ -49734,11 +49815,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);
   }
 };
 
@@ -49747,11 +49828,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);
   }
 };
 
@@ -49762,12 +49843,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: { ...bridgeAgentPathEnv(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);
   }
 };
 
@@ -49776,11 +49864,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);
   }
 };
 
@@ -49814,7 +49902,17 @@ async function installLocalAgentOnBridge(params) {
     return { success: false, error: msg };
   }
   ensureBridgeAgentPathInProcessEnv();
-  const found = await isCommandOnPath(command.detectCommand);
+  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` };
   }
@@ -49831,7 +49929,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",
@@ -49840,14 +49938,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, {
@@ -50232,6 +50331,7 @@ function dispatchBridgeMessage(msg, deps) {
   switch (msg.type) {
     case "auth_token":
     case "bridge_identified":
+    case "installed_agent_auth_sync":
     case "ha":
       dispatchBridgeConnectionMessage(msg, deps);
       break;