@buildautomaton/cli 0.1.8 → 0.1.9

package/dist/index.js

@@ -4065,8 +4065,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path24, errorMaps, issueData } = params;
-      const fullPath = [...path24, ...issueData.path || []];
+      const { data, path: path29, errorMaps, issueData } = params;
+      const fullPath = [...path29, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -4374,11 +4374,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path24, key) {
+      constructor(parent, value, path29, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path24;
+        this._path = path29;
         this._key = key;
       }
       get path() {
@@ -7993,10 +7993,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path24) {
-  if (!path24)
+function getElementAtPath(obj, path29) {
+  if (!path29)
     return obj;
-  return path24.reduce((acc, key) => acc?.[key], obj);
+  return path29.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -8245,11 +8245,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path24, issues) {
+function prefixIssues(path29, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path24);
+    iss.path.unshift(path29);
     return iss;
   });
 }
@@ -8438,7 +8438,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path24 = []) => {
+  const processError = (error41, path29 = []) => {
     var _a2, _b;
     for (const issue2 of error41.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -8448,7 +8448,7 @@ function treeifyError(error40, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path24, ...issue2.path];
+        const fullpath = [...path29, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -8478,9 +8478,9 @@ function treeifyError(error40, _mapper) {
   processError(error40);
   return result;
 }
-function toDotPath(path24) {
+function toDotPath(path29) {
   const segs = [];
-  for (const seg of path24) {
+  for (const seg of path29) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -21963,10 +21963,10 @@ var require_src2 = __commonJS({
     var fs_1 = __require("fs");
     var debug_1 = __importDefault(require_src());
     var log2 = debug_1.default("@kwsites/file-exists");
-    function check2(path24, isFile, isDirectory) {
-      log2(`checking %s`, path24);
+    function check2(path29, isFile, isDirectory) {
+      log2(`checking %s`, path29);
       try {
-        const stat2 = fs_1.statSync(path24);
+        const stat2 = fs_1.statSync(path29);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -21986,8 +21986,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path24, type = exports.READABLE) {
-      return check2(path24, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path29, type = exports.READABLE) {
+      return check2(path29, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -22426,7 +22426,7 @@ function localAgentErrorSuggestsAuth(agentType, errorText) {
   return hints.some((re) => re.test(String(errorText)));
 }
 
-// src/acp/clients/sdk-stdio-acp-client.ts
+// src/agents/acp/clients/sdk-stdio-acp-client.ts
 import { spawn } from "node:child_process";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
@@ -22488,7 +22488,7 @@ function getBridgeWorkspaceDirectory() {
   return bridgeWorkspaceDirectory;
 }
 
-// src/acp/safe-fs-path.ts
+// src/agents/acp/safe-fs-path.ts
 import * as path2 from "node:path";
 function resolveSafePathUnderCwd(cwd, filePath) {
   const trimmed2 = filePath.trim();
@@ -22506,7 +22506,7 @@ function toDisplayPathRelativeToCwd(cwd, absolutePath) {
   return rel.split(path2.sep).join("/");
 }
 
-// src/acp/clients/agent-stderr-capture.ts
+// src/agents/acp/clients/agent-stderr-capture.ts
 var STDERR_CAPTURE_MAX = 48e3;
 function createStderrCapture(child) {
   const chunks = [];
@@ -22553,7 +22553,7 @@ function mergeErrorWithStderr(primary, stderrText) {
 ${s}`;
 }
 
-// src/acp/clients/kiro-sdk-ext-notifications.ts
+// src/agents/acp/clients/kiro-sdk-ext-notifications.ts
 function createKiroSdkExtNotificationHandler(options) {
   const { onSessionUpdate } = options;
   return async (method, params) => {
@@ -22570,7 +22570,7 @@ function createKiroSdkExtNotificationHandler(options) {
   };
 }
 
-// src/acp/clients/sdk-stdio-ext-notifications.ts
+// src/agents/acp/clients/sdk-stdio-ext-notifications.ts
 var noopExtNotification = async () => {
 };
 function createSdkStdioExtNotificationHandler(options) {
@@ -22583,7 +22583,7 @@ function createSdkStdioExtNotificationHandler(options) {
   }
 }
 
-// src/acp/clients/sdk-stdio-acp-client.ts
+// src/agents/acp/clients/sdk-stdio-acp-client.ts
 function formatSpawnError(err, command) {
   if (err.code === "ENOENT") {
     return `Command "${command}" not found. Install the agent (e.g. Cursor CLI) or add it to PATH.`;
@@ -22951,8 +22951,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path24, body) {
-  const url2 = `http://127.0.0.1:${port}${path24}`;
+async function requestPreviewApi(port, secret, method, path29, body) {
+  const url2 = `http://127.0.0.1:${port}${path29}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -22964,7 +22964,7 @@ async function requestPreviewApi(port, secret, method, path24, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path24}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path29}: ${res.status}`);
   }
   return data;
 }
@@ -23514,13 +23514,64 @@ function runPendingAuth(options) {
   };
 }
 
-// src/bridge/connection/build-bridge-url.ts
-function buildBridgeUrl(apiUrl, workspaceId, authToken) {
-  const base = apiUrl.startsWith("https") ? apiUrl.replace(/^https/, "wss") : apiUrl.replace(/^http/, "ws");
-  const params = new URLSearchParams({ workspaceId, token: authToken });
-  return `${base}/ws/bridge?${params.toString()}`;
+// src/bridge/connection/close-bridge-connection.ts
+async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
+  const say = log2 ?? logImmediate;
+  say("Cleaning up connections\u2026");
+  await new Promise((resolve14) => setImmediate(resolve14));
+  state.closedByUser = true;
+  clearReconnectQuietTimer(state.mainQuiet);
+  clearReconnectQuietTimer(state.firehoseQuiet);
+  if (state.reconnectTimeout != null) {
+    say("Cancelling bridge reconnect timer\u2026");
+    clearTimeout(state.reconnectTimeout);
+    state.reconnectTimeout = null;
+  }
+  if (state.firehoseReconnectTimeout != null) {
+    say("Cancelling preview tunnel reconnect timer\u2026");
+    clearTimeout(state.firehoseReconnectTimeout);
+    state.firehoseReconnectTimeout = null;
+  }
+  if (state.firehoseHandle) {
+    say("Closing preview tunnel (local HTTP proxy and dev logs)\u2026");
+    state.firehoseHandle.close();
+    state.firehoseHandle = null;
+  }
+  say("Disconnecting local agent\u2026");
+  acpManager.disconnect();
+  if (state.currentWs) {
+    say("Closing bridge connection to the cloud\u2026");
+    state.currentWs.removeAllListeners();
+    const wsState = state.currentWs.readyState;
+    if (wsState === 1 || wsState === 2) {
+      state.currentWs.close();
+    } else {
+      state.currentWs.on("error", () => {
+      });
+      state.currentWs.on("close", () => {
+      });
+    }
+    state.currentWs = null;
+  }
+  if (devServerManager) {
+    say("Stopping local dev server processes\u2026");
+    await devServerManager.shutdownAllGraceful();
+  }
+  say("Shutdown complete.");
 }
 
+// src/git/session-git-queue.ts
+import { execFile as execFile2 } from "node:child_process";
+import { readFile, stat } from "node:fs/promises";
+import { promisify as promisify2 } from "node:util";
+import * as path6 from "node:path";
+
+// src/git/pre-turn-snapshot.ts
+import * as fs3 from "node:fs";
+import * as path5 from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+
 // src/git/discover-repos.ts
 import * as fs2 from "node:fs";
 import * as path4 from "node:path";
@@ -23562,8 +23613,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path24) {
-  return path24 instanceof String && cache.has(path24);
+function isPathSpec(path29) {
+  return path29 instanceof String && cache.has(path29);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -23652,8 +23703,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path24) {
-  return (0, import_file_exists.exists)(path24, import_file_exists.FOLDER);
+function folderExists(path29) {
+  return (0, import_file_exists.exists)(path29, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -24057,8 +24108,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path24) {
-      return /^\.(git)?$/.test(path24.trim());
+    parser(path29) {
+      return /^\.(git)?$/.test(path29.trim());
     }
   };
 }
@@ -24492,11 +24543,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path24, line, preview] = input.split(NULL);
-    paths.add(path24);
-    (results[path24] = results[path24] || []).push({
+    const [path29, line, preview] = input.split(NULL);
+    paths.add(path29);
+    (results[path29] = results[path29] || []).push({
       line: asNumber(line),
-      path: path24,
+      path: path29,
       preview
     });
   });
@@ -25261,14 +25312,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path24, text) {
+function parseInit(bare, path29, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path24, false, result[1]);
+    return new InitSummary(bare, path29, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path24, true, result[1]);
+    return new InitSummary(bare, path29, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -25279,7 +25330,7 @@ function parseInit(bare, path24, text) {
       break;
     }
   }
-  return new InitSummary(bare, path24, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path29, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -25288,9 +25339,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path24, existing, gitDir) {
+      constructor(bare, path29, existing, gitDir) {
         this.bare = bare;
-        this.path = path24;
+        this.path = path29;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -25302,7 +25353,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path24, customArgs) {
+function initTask(bare = false, path29, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -25311,7 +25362,7 @@ function initTask(bare = false, path24, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path24, text);
+      return parseInit(commands.includes("--bare"), path29, text);
     }
   };
 }
@@ -26127,12 +26178,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path24, index, working_dir) {
-        this.path = path24;
+      constructor(path29, index, working_dir) {
+        this.path = path29;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path24) || [null, path24, path24];
+          const detail = fromPathRegex.exec(path29) || [null, path29, path29];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -26163,14 +26214,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path24) {
+  function data(index, workingDir, path29) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path24);
+      handler(result, path29);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path24, index, workingDir));
+      result.files.push(new FileStatusSummary(path29, index, workingDir));
     }
   }
 }
@@ -26479,9 +26530,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path24, write) {
+      hashObject(path29, write) {
         return this._runTask(
-          hashObjectTask(path24, write === true),
+          hashObjectTask(path29, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -26834,8 +26885,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path24 = input.trim().replace(/^["']|["']$/g, "");
-  return path24 && normalize2(path24);
+  const path29 = input.trim().replace(/^["']|["']$/g, "");
+  return path29 && normalize2(path29);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -27149,8 +27200,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path24) {
-  return subModuleTask(["add", repo, path24]);
+function addSubModuleTask(repo, path29) {
+  return subModuleTask(["add", repo, path29]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -27483,8 +27534,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path24, then) {
-      return this._runTask(addSubModuleTask2(repo, path24), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path29, then) {
+      return this._runTask(addSubModuleTask2(repo, path29), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -28160,84 +28211,7 @@ async function discoverGitReposUnderRoot(rootAbs) {
   return out;
 }
 
-// src/bridge/connection/report-git-repos.ts
-function reportGitRepos(getWs, log2) {
-  setImmediate(() => {
-    discoverGitRepos().then((repos) => {
-      if (repos.length > 0) {
-        const socket = getWs();
-        if (socket) {
-          sendWsMessage(socket, {
-            type: "git_repos",
-            repos: repos.map((r) => ({ absolutePath: r.absolutePath, remoteUrl: r.remoteUrl }))
-          });
-        }
-      }
-    }).catch((err) => {
-      log2(
-        `[Bridge service] Git repository discovery failed: ${err instanceof Error ? err.message : String(err)}`
-      );
-    });
-  });
-}
-
-// src/bridge/connection/close-bridge-connection.ts
-async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
-  const say = log2 ?? logImmediate;
-  say("Cleaning up connections\u2026");
-  await new Promise((resolve14) => setImmediate(resolve14));
-  state.closedByUser = true;
-  clearReconnectQuietTimer(state.mainQuiet);
-  clearReconnectQuietTimer(state.firehoseQuiet);
-  if (state.reconnectTimeout != null) {
-    say("Cancelling bridge reconnect timer\u2026");
-    clearTimeout(state.reconnectTimeout);
-    state.reconnectTimeout = null;
-  }
-  if (state.firehoseReconnectTimeout != null) {
-    say("Cancelling preview tunnel reconnect timer\u2026");
-    clearTimeout(state.firehoseReconnectTimeout);
-    state.firehoseReconnectTimeout = null;
-  }
-  if (state.firehoseHandle) {
-    say("Closing preview tunnel (local HTTP proxy and dev logs)\u2026");
-    state.firehoseHandle.close();
-    state.firehoseHandle = null;
-  }
-  say("Disconnecting local agent\u2026");
-  acpManager.disconnect();
-  if (state.currentWs) {
-    say("Closing bridge connection to the cloud\u2026");
-    state.currentWs.removeAllListeners();
-    const wsState = state.currentWs.readyState;
-    if (wsState === 1 || wsState === 2) {
-      state.currentWs.close();
-    } else {
-      state.currentWs.on("error", () => {
-      });
-      state.currentWs.on("close", () => {
-      });
-    }
-    state.currentWs = null;
-  }
-  if (devServerManager) {
-    say("Stopping local dev server processes\u2026");
-    await devServerManager.shutdownAllGraceful();
-  }
-  say("Shutdown complete.");
-}
-
-// src/git/session-git-queue.ts
-import { execFile as execFile2 } from "node:child_process";
-import { readFile, stat } from "node:fs/promises";
-import { promisify as promisify2 } from "node:util";
-import * as path6 from "node:path";
-
 // src/git/pre-turn-snapshot.ts
-import * as fs3 from "node:fs";
-import * as path5 from "node:path";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
 function snapshotsDirForCwd(agentCwd) {
   return path5.join(agentCwd, ".buildautomaton", "snapshots");
@@ -28421,7 +28395,7 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
   }
 }
 
-// src/acp/send-prompt-to-agent.ts
+// src/agents/acp/send-prompt-to-agent.ts
 async function sendPromptToAgent(options) {
   const {
     handle,
@@ -28431,7 +28405,7 @@ async function sendPromptToAgent(options) {
     runId,
     agentType,
     agentCwd,
-    sendResult,
+    sendResult: sendResult2,
     sendSessionUpdate,
     log: log2
   } = options;
@@ -28455,7 +28429,7 @@ async function sendPromptToAgent(options) {
       });
     }
     const errStr = typeof result.error === "string" ? result.error : void 0;
-    sendResult({
+    sendResult2({
       type: "prompt_result",
       id: promptId,
       ...sessionId ? { sessionId } : {},
@@ -28469,7 +28443,7 @@ async function sendPromptToAgent(options) {
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
     log2(`[Agent] Send failed: ${errMsg}`);
-    sendResult({
+    sendResult2({
       type: "prompt_result",
       id: promptId,
       ...sessionId ? { sessionId } : {},
@@ -28481,7 +28455,7 @@ async function sendPromptToAgent(options) {
   }
 }
 
-// src/acp/ensure-acp-client.ts
+// src/agents/acp/ensure-acp-client.ts
 import * as fs4 from "node:fs";
 import * as path9 from "node:path";
 
@@ -28495,7 +28469,7 @@ function errorMessage(err) {
   return String(err);
 }
 
-// src/acp/clients/claude-code-acp-client.ts
+// 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,
@@ -28506,7 +28480,7 @@ __export(claude_code_acp_client_exports, {
 import { execFile as execFile4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
 
-// src/acp/clients/detect-command-on-path.ts
+// src/agents/acp/clients/detect-command-on-path.ts
 import { execFile as execFile3 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 var execFileAsync3 = promisify3(execFile3);
@@ -28519,7 +28493,7 @@ async function isCommandOnPath(command, timeoutMs = 4e3) {
   }
 }
 
-// src/acp/clients/claude-code-acp-client.ts
+// src/agents/acp/clients/claude-code-acp-client.ts
 var execFileAsync4 = promisify4(execFile4);
 var BACKEND_LOCAL_AGENT_TYPE = "claude-code";
 async function detectLocalAgentPresence() {
@@ -28547,7 +28521,7 @@ async function createClaudeCodeAcpClient(options) {
   });
 }
 
-// src/acp/clients/codex-acp-client.ts
+// 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,
@@ -28575,7 +28549,7 @@ async function createCodexAcpClient(options) {
   return createSdkStdioAcpClient({ ...options, command });
 }
 
-// src/acp/clients/cursor-acp-client.ts
+// src/agents/acp/clients/cursor-acp-client.ts
 var cursor_acp_client_exports = {};
 __export(cursor_acp_client_exports, {
   BACKEND_LOCAL_AGENT_TYPE: () => BACKEND_LOCAL_AGENT_TYPE3,
@@ -28588,7 +28562,7 @@ import { dirname as dirname2 } from "node:path";
 import { spawn as spawn4 } from "node:child_process";
 import * as readline from "node:readline";
 
-// src/acp/format-session-update-kind-for-log.ts
+// src/agents/acp/format-session-update-kind-for-log.ts
 var SESSION_UPDATE_KIND_LABELS = {
   tool_call: "Tool call",
   tool_call_update: "Tool call status",
@@ -28601,7 +28575,7 @@ function formatSessionUpdateKindForLog(kind) {
   return kind.split("_").filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(" ");
 }
 
-// src/acp/clients/cursor-acp-client.ts
+// src/agents/acp/clients/cursor-acp-client.ts
 var FS_READ_METHODS = /* @__PURE__ */ new Set(["fs/read_text_file", "fs/readTextFile"]);
 var FS_WRITE_METHODS = /* @__PURE__ */ new Set(["fs/write_text_file", "fs/writeTextFile"]);
 function formatSpawnError2(err, command) {
@@ -28922,7 +28896,7 @@ async function detectLocalAgentPresence3() {
   return isCommandOnPath("agent");
 }
 
-// src/acp/clients/kiro-acp-client.ts
+// 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,
@@ -28953,7 +28927,7 @@ async function createKiroAcpClient(options) {
   return createSdkStdioAcpClient({ ...options, command });
 }
 
-// src/acp/resolve-agent-command.ts
+// 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],
@@ -29022,7 +28996,7 @@ function resolveAgentCommand(preferredAgentType) {
   };
 }
 
-// src/acp/session-file-change-path-kind.ts
+// src/agents/acp/session-file-change-path-kind.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync, statSync } from "node:fs";
 
@@ -29043,7 +29017,7 @@ function getGitRepoRootSync(startDir) {
   }
 }
 
-// src/acp/workspace-files.ts
+// src/agents/acp/workspace-files.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { readFileSync as readFileSync4 } from "node:fs";
 import * as path8 from "node:path";
@@ -29115,7 +29089,7 @@ function readGitHeadBlob(cwd, displayPath) {
   }
 }
 
-// src/acp/session-file-change-path-kind.ts
+// src/agents/acp/session-file-change-path-kind.ts
 function gitHeadPathObjectType(cwd, displayPath) {
   if (!displayPath || displayPath.includes("..")) return null;
   const gitRoot = getGitRepoRootSync(cwd);
@@ -29147,7 +29121,7 @@ function getSessionFileChangeDirectoryFlags(cwd, displayPath) {
   return { isDirectory: false, directoryRemoved: false };
 }
 
-// src/acp/hooks/bridge-on-file-change.ts
+// src/agents/acp/hooks/bridge-on-file-change.ts
 function createBridgeOnFileChange(opts) {
   const { routing, getSendSessionUpdate, log: log2 } = opts;
   return (evt) => {
@@ -29180,7 +29154,7 @@ function createBridgeOnFileChange(opts) {
   };
 }
 
-// src/acp/hooks/bridge-on-request.ts
+// src/agents/acp/hooks/bridge-on-request.ts
 function createBridgeOnRequest(opts) {
   const { routing, getSendRequest, log: log2 } = opts;
   return (request) => {
@@ -29211,7 +29185,7 @@ function createBridgeOnRequest(opts) {
   };
 }
 
-// src/acp/hooks/extract-acp-file-diffs-from-update/paths-and-text.ts
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/paths-and-text.ts
 import { fileURLToPath } from "node:url";
 function readOptionalTextField(v) {
   if (v === null || v === void 0) return "";
@@ -29237,7 +29211,7 @@ function extractDiffPath(o) {
   return null;
 }
 
-// src/acp/hooks/extract-acp-file-diffs-from-update/push-diff.ts
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/push-diff.ts
 function pushDiffIfComplete(o, cwd, out) {
   const t = o.type;
   if (typeof t !== "string" || t.toLowerCase() !== "diff") return;
@@ -29250,7 +29224,7 @@ function pushDiffIfComplete(o, cwd, out) {
   out.push({ path: resolved.display, oldText, newText });
 }
 
-// src/acp/hooks/extract-acp-file-diffs-from-update/walk-update-for-diffs.ts
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/walk-update-for-diffs.ts
 var NEST_KEYS = [
   "content",
   "contents",
@@ -29289,7 +29263,7 @@ function walkValue(value, cwd, depth, out) {
   }
 }
 
-// src/acp/hooks/extract-acp-file-diffs-from-update/extract.ts
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/extract.ts
 function extractAcpFileDiffsFromUpdate(update, cwd) {
   if (!update || typeof update !== "object") return [];
   const u = update;
@@ -29303,7 +29277,7 @@ function extractAcpFileDiffsFromUpdate(update, cwd) {
   return [...byPath.values()];
 }
 
-// src/acp/hooks/extract-tool-target-paths.ts
+// src/agents/acp/hooks/extract-tool-target-paths.ts
 function addPath(cwd, raw, out) {
   if (typeof raw !== "string") return;
   const trimmed2 = raw.trim();
@@ -29381,10 +29355,10 @@ function extractToolTargetDisplayPaths(update, cwd) {
   return [...out];
 }
 
-// src/acp/hooks/bridge-on-session-update/constants.ts
+// src/agents/acp/hooks/bridge-on-session-update/constants.ts
 var PATH_SNAPSHOT_DEBOUNCE_MS = 500;
 
-// src/acp/hooks/bridge-on-session-update/tool-key.ts
+// src/agents/acp/hooks/bridge-on-session-update/tool-key.ts
 function getToolCallId(params) {
   if (!params || typeof params !== "object") return "";
   const u = params;
@@ -29406,7 +29380,7 @@ function accumulateToolPaths(toolKey, paths, acc) {
   for (const p of paths) s.add(p);
 }
 
-// src/acp/hooks/bridge-on-session-update/path-snapshot-tracker.ts
+// src/agents/acp/hooks/bridge-on-session-update/path-snapshot-tracker.ts
 var PathSnapshotTracker = class {
   lastSeenRunId;
   anonToolSeq = 0;
@@ -29528,7 +29502,7 @@ var PathSnapshotTracker = class {
   }
 };
 
-// src/acp/hooks/bridge-on-session-update/send-structured-file-changes.ts
+// src/agents/acp/hooks/bridge-on-session-update/send-structured-file-changes.ts
 function sendExtractedDiffsAsSessionFileChanges(diffs, send, cwd, sessionId, runId, sentPaths, log2) {
   for (const d of diffs) {
     try {
@@ -29578,7 +29552,7 @@ function sendGitHeadVsWorkspaceForToolPaths(mergedPaths, sentPaths, send, cwd, s
   }
 }
 
-// src/acp/hooks/bridge-on-session-update/create-bridge-on-session-update.ts
+// src/agents/acp/hooks/bridge-on-session-update/create-bridge-on-session-update.ts
 function createBridgeOnSessionUpdate(opts) {
   const { routing, getSendSessionUpdate, log: log2 } = opts;
   const pathTracker = new PathSnapshotTracker();
@@ -29652,7 +29626,7 @@ function createBridgeOnSessionUpdate(opts) {
   };
 }
 
-// src/acp/hooks/build-acp-session-bridge-hooks.ts
+// src/agents/acp/hooks/build-acp-session-bridge-hooks.ts
 function buildAcpSessionBridgeHooks(opts) {
   return {
     onFileChange: createBridgeOnFileChange(opts),
@@ -29661,7 +29635,7 @@ function buildAcpSessionBridgeHooks(opts) {
   };
 }
 
-// src/acp/ensure-acp-client.ts
+// src/agents/acp/ensure-acp-client.ts
 async function ensureAcpClient(options) {
   const { state, preferredAgentType, mode, cwd, routing, sendSessionUpdate, sendRequest, log: log2 } = options;
   const targetCwd = path9.resolve(
@@ -29747,7 +29721,7 @@ async function ensureAcpClient(options) {
   return state.acpStartPromise;
 }
 
-// src/acp/create-acp-manager.ts
+// src/agents/acp/create-acp-manager.ts
 async function createAcpManager(options) {
   const { log: log2 } = options;
   const state = {
@@ -29783,7 +29757,7 @@ async function createAcpManager(options) {
       mode,
       agentType,
       cwd,
-      sendResult,
+      sendResult: sendResult2,
       sendSessionUpdate
     } = opts;
     const preferredForPrompt = agentType ?? backendFallbackAgentType ?? null;
@@ -29807,7 +29781,7 @@ async function createAcpManager(options) {
         const evaluated = Boolean(preferredForPrompt && errMsg.trim());
         const suggestsAuth = evaluated ? localAgentErrorSuggestsAuth(preferredForPrompt, errMsg) : false;
         const auth = suggestsAuth && preferredForPrompt ? { agentAuthRequired: true, agentType: preferredForPrompt } : {};
-        sendResult({
+        sendResult2({
           type: "prompt_result",
           id: promptId,
           ...sessionId ? { sessionId } : {},
@@ -29827,7 +29801,7 @@ async function createAcpManager(options) {
           await handle.cancel?.();
         } catch {
         }
-        sendResult({
+        sendResult2({
           type: "prompt_result",
           id: promptId,
           ...sessionId ? { sessionId } : {},
@@ -29846,7 +29820,7 @@ async function createAcpManager(options) {
         runId,
         agentType: preferredForPrompt,
         agentCwd: cwd,
-        sendResult,
+        sendResult: sendResult2,
         sendSessionUpdate,
         log: log2
       });
@@ -29894,1375 +29868,633 @@ async function createAcpManager(options) {
   };
 }
 
-// src/bridge/routing/handlers/auth-token.ts
-var handleAuthToken = (msg, { log: log2 }) => {
-  if (typeof msg.token !== "string") return;
-  log2("Received auth token. Save it for future runs:");
-  log2(`  export BUILDAMATON_AUTH_TOKEN="${msg.token}"`);
-};
+// src/worktrees/session-worktree-manager.ts
+import * as path13 from "node:path";
+import os3 from "node:os";
 
-// src/bridge/routing/handlers/bridge-identified.ts
-var handleBridgeIdentified = (msg, deps) => {
-  if (typeof msg.bridgeName !== "string") return;
-  deps.onBridgeIdentified(
-    msg
-  );
-  setImmediate(() => {
-    void (async () => {
-      try {
-        await deps.reportAutoDetectedAgents?.();
-      } catch (e) {
-        deps.log(
-          `[Bridge service] Auto-detect agents failed: ${e instanceof Error ? e.message : String(e)}`
-        );
-      }
-    })();
-  });
-  setImmediate(() => {
-    try {
-      deps.sendLocalSkillsReport?.();
-    } catch (e) {
-      deps.log(
-        `[Bridge service] Local skills report failed: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  });
-};
+// src/worktrees/prepare-new-session-worktrees.ts
+import * as fs6 from "node:fs";
+import * as path11 from "node:path";
 
-// src/acp/from-bridge/handle-bridge-agent-config.ts
-function handleBridgeAgentConfig(msg, { acpManager }) {
-  if (!Array.isArray(msg.agents) || msg.agents.length === 0) return;
-  acpManager.setPreferredAgentType(msg.agents[0].type);
+// src/git/worktree-add.ts
+async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch) {
+  const mainGit = simpleGit(mainRepoPath);
+  await mainGit.raw(["worktree", "add", "-b", branch, worktreePath, "HEAD"]);
 }
 
-// src/bridge/routing/handlers/agent-config.ts
-var handleAgentConfigMessage = (msg, deps) => {
-  handleBridgeAgentConfig(msg, deps);
-};
-
-// src/acp/from-bridge/handle-bridge-prompt.ts
-import * as path11 from "node:path";
-import { execFile as execFile5 } from "node:child_process";
-import { promisify as promisify5 } from "node:util";
-
-// src/git/bridge-queue-key.ts
+// src/worktrees/worktree-layout-file.ts
+import * as fs5 from "node:fs";
 import * as path10 from "node:path";
-import { createHash } from "node:crypto";
-function normalizeCanonicalGitUrl(url2) {
-  let s = url2.trim();
-  if (!s) return s;
-  if (s.toLowerCase().endsWith(".git")) {
-    s = s.slice(0, -4);
+import os2 from "node:os";
+var LAYOUT_FILENAME = "worktree-launcher-layout.json";
+function defaultWorktreeLayoutPath() {
+  return path10.join(os2.homedir(), ".buildautomaton", LAYOUT_FILENAME);
+}
+function normalizeLoadedLayout(raw) {
+  if (raw && typeof raw === "object" && "launcherCwds" in raw) {
+    const j = raw;
+    if (Array.isArray(j.launcherCwds)) return { launcherCwds: j.launcherCwds };
   }
-  s = s.replace(/\/+$/, "");
-  const httpsMatch = /^(https?):\/\/([^/]+)(\/.*)?$/i.exec(s);
-  if (httpsMatch) {
-    const host = httpsMatch[2].toLowerCase();
-    const p = httpsMatch[3] ?? "";
-    s = `${httpsMatch[1].toLowerCase()}://${host}${p}`;
-  } else {
-    const sshMatch = /^git@([^:]+):(.+)$/i.exec(s);
-    if (sshMatch) {
-      const host = sshMatch[1].toLowerCase();
-      s = `git@${host}:${sshMatch[2]}`;
-    }
+  return { launcherCwds: [] };
+}
+function loadWorktreeLayout() {
+  try {
+    const p = defaultWorktreeLayoutPath();
+    if (!fs5.existsSync(p)) return { launcherCwds: [] };
+    const raw = JSON.parse(fs5.readFileSync(p, "utf8"));
+    return normalizeLoadedLayout(raw);
+  } catch {
+    return { launcherCwds: [] };
   }
-  return s;
 }
-function canonicalUrlToRepoIdSync(url2) {
-  const normalized = normalizeCanonicalGitUrl(url2);
-  return createHash("sha256").update(normalized).digest("hex").slice(0, 32);
+function saveWorktreeLayout(layout) {
+  try {
+    const dir = path10.dirname(defaultWorktreeLayoutPath());
+    fs5.mkdirSync(dir, { recursive: true });
+    fs5.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
+  } catch {
+  }
 }
-function fallbackRepoIdFromPath(absPath) {
-  return createHash("sha256").update(path10.resolve(absPath)).digest("hex").slice(0, 32);
+function baseNameSafe(abs) {
+  return path10.basename(abs).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
 }
-async function resolveBridgeQueueBindFields(options) {
-  const { effectiveCwd, worktreePaths, primaryRepoRoots, log: log2 } = options;
-  const cwdAbs = worktreePaths.length > 0 ? path10.resolve(worktreePaths[0]) : path10.resolve(effectiveCwd);
-  if (!primaryRepoRoots.length) {
-    log2("[Bridge service] Prompt queue bind skipped: no Git repository roots under the working directory.");
-    return null;
+function allocateDirNameForLauncherCwd(layout, launcherCwdAbs) {
+  const norm = path10.resolve(launcherCwdAbs);
+  const existing = layout.launcherCwds.find((e) => path10.resolve(e.absolutePath) === norm);
+  if (existing) return existing.dirName;
+  const base = baseNameSafe(norm);
+  const used = new Set(layout.launcherCwds.map((e) => e.dirName));
+  let name = base;
+  let n = 2;
+  while (used.has(name)) {
+    name = `${base}-${n}`;
+    n += 1;
   }
-  let primaryRoot = primaryRepoRoots[0];
-  let remote = await getRemoteOriginUrl(primaryRoot);
-  if (!remote) {
-    for (const r of primaryRepoRoots.slice(1)) {
-      const u = await getRemoteOriginUrl(r);
-      if (u) {
-        primaryRoot = r;
-        remote = u;
-        break;
-      }
-    }
-  }
-  const repoId = remote ? canonicalUrlToRepoIdSync(remote) : fallbackRepoIdFromPath(primaryRoot);
-  const canonicalQueueKey = `repo:${repoId}::cwd:${cwdAbs}`;
-  return { canonicalQueueKey, repoId, cwdAbs };
+  layout.launcherCwds.push({ absolutePath: norm, dirName: name });
+  saveWorktreeLayout(layout);
+  return name;
 }
 
-// src/acp/from-bridge/handle-bridge-prompt.ts
-var execFileAsync5 = promisify5(execFile5);
-async function readGitBranch(cwd) {
-  try {
-    const { stdout } = await execFileAsync5("git", ["branch", "--show-current"], { cwd, maxBuffer: 64 * 1024 });
-    const b = stdout.trim();
-    return b || null;
-  } catch {
+// src/worktrees/prepare-new-session-worktrees.ts
+async function prepareNewSessionWorktrees(options) {
+  const { rootAbs, launcherCwd, sessionId, layout, log: log2 } = options;
+  const launcherResolved = path11.resolve(launcherCwd);
+  const cwdKey = allocateDirNameForLauncherCwd(layout, launcherResolved);
+  const agentMirrorRoot = path11.join(rootAbs, cwdKey);
+  const repos = await discoverGitReposUnderRoot(launcherResolved);
+  if (repos.length === 0) {
+    log2("[worktrees] No Git repositories under launcher working directory; skipping worktree creation.");
     return null;
   }
-}
-function handleBridgePrompt(msg, deps) {
-  const { getWs, log: log2, acpManager, sessionWorktreeManager } = deps;
-  const rawPrompt = msg.prompt;
-  const promptText = typeof rawPrompt === "string" ? rawPrompt : rawPrompt != null ? String(rawPrompt) : "";
-  if (!promptText.trim()) {
-    log2(
-      `[Bridge service] Prompt ignored: empty or missing prompt text (session ${typeof msg.sessionId === "string" ? msg.sessionId.slice(0, 8) : "\u2014"}\u2026, run ${typeof msg.runId === "string" ? msg.runId.slice(0, 8) : "\u2014"}\u2026).`
-    );
-    return;
-  }
-  const sessionId = msg.sessionId;
-  const isNewSession = msg.isNewSession === true;
-  const sessionWorktreesEnabled = msg.sessionWorktreesEnabled === true;
-  const agentType = typeof msg.agentType === "string" && msg.agentType.trim() ? msg.agentType.trim() : void 0;
-  const runId = typeof msg.runId === "string" ? msg.runId : void 0;
-  const mode = typeof msg.mode === "string" && msg.mode.trim() ? msg.mode.trim() : void 0;
-  acpManager.logPromptReceivedFromBridge({ agentType, mode });
-  const sendResult = (result) => {
-    const s = getWs();
-    if (s) sendWsMessage(s, result);
-  };
-  const sendSessionUpdate = (payload) => {
-    const s = getWs();
-    if (!s) {
-      log2("[Bridge service] Session update not sent: not connected to the bridge.");
-      return;
-    }
-    const p = payload;
-    sendWsMessage(s, payload);
-  };
-  async function preambleAndPrompt(resolvedCwd) {
-    const s = getWs();
-    const effectiveCwd = path11.resolve(resolvedCwd ?? getBridgeWorkspaceDirectory());
-    const worktreePaths = sessionWorktreeManager.getWorktreePathsForSession(sessionId) ?? [];
-    const repoRoots = await resolveSnapshotRepoRoots({
-      worktreePaths,
-      fallbackCwd: effectiveCwd,
-      log: log2
-    });
-    if (s && sessionId) {
-      const bind = await resolveBridgeQueueBindFields({
-        effectiveCwd,
-        worktreePaths,
-        primaryRepoRoots: repoRoots,
-        log: log2
-      });
-      if (bind) {
-        sendWsMessage(s, {
-          type: "bridge_queue_bind",
-          sessionId,
-          canonicalQueueKey: bind.canonicalQueueKey,
-          repoId: bind.repoId,
-          cwdAbs: bind.cwdAbs
-        });
-      }
-    }
-    if (s && sessionId) {
-      const cliGitBranch = await readGitBranch(effectiveCwd);
-      sendWsMessage(s, {
-        type: "session_git_context_report",
-        sessionId,
-        cliGitBranch,
-        agentUsesWorktree: sessionWorktreeManager.usesWorktreeSession(sessionId)
-      });
-    }
-    if (s && sessionId && runId) {
-      const cap = repoRoots.length > 0 ? await capturePreTurnSnapshot({ runId, repoRoots, agentCwd: effectiveCwd, log: log2 }) : { ok: false, error: "No git repos" };
-      sendWsMessage(s, {
-        type: "pre_turn_snapshot_report",
-        sessionId,
-        turnId: runId,
-        captured: cap.ok
-      });
+  const branch = `session-${sessionId}`;
+  const worktreePaths = [];
+  fs6.mkdirSync(agentMirrorRoot, { recursive: true });
+  for (const repo of repos) {
+    let rel = path11.relative(launcherResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path11.isAbsolute(rel)) continue;
+    const relNorm = rel === "" ? "." : rel;
+    const wtPath = path11.join(agentMirrorRoot, relNorm, sessionId);
+    fs6.mkdirSync(path11.dirname(wtPath), { recursive: true });
+    try {
+      await gitWorktreeAddBranch(repo.absolutePath, wtPath, branch);
+      log2(`[worktrees] Added worktree ${wtPath} (branch ${branch}).`);
+      worktreePaths.push(wtPath);
+    } catch (e) {
+      log2(
+        `[worktrees] Worktree add failed for ${repo.absolutePath}: ${e instanceof Error ? e.message : String(e)}`
+      );
     }
-    acpManager.handlePrompt({
-      promptText,
-      promptId: msg.id,
-      sessionId,
-      runId,
-      mode,
-      agentType,
-      cwd: effectiveCwd,
-      sendResult,
-      sendSessionUpdate
-    });
   }
-  void sessionWorktreeManager.resolveCwdForPrompt(sessionId, { isNewSession, sessionWorktreesEnabled }).then((cwd) => preambleAndPrompt(cwd)).catch((err) => {
-    log2(`[Agent] Worktree resolve failed: ${err instanceof Error ? err.message : String(err)}`);
-    void preambleAndPrompt(void 0);
-  });
+  if (worktreePaths.length === 0) return null;
+  return { worktreePaths, agentCwd: agentMirrorRoot };
 }
 
-// src/bridge/routing/handlers/prompt.ts
-var handlePromptMessage = (msg, deps) => {
-  handleBridgePrompt(msg, deps);
-};
+// src/git/rename-branch.ts
+async function gitRenameCurrentBranch(repoDir, newName) {
+  const g = simpleGit(repoDir);
+  await g.raw(["branch", "-m", newName]);
+}
 
-// src/acp/from-bridge/handle-bridge-cancel-run.ts
-function handleBridgeCancelRun(msg, { log: log2, acpManager }) {
-  const runId = msg.runId;
-  if (!runId) return;
-  void acpManager.cancelRun(runId).then((sent) => {
-    if (!sent) {
+// src/worktrees/rename-session-worktree-branches.ts
+async function renameSessionWorktreeBranches(paths, newBranch, log2) {
+  const safe = newBranch.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "session-branch";
+  for (const wt of paths) {
+    try {
+      await gitRenameCurrentBranch(wt, safe);
+      log2(`[worktrees] Renamed branch in ${wt} \u2192 ${safe}`);
+    } catch (e) {
       log2(
-        `[Agent] Cancel ignored for run ${runId.slice(0, 8)}\u2026 (no active run or cancel not available).`
+        `[worktrees] Branch rename failed in ${wt}: ${e instanceof Error ? e.message : String(e)}`
       );
     }
-  });
+  }
 }
 
-// src/bridge/routing/handlers/cancel-run.ts
-var handleCancelRunMessage = (msg, deps) => {
-  handleBridgeCancelRun(msg, deps);
-};
-
-// src/acp/from-bridge/handle-bridge-cursor-request-response.ts
-function handleBridgeCursorRequestResponse(msg, { acpManager }) {
-  if (typeof msg.requestId !== "string") return;
-  acpManager.resolveRequest(msg.requestId, msg.result ?? {});
-}
+// src/worktrees/remove-session-worktrees.ts
+import * as fs9 from "node:fs";
 
-// src/bridge/routing/handlers/cursor-request-response.ts
-var handleCursorRequestResponseMessage = (msg, deps) => {
-  handleBridgeCursorRequestResponse(msg, deps);
-};
+// src/git/worktree-remove.ts
+import * as fs8 from "node:fs";
 
-// src/skills/handle-skill-call.ts
-function handleSkillCall(msg, socket, log2) {
-  callSkill(msg.skillId, msg.operationId, msg.params ?? {}).then((result) => {
-    sendWsMessage(socket, { type: "skill_result", id: msg.id, result });
-  }).catch((err) => {
-    sendWsMessage(socket, { type: "skill_result", id: msg.id, error: String(err) });
-    log2(`[Bridge service] Skill invocation failed (${msg.skillId}/${msg.operationId}): ${err}`);
-  });
+// src/git/resolve-main-repo-from-git-file.ts
+import * as fs7 from "node:fs";
+import * as path12 from "node:path";
+function resolveMainRepoFromWorktreeGitFile(wt) {
+  const gitDirFile = path12.join(wt, ".git");
+  if (!fs7.existsSync(gitDirFile) || !fs7.statSync(gitDirFile).isFile()) return "";
+  const first2 = fs7.readFileSync(gitDirFile, "utf8").trim();
+  const m = first2.match(/^gitdir:\s*(.+)$/im);
+  if (!m) return "";
+  const gitWorktreePath = path12.resolve(wt, m[1].trim());
+  const gitDir = path12.dirname(path12.dirname(gitWorktreePath));
+  return path12.dirname(gitDir);
 }
 
-// src/bridge/routing/handlers/skill-call.ts
-var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
-  if (!msg.skillId || msg.operationId === void 0) return;
-  const socket = getWs();
-  if (!socket) return;
-  handleSkillCall(
-    msg,
-    socket,
-    log2
-  );
-};
-
-// src/files/list-dir.ts
-import fs5 from "node:fs";
-import path13 from "node:path";
-
-// src/files/ensure-under-cwd.ts
-import path12 from "node:path";
-function ensureUnderCwd(relativePath, cwd = getBridgeWorkspaceDirectory()) {
-  const normalized = path12.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path12.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path12.sep) && resolved !== cwd) {
-    return null;
+// src/git/worktree-remove.ts
+async function gitWorktreeRemoveForce(worktreePath) {
+  const mainRepo = resolveMainRepoFromWorktreeGitFile(worktreePath);
+  if (mainRepo) {
+    await simpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
+  } else {
+    fs8.rmSync(worktreePath, { recursive: true, force: true });
   }
-  return resolved;
 }
 
-// src/files/list-dir.ts
-function listDir(relativePath) {
-  const resolved = ensureUnderCwd(relativePath || ".", getBridgeWorkspaceDirectory());
-  if (!resolved) {
-    return { error: "Path is outside working directory" };
-  }
-  try {
-    const names = fs5.readdirSync(resolved, { withFileTypes: true });
-    const entries = names.filter((d) => !d.name.startsWith(".")).map((d) => {
-      const entryPath = path13.join(relativePath || ".", d.name).replace(/\\/g, "/");
-      const fullPath = path13.join(resolved, d.name);
-      let isDir = d.isDirectory();
-      if (d.isSymbolicLink()) {
-        try {
-          const targetStat = fs5.statSync(fullPath);
-          isDir = targetStat.isDirectory();
-        } catch {
-          isDir = false;
-        }
+// src/worktrees/remove-session-worktrees.ts
+async function removeSessionWorktrees(paths, log2) {
+  for (const wt of paths) {
+    try {
+      await gitWorktreeRemoveForce(wt);
+      log2(`[worktrees] Removed worktree ${wt}`);
+    } catch (e) {
+      log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
+      try {
+        fs9.rmSync(wt, { recursive: true, force: true });
+      } catch {
       }
-      return {
-        name: d.name,
-        path: entryPath,
-        isDir,
-        isSymlink: d.isSymbolicLink()
-      };
-    }).sort((a, b) => {
-      if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
-      return a.name.localeCompare(b.name, void 0, { sensitivity: "base" });
-    });
-    return { entries };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    return { error: message };
+    }
   }
 }
 
-// src/files/read-file.ts
-import fs6 from "node:fs";
-import { StringDecoder } from "node:string_decoder";
-function resolveFilePath(relativePath) {
-  const resolved = ensureUnderCwd(relativePath, getBridgeWorkspaceDirectory());
-  if (!resolved) return { error: "Path is outside working directory" };
-  let real;
+// src/git/working-tree-status.ts
+async function commitsAheadOfUpstream(repoDir) {
+  const g = simpleGit(repoDir);
   try {
-    real = fs6.realpathSync(resolved);
+    await g.raw(["rev-parse", "--verify", "@{u}"]);
   } catch {
-    real = resolved;
+    return 0;
   }
-  const stat2 = fs6.statSync(real);
-  if (!stat2.isFile()) return { error: "Not a file" };
-  return real;
+  const out = await g.raw(["rev-list", "--count", "@{u}..HEAD"]);
+  const n = parseInt(String(out).trim(), 10);
+  return Number.isNaN(n) ? 0 : n;
 }
-var LINE_CHUNK_SIZE = 64 * 1024;
-function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const fileSize = fs6.statSync(filePath).size;
-  const fd = fs6.openSync(filePath, "r");
-  const bufSize = 64 * 1024;
-  const buf = Buffer.alloc(bufSize);
-  const decoder = new StringDecoder("utf8");
-  let currentLine = 0;
-  const resultLines = [];
-  let partial2 = "";
-  let done = false;
-  let skipLine0Chars = typeof lineOffsetIn === "number" ? lineOffsetIn : 0;
-  let line0CharsReturned = 0;
-  let line0Accum = "";
-  try {
-    let bytesRead;
-    while (!done && (bytesRead = fs6.readSync(fd, buf, 0, bufSize, null)) > 0) {
-      const text = partial2 + decoder.write(buf.subarray(0, bytesRead));
-      partial2 = "";
-      let lineStart = 0;
-      for (let i = 0; i < text.length; i++) {
-        if (text[i] === "\n") {
-          const lineContent = (() => {
-            let lineEnd = i;
-            if (lineEnd > lineStart && text[lineEnd - 1] === "\r") lineEnd--;
-            return text.slice(lineStart, lineEnd);
-          })();
-          if (currentLine === 0 && (startLine === 0 || lineOffsetIn !== void 0)) {
-            line0Accum += lineContent;
-            const totalLine0 = line0Accum.length;
-            if (skipLine0Chars > 0) {
-              if (totalLine0 <= skipLine0Chars) {
-                skipLine0Chars -= totalLine0;
-                line0Accum = "";
-                currentLine++;
-                lineStart = i + 1;
-                if (currentLine > endLine) {
-                  done = true;
-                  break;
-                }
-                continue;
-              }
-              const from = skipLine0Chars;
-              const take = Math.min(lineChunkSize, totalLine0 - from);
-              resultLines.push(line0Accum.slice(from, from + take));
-              line0CharsReturned += take;
-              if (from + take < totalLine0) {
-                return {
-                  content: resultLines.join("\n"),
-                  size: fileSize,
-                  lineOffset: lineOffsetIn + line0CharsReturned,
-                  totalLines: 1
-                };
-              }
-              line0Accum = "";
-              skipLine0Chars = 0;
-              line0CharsReturned = 0;
-            } else if (totalLine0 > lineChunkSize) {
-              resultLines.push(line0Accum.slice(0, lineChunkSize));
-              return {
-                content: resultLines.join("\n"),
-                size: fileSize,
-                lineOffset: lineChunkSize,
-                totalLines: 1
-              };
-            } else {
-              resultLines.push(line0Accum);
-              line0Accum = "";
-            }
-          } else if (currentLine >= startLine && currentLine <= endLine) {
-            resultLines.push(lineContent);
-          }
-          currentLine++;
-          lineStart = i + 1;
-          if (currentLine > endLine) {
-            done = true;
-            break;
-          }
-        }
-      }
-      if (!done) {
-        const lineContent = text.slice(lineStart);
-        if (currentLine === 0 && (startLine === 0 || lineOffsetIn !== void 0)) {
-          line0Accum += lineContent;
-          const totalLine0 = line0Accum.length;
-          if (skipLine0Chars > 0) {
-            if (totalLine0 <= skipLine0Chars) {
-              skipLine0Chars -= totalLine0;
-              line0Accum = "";
-            } else {
-              const from = skipLine0Chars;
-              const take = Math.min(lineChunkSize, totalLine0 - from);
-              resultLines.push(line0Accum.slice(from, from + take));
-              return {
-                content: resultLines.join("\n"),
-                size: fileSize,
-                lineOffset: (lineOffsetIn ?? 0) + take,
-                totalLines: 1
-              };
-            }
-          } else if (totalLine0 > lineChunkSize) {
-            resultLines.push(line0Accum.slice(0, lineChunkSize));
-            return {
-              content: resultLines.join("\n"),
-              size: fileSize,
-              lineOffset: lineChunkSize,
-              totalLines: 1
-            };
-          }
-        }
-        partial2 = text.slice(lineStart);
-      }
-    }
-    if (!done) {
-      const tail = partial2 + decoder.end();
-      if (currentLine === 0 && (startLine === 0 || lineOffsetIn !== void 0) && tail.length > 0) {
-        line0Accum += tail.endsWith("\r") ? tail.slice(0, -1) : tail;
-        const totalLine0 = line0Accum.length;
-        if (skipLine0Chars > 0) {
-          if (totalLine0 <= skipLine0Chars) {
-            return { content: resultLines.join("\n"), size: fileSize };
-          }
-          const from = skipLine0Chars;
-          const take = Math.min(lineChunkSize, totalLine0 - from);
-          resultLines.push(line0Accum.slice(from, from + take));
-          line0CharsReturned += take;
-          if (from + take < totalLine0) {
-            return {
-              content: resultLines.join("\n"),
-              size: fileSize,
-              lineOffset: (lineOffsetIn ?? 0) + line0CharsReturned,
-              totalLines: 1
-            };
-          }
-        } else if (totalLine0 > lineChunkSize) {
-          resultLines.push(line0Accum.slice(0, lineChunkSize));
-          return {
-            content: resultLines.join("\n"),
-            size: fileSize,
-            lineOffset: lineChunkSize,
-            totalLines: 1
-          };
-        } else {
-          resultLines.push(line0Accum);
-        }
-      } else if (tail.length > 0 && currentLine >= startLine && currentLine <= endLine) {
-        resultLines.push(tail.endsWith("\r") ? tail.slice(0, -1) : tail);
-      }
-    }
-    return { content: resultLines.join("\n"), size: fileSize };
-  } finally {
-    fs6.closeSync(fd);
+async function getRepoWorkingTreeStatus(repoDir) {
+  const g = simpleGit(repoDir);
+  const st = await g.status();
+  const hasUncommittedChanges = (st.files?.length ?? 0) > 0;
+  const ahead = await commitsAheadOfUpstream(repoDir);
+  return { hasUncommittedChanges, hasUnpushedCommits: ahead > 0 };
+}
+async function aggregateSessionPathsWorkingTreeStatus(paths) {
+  let hasUncommittedChanges = false;
+  let hasUnpushedCommits = false;
+  for (const p of paths) {
+    const s = await getRepoWorkingTreeStatus(p);
+    if (s.hasUncommittedChanges) hasUncommittedChanges = true;
+    if (s.hasUnpushedCommits) hasUnpushedCommits = true;
   }
+  return { hasUncommittedChanges, hasUnpushedCommits };
 }
-function readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize = LINE_CHUNK_SIZE) {
-  try {
-    const result = resolveFilePath(relativePath);
-    if (typeof result === "object") return result;
-    const hasRange = typeof startLine === "number" && typeof endLine === "number";
-    if (hasRange) {
-      return readFileRange(result, startLine, endLine, lineOffset, lineChunkSize);
-    }
-    const stat2 = fs6.statSync(result);
-    const raw = fs6.readFileSync(result, "utf8");
-    const lines = raw.split(/\r?\n/);
-    return { content: raw, totalLines: lines.length, size: stat2.size };
-  } catch (err) {
-    return { error: err instanceof Error ? err.message : String(err) };
+async function pushAheadOfUpstreamForPaths(paths) {
+  for (const p of paths) {
+    const g = simpleGit(p);
+    const ahead = await commitsAheadOfUpstream(p);
+    if (ahead <= 0) continue;
+    await g.push();
   }
 }
 
-// src/files/file-index.ts
-import fs7 from "node:fs";
-import path14 from "node:path";
-import os2 from "node:os";
-import crypto2 from "node:crypto";
-var INDEX_DIR = path14.join(os2.homedir(), ".buildautomaton");
-var HASH_LEN = 16;
-var INDEX_VERSION = 2;
-function getIndexPath(cwd) {
-  const hash = crypto2.createHash("sha256").update(cwd).digest("hex").slice(0, HASH_LEN);
-  return path14.join(INDEX_DIR, `.file-index-${hash}.json`);
-}
-function getTrigrams(s) {
-  const lower = s.toLowerCase();
-  const out = [];
-  for (let i = 0; i <= lower.length - 3; i++) {
-    out.push(lower.slice(i, i + 3));
+// src/git/commit-and-push.ts
+async function gitCommitAllIfDirty(repoDir, message, options) {
+  const g = simpleGit(repoDir);
+  const st = await g.status();
+  if (!st.files?.length) return;
+  const branch = options.branch.trim();
+  if (!branch) {
+    throw new Error("Branch name is required");
   }
-  return out;
-}
-function intersectSortedSets(arrays) {
-  if (arrays.length === 0) return [];
-  if (arrays.length === 1) return arrays[0];
-  const byLength = arrays.slice().sort((a, b) => a.length - b.length);
-  const smallest = byLength[0];
-  const rest = byLength.slice(1);
-  const result = [];
-  for (const idx of smallest) {
-    if (rest.every((arr) => binarySearch(arr, idx) >= 0)) {
-      result.push(idx);
-    }
+  const branches = await g.branchLocal();
+  const localNames = new Set(branches.all.map((b) => b.replace(/^\*\s*/, "").trim()));
+  if (!localNames.has(branch)) {
+    await g.checkoutLocalBranch(branch);
+  } else {
+    await g.checkout(branch);
   }
-  return result;
-}
-function binarySearch(arr, x) {
-  let lo = 0;
-  let hi = arr.length - 1;
-  while (lo <= hi) {
-    const mid = lo + hi >>> 1;
-    if (arr[mid] < x) lo = mid + 1;
-    else if (arr[mid] > x) hi = mid - 1;
-    else return mid;
+  await g.add(".");
+  await g.commit(message);
+  if (options.push) {
+    await g.push(["-u", "origin", branch]);
   }
-  return -1;
 }
-function walkDir(dir, baseDir, out) {
-  let names;
+
+// src/worktrees/commit-session-worktrees.ts
+async function commitSessionWorktrees(options) {
+  const { paths, branch, message, push } = options;
   try {
-    names = fs7.readdirSync(dir);
-  } catch {
-    return;
-  }
-  for (const name of names) {
-    if (name.startsWith(".")) continue;
-    const full = path14.join(dir, name);
-    let stat2;
-    try {
-      stat2 = fs7.statSync(full);
-    } catch {
-      continue;
-    }
-    const relative4 = path14.relative(baseDir, full).replace(/\\/g, "/");
-    if (stat2.isDirectory()) {
-      walkDir(full, baseDir, out);
-    } else if (stat2.isFile()) {
-      out.push(relative4);
-    }
-  }
-}
-function buildFileIndex(cwd) {
-  const resolved = path14.resolve(cwd);
-  const paths = [];
-  walkDir(resolved, resolved, paths);
-  paths.sort((a, b) => a.localeCompare(b, void 0, { sensitivity: "base" }));
-  const trigramIndex = {};
-  for (let i = 0; i < paths.length; i++) {
-    const trigrams = getTrigrams(paths[i]);
-    const seen = /* @__PURE__ */ new Set();
-    for (const tri of trigrams) {
-      if (seen.has(tri)) continue;
-      seen.add(tri);
-      if (!trigramIndex[tri]) trigramIndex[tri] = [];
-      trigramIndex[tri].push(i);
+    for (const wt of paths) {
+      await gitCommitAllIfDirty(wt, message, { push, branch });
     }
-  }
-  const data = { version: INDEX_VERSION, paths, trigramIndex };
-  const indexPath = getIndexPath(resolved);
-  try {
-    if (!fs7.existsSync(INDEX_DIR)) fs7.mkdirSync(INDEX_DIR, { recursive: true });
-    fs7.writeFileSync(indexPath, JSON.stringify(data), "utf8");
+    return { ok: true };
   } catch (e) {
-    console.error("[file-index] Failed to write index:", e);
+    const err = e instanceof Error ? e.message : String(e);
+    return { ok: false, error: err };
   }
-  return data;
 }
-function loadFileIndex(cwd) {
-  const resolved = path14.resolve(cwd);
-  const indexPath = getIndexPath(resolved);
-  try {
-    const raw = fs7.readFileSync(indexPath, "utf8");
-    const parsed = JSON.parse(raw);
-    if (parsed !== null && typeof parsed === "object" && Array.isArray(parsed.paths)) {
-      const obj = parsed;
-      if (obj.version === INDEX_VERSION && obj.trigramIndex && typeof obj.trigramIndex === "object") {
-        return obj;
-      }
-      return buildFileIndex(resolved);
+
+// src/worktrees/session-worktree-manager.ts
+var SessionWorktreeManager = class {
+  rootAbs;
+  log;
+  bridgeWantsWorktrees = false;
+  sessionPaths = /* @__PURE__ */ new Map();
+  sessionAgentCwd = /* @__PURE__ */ new Map();
+  layout;
+  constructor(options) {
+    this.rootAbs = options.worktreesRootAbs;
+    this.log = options.log;
+    this.layout = loadWorktreeLayout();
+  }
+  setBridgeSessionWorktrees(enabled) {
+    this.bridgeWantsWorktrees = enabled;
+  }
+  effective() {
+    return this.bridgeWantsWorktrees;
+  }
+  /**
+   * Returns cwd for the agent (mirror of launcher tree), or undefined to use the bridge workspace directory.
+   */
+  async resolveCwdForPrompt(sessionId, opts) {
+    if (!sessionId || !this.effective() || !opts.sessionWorktreesEnabled) {
+      return void 0;
     }
-    if (Array.isArray(parsed) && parsed.every((p) => typeof p === "string")) {
-      return buildFileIndex(resolved);
+    if (!opts.isNewSession) {
+      const agentCwd = this.sessionAgentCwd.get(sessionId);
+      if (agentCwd) return path13.resolve(agentCwd);
+      return void 0;
     }
-    return null;
-  } catch {
-    return null;
+    const prep = await prepareNewSessionWorktrees({
+      rootAbs: this.rootAbs,
+      launcherCwd: getBridgeWorkspaceDirectory(),
+      sessionId,
+      layout: this.layout,
+      log: this.log
+    });
+    if (!prep) return void 0;
+    this.sessionPaths.set(sessionId, prep.worktreePaths);
+    this.sessionAgentCwd.set(sessionId, prep.agentCwd);
+    return path13.resolve(prep.agentCwd);
   }
-}
-function ensureFileIndex(cwd) {
-  const resolved = path14.resolve(cwd);
-  const cached2 = loadFileIndex(resolved);
-  if (cached2 !== null) return { data: cached2, fromCache: true };
-  const data = buildFileIndex(resolved);
-  return { data, fromCache: false };
-}
-function searchFileIndex(index, query, limit = 100) {
-  const q = query.trim().toLowerCase();
-  if (!q) return [];
-  const { paths, trigramIndex } = index;
-  let candidateIndices;
-  if (q.length < 3) {
-    candidateIndices = paths.map((_, i) => i).filter((i) => paths[i].toLowerCase().includes(q));
-  } else {
-    const trigrams = getTrigrams(q);
-    if (trigrams.length === 0) {
-      candidateIndices = paths.map((_, i) => i).filter((i) => paths[i].toLowerCase().includes(q));
-    } else {
-      const arrays = trigrams.map((tri) => trigramIndex[tri]).filter((arr) => arr != null && arr.length > 0);
-      if (arrays.length === 0) return [];
-      candidateIndices = intersectSortedSets(arrays);
-    }
+  async renameSessionBranch(sessionId, newBranch) {
+    const paths = this.sessionPaths.get(sessionId);
+    if (!paths?.length) return;
+    await renameSessionWorktreeBranches(paths, newBranch, this.log);
   }
-  const out = [];
-  for (const i of candidateIndices) {
-    const p = paths[i];
-    if (p.toLowerCase().includes(q)) {
-      out.push(p);
-      if (out.length >= limit) break;
-    }
+  /** True when this session runs in an isolated worktree mirror (not launcher cwd). */
+  usesWorktreeSession(sessionId) {
+    if (!sessionId) return false;
+    return this.sessionAgentCwd.has(sessionId);
   }
-  return out;
-}
-
-// src/files/handle-file-browser-search.ts
-var SEARCH_LIMIT = 100;
-function handleFileBrowserSearch(msg, socket) {
-  const q = typeof msg.q === "string" ? msg.q : "";
-  const cwd = getBridgeWorkspaceDirectory();
-  const index = loadFileIndex(cwd);
-  if (index === null) {
-    sendWsMessage(socket, {
-      type: "file_browser_search_response",
-      id: msg.id,
-      paths: [],
-      indexReady: false
+  getWorktreePathsForSession(sessionId) {
+    if (!sessionId) return void 0;
+    const paths = this.sessionPaths.get(sessionId);
+    return paths?.length ? [...paths] : void 0;
+  }
+  /** Session mirror root (parent of per-repo worktrees), when using worktrees for this session. */
+  getAgentCwdForSession(sessionId) {
+    if (!sessionId) return null;
+    const c = this.sessionAgentCwd.get(sessionId);
+    return c ? path13.resolve(c) : null;
+  }
+  async removeSessionWorktrees(sessionId) {
+    const paths = this.sessionPaths.get(sessionId);
+    this.sessionPaths.delete(sessionId);
+    this.sessionAgentCwd.delete(sessionId);
+    if (!paths?.length) return;
+    await removeSessionWorktrees(paths, this.log);
+  }
+  async commitSession(params) {
+    const paths = this.sessionPaths.get(params.sessionId);
+    const targets = paths?.length ? paths : [getBridgeWorkspaceDirectory()];
+    return commitSessionWorktrees({
+      paths: targets,
+      branch: params.branch,
+      message: params.message,
+      push: params.push
     });
-    return;
   }
-  const results = searchFileIndex(index, q, SEARCH_LIMIT);
-  sendWsMessage(socket, {
-    type: "file_browser_search_response",
-    id: msg.id,
-    paths: results,
-    indexReady: true
-  });
-}
-function triggerFileIndexBuild() {
-  setImmediate(() => {
+  resolveCommitTargets(sessionId) {
+    const paths = this.sessionPaths.get(sessionId);
+    return paths?.length ? paths : [getBridgeWorkspaceDirectory()];
+  }
+  async getSessionWorkingTreeStatus(sessionId) {
+    return aggregateSessionPathsWorkingTreeStatus(this.resolveCommitTargets(sessionId));
+  }
+  async pushSessionUpstream(sessionId) {
     try {
-      ensureFileIndex(getBridgeWorkspaceDirectory());
+      await pushAheadOfUpstreamForPaths(this.resolveCommitTargets(sessionId));
+      return { ok: true };
     } catch (e) {
-      console.error("[file-index] Background build failed:", e);
-    }
-  });
-}
-
-// src/files/handle-file-browser-request.ts
-function handleFileBrowserRequest(msg, socket) {
-  const reqPath = msg.path.replace(/^\/+/, "") || ".";
-  const op = msg.op === "read" ? "read" : "list";
-  if (op === "list") {
-    const result = listDir(reqPath);
-    if ("error" in result) {
-      sendWsMessage(socket, { type: "file_browser_response", id: msg.id, error: result.error });
-    } else {
-      sendWsMessage(socket, { type: "file_browser_response", id: msg.id, entries: result.entries });
-      if (reqPath === "." || reqPath === "") {
-        triggerFileIndexBuild();
-      }
-    }
-  } else {
-    const startLine = typeof msg.startLine === "number" ? msg.startLine : void 0;
-    const endLine = typeof msg.endLine === "number" ? msg.endLine : void 0;
-    const lineOffset = typeof msg.lineOffset === "number" ? msg.lineOffset : void 0;
-    const lineChunkSize = typeof msg.lineChunkSize === "number" ? msg.lineChunkSize : void 0;
-    const result = readFile2(reqPath, startLine, endLine, lineOffset, lineChunkSize);
-    if ("error" in result) {
-      sendWsMessage(socket, { type: "file_browser_response", id: msg.id, error: result.error });
-    } else {
-      const payload = {
-        type: "file_browser_response",
-        id: msg.id,
-        content: result.content,
-        totalLines: result.totalLines,
-        size: result.size
-      };
-      if (result.lineOffset != null) payload.lineOffset = result.lineOffset;
-      sendWsMessage(socket, payload);
+      const err = e instanceof Error ? e.message : String(e);
+      return { ok: false, error: err };
     }
   }
+};
+function defaultWorktreesRootAbs() {
+  return path13.join(os3.homedir(), ".buildautomaton", "worktrees");
 }
 
-// src/bridge/routing/handlers/file-browser-messages.ts
-function handleFileBrowserRequestMessage(msg, { getWs }) {
-  if (typeof msg.id !== "string" || typeof msg.path !== "string") return;
-  const socket = getWs();
-  if (!socket) return;
-  handleFileBrowserRequest(
-    msg,
-    socket
-  );
-}
-function handleFileBrowserSearchMessage(msg, { getWs }) {
-  if (typeof msg.id !== "string") return;
-  const socket = getWs();
-  if (!socket) return;
-  handleFileBrowserSearch(msg, socket);
+// src/files/watch-file-index.ts
+import { watch } from "node:fs";
+import path20 from "node:path";
+
+// src/files/index/build-file-index.ts
+import path17 from "node:path";
+
+// src/runtime/yield-to-event-loop.ts
+function yieldToEventLoop() {
+  return new Promise((resolve14) => setImmediate(resolve14));
 }
 
-// src/skills/discover-local-agent-skills.ts
-import fs8 from "node:fs";
+// src/files/index/walk-workspace-tree.ts
+import fs10 from "node:fs";
 import path15 from "node:path";
-var SKILL_DISCOVERY_ROOTS = [".agents/skills", ".claude/skills", ".cursor/skills", "skills"];
-function discoverLocalSkills(cwd) {
-  const out = [];
-  const seenKeys = /* @__PURE__ */ new Set();
-  for (const rel of SKILL_DISCOVERY_ROOTS) {
-    const base = path15.join(cwd, rel);
-    if (!fs8.existsSync(base) || !fs8.statSync(base).isDirectory()) continue;
-    let entries = [];
+
+// src/files/index/constants.ts
+import path14 from "node:path";
+import os4 from "node:os";
+var INDEX_WORK_YIELD_EVERY = 256;
+var INDEX_DIR = path14.join(os4.homedir(), ".buildautomaton");
+var INDEX_HASH_LEN = 16;
+var INDEX_VERSION = 2;
+var INDEX_LOG_PREFIX = "[file-index]";
+
+// src/files/index/walk-workspace-tree.ts
+function walkWorkspaceTreeSync(dir, baseDir, out) {
+  let names;
+  try {
+    names = fs10.readdirSync(dir);
+  } catch {
+    return;
+  }
+  for (const name of names) {
+    if (name.startsWith(".")) continue;
+    const full = path15.join(dir, name);
+    let stat2;
     try {
-      entries = fs8.readdirSync(base);
+      stat2 = fs10.statSync(full);
     } catch {
       continue;
     }
-    for (const name of entries) {
-      const dir = path15.join(base, name);
-      try {
-        if (!fs8.statSync(dir).isDirectory()) continue;
-      } catch {
-        continue;
-      }
-      const skillMd = path15.join(dir, "SKILL.md");
-      if (!fs8.existsSync(skillMd)) continue;
-      const key = `${rel}/${name}`;
-      if (seenKeys.has(key)) continue;
-      seenKeys.add(key);
-      out.push({ skillKey: name, path: `${rel}/${name}`.replace(/\\/g, "/") });
+    const relative4 = path15.relative(baseDir, full).replace(/\\/g, "/");
+    if (stat2.isDirectory()) {
+      walkWorkspaceTreeSync(full, baseDir, out);
+    } else if (stat2.isFile()) {
+      out.push(relative4);
     }
   }
-  return out;
 }
-function discoverSkillLayoutRoots(cwd) {
-  const roots = [];
-  for (const rel of SKILL_DISCOVERY_ROOTS) {
-    const base = path15.join(cwd, rel);
-    if (!fs8.existsSync(base) || !fs8.statSync(base).isDirectory()) continue;
-    let entries = [];
+async function walkWorkspaceTreeAsync(dir, baseDir, out, state) {
+  let names;
+  try {
+    names = await fs10.promises.readdir(dir);
+  } catch {
+    return;
+  }
+  for (const name of names) {
+    if (name.startsWith(".")) continue;
+    if (state.n > 0 && state.n % INDEX_WORK_YIELD_EVERY === 0) {
+      await yieldToEventLoop();
+    }
+    state.n++;
+    const full = path15.join(dir, name);
+    let stat2;
     try {
-      entries = fs8.readdirSync(base);
+      stat2 = await fs10.promises.stat(full);
     } catch {
       continue;
     }
-    const skills2 = [];
-    for (const name of entries) {
-      const dir = path15.join(base, name);
-      try {
-        if (!fs8.statSync(dir).isDirectory()) continue;
-      } catch {
-        continue;
-      }
-      if (!fs8.existsSync(path15.join(dir, "SKILL.md"))) continue;
-      const relPath = `${rel}/${name}`.replace(/\\/g, "/");
-      skills2.push({ name, relPath });
-    }
-    if (skills2.length > 0) {
-      roots.push({ path: rel.replace(/\\/g, "/"), skills: skills2 });
+    const relative4 = path15.relative(baseDir, full).replace(/\\/g, "/");
+    if (stat2.isDirectory()) {
+      await walkWorkspaceTreeAsync(full, baseDir, out, state);
+    } else if (stat2.isFile()) {
+      out.push(relative4);
     }
   }
-  return roots;
 }
-
-// src/bridge/routing/handlers/skill-layout-request.ts
-function handleSkillLayoutRequest(msg, deps) {
-  const socket = deps.getWs();
-  const id = typeof msg.id === "string" ? msg.id : "";
-  const roots = discoverSkillLayoutRoots(getBridgeWorkspaceDirectory());
-  socket?.send(JSON.stringify({ type: "skill_layout_response", id, roots }));
+function createWalkYieldState() {
+  return { n: 0 };
 }
 
-// src/skills/install-remote-skills.ts
-import fs9 from "node:fs";
-import path16 from "node:path";
-function installRemoteSkills(cwd, targetDir, items) {
-  const installed = [];
-  if (!Array.isArray(items)) {
-    return { success: false, error: "Invalid items" };
-  }
-  try {
-    for (const item of items) {
-      if (typeof item.sourceId !== "string" || typeof item.skillName !== "string" || typeof item.versionHash !== "string" || !Array.isArray(item.files)) {
-        continue;
-      }
-      const skillDir = path16.join(cwd, targetDir, item.skillName);
-      for (const f of item.files) {
-        if (typeof f.path !== "string" || !f.text && !f.base64) continue;
-        const dest = path16.join(skillDir, f.path);
-        fs9.mkdirSync(path16.dirname(dest), { recursive: true });
-        if (f.text !== void 0) {
-          fs9.writeFileSync(dest, f.text, "utf8");
-        } else if (f.base64) {
-          fs9.writeFileSync(dest, Buffer.from(f.base64, "base64"));
-        }
-      }
-      installed.push({
-        sourceId: item.sourceId,
-        skillName: item.skillName,
-        versionHash: item.versionHash
-      });
-    }
-    return { success: true, installed };
-  } catch (e) {
-    return { success: false, error: e instanceof Error ? e.message : String(e) };
+// src/files/index/trigram-utils.ts
+function getTrigrams(s) {
+  const lower = s.toLowerCase();
+  const out = [];
+  for (let i = 0; i <= lower.length - 3; i++) {
+    out.push(lower.slice(i, i + 3));
   }
+  return out;
 }
-
-// src/bridge/routing/handlers/install-skills.ts
-var handleInstallSkillsMessage = (msg, deps) => {
-  const socket = deps.getWs();
-  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 = getBridgeWorkspaceDirectory();
-  const result = installRemoteSkills(cwd, targetDir, rawItems);
-  if (!result.success) {
-    const err = result.error ?? "Invalid items";
-    deps.log(`[Bridge service] Install skills failed: ${err}`);
-    socket?.send(JSON.stringify({ type: "install_skills_result", id, success: false, error: err }));
-    return;
+function binarySearch(arr, x) {
+  let lo = 0;
+  let hi = arr.length - 1;
+  while (lo <= hi) {
+    const mid = lo + hi >>> 1;
+    if (arr[mid] < x) lo = mid + 1;
+    else if (arr[mid] > x) hi = mid - 1;
+    else return mid;
   }
-  socket?.send(JSON.stringify({ type: "install_skills_result", id, success: true, installed: result.installed }));
-};
-
-// src/bridge/routing/handlers/refresh-local-skills.ts
-var handleRefreshLocalSkills = (_msg, deps) => {
-  deps.sendLocalSkillsReport?.();
-};
-
-// src/bridge/routing/handlers/commit-session-request.ts
-var handleCommitSessionRequestMessage = (msg, deps) => {
-  if (typeof msg.id !== "string") return;
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
-  const branch = typeof msg.branch === "string" ? msg.branch : "";
-  const message = typeof msg.message === "string" ? msg.message : "";
-  const push = msg.push === true;
-  const endSession = msg.endSession === true;
-  if (!sessionId || !branch || !message) return;
-  void deps.sessionWorktreeManager.commitSession({ sessionId, branch, message, push }).then((r) => {
-    const s = deps.getWs();
-    if (s) {
-      sendWsMessage(s, {
-        type: "commit_session_result",
-        id: msg.id,
-        ok: r.ok,
-        ...r.error ? { error: r.error } : {},
-        endSession
-      });
-    }
-  }).catch((e) => {
-    const s = deps.getWs();
-    if (s) {
-      sendWsMessage(s, {
-        type: "commit_session_result",
-        id: msg.id,
-        ok: false,
-        error: e instanceof Error ? e.message : String(e),
-        endSession
-      });
+  return -1;
+}
+function intersectSortedTrigramSets(arrays) {
+  if (arrays.length === 0) return [];
+  if (arrays.length === 1) return arrays[0];
+  const byLength = arrays.slice().sort((a, b) => a.length - b.length);
+  const smallest = byLength[0];
+  const rest = byLength.slice(1);
+  const result = [];
+  for (const idx of smallest) {
+    if (rest.every((arr) => binarySearch(arr, idx) >= 0)) {
+      result.push(idx);
     }
-  });
-};
-
-// src/bridge/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/bridge/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/bridge/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);
-};
+  }
+  return result;
+}
 
-// src/bridge/routing/handlers/revert-turn-snapshot.ts
-import * as fs10 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.getAgentCwdForSession(sessionId) ?? getBridgeWorkspaceDirectory();
-    const file2 = snapshotFilePath(agentBase, turnId);
-    if (!fs10.existsSync(file2)) {
-      sendWsMessage(s, {
-        type: "revert_turn_snapshot_result",
-        id,
-        ok: false,
-        error: "No snapshot found for this turn (git state may be unavailable)."
-      });
-      return;
+// src/files/index/build-trigram-map.ts
+function buildTrigramMapForPaths(paths) {
+  const trigramIndex = {};
+  for (let i = 0; i < paths.length; i++) {
+    const trigrams = getTrigrams(paths[i]);
+    const seen = /* @__PURE__ */ new Set();
+    for (const tri of trigrams) {
+      if (seen.has(tri)) continue;
+      seen.add(tri);
+      if (!trigramIndex[tri]) trigramIndex[tri] = [];
+      trigramIndex[tri].push(i);
     }
-    const res = await applyPreTurnSnapshot(file2, log2);
-    sendWsMessage(s, {
-      type: "revert_turn_snapshot_result",
-      id,
-      ok: res.ok,
-      ...res.error ? { error: res.error } : {}
-    });
-  })();
-};
-
-// src/bridge/routing/handlers/dev-server-control.ts
-var handleDevServerControl = (msg, deps) => {
-  const serverId = typeof msg.serverId === "string" ? msg.serverId : "";
-  const action = msg.action === "start" || msg.action === "stop" ? msg.action : null;
-  if (!serverId || !action) return;
-  deps.devServerManager?.handleControl(serverId, action);
-};
-
-// src/bridge/routing/handlers/dev-servers-config.ts
-var handleDevServersConfig = (msg, deps) => {
-  const devServers = msg.devServers;
-  deps.devServerManager?.applyConfig(devServers ?? []);
-};
-
-// src/bridge/routing/dispatch-bridge-message.ts
-function dispatchBridgeMessage(msg, deps) {
-  const type = msg.type;
-  if (typeof type !== "string") return;
-  switch (type) {
-    case "auth_token":
-      handleAuthToken(msg, deps);
-      break;
-    case "bridge_identified":
-      handleBridgeIdentified(msg, deps);
-      break;
-    case "dev_servers_config":
-      handleDevServersConfig(msg, deps);
-      break;
-    case "server_control":
-      handleDevServerControl(msg, deps);
-      break;
-    case "agent_config":
-      handleAgentConfigMessage(msg, deps);
-      break;
-    case "prompt":
-      handlePromptMessage(msg, deps);
-      break;
-    case "commit_session_request":
-      handleCommitSessionRequestMessage(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 "cancel_run":
-      handleCancelRunMessage(msg, deps);
-      break;
-    case "cursor_request_response":
-      handleCursorRequestResponseMessage(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 "skill_layout_request":
-      handleSkillLayoutRequest(msg, deps);
-      break;
-    case "install_skills":
-      handleInstallSkillsMessage(msg, deps);
-      break;
-    case "refresh_local_skills":
-      handleRefreshLocalSkills(msg, deps);
-      break;
-    default:
-      deps.log?.(`[Bridge service] unhandled message type: ${type}`);
   }
+  return trigramIndex;
 }
-
-// src/bridge/routing/handle-bridge-message.ts
-function handleBridgeMessage(data, deps) {
-  const msg = data;
-  if (!deps.getWs()) return;
-  setImmediate(() => {
-    dispatchBridgeMessage(msg, deps);
-  });
+async function buildTrigramMapForPathsAsync(paths) {
+  const trigramIndex = {};
+  for (let i = 0; i < paths.length; i++) {
+    if (i > 0 && i % INDEX_WORK_YIELD_EVERY === 0) {
+      await yieldToEventLoop();
+    }
+    const trigrams = getTrigrams(paths[i]);
+    const seen = /* @__PURE__ */ new Set();
+    for (const tri of trigrams) {
+      if (seen.has(tri)) continue;
+      seen.add(tri);
+      if (!trigramIndex[tri]) trigramIndex[tri] = [];
+      trigramIndex[tri].push(i);
+    }
+  }
+  return trigramIndex;
 }
 
-// src/worktrees/session-worktree-manager.ts
-import * as path20 from "node:path";
-import os4 from "node:os";
-
-// src/worktrees/prepare-new-session-worktrees.ts
-import * as fs12 from "node:fs";
-import * as path18 from "node:path";
+// src/files/index/write-index-file.ts
+import fs11 from "node:fs";
 
-// src/git/worktree-add.ts
-async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch) {
-  const mainGit = simpleGit(mainRepoPath);
-  await mainGit.raw(["worktree", "add", "-b", branch, worktreePath, "HEAD"]);
+// src/files/index/paths.ts
+import path16 from "node:path";
+import crypto2 from "node:crypto";
+function getIndexPathForCwd(resolvedCwd) {
+  const hash = crypto2.createHash("sha256").update(resolvedCwd).digest("hex").slice(0, INDEX_HASH_LEN);
+  return path16.join(INDEX_DIR, `.file-index-${hash}.json`);
 }
 
-// src/worktrees/worktree-layout-file.ts
-import * as fs11 from "node:fs";
-import * as path17 from "node:path";
-import os3 from "node:os";
-var LAYOUT_FILENAME = "worktree-launcher-layout.json";
-function defaultWorktreeLayoutPath() {
-  return path17.join(os3.homedir(), ".buildautomaton", LAYOUT_FILENAME);
-}
-function normalizeLoadedLayout(raw) {
-  if (raw && typeof raw === "object" && "launcherCwds" in raw) {
-    const j = raw;
-    if (Array.isArray(j.launcherCwds)) return { launcherCwds: j.launcherCwds };
-  }
-  return { launcherCwds: [] };
-}
-function loadWorktreeLayout() {
+// src/files/index/write-index-file.ts
+function writeIndexFileSync(resolvedCwd, data) {
+  const indexPath = getIndexPathForCwd(resolvedCwd);
   try {
-    const p = defaultWorktreeLayoutPath();
-    if (!fs11.existsSync(p)) return { launcherCwds: [] };
-    const raw = JSON.parse(fs11.readFileSync(p, "utf8"));
-    return normalizeLoadedLayout(raw);
-  } catch {
-    return { launcherCwds: [] };
+    if (!fs11.existsSync(INDEX_DIR)) fs11.mkdirSync(INDEX_DIR, { recursive: true });
+    fs11.writeFileSync(indexPath, JSON.stringify(data), "utf8");
+  } catch (e) {
+    console.error(`${INDEX_LOG_PREFIX} Failed to write index:`, e);
   }
 }
-function saveWorktreeLayout(layout) {
+async function writeIndexFileAsync(resolvedCwd, data) {
+  const indexPath = getIndexPathForCwd(resolvedCwd);
   try {
-    const dir = path17.dirname(defaultWorktreeLayoutPath());
-    fs11.mkdirSync(dir, { recursive: true });
-    fs11.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
-  } catch {
+    await fs11.promises.mkdir(INDEX_DIR, { recursive: true });
+    await fs11.promises.writeFile(indexPath, JSON.stringify(data), "utf8");
+  } catch (e) {
+    console.error(`${INDEX_LOG_PREFIX} Failed to write index:`, e);
   }
 }
-function baseNameSafe(abs) {
-  return path17.basename(abs).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
-}
-function allocateDirNameForLauncherCwd(layout, launcherCwdAbs) {
-  const norm = path17.resolve(launcherCwdAbs);
-  const existing = layout.launcherCwds.find((e) => path17.resolve(e.absolutePath) === norm);
-  if (existing) return existing.dirName;
-  const base = baseNameSafe(norm);
-  const used = new Set(layout.launcherCwds.map((e) => e.dirName));
-  let name = base;
-  let n = 2;
-  while (used.has(name)) {
-    name = `${base}-${n}`;
-    n += 1;
-  }
-  layout.launcherCwds.push({ absolutePath: norm, dirName: name });
-  saveWorktreeLayout(layout);
-  return name;
+function makeTrigramIndexData(paths, trigramIndex) {
+  return { version: INDEX_VERSION, paths, trigramIndex };
 }
 
-// src/worktrees/prepare-new-session-worktrees.ts
-async function prepareNewSessionWorktrees(options) {
-  const { rootAbs, launcherCwd, sessionId, layout, log: log2 } = options;
-  const launcherResolved = path18.resolve(launcherCwd);
-  const cwdKey = allocateDirNameForLauncherCwd(layout, launcherResolved);
-  const agentMirrorRoot = path18.join(rootAbs, cwdKey);
-  const repos = await discoverGitReposUnderRoot(launcherResolved);
-  if (repos.length === 0) {
-    log2("[worktrees] No Git repositories under launcher working directory; skipping worktree creation.");
-    return null;
-  }
-  const branch = `session-${sessionId}`;
-  const worktreePaths = [];
-  fs12.mkdirSync(agentMirrorRoot, { recursive: true });
-  for (const repo of repos) {
-    let rel = path18.relative(launcherResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path18.isAbsolute(rel)) continue;
-    const relNorm = rel === "" ? "." : rel;
-    const wtPath = path18.join(agentMirrorRoot, relNorm, sessionId);
-    fs12.mkdirSync(path18.dirname(wtPath), { recursive: true });
-    try {
-      await gitWorktreeAddBranch(repo.absolutePath, wtPath, branch);
-      log2(`[worktrees] Added worktree ${wtPath} (branch ${branch}).`);
-      worktreePaths.push(wtPath);
-    } catch (e) {
-      log2(
-        `[worktrees] Worktree add failed for ${repo.absolutePath}: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  }
-  if (worktreePaths.length === 0) return null;
-  return { worktreePaths, agentCwd: agentMirrorRoot };
-}
-
-// src/git/rename-branch.ts
-async function gitRenameCurrentBranch(repoDir, newName) {
-  const g = simpleGit(repoDir);
-  await g.raw(["branch", "-m", newName]);
-}
-
-// src/worktrees/rename-session-worktree-branches.ts
-async function renameSessionWorktreeBranches(paths, newBranch, log2) {
-  const safe = newBranch.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "session-branch";
-  for (const wt of paths) {
-    try {
-      await gitRenameCurrentBranch(wt, safe);
-      log2(`[worktrees] Renamed branch in ${wt} \u2192 ${safe}`);
-    } catch (e) {
-      log2(
-        `[worktrees] Branch rename failed in ${wt}: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  }
+// src/files/index/build-file-index.ts
+function sortPaths(paths) {
+  paths.sort((a, b) => a.localeCompare(b, void 0, { sensitivity: "base" }));
 }
-
-// src/worktrees/remove-session-worktrees.ts
-import * as fs15 from "node:fs";
-
-// src/git/worktree-remove.ts
-import * as fs14 from "node:fs";
-
-// src/git/resolve-main-repo-from-git-file.ts
-import * as fs13 from "node:fs";
-import * as path19 from "node:path";
-function resolveMainRepoFromWorktreeGitFile(wt) {
-  const gitDirFile = path19.join(wt, ".git");
-  if (!fs13.existsSync(gitDirFile) || !fs13.statSync(gitDirFile).isFile()) return "";
-  const first2 = fs13.readFileSync(gitDirFile, "utf8").trim();
-  const m = first2.match(/^gitdir:\s*(.+)$/im);
-  if (!m) return "";
-  const gitWorktreePath = path19.resolve(wt, m[1].trim());
-  const gitDir = path19.dirname(path19.dirname(gitWorktreePath));
-  return path19.dirname(gitDir);
+function buildFileIndex(cwd) {
+  const resolved = path17.resolve(cwd);
+  const paths = [];
+  walkWorkspaceTreeSync(resolved, resolved, paths);
+  sortPaths(paths);
+  const trigramIndex = buildTrigramMapForPaths(paths);
+  const data = makeTrigramIndexData(paths, trigramIndex);
+  writeIndexFileSync(resolved, data);
+  return data;
 }
-
-// src/git/worktree-remove.ts
-async function gitWorktreeRemoveForce(worktreePath) {
-  const mainRepo = resolveMainRepoFromWorktreeGitFile(worktreePath);
-  if (mainRepo) {
-    await simpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
-  } else {
-    fs14.rmSync(worktreePath, { recursive: true, force: true });
-  }
+async function buildFileIndexAsync(cwd) {
+  const resolved = path17.resolve(cwd);
+  const paths = [];
+  await walkWorkspaceTreeAsync(resolved, resolved, paths, createWalkYieldState());
+  await yieldToEventLoop();
+  sortPaths(paths);
+  const trigramIndex = await buildTrigramMapForPathsAsync(paths);
+  const data = makeTrigramIndexData(paths, trigramIndex);
+  await writeIndexFileAsync(resolved, data);
+  return data;
 }
 
-// src/worktrees/remove-session-worktrees.ts
-async function removeSessionWorktrees(paths, log2) {
-  for (const wt of paths) {
-    try {
-      await gitWorktreeRemoveForce(wt);
-      log2(`[worktrees] Removed worktree ${wt}`);
-    } catch (e) {
-      log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
-      try {
-        fs15.rmSync(wt, { recursive: true, force: true });
-      } catch {
+// src/files/index/load-file-index.ts
+import fs12 from "node:fs";
+import path18 from "node:path";
+function loadFileIndex(cwd) {
+  const resolved = path18.resolve(cwd);
+  const indexPath = getIndexPathForCwd(resolved);
+  try {
+    const raw = fs12.readFileSync(indexPath, "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed !== null && typeof parsed === "object" && Array.isArray(parsed.paths)) {
+      const obj = parsed;
+      if (obj.version === INDEX_VERSION && obj.trigramIndex && typeof obj.trigramIndex === "object") {
+        return obj;
       }
+      return buildFileIndex(resolved);
     }
+    if (Array.isArray(parsed) && parsed.every((p) => typeof p === "string")) {
+      return buildFileIndex(resolved);
+    }
+    return null;
+  } catch {
+    return null;
   }
 }
 
-// src/git/commit-and-push.ts
-async function gitCommitAllIfDirty(repoDir, message, options) {
-  const g = simpleGit(repoDir);
-  const st = await g.status();
-  if (!st.files?.length) return;
-  const branch = options.branch.trim();
-  if (!branch) {
-    throw new Error("Branch name is required");
-  }
-  const branches = await g.branchLocal();
-  const localNames = new Set(branches.all.map((b) => b.replace(/^\*\s*/, "").trim()));
-  if (!localNames.has(branch)) {
-    await g.checkoutLocalBranch(branch);
-  } else {
-    await g.checkout(branch);
-  }
-  await g.add(".");
-  await g.commit(message);
-  if (options.push) {
-    await g.push(["-u", "origin", branch]);
-  }
-}
-
-// src/worktrees/commit-session-worktrees.ts
-async function commitSessionWorktrees(options) {
-  const { paths, branch, message, push } = options;
-  try {
-    for (const wt of paths) {
-      await gitCommitAllIfDirty(wt, message, { push, branch });
-    }
-    return { ok: true };
-  } catch (e) {
-    const err = e instanceof Error ? e.message : String(e);
-    return { ok: false, error: err };
-  }
+// src/files/index/ensure-file-index.ts
+import path19 from "node:path";
+async function ensureFileIndexAsync(cwd) {
+  const resolved = path19.resolve(cwd);
+  const cached2 = loadFileIndex(resolved);
+  if (cached2 !== null) return { data: cached2, fromCache: true };
+  const data = await buildFileIndexAsync(resolved);
+  return { data, fromCache: false };
 }
 
-// src/worktrees/session-worktree-manager.ts
-var SessionWorktreeManager = class {
-  rootAbs;
-  log;
-  bridgeWantsWorktrees = false;
-  sessionPaths = /* @__PURE__ */ new Map();
-  sessionAgentCwd = /* @__PURE__ */ new Map();
-  layout;
-  constructor(options) {
-    this.rootAbs = options.worktreesRootAbs;
-    this.log = options.log;
-    this.layout = loadWorktreeLayout();
-  }
-  setBridgeSessionWorktrees(enabled) {
-    this.bridgeWantsWorktrees = enabled;
+// src/files/index/search-file-index.ts
+function candidatePathIndices(index, q) {
+  const { paths, trigramIndex } = index;
+  if (q.length < 3) {
+    return paths.map((_, i) => i).filter((i) => paths[i].toLowerCase().includes(q));
   }
-  effective() {
-    return this.bridgeWantsWorktrees;
+  const trigrams = getTrigrams(q);
+  if (trigrams.length === 0) {
+    return paths.map((_, i) => i).filter((i) => paths[i].toLowerCase().includes(q));
   }
-  /**
-   * Returns cwd for the agent (mirror of launcher tree), or undefined to use the bridge workspace directory.
-   */
-  async resolveCwdForPrompt(sessionId, opts) {
-    if (!sessionId || !this.effective() || !opts.sessionWorktreesEnabled) {
-      return void 0;
+  const arrays = trigrams.map((tri) => trigramIndex[tri]).filter((arr) => arr != null && arr.length > 0);
+  if (arrays.length === 0) return [];
+  return intersectSortedTrigramSets(arrays);
+}
+async function searchFileIndexAsync(index, query, limit = 100) {
+  await yieldToEventLoop();
+  const q = query.trim().toLowerCase();
+  if (!q) return [];
+  const { paths } = index;
+  const candidateIndices = candidatePathIndices(index, q);
+  const out = [];
+  let n = 0;
+  for (const i of candidateIndices) {
+    if (n > 0 && n % INDEX_WORK_YIELD_EVERY === 0) {
+      await yieldToEventLoop();
     }
-    if (!opts.isNewSession) {
-      const agentCwd = this.sessionAgentCwd.get(sessionId);
-      if (agentCwd) return path20.resolve(agentCwd);
-      return void 0;
+    const p = paths[i];
+    if (p.toLowerCase().includes(q)) {
+      out.push(p);
+      if (out.length >= limit) break;
     }
-    const prep = await prepareNewSessionWorktrees({
-      rootAbs: this.rootAbs,
-      launcherCwd: getBridgeWorkspaceDirectory(),
-      sessionId,
-      layout: this.layout,
-      log: this.log
-    });
-    if (!prep) return void 0;
-    this.sessionPaths.set(sessionId, prep.worktreePaths);
-    this.sessionAgentCwd.set(sessionId, prep.agentCwd);
-    return path20.resolve(prep.agentCwd);
-  }
-  async renameSessionBranch(sessionId, newBranch) {
-    const paths = this.sessionPaths.get(sessionId);
-    if (!paths?.length) return;
-    await renameSessionWorktreeBranches(paths, newBranch, this.log);
-  }
-  /** True when this session runs in an isolated worktree mirror (not launcher cwd). */
-  usesWorktreeSession(sessionId) {
-    if (!sessionId) return false;
-    return this.sessionAgentCwd.has(sessionId);
-  }
-  getWorktreePathsForSession(sessionId) {
-    if (!sessionId) return void 0;
-    const paths = this.sessionPaths.get(sessionId);
-    return paths?.length ? [...paths] : void 0;
-  }
-  /** Session mirror root (parent of per-repo worktrees), when using worktrees for this session. */
-  getAgentCwdForSession(sessionId) {
-    if (!sessionId) return null;
-    const c = this.sessionAgentCwd.get(sessionId);
-    return c ? path20.resolve(c) : null;
-  }
-  async removeSessionWorktrees(sessionId) {
-    const paths = this.sessionPaths.get(sessionId);
-    this.sessionPaths.delete(sessionId);
-    this.sessionAgentCwd.delete(sessionId);
-    if (!paths?.length) return;
-    await removeSessionWorktrees(paths, this.log);
-  }
-  async commitSession(params) {
-    const paths = this.sessionPaths.get(params.sessionId);
-    const targets = paths?.length ? paths : [getBridgeWorkspaceDirectory()];
-    return commitSessionWorktrees({
-      paths: targets,
-      branch: params.branch,
-      message: params.message,
-      push: params.push
-    });
-  }
-};
-function defaultWorktreesRootAbs() {
-  return path20.join(os4.homedir(), ".buildautomaton", "worktrees");
-}
-
-// src/auth/refresh-bridge-tokens.ts
-async function refreshBridgeTokens(params) {
-  const base = params.apiUrl.replace(/\/$/, "");
-  const url2 = `${base}/api/bridges/tokens/refresh`;
-  try {
-    const res = await fetch(url2, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        workspaceId: params.workspaceId,
-        refreshToken: params.refreshToken
-      })
-    });
-    if (!res.ok) return null;
-    const data = await res.json();
-    if (typeof data.token !== "string" || typeof data.refreshToken !== "string") return null;
-    return {
-      token: data.token,
-      refreshToken: data.refreshToken,
-      workspaceId: typeof data.workspaceId === "string" ? data.workspaceId : params.workspaceId,
-      tokenId: typeof data.tokenId === "string" ? data.tokenId : ""
-    };
-  } catch {
-    return null;
+    n++;
   }
+  return out;
 }
 
 // src/files/watch-file-index.ts
-import { watch } from "node:fs";
-import path21 from "node:path";
 var DEBOUNCE_MS = 900;
 function shouldIgnoreRelative(rel) {
   const n = rel.replace(/\\/g, "/");
@@ -31302,19 +30534,15 @@ function createFsWatcher(resolved, schedule) {
   }
 }
 function startFileIndexWatcher(cwd = getBridgeWorkspaceDirectory()) {
-  const resolved = path21.resolve(cwd);
-  try {
-    buildFileIndex(resolved);
-  } catch (e) {
+  const resolved = path20.resolve(cwd);
+  void buildFileIndexAsync(resolved).catch((e) => {
     console.error("[file-index] Initial index build failed:", e);
-  }
+  });
   let timer = null;
   const runRebuild = () => {
-    try {
-      buildFileIndex(resolved);
-    } catch (e) {
+    void buildFileIndexAsync(resolved).catch((e) => {
       console.error("[file-index] Watch rebuild failed:", e);
-    }
+    });
   };
   const schedule = () => {
     if (timer) clearTimeout(timer);
@@ -31375,7 +30603,7 @@ function forceKillChild(proc, log2, shortId, graceMs) {
 }
 
 // src/dev-servers/process/wire-dev-server-child-process.ts
-import fs16 from "node:fs";
+import fs13 from "node:fs";
 
 // src/dev-servers/manager/forward-pipe.ts
 function forwardChildPipe(childReadable, terminal, onData) {
@@ -31411,7 +30639,7 @@ function wireDevServerChildProcess(d) {
         d.setPollInterval(void 0);
         return;
       }
-      fs16.readFile(d.mergedLogPath, (err, buf) => {
+      fs13.readFile(d.mergedLogPath, (err, buf) => {
         if (err || (d.getSpawnGeneration() ?? 0) !== d.scheduledGen) return;
         if (buf.length <= d.mergedReadPos.value) return;
         const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
@@ -31449,7 +30677,7 @@ ${errTail}` : ""}`);
       d.sendStatus(code === 0 || code == null ? "stopped" : "error", detail, tails);
     };
     if (mergedPath) {
-      fs16.readFile(mergedPath, (err, buf) => {
+      fs13.readFile(mergedPath, (err, buf) => {
         if (!err && buf.length > d.mergedReadPos.value) {
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
@@ -31551,13 +30779,13 @@ function parseDevServerDefs(servers) {
 }
 
 // src/dev-servers/manager/shell-spawn/utils.ts
-import fs17 from "node:fs";
+import fs14 from "node:fs";
 function isSpawnEbadf(e) {
   return typeof e === "object" && e !== null && "code" in e && e.code === "EBADF";
 }
 function rmDirQuiet(dir) {
   try {
-    fs17.rmSync(dir, { recursive: true, force: true });
+    fs14.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -31565,7 +30793,7 @@ var cachedDevNullReadFd;
 function devNullReadFd() {
   if (cachedDevNullReadFd === void 0) {
     const devPath = process.platform === "win32" ? "nul" : "/dev/null";
-    cachedDevNullReadFd = fs17.openSync(devPath, "r");
+    cachedDevNullReadFd = fs14.openSync(devPath, "r");
   }
   return cachedDevNullReadFd;
 }
@@ -31639,15 +30867,15 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
 
 // src/dev-servers/manager/shell-spawn/try-spawn-merged-log-file.ts
 import { spawn as spawn7 } from "node:child_process";
-import fs18 from "node:fs";
+import fs15 from "node:fs";
 import { tmpdir } from "node:os";
-import path22 from "node:path";
+import path21 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal) {
-  const tmpRoot = fs18.mkdtempSync(path22.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path22.join(tmpRoot, "combined.log");
+  const tmpRoot = fs15.mkdtempSync(path21.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path21.join(tmpRoot, "combined.log");
   let logFd;
   try {
-    logFd = fs18.openSync(logPath, "a");
+    logFd = fs15.openSync(logPath, "a");
   } catch {
     rmDirQuiet(tmpRoot);
     return null;
@@ -31666,7 +30894,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
     } else {
       proc = spawn7("/bin/sh", ["-c", command], { env, cwd, stdio, ...signal ? { signal } : {} });
     }
-    fs18.closeSync(logFd);
+    fs15.closeSync(logFd);
     return {
       proc,
       pipedStdoutStderr: true,
@@ -31675,7 +30903,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
     };
   } catch (e) {
     try {
-      fs18.closeSync(logFd);
+      fs15.closeSync(logFd);
     } catch {
     }
     rmDirQuiet(tmpRoot);
@@ -31686,22 +30914,22 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
 
 // src/dev-servers/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
 import { spawn as spawn8 } from "node:child_process";
-import fs19 from "node:fs";
+import fs16 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path23 from "node:path";
+import path22 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal) {
-  const tmpRoot = fs19.mkdtempSync(path23.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path23.join(tmpRoot, "combined.log");
-  const innerPath = path23.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path23.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs16.mkdtempSync(path22.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path22.join(tmpRoot, "combined.log");
+  const innerPath = path22.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path22.join(tmpRoot, "_run.sh");
   try {
-    fs19.writeFileSync(innerPath, `#!/bin/sh
+    fs16.writeFileSync(innerPath, `#!/bin/sh
 ${command}
 `);
-    fs19.writeFileSync(
+    fs16.writeFileSync(
       runnerPath,
       `#!/bin/sh
 cd ${shSingleQuote(cwd)}
@@ -31727,13 +30955,13 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal) {
-  const tmpRoot = fs19.mkdtempSync(path23.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path23.join(tmpRoot, "combined.log");
-  const runnerPath = path23.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs16.mkdtempSync(path22.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path22.join(tmpRoot, "combined.log");
+  const runnerPath = path22.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
-    fs19.writeFileSync(
+    fs16.writeFileSync(
       runnerPath,
       `@ECHO OFF\r
 CD /D ${q(cwd)}\r
@@ -32328,213 +31556,1194 @@ function connectFirehose(options) {
   };
 }
 
-// src/bridge/connection/create-bridge-identified-handler.ts
-function createOnBridgeIdentified(opts) {
-  const { sessionWorktreeManager, devServerManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
-  function clearFirehoseReconnectTimer() {
-    if (state.firehoseReconnectTimeout != null) {
-      clearTimeout(state.firehoseReconnectTimeout);
-      state.firehoseReconnectTimeout = null;
-    }
-  }
-  function firehoseCtx() {
-    return {
-      closedByUser: state.closedByUser,
-      currentWs: state.currentWs,
-      firehoseHandle: state.firehoseHandle,
-      firehoseQuiet: state.firehoseQuiet
-    };
-  }
-  function attachFirehose(params) {
-    state.lastFirehoseParams = params;
-    clearFirehoseReconnectTimer();
-    if (state.firehoseReconnectAttempt === 0) {
-      logFn("Connecting to preview tunnel (local HTTP proxy and dev logs)\u2026");
-    }
-    state.firehoseGeneration += 1;
-    const myGen = state.firehoseGeneration;
-    if (state.firehoseHandle) {
-      state.firehoseHandle.close();
-      state.firehoseHandle = null;
-    }
-    state.firehoseHandle = connectFirehose({
-      firehoseServerUrl: params.firehoseServerUrl,
-      workspaceId: params.workspaceId,
-      bridgeName: params.bridgeName,
-      proxyPorts: params.proxyPorts,
-      log: logFn,
-      devServerManager,
-      onOpen: () => {
-        if (myGen !== state.firehoseGeneration) return;
-        clearFirehoseReconnectQuietOnOpen({ firehoseQuiet: state.firehoseQuiet }, logFn);
-        const logOpenAsFirehoseReconnect = state.firehoseReconnectAttempt > 0;
-        state.firehoseReconnectAttempt = 0;
-        if (!logOpenAsFirehoseReconnect) {
-          logFn("Connected to preview tunnel (local HTTP proxy and dev logs).");
-        }
-      },
-      onClose: (code, reason) => {
-        if (myGen !== state.firehoseGeneration) return;
-        state.firehoseHandle = null;
-        if (state.closedByUser) return;
-        const main = state.currentWs;
-        if (!main || main.readyState !== wrapper_default.OPEN) {
-          logFn(
-            `${PROXY_AND_LOG_SERVICE_LABEL} Not reconnecting preview and log stream: main bridge connection is not open.`
-          );
-          return;
-        }
-        beginFirehoseDeferredDisconnect(firehoseCtx(), code, reason, logFn);
-        clearFirehoseReconnectTimer();
-        const delay2 = reconnectDelayMs(state.firehoseReconnectAttempt);
-        state.firehoseReconnectAttempt += 1;
-        logNextReconnectAttempt(
-          logFn,
-          PROXY_AND_LOG_SERVICE_LABEL,
-          state.firehoseQuiet,
-          delay2,
-          state.firehoseReconnectAttempt
-        );
-        state.firehoseReconnectTimeout = setTimeout(() => {
-          state.firehoseReconnectTimeout = null;
-          if (state.closedByUser) return;
-          const w = state.currentWs;
-          if (!w || w.readyState !== wrapper_default.OPEN) {
-            if (state.firehoseQuiet.verboseLogs) {
-              logFn(
-                `${PROXY_AND_LOG_SERVICE_LABEL} Reconnect skipped: main bridge connection closed before preview stream could reconnect.`
-              );
-            }
-            return;
-          }
-          const p = state.lastFirehoseParams;
-          if (!p) {
-            if (state.firehoseQuiet.verboseLogs) {
-              logFn(`${PROXY_AND_LOG_SERVICE_LABEL} Reconnect skipped: no stored connection parameters.`);
-            }
-            return;
-          }
-          attachFirehose(p);
-        }, delay2);
-      }
-    });
-  }
-  return (msg) => {
-    sessionWorktreeManager.setBridgeSessionWorktrees(msg.sessionWorktreesEnabled === true);
-    const bridgeName = msg.bridgeName;
-    const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts : [];
-    const devServers = msg.devServers ?? [];
-    setImmediate(() => {
-      devServerManager.applyConfig(devServers);
-      if (!firehoseServerUrl || typeof bridgeName !== "string" || !bridgeName) return;
-      state.firehoseReconnectAttempt = 0;
-      attachFirehose({
-        firehoseServerUrl,
-        workspaceId,
-        bridgeName,
-        proxyPorts
-      });
-    });
-  };
+// src/bridge/connection/attach-firehose-after-identified.ts
+function attachFirehoseAfterIdentified(ctx, params) {
+  const { state, devServerManager, logFn } = ctx;
+  function clearFirehoseReconnectTimer() {
+    if (state.firehoseReconnectTimeout != null) {
+      clearTimeout(state.firehoseReconnectTimeout);
+      state.firehoseReconnectTimeout = null;
+    }
+  }
+  function firehoseCtx() {
+    return {
+      closedByUser: state.closedByUser,
+      currentWs: state.currentWs,
+      firehoseHandle: state.firehoseHandle,
+      firehoseQuiet: state.firehoseQuiet
+    };
+  }
+  state.lastFirehoseParams = params;
+  clearFirehoseReconnectTimer();
+  if (state.firehoseReconnectAttempt === 0) {
+    logFn("Connecting to preview tunnel (local HTTP proxy and dev logs)\u2026");
+  }
+  state.firehoseGeneration += 1;
+  const myGen = state.firehoseGeneration;
+  if (state.firehoseHandle) {
+    state.firehoseHandle.close();
+    state.firehoseHandle = null;
+  }
+  state.firehoseHandle = connectFirehose({
+    firehoseServerUrl: params.firehoseServerUrl,
+    workspaceId: params.workspaceId,
+    bridgeName: params.bridgeName,
+    proxyPorts: params.proxyPorts,
+    log: logFn,
+    devServerManager,
+    onOpen: () => {
+      if (myGen !== state.firehoseGeneration) return;
+      clearFirehoseReconnectQuietOnOpen({ firehoseQuiet: state.firehoseQuiet }, logFn);
+      const logOpenAsFirehoseReconnect = state.firehoseReconnectAttempt > 0;
+      state.firehoseReconnectAttempt = 0;
+      if (!logOpenAsFirehoseReconnect) {
+        logFn("Connected to preview tunnel (local HTTP proxy and dev logs).");
+      }
+    },
+    onClose: (code, reason) => {
+      if (myGen !== state.firehoseGeneration) return;
+      state.firehoseHandle = null;
+      if (state.closedByUser) return;
+      const main = state.currentWs;
+      if (!main || main.readyState !== wrapper_default.OPEN) {
+        logFn(
+          `${PROXY_AND_LOG_SERVICE_LABEL} Not reconnecting preview and log stream: main bridge connection is not open.`
+        );
+        return;
+      }
+      beginFirehoseDeferredDisconnect(firehoseCtx(), code, reason, logFn);
+      clearFirehoseReconnectTimer();
+      const delay2 = reconnectDelayMs(state.firehoseReconnectAttempt);
+      state.firehoseReconnectAttempt += 1;
+      logNextReconnectAttempt(
+        logFn,
+        PROXY_AND_LOG_SERVICE_LABEL,
+        state.firehoseQuiet,
+        delay2,
+        state.firehoseReconnectAttempt
+      );
+      state.firehoseReconnectTimeout = setTimeout(() => {
+        state.firehoseReconnectTimeout = null;
+        if (state.closedByUser) return;
+        const w = state.currentWs;
+        if (!w || w.readyState !== wrapper_default.OPEN) {
+          if (state.firehoseQuiet.verboseLogs) {
+            logFn(
+              `${PROXY_AND_LOG_SERVICE_LABEL} Reconnect skipped: main bridge connection closed before preview stream could reconnect.`
+            );
+          }
+          return;
+        }
+        const p = state.lastFirehoseParams;
+        if (!p) {
+          if (state.firehoseQuiet.verboseLogs) {
+            logFn(`${PROXY_AND_LOG_SERVICE_LABEL} Reconnect skipped: no stored connection parameters.`);
+          }
+          return;
+        }
+        attachFirehoseAfterIdentified(ctx, p);
+      }, delay2);
+    }
+  });
+}
+
+// src/bridge/connection/create-bridge-identified-handler.ts
+function createOnBridgeIdentified(opts) {
+  const { sessionWorktreeManager, devServerManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
+  const firehoseCtx = { state, devServerManager, logFn };
+  return (msg) => {
+    sessionWorktreeManager.setBridgeSessionWorktrees(msg.sessionWorktreesEnabled === true);
+    const bridgeName = msg.bridgeName;
+    const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts : [];
+    const devServers = msg.devServers ?? [];
+    setImmediate(() => {
+      devServerManager.applyConfig(devServers);
+      if (!firehoseServerUrl || typeof bridgeName !== "string" || !bridgeName) return;
+      state.firehoseReconnectAttempt = 0;
+      attachFirehoseAfterIdentified(firehoseCtx, {
+        firehoseServerUrl,
+        workspaceId,
+        bridgeName,
+        proxyPorts
+      });
+    });
+  };
+}
+
+// src/skills/discover-local-agent-skills.ts
+import fs17 from "node:fs";
+import path23 from "node:path";
+var SKILL_DISCOVERY_ROOTS = [".agents/skills", ".claude/skills", ".cursor/skills", "skills"];
+function discoverLocalSkills(cwd) {
+  const out = [];
+  const seenKeys = /* @__PURE__ */ new Set();
+  for (const rel of SKILL_DISCOVERY_ROOTS) {
+    const base = path23.join(cwd, rel);
+    if (!fs17.existsSync(base) || !fs17.statSync(base).isDirectory()) continue;
+    let entries = [];
+    try {
+      entries = fs17.readdirSync(base);
+    } catch {
+      continue;
+    }
+    for (const name of entries) {
+      const dir = path23.join(base, name);
+      try {
+        if (!fs17.statSync(dir).isDirectory()) continue;
+      } catch {
+        continue;
+      }
+      const skillMd = path23.join(dir, "SKILL.md");
+      if (!fs17.existsSync(skillMd)) continue;
+      const key = `${rel}/${name}`;
+      if (seenKeys.has(key)) continue;
+      seenKeys.add(key);
+      out.push({ skillKey: name, path: `${rel}/${name}`.replace(/\\/g, "/") });
+    }
+  }
+  return out;
+}
+function discoverSkillLayoutRoots(cwd) {
+  const roots = [];
+  for (const rel of SKILL_DISCOVERY_ROOTS) {
+    const base = path23.join(cwd, rel);
+    if (!fs17.existsSync(base) || !fs17.statSync(base).isDirectory()) continue;
+    let entries = [];
+    try {
+      entries = fs17.readdirSync(base);
+    } catch {
+      continue;
+    }
+    const skills2 = [];
+    for (const name of entries) {
+      const dir = path23.join(base, name);
+      try {
+        if (!fs17.statSync(dir).isDirectory()) continue;
+      } catch {
+        continue;
+      }
+      if (!fs17.existsSync(path23.join(dir, "SKILL.md"))) continue;
+      const relPath = `${rel}/${name}`.replace(/\\/g, "/");
+      skills2.push({ name, relPath });
+    }
+    if (skills2.length > 0) {
+      roots.push({ path: rel.replace(/\\/g, "/"), skills: skills2 });
+    }
+  }
+  return roots;
+}
+
+// src/agents/detect-local-agent-types.ts
+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 {
+    const out = [];
+    for (let i = 0; i < LOCAL_AGENT_ACP_MODULES.length; i++) {
+      if (i > 0) {
+        await yieldToEventLoop();
+      }
+      const mod = LOCAL_AGENT_ACP_MODULES[i];
+      try {
+        if (await mod.detectLocalAgentPresence()) out.push(mod.BACKEND_LOCAL_AGENT_TYPE);
+      } catch {
+      }
+    }
+    return out;
+  } catch {
+    return [];
+  }
+}
+
+// src/bridge/connection/create-bridge-local-reports.ts
+function createSendLocalSkillsReport(getWs, logFn) {
+  return () => {
+    setImmediate(() => {
+      try {
+        const socket = getWs();
+        if (!socket || socket.readyState !== wrapper_default.OPEN) return;
+        const skills2 = discoverLocalSkills(getBridgeWorkspaceDirectory());
+        socket.send(JSON.stringify({ type: "local_skills", skills: skills2 }));
+      } catch (e) {
+        logFn(
+          `[Bridge service] Local skills report failed: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
+    });
+  };
+}
+function createReportAutoDetectedAgents(getWs, logFn) {
+  return async () => {
+    try {
+      const types = await detectLocalAgentTypes();
+      const socket = getWs();
+      if (socket && socket.readyState === wrapper_default.OPEN) {
+        sendWsMessage(socket, { type: "auto_detected_agents_report", agentTypes: types });
+      }
+    } catch (e) {
+      logFn(
+        `[Bridge service] Auto-detected agents report failed: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  };
+}
+
+// src/bridge/connection/build-bridge-url.ts
+function buildBridgeUrl(apiUrl, workspaceId, authToken) {
+  const base = apiUrl.startsWith("https") ? apiUrl.replace(/^https/, "wss") : apiUrl.replace(/^http/, "ws");
+  const params = new URLSearchParams({ workspaceId, token: authToken });
+  return `${base}/ws/bridge?${params.toString()}`;
+}
+
+// src/bridge/connection/report-git-repos.ts
+function reportGitRepos(getWs, log2) {
+  setImmediate(() => {
+    discoverGitRepos().then((repos) => {
+      if (repos.length > 0) {
+        const socket = getWs();
+        if (socket) {
+          sendWsMessage(socket, {
+            type: "git_repos",
+            repos: repos.map((r) => ({ absolutePath: r.absolutePath, remoteUrl: r.remoteUrl }))
+          });
+        }
+      }
+    }).catch((err) => {
+      log2(
+        `[Bridge service] Git repository discovery failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
+  });
+}
+
+// src/bridge/routing/handlers/auth-token.ts
+var handleAuthToken = (msg, { log: log2 }) => {
+  if (typeof msg.token !== "string") return;
+  log2("Received auth token. Save it for future runs:");
+  log2(`  export BUILDAMATON_AUTH_TOKEN="${msg.token}"`);
+};
+
+// src/bridge/routing/handlers/bridge-identified.ts
+var handleBridgeIdentified = (msg, deps) => {
+  if (typeof msg.bridgeName !== "string") return;
+  deps.onBridgeIdentified(
+    msg
+  );
+  setImmediate(() => {
+    void (async () => {
+      try {
+        await deps.reportAutoDetectedAgents?.();
+      } catch (e) {
+        deps.log(
+          `[Bridge service] Auto-detect agents failed: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
+    })();
+  });
+  setImmediate(() => {
+    try {
+      deps.sendLocalSkillsReport?.();
+    } catch (e) {
+      deps.log(
+        `[Bridge service] Local skills report failed: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  });
+};
+
+// src/agents/acp/from-bridge/handle-bridge-agent-config.ts
+function handleBridgeAgentConfig(msg, { acpManager }) {
+  if (!Array.isArray(msg.agents) || msg.agents.length === 0) return;
+  acpManager.setPreferredAgentType(msg.agents[0].type);
+}
+
+// src/bridge/routing/handlers/agent-config.ts
+var handleAgentConfigMessage = (msg, deps) => {
+  handleBridgeAgentConfig(msg, deps);
+};
+
+// src/agents/acp/from-bridge/handle-bridge-prompt.ts
+import * as path25 from "node:path";
+import { execFile as execFile5 } from "node:child_process";
+import { promisify as promisify5 } from "node:util";
+
+// src/git/bridge-queue-key.ts
+import * as path24 from "node:path";
+import { createHash } from "node:crypto";
+function normalizeCanonicalGitUrl(url2) {
+  let s = url2.trim();
+  if (!s) return s;
+  if (s.toLowerCase().endsWith(".git")) {
+    s = s.slice(0, -4);
+  }
+  s = s.replace(/\/+$/, "");
+  const httpsMatch = /^(https?):\/\/([^/]+)(\/.*)?$/i.exec(s);
+  if (httpsMatch) {
+    const host = httpsMatch[2].toLowerCase();
+    const p = httpsMatch[3] ?? "";
+    s = `${httpsMatch[1].toLowerCase()}://${host}${p}`;
+  } else {
+    const sshMatch = /^git@([^:]+):(.+)$/i.exec(s);
+    if (sshMatch) {
+      const host = sshMatch[1].toLowerCase();
+      s = `git@${host}:${sshMatch[2]}`;
+    }
+  }
+  return s;
+}
+function canonicalUrlToRepoIdSync(url2) {
+  const normalized = normalizeCanonicalGitUrl(url2);
+  return createHash("sha256").update(normalized).digest("hex").slice(0, 32);
+}
+function fallbackRepoIdFromPath(absPath) {
+  return createHash("sha256").update(path24.resolve(absPath)).digest("hex").slice(0, 32);
+}
+async function resolveBridgeQueueBindFields(options) {
+  const { effectiveCwd, worktreePaths, primaryRepoRoots, log: log2 } = options;
+  const cwdAbs = worktreePaths.length > 0 ? path24.resolve(worktreePaths[0]) : path24.resolve(effectiveCwd);
+  if (!primaryRepoRoots.length) {
+    log2("[Bridge service] Prompt queue bind skipped: no Git repository roots under the working directory.");
+    return null;
+  }
+  let primaryRoot = primaryRepoRoots[0];
+  let remote = await getRemoteOriginUrl(primaryRoot);
+  if (!remote) {
+    for (const r of primaryRepoRoots.slice(1)) {
+      const u = await getRemoteOriginUrl(r);
+      if (u) {
+        primaryRoot = r;
+        remote = u;
+        break;
+      }
+    }
+  }
+  const repoId = remote ? canonicalUrlToRepoIdSync(remote) : fallbackRepoIdFromPath(primaryRoot);
+  const canonicalQueueKey = `repo:${repoId}::cwd:${cwdAbs}`;
+  return { canonicalQueueKey, repoId, cwdAbs };
+}
+
+// src/agents/acp/from-bridge/handle-bridge-prompt.ts
+var execFileAsync5 = promisify5(execFile5);
+async function readGitBranch(cwd) {
+  try {
+    const { stdout } = await execFileAsync5("git", ["branch", "--show-current"], { cwd, maxBuffer: 64 * 1024 });
+    const b = stdout.trim();
+    return b || null;
+  } catch {
+    return null;
+  }
+}
+function handleBridgePrompt(msg, deps) {
+  const { getWs, log: log2, acpManager, sessionWorktreeManager } = deps;
+  const rawPrompt = msg.prompt;
+  const promptText = typeof rawPrompt === "string" ? rawPrompt : rawPrompt != null ? String(rawPrompt) : "";
+  if (!promptText.trim()) {
+    log2(
+      `[Bridge service] Prompt ignored: empty or missing prompt text (session ${typeof msg.sessionId === "string" ? msg.sessionId.slice(0, 8) : "\u2014"}\u2026, run ${typeof msg.runId === "string" ? msg.runId.slice(0, 8) : "\u2014"}\u2026).`
+    );
+    return;
+  }
+  const sessionId = msg.sessionId;
+  const isNewSession = msg.isNewSession === true;
+  const sessionWorktreesEnabled = msg.sessionWorktreesEnabled === true;
+  const agentType = typeof msg.agentType === "string" && msg.agentType.trim() ? msg.agentType.trim() : void 0;
+  const runId = typeof msg.runId === "string" ? msg.runId : void 0;
+  const mode = typeof msg.mode === "string" && msg.mode.trim() ? msg.mode.trim() : void 0;
+  acpManager.logPromptReceivedFromBridge({ agentType, mode });
+  const sendResult2 = (result) => {
+    const s = getWs();
+    if (s) sendWsMessage(s, result);
+  };
+  const sendSessionUpdate = (payload) => {
+    const s = getWs();
+    if (!s) {
+      log2("[Bridge service] Session update not sent: not connected to the bridge.");
+      return;
+    }
+    const p = payload;
+    sendWsMessage(s, payload);
+  };
+  async function preambleAndPrompt(resolvedCwd) {
+    const s = getWs();
+    const effectiveCwd = path25.resolve(resolvedCwd ?? getBridgeWorkspaceDirectory());
+    const worktreePaths = sessionWorktreeManager.getWorktreePathsForSession(sessionId) ?? [];
+    const repoRoots = await resolveSnapshotRepoRoots({
+      worktreePaths,
+      fallbackCwd: effectiveCwd,
+      log: log2
+    });
+    if (s && sessionId) {
+      const bind = await resolveBridgeQueueBindFields({
+        effectiveCwd,
+        worktreePaths,
+        primaryRepoRoots: repoRoots,
+        log: log2
+      });
+      if (bind) {
+        sendWsMessage(s, {
+          type: "bridge_queue_bind",
+          sessionId,
+          canonicalQueueKey: bind.canonicalQueueKey,
+          repoId: bind.repoId,
+          cwdAbs: bind.cwdAbs
+        });
+      }
+    }
+    if (s && sessionId) {
+      const cliGitBranch = await readGitBranch(effectiveCwd);
+      sendWsMessage(s, {
+        type: "session_git_context_report",
+        sessionId,
+        cliGitBranch,
+        agentUsesWorktree: sessionWorktreeManager.usesWorktreeSession(sessionId)
+      });
+    }
+    if (s && sessionId && runId) {
+      const cap = repoRoots.length > 0 ? await capturePreTurnSnapshot({ runId, repoRoots, agentCwd: effectiveCwd, log: log2 }) : { ok: false, error: "No git repos" };
+      sendWsMessage(s, {
+        type: "pre_turn_snapshot_report",
+        sessionId,
+        turnId: runId,
+        captured: cap.ok
+      });
+    }
+    acpManager.handlePrompt({
+      promptText,
+      promptId: msg.id,
+      sessionId,
+      runId,
+      mode,
+      agentType,
+      cwd: effectiveCwd,
+      sendResult: sendResult2,
+      sendSessionUpdate
+    });
+  }
+  void sessionWorktreeManager.resolveCwdForPrompt(sessionId, { isNewSession, sessionWorktreesEnabled }).then((cwd) => preambleAndPrompt(cwd)).catch((err) => {
+    log2(`[Agent] Worktree resolve failed: ${err instanceof Error ? err.message : String(err)}`);
+    void preambleAndPrompt(void 0);
+  });
+}
+
+// src/bridge/routing/handlers/prompt.ts
+var handlePromptMessage = (msg, deps) => {
+  handleBridgePrompt(msg, deps);
+};
+
+// src/agents/acp/from-bridge/handle-bridge-cancel-run.ts
+function handleBridgeCancelRun(msg, { log: log2, acpManager }) {
+  const runId = msg.runId;
+  if (!runId) return;
+  void acpManager.cancelRun(runId).then((sent) => {
+    if (!sent) {
+      log2(
+        `[Agent] Cancel ignored for run ${runId.slice(0, 8)}\u2026 (no active run or cancel not available).`
+      );
+    }
+  });
+}
+
+// src/bridge/routing/handlers/cancel-run.ts
+var handleCancelRunMessage = (msg, deps) => {
+  handleBridgeCancelRun(msg, deps);
+};
+
+// src/agents/acp/from-bridge/handle-bridge-cursor-request-response.ts
+function handleBridgeCursorRequestResponse(msg, { acpManager }) {
+  if (typeof msg.requestId !== "string") return;
+  acpManager.resolveRequest(msg.requestId, msg.result ?? {});
+}
+
+// src/bridge/routing/handlers/cursor-request-response.ts
+var handleCursorRequestResponseMessage = (msg, deps) => {
+  handleBridgeCursorRequestResponse(msg, deps);
+};
+
+// src/skills/handle-skill-call.ts
+function handleSkillCall(msg, socket, log2) {
+  callSkill(msg.skillId, msg.operationId, msg.params ?? {}).then((result) => {
+    sendWsMessage(socket, { type: "skill_result", id: msg.id, result });
+  }).catch((err) => {
+    sendWsMessage(socket, { type: "skill_result", id: msg.id, error: String(err) });
+    log2(`[Bridge service] Skill invocation failed (${msg.skillId}/${msg.operationId}): ${err}`);
+  });
+}
+
+// src/bridge/routing/handlers/skill-call.ts
+var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
+  if (!msg.skillId || msg.operationId === void 0) return;
+  const socket = getWs();
+  if (!socket) return;
+  handleSkillCall(
+    msg,
+    socket,
+    log2
+  );
+};
+
+// src/files/list-dir.ts
+import fs18 from "node:fs";
+import path27 from "node:path";
+
+// src/files/ensure-under-cwd.ts
+import path26 from "node:path";
+function ensureUnderCwd(relativePath, cwd = getBridgeWorkspaceDirectory()) {
+  const normalized = path26.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path26.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path26.sep) && resolved !== cwd) {
+    return null;
+  }
+  return resolved;
+}
+
+// src/files/list-dir.ts
+var LIST_DIR_YIELD_EVERY = 256;
+async function listDirAsync(relativePath) {
+  const resolved = ensureUnderCwd(relativePath || ".", getBridgeWorkspaceDirectory());
+  if (!resolved) {
+    return { error: "Path is outside working directory" };
+  }
+  try {
+    const names = await fs18.promises.readdir(resolved, { withFileTypes: true });
+    const visible = names.filter((d) => !d.name.startsWith("."));
+    const entries = [];
+    for (let i = 0; i < visible.length; i++) {
+      if (i > 0 && i % LIST_DIR_YIELD_EVERY === 0) {
+        await yieldToEventLoop();
+      }
+      const d = visible[i];
+      const entryPath = path27.join(relativePath || ".", d.name).replace(/\\/g, "/");
+      const fullPath = path27.join(resolved, d.name);
+      let isDir = d.isDirectory();
+      if (d.isSymbolicLink()) {
+        try {
+          const targetStat = await fs18.promises.stat(fullPath);
+          isDir = targetStat.isDirectory();
+        } catch {
+          isDir = false;
+        }
+      }
+      entries.push({
+        name: d.name,
+        path: entryPath,
+        isDir,
+        isSymlink: d.isSymbolicLink()
+      });
+    }
+    entries.sort((a, b) => {
+      if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
+      return a.name.localeCompare(b.name, void 0, { sensitivity: "base" });
+    });
+    return { entries };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { error: message };
+  }
+}
+
+// src/files/read-file.ts
+import fs19 from "node:fs";
+import { StringDecoder } from "node:string_decoder";
+function resolveFilePath(relativePath) {
+  const resolved = ensureUnderCwd(relativePath, getBridgeWorkspaceDirectory());
+  if (!resolved) return { error: "Path is outside working directory" };
+  let real;
+  try {
+    real = fs19.realpathSync(resolved);
+  } catch {
+    real = resolved;
+  }
+  const stat2 = fs19.statSync(real);
+  if (!stat2.isFile()) return { error: "Not a file" };
+  return real;
+}
+var LINE_CHUNK_SIZE = 64 * 1024;
+function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
+  const fileSize = fs19.statSync(filePath).size;
+  const fd = fs19.openSync(filePath, "r");
+  const bufSize = 64 * 1024;
+  const buf = Buffer.alloc(bufSize);
+  const decoder = new StringDecoder("utf8");
+  let currentLine = 0;
+  const resultLines = [];
+  let partial2 = "";
+  let done = false;
+  let skipLine0Chars = typeof lineOffsetIn === "number" ? lineOffsetIn : 0;
+  let line0CharsReturned = 0;
+  let line0Accum = "";
+  try {
+    let bytesRead;
+    while (!done && (bytesRead = fs19.readSync(fd, buf, 0, bufSize, null)) > 0) {
+      const text = partial2 + decoder.write(buf.subarray(0, bytesRead));
+      partial2 = "";
+      let lineStart = 0;
+      for (let i = 0; i < text.length; i++) {
+        if (text[i] === "\n") {
+          const lineContent = (() => {
+            let lineEnd = i;
+            if (lineEnd > lineStart && text[lineEnd - 1] === "\r") lineEnd--;
+            return text.slice(lineStart, lineEnd);
+          })();
+          if (currentLine === 0 && (startLine === 0 || lineOffsetIn !== void 0)) {
+            line0Accum += lineContent;
+            const totalLine0 = line0Accum.length;
+            if (skipLine0Chars > 0) {
+              if (totalLine0 <= skipLine0Chars) {
+                skipLine0Chars -= totalLine0;
+                line0Accum = "";
+                currentLine++;
+                lineStart = i + 1;
+                if (currentLine > endLine) {
+                  done = true;
+                  break;
+                }
+                continue;
+              }
+              const from = skipLine0Chars;
+              const take = Math.min(lineChunkSize, totalLine0 - from);
+              resultLines.push(line0Accum.slice(from, from + take));
+              line0CharsReturned += take;
+              if (from + take < totalLine0) {
+                return {
+                  content: resultLines.join("\n"),
+                  size: fileSize,
+                  lineOffset: lineOffsetIn + line0CharsReturned,
+                  totalLines: 1
+                };
+              }
+              line0Accum = "";
+              skipLine0Chars = 0;
+              line0CharsReturned = 0;
+            } else if (totalLine0 > lineChunkSize) {
+              resultLines.push(line0Accum.slice(0, lineChunkSize));
+              return {
+                content: resultLines.join("\n"),
+                size: fileSize,
+                lineOffset: lineChunkSize,
+                totalLines: 1
+              };
+            } else {
+              resultLines.push(line0Accum);
+              line0Accum = "";
+            }
+          } else if (currentLine >= startLine && currentLine <= endLine) {
+            resultLines.push(lineContent);
+          }
+          currentLine++;
+          lineStart = i + 1;
+          if (currentLine > endLine) {
+            done = true;
+            break;
+          }
+        }
+      }
+      if (!done) {
+        const lineContent = text.slice(lineStart);
+        if (currentLine === 0 && (startLine === 0 || lineOffsetIn !== void 0)) {
+          line0Accum += lineContent;
+          const totalLine0 = line0Accum.length;
+          if (skipLine0Chars > 0) {
+            if (totalLine0 <= skipLine0Chars) {
+              skipLine0Chars -= totalLine0;
+              line0Accum = "";
+            } else {
+              const from = skipLine0Chars;
+              const take = Math.min(lineChunkSize, totalLine0 - from);
+              resultLines.push(line0Accum.slice(from, from + take));
+              return {
+                content: resultLines.join("\n"),
+                size: fileSize,
+                lineOffset: (lineOffsetIn ?? 0) + take,
+                totalLines: 1
+              };
+            }
+          } else if (totalLine0 > lineChunkSize) {
+            resultLines.push(line0Accum.slice(0, lineChunkSize));
+            return {
+              content: resultLines.join("\n"),
+              size: fileSize,
+              lineOffset: lineChunkSize,
+              totalLines: 1
+            };
+          }
+        }
+        partial2 = text.slice(lineStart);
+      }
+    }
+    if (!done) {
+      const tail = partial2 + decoder.end();
+      if (currentLine === 0 && (startLine === 0 || lineOffsetIn !== void 0) && tail.length > 0) {
+        line0Accum += tail.endsWith("\r") ? tail.slice(0, -1) : tail;
+        const totalLine0 = line0Accum.length;
+        if (skipLine0Chars > 0) {
+          if (totalLine0 <= skipLine0Chars) {
+            return { content: resultLines.join("\n"), size: fileSize };
+          }
+          const from = skipLine0Chars;
+          const take = Math.min(lineChunkSize, totalLine0 - from);
+          resultLines.push(line0Accum.slice(from, from + take));
+          line0CharsReturned += take;
+          if (from + take < totalLine0) {
+            return {
+              content: resultLines.join("\n"),
+              size: fileSize,
+              lineOffset: (lineOffsetIn ?? 0) + line0CharsReturned,
+              totalLines: 1
+            };
+          }
+        } else if (totalLine0 > lineChunkSize) {
+          resultLines.push(line0Accum.slice(0, lineChunkSize));
+          return {
+            content: resultLines.join("\n"),
+            size: fileSize,
+            lineOffset: lineChunkSize,
+            totalLines: 1
+          };
+        } else {
+          resultLines.push(line0Accum);
+        }
+      } else if (tail.length > 0 && currentLine >= startLine && currentLine <= endLine) {
+        resultLines.push(tail.endsWith("\r") ? tail.slice(0, -1) : tail);
+      }
+    }
+    return { content: resultLines.join("\n"), size: fileSize };
+  } finally {
+    fs19.closeSync(fd);
+  }
+}
+function readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize = LINE_CHUNK_SIZE) {
+  try {
+    const result = resolveFilePath(relativePath);
+    if (typeof result === "object") return result;
+    const hasRange = typeof startLine === "number" && typeof endLine === "number";
+    if (hasRange) {
+      return readFileRange(result, startLine, endLine, lineOffset, lineChunkSize);
+    }
+    const stat2 = fs19.statSync(result);
+    const raw = fs19.readFileSync(result, "utf8");
+    const lines = raw.split(/\r?\n/);
+    return { content: raw, totalLines: lines.length, size: stat2.size };
+  } catch (err) {
+    return { error: err instanceof Error ? err.message : String(err) };
+  }
+}
+async function readFileAsync(relativePath, startLine, endLine, lineOffset, lineChunkSize = LINE_CHUNK_SIZE) {
+  await yieldToEventLoop();
+  return readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize);
+}
+
+// src/files/handle-file-browser-search.ts
+var SEARCH_LIMIT = 100;
+function handleFileBrowserSearch(msg, socket) {
+  void (async () => {
+    await yieldToEventLoop();
+    const q = typeof msg.q === "string" ? msg.q : "";
+    const cwd = getBridgeWorkspaceDirectory();
+    const index = loadFileIndex(cwd);
+    if (index === null) {
+      sendWsMessage(socket, {
+        type: "file_browser_search_response",
+        id: msg.id,
+        paths: [],
+        indexReady: false
+      });
+      return;
+    }
+    const results = await searchFileIndexAsync(index, q, SEARCH_LIMIT);
+    sendWsMessage(socket, {
+      type: "file_browser_search_response",
+      id: msg.id,
+      paths: results,
+      indexReady: true
+    });
+  })();
+}
+function triggerFileIndexBuild() {
+  setImmediate(() => {
+    void ensureFileIndexAsync(getBridgeWorkspaceDirectory()).catch((e) => {
+      console.error("[file-index] Background build failed:", e);
+    });
+  });
+}
+
+// src/files/handle-file-browser-request.ts
+function handleFileBrowserRequest(msg, socket) {
+  void (async () => {
+    const reqPath = msg.path.replace(/^\/+/, "") || ".";
+    const op = msg.op === "read" ? "read" : "list";
+    if (op === "list") {
+      const result = await listDirAsync(reqPath);
+      if ("error" in result) {
+        sendWsMessage(socket, { type: "file_browser_response", id: msg.id, error: result.error });
+      } else {
+        sendWsMessage(socket, { type: "file_browser_response", id: msg.id, entries: result.entries });
+        if (reqPath === "." || reqPath === "") {
+          triggerFileIndexBuild();
+        }
+      }
+    } else {
+      const startLine = typeof msg.startLine === "number" ? msg.startLine : void 0;
+      const endLine = typeof msg.endLine === "number" ? msg.endLine : void 0;
+      const lineOffset = typeof msg.lineOffset === "number" ? msg.lineOffset : void 0;
+      const lineChunkSize = typeof msg.lineChunkSize === "number" ? msg.lineChunkSize : void 0;
+      const result = await readFileAsync(reqPath, startLine, endLine, lineOffset, lineChunkSize);
+      if ("error" in result) {
+        sendWsMessage(socket, { type: "file_browser_response", id: msg.id, error: result.error });
+      } else {
+        const payload = {
+          type: "file_browser_response",
+          id: msg.id,
+          content: result.content,
+          totalLines: result.totalLines,
+          size: result.size
+        };
+        if (result.lineOffset != null) payload.lineOffset = result.lineOffset;
+        sendWsMessage(socket, payload);
+      }
+    }
+  })();
+}
+
+// src/bridge/routing/handlers/file-browser-messages.ts
+function handleFileBrowserRequestMessage(msg, { getWs }) {
+  if (typeof msg.id !== "string" || typeof msg.path !== "string") return;
+  const socket = getWs();
+  if (!socket) return;
+  handleFileBrowserRequest(
+    msg,
+    socket
+  );
+}
+function handleFileBrowserSearchMessage(msg, { getWs }) {
+  if (typeof msg.id !== "string") return;
+  const socket = getWs();
+  if (!socket) return;
+  handleFileBrowserSearch(msg, socket);
+}
+
+// src/bridge/routing/handlers/skill-layout-request.ts
+function handleSkillLayoutRequest(msg, deps) {
+  const socket = deps.getWs();
+  const id = typeof msg.id === "string" ? msg.id : "";
+  const roots = discoverSkillLayoutRoots(getBridgeWorkspaceDirectory());
+  socket?.send(JSON.stringify({ type: "skill_layout_response", id, roots }));
+}
+
+// src/skills/install-remote-skills.ts
+import fs20 from "node:fs";
+import path28 from "node:path";
+function installRemoteSkills(cwd, targetDir, items) {
+  const installed = [];
+  if (!Array.isArray(items)) {
+    return { success: false, error: "Invalid items" };
+  }
+  try {
+    for (const item of items) {
+      if (typeof item.sourceId !== "string" || typeof item.skillName !== "string" || typeof item.versionHash !== "string" || !Array.isArray(item.files)) {
+        continue;
+      }
+      const skillDir = path28.join(cwd, targetDir, item.skillName);
+      for (const f of item.files) {
+        if (typeof f.path !== "string" || !f.text && !f.base64) continue;
+        const dest = path28.join(skillDir, f.path);
+        fs20.mkdirSync(path28.dirname(dest), { recursive: true });
+        if (f.text !== void 0) {
+          fs20.writeFileSync(dest, f.text, "utf8");
+        } else if (f.base64) {
+          fs20.writeFileSync(dest, Buffer.from(f.base64, "base64"));
+        }
+      }
+      installed.push({
+        sourceId: item.sourceId,
+        skillName: item.skillName,
+        versionHash: item.versionHash
+      });
+    }
+    return { success: true, installed };
+  } catch (e) {
+    return { success: false, error: e instanceof Error ? e.message : String(e) };
+  }
+}
+
+// src/bridge/routing/handlers/install-skills.ts
+var handleInstallSkillsMessage = (msg, deps) => {
+  const socket = deps.getWs();
+  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 = getBridgeWorkspaceDirectory();
+  const result = installRemoteSkills(cwd, targetDir, rawItems);
+  if (!result.success) {
+    const err = result.error ?? "Invalid items";
+    deps.log(`[Bridge service] Install skills failed: ${err}`);
+    socket?.send(JSON.stringify({ type: "install_skills_result", id, success: false, error: err }));
+    return;
+  }
+  socket?.send(JSON.stringify({ type: "install_skills_result", id, success: true, installed: result.installed }));
+};
+
+// src/bridge/routing/handlers/refresh-local-skills.ts
+var handleRefreshLocalSkills = (_msg, deps) => {
+  deps.sendLocalSkillsReport?.();
+};
+
+// src/bridge/routing/handlers/session-git-request.ts
+function sendResult(ws, id, payload) {
+  if (!ws) return;
+  sendWsMessage(ws, { type: "session_git_result", id, ...payload });
+}
+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") return;
+  void (async () => {
+    const ws = deps.getWs();
+    const reply = (payload) => sendResult(ws, msg.id, payload);
+    try {
+      if (action === "status") {
+        const r = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
+        reply({
+          ok: true,
+          hasUncommittedChanges: r.hasUncommittedChanges,
+          hasUnpushedCommits: r.hasUnpushedCommits
+        });
+        return;
+      }
+      if (action === "push") {
+        const pushRes = await deps.sessionWorktreeManager.pushSessionUpstream(sessionId);
+        if (!pushRes.ok) {
+          reply({ ok: false, error: pushRes.error ?? "Push failed" });
+          return;
+        }
+        const st2 = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
+        reply({
+          ok: true,
+          hasUncommittedChanges: st2.hasUncommittedChanges,
+          hasUnpushedCommits: st2.hasUnpushedCommits
+        });
+        return;
+      }
+      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
+      });
+    } catch (e) {
+      reply({ ok: false, error: e instanceof Error ? e.message : String(e) });
+    }
+  })();
+};
+
+// src/bridge/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/bridge/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/bridge/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/bridge/routing/handlers/revert-turn-snapshot.ts
+import * as fs21 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.getAgentCwdForSession(sessionId) ?? getBridgeWorkspaceDirectory();
+    const file2 = snapshotFilePath(agentBase, turnId);
+    if (!fs21.existsSync(file2)) {
+      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/bridge/routing/handlers/dev-server-control.ts
+var handleDevServerControl = (msg, deps) => {
+  const serverId = typeof msg.serverId === "string" ? msg.serverId : "";
+  const action = msg.action === "start" || msg.action === "stop" ? msg.action : null;
+  if (!serverId || !action) return;
+  deps.devServerManager?.handleControl(serverId, action);
+};
+
+// src/bridge/routing/handlers/dev-servers-config.ts
+var handleDevServersConfig = (msg, deps) => {
+  const devServers = msg.devServers;
+  deps.devServerManager?.applyConfig(devServers ?? []);
+};
+
+// src/bridge/routing/dispatch-bridge-message.ts
+function dispatchBridgeMessage(msg, deps) {
+  const type = msg.type;
+  if (typeof type !== "string") return;
+  switch (type) {
+    case "auth_token":
+      handleAuthToken(msg, deps);
+      break;
+    case "bridge_identified":
+      handleBridgeIdentified(msg, deps);
+      break;
+    case "dev_servers_config":
+      handleDevServersConfig(msg, deps);
+      break;
+    case "server_control":
+      handleDevServerControl(msg, deps);
+      break;
+    case "agent_config":
+      handleAgentConfigMessage(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 "cancel_run":
+      handleCancelRunMessage(msg, deps);
+      break;
+    case "cursor_request_response":
+      handleCursorRequestResponseMessage(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 "skill_layout_request":
+      handleSkillLayoutRequest(msg, deps);
+      break;
+    case "install_skills":
+      handleInstallSkillsMessage(msg, deps);
+      break;
+    case "refresh_local_skills":
+      handleRefreshLocalSkills(msg, deps);
+      break;
+    default:
+      deps.log?.(`[Bridge service] unhandled message type: ${type}`);
+  }
+}
+
+// src/bridge/routing/handle-bridge-message.ts
+function handleBridgeMessage(data, deps) {
+  const msg = data;
+  if (!deps.getWs()) return;
+  setImmediate(() => {
+    dispatchBridgeMessage(msg, deps);
+  });
 }
 
-// src/acp/detect-local-agent-types.ts
-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() {
+// src/auth/refresh-bridge-tokens.ts
+async function refreshBridgeTokens(params) {
+  const base = params.apiUrl.replace(/\/$/, "");
+  const url2 = `${base}/api/bridges/tokens/refresh`;
   try {
-    const out = [];
-    for (const mod of LOCAL_AGENT_ACP_MODULES) {
-      try {
-        if (await mod.detectLocalAgentPresence()) out.push(mod.BACKEND_LOCAL_AGENT_TYPE);
-      } catch {
-      }
-    }
-    return out;
+    const res = await fetch(url2, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        workspaceId: params.workspaceId,
+        refreshToken: params.refreshToken
+      })
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    if (typeof data.token !== "string" || typeof data.refreshToken !== "string") return null;
+    return {
+      token: data.token,
+      refreshToken: data.refreshToken,
+      workspaceId: typeof data.workspaceId === "string" ? data.workspaceId : params.workspaceId,
+      tokenId: typeof data.tokenId === "string" ? data.tokenId : ""
+    };
   } catch {
-    return [];
+    return null;
   }
 }
 
-// src/bridge/connection/create-bridge-local-reports.ts
-function createSendLocalSkillsReport(getWs, logFn) {
-  return () => {
-    try {
-      const socket = getWs();
-      if (!socket || socket.readyState !== wrapper_default.OPEN) return;
-      const skills2 = discoverLocalSkills(getBridgeWorkspaceDirectory());
-      socket.send(JSON.stringify({ type: "local_skills", skills: skills2 }));
-    } catch (e) {
-      logFn(
-        `[Bridge service] Local skills report failed: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  };
-}
-function createReportAutoDetectedAgents(getWs, logFn) {
-  return async () => {
-    try {
-      const types = await detectLocalAgentTypes();
-      const socket = getWs();
-      if (socket && socket.readyState === wrapper_default.OPEN) {
-        sendWsMessage(socket, { type: "auto_detected_agents_report", agentTypes: types });
-      }
-    } catch (e) {
-      logFn(
-        `[Bridge service] Auto-detected agents report failed: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  };
-}
-
-// src/bridge/connection/create-bridge-connection.ts
+// src/bridge/connection/main-bridge-ws-lifecycle.ts
 var BRIDGE_CLIENT_PING_MS = 25e3;
-async function createBridgeConnection(options) {
-  const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
-  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
-  const logFn = options.log ?? log;
-  let accessToken = options.authToken;
-  let refreshTok = options.refreshToken;
-  let authRefreshInFlight = false;
-  const state = {
-    closedByUser: false,
-    reconnectAttempt: 0,
-    logBridgeOpenAsReconnect: false,
-    reconnectTimeout: null,
-    currentWs: null,
-    mainQuiet: createEmptyReconnectQuietSlot(),
-    firehoseHandle: null,
-    lastFirehoseParams: null,
-    firehoseReconnectTimeout: null,
-    firehoseReconnectAttempt: 0,
-    firehoseGeneration: 0,
-    firehoseQuiet: createEmptyReconnectQuietSlot()
-  };
-  const worktreesRootAbs = options.worktreesRootAbs ?? defaultWorktreesRootAbs();
-  const sessionWorktreeManager = new SessionWorktreeManager({
-    worktreesRootAbs,
-    log: logFn
-  });
-  const acpManager = await createAcpManager({ log: logFn });
-  logFn("CLI running. Press Ctrl+C to exit.");
-  function getWs() {
-    return state.currentWs;
-  }
-  const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeCwd: getBridgeWorkspaceDirectory });
-  const onBridgeIdentified = createOnBridgeIdentified({
-    sessionWorktreeManager,
-    devServerManager,
-    firehoseServerUrl,
-    workspaceId,
+function createMainBridgeWebSocketLifecycle(params) {
+  const {
     state,
-    logFn
-  });
-  const sendLocalSkillsReport = createSendLocalSkillsReport(getWs, logFn);
-  const reportAutoDetectedAgents = createReportAutoDetectedAgents(getWs, logFn);
+    getWs,
+    apiUrl,
+    workspaceId,
+    justAuthenticated,
+    logFn,
+    messageDeps,
+    tokens,
+    persistTokens,
+    onAuthInvalid
+  } = params;
+  let authRefreshInFlight = false;
   function handleOpen() {
     const logOpenAsPostRefreshReconnect = state.logBridgeOpenAsReconnect;
     clearMainBridgeReconnectQuietOnOpen(state, logFn);
@@ -32549,8 +32758,10 @@ async function createBridgeConnection(options) {
       reportGitRepos(getWs, logFn);
     }
     if (justAuthenticated && socket) {
-      logFn("Save these for future runs (access token may rotate; refresh token is stored in ~/.buildautomaton/config.json when you use browser auth):");
-      logFn(`  export BUILDAMATON_AUTH_TOKEN="${accessToken}"`);
+      logFn(
+        "Save these for future runs (access token may rotate; refresh token is stored in ~/.buildautomaton/config.json when you use browser auth):"
+      );
+      logFn(`  export BUILDAMATON_AUTH_TOKEN="${tokens.accessToken}"`);
       logFn(`  export BUILDAMATON_WORKSPACE_ID="${workspaceId}"`);
     }
   }
@@ -32564,16 +32775,6 @@ async function createBridgeConnection(options) {
       scheduleMainBridgeReconnect(state, connect, logFn);
     }
   }
-  const messageDeps = {
-    getWs,
-    log: logFn,
-    acpManager,
-    sessionWorktreeManager,
-    onBridgeIdentified,
-    sendLocalSkillsReport,
-    reportAutoDetectedAgents,
-    devServerManager
-  };
   function connect() {
     if (state.closedByUser) return;
     if (state.reconnectTimeout != null) {
@@ -32592,7 +32793,7 @@ async function createBridgeConnection(options) {
       }
       state.currentWs = null;
     }
-    const url2 = buildBridgeUrl(apiUrl, workspaceId, accessToken);
+    const url2 = buildBridgeUrl(apiUrl, workspaceId, tokens.accessToken);
     state.currentWs = createWsBridge({
       url: url2,
       clientPingIntervalMs: BRIDGE_CLIENT_PING_MS,
@@ -32601,12 +32802,16 @@ async function createBridgeConnection(options) {
         void (async () => {
           authRefreshInFlight = true;
           try {
-            if (refreshTok) {
-              const next = await refreshBridgeTokens({ apiUrl, workspaceId, refreshToken: refreshTok });
+            if (tokens.refreshToken) {
+              const next = await refreshBridgeTokens({
+                apiUrl,
+                workspaceId,
+                refreshToken: tokens.refreshToken
+              });
               if (next?.token && next.refreshToken) {
-                accessToken = next.token;
-                refreshTok = next.refreshToken;
-                persistTokens?.({ token: accessToken, refreshToken: refreshTok });
+                tokens.accessToken = next.token;
+                tokens.refreshToken = next.refreshToken;
+                persistTokens?.({ token: tokens.accessToken, refreshToken: tokens.refreshToken });
                 logFn("[Bridge service] Access token refreshed; reconnecting\u2026");
                 state.reconnectAttempt = 0;
                 state.logBridgeOpenAsReconnect = true;
@@ -32631,6 +32836,75 @@ async function createBridgeConnection(options) {
       onMessage: (data) => handleBridgeMessage(data, messageDeps)
     });
   }
+  return { connect };
+}
+
+// src/bridge/connection/create-bridge-connection.ts
+async function createBridgeConnection(options) {
+  const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
+  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
+  const logFn = options.log ?? log;
+  const tokens = {
+    accessToken: options.authToken,
+    refreshToken: options.refreshToken
+  };
+  const state = {
+    closedByUser: false,
+    reconnectAttempt: 0,
+    logBridgeOpenAsReconnect: false,
+    reconnectTimeout: null,
+    currentWs: null,
+    mainQuiet: createEmptyReconnectQuietSlot(),
+    firehoseHandle: null,
+    lastFirehoseParams: null,
+    firehoseReconnectTimeout: null,
+    firehoseReconnectAttempt: 0,
+    firehoseGeneration: 0,
+    firehoseQuiet: createEmptyReconnectQuietSlot()
+  };
+  const worktreesRootAbs = options.worktreesRootAbs ?? defaultWorktreesRootAbs();
+  const sessionWorktreeManager = new SessionWorktreeManager({
+    worktreesRootAbs,
+    log: logFn
+  });
+  const acpManager = await createAcpManager({ log: logFn });
+  logFn("CLI running. Press Ctrl+C to exit.");
+  function getWs() {
+    return state.currentWs;
+  }
+  const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeCwd: getBridgeWorkspaceDirectory });
+  const onBridgeIdentified = createOnBridgeIdentified({
+    sessionWorktreeManager,
+    devServerManager,
+    firehoseServerUrl,
+    workspaceId,
+    state,
+    logFn
+  });
+  const sendLocalSkillsReport = createSendLocalSkillsReport(getWs, logFn);
+  const reportAutoDetectedAgents = createReportAutoDetectedAgents(getWs, logFn);
+  const messageDeps = {
+    getWs,
+    log: logFn,
+    acpManager,
+    sessionWorktreeManager,
+    onBridgeIdentified,
+    sendLocalSkillsReport,
+    reportAutoDetectedAgents,
+    devServerManager
+  };
+  const { connect } = createMainBridgeWebSocketLifecycle({
+    state,
+    getWs,
+    apiUrl,
+    workspaceId,
+    justAuthenticated: justAuthenticated === true,
+    logFn,
+    messageDeps,
+    tokens,
+    persistTokens,
+    onAuthInvalid
+  });
   connect();
   const stopFileIndexWatcher = startFileIndexWatcher(getBridgeWorkspaceDirectory());
   return {