@buildautomaton/cli 0.1.93 → 0.1.94

package/dist/index.js

@@ -20756,12 +20756,22 @@ var init_acp = __esm({
   }
 });
 
+// ../bridge/src/runtime/yield-to-event-loop.ts
+function yieldToEventLoop() {
+  return new Promise((resolve36) => setImmediate(resolve36));
+}
+var init_yield_to_event_loop = __esm({
+  "../bridge/src/runtime/yield-to-event-loop.ts"() {
+  }
+});
+
 // ../bridge/src/files/index/constants.ts
 import path3 from "node:path";
 import os from "node:os";
 var INDEX_WORK_YIELD_EVERY, INDEX_DIR, INDEX_HASH_LEN;
 var init_constants = __esm({
   "../bridge/src/files/index/constants.ts"() {
+    "use strict";
     INDEX_WORK_YIELD_EVERY = 128;
     INDEX_DIR = path3.join(os.homedir(), ".buildautomaton");
     INDEX_HASH_LEN = 16;
@@ -21026,15 +21036,6 @@ var init_activity_tracker = __esm({
   }
 });
 
-// ../bridge/src/runtime/yield-to-event-loop.ts
-function yieldToEventLoop() {
-  return new Promise((resolve36) => setImmediate(resolve36));
-}
-var init_yield_to_event_loop = __esm({
-  "../bridge/src/runtime/yield-to-event-loop.ts"() {
-  }
-});
-
 // ../bridge/src/code-nav/symbol-index/deferred-indexing.ts
 function isSymbolIndexDeferredError(err) {
   return err instanceof SymbolIndexDeferredError;
@@ -21125,7 +21126,6 @@ function isCliSqliteLockError(e) {
 var CliSqliteInterrupted;
 var init_sqlite_errors = __esm({
   "../bridge/src/sqlite/sqlite-errors.ts"() {
-    "use strict";
     CliSqliteInterrupted = class extends Error {
       name = "CliSqliteInterrupted";
       constructor() {
@@ -21923,7 +21923,6 @@ function withCodeNavCacheSqliteWorkLock(fn) {
 var chain, workLockDepth;
 var init_code_nav_cache_sqlite_work_lock = __esm({
   "../bridge/src/sqlite/code-nav-cache/code-nav-cache-sqlite-work-lock.ts"() {
-    "use strict";
     init_code_nav_cache_paths();
     chain = Promise.resolve();
     workLockDepth = 0;
@@ -22065,7 +22064,6 @@ async function ensureCodeNavCacheSqliteInitialized() {
 var safeCloseCodeNavCacheSqliteDatabase, openCodeNavCacheSqliteConnection;
 var init_database = __esm({
   "../bridge/src/sqlite/code-nav-cache/database.ts"() {
-    "use strict";
     init_code_nav_cache_availability();
     init_instance();
     init_sqlite_errors();
@@ -27443,6 +27441,12 @@ var wrapper_default = import_websocket.default;
 // ../bridge/src/connection/ws/cli-ws-client.ts
 import https from "node:https";
 var CLI_WEBSOCKET_CLIENT_PING_MS = 25e3;
+var CLI_WEBSOCKET_HANDSHAKE_TIMEOUT_MS = 15e3;
+var sharedWssAgent = null;
+function cliWssAgent() {
+  sharedWssAgent ??= new https.Agent({ rejectUnauthorized: false, keepAlive: true });
+  return sharedWssAgent;
+}
 function attachWebSocketClientPing(ws, intervalMs) {
   let timer = null;
   function clear() {
@@ -27463,9 +27467,12 @@ function attachWebSocketClientPing(ws, intervalMs) {
   return clear;
 }
 function buildCliWebSocketClientOptions(wsUrl) {
-  const wsOptions = { perMessageDeflate: false };
+  const wsOptions = {
+    perMessageDeflate: false,
+    handshakeTimeout: CLI_WEBSOCKET_HANDSHAKE_TIMEOUT_MS
+  };
   if (wsUrl.startsWith("wss://")) {
-    wsOptions.agent = new https.Agent({ rejectUnauthorized: false });
+    wsOptions.agent = cliWssAgent();
   }
   return wsOptions;
 }
@@ -27479,6 +27486,15 @@ function safeCloseWebSocket(ws) {
       ws.removeAllListeners();
       return;
     }
+    if (ws.readyState === wrapper_default.CONNECTING) {
+      ws.once("error", () => {
+      });
+      ws.once("close", () => {
+        ws.removeAllListeners();
+      });
+      ws.terminate();
+      return;
+    }
     ws.once("close", () => {
       ws.removeAllListeners();
     });
@@ -33501,7 +33517,25 @@ function spawnSdkStdioProcess(options) {
   return { child, stderrCapture };
 }
 
+// ../bridge/src/agents/acp/clients/listen-for-acp-client-abort.ts
+function listenForAcpClientAbort(child, signal, onAbort) {
+  if (!signal) return () => {
+  };
+  const fire = () => {
+    killChildProcessTree(child, "SIGKILL");
+    onAbort();
+  };
+  if (signal.aborted) {
+    fire();
+    return () => {
+    };
+  }
+  signal.addEventListener("abort", fire, { once: true });
+  return () => signal.removeEventListener("abort", fire);
+}
+
 // ../bridge/src/agents/acp/clients/sdk/sdk-stdio-acp-client.ts
+init_yield_to_event_loop();
 async function createSdkStdioAcpClient(options) {
   const { PROTOCOL_VERSION: PROTOCOL_VERSION2 } = await Promise.resolve().then(() => (init_acp(), acp_exports));
   const {
@@ -33519,13 +33553,18 @@ async function createSdkStdioAcpClient(options) {
     onAcpConfigOptionsUpdated,
     getActiveConfigOptions,
     afterSessionEstablished,
-    createExtNotificationHandler
+    createExtNotificationHandler,
+    signal
   } = options;
+  if (signal?.aborted) {
+    throw new Error("ACP client aborted");
+  }
   const { child, stderrCapture } = spawnSdkStdioProcess({
     command,
     cwd,
     onAgentSubprocessExit
   });
+  await yieldToEventLoop();
   const sessionCtx = createSdkStdioSessionContext({
     cwd,
     mcpServers: options.mcpServers,
@@ -33541,7 +33580,11 @@ async function createSdkStdioAcpClient(options) {
   });
   return new Promise((resolve36, reject) => {
     const init = createSdkStdioInitSettle(child);
+    const stopAbort = listenForAcpClientAbort(child, signal, () => {
+      init.settleReject(reject, new Error("ACP client aborted"));
+    });
     child.on("error", (err) => {
+      stopAbort();
       init.settleReject(reject, new Error(formatSpawnError(err, command[0])));
     });
     attachSdkStdioStderrAuthWatch({
@@ -33575,7 +33618,9 @@ async function createSdkStdioAcpClient(options) {
             killSubprocessAfterCancelMs
           })
         );
+        stopAbort();
       } catch (err) {
+        stopAbort();
         if (init.settled) return;
         init.settleReject(
           reject,
@@ -33847,22 +33892,12 @@ function installBridgeProcessResilience() {
 init_log();
 
 // ../bridge/src/agents/acp/clients/bridge-agent-path.ts
-import { execFileSync } 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 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 = execFileSync("npm", ["bin", "-g"], { encoding: "utf8", timeout: 2e3 }).trim();
-    if (npmBin) entries.push(npmBin);
-  } catch {
-  }
   return entries;
 }
 function augmentPath(pathValue, extra) {
@@ -35104,6 +35139,22 @@ function beginDeferredDisconnectForReconnect(options) {
   }
 }
 
+// ../bridge/src/connection/ws/dispose-previous-bridge-socket.ts
+function disposePreviousBridgeSocket(ws) {
+  if (!ws) return;
+  ws.removeAllListeners();
+  ws.once("error", () => {
+  });
+  ws.once("close", () => {
+    ws.removeAllListeners();
+  });
+  try {
+    if (ws.readyState === wrapper_default.CONNECTING) ws.terminate();
+    else ws.close();
+  } catch {
+  }
+}
+
 // ../bridge/src/connection/runtime/close-bridge-connection.ts
 async function closeBridgeConnection(state, acpManager, previewEnvironmentManager, log2) {
   requestCliImmediateShutdown();
@@ -35120,16 +35171,7 @@ async function closeBridgeConnection(state, acpManager, previewEnvironmentManage
   await acpManager.disconnect();
   if (state.currentWs) {
     say("Closing bridge connection to the cloud\u2026");
-    state.currentWs.removeAllListeners();
-    const wsState = state.currentWs.readyState;
-    if (wsState === 1 || wsState === 2) {
-      state.currentWs.close();
-    } else {
-      state.currentWs.on("error", () => {
-      });
-      state.currentWs.on("close", () => {
-      });
-    }
+    disposePreviousBridgeSocket(state.currentWs);
     state.currentWs = null;
   }
   if (previewEnvironmentManager) {
@@ -36323,7 +36365,8 @@ async function createCursorAcpClient(options) {
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
     onAgentSubprocessExit,
-    afterSessionEstablished
+    afterSessionEstablished,
+    signal
   } = options;
   const dbgFs = process.env.BUILDAUTOMATON_DEBUG_ACP_FS === "1";
   const spawnEnv = bridgeInstalledAgentAuthProcessEnv(process.env);
@@ -36348,7 +36391,11 @@ async function createCursorAcpClient(options) {
     stderrCapture
   });
   return new Promise((resolve36, reject) => {
+    const stopAbort = listenForAcpClientAbort(child, signal, () => {
+      reject(new Error("ACP client aborted"));
+    });
     child.on("error", (err) => {
+      stopAbort();
       killChildProcessTree(child, "SIGKILL");
       reject(new Error(formatSpawnError(err, command[0])));
     });
@@ -36360,6 +36407,7 @@ async function createCursorAcpClient(options) {
           skipBrowserAuthenticate,
           incomingDeps: { dbgFs, sessionCtx, onSessionUpdate, onRequest }
         });
+        stopAbort();
         resolve36(
           createCursorAcpHandle({
             child,
@@ -36372,6 +36420,7 @@ async function createCursorAcpClient(options) {
           })
         );
       } catch (err) {
+        stopAbort();
         killChildProcessTree(child, "SIGKILL");
         const merged = mergeErrorWithStderr(formatJsonRpcStyleError(err), stderrCapture.getText());
         reject(merged ? new Error(merged) : err instanceof Error ? err : new Error(String(err)));
@@ -36538,7 +36587,7 @@ function getAgentTypeDisplayName(agentType) {
 import { existsSync as existsSync4, statSync } from "node:fs";
 
 // ../bridge/src/git/git-exec.ts
-import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn4 } from "node:child_process";
+import { execFile as execFile2, execFileSync, spawn as spawn4 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 
 // ../bridge/src/git/git-runtime.ts
@@ -36596,7 +36645,7 @@ init_cli_process_interrupt();
 var execFileAsync2 = promisify3(execFile2);
 var GIT_SYNC_STDIO = ["ignore", "pipe", "pipe"];
 function execGitFileSync(args, options) {
-  return execFileSync2("git", args, {
+  return execFileSync("git", args, {
     encoding: "utf8",
     maxBuffer: 10 * 1024 * 1024,
     ...options,
@@ -38984,45 +39033,53 @@ function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
 // ../bridge/src/agents/capabilities/probe-agent-capabilities-for-types.ts
 init_cli_database();
 
+// ../bridge/src/agents/capabilities/agent-capability-warmup-run.ts
+init_cli_process_interrupt();
+var warmupEpoch = 0;
+var probedTypesThisProcess = /* @__PURE__ */ new Set();
+function cancelInFlightAgentCapabilityWarmup() {
+  warmupEpoch += 1;
+}
+function beginAgentCapabilityWarmupRun() {
+  const epoch = warmupEpoch += 1;
+  return () => epoch === warmupEpoch && !isCliImmediateShutdownRequested();
+}
+function wasAgentCapabilityTypeProbedThisProcess(agentType) {
+  return probedTypesThisProcess.has(agentType);
+}
+function markAgentCapabilityTypeProbedThisProcess(agentType) {
+  probedTypesThisProcess.add(agentType);
+}
+function shouldSkipCapabilityProbeThisProcess(agentType) {
+  if (process.env.BUILDAUTOMATON_FORCE_PROBE_ACP_CAPABILITIES === "1") return false;
+  return wasAgentCapabilityTypeProbedThisProcess(agentType);
+}
+
 // ../bridge/src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
 import * as path34 from "node:path";
 init_cli_database();
+init_yield_to_event_loop();
 init_cli_process_interrupt();
+var ACP_CAPABILITY_PROBE_TIMEOUT_MS = 12e3;
 async function probeOneAgentTypeForCapabilities(params) {
   const { agentType, cwd, workspaceId, log: log2, reportAgentCapabilities, bridgeReport = true, shouldContinue } = params;
-  const canContinue = () => shouldContinue?.() !== false;
+  const canContinue = () => shouldContinue?.() !== false && !isCliImmediateShutdownRequested();
   if (!canContinue()) return false;
   const resolved = resolveAgentCommand(agentType);
   if (!resolved) return false;
-  let sqliteChanged = false;
-  const reportedRef = { done: false };
-  const tryReport = (co) => {
-    if (reportedRef.done) return;
-    if (!Array.isArray(co) || co.length === 0) return;
-    reportedRef.done = true;
-    let changed = false;
-    try {
-      changed = withCliSqliteSync(
-        (db) => upsertCliAgentCapabilityCache(db, {
-          workspaceId,
-          agentType,
-          configOptions: co
-        })
-      );
-    } catch {
-    }
-    sqliteChanged ||= changed;
-    if (bridgeReport && changed) {
-      reportAgentCapabilities?.({ agentType, configOptions: co });
-    }
-  };
+  await yieldToEventLoop();
+  if (!canContinue()) return false;
+  markAgentCapabilityTypeProbedThisProcess(agentType);
+  let pendingCo = null;
+  const ac = new AbortController();
+  const abortTimer = setTimeout(() => ac.abort(), ACP_CAPABILITY_PROBE_TIMEOUT_MS);
+  abortTimer.unref?.();
+  const abortIfStale = setInterval(() => {
+    if (!canContinue()) ac.abort();
+  }, 50);
+  abortIfStale.unref?.();
   let handle = null;
-  const killTimer = setTimeout(() => {
-    void handle?.disconnectGracefully();
-  }, 28e3);
-  killTimer.unref?.();
   try {
-    if (!canContinue()) return false;
     handle = await resolved.createClient({
       command: resolved.command,
       cwd: path34.resolve(cwd),
@@ -39030,12 +39087,13 @@ async function probeOneAgentTypeForCapabilities(params) {
       sessionMode: "agent",
       persistedAcpSessionId: null,
       agentConfig: null,
+      signal: ac.signal,
       getActiveConfigOptions: () => null,
       onAcpSessionEstablished: (info) => {
-        tryReport(info.configOptions ?? null);
+        if (Array.isArray(info.configOptions) && info.configOptions.length > 0) pendingCo = info.configOptions;
       },
       onAcpConfigOptionsUpdated: (co) => {
-        tryReport(co);
+        if (Array.isArray(co) && co.length > 0) pendingCo = co;
       },
       onAgentSubprocessExit: () => {
       },
@@ -39048,13 +39106,21 @@ async function probeOneAgentTypeForCapabilities(params) {
       `[Bridge service] Agent capability probe (${agentType}): ${e instanceof Error ? e.message : String(e)}`
     );
   } finally {
-    clearTimeout(killTimer);
+    clearTimeout(abortTimer);
+    clearInterval(abortIfStale);
     try {
       await handle?.disconnectGracefully();
     } catch {
     }
   }
-  return sqliteChanged;
+  if (!pendingCo || !canContinue()) return false;
+  const configOptions = pendingCo;
+  await yieldToEventLoop();
+  const changed = await withCliSqlite(
+    (db) => upsertCliAgentCapabilityCache(db, { workspaceId, agentType, configOptions })
+  );
+  if (bridgeReport && changed) reportAgentCapabilities?.({ agentType, configOptions });
+  return changed;
 }
 
 // ../bridge/src/agents/capabilities/probe-agent-capabilities-for-types.ts
@@ -39073,9 +39139,10 @@ async function probeAgentCapabilitiesForDetectedTypes(params) {
   let changedCount = 0;
   for (let i = 0; i < agentTypes.length; i++) {
     if (!canContinue()) return changedCount;
-    if (i > 0) await yieldToEventLoop();
+    await yieldToEventLoop();
     const agentType = agentTypes[i];
     if (!agentType.trim()) continue;
+    if (shouldSkipCapabilityProbeThisProcess(agentType)) continue;
     if (!forceAllTypes) {
       try {
         if (process.env.BUILDAUTOMATON_FORCE_PROBE_ACP_CAPABILITIES !== "1" && await withCliSqlite((db) => hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType))) {
@@ -39101,19 +39168,6 @@ async function probeAgentCapabilitiesForDetectedTypes(params) {
 // ../bridge/src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
 init_yield_to_event_loop();
 init_cli_database();
-
-// ../bridge/src/agents/capabilities/agent-capability-warmup-run.ts
-init_cli_process_interrupt();
-var warmupEpoch = 0;
-function cancelInFlightAgentCapabilityWarmup() {
-  warmupEpoch += 1;
-}
-function beginAgentCapabilityWarmupRun() {
-  const epoch = warmupEpoch += 1;
-  return () => epoch === warmupEpoch && !isCliImmediateShutdownRequested();
-}
-
-// ../bridge/src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
 async function warmupAgentCapabilitiesOnConnect(params) {
   const { workspaceId, log: log2, getWs } = params;
   const isCurrent = beginAgentCapabilityWarmupRun();
@@ -39125,8 +39179,7 @@ async function warmupAgentCapabilitiesOnConnect(params) {
     if (!socket || socket.readyState !== wrapper_default.OPEN) return;
     try {
       const rows = await withCliSqlite((db) => listCliAgentCapabilityCacheForWorkspace(db, workspaceId));
-      if (!isCurrent()) return;
-      if (rows.length === 0) return;
+      if (!isCurrent() || rows.length === 0) return;
       sendWsMessage(socket, {
         type: "agent_capabilities_batch",
         items: rows.map((r) => ({ agentType: r.agentType, configOptions: r.configOptions }))
@@ -39140,46 +39193,30 @@ async function warmupAgentCapabilitiesOnConnect(params) {
   }
   await sendBatchFromCache();
   if (!isCurrent()) return;
-  let types = [];
-  try {
-    types = [...await detectLocalAgentTypes()];
-  } catch (e) {
-    log2(`[Bridge service] detectLocalAgentTypes failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  if (!isCurrent()) return;
-  try {
-    const n = await probeAgentCapabilitiesForDetectedTypes({
-      agentTypes: types,
-      cwd,
-      workspaceId,
-      log: log2,
-      bridgeReport: false,
-      forceAllTypes: false,
-      shouldContinue: isCurrent
-    });
-    if (n > 0) await sendBatchFromCache();
-  } catch (e) {
-    if (e instanceof CliSqliteInterrupted) return;
-    log2(`[Bridge service] Agent capability probe (missing cache) failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  if (!isCurrent()) return;
   void (async () => {
     try {
       await yieldToEventLoop();
       if (!isCurrent()) return;
+      let types = [];
+      try {
+        types = [...await detectLocalAgentTypes()];
+      } catch (e) {
+        log2(`[Bridge service] detectLocalAgentTypes failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+      if (!isCurrent()) return;
       const n = await probeAgentCapabilitiesForDetectedTypes({
         agentTypes: types,
         cwd,
         workspaceId,
         log: log2,
         bridgeReport: false,
-        forceAllTypes: true,
+        forceAllTypes: false,
         shouldContinue: isCurrent
       });
       if (n > 0) await sendBatchFromCache();
     } catch (e) {
       if (e instanceof CliSqliteInterrupted) return;
-      log2(`[Bridge service] Agent capability lazy refresh failed: ${e instanceof Error ? e.message : String(e)}`);
+      log2(`[Bridge service] Agent capability probe failed: ${e instanceof Error ? e.message : String(e)}`);
     }
   })();
 }
@@ -40591,7 +40628,7 @@ function createBridgeHeartbeatController(params) {
 }
 
 // ../bridge/src/cli/cli-version.ts
-var CLI_VERSION = "0.1.93".length > 0 ? "0.1.93" : "0.0.0-dev";
+var CLI_VERSION = "0.1.94".length > 0 ? "0.1.94" : "0.0.0-dev";
 
 // ../bridge/src/connection/identify/send-bridge-identify.ts
 function sendBridgeIdentify(ws, params) {
@@ -50490,7 +50527,6 @@ var handleBridgeIdentified = (msg, deps) => {
   });
   setImmediate(() => {
     void (async () => {
-      cancelInFlightAgentCapabilityWarmup();
       try {
         await deps.reportAutoDetectedAgents?.();
       } catch (e) {
@@ -50498,13 +50534,11 @@ var handleBridgeIdentified = (msg, deps) => {
           `[Bridge service] Auto-detect agents failed: ${e instanceof Error ? e.message : String(e)}`
         );
       }
-      try {
-        await deps.warmupAgentCapabilitiesOnConnect?.();
-      } catch (e) {
+      void deps.warmupAgentCapabilitiesOnConnect?.()?.catch((e) => {
         deps.log(
           `[Bridge service] Agent capability warmup failed: ${e instanceof Error ? e.message : String(e)}`
         );
-      }
+      });
     })();
   });
 };
@@ -52392,6 +52426,7 @@ function createMainBridgeCloseHandler(params, connect) {
   const { state, logFn, bridgeHeartbeat } = params;
   return (code, reason, closedWs) => {
     if (state.currentWs !== closedWs) return;
+    cancelInFlightAgentCapabilityWarmup();
     bridgeHeartbeat?.stop();
     try {
       state.currentWs = null;
@@ -52519,20 +52554,8 @@ function createMainBridgeWebSocketLifecycle(params) {
       }
     }
     bridgeHeartbeat?.stop();
-    const prev = state.currentWs;
-    if (prev) {
-      prev.removeAllListeners();
-      prev.once("error", () => {
-      });
-      prev.once("close", () => {
-        prev.removeAllListeners();
-      });
-      try {
-        prev.close();
-      } catch {
-      }
-      state.currentWs = null;
-    }
+    disposePreviousBridgeSocket(state.currentWs);
+    state.currentWs = null;
     try {
       const url2 = plugin.transport.resolveControlPlaneUrl({
         workspaceId,
@@ -53029,7 +53052,7 @@ async function defaultBrowserId() {
 // ../../node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js
 import process6 from "node:process";
 import { promisify as promisify5 } from "node:util";
-import { execFile as execFile4, execFileSync as execFileSync3 } from "node:child_process";
+import { execFile as execFile4, execFileSync as execFileSync2 } from "node:child_process";
 var execFileAsync4 = promisify5(execFile4);
 async function runAppleScript(script, { humanReadableOutput = true, signal } = {}) {
   if (process6.platform !== "darwin") {
@@ -53516,7 +53539,7 @@ function createPendingAuthOnMessage(params) {
 }
 
 // src/cli-version.ts
-var CLI_VERSION2 = "0.1.93".length > 0 ? "0.1.93" : "0.0.0-dev";
+var CLI_VERSION2 = "0.1.94".length > 0 ? "0.1.94" : "0.0.0-dev";
 
 // src/auth/pending/pending-auth-on-open.ts
 function createPendingAuthOnOpen(params) {