@buildautomaton/cli 0.1.90 → 0.1.92

package/dist/cli.js

@@ -24125,7 +24125,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() {
@@ -30449,7 +30448,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.90".length > 0 ? "0.1.90" : "0.0.0-dev";
+var CLI_VERSION = "0.1.92".length > 0 ? "0.1.92" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -30605,6 +30604,7 @@ function createWsBridge(options) {
   });
   ws.on("open", () => {
     disposeClientPing();
+    if (isActiveSocket && !isActiveSocket(ws)) return;
     if (clientPingIntervalMs != null && clientPingIntervalMs > 0) {
       clearClientPing = attachWebSocketClientPing(ws, clientPingIntervalMs);
     }
@@ -30624,10 +30624,12 @@ function createWsBridge(options) {
   });
   ws.on("close", (code, reason) => {
     disposeClientPing();
-    onClose?.(code, reason.toString());
+    if (isActiveSocket && !isActiveSocket(ws)) return;
+    onClose?.(code, reason.toString(), ws);
   });
   ws.on("error", (err) => {
     disposeClientPing();
+    if (isActiveSocket && !isActiveSocket(ws)) return;
     onError2?.(err);
   });
   return ws;
@@ -30732,7 +30734,7 @@ function formatSpawnError(err, command) {
 }
 
 // ../bridge/src/agents/acp/clients/kill-process-tree.ts
-var import_tree_kill = __toESM(require_tree_kill());
+var import_tree_kill = __toESM(require_tree_kill(), 1);
 import { promisify } from "node:util";
 var treeKillAsync = promisify(import_tree_kill.default);
 var ACP_PROCESS_TREE_KILL_GRACE_MS = 2500;
@@ -30801,29 +30803,50 @@ function forceAcpSubprocessDisconnect(child) {
   killChildProcessTree(child, "SIGKILL");
 }
 
-// ../bridge/src/agents/local-agent-auth.ts
-var LOCAL_AGENT_AUTH_ERROR_HINTS = {
-  "kiro-acp": [/not logged in/i, /kiro-cli\s+login/i, /log in with kiro-cli/i],
-  "cursor-cli": [/cursor_login/i, /authenticate.*cursor/i, /not logged in.*cursor/i, /run:\s*agent\s+login/i],
-  "codex-acp": [
-    /authentication failed/i,
-    /not authenticated/i,
-    /invalid.*api key/i,
-    /sign in.*openai/i,
-    /login.*openai/i,
-    /unauthorized/i
-  ],
-  "claude-code": [
-    /ANTHROPIC_API_KEY/i,
-    /not authenticated/i,
-    /authentication failed/i,
-    /claude\s+login/i,
-    /please run.*claude.*login/i
-  ]
+// ../bridge/src/agents/providers/claude-code/auth.ts
+var claudeCodeAuthErrorHints = [
+  /ANTHROPIC_API_KEY/i,
+  /not authenticated/i,
+  /authentication failed/i,
+  /claude\s+login/i,
+  /please run.*claude.*login/i
+];
+
+// ../bridge/src/agents/providers/codex/auth.ts
+var codexAuthErrorHints = [
+  /authentication failed/i,
+  /not authenticated/i,
+  /invalid.*api key/i,
+  /sign in.*openai/i,
+  /login.*openai/i,
+  /unauthorized/i
+];
+
+// ../bridge/src/agents/providers/cursor/auth.ts
+var cursorAuthErrorHints = [
+  /cursor_login/i,
+  /authenticate.*cursor/i,
+  /not logged in.*cursor/i,
+  /run:\s*agent\s+login/i
+];
+
+// ../bridge/src/agents/providers/kiro/auth.ts
+var kiroAuthErrorHints = [
+  /not logged in/i,
+  /kiro-cli\s+login/i,
+  /log in with kiro-cli/i
+];
+
+// ../bridge/src/agents/providers/auth.ts
+var AUTH_ERROR_HINTS = {
+  "claude-code": claudeCodeAuthErrorHints,
+  "codex-acp": codexAuthErrorHints,
+  "cursor-cli": cursorAuthErrorHints,
+  "kiro-acp": kiroAuthErrorHints
 };
 function localAgentErrorSuggestsAuth(agentType, errorText) {
   if (agentType == null || agentType === "" || errorText == null || !String(errorText).trim()) return false;
-  const hints = LOCAL_AGENT_AUTH_ERROR_HINTS[agentType];
+  const hints = AUTH_ERROR_HINTS[agentType];
   if (!hints?.length) return false;
   return hints.some((re) => re.test(String(errorText)));
 }
@@ -36016,34 +36039,11 @@ function flattenSdkSessionNotificationParams(params) {
   return { sessionId: params.sessionId, ...params.update };
 }
 
-// ../bridge/src/agents/acp/clients/kiro-sdk-ext-notifications.ts
-function createKiroSdkExtNotificationHandler(options) {
-  const { onSessionUpdate } = options;
-  return async (method, params) => {
-    if (method === "_kiro.dev/metadata") {
-      const p = params && typeof params === "object" ? params : {};
-      const pct = p.contextUsagePercentage;
-      if (typeof pct !== "number" || !Number.isFinite(pct) || !onSessionUpdate) return;
-      onSessionUpdate({
-        sessionUpdate: "context_usage",
-        contextUsagePercentage: pct
-      });
-      return;
-    }
-  };
-}
-
 // ../bridge/src/agents/acp/clients/sdk/sdk-stdio-ext-notifications.ts
 var noopExtNotification = async () => {
 };
-function createSdkStdioExtNotificationHandler(options) {
-  const { backendAgentType, onSessionUpdate } = options;
-  switch (backendAgentType) {
-    case "kiro-acp":
-      return createKiroSdkExtNotificationHandler({ onSessionUpdate });
-    default:
-      return noopExtNotification;
-  }
+function createSdkStdioExtNotificationHandler(_options) {
+  return noopExtNotification;
 }
 
 // ../bridge/src/agents/acp/clients/sdk/sdk-stdio-permission-request-handshake.ts
@@ -36077,11 +36077,8 @@ function resolvePendingSdkStdioPermissionCancellations(pending2) {
 
 // ../bridge/src/agents/acp/clients/sdk/sdk-stdio-connection-client.ts
 function createSdkStdioConnectionClient(deps) {
-  const { backendAgentType, onSessionUpdate, onRequest, sessionCtx, pendingPermissionReplies } = deps;
-  const extNotification = createSdkStdioExtNotificationHandler({
-    backendAgentType,
-    onSessionUpdate
-  });
+  const { onSessionUpdate, onRequest, sessionCtx, pendingPermissionReplies, createExtNotificationHandler } = deps;
+  const extNotification = createExtNotificationHandler?.({ onSessionUpdate }) ?? createSdkStdioExtNotificationHandler({ onSessionUpdate });
   let permissionSeq = 0;
   return (_agent) => ({
     async requestPermission(params) {
@@ -36193,121 +36190,16 @@ function createSdkStdioSessionContext(options) {
     onAcpSessionEstablished: options.onAcpSessionEstablished,
     onAcpConfigOptionsUpdated: options.onAcpConfigOptionsUpdated,
     logDebug,
-    getStderrText: () => options.stderrCapture.getText()
+    getStderrText: () => options.stderrCapture.getText(),
+    afterSessionEstablished: options.afterSessionEstablished
   };
 }
 
 // ../bridge/src/agents/acp/clients/sdk/sdk-stdio-bootstrap-connection.ts
 import { Readable, Writable } from "node:stream";
 
-// ../bridge/src/agents/acp/claude-acp-permission-from-session.ts
-function flattenSelectOptions(options) {
-  if (options == null || options.length === 0) return [];
-  const first2 = options[0];
-  if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
-    return options.flatMap(
-      (g) => Array.isArray(g.options) ? g.options : []
-    );
-  }
-  return options;
-}
-function pickModeConfigOption(configOptions) {
-  if (configOptions == null || configOptions.length === 0) return null;
-  const byCategory = configOptions.find((o) => o.category === "mode");
-  if (byCategory) return byCategory;
-  return configOptions.find((o) => o.id === "mode") ?? null;
-}
-async function applyClaudePermissionFromAcpSession(params) {
-  const { sessionId, agentConfig, configOptions, modes, setSessionConfigOption, setSessionMode, logDebug: logDebug2 } = params;
-  const desiredMode = getClaudePermissionModeFromAgentConfig(agentConfig);
-  if (desiredMode == null) return;
-  const modeOpt = pickModeConfigOption(configOptions ?? null);
-  if (modeOpt != null) {
-    const flat = flattenSelectOptions(modeOpt.options);
-    const allowed = flat.some((o) => o.value === desiredMode);
-    if (allowed && modeOpt.currentValue !== desiredMode) {
-      try {
-        logDebug2(
-          `[Agent] Claude Code: sending ACP session/set_config_option (permission mode) configId=${JSON.stringify(modeOpt.id)} value=${JSON.stringify(desiredMode)} was=${JSON.stringify(modeOpt.currentValue)} sessionId=${sessionId.slice(0, 8)}\u2026`
-        );
-        await setSessionConfigOption({ sessionId, configId: modeOpt.id, value: desiredMode });
-      } catch (e) {
-        logDebug2(
-          `[Agent] Claude Code: session/set_config_option failed: ${e instanceof Error ? e.message : String(e)}`
-        );
-      }
-    }
-    return;
-  }
-  if (modes?.availableModes?.length) {
-    const allowed = modes.availableModes.some((m) => m.id === desiredMode);
-    if (allowed && desiredMode !== modes.currentModeId) {
-      try {
-        logDebug2(
-          `[Agent] Claude Code: sending ACP session/set_mode (permission mode) modeId=${JSON.stringify(desiredMode)} was=${JSON.stringify(modes.currentModeId ?? null)} sessionId=${sessionId.slice(0, 8)}\u2026`
-        );
-        await setSessionMode({ sessionId, modeId: desiredMode });
-      } catch (e) {
-        logDebug2(`[Agent] Claude Code: session/set_mode failed: ${e instanceof Error ? e.message : String(e)}`);
-      }
-    }
-  }
-}
-
-// ../bridge/src/agents/acp/codex-acp-permission-from-session.ts
-function flattenSelectOptions2(options) {
-  if (options == null || options.length === 0) return [];
-  const first2 = options[0];
-  if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
-    return options.flatMap(
-      (g) => Array.isArray(g.options) ? g.options : []
-    );
-  }
-  return options;
-}
-function pickModeConfigOption2(configOptions) {
-  if (configOptions == null || configOptions.length === 0) return null;
-  const byCategory = configOptions.find((o) => o.category === "mode");
-  if (byCategory) return byCategory;
-  return configOptions.find((o) => o.id === "mode") ?? null;
-}
-async function applyCodexPermissionFromAcpSession(params) {
-  const { sessionId, agentConfig, configOptions, modes, setSessionConfigOption, setSessionMode, logDebug: logDebug2 } = params;
-  const desiredMode = getCodexPermissionModeFromAgentConfig(agentConfig);
-  if (desiredMode == null) return;
-  const modeOpt = pickModeConfigOption2(configOptions ?? null);
-  if (modeOpt != null) {
-    const flat = flattenSelectOptions2(modeOpt.options);
-    const allowed = flat.some((o) => o.value === desiredMode);
-    if (allowed && modeOpt.currentValue !== desiredMode) {
-      try {
-        logDebug2(
-          `[Agent] Codex: sending ACP session/set_config_option (mode) configId=${JSON.stringify(modeOpt.id)} value=${JSON.stringify(desiredMode)} was=${JSON.stringify(modeOpt.currentValue)} sessionId=${sessionId.slice(0, 8)}\u2026`
-        );
-        await setSessionConfigOption({ sessionId, configId: modeOpt.id, value: desiredMode });
-      } catch (e) {
-        logDebug2(`[Agent] Codex: session/set_config_option failed: ${e instanceof Error ? e.message : String(e)}`);
-      }
-    }
-    return;
-  }
-  if (modes?.availableModes?.length) {
-    const allowed = modes.availableModes.some((m) => m.id === desiredMode);
-    if (allowed && desiredMode !== modes.currentModeId) {
-      try {
-        logDebug2(
-          `[Agent] Codex: sending ACP session/set_mode modeId=${JSON.stringify(desiredMode)} was=${JSON.stringify(modes.currentModeId ?? null)} sessionId=${sessionId.slice(0, 8)}\u2026`
-        );
-        await setSessionMode({ sessionId, modeId: desiredMode });
-      } catch (e) {
-        logDebug2(`[Agent] Codex: session/set_mode failed: ${e instanceof Error ? e.message : String(e)}`);
-      }
-    }
-  }
-}
-
 // ../bridge/src/agents/acp/apply-acp-model-from-agent-session.ts
-function flattenSelectOptions3(options) {
+function flattenSelectOptions(options) {
   if (options == null || options.length === 0) return [];
   const first2 = options[0];
   if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
@@ -36332,7 +36224,7 @@ async function applyAcpModelFromAcpSession(params) {
   if (desired == null) return;
   const modelOpt = pickModelConfigOption(configOptions ?? null);
   if (modelOpt == null) return;
-  const flat = flattenSelectOptions3(modelOpt.options);
+  const flat = flattenSelectOptions(modelOpt.options);
   const allowed = flat.some((o) => o.value === desired);
   if (!allowed) return;
   if (modelOpt.currentValue === desired) return;
@@ -36454,38 +36346,13 @@ async function bootstrapAcpWireSession(transport, ctx, initializeRequest) {
     configOptions: established.configOptions,
     modes: established.modes
   });
-  if (ctx.backendAgentType === "claude-code") {
-    const cfg = ctx.agentConfig != null && typeof ctx.agentConfig === "object" && !Array.isArray(ctx.agentConfig) ? ctx.agentConfig : null;
-    const configOptionsTyped = established.configOptions;
-    const modesTyped = established.modes;
-    await applyClaudePermissionFromAcpSession({
-      sessionId,
-      agentConfig: cfg,
-      configOptions: configOptionsForPermission(ctx.getActiveConfigOptions, configOptionsTyped),
-      modes: modesTyped,
-      setSessionConfigOption: transport.setSessionConfigOption ? (p) => transport.setSessionConfigOption(p) : async () => {
-      },
-      setSessionMode: transport.setSessionMode ? (p) => transport.setSessionMode(p) : async () => {
-      },
-      logDebug: ctx.logDebug
-    });
-  }
-  if (ctx.backendAgentType === "codex-acp") {
-    const cfg = ctx.agentConfig != null && typeof ctx.agentConfig === "object" && !Array.isArray(ctx.agentConfig) ? ctx.agentConfig : null;
-    const configOptionsTyped = established.configOptions;
-    const modesTyped = established.modes;
-    await applyCodexPermissionFromAcpSession({
-      sessionId,
-      agentConfig: cfg,
-      configOptions: configOptionsForPermission(ctx.getActiveConfigOptions, configOptionsTyped),
-      modes: modesTyped,
-      setSessionConfigOption: transport.setSessionConfigOption ? (p) => transport.setSessionConfigOption(p) : async () => {
-      },
-      setSessionMode: transport.setSessionMode ? (p) => transport.setSessionMode(p) : async () => {
-      },
-      logDebug: ctx.logDebug
-    });
-  }
+  await ctx.afterSessionEstablished?.({
+    sessionId,
+    transport,
+    ctx,
+    configOptions: established.configOptions,
+    modes: established.modes
+  });
   const cfgAll = ctx.agentConfig != null && typeof ctx.agentConfig === "object" && !Array.isArray(ctx.agentConfig) ? ctx.agentConfig : null;
   const configOptionsForModel = established.configOptions;
   if (transport.setSessionConfigOption) {
@@ -36538,7 +36405,8 @@ async function bootstrapSdkStdioConnection(options) {
     onSessionUpdate: options.onSessionUpdate,
     onRequest: options.onRequest,
     sessionCtx: options.sessionCtx,
-    pendingPermissionReplies: options.pendingPermissionReplies
+    pendingPermissionReplies: options.pendingPermissionReplies,
+    createExtNotificationHandler: options.createExtNotificationHandler
   });
   const connection = new ClientSideConnection2(client, stream);
   connection.signal.addEventListener("abort", () => {
@@ -36638,7 +36506,9 @@ async function createSdkStdioAcpClient(options) {
     persistedAcpSessionId,
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
-    getActiveConfigOptions
+    getActiveConfigOptions,
+    afterSessionEstablished,
+    createExtNotificationHandler
   } = options;
   const { child, stderrCapture } = spawnSdkStdioProcess({
     command,
@@ -36655,6 +36525,7 @@ async function createSdkStdioAcpClient(options) {
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
     onFileChange,
+    afterSessionEstablished,
     stderrCapture
   });
   return new Promise((resolve39, reject) => {
@@ -36679,7 +36550,8 @@ async function createSdkStdioAcpClient(options) {
           onSessionUpdate,
           onRequest,
           pendingPermissionReplies,
-          protocolVersion: PROTOCOL_VERSION2
+          protocolVersion: PROTOCOL_VERSION2,
+          createExtNotificationHandler
         });
         init.settleResolve(
           resolve39,
@@ -38339,7 +38211,7 @@ async function cancelRun(ctx, runId) {
 }
 
 // ../bridge/src/agents/acp/ensure-acp-client.ts
-import * as fs18 from "node:fs";
+import * as fs19 from "node:fs";
 import * as path29 from "node:path";
 
 // ../bridge/src/paths/session-layout-paths.ts
@@ -38367,14 +38239,86 @@ function errorMessage(err) {
   return String(err);
 }
 
-// ../bridge/src/agents/acp/clients/claude-code-acp-client.ts
-var claude_code_acp_client_exports = {};
-__export(claude_code_acp_client_exports, {
-  BACKEND_LOCAL_AGENT_TYPE: () => BACKEND_LOCAL_AGENT_TYPE,
-  buildClaudeCodeAcpSpawnCommand: () => buildClaudeCodeAcpSpawnCommand,
-  createClaudeCodeAcpClient: () => createClaudeCodeAcpClient,
-  detectLocalAgentPresence: () => detectLocalAgentPresence
-});
+// ../bridge/src/agents/providers/claude-code/apply-permission.ts
+function flattenSelectOptions2(options) {
+  if (options == null || options.length === 0) return [];
+  const first2 = options[0];
+  if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
+    return options.flatMap(
+      (g) => Array.isArray(g.options) ? g.options : []
+    );
+  }
+  return options;
+}
+function pickModeConfigOption(configOptions) {
+  if (configOptions == null || configOptions.length === 0) return null;
+  const byCategory = configOptions.find((o) => o.category === "mode");
+  if (byCategory) return byCategory;
+  return configOptions.find((o) => o.id === "mode") ?? null;
+}
+async function applyClaudePermissionFromAcpSession(params) {
+  const { sessionId, agentConfig, configOptions, modes, setSessionConfigOption, setSessionMode, logDebug: logDebug2 } = params;
+  const desiredMode = getClaudePermissionModeFromAgentConfig(agentConfig);
+  if (desiredMode == null) return;
+  const modeOpt = pickModeConfigOption(configOptions ?? null);
+  if (modeOpt != null) {
+    const flat = flattenSelectOptions2(modeOpt.options);
+    const allowed = flat.some((o) => o.value === desiredMode);
+    if (allowed && modeOpt.currentValue !== desiredMode) {
+      try {
+        logDebug2(
+          `[Agent] Claude Code: sending ACP session/set_config_option (permission mode) configId=${JSON.stringify(modeOpt.id)} value=${JSON.stringify(desiredMode)} was=${JSON.stringify(modeOpt.currentValue)} sessionId=${sessionId.slice(0, 8)}\u2026`
+        );
+        await setSessionConfigOption({ sessionId, configId: modeOpt.id, value: desiredMode });
+      } catch (e) {
+        logDebug2(
+          `[Agent] Claude Code: session/set_config_option failed: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
+    }
+    return;
+  }
+  if (modes?.availableModes?.length) {
+    const allowed = modes.availableModes.some((m) => m.id === desiredMode);
+    if (allowed && desiredMode !== modes.currentModeId) {
+      try {
+        logDebug2(
+          `[Agent] Claude Code: sending ACP session/set_mode (permission mode) modeId=${JSON.stringify(desiredMode)} was=${JSON.stringify(modes.currentModeId ?? null)} sessionId=${sessionId.slice(0, 8)}\u2026`
+        );
+        await setSessionMode({ sessionId, modeId: desiredMode });
+      } catch (e) {
+        logDebug2(`[Agent] Claude Code: session/set_mode failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+    }
+  }
+}
+
+// ../bridge/src/agents/providers/shared/wrap-permission-after-session.ts
+function wrapPermissionAfterSession(apply) {
+  return async ({ sessionId, transport, ctx, configOptions, modes }) => {
+    const raw = ctx.agentConfig;
+    const agentConfig = raw != null && typeof raw === "object" && !Array.isArray(raw) ? raw : null;
+    await apply({
+      sessionId,
+      agentConfig,
+      configOptions: configOptionsForPermission(
+        ctx.getActiveConfigOptions,
+        configOptions
+      ),
+      modes,
+      setSessionConfigOption: transport.setSessionConfigOption ? (p) => transport.setSessionConfigOption(p) : async () => {
+      },
+      setSessionMode: transport.setSessionMode ? (p) => transport.setSessionMode(p) : async () => {
+      },
+      logDebug: ctx.logDebug
+    });
+  };
+}
+
+// ../bridge/src/agents/providers/claude-code/after-session.ts
+var applyClaudeCodeAfterSessionEstablished = wrapPermissionAfterSession(
+  applyClaudePermissionFromAcpSession
+);
 
 // ../bridge/src/agents/acp/clients/detect-command-on-path.ts
 init_cli_process_interrupt();
@@ -38446,8 +38390,7 @@ async function execProbeShutdownAware(file2, args, timeoutMs) {
   }
 }
 
-// ../bridge/src/agents/acp/clients/claude-code-acp-client.ts
-var BACKEND_LOCAL_AGENT_TYPE = "claude-code";
+// ../bridge/src/agents/providers/claude-code/client.ts
 var CLAUDE_ACP_ADAPTER_NPX_ARGS = ["--yes", "@agentclientprotocol/claude-agent-acp"];
 async function detectLocalAgentPresence() {
   return execProbeShutdownAware("npx", [...CLAUDE_ACP_ADAPTER_NPX_ARGS, "--help"], 8e3);
@@ -38466,58 +38409,230 @@ async function createClaudeCodeAcpClient(options) {
   });
 }
 
-// ../bridge/src/agents/acp/clients/codex-acp-client.ts
-var codex_acp_client_exports = {};
-__export(codex_acp_client_exports, {
-  BACKEND_LOCAL_AGENT_TYPE: () => BACKEND_LOCAL_AGENT_TYPE2,
-  CODEX_ACP_PACKAGE: () => CODEX_ACP_PACKAGE,
-  DEFAULT_CODEX_ACP_COMMAND: () => DEFAULT_CODEX_ACP_COMMAND,
-  LEGACY_CODEX_ACP_PACKAGE: () => LEGACY_CODEX_ACP_PACKAGE,
-  buildCodexAcpSpawnCommand: () => buildCodexAcpSpawnCommand,
-  createCodexAcpClient: () => createCodexAcpClient,
-  detectLocalAgentPresence: () => detectLocalAgentPresence2,
-  isCodexAcpCommand: () => isCodexAcpCommand,
-  normalizeCodexAcpCommand: () => normalizeCodexAcpCommand
-});
-var BACKEND_LOCAL_AGENT_TYPE2 = "codex-acp";
+// ../bridge/src/agents/install/run-streaming-command.ts
+import { spawn as spawn2 } from "node:child_process";
+import * as readline from "node:readline";
+function runStreamingCommand(command, args, options) {
+  return new Promise((resolve39, reject) => {
+    const child = spawn2(command, args, {
+      env: options.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let settled = false;
+    const timer = options.timeoutMs != null ? setTimeout(() => {
+      child.kill("SIGKILL");
+      if (!settled) {
+        settled = true;
+        reject(new Error(`Command timed out after ${options.timeoutMs}ms`));
+      }
+    }, options.timeoutMs) : null;
+    const onLine = (line) => {
+      if (line.length > 0) options.onLine?.(line);
+    };
+    if (child.stdout) {
+      readline.createInterface({ input: child.stdout, crlfDelay: Infinity }).on("line", onLine);
+    }
+    if (child.stderr) {
+      readline.createInterface({ input: child.stderr, crlfDelay: Infinity }).on("line", onLine);
+    }
+    child.on("error", (err) => {
+      if (timer) clearTimeout(timer);
+      if (!settled) {
+        settled = true;
+        reject(err);
+      }
+    });
+    child.on("close", (code, signal) => {
+      if (timer) clearTimeout(timer);
+      if (!settled) {
+        settled = true;
+        resolve39({ code, signal });
+      }
+    });
+  });
+}
+
+// ../bridge/src/agents/install/commands/run-npm-global-install.ts
+async function runNpmGlobalInstall(packageName, env, options) {
+  const result = await runStreamingCommand("npm", ["install", "-g", packageName], {
+    env: bridgeAgentPathEnv(env),
+    timeoutMs: options?.timeoutMs ?? 3e5,
+    onLine: options?.onLine
+  });
+  if (result.code !== 0) {
+    throw new Error(`npm install -g ${packageName} failed (exit ${result.code ?? "signal"})`);
+  }
+}
+
+// ../bridge/src/agents/providers/claude-code/install.ts
+var claudeCodeInstall = {
+  detectCommand: "claude",
+  tokenEnvVar: "ANTHROPIC_API_KEY",
+  async run(ctx) {
+    ctx.onProgress?.("Installing Anthropic Claude Code");
+    await runNpmGlobalInstall(
+      "@anthropic-ai/claude-code",
+      { ...ctx.env, ANTHROPIC_API_KEY: ctx.authToken },
+      { onLine: (line) => ctx.onProgress?.("Installing Anthropic Claude Code", line) }
+    );
+  }
+};
+
+// ../bridge/src/agents/providers/claude-code/definition.ts
+var DEFAULT_COMMAND = ["npx", "--yes", "@agentclientprotocol/claude-agent-acp"];
+var claudeCodeProvider = {
+  type: "claude-code",
+  displayName: "Claude Code",
+  defaultCommand: DEFAULT_COMMAND,
+  authErrorHints: claudeCodeAuthErrorHints,
+  detectPresence: detectLocalAgentPresence,
+  install: claudeCodeInstall,
+  createClient: (options) => createClaudeCodeAcpClient({
+    ...options,
+    afterSessionEstablished: options.afterSessionEstablished ?? applyClaudeCodeAfterSessionEstablished
+  }),
+  buildSpawnCommand: (base, sessionMode) => buildClaudeCodeAcpSpawnCommand([...base], sessionMode)
+};
+
+// ../bridge/src/agents/providers/codex/apply-permission.ts
+function flattenSelectOptions3(options) {
+  if (options == null || options.length === 0) return [];
+  const first2 = options[0];
+  if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
+    return options.flatMap(
+      (g) => Array.isArray(g.options) ? g.options : []
+    );
+  }
+  return options;
+}
+function pickModeConfigOption2(configOptions) {
+  if (configOptions == null || configOptions.length === 0) return null;
+  const byCategory = configOptions.find((o) => o.category === "mode");
+  if (byCategory) return byCategory;
+  return configOptions.find((o) => o.id === "mode") ?? null;
+}
+async function applyCodexPermissionFromAcpSession(params) {
+  const { sessionId, agentConfig, configOptions, modes, setSessionConfigOption, setSessionMode, logDebug: logDebug2 } = params;
+  const desiredMode = getCodexPermissionModeFromAgentConfig(agentConfig);
+  if (desiredMode == null) return;
+  const modeOpt = pickModeConfigOption2(configOptions ?? null);
+  if (modeOpt != null) {
+    const flat = flattenSelectOptions3(modeOpt.options);
+    const allowed = flat.some((o) => o.value === desiredMode);
+    if (allowed && modeOpt.currentValue !== desiredMode) {
+      try {
+        logDebug2(
+          `[Agent] Codex: sending ACP session/set_config_option (mode) configId=${JSON.stringify(modeOpt.id)} value=${JSON.stringify(desiredMode)} was=${JSON.stringify(modeOpt.currentValue)} sessionId=${sessionId.slice(0, 8)}\u2026`
+        );
+        await setSessionConfigOption({ sessionId, configId: modeOpt.id, value: desiredMode });
+      } catch (e) {
+        logDebug2(`[Agent] Codex: session/set_config_option failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+    }
+    return;
+  }
+  if (modes?.availableModes?.length) {
+    const allowed = modes.availableModes.some((m) => m.id === desiredMode);
+    if (allowed && desiredMode !== modes.currentModeId) {
+      try {
+        logDebug2(
+          `[Agent] Codex: sending ACP session/set_mode modeId=${JSON.stringify(desiredMode)} was=${JSON.stringify(modes.currentModeId ?? null)} sessionId=${sessionId.slice(0, 8)}\u2026`
+        );
+        await setSessionMode({ sessionId, modeId: desiredMode });
+      } catch (e) {
+        logDebug2(`[Agent] Codex: session/set_mode failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+    }
+  }
+}
+
+// ../bridge/src/agents/providers/codex/after-session.ts
+var applyCodexAfterSessionEstablished = wrapPermissionAfterSession(
+  applyCodexPermissionFromAcpSession
+);
+
+// ../bridge/src/agents/providers/codex/client.ts
 var CODEX_ACP_PACKAGE = "@agentclientprotocol/codex-acp";
 var LEGACY_CODEX_ACP_PACKAGE = "@zed-industries/codex-acp";
 async function detectLocalAgentPresence2() {
   return isCommandOnPath("codex");
 }
 var DEFAULT_CODEX_ACP_COMMAND = ["npx", "--yes", CODEX_ACP_PACKAGE];
-function isCodexAcpCommand(command) {
-  return command.some(
-    (a) => a === CODEX_ACP_PACKAGE || a === LEGACY_CODEX_ACP_PACKAGE || a.includes("codex-acp")
-  );
-}
 function normalizeCodexAcpCommand(command) {
   return command.map((a) => a === LEGACY_CODEX_ACP_PACKAGE ? CODEX_ACP_PACKAGE : a);
 }
-function buildCodexAcpSpawnCommand(base, _sessionMode, _agentConfig) {
-  return normalizeCodexAcpCommand(base);
+function buildCodexAcpSpawnCommand(base, _sessionMode, _agentConfig) {
+  return normalizeCodexAcpCommand(base);
+}
+async function createCodexAcpClient(options) {
+  const base = options.command?.length && options.command.some((a) => a.includes("codex-acp")) ? options.command : [...DEFAULT_CODEX_ACP_COMMAND];
+  const command = buildCodexAcpSpawnCommand(base, options.sessionMode, options.agentConfig);
+  return createSdkStdioAcpClient({
+    ...options,
+    command,
+    /** Codex ACP can ignore `session/cancel`; mirror Claude Code's subprocess fallback. */
+    killSubprocessAfterCancelMs: options.killSubprocessAfterCancelMs ?? 2500
+  });
+}
+
+// ../bridge/src/agents/providers/codex/install.ts
+var codexInstall = {
+  detectCommand: "codex",
+  tokenEnvVar: "OPENAI_API_KEY",
+  async run(ctx) {
+    ctx.onProgress?.("Installing Codex");
+    await runNpmGlobalInstall(
+      "@openai/codex",
+      { ...ctx.env, OPENAI_API_KEY: ctx.authToken },
+      { onLine: (line) => ctx.onProgress?.("Installing Codex", line) }
+    );
+  }
+};
+
+// ../bridge/src/agents/providers/codex/definition.ts
+var codexProvider = {
+  type: "codex-acp",
+  displayName: "Codex",
+  defaultCommand: DEFAULT_CODEX_ACP_COMMAND,
+  authErrorHints: codexAuthErrorHints,
+  detectPresence: detectLocalAgentPresence2,
+  install: codexInstall,
+  createClient: (options) => createCodexAcpClient({
+    ...options,
+    afterSessionEstablished: options.afterSessionEstablished ?? applyCodexAfterSessionEstablished
+  }),
+  buildSpawnCommand: (base, sessionMode, agentConfig) => buildCodexAcpSpawnCommand([...base], sessionMode, agentConfig)
+};
+
+// ../bridge/src/agents/providers/cursor/cleanup-session-plans.ts
+import * as fs17 from "node:fs";
+
+// ../bridge/src/paths/session-plans-paths.ts
+import * as os6 from "node:os";
+import * as path25 from "node:path";
+function getSessionPlansRootDir() {
+  return path25.join(os6.homedir(), ".buildautomaton", "plans");
+}
+function sanitizeSessionPlansKey(sessionId) {
+  const t = sessionId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 220);
+  return t || "session";
 }
-async function createCodexAcpClient(options) {
-  const base = options.command?.length && options.command.some((a) => a.includes("codex-acp")) ? options.command : [...DEFAULT_CODEX_ACP_COMMAND];
-  const command = buildCodexAcpSpawnCommand(base, options.sessionMode, options.agentConfig);
-  return createSdkStdioAcpClient({
-    ...options,
-    command,
-    /** Codex ACP can ignore `session/cancel`; mirror Claude Code's subprocess fallback. */
-    killSubprocessAfterCancelMs: options.killSubprocessAfterCancelMs ?? 2500
-  });
+function getSessionPlansDir(sessionId) {
+  return path25.join(getSessionPlansRootDir(), sanitizeSessionPlansKey(sessionId));
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-acp-client.ts
-var cursor_acp_client_exports = {};
-__export(cursor_acp_client_exports, {
-  BACKEND_LOCAL_AGENT_TYPE: () => BACKEND_LOCAL_AGENT_TYPE3,
-  buildCursorAcpSpawnCommand: () => buildCursorAcpSpawnCommand,
-  createCursorAcpClient: () => createCursorAcpClient,
-  detectLocalAgentPresence: () => detectLocalAgentPresence3
-});
+// ../bridge/src/agents/providers/cursor/cleanup-session-plans.ts
+function cleanupSessionPlans(sessionId) {
+  const id = typeof sessionId === "string" ? sessionId.trim() : "";
+  if (!id) return;
+  const dir = getSessionPlansDir(id);
+  try {
+    fs17.rmSync(dir, { recursive: true, force: true });
+  } catch {
+  }
+}
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-spawn-command.ts
+// ../bridge/src/agents/providers/cursor/cursor-spawn-command.ts
 function buildCursorAcpSpawnCommand(base, sessionMode) {
   if (!sessionMode) return [...base];
   const m = sessionMode.trim();
@@ -38525,7 +38640,7 @@ function buildCursorAcpSpawnCommand(base, sessionMode) {
   return [...base, "--mode", m];
 }
 
-// ../bridge/src/agents/acp/clients/cursor/create-cursor-acp-session-context.ts
+// ../bridge/src/agents/providers/cursor/create-cursor-acp-session-context.ts
 init_log();
 function createCursorAcpSessionContext(options) {
   const suppressLoadReplayRef = { value: false };
@@ -38544,14 +38659,15 @@ function createCursorAcpSessionContext(options) {
     onAcpConfigOptionsUpdated: options.onAcpConfigOptionsUpdated,
     logDebug,
     getStderrText: () => options.stderrCapture.getText(),
-    pendingPlanExecute: { value: false }
+    pendingPlanExecute: { value: false },
+    afterSessionEstablished: options.afterSessionEstablished
   };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/send-cursor-prompt-with-plan-continue.ts
+// ../bridge/src/agents/providers/cursor/send-cursor-prompt-with-plan-continue.ts
 init_log();
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-plan-continue.ts
+// ../bridge/src/agents/providers/cursor/cursor-plan-continue.ts
 var CURSOR_PLAN_CONTINUE_PROMPT = "The user accepted the plan. Implement it now. Do not wait for another approval unless the plan needs material changes.";
 function isAcceptedCreatePlanRpcResult(result) {
   if (result == null || typeof result !== "object" || Array.isArray(result)) return false;
@@ -38575,7 +38691,7 @@ async function switchCursorSessionToAgentMode(transport, sessionId) {
   }
 }
 
-// ../bridge/src/agents/acp/clients/cursor/send-cursor-prompt-with-plan-continue.ts
+// ../bridge/src/agents/providers/cursor/send-cursor-prompt-with-plan-continue.ts
 async function sendCursorPromptWithPlanContinue(params) {
   const { transport, sessionCtx, sessionId, prompt, images } = params;
   const first2 = await sendAcpPromptViaTransport(transport, sessionCtx, sessionId, prompt, images);
@@ -38590,7 +38706,7 @@ async function sendCursorPromptWithPlanContinue(params) {
   );
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cancel-pending-cursor-permission-requests.ts
+// ../bridge/src/agents/providers/cursor/cancel-pending-cursor-permission-requests.ts
 function cancelPendingCursorPermissionRequests(pendingRequests2, respond) {
   for (const [reqId, pending2] of [...pendingRequests2.entries()]) {
     if (pending2.method === "session/request_permission") {
@@ -38600,7 +38716,7 @@ function cancelPendingCursorPermissionRequests(pendingRequests2, respond) {
   }
 }
 
-// ../bridge/src/agents/acp/clients/cursor/create-cursor-acp-handle.ts
+// ../bridge/src/agents/providers/cursor/create-cursor-acp-handle.ts
 function createCursorAcpHandle(options) {
   let teardownStarted = false;
   let cancelFallback = null;
@@ -38663,10 +38779,10 @@ function createCursorAcpHandle(options) {
   };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-acp-init.ts
-import * as readline from "node:readline";
+// ../bridge/src/agents/providers/cursor/cursor-acp-init.ts
+import * as readline2 from "node:readline";
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-cursor-create-plan.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-cursor-create-plan.ts
 function buildCursorCreatePlanToolCallUpdate(requestId, params) {
   const toolCallId = params.toolCallId ?? params.tool_call_id;
   if (typeof toolCallId !== "string" || !toolCallId.trim()) return null;
@@ -38701,7 +38817,7 @@ function queueCursorCreatePlanRequest(method, id, msg, deps) {
   deps.onRequest?.({ requestId, method, params });
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-cursor-task.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-cursor-task.ts
 function buildCursorTaskToolCallUpdate(params) {
   const toolCallId = params.toolCallId ?? params.tool_call_id;
   if (typeof toolCallId !== "string" || !toolCallId.trim()) return null;
@@ -38734,7 +38850,7 @@ function handleCursorIncomingCursorTask(id, msg, deps) {
   if (update) deps.onSessionUpdate?.(update);
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-cursor-methods.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-cursor-methods.ts
 var CURSOR_BRIDGE_METHODS = /* @__PURE__ */ new Set(["cursor/ask_question"]);
 var CURSOR_NOOP_METHODS = /* @__PURE__ */ new Set(["cursor/update_todos", "cursor/generate_image"]);
 function handleCursorIncomingCursorNotification(method, msg, onSessionUpdate) {
@@ -38770,7 +38886,7 @@ function handleCursorIncomingCursorMethods(method, id, msg, deps) {
   return false;
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-types.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-types.ts
 function parseIncomingJsonRpcRequestId(raw) {
   if (typeof raw === "number" && Number.isFinite(raw)) return raw;
   if (typeof raw === "string" && raw.length > 0) return raw;
@@ -38789,7 +38905,7 @@ function isCursorFsWriteMethod(method) {
   return lower.startsWith("fs/") && lower.includes("write");
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-fs-request.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-fs-request.ts
 function pathFromFsParams(params) {
   for (const key of ["path", "filePath", "file_path", "targetPath", "target_path"]) {
     const value = params[key];
@@ -38846,7 +38962,7 @@ function handleCursorIncomingFsRequest(method, id, msg, deps) {
   return false;
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-permission-request.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-permission-request.ts
 function handleCursorIncomingPermissionRequest(id, method, msg, deps) {
   const params = msg.params ?? {};
   if (deps.onRequest) {
@@ -38862,39 +38978,23 @@ function handleCursorIncomingPermissionRequest(id, method, msg, deps) {
   return true;
 }
 
-// ../bridge/src/agents/acp/clients/cursor/write-create-plan-file.ts
-import * as fs17 from "node:fs";
+// ../bridge/src/agents/providers/cursor/write-create-plan-file.ts
+import * as fs18 from "node:fs";
 import * as path26 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
-
-// ../bridge/src/paths/session-plans-paths.ts
-import * as os6 from "node:os";
-import * as path25 from "node:path";
-function getSessionPlansRootDir() {
-  return path25.join(os6.homedir(), ".buildautomaton", "plans");
-}
-function sanitizeSessionPlansKey(sessionId) {
-  const t = sessionId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 220);
-  return t || "session";
-}
-function getSessionPlansDir(sessionId) {
-  return path25.join(getSessionPlansRootDir(), sanitizeSessionPlansKey(sessionId));
-}
-
-// ../bridge/src/agents/acp/clients/cursor/write-create-plan-file.ts
 function sanitizePlanFileBase(toolCallId) {
   const t = toolCallId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 120);
   return t || "plan";
 }
 function writeCreatePlanFile(params) {
   const dir = getSessionPlansDir(params.cloudSessionId);
-  fs17.mkdirSync(dir, { recursive: true });
+  fs18.mkdirSync(dir, { recursive: true });
   const filePath = path26.join(dir, `${sanitizePlanFileBase(params.toolCallId)}.md`);
-  fs17.writeFileSync(filePath, params.planMarkdown, "utf8");
+  fs18.writeFileSync(filePath, params.planMarkdown, "utf8");
   return pathToFileURL2(filePath).href;
 }
 
-// ../bridge/src/agents/acp/clients/cursor/enrich-create-plan-rpc-result.ts
+// ../bridge/src/agents/providers/cursor/enrich-create-plan-rpc-result.ts
 function asRecord2(v) {
   return v != null && typeof v === "object" && !Array.isArray(v) ? v : null;
 }
@@ -38923,7 +39023,7 @@ function enrichCreatePlanRpcResult(result, pendingParams, cloudSessionId) {
   return { outcome: { outcome: "accepted" } };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-resolve-request.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-resolve-request.ts
 function resolveCursorIncomingRequest(pendingRequests2, respond, requestId, result, cloudSessionId, pendingPlanExecute) {
   const pending2 = pendingRequests2.get(requestId);
   let payload = result;
@@ -38950,7 +39050,7 @@ function formatSessionUpdateKindForLog(kind) {
   return kind.split("_").filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(" ");
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-incoming-session-update.ts
+// ../bridge/src/agents/providers/cursor/cursor-incoming-session-update.ts
 function handleCursorIncomingSessionUpdate(msg, deps) {
   const params = msg.params;
   const update = params?.update;
@@ -38971,7 +39071,7 @@ function handleCursorIncomingSessionUpdate(msg, deps) {
   return true;
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-parse.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-parse.ts
 function safeJsonParse(value) {
   try {
     const parsed = JSON.parse(value);
@@ -38981,7 +39081,7 @@ function safeJsonParse(value) {
   }
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-acp-incoming-line-handler.ts
+// ../bridge/src/agents/providers/cursor/cursor-acp-incoming-line-handler.ts
 function createCursorAcpIncomingLineHandler(deps) {
   const respondDeps = {
     dbgFs: deps.dbgFs,
@@ -39037,7 +39137,7 @@ function createCursorAcpIncomingLineHandler(deps) {
   };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-acp-transport.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-acp-transport.ts
 function createCursorJsonRpcAcpTransport(deps) {
   const { send, cancelSessionNotification, skipBrowserAuthenticate } = deps;
   return {
@@ -39055,12 +39155,12 @@ function createCursorJsonRpcAcpTransport(deps) {
   };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-stdin-write.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-stdin-write.ts
 function writeJsonRpcLine(stdin, payload, callback) {
   stdin.write(JSON.stringify(payload) + "\n", callback);
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-inbound-respond.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-inbound-respond.ts
 function createCursorJsonRpcInboundRespond(stdin) {
   function respond(id, result) {
     writeJsonRpcLine(stdin, { jsonrpc: "2.0", id, result });
@@ -39081,7 +39181,7 @@ function createCursorJsonRpcInboundRespond(stdin) {
   return { respond, respondJsonRpcError, cancelSessionNotification };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-outbound.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-outbound.ts
 function createCursorJsonRpcOutboundPending() {
   const pending2 = /* @__PURE__ */ new Map();
   let nextId = 1;
@@ -39107,7 +39207,7 @@ function createCursorJsonRpcOutboundPending() {
   return { allocateId, register, settleResponse, rejectOnWriteError };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-json-rpc-wire.ts
+// ../bridge/src/agents/providers/cursor/cursor-json-rpc-wire.ts
 function createCursorJsonRpcWriter(stdin) {
   const inbound = createCursorJsonRpcInboundRespond(stdin);
   const outbound = createCursorJsonRpcOutboundPending();
@@ -39129,7 +39229,7 @@ function createCursorJsonRpcWriter(stdin) {
   };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-acp-init.ts
+// ../bridge/src/agents/providers/cursor/cursor-acp-init.ts
 var CURSOR_ACP_CLIENT_INFO = {
   protocolVersion: 1,
   clientCapabilities: {
@@ -39149,7 +39249,7 @@ async function initCursorAcpWire(options) {
     settleResponse: wire.settleResponse,
     pendingRequests: pendingRequests2
   });
-  const rl = readline.createInterface({ input: options.child.stdout });
+  const rl = readline2.createInterface({ input: options.child.stdout });
   rl.on("line", (line) => incoming.handleLine(line));
   const transport = createCursorJsonRpcAcpTransport({
     send: wire.send,
@@ -39160,11 +39260,11 @@ async function initCursorAcpWire(options) {
   return { wire, transport, established, incoming, pendingRequests: pendingRequests2 };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/spawn-cursor-acp-process.ts
-import { spawn as spawn2 } from "node:child_process";
+// ../bridge/src/agents/providers/cursor/spawn-cursor-acp-process.ts
+import { spawn as spawn3 } from "node:child_process";
 function spawnCursorAcpProcess(options) {
   const isWindows = process.platform === "win32";
-  const child = spawn2(options.command[0], options.command.slice(1), {
+  const child = spawn3(options.command[0], options.command.slice(1), {
     cwd: options.cwd,
     stdio: ["pipe", "pipe", "pipe"],
     env: bridgeInstalledAgentAuthProcessEnv(process.env),
@@ -39178,13 +39278,12 @@ function spawnCursorAcpProcess(options) {
   return { child, stderrCapture };
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-local-agent.ts
-var BACKEND_LOCAL_AGENT_TYPE3 = "cursor-cli";
+// ../bridge/src/agents/providers/cursor/cursor-local-agent.ts
 async function detectLocalAgentPresence3() {
   return isCommandOnPath("agent");
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cursor-acp-client.ts
+// ../bridge/src/agents/providers/cursor/cursor-acp-client.ts
 async function createCursorAcpClient(options) {
   const command = buildCursorAcpSpawnCommand(options.command, options.sessionMode);
   const {
@@ -39196,7 +39295,8 @@ async function createCursorAcpClient(options) {
     persistedAcpSessionId,
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
-    onAgentSubprocessExit
+    onAgentSubprocessExit,
+    afterSessionEstablished
   } = options;
   const dbgFs = process.env.BUILDAUTOMATON_DEBUG_ACP_FS === "1";
   const spawnEnv = bridgeInstalledAgentAuthProcessEnv(process.env);
@@ -39217,6 +39317,7 @@ async function createCursorAcpClient(options) {
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
     onFileChange,
+    afterSessionEstablished,
     stderrCapture
   });
   return new Promise((resolve39, reject) => {
@@ -39252,17 +39353,43 @@ async function createCursorAcpClient(options) {
   });
 }
 
-// ../bridge/src/agents/acp/clients/kiro-acp-client.ts
-var kiro_acp_client_exports = {};
-__export(kiro_acp_client_exports, {
-  BACKEND_LOCAL_AGENT_TYPE: () => BACKEND_LOCAL_AGENT_TYPE4,
-  DEFAULT_KIRO_ACP_COMMAND: () => DEFAULT_KIRO_ACP_COMMAND,
-  buildKiroAcpSpawnCommand: () => buildKiroAcpSpawnCommand,
-  createKiroAcpClient: () => createKiroAcpClient,
-  detectLocalAgentPresence: () => detectLocalAgentPresence4,
-  isKiroAcpCommand: () => isKiroAcpCommand
-});
-var BACKEND_LOCAL_AGENT_TYPE4 = "kiro-acp";
+// ../bridge/src/agents/providers/cursor/install.ts
+var cursorInstall = {
+  detectCommand: "agent",
+  alternateDetectCommands: ["cursor-agent"],
+  tokenEnvVar: "CURSOR_API_KEY",
+  async run(ctx) {
+    ctx.onProgress?.("Installing Cursor CLI");
+    const result = await runStreamingCommand(
+      "bash",
+      ["-lc", "curl -fsSL https://cursor.com/install | bash"],
+      {
+        timeoutMs: 3e5,
+        env: { ...bridgeAgentPathEnv(ctx.env), CURSOR_API_KEY: ctx.authToken },
+        onLine: (line) => ctx.onProgress?.("Installing Cursor CLI", line)
+      }
+    );
+    if (result.code !== 0) {
+      throw new Error(`Cursor CLI install failed (exit ${result.code ?? "signal"})`);
+    }
+  }
+};
+
+// ../bridge/src/agents/providers/cursor/definition.ts
+var cursorProvider = {
+  type: "cursor-cli",
+  displayName: "Cursor",
+  defaultCommand: ["agent", "acp"],
+  authErrorHints: cursorAuthErrorHints,
+  detectPresence: detectLocalAgentPresence3,
+  install: cursorInstall,
+  createClient: createCursorAcpClient,
+  buildSpawnCommand: (base, sessionMode) => buildCursorAcpSpawnCommand([...base], sessionMode),
+  onPromptTurnFinished: cleanupSessionPlans,
+  onSessionClosed: cleanupSessionPlans
+};
+
+// ../bridge/src/agents/providers/kiro/client.ts
 async function detectLocalAgentPresence4() {
   return isCommandOnPath("kiro-cli");
 }
@@ -39283,80 +39410,108 @@ async function createKiroAcpClient(options) {
   return createSdkStdioAcpClient({ ...options, command });
 }
 
-// ../bridge/src/agents/acp/resolve-agent-command.ts
-var AGENT_TYPE_DEFAULT_COMMANDS = {
-  [BACKEND_LOCAL_AGENT_TYPE3]: ["agent", "acp"],
-  [BACKEND_LOCAL_AGENT_TYPE2]: [...DEFAULT_CODEX_ACP_COMMAND],
-  /** ACP stdio agent; `@anthropic-ai/claude-code` is the interactive CLI and does not speak ACP on stdout. */
-  [BACKEND_LOCAL_AGENT_TYPE]: ["npx", "--yes", "@agentclientprotocol/claude-agent-acp"],
-  /** [Kiro CLI ACP](https://kiro.dev/docs/cli/acp/) — use full path to `kiro-cli` in PATH if the IDE cannot find it. */
-  [BACKEND_LOCAL_AGENT_TYPE4]: [...DEFAULT_KIRO_ACP_COMMAND]
+// ../bridge/src/agents/providers/kiro/ext-notifications.ts
+function createKiroSdkExtNotificationHandler(options) {
+  const { onSessionUpdate } = options;
+  return async (method, params) => {
+    if (method === "_kiro.dev/metadata") {
+      const p = params && typeof params === "object" ? params : {};
+      const pct = p.contextUsagePercentage;
+      if (typeof pct !== "number" || !Number.isFinite(pct) || !onSessionUpdate) return;
+      onSessionUpdate({
+        sessionUpdate: "context_usage",
+        contextUsagePercentage: pct
+      });
+      return;
+    }
+  };
+}
+
+// ../bridge/src/agents/providers/kiro/definition.ts
+var kiroProvider = {
+  type: "kiro-acp",
+  displayName: "Kiro",
+  defaultCommand: DEFAULT_KIRO_ACP_COMMAND,
+  authErrorHints: kiroAuthErrorHints,
+  detectPresence: detectLocalAgentPresence4,
+  createClient: (options) => createKiroAcpClient({
+    ...options,
+    createExtNotificationHandler: options.createExtNotificationHandler ?? createKiroSdkExtNotificationHandler
+  }),
+  buildSpawnCommand: (base, sessionMode) => buildKiroAcpSpawnCommand([...base], sessionMode)
+};
+
+// ../bridge/src/agents/providers/opencode/install.ts
+var opencodeInstall = {
+  detectCommand: "opencode",
+  tokenEnvVar: "OPENCODE_API_KEY",
+  async run(ctx) {
+    ctx.onProgress?.("Installing OpenCode");
+    await runNpmGlobalInstall(
+      "opencode-ai",
+      { ...ctx.env, OPENCODE_API_KEY: ctx.authToken },
+      { onLine: (line) => ctx.onProgress?.("Installing OpenCode", line) }
+    );
+  }
 };
-var AGENT_TYPE_DISPLAY_NAMES = {
-  [BACKEND_LOCAL_AGENT_TYPE3]: "Cursor",
-  [BACKEND_LOCAL_AGENT_TYPE2]: "Codex",
-  [BACKEND_LOCAL_AGENT_TYPE]: "Claude Code",
-  [BACKEND_LOCAL_AGENT_TYPE4]: "Kiro"
+
+// ../bridge/src/agents/providers/opencode/definition.ts
+var opencodeProvider = {
+  type: "opencode",
+  displayName: "OpenCode",
+  defaultCommand: [],
+  authErrorHints: [],
+  install: opencodeInstall,
+  buildSpawnCommand: (base) => [...base]
 };
-function getAgentTypeDisplayName(agentType) {
-  if (agentType == null || agentType === "") return "Unknown agent";
-  const known = AGENT_TYPE_DISPLAY_NAMES[agentType];
-  if (known) return known;
-  return agentType.split(/[-_]/).filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(" ");
+
+// ../bridge/src/agents/providers/registry.ts
+var AGENT_PROVIDERS = [
+  cursorProvider,
+  codexProvider,
+  kiroProvider,
+  claudeCodeProvider,
+  opencodeProvider
+];
+var byType = new Map(AGENT_PROVIDERS.map((p) => [p.type, p]));
+function getAgentProvider(agentType) {
+  if (agentType == null || agentType === "") return void 0;
+  return byType.get(agentType);
 }
-function useCursorAcp(agentType, command) {
-  if (agentType === BACKEND_LOCAL_AGENT_TYPE3) return true;
-  return command[0] === "agent" && command[1] === "acp";
+function listAutoDetectAgentProviders() {
+  return AGENT_PROVIDERS.filter((p) => p.detectPresence != null);
 }
-function useCodexAcp(agentType, command) {
-  if (agentType === BACKEND_LOCAL_AGENT_TYPE2) return true;
-  return isCodexAcpCommand(command);
+function notifyAgentProvidersSessionClosed(sessionId) {
+  for (const p of AGENT_PROVIDERS) p.onSessionClosed?.(sessionId);
 }
-function useKiroAcp(agentType, command) {
-  if (agentType === BACKEND_LOCAL_AGENT_TYPE4) return true;
-  return isKiroAcpCommand(command);
+function notifyAgentProvidersPromptTurnFinished(sessionId) {
+  for (const p of AGENT_PROVIDERS) p.onPromptTurnFinished?.(sessionId);
 }
+
+// ../bridge/src/agents/acp/resolve-agent-command.ts
 function resolveAgentCommand(preferredAgentType) {
-  if (!preferredAgentType) return null;
-  const command = AGENT_TYPE_DEFAULT_COMMANDS[preferredAgentType];
-  if (!command?.length) return null;
-  if (useCursorAcp(preferredAgentType, command)) {
-    return {
-      command,
-      label: preferredAgentType,
-      createClient: createCursorAcpClient,
-      spawnCommandForSession: (sessionMode, _agentConfig) => buildCursorAcpSpawnCommand(command, sessionMode)
-    };
-  }
-  if (useCodexAcp(preferredAgentType, command)) {
-    return {
-      command,
-      label: preferredAgentType,
-      createClient: createCodexAcpClient,
-      spawnCommandForSession: (sessionMode, agentConfig) => buildCodexAcpSpawnCommand(command, sessionMode, agentConfig)
-    };
-  }
-  if (useKiroAcp(preferredAgentType, command)) {
-    return {
-      command,
-      label: preferredAgentType,
-      createClient: createKiroAcpClient,
-      spawnCommandForSession: (sessionMode, _agentConfig) => buildKiroAcpSpawnCommand(command, sessionMode)
-    };
-  }
+  const provider = getAgentProvider(preferredAgentType);
+  if (!provider?.createClient || provider.defaultCommand.length === 0) return null;
+  const command = [...provider.defaultCommand];
   return {
     command,
-    label: preferredAgentType,
-    createClient: createClaudeCodeAcpClient,
-    spawnCommandForSession: (sessionMode) => buildClaudeCodeAcpSpawnCommand(command, sessionMode)
+    label: provider.type,
+    createClient: provider.createClient,
+    spawnCommandForSession: (sessionMode, agentConfig) => provider.buildSpawnCommand(command, sessionMode, agentConfig)
   };
 }
+function getAgentTypeDisplayName(agentType) {
+  if (agentType == null || agentType === "") return "Unknown agent";
+  const known = getAgentProvider(agentType)?.displayName;
+  if (known) return known;
+  return agentType.split(/[-_]/).filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(" ");
+}
 
 // ../bridge/src/agents/acp/session-file-change-path-kind.ts
 import { existsSync as existsSync4, statSync } from "node:fs";
 
 // ../bridge/src/git/git-exec.ts
-import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn3 } from "node:child_process";
+import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn4 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 
 // ../bridge/src/git/git-runtime.ts
@@ -40490,7 +40645,7 @@ async function ensureAcpClient(options) {
   if (!state.acpStartPromise) {
     let statOk = false;
     try {
-      const st = await fs18.promises.stat(targetSessionParentPath);
+      const st = await fs19.promises.stat(targetSessionParentPath);
       statOk = st.isDirectory();
       if (!statOk) {
         state.lastAcpStartError = `Agent cwd is not a directory: ${targetSessionParentPath}`;
@@ -40962,18 +41117,6 @@ function reportPostTurnEnrichment(options) {
   });
 }
 
-// ../bridge/src/agents/acp/clients/cursor/cleanup-session-plans.ts
-import * as fs19 from "node:fs";
-function cleanupSessionPlans(sessionId) {
-  const id = typeof sessionId === "string" ? sessionId.trim() : "";
-  if (!id) return;
-  const dir = getSessionPlansDir(id);
-  try {
-    fs19.rmSync(dir, { recursive: true, force: true });
-  } catch {
-  }
-}
-
 // ../bridge/src/agents/acp/prompts/finalize-and-send-prompt-result.ts
 async function finalizeAndSendPromptResult(params) {
   const {
@@ -40990,7 +41133,7 @@ async function finalizeAndSendPromptResult(params) {
     sendSessionUpdate,
     log: log2
   } = params;
-  cleanupSessionPlans(sessionId);
+  notifyAgentProvidersPromptTurnFinished(sessionId);
   const planningTodosSubmit = isPlanningSession && plugin?.cloud?.maybeSubmitPlanningTodos ? await plugin.cloud.maybeSubmitPlanningTodos({
     sessionId,
     runId,
@@ -41714,7 +41857,7 @@ async function loadOrCreateE2eCertificates(directory) {
 }
 
 // ../bridge/src/e2ee/key-command.ts
-import * as readline2 from "node:readline";
+import * as readline3 from "node:readline";
 function installE2eCertificateKeyCommand({
   log: log2,
   onOpenCertificate,
@@ -41725,7 +41868,7 @@ function installE2eCertificateKeyCommand({
     return () => {
     };
   }
-  readline2.emitKeypressEvents(process.stdin);
+  readline3.emitKeypressEvents(process.stdin);
   process.stdin.setRawMode(true);
   process.stdin.resume();
   const onKeypress = (str, key) => {
@@ -41900,25 +42043,20 @@ import * as path36 from "node:path";
 // ../bridge/src/agents/detect-local-agent-types.ts
 init_yield_to_event_loop();
 init_cli_process_interrupt();
-var LOCAL_AGENT_ACP_MODULES = [
-  cursor_acp_client_exports,
-  codex_acp_client_exports,
-  kiro_acp_client_exports,
-  claude_code_acp_client_exports
-];
 async function detectLocalAgentTypes() {
   try {
     if (isCliImmediateShutdownRequested()) return [];
+    const providers = listAutoDetectAgentProviders();
     const out = [];
-    for (let i = 0; i < LOCAL_AGENT_ACP_MODULES.length; i++) {
+    for (let i = 0; i < providers.length; i++) {
       if (isCliImmediateShutdownRequested()) return out;
       if (i > 0) {
         await yieldToEventLoop();
         if (isCliImmediateShutdownRequested()) return out;
       }
-      const mod = LOCAL_AGENT_ACP_MODULES[i];
+      const provider = providers[i];
       try {
-        if (await mod.detectLocalAgentPresence()) out.push(mod.BACKEND_LOCAL_AGENT_TYPE);
+        if (await provider.detectPresence?.()) out.push(provider.type);
       } catch {
       }
     }
@@ -42913,7 +43051,7 @@ function pipedStdoutStderrFor(attemptStdio) {
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-piped-via-sh.ts
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 function trySpawnPipedViaSh(command, env, cwd, signal, lifecycle) {
   const attempts = [
     { stdio: [devNullReadFd(), "pipe", "pipe"], endStdin: false },
@@ -42937,9 +43075,9 @@ function trySpawnPipedViaSh(command, env, cwd, signal, lifecycle) {
       if (process.platform === "win32") {
         opts.windowsHide = true;
         const com = process.env.ComSpec || "cmd.exe";
-        proc = spawn4(com, ["/d", "/s", "/c", command], opts);
+        proc = spawn5(com, ["/d", "/s", "/c", command], opts);
       } else {
-        proc = spawn4("/bin/sh", ["-c", command], opts);
+        proc = spawn5("/bin/sh", ["-c", command], opts);
       }
       if (attempt.endStdin) {
         proc.stdin?.end();
@@ -42959,7 +43097,7 @@ function trySpawnPipedViaSh(command, env, cwd, signal, lifecycle) {
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-shell-true-piped.ts
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn6 } from "node:child_process";
 function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle) {
   try {
     const opts = mergePreviewEnvironmentSpawnOptions(
@@ -42975,7 +43113,7 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle)
     if (process.platform === "win32") {
       opts.windowsHide = true;
     }
-    return spawn5(command, opts);
+    return spawn6(command, opts);
   } catch (e) {
     if (isSpawnEbadf(e)) return null;
     throw e;
@@ -42983,7 +43121,7 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle)
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-merged-log-file.ts
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 import fs24 from "node:fs";
 import { tmpdir } from "node:os";
 import path37 from "node:path";
@@ -43001,7 +43139,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
   try {
     let proc;
     if (process.platform === "win32") {
-      proc = spawn6(
+      proc = spawn7(
         process.env.ComSpec || "cmd.exe",
         ["/d", "/s", "/c", command],
         mergePreviewEnvironmentSpawnOptions(
@@ -43010,7 +43148,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
         )
       );
     } else {
-      proc = spawn6(
+      proc = spawn7(
         "/bin/sh",
         ["-c", command],
         mergePreviewEnvironmentSpawnOptions({ env, cwd, stdio, ...signal ? { signal } : {} }, lifecycle)
@@ -43035,7 +43173,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 import fs25 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import path38 from "node:path";
@@ -43058,7 +43196,7 @@ cd ${shSingleQuote(cwd)}
 /bin/sh ${shSingleQuote(innerPath)} >>${shSingleQuote(logPath)} 2>&1
 `
     );
-    const proc = spawn7(
+    const proc = spawn8(
       "/bin/sh",
       [runnerPath],
       mergePreviewEnvironmentSpawnOptions(
@@ -43092,7 +43230,7 @@ CD /D ${q(cwd)}\r
 ${command} >> ${q(logPath)} 2>&1\r
 `
     );
-    const proc = spawn7(
+    const proc = spawn8(
       com,
       ["/d", "/s", "/c", q(runnerPath)],
       mergePreviewEnvironmentSpawnOptions(
@@ -43114,7 +43252,7 @@ ${command} >> ${q(logPath)} 2>&1\r
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-inherit.ts
-import { spawn as spawn8 } from "node:child_process";
+import { spawn as spawn9 } from "node:child_process";
 function trySpawnInheritStdio(command, env, cwd, signal, lifecycle) {
   const opts = mergePreviewEnvironmentSpawnOptions(
     {
@@ -43129,9 +43267,9 @@ function trySpawnInheritStdio(command, env, cwd, signal, lifecycle) {
   if (process.platform === "win32") {
     opts.windowsHide = true;
     const com = process.env.ComSpec || "cmd.exe";
-    proc = spawn8(com, ["/d", "/s", "/c", command], opts);
+    proc = spawn9(com, ["/d", "/s", "/c", command], opts);
   } else {
-    proc = spawn8("/bin/sh", ["-c", command], opts);
+    proc = spawn9("/bin/sh", ["-c", command], opts);
   }
   return { proc, pipedStdoutStderr: false };
 }
@@ -43606,7 +43744,7 @@ function createBridgeHeartbeatController(params) {
 }
 
 // ../bridge/src/cli/cli-version.ts
-var CLI_VERSION2 = "0.1.90".length > 0 ? "0.1.90" : "0.0.0-dev";
+var CLI_VERSION2 = "0.1.92".length > 0 ? "0.1.92" : "0.0.0-dev";
 
 // ../bridge/src/connection/identify/send-bridge-identify.ts
 function sendBridgeIdentify(ws, params) {
@@ -43882,7 +44020,7 @@ var import_debug = __toESM(require_src(), 1);
 var import_promise_deferred = __toESM(require_dist2(), 1);
 var import_promise_deferred2 = __toESM(require_dist2(), 1);
 import { Buffer as Buffer2 } from "node:buffer";
-import { spawn as spawn9 } from "child_process";
+import { spawn as spawn10 } from "child_process";
 import { normalize as normalize3 } from "node:path";
 import { EventEmitter } from "node:events";
 var __defProp2 = Object.defineProperty;
@@ -45270,7 +45408,7 @@ var init_git_executor_chain = __esm2({
               rejection = reason || rejection;
             }
           });
-          const spawned = spawn9(command, args, spawnOptions);
+          const spawned = spawn10(command, args, spawnOptions);
           spawned.stdout.on(
             "data",
             onDataReceived(stdOut, "stdOut", logger, outputLogger.step("stdOut"))
@@ -48873,7 +49011,7 @@ import * as path43 from "node:path";
 
 // ../bridge/src/git/changes/lines/count-lines.ts
 import { createReadStream } from "node:fs";
-import * as readline3 from "node:readline";
+import * as readline4 from "node:readline";
 function countLinesInText(text) {
   return splitTextIntoDiffLines(text).length;
 }
@@ -48882,7 +49020,7 @@ async function countTextFileLines(filePath) {
   const maxBytes = 512e3;
   let lines = 0;
   const stream = createReadStream(filePath, { encoding: "utf8" });
-  const rl = readline3.createInterface({ input: stream, crlfDelay: Infinity });
+  const rl = readline4.createInterface({ input: stream, crlfDelay: Infinity });
   for await (const _line of rl) {
     lines += 1;
     bytes += Buffer.byteLength(String(_line), "utf8") + 1;
@@ -53534,159 +53672,24 @@ var handleInstalledAgentAuthSync = (msg) => {
   );
 };
 
-// ../bridge/src/agents/install/run-streaming-command.ts
-import { spawn as spawn10 } from "node:child_process";
-import * as readline4 from "node:readline";
-function runStreamingCommand(command, args, options) {
-  return new Promise((resolve39, reject) => {
-    const child = spawn10(command, args, {
-      env: options.env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let settled = false;
-    const timer = options.timeoutMs != null ? setTimeout(() => {
-      child.kill("SIGKILL");
-      if (!settled) {
-        settled = true;
-        reject(new Error(`Command timed out after ${options.timeoutMs}ms`));
-      }
-    }, options.timeoutMs) : null;
-    const onLine = (line) => {
-      if (line.length > 0) options.onLine?.(line);
-    };
-    if (child.stdout) {
-      readline4.createInterface({ input: child.stdout, crlfDelay: Infinity }).on("line", onLine);
-    }
-    if (child.stderr) {
-      readline4.createInterface({ input: child.stderr, crlfDelay: Infinity }).on("line", onLine);
-    }
-    child.on("error", (err) => {
-      if (timer) clearTimeout(timer);
-      if (!settled) {
-        settled = true;
-        reject(err);
-      }
-    });
-    child.on("close", (code, signal) => {
-      if (timer) clearTimeout(timer);
-      if (!settled) {
-        settled = true;
-        resolve39({ code, signal });
-      }
-    });
-  });
-}
-
-// ../bridge/src/agents/install/commands/run-npm-global-install.ts
-async function runNpmGlobalInstall(packageName, env, options) {
-  const result = await runStreamingCommand("npm", ["install", "-g", packageName], {
-    env: bridgeAgentPathEnv(env),
-    timeoutMs: options?.timeoutMs ?? 3e5,
-    onLine: options?.onLine
-  });
-  if (result.code !== 0) {
-    throw new Error(`npm install -g ${packageName} failed (exit ${result.code ?? "signal"})`);
-  }
-}
-
-// ../bridge/src/agents/install/commands/claude-code.ts
-var claudeCodeInstallCommand = {
-  agentType: "claude-code",
-  detectCommand: "claude",
-  async install(ctx) {
-    ctx.onProgress?.("Installing Anthropic Claude Code");
-    await runNpmGlobalInstall(
-      "@anthropic-ai/claude-code",
-      { ...ctx.env, ANTHROPIC_API_KEY: ctx.authToken },
-      { onLine: (line) => ctx.onProgress?.("Installing Anthropic Claude Code", line) }
-    );
-  }
-};
-
-// ../bridge/src/agents/install/commands/codex-acp.ts
-var codexAcpInstallCommand = {
-  agentType: "codex-acp",
-  detectCommand: "codex",
-  async install(ctx) {
-    ctx.onProgress?.("Installing Codex");
-    await runNpmGlobalInstall(
-      "@openai/codex",
-      { ...ctx.env, OPENAI_API_KEY: ctx.authToken },
-      { onLine: (line) => ctx.onProgress?.("Installing Codex", line) }
-    );
-  }
-};
-
-// ../bridge/src/agents/install/commands/cursor-cli.ts
-var cursorCliInstallCommand = {
-  agentType: "cursor-cli",
-  detectCommand: "agent",
-  alternateDetectCommands: ["cursor-agent"],
-  async install(ctx) {
-    ctx.onProgress?.("Installing Cursor CLI");
-    const result = await runStreamingCommand(
-      "bash",
-      ["-lc", "curl -fsSL https://cursor.com/install | bash"],
-      {
-        timeoutMs: 3e5,
-        env: { ...bridgeAgentPathEnv(ctx.env), CURSOR_API_KEY: ctx.authToken },
-        onLine: (line) => ctx.onProgress?.("Installing Cursor CLI", line)
-      }
-    );
-    if (result.code !== 0) {
-      throw new Error(`Cursor CLI install failed (exit ${result.code ?? "signal"})`);
-    }
-  }
-};
-
-// ../bridge/src/agents/install/commands/opencode.ts
-var opencodeInstallCommand = {
-  agentType: "opencode",
-  detectCommand: "opencode",
-  async install(ctx) {
-    ctx.onProgress?.("Installing OpenCode");
-    await runNpmGlobalInstall(
-      "opencode-ai",
-      { ...ctx.env, OPENCODE_API_KEY: ctx.authToken },
-      { onLine: (line) => ctx.onProgress?.("Installing OpenCode", line) }
-    );
-  }
-};
-
-// ../bridge/src/agents/install/commands/index.ts
-var COMMANDS = [
-  claudeCodeInstallCommand,
-  codexAcpInstallCommand,
-  cursorCliInstallCommand,
-  opencodeInstallCommand
-];
-var byType = new Map(COMMANDS.map((c) => [c.agentType, c]));
-function getAgentInstallCommand(agentType) {
-  return byType.get(agentType);
-}
-
 // ../bridge/src/agents/install/install-local-agent.ts
 async function installLocalAgentOnBridge(params) {
-  const spec = INSTALLABLE_BRIDGE_AGENTS.find((a) => a.value === params.agentType);
-  if (!spec) return { success: false, error: `Unsupported agent type: ${params.agentType}` };
-  const command = getAgentInstallCommand(params.agentType);
-  if (!command) return { success: false, error: `No install command for ${params.agentType}` };
-  params.onProgress?.(`Configuring ${spec.label} credentials`);
+  const provider = getAgentProvider(params.agentType);
+  const install = provider?.install;
+  if (!provider || !install) return { success: false, error: `Unsupported agent type: ${params.agentType}` };
+  params.onProgress?.(`Configuring ${provider.displayName} credentials`);
   try {
-    await command.install({
+    await install.run({
       authToken: params.authToken,
       onProgress: params.onProgress,
-      env: { ...process.env, [spec.tokenEnvVar]: params.authToken }
+      env: { ...process.env, [install.tokenEnvVar]: params.authToken }
     });
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     return { success: false, error: msg };
   }
   ensureBridgeAgentPathInProcessEnv();
-  const detectNames = [
-    command.detectCommand,
-    ...command.alternateDetectCommands ?? []
-  ];
+  const detectNames = [install.detectCommand, ...install.alternateDetectCommands ?? []];
   let found = false;
   for (const name of detectNames) {
     if (await waitForCommandOnPath(name)) {
@@ -53695,7 +53698,7 @@ async function installLocalAgentOnBridge(params) {
     }
   }
   if (!found) {
-    return { success: false, error: `${command.detectCommand} not found on PATH after install` };
+    return { success: false, error: `${install.detectCommand} not found on PATH after install` };
   }
   return { success: true };
 }
@@ -54853,7 +54856,7 @@ var handleRenameSessionBranchMessage = (msg, deps) => {
 var handleSessionArchivedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
-  cleanupSessionPlans(sessionId);
+  notifyAgentProvidersSessionClosed(sessionId);
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
@@ -54861,7 +54864,7 @@ var handleSessionArchivedMessage = (msg, deps) => {
 var handleSessionDiscardedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
-  cleanupSessionPlans(sessionId);
+  notifyAgentProvidersSessionClosed(sessionId);
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
@@ -55540,12 +55543,12 @@ function createMainBridgeAuthRefreshHandler(params, connect) {
 // ../bridge/src/connection/ws/main-bridge-ws-close-handler.ts
 function createMainBridgeCloseHandler(params, connect) {
   const { state, logFn, bridgeHeartbeat } = params;
-  return (code, reason) => {
+  return (code, reason, closedWs) => {
+    if (state.currentWs !== closedWs) return;
     bridgeHeartbeat?.stop();
     try {
-      const was = state.currentWs;
       state.currentWs = null;
-      if (was) was.removeAllListeners();
+      closedWs.removeAllListeners();
       const willReconnect = !state.closedByUser;
       if (willReconnect) {
         const duplicateResult = evaluateDuplicateBridgeDisconnect(