@buildautomaton/cli 0.1.69 → 0.1.71

package/dist/cli.js

@@ -7720,14 +7720,14 @@ var init_access = __esm({
 
 // src/sqlite/read-migration-sql.ts
 import { existsSync, readFileSync } from "node:fs";
-import { dirname, join as join2 } from "node:path";
+import { dirname, join as join3 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function readMigrationSql(filename, ...searchSubdirs) {
   const moduleDir = dirname(fileURLToPath2(import.meta.url));
   const candidates = searchSubdirs.flatMap((sub) => [
-    join2(moduleDir, sub, filename),
-    join2(moduleDir, "..", sub, filename),
-    join2(moduleDir, "..", "..", "dist", sub, filename)
+    join3(moduleDir, sub, filename),
+    join3(moduleDir, "..", sub, filename),
+    join3(moduleDir, "..", "..", "dist", sub, filename)
   ]);
   const resolved = candidates.find((path84) => existsSync(path84));
   if (!resolved) {
@@ -10608,26 +10608,26 @@ var init_member_access = __esm({
 
 // src/code-nav/tree-sitter-assets-dir.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { dirname as dirname2, join as join3 } from "node:path";
+import { dirname as dirname2, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function repoNodeModulesDir(fromDir) {
-  return join3(fromDir, "..", "..", "..", "node_modules");
+  return join4(fromDir, "..", "..", "..", "node_modules");
 }
 function firstDirWithWebTreeSitterWasm(candidates) {
   for (const dir of candidates) {
-    if (existsSync2(join3(dir, "web-tree-sitter.wasm"))) return dir;
+    if (existsSync2(join4(dir, "web-tree-sitter.wasm"))) return dir;
   }
   return null;
 }
 function getTreeSitterAssetsDir() {
   const moduleDir = dirname2(fileURLToPath3(import.meta.url));
   const fromModule = firstDirWithWebTreeSitterWasm([
-    join3(moduleDir, "tree-sitter"),
-    join3(moduleDir, "..", "tree-sitter"),
-    join3(moduleDir, "..", "..", "dist", "tree-sitter")
+    join4(moduleDir, "tree-sitter"),
+    join4(moduleDir, "..", "tree-sitter"),
+    join4(moduleDir, "..", "..", "dist", "tree-sitter")
   ]);
   if (fromModule) return fromModule;
-  const fromNodeModules = firstDirWithWebTreeSitterWasm([join3(repoNodeModulesDir(moduleDir), "web-tree-sitter")]);
+  const fromNodeModules = firstDirWithWebTreeSitterWasm([join4(repoNodeModulesDir(moduleDir), "web-tree-sitter")]);
   if (fromNodeModules) return fromNodeModules;
   throw new Error(
     "Missing web-tree-sitter.wasm. Run `pnpm build` in packages/cli to copy tree-sitter assets into dist/tree-sitter."
@@ -10641,7 +10641,7 @@ var init_tree_sitter_assets_dir = __esm({
 
 // src/code-nav/parser/tree-sitter-runtime.ts
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
-import { dirname as dirname3, join as join4 } from "node:path";
+import { dirname as dirname3, join as join5 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { Parser, Language, Query, LANGUAGE_VERSION, MIN_COMPATIBLE_VERSION } from "web-tree-sitter";
 function withTreeSitterRuntimeLock(fn) {
@@ -10656,7 +10656,7 @@ async function ensureParserInit() {
   if (!initPromise2) {
     const assetsDir = getTreeSitterAssetsDir();
     initPromise2 = Parser.init({
-      locateFile: (scriptName) => join4(assetsDir, scriptName)
+      locateFile: (scriptName) => join5(assetsDir, scriptName)
     }).catch((e) => {
       initPromise2 = null;
       throw e;
@@ -10666,9 +10666,9 @@ async function ensureParserInit() {
 }
 function resolveWasmPath(assetsDir, wasmFile) {
   const candidates = [
-    join4(assetsDir, wasmFile),
-    join4(assetsDir, "..", "..", "dist", "tree-sitter", wasmFile),
-    join4(assetsDir, "..", "..", "..", "node_modules", wasmFile.replace(".wasm", ""), wasmFile)
+    join5(assetsDir, wasmFile),
+    join5(assetsDir, "..", "..", "dist", "tree-sitter", wasmFile),
+    join5(assetsDir, "..", "..", "..", "node_modules", wasmFile.replace(".wasm", ""), wasmFile)
   ];
   const hit = candidates.find((p) => existsSync3(p));
   if (!hit) throw new Error(`Missing tree-sitter wasm: ${wasmFile}`);
@@ -10677,10 +10677,10 @@ function resolveWasmPath(assetsDir, wasmFile) {
 function resolveTagsPath(assetsDir, tagsQueryFile) {
   const pkgName = tagsQueryFile.split("/")[0] ?? "";
   const candidates = [
-    join4(CODE_NAV_QUERIES_ROOT, tagsQueryFile),
-    join4(assetsDir, tagsQueryFile),
-    join4(assetsDir, "..", "..", "dist", "tree-sitter", tagsQueryFile),
-    join4(assetsDir, "..", "..", "..", "node_modules", pkgName, "queries", "tags.scm")
+    join5(CODE_NAV_QUERIES_ROOT, tagsQueryFile),
+    join5(assetsDir, tagsQueryFile),
+    join5(assetsDir, "..", "..", "dist", "tree-sitter", tagsQueryFile),
+    join5(assetsDir, "..", "..", "..", "node_modules", pkgName, "queries", "tags.scm")
   ];
   const hit = candidates.find((p) => existsSync3(p));
   if (!hit) throw new Error(`Missing tags query: ${tagsQueryFile}`);
@@ -10718,7 +10718,7 @@ var init_tree_sitter_runtime = __esm({
     loadedByKey = /* @__PURE__ */ new Map();
     failedLanguageKeys = /* @__PURE__ */ new Set();
     runtimeChain = Promise.resolve();
-    CODE_NAV_QUERIES_ROOT = join4(dirname3(fileURLToPath4(import.meta.url)), "..", "queries");
+    CODE_NAV_QUERIES_ROOT = join5(dirname3(fileURLToPath4(import.meta.url)), "..", "queries");
   }
 });
 
@@ -12289,7 +12289,7 @@ var init_in_process_bridge = __esm({
 });
 
 // src/code-nav/symbol-index/worker/lifecycle/state.ts
-import { dirname as dirname4, join as join5 } from "node:path";
+import { dirname as dirname4, join as join6 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function getWorker() {
   return worker;
@@ -12308,7 +12308,7 @@ function shouldUseInProcessWorker() {
 }
 function resolveWorkerScriptPath() {
   const moduleDir = dirname4(fileURLToPath5(import.meta.url));
-  return join5(moduleDir, "..", "worker.js");
+  return join6(moduleDir, "..", "worker.js");
 }
 function resetLifecycleStateForTests() {
   terminatePromise = null;
@@ -31064,7 +31064,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.69".length > 0 ? "0.1.69" : "0.0.0-dev";
+var CLI_VERSION = "0.1.71".length > 0 ? "0.1.71" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -32816,6 +32816,46 @@ function runPendingAuth(options) {
 // src/run-bridge-connected.ts
 init_log();
 
+// src/agents/acp/clients/bridge-agent-path.ts
+import { execFileSync as execFileSync2 } from "node:child_process";
+import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+function getBridgeAgentPathEntries(home = process.env.HOME ?? homedir()) {
+  const entries = [
+    join2(home, ".local", "bin"),
+    join2(home, ".npm-global", "bin"),
+    "/usr/local/bin"
+  ];
+  const prefix = process.env.NPM_CONFIG_PREFIX;
+  if (prefix) entries.push(join2(prefix, "bin"));
+  try {
+    const npmBin = execFileSync2("npm", ["bin", "-g"], { encoding: "utf8", timeout: 2e3 }).trim();
+    if (npmBin) entries.push(npmBin);
+  } catch {
+  }
+  return entries;
+}
+function augmentPath(pathValue, extra) {
+  const current = pathValue ?? "";
+  const parts = current.split(":").filter(Boolean);
+  const seen = new Set(parts);
+  const prefix = [];
+  for (const entry of extra) {
+    if (!entry || seen.has(entry)) continue;
+    seen.add(entry);
+    prefix.push(entry);
+  }
+  if (prefix.length === 0) return current;
+  return current ? `${prefix.join(":")}:${current}` : prefix.join(":");
+}
+function ensureBridgeAgentPathInProcessEnv() {
+  const extra = getBridgeAgentPathEntries();
+  process.env.PATH = augmentPath(process.env.PATH, extra);
+}
+function bridgeAgentPathEnv(base = process.env) {
+  return { ...base, PATH: augmentPath(base.PATH, getBridgeAgentPathEntries()) };
+}
+
 // src/files/watch-file-index.ts
 import path25 from "node:path";
 
@@ -34902,6 +34942,18 @@ function getAgentModelFromAgentConfig(config2) {
   return t !== "" ? t : null;
 }
 
+// ../types/src/overview/heatmap/constants.ts
+var HOUR_MS = 36e5;
+var DAY_MS = 24 * HOUR_MS;
+
+// ../types/src/bridges/agents/types.ts
+var INSTALLABLE_BRIDGE_AGENTS = [
+  { value: "claude-code", label: "Anthropic Claude Code", tokenLabel: "Anthropic API key", tokenEnvVar: "ANTHROPIC_API_KEY" },
+  { value: "codex-acp", label: "Codex", tokenLabel: "OpenAI API key", tokenEnvVar: "OPENAI_API_KEY" },
+  { value: "cursor-cli", label: "Cursor CLI agent", tokenLabel: "Cursor API key", tokenEnvVar: "CURSOR_API_KEY" },
+  { value: "opencode", label: "OpenCode agent", tokenLabel: "Provider API key", tokenEnvVar: "OPENCODE_API_KEY" }
+];
+
 // src/paths/session-layout-paths.ts
 import * as path26 from "node:path";
 function resolveIsolatedSessionParentPathFromCheckouts(worktreePaths) {
@@ -34958,7 +35010,10 @@ async function execFileShutdownAware(file2, args, timeoutMs) {
 async function isCommandOnPath(command, timeoutMs = COMMAND_ON_PATH_PROBE_TIMEOUT_MS) {
   if (isCliImmediateShutdownRequested()) return false;
   try {
-    await execFileShutdownAware("which", [command], timeoutMs);
+    await execFileAsync5("which", [command], {
+      timeout: timeoutMs,
+      env: bridgeAgentPathEnv()
+    });
     return true;
   } catch {
     return false;
@@ -36673,15 +36728,15 @@ function resolveAgentCommand(preferredAgentType) {
 }
 
 // src/agents/acp/session-file-change-path-kind.ts
-import { execFileSync as execFileSync4 } from "node:child_process";
+import { execFileSync as execFileSync5 } from "node:child_process";
 import { existsSync as existsSync4, statSync } from "node:fs";
 
 // src/git/get-git-repo-root-sync.ts
-import { execFileSync as execFileSync2 } from "node:child_process";
+import { execFileSync as execFileSync3 } from "node:child_process";
 import * as path28 from "node:path";
 function getGitRepoRootSync(startDir) {
   try {
-    const out = execFileSync2("git", ["rev-parse", "--show-toplevel"], {
+    const out = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
       cwd: path28.resolve(startDir),
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
@@ -36694,7 +36749,7 @@ function getGitRepoRootSync(startDir) {
 }
 
 // src/agents/acp/workspace-files.ts
-import { execFileSync as execFileSync3 } from "node:child_process";
+import { execFileSync as execFileSync4 } from "node:child_process";
 import { readFileSync as readFileSync4 } from "node:fs";
 import * as path29 from "node:path";
 function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
@@ -36755,7 +36810,7 @@ function readGitHeadBlob(sessionParentPath, displayPath) {
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   const execCwd = gitRoot ?? sessionParentPath;
   try {
-    return execFileSync3("git", ["show", `HEAD:${displayPath}`], {
+    return execFileSync4("git", ["show", `HEAD:${displayPath}`], {
       cwd: execCwd,
       encoding: "utf8",
       maxBuffer: 50 * 1024 * 1024
@@ -36771,7 +36826,7 @@ function gitHeadPathObjectType(sessionParentPath, displayPath) {
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (!gitRoot) return null;
   try {
-    return execFileSync4("git", ["cat-file", "-t", `HEAD:${displayPath}`], {
+    return execFileSync5("git", ["cat-file", "-t", `HEAD:${displayPath}`], {
       cwd: gitRoot,
       encoding: "utf8"
     }).trim();
@@ -37626,11 +37681,11 @@ init_cli_process_interrupt();
 var BRIDGE_MCP_SERVER_NAME2 = "buildautomaton-bridge";
 
 // src/mcp/resolve-bridge-mcp-server-path.ts
-import { dirname as dirname7, join as join6 } from "node:path";
+import { dirname as dirname7, join as join7 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function resolveBridgeMcpServerScriptPath() {
   const cliDir = dirname7(fileURLToPath7(import.meta.url));
-  return join6(cliDir, "bridge-mcp-server.js");
+  return join7(cliDir, "bridge-mcp-server.js");
 }
 
 // src/mcp/build-acp-mcp-servers.ts
@@ -51489,6 +51544,7 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "code_nav",
   "skill_layout_request",
   "install_skills",
+  "install_agent",
   "refresh_local_skills",
   "bridge_git_context_request",
   "list_repo_branches_request"
@@ -51564,6 +51620,100 @@ var handleBridgeHeartbeatAck = (msg, deps) => {
   deps.onBridgeHeartbeatAck?.(Math.trunc(raw));
 };
 
+// src/routing/dispatch/connection.ts
+function dispatchBridgeConnectionMessage(msg, deps) {
+  switch (msg.type) {
+    case "auth_token":
+      handleAuthToken(msg, deps);
+      break;
+    case "bridge_identified":
+      handleBridgeIdentified(msg, deps);
+      break;
+    case "ha":
+      handleBridgeHeartbeatAck(msg, deps);
+      break;
+  }
+}
+
+// src/routing/handlers/preview-environment-control.ts
+var handlePreviewEnvironmentControl = (msg, deps) => {
+  let wire;
+  try {
+    wire = deps.e2ee ? deps.e2ee.decryptMessage(msg) : msg;
+  } catch (e) {
+    deps.log(`[E2EE] Could not decrypt preview environment command: ${e instanceof Error ? e.message : String(e)}`);
+    return;
+  }
+  const environmentId = typeof wire.environmentId === "string" ? wire.environmentId : "";
+  const action = wire.action === "start" || wire.action === "stop" ? wire.action : null;
+  if (!environmentId || !action) return;
+  deps.previewEnvironmentManager?.handleControl(environmentId, action);
+};
+
+// src/routing/handlers/preview-environments-config.ts
+var VALID_PORT = (p) => typeof p === "number" && Number.isInteger(p) && p > 0 && p < 65536;
+var handlePreviewEnvironmentsConfig = (msg, deps) => {
+  const previewEnvironments = msg.previewEnvironments;
+  const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts.filter(VALID_PORT) : void 0;
+  setImmediate(() => {
+    deps.previewEnvironmentManager?.applyConfig(previewEnvironments ?? []);
+    const environmentIds = parsePreviewEnvironmentDefs(previewEnvironments ?? []).map((d) => d.environmentId);
+    void deps.previewWorktreeManager?.syncConfiguredEnvironments(environmentIds);
+    if (proxyPorts !== void 0) {
+      deps.updateFirehoseProxyPorts?.(proxyPorts);
+    }
+  });
+};
+
+// src/routing/handlers/send-deploy-session-to-preview-result.ts
+function sendDeploySessionToPreviewResult(ws, id, payload) {
+  if (!ws) return;
+  sendWsMessage(ws, { type: "deploy_session_to_preview_result", id, ...payload });
+}
+
+// src/routing/handlers/deploy-session-to-preview.ts
+var handleDeploySessionToPreviewMessage = (msg, deps) => {
+  if (typeof msg.id !== "string") return;
+  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
+  const environmentId = typeof msg.environmentId === "string" ? msg.environmentId : "";
+  if (!sessionId || !environmentId) return;
+  void (async () => {
+    const ws = deps.getWs();
+    const reply = (payload) => sendDeploySessionToPreviewResult(ws, msg.id, payload);
+    try {
+      if (!deps.previewWorktreeManager) {
+        reply({ ok: false, error: "Preview worktree manager unavailable" });
+        return;
+      }
+      const result = await deploySessionToPreviewEnvironment({
+        sessionWorktreeManager: deps.sessionWorktreeManager,
+        previewWorktreeManager: deps.previewWorktreeManager,
+        sessionId,
+        environmentId,
+        log: deps.log
+      });
+      reply(result);
+    } catch (e) {
+      reply({ ok: false, error: e instanceof Error ? e.message : String(e) });
+    }
+  })();
+};
+
+// src/routing/dispatch/preview.ts
+function dispatchBridgePreviewMessage(msg, deps) {
+  switch (msg.type) {
+    case "preview_environments_config":
+      handlePreviewEnvironmentsConfig(msg, deps);
+      break;
+    case "preview_environment_control":
+      handlePreviewEnvironmentControl(msg, deps);
+      break;
+    case "deploy_session_to_preview":
+      handleDeploySessionToPreviewMessage(msg, deps);
+      break;
+  }
+}
+
 // src/agents/acp/from-bridge/handle-bridge-agent-config.ts
 function handleBridgeAgentConfig(msg, { acpManager }) {
   if (!Array.isArray(msg.agents) || msg.agents.length === 0) return;
@@ -52202,6 +52352,308 @@ var handleSessionRequestResponseMessage = (msg, deps) => {
   handleBridgeSessionRequestResponse(msg, deps);
 };
 
+// src/routing/handlers/git/handle-session-git-commit.ts
+async function handleSessionGitCommitAction(deps, sessionId, msg, reply) {
+  const branch = typeof msg.branch === "string" ? msg.branch : "";
+  const message = typeof msg.message === "string" ? msg.message : "";
+  const pushAfterCommit = msg.pushAfterCommit === true;
+  if (!branch.trim() || !message.trim()) {
+    reply({ ok: false, error: "branch and message are required for commit" });
+    return;
+  }
+  const commitRes = await deps.sessionWorktreeManager.commitSession({
+    sessionId,
+    branch: branch.trim(),
+    message: message.trim(),
+    push: pushAfterCommit
+  });
+  if (!commitRes.ok) {
+    reply({ ok: false, error: commitRes.error ?? "Commit failed" });
+    return;
+  }
+  const st = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
+  reply({
+    ok: true,
+    hasUncommittedChanges: st.hasUncommittedChanges,
+    hasUnpushedCommits: st.hasUnpushedCommits,
+    uncommittedFileCount: st.uncommittedFileCount
+  });
+}
+
+// src/routing/handlers/git/session-git-changes-params.ts
+function readString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function readChangesObject(msg) {
+  const changes = msg.changes;
+  if (!changes || typeof changes !== "object" || Array.isArray(changes)) return null;
+  return changes;
+}
+function parseSessionGitChangesParams(msg) {
+  const nested = readChangesObject(msg);
+  const file2 = nested?.file && typeof nested.file === "object" && !Array.isArray(nested.file) ? nested.file : null;
+  const repoRelPath = readString(nested?.repoRelPath) || readString(msg.changesRepoRelPath);
+  const viewRaw = nested?.view ?? msg.changesView;
+  const view = viewRaw === "commit" ? "commit" : "working";
+  const commitSha = readString(nested?.commitSha) || readString(msg.changesCommitSha);
+  const recentCommitsLimit = nested?.recentCommitsLimit ?? msg.changesRecentCommitsLimit;
+  return {
+    repoRelPath,
+    view,
+    commitSha,
+    recentCommitsLimit: typeof recentCommitsLimit === "number" || typeof recentCommitsLimit === "string" ? recentCommitsLimit : void 0,
+    fileWorkspaceRelPath: readString(file2?.workspaceRelPath),
+    fileChange: readString(file2?.change),
+    fileMovedFromWorkspaceRelPath: readString(file2?.movedFromWorkspaceRelPath)
+  };
+}
+
+// src/routing/handlers/git/handle-session-git-get-change-file-patch.ts
+async function handleSessionGitGetChangeFilePatchAction(deps, msg, reply) {
+  const changes = parseSessionGitChangesParams(msg);
+  const { repoRelPath: repoRel, view, commitSha, fileWorkspaceRelPath, fileChange, fileMovedFromWorkspaceRelPath } = changes;
+  const change = parseWorkingTreeChangeKind(fileChange);
+  if (!repoRel || !fileWorkspaceRelPath || !change) {
+    reply({
+      ok: false,
+      error: "changes.repoRelPath, changes.file.workspaceRelPath, and changes.file.change are required"
+    });
+    return;
+  }
+  if (view === "commit" && !commitSha) {
+    reply({ ok: false, error: "changes.commitSha is required for commit file patch" });
+    return;
+  }
+  const patch = await deps.sessionWorktreeManager.getSessionWorkingTreeChangeFilePatch(msg.sessionId, {
+    repoRelPath: repoRel,
+    workspaceRelPath: fileWorkspaceRelPath,
+    change,
+    movedFromWorkspaceRelPath: fileMovedFromWorkspaceRelPath || null,
+    basis: view === "commit" ? { kind: "commit", sha: commitSha } : { kind: "working" }
+  });
+  reply(
+    {
+      ok: true,
+      patchContent: patch.patchContent ?? null,
+      totalLines: patch.totalLines
+    },
+    ["patchContent"]
+  );
+}
+
+// src/routing/handlers/git/coalesce-list-changes.ts
+var listChangesInflight = /* @__PURE__ */ new Map();
+function normalizeListChangesRepoPathRelativeToWorkspaceRoot(repoRelPath) {
+  if (!repoRelPath?.trim()) return "";
+  return normalizeRepoPathRelativeToWorkspaceRoot(repoRelPath.trim());
+}
+function listChangesInflightKey(sessionId, opts) {
+  const basis = opts?.basis;
+  return [
+    sessionId,
+    normalizeListChangesRepoPathRelativeToWorkspaceRoot(opts?.repoRelPath),
+    basis?.kind === "commit" ? `commit:${basis.sha}` : "working",
+    String(opts?.recentCommitsLimit ?? "")
+  ].join("|");
+}
+function getSessionWorkingTreeChangeDetailsCoalesced(sessionWorktreeManager, sessionId, opts) {
+  const key = listChangesInflightKey(sessionId, opts);
+  const existing = listChangesInflight.get(key);
+  if (existing) return existing;
+  const promise2 = sessionWorktreeManager.getSessionWorkingTreeChangeDetails(sessionId, opts).finally(() => {
+    if (listChangesInflight.get(key) === promise2) listChangesInflight.delete(key);
+  });
+  listChangesInflight.set(key, promise2);
+  return promise2;
+}
+
+// src/routing/handlers/git/handle-session-git-list-changes.ts
+async function handleSessionGitListChangesAction(deps, msg, reply) {
+  const changes = parseSessionGitChangesParams(msg);
+  const { repoRelPath: repoRel, view, commitSha, recentCommitsLimit } = changes;
+  if (view === "commit") {
+    if (!repoRel || !commitSha) {
+      reply({
+        ok: false,
+        error: "changes.repoRelPath and changes.commitSha are required for commit view"
+      });
+      return;
+    }
+  }
+  const opts = repoRel && view === "commit" && commitSha ? {
+    repoRelPath: repoRel,
+    basis: { kind: "commit", sha: commitSha },
+    recentCommitsLimit
+  } : repoRel ? { repoRelPath: repoRel, basis: { kind: "working" }, recentCommitsLimit } : recentCommitsLimit !== void 0 ? { recentCommitsLimit } : void 0;
+  const repos = await getSessionWorkingTreeChangeDetailsCoalesced(
+    deps.sessionWorktreeManager,
+    msg.sessionId,
+    opts
+  );
+  reply({ ok: true, repos }, ["repos"]);
+}
+
+// src/routing/handlers/git/handle-session-git-push.ts
+async function handleSessionGitPushAction(deps, sessionId, reply) {
+  const pushRes = await deps.sessionWorktreeManager.pushSessionUpstream(sessionId);
+  if (!pushRes.ok) {
+    reply({ ok: false, error: pushRes.error ?? "Push failed" });
+    return;
+  }
+  const st = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
+  reply({
+    ok: true,
+    hasUncommittedChanges: st.hasUncommittedChanges,
+    hasUnpushedCommits: st.hasUnpushedCommits,
+    uncommittedFileCount: st.uncommittedFileCount
+  });
+}
+
+// src/routing/handlers/git/handle-session-git-status.ts
+async function handleSessionGitStatusAction(deps, sessionId, reply) {
+  const r = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
+  reply({
+    ok: true,
+    hasUncommittedChanges: r.hasUncommittedChanges,
+    hasUnpushedCommits: r.hasUnpushedCommits,
+    uncommittedFileCount: r.uncommittedFileCount
+  });
+}
+
+// src/routing/handlers/git/send-session-git-result.ts
+function sendSessionGitResult(ws, id, payload, e2ee, encryptedFields = []) {
+  if (!ws) return;
+  const message = { type: "session_git_result", id, ...payload };
+  let wire = message;
+  if (e2ee && encryptedFields.length > 0) {
+    wire = e2ee.encryptFields(message, encryptedFields);
+  }
+  sendWsMessage(ws, wire);
+}
+
+// src/routing/handlers/git/session-git-request.ts
+var handleSessionGitRequestMessage = (msg, deps) => {
+  if (typeof msg.id !== "string") return;
+  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
+  const action = msg.action;
+  if (!sessionId || action !== "status" && action !== "push" && action !== "commit" && action !== "list_changes" && action !== "file_diff")
+    return;
+  void (async () => {
+    const ws = deps.getWs();
+    const reply = (payload, encryptedFields = []) => sendSessionGitResult(ws, msg.id, payload, deps.e2ee, encryptedFields);
+    try {
+      if (action === "status") {
+        await handleSessionGitStatusAction(deps, sessionId, reply);
+        return;
+      }
+      if (action === "list_changes") {
+        await handleSessionGitListChangesAction(deps, { ...msg, sessionId }, reply);
+        return;
+      }
+      if (action === "file_diff") {
+        await handleSessionGitGetChangeFilePatchAction(deps, { ...msg, sessionId }, reply);
+        return;
+      }
+      if (action === "push") {
+        await handleSessionGitPushAction(deps, sessionId, reply);
+        return;
+      }
+      await handleSessionGitCommitAction(deps, sessionId, msg, reply);
+    } catch (e) {
+      reply({ ok: false, error: e instanceof Error ? e.message : String(e) });
+    }
+  })();
+};
+
+// src/routing/handlers/rename-session-branch.ts
+var handleRenameSessionBranchMessage = (msg, deps) => {
+  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
+  const newBranch = typeof msg.newBranch === "string" ? msg.newBranch : "";
+  if (!sessionId || !newBranch) return;
+  void deps.sessionWorktreeManager.renameSessionBranch(sessionId, newBranch);
+};
+
+// src/routing/handlers/session-archived.ts
+var handleSessionArchivedMessage = (msg, deps) => {
+  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
+  if (!sessionId) return;
+  void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
+};
+
+// src/routing/handlers/session-discarded.ts
+var handleSessionDiscardedMessage = (msg, deps) => {
+  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
+  if (!sessionId) return;
+  void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
+};
+
+// src/routing/handlers/revert-turn-snapshot.ts
+import * as fs60 from "node:fs";
+var handleRevertTurnSnapshotMessage = (msg, deps) => {
+  const id = typeof msg.id === "string" ? msg.id : "";
+  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
+  const turnId = typeof msg.turnId === "string" ? msg.turnId : "";
+  if (!id || !sessionId || !turnId) return;
+  const { getWs, log: log2, sessionWorktreeManager } = deps;
+  void (async () => {
+    const s = getWs();
+    if (!s) return;
+    const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
+    const file2 = snapshotFilePath(agentBase, turnId);
+    try {
+      await fs60.promises.access(file2, fs60.constants.F_OK);
+    } catch {
+      sendWsMessage(s, {
+        type: "revert_turn_snapshot_result",
+        id,
+        ok: false,
+        error: "No snapshot found for this turn (git state may be unavailable)."
+      });
+      return;
+    }
+    const res = await applyPreTurnSnapshot(file2, log2);
+    sendWsMessage(s, {
+      type: "revert_turn_snapshot_result",
+      id,
+      ok: res.ok,
+      ...res.error ? { error: res.error } : {}
+    });
+  })();
+};
+
+// src/routing/dispatch/session.ts
+function dispatchBridgeSessionMessage(msg, deps) {
+  switch (msg.type) {
+    case "agent_config":
+      handleAgentConfigMessage(msg, deps);
+      break;
+    case "prompt_queue_state":
+      handlePromptQueueStateMessage(msg, deps);
+      break;
+    case "prompt":
+      handlePromptMessage(msg, deps);
+      break;
+    case "session_git_request":
+      handleSessionGitRequestMessage(msg, deps);
+      break;
+    case "rename_session_branch":
+      handleRenameSessionBranchMessage(msg, deps);
+      break;
+    case "session_archived":
+      handleSessionArchivedMessage(msg, deps);
+      break;
+    case "session_discarded":
+      handleSessionDiscardedMessage(msg, deps);
+      break;
+    case "revert_turn_snapshot":
+      handleRevertTurnSnapshotMessage(msg, deps);
+      break;
+    case "cursor_request_response":
+      handleSessionRequestResponseMessage(msg, deps);
+      break;
+  }
+}
+
 // src/skills/preview.ts
 import { spawn as spawn10 } from "node:child_process";
 var PREVIEW_API_BASE_PATH = "/__preview";
@@ -52400,6 +52852,271 @@ var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
   );
 };
 
+// src/routing/handlers/skill-layout-request.ts
+function handleSkillLayoutRequest(msg, deps) {
+  const id = typeof msg.id === "string" ? msg.id : "";
+  void (async () => {
+    const socket = deps.getWs();
+    const roots = await discoverSkillLayoutRootsAsync(getBridgeRoot());
+    if (socket) {
+      sendWsMessage(socket, { type: "skill_layout_response", id, roots });
+    }
+  })();
+}
+
+// src/skills/install/is-valid-install-item.ts
+function isValidRemoteSkillInstallItem(item) {
+  if (item === null || typeof item !== "object") return false;
+  const o = item;
+  return typeof o.sourceId === "string" && typeof o.skillName === "string" && typeof o.versionHash === "string" && Array.isArray(o.files);
+}
+
+// src/skills/install/install-remote-skills-async.ts
+init_yield_to_event_loop();
+import fs61 from "node:fs";
+import path80 from "node:path";
+
+// src/skills/install/constants.ts
+var INSTALL_SKILLS_YIELD_EVERY = 16;
+
+// src/skills/install/install-remote-skills-async.ts
+async function writeInstallFileAsync(skillDir, f, filesWritten) {
+  if (typeof f.path !== "string" || !f.text && !f.base64) return;
+  if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
+    await yieldToEventLoop();
+  }
+  const dest = path80.join(skillDir, f.path);
+  await fs61.promises.mkdir(path80.dirname(dest), { recursive: true });
+  if (f.text !== void 0) {
+    await fs61.promises.writeFile(dest, f.text, "utf8");
+  } else if (f.base64) {
+    await fs61.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
+  }
+}
+async function installRemoteSkillsAsync(cwd, targetDir, items) {
+  const installed2 = [];
+  if (!Array.isArray(items)) {
+    return { success: false, error: "Invalid items" };
+  }
+  const filesWritten = { count: 0 };
+  try {
+    for (const item of items) {
+      if (!isValidRemoteSkillInstallItem(item)) continue;
+      const skillDir = path80.join(cwd, targetDir, item.skillName);
+      for (const f of item.files) {
+        await writeInstallFileAsync(skillDir, f, filesWritten);
+      }
+      installed2.push({
+        sourceId: item.sourceId,
+        skillName: item.skillName,
+        versionHash: item.versionHash
+      });
+    }
+    return { success: true, installed: installed2 };
+  } catch (e) {
+    return { success: false, error: e instanceof Error ? e.message : String(e) };
+  }
+}
+
+// src/routing/handlers/install-skills.ts
+var handleInstallSkillsMessage = (msg, deps) => {
+  const id = typeof msg.id === "string" ? msg.id : "";
+  const targetDir = typeof msg.targetDir === "string" && msg.targetDir.trim() ? msg.targetDir.trim() : ".agents/skills";
+  const rawItems = msg.items;
+  const cwd = getBridgeRoot();
+  void (async () => {
+    const socket = deps.getWs();
+    const result = await installRemoteSkillsAsync(cwd, targetDir, rawItems);
+    if (!result.success) {
+      const err = result.error ?? "Invalid items";
+      deps.log(`[Bridge service] Install skills failed: ${err}`);
+      if (socket) {
+        sendWsMessage(socket, { type: "install_skills_result", id, success: false, error: err });
+      }
+      return;
+    }
+    if (socket) {
+      sendWsMessage(socket, { type: "install_skills_result", id, success: true, installed: result.installed });
+    }
+  })();
+};
+
+// src/agents/install/commands/run-npm-global-install.ts
+import { execFile as execFile9 } from "node:child_process";
+import { promisify as promisify10 } from "node:util";
+var execFileAsync8 = promisify10(execFile9);
+async function runNpmGlobalInstall(packageName, env, timeoutMs = 3e5) {
+  await execFileAsync8("npm", ["install", "-g", packageName], { timeout: timeoutMs, env: bridgeAgentPathEnv(env) });
+}
+
+// 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
+    });
+  }
+};
+
+// 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
+    });
+  }
+};
+
+// src/agents/install/commands/cursor-cli.ts
+import { execFile as execFile10 } from "node:child_process";
+import { promisify as promisify11 } from "node:util";
+var execFileAsync9 = promisify11(execFile10);
+var cursorCliInstallCommand = {
+  agentType: "cursor-cli",
+  detectCommand: "agent",
+  async install(ctx) {
+    ctx.onProgress?.("Installing Cursor CLI");
+    await execFileAsync9("bash", ["-lc", "curl -fsSL https://cursor.com/install | bash"], {
+      timeout: 3e5,
+      env: { ...bridgeAgentPathEnv(ctx.env), CURSOR_API_KEY: ctx.authToken }
+    });
+  }
+};
+
+// 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
+    });
+  }
+};
+
+// 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);
+}
+
+// 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`);
+  try {
+    await command.install({
+      authToken: params.authToken,
+      onProgress: params.onProgress,
+      env: { ...process.env, [spec.tokenEnvVar]: params.authToken }
+    });
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return { success: false, error: msg };
+  }
+  ensureBridgeAgentPathInProcessEnv();
+  const found = await isCommandOnPath(command.detectCommand);
+  if (!found) {
+    return { success: false, error: `${command.detectCommand} not found on PATH after install` };
+  }
+  return { success: true };
+}
+
+// src/routing/handlers/install-agent.ts
+var handleInstallAgentMessage = (msg, deps) => {
+  const processId = typeof msg.processId === "string" ? msg.processId : "";
+  const agentId = typeof msg.agentId === "string" ? msg.agentId : "";
+  const tokenId = typeof msg.tokenId === "string" ? msg.tokenId : "";
+  const agentType = typeof msg.agentType === "string" ? msg.agentType : "";
+  const authToken = typeof msg.authToken === "string" ? msg.authToken : "";
+  if (!processId || !agentId || !tokenId || !agentType || !authToken) return;
+  void (async () => {
+    const socket = deps.getWs();
+    const report = (step, message) => {
+      if (socket) {
+        sendWsMessage(socket, {
+          type: "install_agent_progress",
+          processId,
+          agentId,
+          tokenId,
+          agentType,
+          step,
+          message
+        });
+      }
+    };
+    const result = await installLocalAgentOnBridge({
+      agentType,
+      authToken,
+      onProgress: (message) => report("agent_install_package", message)
+    });
+    if (socket) {
+      sendWsMessage(socket, {
+        type: "install_agent_result",
+        processId,
+        agentId,
+        tokenId,
+        agentType,
+        success: result.success,
+        error: result.error
+      });
+    }
+    if (result.success) {
+      await deps.reportAutoDetectedAgents?.();
+    }
+    if (!result.success) {
+      deps.log(`[Bridge service] Install agent failed: ${result.error ?? "unknown"}`);
+    }
+  })();
+};
+
+// src/routing/handlers/refresh-local-skills.ts
+var handleRefreshLocalSkills = (_msg, deps) => {
+  setImmediate(() => {
+    deps.sendLocalSkillsReport?.();
+  });
+};
+
+// src/routing/dispatch/skills.ts
+function dispatchBridgeSkillsMessage(msg, deps) {
+  switch (msg.type) {
+    case "skill_call":
+      handleSkillCallMessage(msg, deps);
+      break;
+    case "skill_layout_request":
+      handleSkillLayoutRequest(msg, deps);
+      break;
+    case "install_skills":
+      handleInstallSkillsMessage(msg, deps);
+      break;
+    case "install_agent":
+      handleInstallAgentMessage(msg, deps);
+      break;
+    case "refresh_local_skills":
+      handleRefreshLocalSkills(msg, deps);
+      break;
+  }
+}
+
 // src/files/browser/send-file-browser-message.ts
 function sendFileBrowserMessage(socket, e2ee, payload) {
   sendWsMessage(socket, e2ee ? e2ee.encryptFields(payload, ["entries", "content", "totalLines", "size", "lineOffset"]) : payload);
@@ -52461,13 +53178,13 @@ function handleFileBrowserRequest(msg, socket, e2ee, sessionWorktreeManager) {
 
 // src/files/handle-file-browser-search.ts
 init_yield_to_event_loop();
-import path80 from "node:path";
+import path81 from "node:path";
 var SEARCH_LIMIT = 100;
 function handleFileBrowserSearch(msg, socket, e2ee, sessionWorktreeManager) {
   void (async () => {
     await yieldToEventLoop();
     const q = typeof msg.q === "string" ? msg.q : "";
-    const sessionParentPath = path80.resolve(
+    const sessionParentPath = path81.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -52564,435 +53281,6 @@ function handleFileBrowserCodeNavMessage(msg, { getWs, e2ee, sessionWorktreeMana
   );
 }
 
-// src/routing/handlers/skill-layout-request.ts
-function handleSkillLayoutRequest(msg, deps) {
-  const id = typeof msg.id === "string" ? msg.id : "";
-  void (async () => {
-    const socket = deps.getWs();
-    const roots = await discoverSkillLayoutRootsAsync(getBridgeRoot());
-    if (socket) {
-      sendWsMessage(socket, { type: "skill_layout_response", id, roots });
-    }
-  })();
-}
-
-// src/skills/install/is-valid-install-item.ts
-function isValidRemoteSkillInstallItem(item) {
-  if (item === null || typeof item !== "object") return false;
-  const o = item;
-  return typeof o.sourceId === "string" && typeof o.skillName === "string" && typeof o.versionHash === "string" && Array.isArray(o.files);
-}
-
-// src/skills/install/install-remote-skills-async.ts
-init_yield_to_event_loop();
-import fs60 from "node:fs";
-import path81 from "node:path";
-
-// src/skills/install/constants.ts
-var INSTALL_SKILLS_YIELD_EVERY = 16;
-
-// src/skills/install/install-remote-skills-async.ts
-async function writeInstallFileAsync(skillDir, f, filesWritten) {
-  if (typeof f.path !== "string" || !f.text && !f.base64) return;
-  if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
-    await yieldToEventLoop();
-  }
-  const dest = path81.join(skillDir, f.path);
-  await fs60.promises.mkdir(path81.dirname(dest), { recursive: true });
-  if (f.text !== void 0) {
-    await fs60.promises.writeFile(dest, f.text, "utf8");
-  } else if (f.base64) {
-    await fs60.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
-  }
-}
-async function installRemoteSkillsAsync(cwd, targetDir, items) {
-  const installed2 = [];
-  if (!Array.isArray(items)) {
-    return { success: false, error: "Invalid items" };
-  }
-  const filesWritten = { count: 0 };
-  try {
-    for (const item of items) {
-      if (!isValidRemoteSkillInstallItem(item)) continue;
-      const skillDir = path81.join(cwd, targetDir, item.skillName);
-      for (const f of item.files) {
-        await writeInstallFileAsync(skillDir, f, filesWritten);
-      }
-      installed2.push({
-        sourceId: item.sourceId,
-        skillName: item.skillName,
-        versionHash: item.versionHash
-      });
-    }
-    return { success: true, installed: installed2 };
-  } catch (e) {
-    return { success: false, error: e instanceof Error ? e.message : String(e) };
-  }
-}
-
-// src/routing/handlers/install-skills.ts
-var handleInstallSkillsMessage = (msg, deps) => {
-  const id = typeof msg.id === "string" ? msg.id : "";
-  const targetDir = typeof msg.targetDir === "string" && msg.targetDir.trim() ? msg.targetDir.trim() : ".agents/skills";
-  const rawItems = msg.items;
-  const cwd = getBridgeRoot();
-  void (async () => {
-    const socket = deps.getWs();
-    const result = await installRemoteSkillsAsync(cwd, targetDir, rawItems);
-    if (!result.success) {
-      const err = result.error ?? "Invalid items";
-      deps.log(`[Bridge service] Install skills failed: ${err}`);
-      if (socket) {
-        sendWsMessage(socket, { type: "install_skills_result", id, success: false, error: err });
-      }
-      return;
-    }
-    if (socket) {
-      sendWsMessage(socket, { type: "install_skills_result", id, success: true, installed: result.installed });
-    }
-  })();
-};
-
-// src/routing/handlers/refresh-local-skills.ts
-var handleRefreshLocalSkills = (_msg, deps) => {
-  setImmediate(() => {
-    deps.sendLocalSkillsReport?.();
-  });
-};
-
-// src/routing/handlers/git/handle-session-git-commit.ts
-async function handleSessionGitCommitAction(deps, sessionId, msg, reply) {
-  const branch = typeof msg.branch === "string" ? msg.branch : "";
-  const message = typeof msg.message === "string" ? msg.message : "";
-  const pushAfterCommit = msg.pushAfterCommit === true;
-  if (!branch.trim() || !message.trim()) {
-    reply({ ok: false, error: "branch and message are required for commit" });
-    return;
-  }
-  const commitRes = await deps.sessionWorktreeManager.commitSession({
-    sessionId,
-    branch: branch.trim(),
-    message: message.trim(),
-    push: pushAfterCommit
-  });
-  if (!commitRes.ok) {
-    reply({ ok: false, error: commitRes.error ?? "Commit failed" });
-    return;
-  }
-  const st = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
-  reply({
-    ok: true,
-    hasUncommittedChanges: st.hasUncommittedChanges,
-    hasUnpushedCommits: st.hasUnpushedCommits,
-    uncommittedFileCount: st.uncommittedFileCount
-  });
-}
-
-// src/routing/handlers/git/session-git-changes-params.ts
-function readString(value) {
-  return typeof value === "string" ? value.trim() : "";
-}
-function readChangesObject(msg) {
-  const changes = msg.changes;
-  if (!changes || typeof changes !== "object" || Array.isArray(changes)) return null;
-  return changes;
-}
-function parseSessionGitChangesParams(msg) {
-  const nested = readChangesObject(msg);
-  const file2 = nested?.file && typeof nested.file === "object" && !Array.isArray(nested.file) ? nested.file : null;
-  const repoRelPath = readString(nested?.repoRelPath) || readString(msg.changesRepoRelPath);
-  const viewRaw = nested?.view ?? msg.changesView;
-  const view = viewRaw === "commit" ? "commit" : "working";
-  const commitSha = readString(nested?.commitSha) || readString(msg.changesCommitSha);
-  const recentCommitsLimit = nested?.recentCommitsLimit ?? msg.changesRecentCommitsLimit;
-  return {
-    repoRelPath,
-    view,
-    commitSha,
-    recentCommitsLimit: typeof recentCommitsLimit === "number" || typeof recentCommitsLimit === "string" ? recentCommitsLimit : void 0,
-    fileWorkspaceRelPath: readString(file2?.workspaceRelPath),
-    fileChange: readString(file2?.change),
-    fileMovedFromWorkspaceRelPath: readString(file2?.movedFromWorkspaceRelPath)
-  };
-}
-
-// src/routing/handlers/git/handle-session-git-get-change-file-patch.ts
-async function handleSessionGitGetChangeFilePatchAction(deps, msg, reply) {
-  const changes = parseSessionGitChangesParams(msg);
-  const { repoRelPath: repoRel, view, commitSha, fileWorkspaceRelPath, fileChange, fileMovedFromWorkspaceRelPath } = changes;
-  const change = parseWorkingTreeChangeKind(fileChange);
-  if (!repoRel || !fileWorkspaceRelPath || !change) {
-    reply({
-      ok: false,
-      error: "changes.repoRelPath, changes.file.workspaceRelPath, and changes.file.change are required"
-    });
-    return;
-  }
-  if (view === "commit" && !commitSha) {
-    reply({ ok: false, error: "changes.commitSha is required for commit file patch" });
-    return;
-  }
-  const patch = await deps.sessionWorktreeManager.getSessionWorkingTreeChangeFilePatch(msg.sessionId, {
-    repoRelPath: repoRel,
-    workspaceRelPath: fileWorkspaceRelPath,
-    change,
-    movedFromWorkspaceRelPath: fileMovedFromWorkspaceRelPath || null,
-    basis: view === "commit" ? { kind: "commit", sha: commitSha } : { kind: "working" }
-  });
-  reply(
-    {
-      ok: true,
-      patchContent: patch.patchContent ?? null,
-      totalLines: patch.totalLines
-    },
-    ["patchContent"]
-  );
-}
-
-// src/routing/handlers/git/coalesce-list-changes.ts
-var listChangesInflight = /* @__PURE__ */ new Map();
-function normalizeListChangesRepoPathRelativeToWorkspaceRoot(repoRelPath) {
-  if (!repoRelPath?.trim()) return "";
-  return normalizeRepoPathRelativeToWorkspaceRoot(repoRelPath.trim());
-}
-function listChangesInflightKey(sessionId, opts) {
-  const basis = opts?.basis;
-  return [
-    sessionId,
-    normalizeListChangesRepoPathRelativeToWorkspaceRoot(opts?.repoRelPath),
-    basis?.kind === "commit" ? `commit:${basis.sha}` : "working",
-    String(opts?.recentCommitsLimit ?? "")
-  ].join("|");
-}
-function getSessionWorkingTreeChangeDetailsCoalesced(sessionWorktreeManager, sessionId, opts) {
-  const key = listChangesInflightKey(sessionId, opts);
-  const existing = listChangesInflight.get(key);
-  if (existing) return existing;
-  const promise2 = sessionWorktreeManager.getSessionWorkingTreeChangeDetails(sessionId, opts).finally(() => {
-    if (listChangesInflight.get(key) === promise2) listChangesInflight.delete(key);
-  });
-  listChangesInflight.set(key, promise2);
-  return promise2;
-}
-
-// src/routing/handlers/git/handle-session-git-list-changes.ts
-async function handleSessionGitListChangesAction(deps, msg, reply) {
-  const changes = parseSessionGitChangesParams(msg);
-  const { repoRelPath: repoRel, view, commitSha, recentCommitsLimit } = changes;
-  if (view === "commit") {
-    if (!repoRel || !commitSha) {
-      reply({
-        ok: false,
-        error: "changes.repoRelPath and changes.commitSha are required for commit view"
-      });
-      return;
-    }
-  }
-  const opts = repoRel && view === "commit" && commitSha ? {
-    repoRelPath: repoRel,
-    basis: { kind: "commit", sha: commitSha },
-    recentCommitsLimit
-  } : repoRel ? { repoRelPath: repoRel, basis: { kind: "working" }, recentCommitsLimit } : recentCommitsLimit !== void 0 ? { recentCommitsLimit } : void 0;
-  const repos = await getSessionWorkingTreeChangeDetailsCoalesced(
-    deps.sessionWorktreeManager,
-    msg.sessionId,
-    opts
-  );
-  reply({ ok: true, repos }, ["repos"]);
-}
-
-// src/routing/handlers/git/handle-session-git-push.ts
-async function handleSessionGitPushAction(deps, sessionId, reply) {
-  const pushRes = await deps.sessionWorktreeManager.pushSessionUpstream(sessionId);
-  if (!pushRes.ok) {
-    reply({ ok: false, error: pushRes.error ?? "Push failed" });
-    return;
-  }
-  const st = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
-  reply({
-    ok: true,
-    hasUncommittedChanges: st.hasUncommittedChanges,
-    hasUnpushedCommits: st.hasUnpushedCommits,
-    uncommittedFileCount: st.uncommittedFileCount
-  });
-}
-
-// src/routing/handlers/git/handle-session-git-status.ts
-async function handleSessionGitStatusAction(deps, sessionId, reply) {
-  const r = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
-  reply({
-    ok: true,
-    hasUncommittedChanges: r.hasUncommittedChanges,
-    hasUnpushedCommits: r.hasUnpushedCommits,
-    uncommittedFileCount: r.uncommittedFileCount
-  });
-}
-
-// src/routing/handlers/git/send-session-git-result.ts
-function sendSessionGitResult(ws, id, payload, e2ee, encryptedFields = []) {
-  if (!ws) return;
-  const message = { type: "session_git_result", id, ...payload };
-  let wire = message;
-  if (e2ee && encryptedFields.length > 0) {
-    wire = e2ee.encryptFields(message, encryptedFields);
-  }
-  sendWsMessage(ws, wire);
-}
-
-// src/routing/handlers/git/session-git-request.ts
-var handleSessionGitRequestMessage = (msg, deps) => {
-  if (typeof msg.id !== "string") return;
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  const action = msg.action;
-  if (!sessionId || action !== "status" && action !== "push" && action !== "commit" && action !== "list_changes" && action !== "file_diff")
-    return;
-  void (async () => {
-    const ws = deps.getWs();
-    const reply = (payload, encryptedFields = []) => sendSessionGitResult(ws, msg.id, payload, deps.e2ee, encryptedFields);
-    try {
-      if (action === "status") {
-        await handleSessionGitStatusAction(deps, sessionId, reply);
-        return;
-      }
-      if (action === "list_changes") {
-        await handleSessionGitListChangesAction(deps, { ...msg, sessionId }, reply);
-        return;
-      }
-      if (action === "file_diff") {
-        await handleSessionGitGetChangeFilePatchAction(deps, { ...msg, sessionId }, reply);
-        return;
-      }
-      if (action === "push") {
-        await handleSessionGitPushAction(deps, sessionId, reply);
-        return;
-      }
-      await handleSessionGitCommitAction(deps, sessionId, msg, reply);
-    } catch (e) {
-      reply({ ok: false, error: e instanceof Error ? e.message : String(e) });
-    }
-  })();
-};
-
-// src/routing/handlers/rename-session-branch.ts
-var handleRenameSessionBranchMessage = (msg, deps) => {
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  const newBranch = typeof msg.newBranch === "string" ? msg.newBranch : "";
-  if (!sessionId || !newBranch) return;
-  void deps.sessionWorktreeManager.renameSessionBranch(sessionId, newBranch);
-};
-
-// src/routing/handlers/session-archived.ts
-var handleSessionArchivedMessage = (msg, deps) => {
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  if (!sessionId) return;
-  void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
-};
-
-// src/routing/handlers/session-discarded.ts
-var handleSessionDiscardedMessage = (msg, deps) => {
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  if (!sessionId) return;
-  void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
-};
-
-// src/routing/handlers/revert-turn-snapshot.ts
-import * as fs61 from "node:fs";
-var handleRevertTurnSnapshotMessage = (msg, deps) => {
-  const id = typeof msg.id === "string" ? msg.id : "";
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  const turnId = typeof msg.turnId === "string" ? msg.turnId : "";
-  if (!id || !sessionId || !turnId) return;
-  const { getWs, log: log2, sessionWorktreeManager } = deps;
-  void (async () => {
-    const s = getWs();
-    if (!s) return;
-    const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
-    const file2 = snapshotFilePath(agentBase, turnId);
-    try {
-      await fs61.promises.access(file2, fs61.constants.F_OK);
-    } catch {
-      sendWsMessage(s, {
-        type: "revert_turn_snapshot_result",
-        id,
-        ok: false,
-        error: "No snapshot found for this turn (git state may be unavailable)."
-      });
-      return;
-    }
-    const res = await applyPreTurnSnapshot(file2, log2);
-    sendWsMessage(s, {
-      type: "revert_turn_snapshot_result",
-      id,
-      ok: res.ok,
-      ...res.error ? { error: res.error } : {}
-    });
-  })();
-};
-
-// src/routing/handlers/preview-environment-control.ts
-var handlePreviewEnvironmentControl = (msg, deps) => {
-  let wire;
-  try {
-    wire = deps.e2ee ? deps.e2ee.decryptMessage(msg) : msg;
-  } catch (e) {
-    deps.log(`[E2EE] Could not decrypt preview environment command: ${e instanceof Error ? e.message : String(e)}`);
-    return;
-  }
-  const environmentId = typeof wire.environmentId === "string" ? wire.environmentId : "";
-  const action = wire.action === "start" || wire.action === "stop" ? wire.action : null;
-  if (!environmentId || !action) return;
-  deps.previewEnvironmentManager?.handleControl(environmentId, action);
-};
-
-// src/routing/handlers/preview-environments-config.ts
-var VALID_PORT = (p) => typeof p === "number" && Number.isInteger(p) && p > 0 && p < 65536;
-var handlePreviewEnvironmentsConfig = (msg, deps) => {
-  const previewEnvironments = msg.previewEnvironments;
-  const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts.filter(VALID_PORT) : void 0;
-  setImmediate(() => {
-    deps.previewEnvironmentManager?.applyConfig(previewEnvironments ?? []);
-    const environmentIds = parsePreviewEnvironmentDefs(previewEnvironments ?? []).map((d) => d.environmentId);
-    void deps.previewWorktreeManager?.syncConfiguredEnvironments(environmentIds);
-    if (proxyPorts !== void 0) {
-      deps.updateFirehoseProxyPorts?.(proxyPorts);
-    }
-  });
-};
-
-// src/routing/handlers/send-deploy-session-to-preview-result.ts
-function sendDeploySessionToPreviewResult(ws, id, payload) {
-  if (!ws) return;
-  sendWsMessage(ws, { type: "deploy_session_to_preview_result", id, ...payload });
-}
-
-// src/routing/handlers/deploy-session-to-preview.ts
-var handleDeploySessionToPreviewMessage = (msg, deps) => {
-  if (typeof msg.id !== "string") return;
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  const environmentId = typeof msg.environmentId === "string" ? msg.environmentId : "";
-  if (!sessionId || !environmentId) return;
-  void (async () => {
-    const ws = deps.getWs();
-    const reply = (payload) => sendDeploySessionToPreviewResult(ws, msg.id, payload);
-    try {
-      if (!deps.previewWorktreeManager) {
-        reply({ ok: false, error: "Preview worktree manager unavailable" });
-        return;
-      }
-      const result = await deploySessionToPreviewEnvironment({
-        sessionWorktreeManager: deps.sessionWorktreeManager,
-        previewWorktreeManager: deps.previewWorktreeManager,
-        sessionId,
-        environmentId,
-        log: deps.log
-      });
-      reply(result);
-    } catch (e) {
-      reply({ ok: false, error: e instanceof Error ? e.message : String(e) });
-    }
-  })();
-};
-
 // src/git/bridge-git-context.ts
 import * as path82 from "node:path";
 init_yield_to_event_loop();
@@ -53138,80 +53426,64 @@ function handleListRepoBranchesRequestMessage(msg, getWs) {
   })();
 }
 
-// src/routing/dispatch-bridge-message.ts
+// src/routing/dispatch/file-browser.ts
+function dispatchBridgeFileBrowserMessage(msg, deps) {
+  switch (msg.type) {
+    case "file_browser_request":
+      handleFileBrowserRequestMessage(msg, deps);
+      break;
+    case "file_browser_search":
+      handleFileBrowserSearchMessage(msg, deps);
+      break;
+    case "code_nav":
+      handleFileBrowserCodeNavMessage(msg, deps);
+      break;
+    case "bridge_git_context_request":
+      handleBridgeGitContextRequestMessage(msg, deps.getWs);
+      break;
+    case "list_repo_branches_request":
+      handleListRepoBranchesRequestMessage(msg, deps.getWs);
+      break;
+  }
+}
+
+// src/routing/dispatch/index.ts
 function dispatchBridgeMessage(msg, deps) {
   switch (msg.type) {
     case "auth_token":
-      handleAuthToken(msg, deps);
-      break;
     case "bridge_identified":
-      handleBridgeIdentified(msg, deps);
-      break;
     case "ha":
-      handleBridgeHeartbeatAck(msg, deps);
+      dispatchBridgeConnectionMessage(msg, deps);
       break;
     case "preview_environments_config":
-      handlePreviewEnvironmentsConfig(msg, deps);
-      break;
     case "preview_environment_control":
-      handlePreviewEnvironmentControl(msg, deps);
-      break;
     case "deploy_session_to_preview":
-      handleDeploySessionToPreviewMessage(msg, deps);
+      dispatchBridgePreviewMessage(msg, deps);
       break;
     case "agent_config":
-      handleAgentConfigMessage(msg, deps);
-      break;
     case "prompt_queue_state":
-      handlePromptQueueStateMessage(msg, deps);
-      break;
     case "prompt":
-      handlePromptMessage(msg, deps);
-      break;
     case "session_git_request":
-      handleSessionGitRequestMessage(msg, deps);
-      break;
     case "rename_session_branch":
-      handleRenameSessionBranchMessage(msg, deps);
-      break;
     case "session_archived":
-      handleSessionArchivedMessage(msg, deps);
-      break;
     case "session_discarded":
-      handleSessionDiscardedMessage(msg, deps);
-      break;
     case "revert_turn_snapshot":
-      handleRevertTurnSnapshotMessage(msg, deps);
-      break;
     case "cursor_request_response":
-      handleSessionRequestResponseMessage(msg, deps);
+      dispatchBridgeSessionMessage(msg, deps);
       break;
     case "skill_call":
-      handleSkillCallMessage(msg, deps);
-      break;
-    case "file_browser_request":
-      handleFileBrowserRequestMessage(msg, deps);
-      break;
-    case "file_browser_search":
-      handleFileBrowserSearchMessage(msg, deps);
-      break;
-    case "code_nav":
-      handleFileBrowserCodeNavMessage(msg, deps);
-      break;
     case "skill_layout_request":
-      handleSkillLayoutRequest(msg, deps);
-      break;
     case "install_skills":
-      handleInstallSkillsMessage(msg, deps);
-      break;
+    case "install_agent":
     case "refresh_local_skills":
-      handleRefreshLocalSkills(msg, deps);
+      dispatchBridgeSkillsMessage(msg, deps);
       break;
+    case "file_browser_request":
+    case "file_browser_search":
+    case "code_nav":
     case "bridge_git_context_request":
-      handleBridgeGitContextRequestMessage(msg, deps.getWs);
-      break;
     case "list_repo_branches_request":
-      handleListRepoBranchesRequestMessage(msg, deps.getWs);
+      dispatchBridgeFileBrowserMessage(msg, deps);
       break;
   }
 }
@@ -53496,6 +53768,7 @@ init_log();
 async function createBridgeConnection(options) {
   const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
   const logFn = options.log ?? log;
+  ensureBridgeAgentPathInProcessEnv();
   await ensureBridgeConnectionDatabases(logFn);
   const { state, getWs } = createMainBridgeReconnectState();
   const runtime = await createBridgeConnectionRuntime(options, { state, getWs, logFn });