@buildautomaton/cli 0.1.89 → 0.1.90

package/dist/cli.js

@@ -973,8 +973,8 @@ var require_command = __commonJS({
   "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js"(exports) {
     var EventEmitter2 = __require("node:events").EventEmitter;
     var childProcess2 = __require("node:child_process");
-    var path91 = __require("node:path");
-    var fs69 = __require("node:fs");
+    var path88 = __require("node:path");
+    var fs66 = __require("node:fs");
     var process9 = __require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1906,11 +1906,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path91.resolve(baseDir, baseName);
-          if (fs69.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path91.extname(baseName))) return void 0;
+          const localBin = path88.resolve(baseDir, baseName);
+          if (fs66.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path88.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs69.existsSync(`${localBin}${ext}`)
+            (ext) => fs66.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -1922,21 +1922,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs69.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs66.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path91.resolve(
-            path91.dirname(resolvedScriptPath),
+          executableDir = path88.resolve(
+            path88.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path91.basename(
+            const legacyName = path88.basename(
               this._scriptPath,
-              path91.extname(this._scriptPath)
+              path88.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -1947,7 +1947,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path91.extname(executableFile));
+        launchWithNode = sourceExt.includes(path88.extname(executableFile));
         let proc;
         if (process9.platform !== "win32") {
           if (launchWithNode) {
@@ -2787,7 +2787,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path91.basename(filename, path91.extname(filename));
+        this._name = path88.basename(filename, path88.extname(filename));
         return this;
       }
       /**
@@ -2801,9 +2801,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path92) {
-        if (path92 === void 0) return this._executableDir;
-        this._executableDir = path92;
+      executableDir(path89) {
+        if (path89 === void 0) return this._executableDir;
+        this._executableDir = path89;
         return this;
       }
       /**
@@ -6662,7 +6662,6 @@ function normalizeResolvedPath(resolved) {
 }
 var init_normalize_resolved_path = __esm({
   "../bridge/src/paths/normalize-resolved-path.ts"() {
-    "use strict";
   }
 });
 
@@ -6690,7 +6689,7 @@ var require_tree_kill = __commonJS({
   "../../node_modules/.pnpm/tree-kill@1.2.2/node_modules/tree-kill/index.js"(exports, module) {
     "use strict";
     var childProcess2 = __require("child_process");
-    var spawn12 = childProcess2.spawn;
+    var spawn11 = childProcess2.spawn;
     var exec = childProcess2.exec;
     module.exports = function(pid, signal, callback) {
       if (typeof signal === "function" && callback === void 0) {
@@ -6715,7 +6714,7 @@ var require_tree_kill = __commonJS({
           break;
         case "darwin":
           buildProcessTree(pid, tree, pidsToProcess, function(parentPid) {
-            return spawn12("pgrep", ["-P", parentPid]);
+            return spawn11("pgrep", ["-P", parentPid]);
           }, function() {
             killAll(tree, signal, callback);
           });
@@ -6727,7 +6726,7 @@ var require_tree_kill = __commonJS({
         //     break;
         default:
           buildProcessTree(pid, tree, pidsToProcess, function(parentPid) {
-            return spawn12("ps", ["-o", "pid", "--no-headers", "--ppid", parentPid]);
+            return spawn11("ps", ["-o", "pid", "--no-headers", "--ppid", parentPid]);
           }, function() {
             killAll(tree, signal, callback);
           });
@@ -6795,7 +6794,7 @@ var require_tree_kill = __commonJS({
   }
 });
 
-// ../bridge/src/cli-log-level.ts
+// ../bridge/src/cli/cli-log-level.ts
 function setCliLogVerbosity(level) {
   verbosity = level;
 }
@@ -6807,13 +6806,12 @@ function isCliTrace() {
 }
 var verbosity;
 var init_cli_log_level = __esm({
-  "../bridge/src/cli-log-level.ts"() {
-    "use strict";
+  "../bridge/src/cli/cli-log-level.ts"() {
     verbosity = "info";
   }
 });
 
-// ../bridge/src/log.ts
+// ../bridge/src/cli/log.ts
 function timestampPrefix() {
   const time3 = (/* @__PURE__ */ new Date()).toISOString().slice(11, 19);
   return `[${time3}]`;
@@ -6835,8 +6833,7 @@ function logTrace(line) {
   console.log(`${timestampPrefix()} [trace] ${line}`);
 }
 var init_log = __esm({
-  "../bridge/src/log.ts"() {
-    "use strict";
+  "../bridge/src/cli/log.ts"() {
     init_cli_log_level();
   }
 });
@@ -7088,10 +7085,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path91) {
-  if (!path91)
+function getElementAtPath(obj, path88) {
+  if (!path88)
     return obj;
-  return path91.reduce((acc, key) => acc?.[key], obj);
+  return path88.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -7419,11 +7416,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path91, issues) {
+function prefixIssues(path88, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path91);
+    iss.path.unshift(path88);
     return iss;
   });
 }
@@ -7640,16 +7637,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path91 = []) => {
+  const processError = (error52, path88 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path91, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path88, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path91, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path91, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else {
-        const fullpath = [...path91, ...issue2.path];
+        const fullpath = [...path88, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -7676,17 +7673,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path91 = []) => {
+  const processError = (error52, path88 = []) => {
     var _a4, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path91, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path88, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path91, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path91, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else {
-        const fullpath = [...path91, ...issue2.path];
+        const fullpath = [...path88, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -7718,8 +7715,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path91 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path91) {
+  const path88 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path88) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -21149,13 +21146,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path91 = ref.slice(1).split("/").filter(Boolean);
-  if (path91.length === 0) {
+  const path88 = ref.slice(1).split("/").filter(Boolean);
+  if (path88.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path91[0] === defsKey) {
-    const key = path91[1];
+  if (path88[0] === defsKey) {
+    const key = path88[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -24035,7 +24032,6 @@ function yieldToEventLoop() {
 }
 var init_yield_to_event_loop = __esm({
   "../bridge/src/runtime/yield-to-event-loop.ts"() {
-    "use strict";
   }
 });
 
@@ -24046,7 +24042,6 @@ function isSymbolIndexDeferredError(err) {
 var SymbolIndexDeferredError;
 var init_deferred_indexing = __esm({
   "../bridge/src/code-nav/symbol-index/deferred-indexing.ts"() {
-    "use strict";
     SymbolIndexDeferredError = class extends Error {
       constructor() {
         super("Symbol indexing deferred for file browser");
@@ -24113,7 +24108,6 @@ var init_idle_yield = __esm({
 // ../bridge/src/files/browser/in-flight.ts
 var init_in_flight = __esm({
   "../bridge/src/files/browser/in-flight.ts"() {
-    "use strict";
     init_activity_shared();
     init_activity_types();
     init_activity_tracker();
@@ -24242,7 +24236,6 @@ function maybeLogCodeNavCacheWorkerError(message) {
 var diagnosticSink, lastDiagnosticKey;
 var init_code_nav_cache_log = __esm({
   "../bridge/src/sqlite/code-nav-cache/code-nav-cache-log.ts"() {
-    "use strict";
     init_log();
     init_sqlite_errors();
     init_sqlite_lock_path();
@@ -24379,7 +24372,6 @@ function resetCodeNavCacheAvailabilityForTests() {
 var initState, initPromise, CodeNavCacheUnavailableError;
 var init_code_nav_cache_availability = __esm({
   "../bridge/src/sqlite/code-nav-cache/code-nav-cache-availability.ts"() {
-    "use strict";
     init_log();
     init_in_flight();
     init_sqlite_errors();
@@ -24756,7 +24748,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join2(moduleDir, "..", sub, filename),
     join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path91) => existsSync(path91));
+  const resolved = candidates.find((path88) => existsSync(path88));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -25073,7 +25065,6 @@ async function ensureCodeNavCacheSqliteInitialized() {
 var safeCloseCodeNavCacheSqliteDatabase, openCodeNavCacheSqliteConnection;
 var init_database = __esm({
   "../bridge/src/sqlite/code-nav-cache/database.ts"() {
-    "use strict";
     init_code_nav_cache_availability();
     init_instance();
     init_sqlite_errors();
@@ -25102,7 +25093,6 @@ function runCodeNavCacheWriteTransaction(db, fn) {
 }
 var init_code_nav_cache_sqlite_transaction = __esm({
   "../bridge/src/sqlite/code-nav-cache/code-nav-cache-sqlite-transaction.ts"() {
-    "use strict";
   }
 });
 
@@ -25157,7 +25147,6 @@ function getPromptQueuesDirectory() {
 }
 var init_paths2 = __esm({
   "../bridge/src/prompt-turn-queue/paths.ts"() {
-    "use strict";
   }
 });
 
@@ -25447,7 +25436,6 @@ function closeAllCliSqliteConnections() {
 var legacyImportDoneForPath, cliSqlite, safeCloseCliSqliteDatabase, openCliSqliteConnection, withCliSqliteSync, withCliSqlite, ensureCliSqliteInitialized;
 var init_cli_database = __esm({
   "../bridge/src/sqlite/cli-database.ts"() {
-    "use strict";
     init_cli_process_interrupt();
     init_cli_sqlite_paths();
     init_access();
@@ -25834,7 +25822,7 @@ var require_ignore = __commonJS({
       //   path matching.
       // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE`
       // @returns {TestResult} true if a file is ignored
-      test(path91, checkUnignored, mode) {
+      test(path88, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -25843,7 +25831,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path91);
+          const matched = rule[mode].test(path88);
           if (!matched) {
             return;
           }
@@ -25864,17 +25852,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path91, originalPath, doThrow) => {
-      if (!isString(path91)) {
+    var checkPath = (path88, originalPath, doThrow) => {
+      if (!isString(path88)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path91) {
+      if (!path88) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path91)) {
+      if (checkPath.isNotRelative(path88)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -25883,7 +25871,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path91) => REGEX_TEST_INVALID_PATH.test(path91);
+    var isNotRelative = (path88) => REGEX_TEST_INVALID_PATH.test(path88);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -25913,19 +25901,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path91 = originalPath && checkPath.convert(originalPath);
+        const path88 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path91,
+          path88,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path91, cache2, checkUnignored, slices);
+        return this._t(path88, cache2, checkUnignored, slices);
       }
-      checkIgnore(path91) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path91)) {
-          return this.test(path91);
+      checkIgnore(path88) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path88)) {
+          return this.test(path88);
         }
-        const slices = path91.split(SLASH).filter(Boolean);
+        const slices = path88.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -25938,18 +25926,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path91, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path88, false, MODE_CHECK_IGNORE);
       }
-      _t(path91, cache2, checkUnignored, slices) {
-        if (path91 in cache2) {
-          return cache2[path91];
+      _t(path88, cache2, checkUnignored, slices) {
+        if (path88 in cache2) {
+          return cache2[path88];
         }
         if (!slices) {
-          slices = path91.split(SLASH).filter(Boolean);
+          slices = path88.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path91] = this._rules.test(path91, checkUnignored, MODE_IGNORE);
+          return cache2[path88] = this._rules.test(path88, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -25957,29 +25945,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path91] = parent.ignored ? parent : this._rules.test(path91, checkUnignored, MODE_IGNORE);
+        return cache2[path88] = parent.ignored ? parent : this._rules.test(path88, checkUnignored, MODE_IGNORE);
       }
-      ignores(path91) {
-        return this._test(path91, this._ignoreCache, false).ignored;
+      ignores(path88) {
+        return this._test(path88, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path91) => !this.ignores(path91);
+        return (path88) => !this.ignores(path88);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path91) {
-        return this._test(path91, this._testCache, true);
+      test(path88) {
+        return this._test(path88, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path91) => checkPath(path91 && checkPath.convert(path91), path91, RETURN_FALSE);
+    var isPathValid = (path88) => checkPath(path88 && checkPath.convert(path88), path88, RETURN_FALSE);
     var setupWindows = () => {
       const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
       checkPath.convert = makePosix;
       const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-      checkPath.isNotRelative = (path91) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path91) || isNotRelative(path91);
+      checkPath.isNotRelative = (path88) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path88) || isNotRelative(path88);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -29524,12 +29512,11 @@ __export(lifecycle_exports, {
 });
 var init_lifecycle2 = __esm({
   "../bridge/src/code-nav/symbol-index/worker/lifecycle.ts"() {
-    "use strict";
     init_lifecycle();
   }
 });
 
-// ../bridge/src/runtime/cli-process-interrupt.ts
+// ../bridge/src/cli/teardown/cli-process-interrupt.ts
 function requestCliImmediateShutdown() {
   if (cliImmediateShutdownRequested) return;
   cliImmediateShutdownRequested = true;
@@ -29576,7 +29563,7 @@ async function delayMsUnlessShutdownRequested(ms) {
 }
 var cliImmediateShutdownRequested, symbolIndexShutdownPromise;
 var init_cli_process_interrupt = __esm({
-  "../bridge/src/runtime/cli-process-interrupt.ts"() {
+  "../bridge/src/cli/teardown/cli-process-interrupt.ts"() {
     "use strict";
     cliImmediateShutdownRequested = false;
     symbolIndexShutdownPromise = null;
@@ -30357,10 +30344,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(path91, isFile, isDirectory) {
-      log2(`checking %s`, path91);
+    function check2(path88, isFile, isDirectory) {
+      log2(`checking %s`, path88);
       try {
-        const stat3 = fs_1.statSync(path91);
+        const stat3 = fs_1.statSync(path88);
         if (stat3.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -30380,8 +30367,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path91, type = exports.READABLE) {
-      return check2(path91, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path88, type = exports.READABLE) {
+      return check2(path88, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -30462,14 +30449,14 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.89".length > 0 ? "0.1.89" : "0.0.0-dev";
+var CLI_VERSION = "0.1.90".length > 0 ? "0.1.90" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
 var DEFAULT_FIREHOSE_URL = "https://buildautomaton-firehose.fly.dev";
 
 // src/cli/run-cli-action.ts
-import * as path90 from "node:path";
+import * as path87 from "node:path";
 
 // ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -30479,7 +30466,7 @@ var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
-// ../bridge/src/connection/cli-ws-client.ts
+// ../bridge/src/connection/ws/cli-ws-client.ts
 import https from "node:https";
 var CLI_WEBSOCKET_CLIENT_PING_MS = 25e3;
 function attachWebSocketClientPing(ws, intervalMs) {
@@ -30539,11 +30526,11 @@ function safeSendWebSocketBinary(ws, data) {
   }
 }
 
-// ../bridge/src/connection/create-ws-bridge-options.ts
+// ../bridge/src/connection/ws/create-ws-bridge-options.ts
 var BRIDGE_AUTH_ERROR_HEADER = "x-bridge-auth-error";
 var BRIDGE_AUTH_ERROR_TOKEN_INVALID = "token_invalid";
 
-// ../bridge/src/connection/dispatch-ws-inbound-message.ts
+// ../bridge/src/connection/ws/dispatch-ws-inbound-message.ts
 function dispatchWsInboundMessage(raw, ws, onMessage, isActiveSocket) {
   if (isActiveSocket && !isActiveSocket(ws)) return;
   try {
@@ -30562,7 +30549,7 @@ function dispatchWsInboundMessage(raw, ws, onMessage, isActiveSocket) {
   }
 }
 
-// ../bridge/src/connection/parse-compact-heartbeat-ack.ts
+// ../bridge/src/connection/heartbeat/parse-compact-heartbeat-ack.ts
 function tryParseCompactHeartbeatAck(raw) {
   let str = null;
   if (typeof raw === "string") {
@@ -30588,7 +30575,7 @@ function tryParseCompactHeartbeatAck(raw) {
   }
 }
 
-// ../bridge/src/connection/create-ws-bridge.ts
+// ../bridge/src/connection/ws/create-ws-bridge.ts
 function createWsBridge(options) {
   const {
     url: url2,
@@ -30745,7 +30732,7 @@ function formatSpawnError(err, command) {
 }
 
 // ../bridge/src/agents/acp/clients/kill-process-tree.ts
-var import_tree_kill = __toESM(require_tree_kill(), 1);
+var import_tree_kill = __toESM(require_tree_kill());
 import { promisify } from "node:util";
 var treeKillAsync = promisify(import_tree_kill.default);
 var ACP_PROCESS_TREE_KILL_GRACE_MS = 2500;
@@ -30814,7 +30801,7 @@ function forceAcpSubprocessDisconnect(child) {
   killChildProcessTree(child, "SIGKILL");
 }
 
-// ../bridge/src/lib/local-agent-auth.ts
+// ../bridge/src/agents/local-agent-auth.ts
 var LOCAL_AGENT_AUTH_ERROR_HINTS = {
   "kiro-acp": [/not logged in/i, /kiro-cli\s+login/i, /log in with kiro-cli/i],
   "cursor-cli": [/cursor_login/i, /authenticate.*cursor/i, /not logged in.*cursor/i, /run:\s*agent\s+login/i],
@@ -31450,8 +31437,8 @@ function getErrorMap() {
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path91, errorMaps, issueData } = params;
-  const fullPath = [...path91, ...issueData.path || []];
+  const { data, path: path88, errorMaps, issueData } = params;
+  const fullPath = [...path88, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -31567,11 +31554,11 @@ var errorUtil;
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path91, key) {
+  constructor(parent, value, path88, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path91;
+    this._path = path88;
     this._key = key;
   }
   get path() {
@@ -36952,188 +36939,14 @@ async function proxyToLocalStreaming(request, callbacks) {
   });
 }
 
-// ../bridge/src/skills/preview.ts
-import { spawn as spawn2 } from "node:child_process";
-var PREVIEW_API_BASE_PATH = "/__preview";
-var PREVIEW_SECRET_HEADER = "X-Preview-Secret";
-var DEFAULT_PORT = 3e3;
-var DEFAULT_COMMAND = "npm run preview";
-var PREVIEW_COMMAND_ENV = "BUILDAUTOMATON_PREVIEW_COMMAND";
-var PREVIEW_PORT_ENV = "BUILDAUTOMATON_PREVIEW_PORT";
-var previewProcess = null;
-var previewPort = DEFAULT_PORT;
-var previewSecret = "";
-function getPreviewCommand() {
-  return process.env[PREVIEW_COMMAND_ENV]?.trim() || DEFAULT_COMMAND;
-}
-function randomSecret() {
-  const bytes = new Uint8Array(32);
-  if (typeof crypto !== "undefined" && crypto.getRandomValues) {
-    crypto.getRandomValues(bytes);
-  }
-  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
-}
-async function requestPreviewApi(port, secret, method, path91, body) {
-  const url2 = `http://127.0.0.1:${port}${path91}`;
-  const headers = {
-    [PREVIEW_SECRET_HEADER]: secret,
-    "Content-Type": "application/json"
-  };
-  const res = await fetch(url2, {
-    method,
-    headers,
-    body: body !== void 0 ? JSON.stringify(body) : void 0
-  });
-  const data = await res.json().catch(() => ({}));
-  if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path91}: ${res.status}`);
-  }
-  return data;
-}
-var OPERATIONS = [
-  {
-    id: "start",
-    description: "Start the preview server process (runs the configured command with PORT and PREVIEW_SECRET).",
-    params: [
-      { name: "port", description: "Port for the preview server", type: "number", required: false }
-    ]
-  },
-  {
-    id: "stop",
-    description: "Stop the preview server via POST /__preview/stop (graceful shutdown).",
-    params: []
-  },
-  {
-    id: "status",
-    description: "Return status from GET /__preview/status (running, url).",
-    params: []
-  }
-];
-var previewSkill = {
-  id: "preview",
-  name: "Preview",
-  description: "Start and manage a local preview server that implements the BuildAutomaton Preview Server API. Configure the command with BUILDAUTOMATON_PREVIEW_COMMAND (default: npm run preview). The server receives PORT and PREVIEW_SECRET and must expose /__preview/status and /__preview/stop.",
-  operations: OPERATIONS,
-  async execute(operationId, params) {
-    const command = getPreviewCommand();
-    switch (operationId) {
-      case "start": {
-        if (previewProcess) {
-          return {
-            ok: false,
-            message: "Preview server already running",
-            url: `http://localhost:${previewPort}`
-          };
-        }
-        const port = params.port ?? (Number(process.env[PREVIEW_PORT_ENV]) || DEFAULT_PORT);
-        previewPort = port;
-        previewSecret = randomSecret();
-        const isWindows = process.platform === "win32";
-        const parts = command.split(/\s+/);
-        const exe = parts[0];
-        const args = parts.slice(1);
-        previewProcess = spawn2(isWindows && exe === "npm" ? "npm.cmd" : exe, args, {
-          cwd: getBridgeRoot(),
-          stdio: ["ignore", "pipe", "pipe"],
-          env: {
-            ...process.env,
-            PORT: String(port),
-            PREVIEW_SECRET: previewSecret
-          }
-        });
-        previewProcess.stdout?.on("data", (d) => process.stdout.write(d));
-        previewProcess.stderr?.on("data", (d) => process.stderr.write(d));
-        previewProcess.on("exit", (code) => {
-          previewProcess = null;
-          if (code !== null && code !== 0) {
-            process.stderr.write(`Preview server exited with code ${code}
-`);
-          }
-        });
-        return {
-          ok: true,
-          message: `Preview server starting (${command}, port=${port})`,
-          url: `http://localhost:${port}`,
-          port
-        };
-      }
-      case "stop": {
-        if (!previewProcess) {
-          return { ok: true, message: "No preview server was running" };
-        }
-        if (!previewSecret) {
-          previewProcess.kill("SIGTERM");
-          previewProcess = null;
-          return { ok: true, message: "Preview process stopped (no secret)" };
-        }
-        try {
-          await requestPreviewApi(
-            previewPort,
-            previewSecret,
-            "POST",
-            `${PREVIEW_API_BASE_PATH}/stop`
-          );
-        } catch (e) {
-          previewProcess.kill("SIGTERM");
-        }
-        previewProcess = null;
-        previewSecret = "";
-        return { ok: true, message: "Preview server stop requested" };
-      }
-      case "status": {
-        if (!previewProcess || !previewSecret) {
-          return {
-            running: previewProcess != null,
-            url: previewProcess ? `http://localhost:${previewPort}` : void 0,
-            message: previewProcess ? `Process running at http://localhost:${previewPort}` : "No preview server running"
-          };
-        }
-        try {
-          const status = await requestPreviewApi(
-            previewPort,
-            previewSecret,
-            "GET",
-            `${PREVIEW_API_BASE_PATH}/status`
-          );
-          return {
-            running: status.status === "running",
-            status: status.status,
-            url: status.url ?? `http://localhost:${previewPort}`,
-            message: status.message ?? (status.status === "running" ? "Preview server running" : "Stopping")
-          };
-        } catch {
-          return {
-            running: previewProcess != null,
-            url: `http://localhost:${previewPort}`,
-            message: "Process running but status endpoint unreachable (server may not implement Preview Server API yet)"
-          };
-        }
-      }
-      default:
-        throw new Error(`Unknown operation: ${operationId}`);
-    }
-  }
-};
-
-// ../bridge/src/skills/index.ts
-var skills = [previewSkill];
-function getSkill(id) {
-  return skills.find((s) => s.id === id);
-}
-async function callSkill(skillId, operationId, params) {
-  const skill = getSkill(skillId);
-  if (!skill) throw new Error(`Skill not found: ${skillId}`);
-  return skill.execute(operationId, params);
-}
-
 // ../bridge/src/index.ts
 init_log();
 init_cli_log_level();
 
-// ../bridge/src/run-bridge.ts
+// ../bridge/src/cli/run-bridge.ts
 init_log();
 
-// ../bridge/src/process-bridge-resilience.ts
+// ../bridge/src/cli/teardown/process-bridge-resilience.ts
 init_log();
 var installed = false;
 function installBridgeProcessResilience() {
@@ -37147,7 +36960,7 @@ function installBridgeProcessResilience() {
   });
 }
 
-// ../bridge/src/run-bridge-connected.ts
+// ../bridge/src/cli/run-bridge-connected.ts
 init_log();
 
 // ../bridge/src/agents/acp/clients/bridge-agent-path.ts
@@ -38294,7 +38107,7 @@ function startFileIndexWatcher(cwd = getBridgeRoot()) {
   };
 }
 
-// ../bridge/src/connection/create-bridge-connection.ts
+// ../bridge/src/connection/runtime/create-bridge-connection.ts
 init_cli_process_interrupt();
 
 // ../bridge/src/preview-environments/manager/constants.ts
@@ -38302,13 +38115,13 @@ var BRIDGE_CLOSE_PREVIEW_ENVIRONMENT_GRACE_MS = 0;
 var BRIDGE_SHUTDOWN_GRACE_MS = 8e3;
 var PREVIEW_ENVIRONMENT_STOP_GRACE_MS = 2500;
 
-// ../bridge/src/connection/close-bridge-connection.ts
+// ../bridge/src/connection/runtime/close-bridge-connection.ts
 init_log();
 init_cli_process_interrupt();
 init_cli_database();
 init_database();
 
-// ../bridge/src/connection/ws-close-diagnostics.ts
+// ../bridge/src/connection/ws/ws-close-diagnostics.ts
 function describeWebSocketCloseCode(code) {
   const known = {
     1e3: "normal closure",
@@ -38408,7 +38221,7 @@ function beginDeferredDisconnectForReconnect(options) {
   }
 }
 
-// ../bridge/src/connection/close-bridge-connection.ts
+// ../bridge/src/connection/runtime/close-bridge-connection.ts
 async function closeBridgeConnection(state, acpManager, previewEnvironmentManager, log2) {
   requestCliImmediateShutdown();
   const say = log2 ?? logImmediate;
@@ -38544,7 +38357,7 @@ function resolveSessionParentPathForAgentProcess(resolvedSessionParentPath) {
   return getBridgeRoot();
 }
 
-// ../bridge/src/error-message.ts
+// ../bridge/src/cli/error-message.ts
 function errorMessage(err) {
   if (err instanceof Error) return err.message;
   if (err != null && typeof err === "object" && "message" in err)
@@ -39348,10 +39161,10 @@ async function initCursorAcpWire(options) {
 }
 
 // ../bridge/src/agents/acp/clients/cursor/spawn-cursor-acp-process.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 function spawnCursorAcpProcess(options) {
   const isWindows = process.platform === "win32";
-  const child = spawn3(options.command[0], options.command.slice(1), {
+  const child = spawn2(options.command[0], options.command.slice(1), {
     cwd: options.cwd,
     stdio: ["pipe", "pipe", "pipe"],
     env: bridgeInstalledAgentAuthProcessEnv(process.env),
@@ -39543,7 +39356,7 @@ function resolveAgentCommand(preferredAgentType) {
 import { existsSync as existsSync4, statSync } from "node:fs";
 
 // ../bridge/src/git/git-exec.ts
-import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn4 } from "node:child_process";
+import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn3 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 
 // ../bridge/src/git/git-runtime.ts
@@ -40837,8 +40650,8 @@ function augmentPromptResultAuthFields(agentType, errorText) {
 init_yield_to_event_loop();
 
 // ../bridge/src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path91) {
-  return path91.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path88) {
+  return path88.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // ../bridge/src/git/changes/parse/parse-name-status-entries.ts
@@ -41549,15 +41362,12 @@ async function createAcpManager(options) {
   };
 }
 
-// ../bridge/src/lib/e2ee/cli-e2ee-key.ts
-import { createHash, randomBytes } from "node:crypto";
-
-// ../e2ee/src/constants.ts
+// ../bridge/src/e2ee/constants.ts
 var E2EE_ALG = "A1";
 var E2EE_KEY_BYTES = 32;
 var E2EE_NONCE_BYTES = 12;
 
-// ../e2ee/src/types.ts
+// ../bridge/src/e2ee/types.ts
 function isE2eeEnvelope(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
   const o = value;
@@ -41569,7 +41379,7 @@ function isE2eeKeyRecord(value) {
   return typeof o.id === "string" && o.id.length > 0 && typeof o.name === "string" && o.name.length > 0 && o.a === E2EE_ALG && typeof o.k === "string" && o.k.length > 0 && typeof o.createdAt === "string" && o.createdAt.length > 0;
 }
 
-// ../e2ee/src/encoding.ts
+// ../bridge/src/e2ee/encoding.ts
 function base64UrlEncode(bytes) {
   let binary = "";
   for (let i = 0; i < bytes.length; i += 1) binary += String.fromCharCode(bytes[i]);
@@ -41585,7 +41395,7 @@ function base64UrlDecode(value) {
   return out;
 }
 
-// ../e2ee/src/pem.ts
+// ../bridge/src/e2ee/pem.ts
 var E2EE_PEM_LABEL = "BUILD AUTOMATON E2EE KEY";
 function pemHeaderValue(headers, name) {
   return headers[name.toLowerCase()];
@@ -41658,7 +41468,8 @@ function serializeE2eeKeyRecord(key) {
   ].join("\n");
 }
 
-// ../bridge/src/lib/e2ee/cli-e2ee-key.ts
+// ../bridge/src/e2ee/cli-e2ee-key.ts
+import { createHash, randomBytes } from "node:crypto";
 function createE2eeKeyRecord(name) {
   const raw = randomBytes(E2EE_KEY_BYTES);
   const digest = createHash("sha256").update(raw).digest();
@@ -41671,7 +41482,7 @@ function createE2eeKeyRecord(name) {
   };
 }
 
-// ../bridge/src/lib/e2ee/cli-e2ee-runtime.ts
+// ../bridge/src/e2ee/cli-e2ee-runtime.ts
 import { createCipheriv, createDecipheriv, randomBytes as randomBytes2 } from "node:crypto";
 function nonceFromCounter(prefix, counter) {
   const nonce = Buffer.alloc(E2EE_NONCE_BYTES);
@@ -41750,7 +41561,7 @@ function createCliE2eeRuntime(key) {
   };
 }
 
-// ../bridge/src/lib/e2ee/decrypt-stored-e2ee-content.ts
+// ../bridge/src/e2ee/decrypt-stored-e2ee-content.ts
 function parseJsonObject(raw) {
   try {
     const parsed = JSON.parse(raw);
@@ -41816,6 +41627,126 @@ function decryptCliE2eeMessageField(payload, field, e2ee) {
   return typeof value === "string" ? value : JSON.stringify(value);
 }
 
+// ../bridge/src/e2ee/certificates.ts
+import * as fs20 from "node:fs/promises";
+import * as path34 from "node:path";
+var E2E_CERTIFICATE_ALGORITHM = "A1";
+var CERTIFICATE_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".pem", ".key", ".crt"]);
+function certificateFromKey({
+  raw,
+  name,
+  createdAt
+}) {
+  try {
+    const key = parseE2eeKeyRecord(raw, name);
+    return {
+      ...key,
+      name: key.name || name,
+      algorithm: E2E_CERTIFICATE_ALGORITHM,
+      pemBundle: serializeE2eeKeyRecord({ ...key, createdAt: key.createdAt || createdAt })
+    };
+  } catch {
+    return void 0;
+  }
+}
+function baseNameForCertificate(fileName) {
+  return path34.basename(fileName, path34.extname(fileName)) || "BuildAutomaton E2EE certificate";
+}
+async function readCertificateFiles(directory) {
+  let entries;
+  try {
+    entries = await fs20.readdir(directory, { withFileTypes: true });
+  } catch (err) {
+    const nodeErr = err;
+    if (nodeErr.code === "ENOENT") return [];
+    throw err;
+  }
+  const certificates = [];
+  for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
+    if (!entry.isFile() || !CERTIFICATE_FILE_EXTENSIONS.has(path34.extname(entry.name).toLowerCase())) continue;
+    const filePath = path34.join(directory, entry.name);
+    const raw = await fs20.readFile(filePath, "utf8").catch(() => void 0);
+    if (!raw) continue;
+    const stat3 = await fs20.stat(filePath).catch(() => void 0);
+    const certificate = certificateFromKey({
+      raw,
+      name: baseNameForCertificate(entry.name),
+      createdAt: stat3?.mtime?.toISOString() ?? (/* @__PURE__ */ new Date()).toISOString()
+    });
+    if (certificate) {
+      certificates.push(certificate);
+    }
+  }
+  return certificates;
+}
+function createCertificate(directory) {
+  const baseName = path34.basename(directory) || "BuildAutomaton E2EE certificate";
+  const key = createE2eeKeyRecord(baseName);
+  return {
+    ...key,
+    algorithm: E2E_CERTIFICATE_ALGORITHM,
+    pemBundle: serializeE2eeKeyRecord(key)
+  };
+}
+async function loadOrCreateE2eCertificates(directory) {
+  const resolved = path34.resolve(directory);
+  await fs20.mkdir(resolved, { recursive: true, mode: 448 });
+  const existing = await readCertificateFiles(resolved);
+  if (existing.length > 0) {
+    return {
+      directory: resolved,
+      certificates: existing,
+      activeCertificate: existing[0],
+      generated: false
+    };
+  }
+  const certificate = createCertificate(resolved);
+  const fileName = `buildautomaton-e2ee-key-${certificate.id.slice(0, 12)}.pem`;
+  await fs20.writeFile(path34.join(resolved, fileName), certificate.pemBundle, {
+    mode: 384
+  });
+  return {
+    directory: resolved,
+    certificates: [certificate],
+    activeCertificate: certificate,
+    generated: true
+  };
+}
+
+// ../bridge/src/e2ee/key-command.ts
+import * as readline2 from "node:readline";
+function installE2eCertificateKeyCommand({
+  log: log2,
+  onOpenCertificate,
+  onInterrupt
+}) {
+  if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== "function") {
+    log2("[E2EE] Press c to import the E2EE key in a browser when running in an interactive terminal.");
+    return () => {
+    };
+  }
+  readline2.emitKeypressEvents(process.stdin);
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  const onKeypress = (str, key) => {
+    if (key?.ctrl && key.name === "c") {
+      onInterrupt();
+      return;
+    }
+    if (!key?.ctrl && !key?.meta && (key?.name === "c" || str === "c")) {
+      onOpenCertificate();
+    }
+  };
+  process.stdin.on("keypress", onKeypress);
+  log2("[E2EE] Press c to import the active E2EE key into the browser.");
+  return () => {
+    process.stdin.off("keypress", onKeypress);
+    if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
+      process.stdin.setRawMode(false);
+    }
+  };
+}
+
 // ../bridge/src/mcp/create-empty-mcp-tool-registry.ts
 function createEmptyMcpToolRegistry() {
   return {
@@ -41964,7 +41895,7 @@ async function createBridgeAccessState(options) {
 }
 
 // ../bridge/src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-import * as path35 from "node:path";
+import * as path36 from "node:path";
 
 // ../bridge/src/agents/detect-local-agent-types.ts
 init_yield_to_event_loop();
@@ -42069,7 +42000,7 @@ function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
 init_cli_database();
 
 // ../bridge/src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
-import * as path34 from "node:path";
+import * as path35 from "node:path";
 init_cli_database();
 init_cli_process_interrupt();
 async function probeOneAgentTypeForCapabilities(params) {
@@ -42109,7 +42040,7 @@ async function probeOneAgentTypeForCapabilities(params) {
     if (!canContinue()) return false;
     handle = await resolved.createClient({
       command: resolved.command,
-      cwd: path34.resolve(cwd),
+      cwd: path35.resolve(cwd),
       backendAgentType: agentType,
       sessionMode: "agent",
       persistedAcpSessionId: null,
@@ -42202,7 +42133,7 @@ async function warmupAgentCapabilitiesOnConnect(params) {
   const { workspaceId, log: log2, getWs } = params;
   const isCurrent = beginAgentCapabilityWarmupRun();
   if (!isCurrent()) return;
-  const cwd = path35.resolve(getBridgeRoot());
+  const cwd = path36.resolve(getBridgeRoot());
   async function sendBatchFromCache() {
     if (!isCurrent()) return;
     const socket = getWs();
@@ -42268,7 +42199,7 @@ async function warmupAgentCapabilitiesOnConnect(params) {
   })();
 }
 
-// ../bridge/src/connection/create-bridge-agent-capabilities-reporter.ts
+// ../bridge/src/connection/reports/create-bridge-agent-capabilities-reporter.ts
 init_cli_database();
 function createAgentCapabilitiesReporter(params) {
   const { workspaceId, getWs } = params;
@@ -42304,7 +42235,7 @@ function createWarmupAgentCapabilitiesOnConnect(params) {
   };
 }
 
-// ../bridge/src/connection/create-bridge-access-and-acp.ts
+// ../bridge/src/connection/setup/create-bridge-access-and-acp.ts
 async function createBridgeAccessAndAcp(options) {
   const { plugin, workspaceId, getWs, log: log2 } = options;
   const e2ee = options.e2eCertificate ? createCliE2eeRuntime(options.e2eCertificate) : void 0;
@@ -42327,8 +42258,8 @@ async function createBridgeAccessAndAcp(options) {
   return { e2ee, acpManager, bridgeAccessPromise };
 }
 
-// ../bridge/src/connection/create-bridge-preview-stack.ts
-import * as path38 from "node:path";
+// ../bridge/src/connection/setup/create-bridge-preview-stack.ts
+import * as path39 from "node:path";
 
 // ../bridge/src/preview-environments/manager/firehose-messages.ts
 function buildFirehoseSnapshotMessage(params) {
@@ -42646,7 +42577,7 @@ function attachChildErrorHandler(d) {
 }
 
 // ../bridge/src/preview-environments/process/wire/handle-exit.ts
-import fs20 from "node:fs";
+import fs21 from "node:fs";
 function logStopLine(d, code, signal) {
   const { title } = d;
   if (signal) {
@@ -42685,7 +42616,7 @@ function attachChildExitHandler(d) {
     const cleanupDir = d.mergedCleanupDir;
     const mergedPath = d.mergedLogPath;
     if (mergedPath && !stale) {
-      fs20.readFile(mergedPath, (err, buf) => {
+      fs21.readFile(mergedPath, (err, buf) => {
         if (!err && buf.length > d.mergedReadPos.value) {
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
@@ -42731,7 +42662,7 @@ function wireChildOutputPipes(d) {
 }
 
 // ../bridge/src/preview-environments/process/wire/poll-merged-log.ts
-import fs21 from "node:fs";
+import fs22 from "node:fs";
 function startMergedLogPoll(d) {
   if (!d.mergedLogPath || !d.mergedCleanupDir) return;
   const { environmentId } = d;
@@ -42741,7 +42672,7 @@ function startMergedLogPoll(d) {
       d.setPollInterval(void 0);
       return;
     }
-    fs21.readFile(d.mergedLogPath, (err, buf) => {
+    fs22.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));
@@ -42956,7 +42887,7 @@ function previewEnvironmentSpawnOptions(lifecycle = DEFAULT_PREVIEW_ENVIRONMENT_
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/utils.ts
-import fs22 from "node:fs";
+import fs23 from "node:fs";
 function mergePreviewEnvironmentSpawnOptions(opts, lifecycle = DEFAULT_PREVIEW_ENVIRONMENT_PROCESS_LIFECYCLE) {
   return { ...opts, ...previewEnvironmentSpawnOptions(lifecycle) };
 }
@@ -42965,7 +42896,7 @@ function isSpawnEbadf(e) {
 }
 function rmDirQuiet(dir) {
   try {
-    fs22.rmSync(dir, { recursive: true, force: true });
+    fs23.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -42973,7 +42904,7 @@ var cachedDevNullReadFd;
 function devNullReadFd() {
   if (cachedDevNullReadFd === void 0) {
     const devPath = process.platform === "win32" ? "nul" : "/dev/null";
-    cachedDevNullReadFd = fs22.openSync(devPath, "r");
+    cachedDevNullReadFd = fs23.openSync(devPath, "r");
   }
   return cachedDevNullReadFd;
 }
@@ -42982,7 +42913,7 @@ function pipedStdoutStderrFor(attemptStdio) {
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-piped-via-sh.ts
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 function trySpawnPipedViaSh(command, env, cwd, signal, lifecycle) {
   const attempts = [
     { stdio: [devNullReadFd(), "pipe", "pipe"], endStdin: false },
@@ -43006,9 +42937,9 @@ function trySpawnPipedViaSh(command, env, cwd, signal, lifecycle) {
       if (process.platform === "win32") {
         opts.windowsHide = true;
         const com = process.env.ComSpec || "cmd.exe";
-        proc = spawn5(com, ["/d", "/s", "/c", command], opts);
+        proc = spawn4(com, ["/d", "/s", "/c", command], opts);
       } else {
-        proc = spawn5("/bin/sh", ["-c", command], opts);
+        proc = spawn4("/bin/sh", ["-c", command], opts);
       }
       if (attempt.endStdin) {
         proc.stdin?.end();
@@ -43028,7 +42959,7 @@ function trySpawnPipedViaSh(command, env, cwd, signal, lifecycle) {
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-shell-true-piped.ts
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle) {
   try {
     const opts = mergePreviewEnvironmentSpawnOptions(
@@ -43044,7 +42975,7 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle)
     if (process.platform === "win32") {
       opts.windowsHide = true;
     }
-    return spawn6(command, opts);
+    return spawn5(command, opts);
   } catch (e) {
     if (isSpawnEbadf(e)) return null;
     throw e;
@@ -43052,16 +42983,16 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle)
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-merged-log-file.ts
-import { spawn as spawn7 } from "node:child_process";
-import fs23 from "node:fs";
+import { spawn as spawn6 } from "node:child_process";
+import fs24 from "node:fs";
 import { tmpdir } from "node:os";
-import path36 from "node:path";
+import path37 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs23.mkdtempSync(path36.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path36.join(tmpRoot, "combined.log");
+  const tmpRoot = fs24.mkdtempSync(path37.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path37.join(tmpRoot, "combined.log");
   let logFd;
   try {
-    logFd = fs23.openSync(logPath, "a");
+    logFd = fs24.openSync(logPath, "a");
   } catch {
     rmDirQuiet(tmpRoot);
     return null;
@@ -43070,7 +43001,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
   try {
     let proc;
     if (process.platform === "win32") {
-      proc = spawn7(
+      proc = spawn6(
         process.env.ComSpec || "cmd.exe",
         ["/d", "/s", "/c", command],
         mergePreviewEnvironmentSpawnOptions(
@@ -43079,13 +43010,13 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
         )
       );
     } else {
-      proc = spawn7(
+      proc = spawn6(
         "/bin/sh",
         ["-c", command],
         mergePreviewEnvironmentSpawnOptions({ env, cwd, stdio, ...signal ? { signal } : {} }, lifecycle)
       );
     }
-    fs23.closeSync(logFd);
+    fs24.closeSync(logFd);
     return {
       proc,
       pipedStdoutStderr: true,
@@ -43094,7 +43025,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
     };
   } catch (e) {
     try {
-      fs23.closeSync(logFd);
+      fs24.closeSync(logFd);
     } catch {
     }
     rmDirQuiet(tmpRoot);
@@ -43104,30 +43035,30 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
-import { spawn as spawn8 } from "node:child_process";
-import fs24 from "node:fs";
+import { spawn as spawn7 } from "node:child_process";
+import fs25 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path37 from "node:path";
+import path38 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs24.mkdtempSync(path37.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path37.join(tmpRoot, "combined.log");
-  const innerPath = path37.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path37.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs25.mkdtempSync(path38.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path38.join(tmpRoot, "combined.log");
+  const innerPath = path38.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path38.join(tmpRoot, "_run.sh");
   try {
-    fs24.writeFileSync(innerPath, `#!/bin/sh
+    fs25.writeFileSync(innerPath, `#!/bin/sh
 ${command}
 `);
-    fs24.writeFileSync(
+    fs25.writeFileSync(
       runnerPath,
       `#!/bin/sh
 cd ${shSingleQuote(cwd)}
 /bin/sh ${shSingleQuote(innerPath)} >>${shSingleQuote(logPath)} 2>&1
 `
     );
-    const proc = spawn8(
+    const proc = spawn7(
       "/bin/sh",
       [runnerPath],
       mergePreviewEnvironmentSpawnOptions(
@@ -43148,20 +43079,20 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs24.mkdtempSync(path37.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path37.join(tmpRoot, "combined.log");
-  const runnerPath = path37.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs25.mkdtempSync(path38.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path38.join(tmpRoot, "combined.log");
+  const runnerPath = path38.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
-    fs24.writeFileSync(
+    fs25.writeFileSync(
       runnerPath,
       `@ECHO OFF\r
 CD /D ${q(cwd)}\r
 ${command} >> ${q(logPath)} 2>&1\r
 `
     );
-    const proc = spawn8(
+    const proc = spawn7(
       com,
       ["/d", "/s", "/c", q(runnerPath)],
       mergePreviewEnvironmentSpawnOptions(
@@ -43183,7 +43114,7 @@ ${command} >> ${q(logPath)} 2>&1\r
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-inherit.ts
-import { spawn as spawn9 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 function trySpawnInheritStdio(command, env, cwd, signal, lifecycle) {
   const opts = mergePreviewEnvironmentSpawnOptions(
     {
@@ -43198,9 +43129,9 @@ function trySpawnInheritStdio(command, env, cwd, signal, lifecycle) {
   if (process.platform === "win32") {
     opts.windowsHide = true;
     const com = process.env.ComSpec || "cmd.exe";
-    proc = spawn9(com, ["/d", "/s", "/c", command], opts);
+    proc = spawn8(com, ["/d", "/s", "/c", command], opts);
   } else {
-    proc = spawn9("/bin/sh", ["-c", command], opts);
+    proc = spawn8("/bin/sh", ["-c", command], opts);
   }
   return { proc, pipedStdoutStderr: false };
 }
@@ -43456,7 +43387,7 @@ var PreviewEnvironmentManager = class {
   }
 };
 
-// ../bridge/src/connection/create-bridge-preview-stack.ts
+// ../bridge/src/connection/setup/create-bridge-preview-stack.ts
 function createBridgePreviewStack(options) {
   const previewEnvironmentManager = new PreviewEnvironmentManager({
     getWs: options.getWs,
@@ -43472,15 +43403,15 @@ function createBridgePreviewStack(options) {
     scheduleInitialIndexBuilds(getBridgeRoot());
   };
   const identifyReportedPaths = {
-    bridgeRootPath: path38.resolve(getBridgeRoot()),
-    worktreesRootPath: path38.resolve(options.worktreesRootPath),
+    bridgeRootPath: path39.resolve(getBridgeRoot()),
+    worktreesRootPath: path39.resolve(options.worktreesRootPath),
     localShortcutPort: 0,
     localShortcutToken: ""
   };
   return { previewEnvironmentManager, scheduleInitialIndexBuildsOnce, identifyReportedPaths };
 }
 
-// ../bridge/src/connection/create-bridge-identified-handler.ts
+// ../bridge/src/connection/identify/create-bridge-identified-handler.ts
 function createOnBridgeIdentified(opts) {
   const { plugin, previewEnvironmentManager, workspaceId, logFn } = opts;
   return (msg) => {
@@ -43496,7 +43427,7 @@ function createOnBridgeIdentified(opts) {
   };
 }
 
-// ../bridge/src/connection/create-bridge-identified-with-heartbeat.ts
+// ../bridge/src/connection/identify/create-bridge-identified-with-heartbeat.ts
 function createBridgeIdentifiedWithHeartbeat(params) {
   const { bridgeHeartbeat, log: log2, ...identifiedOpts } = params;
   const onBridgeIdentified = createOnBridgeIdentified({ ...identifiedOpts, logFn: log2 });
@@ -43674,10 +43605,10 @@ function createBridgeHeartbeatController(params) {
   };
 }
 
-// ../bridge/src/cli-version.ts
-var CLI_VERSION2 = "0.1.89".length > 0 ? "0.1.89" : "0.0.0-dev";
+// ../bridge/src/cli/cli-version.ts
+var CLI_VERSION2 = "0.1.90".length > 0 ? "0.1.90" : "0.0.0-dev";
 
-// ../bridge/src/connection/send-bridge-identify.ts
+// ../bridge/src/connection/identify/send-bridge-identify.ts
 function sendBridgeIdentify(ws, params) {
   if (!ws) return;
   const { identifyReportedPaths, e2ee } = params;
@@ -43694,7 +43625,7 @@ function sendBridgeIdentify(ws, params) {
 }
 var BRIDGE_IDENTIFY_REFRESH_EVERY_TICKS = 6;
 
-// ../bridge/src/connection/create-bridge-identify-heartbeat.ts
+// ../bridge/src/connection/identify/create-bridge-identify-heartbeat.ts
 function createBridgeIdentifyHeartbeat(params) {
   const { getWs, log: log2, identifyReportedPaths, e2ee } = params;
   return createBridgeHeartbeatController({
@@ -43707,7 +43638,7 @@ function createBridgeIdentifyHeartbeat(params) {
   });
 }
 
-// ../bridge/src/connection/create-bridge-message-deps.ts
+// ../bridge/src/connection/runtime/create-bridge-message-deps.ts
 function createBridgeMessageDeps(params) {
   const {
     getWs,
@@ -43717,7 +43648,6 @@ function createBridgeMessageDeps(params) {
     previewWorktreeManager,
     onBridgeIdentified,
     bridgeHeartbeat,
-    sendLocalSkillsReport,
     reportAutoDetectedAgents,
     warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
     previewEnvironmentManager,
@@ -43735,7 +43665,6 @@ function createBridgeMessageDeps(params) {
     onBridgeHeartbeatAck: (seq) => {
       bridgeHeartbeat.onAck(seq);
     },
-    sendLocalSkillsReport,
     reportAutoDetectedAgents,
     warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
     previewEnvironmentManager,
@@ -43745,114 +43674,8 @@ function createBridgeMessageDeps(params) {
   };
 }
 
-// ../bridge/src/skills/discovery/skill-discovery-roots.ts
-init_constants();
-init_yield_to_event_loop();
-var SKILL_DISCOVERY_ROOTS = [".agents/skills", ".claude/skills", ".cursor/skills", "skills"];
-async function yieldSkillDiscoveryWork(entryCount) {
-  if (entryCount > 0 && entryCount % INDEX_WORK_YIELD_EVERY === 0) {
-    await yieldToEventLoop();
-  }
-}
-
-// ../bridge/src/skills/discovery/discover-local-skills.ts
-import fs25 from "node:fs";
-import path39 from "node:path";
-function collectSkillFromDir(rel, base, name, seenKeys, out) {
-  const dir = path39.join(base, name);
-  try {
-    if (!fs25.statSync(dir).isDirectory()) return;
-  } catch {
-    return;
-  }
-  const skillMd = path39.join(dir, "SKILL.md");
-  if (!fs25.existsSync(skillMd)) return;
-  const key = `${rel}/${name}`;
-  if (seenKeys.has(key)) return;
-  seenKeys.add(key);
-  out.push({ skillKey: name, path: `${rel}/${name}`.replace(/\\/g, "/") });
-}
-async function discoverLocalSkillsAsync(cwd) {
-  const out = [];
-  const seenKeys = /* @__PURE__ */ new Set();
-  let work = 0;
-  for (const rel of SKILL_DISCOVERY_ROOTS) {
-    await yieldSkillDiscoveryWork(++work);
-    const base = path39.join(cwd, rel);
-    if (!fs25.existsSync(base) || !fs25.statSync(base).isDirectory()) continue;
-    let entries = [];
-    try {
-      entries = fs25.readdirSync(base);
-    } catch {
-      continue;
-    }
-    for (let i = 0; i < entries.length; i++) {
-      await yieldSkillDiscoveryWork(++work);
-      collectSkillFromDir(rel, base, entries[i], seenKeys, out);
-    }
-  }
-  return out;
-}
-
-// ../bridge/src/skills/discovery/discover-skill-layout-roots.ts
-import fs26 from "node:fs";
-import path40 from "node:path";
-function collectLayoutSkill(rel, base, name, skills2) {
-  const dir = path40.join(base, name);
-  try {
-    if (!fs26.statSync(dir).isDirectory()) return;
-  } catch {
-    return;
-  }
-  if (!fs26.existsSync(path40.join(dir, "SKILL.md"))) return;
-  const relPath = `${rel}/${name}`.replace(/\\/g, "/");
-  skills2.push({ name, relPath });
-}
-async function discoverSkillLayoutRootsAsync(cwd) {
-  const roots = [];
-  let work = 0;
-  for (const rel of SKILL_DISCOVERY_ROOTS) {
-    await yieldSkillDiscoveryWork(++work);
-    const base = path40.join(cwd, rel);
-    if (!fs26.existsSync(base) || !fs26.statSync(base).isDirectory()) continue;
-    let entries = [];
-    try {
-      entries = fs26.readdirSync(base);
-    } catch {
-      continue;
-    }
-    const skills2 = [];
-    for (let i = 0; i < entries.length; i++) {
-      await yieldSkillDiscoveryWork(++work);
-      collectLayoutSkill(rel, base, entries[i], skills2);
-    }
-    if (skills2.length > 0) {
-      roots.push({ path: rel.replace(/\\/g, "/"), skills: skills2 });
-    }
-  }
-  return roots;
-}
-
-// ../bridge/src/connection/create-bridge-local-reports.ts
+// ../bridge/src/connection/reports/create-bridge-local-reports.ts
 init_cli_process_interrupt();
-function createSendLocalSkillsReport(getWs, logFn) {
-  return () => {
-    setImmediate(() => {
-      void (async () => {
-        try {
-          const socket = getWs();
-          if (!socket || socket.readyState !== wrapper_default.OPEN) return;
-          const skills2 = await discoverLocalSkillsAsync(getBridgeRoot());
-          sendWsMessage(socket, { 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 () => {
     if (isCliImmediateShutdownRequested()) return;
@@ -43870,7 +43693,7 @@ function createReportAutoDetectedAgents(getWs, logFn) {
   };
 }
 
-// ../bridge/src/connection/create-bridge-runtime-message-deps.ts
+// ../bridge/src/connection/runtime/create-bridge-runtime-message-deps.ts
 function createBridgeRuntimeMessageDeps(params) {
   const {
     plugin,
@@ -43893,7 +43716,6 @@ function createBridgeRuntimeMessageDeps(params) {
     previewWorktreeManager,
     onBridgeIdentified,
     bridgeHeartbeat,
-    sendLocalSkillsReport: createSendLocalSkillsReport(getWs, log2),
     reportAutoDetectedAgents: createReportAutoDetectedAgents(getWs, log2),
     warmupAgentCapabilitiesOnConnect: createWarmupAgentCapabilitiesOnConnect({
       workspaceId,
@@ -43909,7 +43731,7 @@ function createBridgeRuntimeMessageDeps(params) {
   });
 }
 
-// ../bridge/src/connection/create-bridge-runtime-message-setup.ts
+// ../bridge/src/connection/runtime/create-bridge-runtime-message-setup.ts
 function createBridgeRuntimeMessageSetup(options) {
   const {
     plugin,
@@ -43955,12 +43777,12 @@ function createBridgeRuntimeMessageSetup(options) {
 }
 
 // ../bridge/src/worktrees/worktree-layout-file.ts
-import * as fs27 from "node:fs";
-import * as path41 from "node:path";
+import * as fs26 from "node:fs";
+import * as path40 from "node:path";
 import os7 from "node:os";
 var LAYOUT_FILENAME = "worktree-launcher-layout.json";
 function defaultWorktreeLayoutPath() {
-  return path41.join(os7.homedir(), ".buildautomaton", LAYOUT_FILENAME);
+  return path40.join(os7.homedir(), ".buildautomaton", LAYOUT_FILENAME);
 }
 function normalizeLoadedLayout(raw) {
   if (raw && typeof raw === "object" && "launcherCwds" in raw) {
@@ -43972,8 +43794,8 @@ function normalizeLoadedLayout(raw) {
 function loadWorktreeLayout() {
   try {
     const p = defaultWorktreeLayoutPath();
-    if (!fs27.existsSync(p)) return { launcherCwds: [] };
-    const raw = JSON.parse(fs27.readFileSync(p, "utf8"));
+    if (!fs26.existsSync(p)) return { launcherCwds: [] };
+    const raw = JSON.parse(fs26.readFileSync(p, "utf8"));
     return normalizeLoadedLayout(raw);
   } catch {
     return { launcherCwds: [] };
@@ -43981,24 +43803,24 @@ function loadWorktreeLayout() {
 }
 function saveWorktreeLayout(layout) {
   try {
-    const dir = path41.dirname(defaultWorktreeLayoutPath());
-    fs27.mkdirSync(dir, { recursive: true });
-    fs27.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
+    const dir = path40.dirname(defaultWorktreeLayoutPath());
+    fs26.mkdirSync(dir, { recursive: true });
+    fs26.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
   } catch {
   }
 }
 function baseNameSafe(pathString) {
-  return path41.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
+  return path40.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
 }
 function getLauncherDirNameIfPresent(layout, bridgeRootPath2) {
-  const norm = path41.resolve(bridgeRootPath2);
-  const existing = layout.launcherCwds.find((e) => path41.resolve(e.absolutePath) === norm);
+  const norm = path40.resolve(bridgeRootPath2);
+  const existing = layout.launcherCwds.find((e) => path40.resolve(e.absolutePath) === norm);
   return existing?.dirName;
 }
 function allocateDirNameForLauncherCwd(layout, bridgeRootPath2) {
   const existing = getLauncherDirNameIfPresent(layout, bridgeRootPath2);
   if (existing) return existing;
-  const norm = path41.resolve(bridgeRootPath2);
+  const norm = path40.resolve(bridgeRootPath2);
   const base = baseNameSafe(norm);
   const used = new Set(layout.launcherCwds.map((e) => e.dirName));
   let name = base;
@@ -44060,7 +43882,7 @@ var import_debug = __toESM(require_src(), 1);
 var import_promise_deferred = __toESM(require_dist2(), 1);
 var import_promise_deferred2 = __toESM(require_dist2(), 1);
 import { Buffer as Buffer2 } from "node:buffer";
-import { spawn as spawn10 } from "child_process";
+import { spawn as spawn9 } from "child_process";
 import { normalize as normalize3 } from "node:path";
 import { EventEmitter } from "node:events";
 var __defProp2 = Object.defineProperty;
@@ -44091,8 +43913,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path91) {
-  return path91 instanceof String && cache.has(path91);
+function isPathSpec(path88) {
+  return path88 instanceof String && cache.has(path88);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -44181,8 +44003,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path91) {
-  return (0, import_file_exists.exists)(path91, import_file_exists.FOLDER);
+function folderExists(path88) {
+  return (0, import_file_exists.exists)(path88, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -44586,8 +44408,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path91) {
-      return /^\.(git)?$/.test(path91.trim());
+    parser(path88) {
+      return /^\.(git)?$/.test(path88.trim());
     }
   };
 }
@@ -45021,11 +44843,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path91, line, preview] = input.split(NULL);
-    paths.add(path91);
-    (results[path91] = results[path91] || []).push({
+    const [path88, line, preview] = input.split(NULL);
+    paths.add(path88);
+    (results[path88] = results[path88] || []).push({
       line: asNumber(line),
-      path: path91,
+      path: path88,
       preview
     });
   });
@@ -45448,7 +45270,7 @@ var init_git_executor_chain = __esm2({
               rejection = reason || rejection;
             }
           });
-          const spawned = spawn10(command, args, spawnOptions);
+          const spawned = spawn9(command, args, spawnOptions);
           spawned.stdout.on(
             "data",
             onDataReceived(stdOut, "stdOut", logger, outputLogger.step("stdOut"))
@@ -45790,14 +45612,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path91, text) {
+function parseInit(bare, path88, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path91, false, result[1]);
+    return new InitSummary(bare, path88, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path91, true, result[1]);
+    return new InitSummary(bare, path88, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -45808,7 +45630,7 @@ function parseInit(bare, path91, text) {
       break;
     }
   }
-  return new InitSummary(bare, path91, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path88, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -45817,9 +45639,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path91, existing, gitDir) {
+      constructor(bare, path88, existing, gitDir) {
         this.bare = bare;
-        this.path = path91;
+        this.path = path88;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -45831,7 +45653,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path91, customArgs) {
+function initTask(bare = false, path88, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -45840,7 +45662,7 @@ function initTask(bare = false, path91, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path91, text);
+      return parseInit(commands.includes("--bare"), path88, text);
     }
   };
 }
@@ -46656,12 +46478,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path91, index, working_dir) {
-        this.path = path91;
+      constructor(path88, index, working_dir) {
+        this.path = path88;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path91) || [null, path91, path91];
+          const detail = fromPathRegex.exec(path88) || [null, path88, path88];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -46692,14 +46514,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path91) {
+  function data(index, workingDir, path88) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path91);
+      handler(result, path88);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path91, index, workingDir));
+      result.files.push(new FileStatusSummary(path88, index, workingDir));
     }
   }
 }
@@ -47008,9 +46830,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path91, write) {
+      hashObject(path88, write) {
         return this._runTask(
-          hashObjectTask(path91, write === true),
+          hashObjectTask(path88, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -47363,8 +47185,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path91 = input.trim().replace(/^["']|["']$/g, "");
-  return path91 && normalize3(path91);
+  const path88 = input.trim().replace(/^["']|["']$/g, "");
+  return path88 && normalize3(path88);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -47678,8 +47500,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path91) {
-  return subModuleTask(["add", repo, path91]);
+function addSubModuleTask(repo, path88) {
+  return subModuleTask(["add", repo, path88]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -48012,8 +47834,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path91, then) {
-      return this._runTask(addSubModuleTask2(repo, path91), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path88, then) {
+      return this._runTask(addSubModuleTask2(repo, path88), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -48752,8 +48574,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path91, entry] of parseNumstatEntries(lines)) {
-    m.set(path91, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path88, entry] of parseNumstatEntries(lines)) {
+    m.set(path88, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -48882,7 +48704,7 @@ async function resolveDefaultRemoteBranchSha(g, remote) {
 }
 
 // ../bridge/src/git/commits/remote-tracking/resolve-base-sha-for-unpushed-commits.ts
-import * as path42 from "node:path";
+import * as path41 from "node:path";
 var BASE_SHA_CACHE_TTL_MS = 3e4;
 var baseShaCache = /* @__PURE__ */ new Map();
 async function resolveBaseShaForUnpushedCommitsUncached(g) {
@@ -48893,7 +48715,7 @@ async function resolveBaseShaForUnpushedCommitsUncached(g) {
 }
 async function resolveBaseShaForUnpushedCommits(g, repoDir) {
   if (repoDir) {
-    const key = path42.resolve(repoDir);
+    const key = path41.resolve(repoDir);
     const now = Date.now();
     const cached2 = baseShaCache.get(key);
     if (cached2 && cached2.expiresAt > now) return cached2.baseSha;
@@ -49028,17 +48850,17 @@ function formatRemoteDisplayLabel(remoteUrl) {
 }
 
 // ../bridge/src/git/changes/repo/get-working-tree-change-repo-details.ts
-import * as path52 from "node:path";
+import * as path51 from "node:path";
 
 // ../bridge/src/git/changes/repo/build-working-tree-change-repo-detail.ts
-import * as path51 from "node:path";
+import * as path50 from "node:path";
 
 // ../bridge/src/git/is-git-repo.ts
-import * as fs28 from "node:fs";
-import * as path43 from "node:path";
+import * as fs27 from "node:fs";
+import * as path42 from "node:path";
 async function isGitRepoDirectory(dirPath) {
   try {
-    await fs28.promises.access(path43.join(dirPath, ".git"));
+    await fs27.promises.access(path42.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -49046,12 +48868,12 @@ async function isGitRepoDirectory(dirPath) {
 }
 
 // ../bridge/src/git/changes/listing/apply-untracked-file-stats.ts
-import * as fs29 from "node:fs";
-import * as path44 from "node:path";
+import * as fs28 from "node:fs";
+import * as path43 from "node:path";
 
 // ../bridge/src/git/changes/lines/count-lines.ts
 import { createReadStream } from "node:fs";
-import * as readline2 from "node:readline";
+import * as readline3 from "node:readline";
 function countLinesInText(text) {
   return splitTextIntoDiffLines(text).length;
 }
@@ -49060,7 +48882,7 @@ async function countTextFileLines(filePath) {
   const maxBytes = 512e3;
   let lines = 0;
   const stream = createReadStream(filePath, { encoding: "utf8" });
-  const rl = readline2.createInterface({ input: stream, crlfDelay: Infinity });
+  const rl = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   for await (const _line of rl) {
     lines += 1;
     bytes += Buffer.byteLength(String(_line), "utf8") + 1;
@@ -49079,7 +48901,7 @@ function createUntrackedStatsApplier(options) {
     if (!options.untrackedSet.has(pathInRepo)) return;
     if (options.nameByPath.has(pathInRepo)) return;
     if (row.change === "moved") return;
-    const repoFilePath = path44.join(options.repoGitCwd, pathInRepo);
+    const repoFilePath = path43.join(options.repoGitCwd, pathInRepo);
     const fromGit = await numstatFromGitNoIndex(options.g, pathInRepo);
     if (fromGit) {
       row.additions = fromGit.additions;
@@ -49087,7 +48909,7 @@ function createUntrackedStatsApplier(options) {
       return;
     }
     try {
-      const st = await fs29.promises.stat(repoFilePath);
+      const st = await fs28.promises.stat(repoFilePath);
       row.additions = st.isFile() ? await countTextFileLines(repoFilePath) : 0;
     } catch {
       row.additions = 0;
@@ -49164,7 +48986,7 @@ async function buildChangedFileRowsFromPaths(options) {
 }
 
 // ../bridge/src/git/changes/listing/enrich-working-tree-file-rows.ts
-import * as path46 from "node:path";
+import * as path45 from "node:path";
 
 // ../bridge/src/git/changes/patch/patch-truncate.ts
 function truncatePatch(s) {
@@ -49252,10 +49074,10 @@ async function readGitBlobLines(repoCwd, pathInRepo) {
 }
 
 // ../bridge/src/git/changes/patch/hydrate/read-worktree-file-lines.ts
-import * as fs30 from "node:fs";
+import * as fs29 from "node:fs";
 async function readWorktreeFileLines(filePath) {
   try {
-    const raw = await fs30.promises.readFile(filePath, "utf8");
+    const raw = await fs29.promises.readFile(filePath, "utf8");
     return raw.split(/\r?\n/);
   } catch {
     return null;
@@ -49393,8 +49215,8 @@ async function unifiedDiffForFileInRange(repoCwd, range, pathInRepo, change, mov
 }
 
 // ../bridge/src/git/changes/total-lines/resolve-changed-file-total-lines.ts
-import * as fs31 from "node:fs";
-import * as path45 from "node:path";
+import * as fs30 from "node:fs";
+import * as path44 from "node:path";
 var MAX_BYTES = 512e3;
 async function countLinesInGitRef(repoGitCwd, ref, pathInRepo) {
   const spec = `${ref}:${pathInRepo}`;
@@ -49414,13 +49236,13 @@ async function countLinesInGitRef(repoGitCwd, ref, pathInRepo) {
 }
 async function resolveWorkingTreeFileTotalLines(options) {
   if (options.isBinary) return null;
-  const filePath = path45.join(options.repoGitCwd, options.pathInRepo);
+  const filePath = path44.join(options.repoGitCwd, options.pathInRepo);
   if (options.change === "removed") {
     return countLinesInGitRef(options.repoGitCwd, "HEAD", options.pathInRepo);
   }
   if (options.change === "moved" || options.change === "modified") {
     try {
-      const st = await fs31.promises.stat(filePath);
+      const st = await fs30.promises.stat(filePath);
       if (!st.isFile()) return null;
       return await countTextFileLines(filePath);
     } catch {
@@ -49463,7 +49285,7 @@ async function enrichWorkingTreeFileRows(options) {
       row.workspaceRelPath,
       options.repoPathRelativeToWorkspaceRoot
     );
-    const filePath = path46.join(options.repoGitCwd, filePathRelativeToRepoRoot);
+    const filePath = path45.join(options.repoGitCwd, filePathRelativeToRepoRoot);
     const hydrateKind = row.change === "moved" ? "modified" : row.change;
     let patch = await unifiedDiffForFile(
       options.repoGitCwd,
@@ -49621,7 +49443,7 @@ async function listChangedFilesForRepo(repoGitCwd, repoPathRelativeToWorkspaceRo
 }
 
 // ../bridge/src/git/changes/listing/list-changed-files-for-commit.ts
-import * as path47 from "node:path";
+import * as path46 from "node:path";
 
 // ../bridge/src/git/changes/listing/enrich-commit-file-rows.ts
 async function enrichCommitFileRows(options) {
@@ -49666,7 +49488,7 @@ async function parentForCommitDiff(g, sha) {
 var COMMIT_FILES_CACHE_TTL_MS = 5 * 6e4;
 var commitFilesCache = /* @__PURE__ */ new Map();
 function commitFilesCacheKey(repoGitCwd, commitSha) {
-  return `${path47.resolve(repoGitCwd)}:${commitSha}`;
+  return `${path46.resolve(repoGitCwd)}:${commitSha}`;
 }
 async function listChangedFilesForCommit(repoGitCwd, repoPathRelativeToWorkspaceRoot, commitSha, options = {}) {
   const cacheKey = commitFilesCacheKey(repoGitCwd, commitSha);
@@ -49721,7 +49543,7 @@ async function listChangedFilesForCommit(repoGitCwd, repoPathRelativeToWorkspace
 }
 
 // ../bridge/src/git/commits/list-unpushed-commits.ts
-import * as path48 from "node:path";
+import * as path47 from "node:path";
 
 // ../bridge/src/git/commits/lib/parse-log-lines.ts
 function parseLogShaDateSubjectLines(raw) {
@@ -49756,7 +49578,7 @@ async function gitLogNotReachableFromBase(g, baseSha, headSha) {
   }
 }
 async function listUnpushedCommits(repoDir) {
-  const key = path48.resolve(repoDir);
+  const key = path47.resolve(repoDir);
   const now = Date.now();
   const cached2 = unpushedCache.get(key);
   if (cached2 && cached2.expiresAt > now) return cached2.commits;
@@ -49817,7 +49639,7 @@ async function loadRecentAndUnpushedCommitsForRepoDetail(repoDir, recentCommitsL
 }
 
 // ../bridge/src/git/changes/repo/load-working-tree-change-repo-git-info.ts
-import * as path49 from "node:path";
+import * as path48 from "node:path";
 
 // ../bridge/src/git/remote-origin-url.ts
 async function getRemoteOriginUrl(gitDir) {
@@ -49832,7 +49654,7 @@ async function getRemoteOriginUrl(gitDir) {
 
 // ../bridge/src/git/changes/repo/load-working-tree-change-repo-git-info.ts
 async function loadWorkingTreeChangeRepoGitInfo(checkoutPath) {
-  const resolvedCheckoutPath = path49.resolve(checkoutPath);
+  const resolvedCheckoutPath = path48.resolve(checkoutPath);
   const git = cliSimpleGit(resolvedCheckoutPath);
   await yieldToEventLoop2();
   const [branch, remoteUrl] = await Promise.all([
@@ -49847,14 +49669,14 @@ async function loadWorkingTreeChangeRepoGitInfo(checkoutPath) {
 }
 
 // ../bridge/src/git/changes/repo/resolve-repo-path-relative-to-workspace-root.ts
-import * as path50 from "node:path";
+import * as path49 from "node:path";
 async function resolveRepoPathRelativeToWorkspaceRoot(options) {
-  const checkoutPath = path50.resolve(options.checkoutPath);
+  const checkoutPath = path49.resolve(options.checkoutPath);
   const git = cliSimpleGit(checkoutPath);
-  const sessionParentPath = options.sessionParentPath ? path50.resolve(options.sessionParentPath) : null;
+  const sessionParentPath = options.sessionParentPath ? path49.resolve(options.sessionParentPath) : null;
   let repoPathRelativeToWorkspaceRoot;
   if (sessionParentPath) {
-    const checkoutPathRelativeToSessionParent = path50.relative(sessionParentPath, checkoutPath);
+    const checkoutPathRelativeToSessionParent = path49.relative(sessionParentPath, checkoutPath);
     repoPathRelativeToWorkspaceRoot = checkoutPathRelativeToSessionParent === "" ? "." : checkoutPathRelativeToSessionParent.replace(/\\/g, "/");
   } else {
     let gitTopLevel = checkoutPath;
@@ -49864,8 +49686,8 @@ async function resolveRepoPathRelativeToWorkspaceRoot(options) {
     } catch {
       gitTopLevel = checkoutPath;
     }
-    const gitTopLevelRelativeToBridgeRoot = path50.relative(options.bridgeRoot, path50.resolve(gitTopLevel)).replace(/\\/g, "/") || ".";
-    repoPathRelativeToWorkspaceRoot = gitTopLevelRelativeToBridgeRoot.startsWith("..") ? path50.basename(path50.resolve(gitTopLevel)) : gitTopLevelRelativeToBridgeRoot;
+    const gitTopLevelRelativeToBridgeRoot = path49.relative(options.bridgeRoot, path49.resolve(gitTopLevel)).replace(/\\/g, "/") || ".";
+    repoPathRelativeToWorkspaceRoot = gitTopLevelRelativeToBridgeRoot.startsWith("..") ? path49.basename(path49.resolve(gitTopLevel)) : gitTopLevelRelativeToBridgeRoot;
   }
   return normalizeRepoPathRelativeToWorkspaceRoot(
     repoPathRelativeToWorkspaceRoot === "" ? "." : repoPathRelativeToWorkspaceRoot
@@ -49874,10 +49696,10 @@ async function resolveRepoPathRelativeToWorkspaceRoot(options) {
 
 // ../bridge/src/git/changes/repo/build-working-tree-change-repo-detail.ts
 async function buildWorkingTreeChangeRepoDetail(options) {
-  const checkoutPath = path51.resolve(options.targetPath);
+  const checkoutPath = path50.resolve(options.targetPath);
   if (!await isGitRepoDirectory(checkoutPath)) return null;
   const isCommitView = options.basis.kind === "commit";
-  const sessionParentPath = options.sessionParentPath ? path51.resolve(options.sessionParentPath) : null;
+  const sessionParentPath = options.sessionParentPath ? path50.resolve(options.sessionParentPath) : null;
   const git = cliSimpleGit(checkoutPath);
   const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
     checkoutPath,
@@ -49925,8 +49747,8 @@ async function buildWorkingTreeChangeRepoDetail(options) {
 
 // ../bridge/src/git/changes/repo/get-working-tree-change-repo-details.ts
 async function getWorkingTreeChangeRepoDetails(options) {
-  const bridgeRoot = path52.resolve(getBridgeRoot());
-  const sessionParentPath = options.sessionParentPath ? path52.resolve(options.sessionParentPath) : null;
+  const bridgeRoot = path51.resolve(getBridgeRoot());
+  const sessionParentPath = options.sessionParentPath ? path51.resolve(options.sessionParentPath) : null;
   const out = [];
   const filter = options.repoFilterRelPath != null ? normalizeRepoPathRelativeToWorkspaceRoot(options.repoFilterRelPath) : null;
   const basisInput = options.basis ?? { kind: "working" };
@@ -49957,9 +49779,9 @@ async function getWorkingTreeChangeRepoDetails(options) {
 }
 
 // ../bridge/src/git/changes/repo/get-working-tree-change-file-patch.ts
-import * as path53 from "node:path";
+import * as path52 from "node:path";
 async function getWorkingTreeChangeFilePatch(options) {
-  const repoGitCwd = path53.resolve(options.repoGitCwd);
+  const repoGitCwd = path52.resolve(options.repoGitCwd);
   if (!await isGitRepoDirectory(repoGitCwd)) {
     throw new Error("Not a git repository");
   }
@@ -49998,7 +49820,7 @@ async function getWorkingTreeChangeFilePatch(options) {
     });
     return { patchContent: patchContent2, totalLines: totalLines2 };
   }
-  const filePath = path53.join(repoGitCwd, filePathRelativeToRepoRoot);
+  const filePath = path52.join(repoGitCwd, filePathRelativeToRepoRoot);
   const hydrateKind = options.change === "moved" ? "modified" : options.change;
   let patchContent = await unifiedDiffForFile(
     repoGitCwd,
@@ -50044,18 +49866,18 @@ function parseWorkingTreeChangeKind(value) {
 }
 
 // ../bridge/src/worktrees/manager/git/get-session-working-tree-change-file-patch.ts
-import * as path54 from "node:path";
+import * as path53 from "node:path";
 async function getSessionWorkingTreeChangeFilePatch(cache2, sessionId, discover, opts) {
   const targets = await resolveCommitTargetsAsync(sessionId, cache2, discover);
-  const bridgeRoot = path54.resolve(getBridgeRoot());
-  const sessionParentPath = cache2.getSessionParentPath(sessionId) ? path54.resolve(cache2.getSessionParentPath(sessionId)) : null;
+  const bridgeRoot = path53.resolve(getBridgeRoot());
+  const sessionParentPath = cache2.getSessionParentPath(sessionId) ? path53.resolve(cache2.getSessionParentPath(sessionId)) : null;
   const repoPathRelativeToWorkspaceRootFilter = normalizeRepoPathRelativeToWorkspaceRoot(
     opts.repoRelPath.trim()
   );
   let result = null;
   await forEachWithGitYield(targets, async (targetPath) => {
     if (result) return;
-    const checkoutPath = path54.resolve(targetPath);
+    const checkoutPath = path53.resolve(targetPath);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
@@ -50088,13 +49910,13 @@ async function pushSessionUpstream(cache2, sessionId, discover) {
 }
 
 // ../bridge/src/worktrees/remove-session-worktrees.ts
-import * as fs34 from "node:fs";
+import * as fs33 from "node:fs";
 
 // ../bridge/src/git/worktrees/worktree-remove.ts
-import * as fs33 from "node:fs";
+import * as fs32 from "node:fs";
 
 // ../bridge/src/worktrees/is-removable-session-worktree-checkout-path.ts
-import path55 from "node:path";
+import path54 from "node:path";
 init_normalize_resolved_path();
 function isBridgeRootCheckoutPath(checkoutPath) {
   return normalizeResolvedPath(checkoutPath) === normalizeResolvedPath(getBridgeRoot());
@@ -50103,23 +49925,23 @@ function isRemovableSessionWorktreeCheckoutPath(checkoutPath, worktreesRootPath)
   if (isBridgeRootCheckoutPath(checkoutPath)) return false;
   const normalized = normalizeResolvedPath(checkoutPath);
   const worktreesRoot = normalizeResolvedPath(worktreesRootPath);
-  const rel = path55.relative(worktreesRoot, normalized);
-  if (rel === "" || rel.startsWith("..") || path55.isAbsolute(rel)) return false;
+  const rel = path54.relative(worktreesRoot, normalized);
+  if (rel === "" || rel.startsWith("..") || path54.isAbsolute(rel)) return false;
   return true;
 }
 
 // ../bridge/src/git/worktrees/resolve-main-repo-from-git-file.ts
-import * as fs32 from "node:fs";
-import * as path56 from "node:path";
+import * as fs31 from "node:fs";
+import * as path55 from "node:path";
 function resolveMainRepoFromWorktreeGitFile(wt) {
-  const gitDirFile = path56.join(wt, ".git");
-  if (!fs32.existsSync(gitDirFile) || !fs32.statSync(gitDirFile).isFile()) return "";
-  const first2 = fs32.readFileSync(gitDirFile, "utf8").trim();
+  const gitDirFile = path55.join(wt, ".git");
+  if (!fs31.existsSync(gitDirFile) || !fs31.statSync(gitDirFile).isFile()) return "";
+  const first2 = fs31.readFileSync(gitDirFile, "utf8").trim();
   const m = first2.match(/^gitdir:\s*(.+)$/im);
   if (!m) return "";
-  const gitWorktreePath = path56.resolve(wt, m[1].trim());
-  const gitDir = path56.dirname(path56.dirname(gitWorktreePath));
-  return path56.dirname(gitDir);
+  const gitWorktreePath = path55.resolve(wt, m[1].trim());
+  const gitDir = path55.dirname(path55.dirname(gitWorktreePath));
+  return path55.dirname(gitDir);
 }
 
 // ../bridge/src/git/worktrees/worktree-remove.ts
@@ -50130,7 +49952,7 @@ async function gitWorktreeRemoveForce(worktreePath) {
     return true;
   }
   if (isBridgeRootCheckoutPath(worktreePath)) return false;
-  fs33.rmSync(worktreePath, { recursive: true, force: true });
+  fs32.rmSync(worktreePath, { recursive: true, force: true });
   return true;
 }
 
@@ -50152,7 +49974,7 @@ async function removeSessionWorktrees(paths, worktreesRootPath, log2) {
       log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
       if (isRemovableSessionWorktreeCheckoutPath(wt, worktreesRootPath)) {
         try {
-          fs34.rmSync(wt, { recursive: true, force: true });
+          fs33.rmSync(wt, { recursive: true, force: true });
         } catch {
         }
       }
@@ -50208,12 +50030,12 @@ async function renameSessionWorktreeBranch(cache2, sessionId, newBranch, log2) {
 // ../bridge/src/worktrees/discovery/discover-session-worktree-on-disk.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as fs38 from "node:fs";
-import * as path61 from "node:path";
+import * as fs37 from "node:fs";
+import * as path60 from "node:path";
 
 // ../bridge/src/worktrees/discovery/collect-worktree-paths.ts
-import * as fs36 from "node:fs";
-import * as path58 from "node:path";
+import * as fs35 from "node:fs";
+import * as path57 from "node:path";
 
 // ../bridge/src/worktrees/discovery/disk-walk-constants.ts
 var DISK_WALK_YIELD_EVERY = 64;
@@ -50243,8 +50065,8 @@ function shouldSkipDiskWalkEntry(name) {
 // ../bridge/src/worktrees/discovery/disk-walk-utils.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as fs35 from "node:fs";
-import * as path57 from "node:path";
+import * as fs34 from "node:fs";
+import * as path56 from "node:path";
 async function yieldDuringDiskWalk(state) {
   state.entries++;
   if (state.entries % DISK_WALK_YIELD_EVERY !== 0) return true;
@@ -50254,7 +50076,7 @@ async function yieldDuringDiskWalk(state) {
 }
 async function isGitDir(dirPath) {
   try {
-    await fs35.promises.access(path57.join(dirPath, ".git"));
+    await fs34.promises.access(path56.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -50268,23 +50090,23 @@ async function collectGitRepoRootsUnderDirectory(rootPath) {
   const walk = async (dir) => {
     if (!await yieldDuringDiskWalk(state)) return;
     if (await isGitDir(dir)) {
-      out.push(path58.resolve(dir));
+      out.push(path57.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = await fs36.promises.readdir(dir, { withFileTypes: true });
+      entries = await fs35.promises.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path58.join(dir, e.name);
+      const full = path57.join(dir, e.name);
       if (!e.isDirectory()) continue;
       await walk(full);
     }
   };
-  await walk(path58.resolve(rootPath));
+  await walk(path57.resolve(rootPath));
   return { paths: [...new Set(out)], entriesVisited: state.entries };
 }
 async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK_MAX_DEPTH) {
@@ -50295,16 +50117,16 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
     if (!await yieldDuringDiskWalk(state)) return;
     let entries;
     try {
-      entries = await fs36.promises.readdir(dir, { withFileTypes: true });
+      entries = await fs35.promises.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path58.join(dir, e.name);
+      const full = path57.join(dir, e.name);
       if (!e.isDirectory()) continue;
       if (e.name === sessionId) {
-        if (await isGitDir(full)) out.push(path58.resolve(full));
+        if (await isGitDir(full)) out.push(path57.resolve(full));
         continue;
       }
       if (await isGitDir(full)) continue;
@@ -50316,14 +50138,14 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
 }
 
 // ../bridge/src/worktrees/discovery/layout-keys-for-bridge-root.ts
-import * as path59 from "node:path";
+import * as path58 from "node:path";
 function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
-  const bridge = path59.resolve(bridgeRoot);
+  const bridge = path58.resolve(bridgeRoot);
   const preferred = getLauncherDirNameIfPresent(layout, bridgeRoot);
   const relevant = layout.launcherCwds.filter((e) => {
-    const entry = path59.resolve(e.absolutePath);
-    return bridge === entry || bridge.startsWith(entry + path59.sep) || entry.startsWith(bridge + path59.sep);
-  }).sort((a, b) => path59.resolve(b.absolutePath).length - path59.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
+    const entry = path58.resolve(e.absolutePath);
+    return bridge === entry || bridge.startsWith(entry + path58.sep) || entry.startsWith(bridge + path58.sep);
+  }).sort((a, b) => path58.resolve(b.absolutePath).length - path58.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
   const ordered = [];
   const seen = /* @__PURE__ */ new Set();
   const add = (k) => {
@@ -50341,19 +50163,19 @@ function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
 }
 
 // ../bridge/src/worktrees/discovery/try-binding-from-isolated-directory.ts
-import * as fs37 from "node:fs";
-import * as path60 from "node:path";
+import * as fs36 from "node:fs";
+import * as path59 from "node:path";
 async function tryBindingFromIsolatedDirectory(scopeDir) {
   let st;
   try {
-    st = await fs37.promises.stat(scopeDir);
+    st = await fs36.promises.stat(scopeDir);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const { paths: worktreePaths } = await collectGitRepoRootsUnderDirectory(scopeDir);
   if (worktreePaths.length === 0) return null;
-  const abs = path60.resolve(scopeDir);
+  const abs = path59.resolve(scopeDir);
   return {
     parentPath: abs,
     repoCheckoutPaths: worktreePaths
@@ -50376,7 +50198,7 @@ async function discoverSessionWorktreeOnDisk(options) {
   const sid = sessionId.trim();
   if (!sid) return null;
   try {
-    await fs38.promises.access(worktreesRootPath);
+    await fs37.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -50385,13 +50207,13 @@ async function discoverSessionWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs38.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs37.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path61.join(worktreesRootPath, name);
+      const p = path60.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs38.promises.stat(p);
+        st = await fs37.promises.stat(p);
       } catch {
         continue;
       }
@@ -50405,23 +50227,23 @@ async function discoverSessionWorktreeOnDisk(options) {
   for (const key of keys) {
     if (isCliImmediateShutdownRequested()) return null;
     await yieldToEventLoop();
-    const layoutRoot = path61.join(worktreesRootPath, key);
+    const layoutRoot = path60.join(worktreesRootPath, key);
     let layoutSt;
     try {
-      layoutSt = await fs38.promises.stat(layoutRoot);
+      layoutSt = await fs37.promises.stat(layoutRoot);
     } catch {
       continue;
     }
     if (!layoutSt.isDirectory()) continue;
-    const sessionDir = path61.join(layoutRoot, sid);
+    const sessionDir = path60.join(layoutRoot, sid);
     const nested = await tryBindingFromSessionDirectory(sessionDir);
     if (nested) return nested;
     const legacy = await collectWorktreeRootsNamed(layoutRoot, sid);
     if (legacy.paths.length > 0) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacy.paths) ?? path61.resolve(legacy.paths[0]);
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacy.paths) ?? path60.resolve(legacy.paths[0]);
       return {
-        sessionParentPath: path61.resolve(isolated),
-        repoCheckoutPaths: legacy.paths.map((p) => path61.resolve(p))
+        sessionParentPath: path60.resolve(isolated),
+        repoCheckoutPaths: legacy.paths.map((p) => path60.resolve(p))
       };
     }
   }
@@ -50429,31 +50251,31 @@ async function discoverSessionWorktreeOnDisk(options) {
 }
 
 // ../bridge/src/worktrees/discovery/discover-session-worktrees-under-session-worktree-root.ts
-import * as fs39 from "node:fs";
-import * as path63 from "node:path";
+import * as fs38 from "node:fs";
+import * as path62 from "node:path";
 
 // ../bridge/src/worktrees/discovery/discover-legacy-binding-ascending-from-checkout.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as path62 from "node:path";
+import * as path61 from "node:path";
 async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPath) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hintR = path62.resolve(checkoutPath);
+  const hintR = path61.resolve(checkoutPath);
   let best = null;
-  let cur = path62.dirname(hintR);
+  let cur = path61.dirname(hintR);
   for (let i = 0; i < 40; i++) {
     if (isCliImmediateShutdownRequested()) return best;
     await yieldToEventLoop();
     const paths = await collectWorktreeRootsNamed(cur, sid);
-    if (paths.paths.some((p) => path62.resolve(p) === hintR)) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path62.resolve(paths.paths[0]);
+    if (paths.paths.some((p) => path61.resolve(p) === hintR)) {
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path61.resolve(paths.paths[0]);
       best = {
-        sessionParentPath: path62.resolve(isolated),
-        repoCheckoutPaths: paths.paths.map((p) => path62.resolve(p))
+        sessionParentPath: path61.resolve(isolated),
+        repoCheckoutPaths: paths.paths.map((p) => path61.resolve(p))
       };
     }
-    const next = path62.dirname(cur);
+    const next = path61.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -50464,12 +50286,12 @@ async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPat
 async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionParentPathOrHint, sessionId) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hint = path63.resolve(sessionParentPathOrHint);
-  const underHint = await tryBindingFromSessionDirectory(path63.join(hint, sid));
+  const hint = path62.resolve(sessionParentPathOrHint);
+  const underHint = await tryBindingFromSessionDirectory(path62.join(hint, sid));
   if (underHint) return underHint;
   const direct = await tryBindingFromSessionDirectory(hint);
   if (direct) {
-    if (path63.basename(hint) === sid && await isGitDir(hint)) {
+    if (path62.basename(hint) === sid && await isGitDir(hint)) {
       const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
       if (legacyFromCheckout && legacyFromCheckout.repoCheckoutPaths.length > direct.repoCheckoutPaths.length) {
         return legacyFromCheckout;
@@ -50477,23 +50299,23 @@ async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionParentPat
     }
     return direct;
   }
-  if (path63.basename(hint) === sid && await isGitDir(hint)) {
+  if (path62.basename(hint) === sid && await isGitDir(hint)) {
     const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
     if (legacyFromCheckout) return legacyFromCheckout;
   }
   let st;
   try {
-    st = await fs39.promises.stat(hint);
+    st = await fs38.promises.stat(hint);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const legacyPaths = await collectWorktreeRootsNamed(hint, sid);
   if (legacyPaths.paths.length === 0) return null;
-  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path63.resolve(legacyPaths.paths[0]);
+  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path62.resolve(legacyPaths.paths[0]);
   return {
-    sessionParentPath: path63.resolve(isolated),
-    repoCheckoutPaths: legacyPaths.paths.map((p) => path63.resolve(p))
+    sessionParentPath: path62.resolve(isolated),
+    repoCheckoutPaths: legacyPaths.paths.map((p) => path62.resolve(p))
   };
 }
 
@@ -50554,11 +50376,11 @@ function parseSessionParent(v) {
 }
 
 // ../bridge/src/worktrees/prepare/prepare-new-isolated-worktrees.ts
-import * as fs43 from "node:fs";
+import * as fs42 from "node:fs";
 
 // ../bridge/src/git/discover-repos.ts
-import * as fs40 from "node:fs";
-import * as path64 from "node:path";
+import * as fs39 from "node:fs";
+import * as path63 from "node:path";
 init_yield_to_event_loop();
 var GIT_DISCOVER_YIELD_EVERY = 32;
 async function yieldGitDiscoverWork(entryCount) {
@@ -50568,14 +50390,14 @@ async function yieldGitDiscoverWork(entryCount) {
 }
 async function discoverGitRepos(cwd = getBridgeRoot()) {
   const result = [];
-  const cwdResolved = path64.resolve(cwd);
+  const cwdResolved = path63.resolve(cwd);
   if (await isGitRepoDirectory(cwdResolved)) {
     const remoteUrl = await getRemoteOriginUrl(cwdResolved);
     result.push({ absolutePath: cwdResolved, remoteUrl });
   }
   let entries;
   try {
-    entries = fs40.readdirSync(cwdResolved, { withFileTypes: true });
+    entries = fs39.readdirSync(cwdResolved, { withFileTypes: true });
   } catch {
     return result;
   }
@@ -50583,7 +50405,7 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
     await yieldGitDiscoverWork(i + 1);
     const ent = entries[i];
     if (!ent.isDirectory()) continue;
-    const childPath2 = path64.join(cwdResolved, ent.name);
+    const childPath2 = path63.join(cwdResolved, ent.name);
     if (await isGitRepoDirectory(childPath2)) {
       const remoteUrl = await getRemoteOriginUrl(childPath2);
       result.push({ absolutePath: childPath2, remoteUrl });
@@ -50592,17 +50414,17 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
   return result;
 }
 async function discoverGitReposUnderRoot(rootPath) {
-  const root = path64.resolve(rootPath);
+  const root = path63.resolve(rootPath);
   const roots = [];
   let walkEntries = 0;
   async function walk(dir) {
     if (await isGitRepoDirectory(dir)) {
-      roots.push(path64.resolve(dir));
+      roots.push(path63.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = fs40.readdirSync(dir, { withFileTypes: true });
+      entries = fs39.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -50610,7 +50432,7 @@ async function discoverGitReposUnderRoot(rootPath) {
       await yieldGitDiscoverWork(++walkEntries);
       const ent = entries[i];
       if (!ent.isDirectory() || ent.name === ".git") continue;
-      await walk(path64.join(dir, ent.name));
+      await walk(path63.join(dir, ent.name));
     }
   }
   await walk(root);
@@ -50626,8 +50448,8 @@ async function discoverGitReposUnderRoot(rootPath) {
 }
 
 // ../bridge/src/worktrees/prepare/add-isolated-repo-worktree.ts
-import * as fs42 from "node:fs";
-import * as path66 from "node:path";
+import * as fs41 from "node:fs";
+import * as path65 from "node:path";
 
 // ../bridge/src/git/worktrees/worktree-add.ts
 async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch, baseRef = "HEAD") {
@@ -50643,8 +50465,8 @@ async function gitWorktreeAddExistingBranch(mainRepoPath, worktreePath, branch)
 }
 
 // ../bridge/src/worktrees/prepare/copy-bridge-files-along-worktree-path.ts
-import * as fs41 from "node:fs";
-import * as path65 from "node:path";
+import * as fs40 from "node:fs";
+import * as path64 from "node:path";
 var BRIDGE_FILES_ALONG_WORKTREE_PATH = ["AGENTS.md"];
 function copyBridgeFilesAlongWorktreePath(options) {
   const { bridgeRoot, scopeDir, repoPathRelativeToBridgeRoot, log: log2 } = options;
@@ -50653,19 +50475,19 @@ function copyBridgeFilesAlongWorktreePath(options) {
   const segments = repoPathRelativeToBridgeRoot.split("/").filter(Boolean);
   for (let i = 0; i < segments.length; i++) {
     const prefix = segments.slice(0, i).join("/");
-    const bridgeDir = prefix ? path65.join(bridgeRoot, prefix) : bridgeRoot;
-    const destDir = prefix ? path65.join(scopeDir, prefix) : scopeDir;
+    const bridgeDir = prefix ? path64.join(bridgeRoot, prefix) : bridgeRoot;
+    const destDir = prefix ? path64.join(scopeDir, prefix) : scopeDir;
     for (const fileName of fileNames) {
       copyFileIfPresent(bridgeDir, destDir, fileName, log2);
     }
   }
 }
 function copyFileIfPresent(srcDir, destDir, fileName, log2) {
-  const src = path65.join(srcDir, fileName);
-  if (!fs41.existsSync(src)) return;
-  const dest = path65.join(destDir, fileName);
+  const src = path64.join(srcDir, fileName);
+  if (!fs40.existsSync(src)) return;
+  const dest = path64.join(destDir, fileName);
   try {
-    fs41.copyFileSync(src, dest);
+    fs40.copyFileSync(src, dest);
     log2?.(`[worktrees] Copied ${fileName} to ${dest}`);
   } catch (e) {
     log2?.(
@@ -50697,16 +50519,16 @@ async function addIsolatedRepoWorktree(options) {
     worktreeBaseBranches,
     log: log2
   } = options;
-  const repoPathRelativeToBridgeRootRaw = path66.relative(bridgeResolved, repoAbsolutePath);
-  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path66.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
+  const repoPathRelativeToBridgeRootRaw = path65.relative(bridgeResolved, repoAbsolutePath);
+  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path65.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
     return null;
   }
   const repoPathRelativeToBridgeRoot = normalizeRepoPathRelativeToWorkspaceRoot(
     repoPathRelativeToBridgeRootRaw === "" ? "." : repoPathRelativeToBridgeRootRaw
   );
-  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path66.join(scopeDir, repoPathRelativeToBridgeRoot);
+  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path65.join(scopeDir, repoPathRelativeToBridgeRoot);
   if (repoPathRelativeToBridgeRoot !== ".") {
-    fs42.mkdirSync(path66.dirname(worktreePath), { recursive: true });
+    fs41.mkdirSync(path65.dirname(worktreePath), { recursive: true });
     copyBridgeFilesAlongWorktreePath({
       bridgeRoot: bridgeResolved,
       scopeDir,
@@ -50734,7 +50556,7 @@ async function addIsolatedRepoWorktree(options) {
 }
 
 // ../bridge/src/worktrees/prepare/resolve-isolated-scope-dir.ts
-import * as path67 from "node:path";
+import * as path66 from "node:path";
 
 // ../bridge/src/worktrees/worktree-layout-kind.ts
 function sanitizeWorktreeBranchSegment(value) {
@@ -50764,10 +50586,10 @@ function previewDeployBranchName(environmentId) {
 
 // ../bridge/src/worktrees/prepare/resolve-isolated-scope-dir.ts
 function resolveIsolatedScopeDir(options) {
-  const bridgeResolved = path67.resolve(options.bridgeRoot);
+  const bridgeResolved = path66.resolve(options.bridgeRoot);
   const cwdKey = allocateDirNameForLauncherCwd(options.layout, bridgeResolved);
-  const bridgeKeyDir = path67.join(options.worktreesRootPath, cwdKey);
-  const scopeDir = path67.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
+  const bridgeKeyDir = path66.join(options.worktreesRootPath, cwdKey);
+  const scopeDir = path66.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
   return { bridgeResolved, scopeDir };
 }
 
@@ -50797,7 +50619,7 @@ async function prepareNewIsolatedWorktrees(options) {
     return null;
   }
   const worktreePaths = [];
-  fs43.mkdirSync(scopeDir, { recursive: true });
+  fs42.mkdirSync(scopeDir, { recursive: true });
   await forEachWithGitYield(repos, async (repo) => {
     const worktreePath = await addIsolatedRepoWorktree({
       kind,
@@ -50869,10 +50691,10 @@ async function resolveExistingSessionParentPath(sessionId, cache2, discover) {
 }
 
 // ../bridge/src/worktrees/manager/resolve-explicit-session-parent-path.ts
-import * as path68 from "node:path";
+import * as path67 from "node:path";
 init_yield_to_event_loop();
 async function resolveExplicitSessionParentPath(params) {
-  const resolved = path68.resolve(params.parentPathRaw);
+  const resolved = path67.resolve(params.parentPathRaw);
   if (parseSessionParent(params.sessionParent) !== "worktrees_root") {
     return resolved;
   }
@@ -50889,7 +50711,7 @@ async function resolveExplicitSessionParentPath(params) {
     await yieldToEventLoop();
     const tryRoot = await discoverSessionWorktreesUnderSessionWorktreeRoot(cur, params.sessionId);
     if (tryRoot) return rememberAndReturn(tryRoot);
-    const next = path68.dirname(cur);
+    const next = path67.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -51050,15 +50872,15 @@ var SessionWorktreeManager = class {
 };
 
 // ../bridge/src/worktrees/discovery/discover-preview-worktree-on-disk.ts
-import * as fs44 from "node:fs";
-import * as path69 from "node:path";
+import * as fs43 from "node:fs";
+import * as path68 from "node:path";
 init_yield_to_event_loop();
 async function discoverPreviewWorktreeOnDisk(options) {
   const { environmentId, worktreesRootPath, layout, bridgeRoot } = options;
   const eid = environmentId.trim();
   if (!eid) return null;
   try {
-    await fs44.promises.access(worktreesRootPath);
+    await fs43.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -51067,13 +50889,13 @@ async function discoverPreviewWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs44.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs43.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path69.join(worktreesRootPath, name);
+      const p = path68.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs44.promises.stat(p);
+        st = await fs43.promises.stat(p);
       } catch {
         continue;
       }
@@ -51087,7 +50909,7 @@ async function discoverPreviewWorktreeOnDisk(options) {
   const previewDirRel = layoutDirSegments("preview_environment", eid);
   for (const key of keys) {
     await yieldToEventLoop();
-    const previewDir = path69.join(worktreesRootPath, key, ...previewDirRel);
+    const previewDir = path68.join(worktreesRootPath, key, ...previewDirRel);
     const binding = await tryBindingFromIsolatedDirectory(previewDir);
     if (binding) return binding;
   }
@@ -51214,7 +51036,7 @@ var PreviewWorktreeManager = class {
 };
 
 // ../bridge/src/worktrees/deploy/deploy-session-to-preview-environment.ts
-import * as path73 from "node:path";
+import * as path72 from "node:path";
 
 // ../bridge/src/git/worktrees/reset-worktree-to-branch.ts
 async function gitResetWorktreeToBranch(worktreePath, branch) {
@@ -51225,8 +51047,8 @@ async function gitResetWorktreeToBranch(worktreePath, branch) {
 }
 
 // ../bridge/src/worktrees/deploy/capture-and-apply-wip.ts
-import * as fs45 from "node:fs";
-import * as path70 from "node:path";
+import * as fs44 from "node:fs";
+import * as path69 from "node:path";
 
 // ../bridge/src/git/is-not-a-git-repository-error.ts
 function isNotAGitRepositoryError(e) {
@@ -51288,12 +51110,12 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
     if (!ap.ok) return ap;
   }
   await forEachWithGitYield(wip.untrackedPaths, async (rel) => {
-    const src = path70.join(sourceRepoPath, rel);
-    const dst = path70.join(targetRepoPath, rel);
+    const src = path69.join(sourceRepoPath, rel);
+    const dst = path69.join(targetRepoPath, rel);
     try {
-      if (!fs45.existsSync(src)) return;
-      fs45.mkdirSync(path70.dirname(dst), { recursive: true });
-      fs45.copyFileSync(src, dst);
+      if (!fs44.existsSync(src)) return;
+      fs44.mkdirSync(path69.dirname(dst), { recursive: true });
+      fs44.copyFileSync(src, dst);
     } catch (e) {
       log2(
         `[worktrees] Failed to copy untracked ${rel}: ${e instanceof Error ? e.message : String(e)}`
@@ -51304,14 +51126,14 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
 }
 
 // ../bridge/src/worktrees/deploy/resolve-isolated-checkout-for-repo-path-relative-to-workspace-root.ts
-import * as path71 from "node:path";
+import * as path70 from "node:path";
 async function resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot(options) {
   const { checkoutPaths, sessionParentPath, bridgeRoot, repoPathRelativeToWorkspaceRoot } = options;
-  const resolvedSessionParentPath = sessionParentPath ? path71.resolve(sessionParentPath) : null;
+  const resolvedSessionParentPath = sessionParentPath ? path70.resolve(sessionParentPath) : null;
   let match = null;
   await forEachWithGitYield(checkoutPaths, async (checkoutPath) => {
     if (match) return;
-    const resolvedCheckoutPath = path71.resolve(checkoutPath);
+    const resolvedCheckoutPath = path70.resolve(checkoutPath);
     if (!await isGitRepoDirectory(resolvedCheckoutPath)) return;
     const resolvedRepoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath: resolvedCheckoutPath,
@@ -51365,7 +51187,7 @@ async function applySessionWipToPreviewCheckouts(options) {
 }
 
 // ../bridge/src/worktrees/deploy/collect-session-repo-deploy-states.ts
-import * as path72 from "node:path";
+import * as path71 from "node:path";
 
 // ../bridge/src/git/branches/create-or-update-branch.ts
 async function gitCreateOrUpdateBranch(repoPath, branch, startRef, options) {
@@ -51402,19 +51224,19 @@ async function collectSessionRepoDeployStates(options) {
   const sessionParentPath = sessionWorktreeManager.getSessionParentPath(sid);
   const states = [];
   await forEachWithGitYield(sessionTargets, async (sessionCheckout) => {
-    const checkoutPath = path72.resolve(sessionCheckout);
+    const checkoutPath = path71.resolve(sessionCheckout);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
       bridgeRoot,
-      sessionParentPath: sessionParentPath ? path72.resolve(sessionParentPath) : null
+      sessionParentPath: sessionParentPath ? path71.resolve(sessionParentPath) : null
     });
     if (!repoPathRelativeToWorkspaceRoot) return;
     const mainRepoPath = resolveMainRepoPath(checkoutPath);
     const headSha = (await cliSimpleGit(checkoutPath).revparse(["HEAD"])).trim();
     const previewCheckout = previewCheckoutPaths.length > 0 ? await resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot({
       checkoutPaths: previewCheckoutPaths,
-      sessionParentPath: previewParentPath ? path72.resolve(previewParentPath) : null,
+      sessionParentPath: previewParentPath ? path71.resolve(previewParentPath) : null,
       bridgeRoot,
       repoPathRelativeToWorkspaceRoot
     }) : null;
@@ -51434,7 +51256,7 @@ async function deploySessionToPreviewEnvironment(options) {
   const eid = options.environmentId.trim();
   if (!sid || !eid) return { ok: false, error: "sessionId and environmentId are required" };
   const deployBranch = previewDeployBranchName(eid);
-  const bridgeRoot = path73.resolve(getBridgeRoot());
+  const bridgeRoot = path72.resolve(getBridgeRoot());
   await previewWorktreeManager.ensureCached(eid);
   const existingPreviewParentPath = previewWorktreeManager.getPreviewParentPath(eid) ?? null;
   const existingPreviewCheckoutPaths = previewWorktreeManager.getRepoCheckoutPaths(eid) ?? [];
@@ -51474,13 +51296,13 @@ async function deploySessionToPreviewEnvironment(options) {
 }
 
 // ../bridge/src/worktrees/manager/default-worktrees-root-path.ts
-import * as path74 from "node:path";
+import * as path73 from "node:path";
 import os8 from "node:os";
 function defaultWorktreesRootPath() {
-  return path74.join(os8.homedir(), ".buildautomaton", "worktrees");
+  return path73.join(os8.homedir(), ".buildautomaton", "worktrees");
 }
 
-// ../bridge/src/connection/create-bridge-worktree-managers.ts
+// ../bridge/src/connection/setup/create-bridge-worktree-managers.ts
 function createBridgeWorktreeManagers(options) {
   const worktreesRootPath = options.worktreesRootPath ?? defaultWorktreesRootPath();
   return {
@@ -51602,14 +51424,14 @@ function assertBridgeWorkspace(ctx) {
 }
 
 // ../bridge/src/files/list-dir/index.ts
-import fs47 from "node:fs";
+import fs46 from "node:fs";
 
 // ../bridge/src/files/ensure-under-cwd.ts
-import path75 from "node:path";
+import path74 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path75.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path75.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path75.sep) && resolved !== cwd) {
+  const normalized = path74.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path74.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path74.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -51622,15 +51444,15 @@ init_yield_to_event_loop();
 var LIST_DIR_YIELD_EVERY = 256;
 
 // ../bridge/src/files/list-dir/map-dir-entry.ts
-import path76 from "node:path";
-import fs46 from "node:fs";
+import path75 from "node:path";
+import fs45 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path76.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path76.join(resolved, d.name);
+  const entryPath = path75.join(relativePath || ".", d.name).replace(/\\/g, "/");
+  const fullPath = path75.join(resolved, d.name);
   let isDir = d.isDirectory();
   if (d.isSymbolicLink()) {
     try {
-      const targetStat = await fs46.promises.stat(fullPath);
+      const targetStat = await fs45.promises.stat(fullPath);
       isDir = targetStat.isDirectory();
     } catch {
       isDir = false;
@@ -51660,7 +51482,7 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs47.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs46.promises.readdir(resolved, { withFileTypes: true });
     const entries = [];
     for (let i = 0; i < names.length; i++) {
       if (i > 0 && i % LIST_DIR_YIELD_EVERY === 0) {
@@ -51676,13 +51498,13 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
 }
 
 // ../bridge/src/git/tree/resolve-repo-abs-path.ts
-import * as path77 from "node:path";
+import * as path76 from "node:path";
 function resolveRepoAbsPathFromBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path77.resolve(bridgeRoot);
+  const bridgeResolved = path76.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path77.join(bridgeResolved, rel);
-  const resolved = path77.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path77.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path76.join(bridgeResolved, rel);
+  const resolved = path76.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path76.sep) && resolved !== bridgeResolved) {
     return null;
   }
   return resolved;
@@ -52163,25 +51985,25 @@ async function GET2(ctx) {
 init_in_flight();
 
 // ../bridge/src/files/read/read-file-async.ts
-import fs53 from "node:fs";
+import fs52 from "node:fs";
 init_yield_to_event_loop();
 
 // ../bridge/src/files/read/resolve-file-cache.ts
-import fs48 from "node:fs";
-import path78 from "node:path";
+import fs47 from "node:fs";
+import path77 from "node:path";
 var RESOLVE_CACHE_MAX = 4096;
 var resolveCache = /* @__PURE__ */ new Map();
 function resolveCacheKey(sessionParentPath, relativePath) {
   return `${sessionParentPath}\0${relativePath}`;
 }
 function pathStaysUnderParent(filePath, sessionParentPath) {
-  const parent = path78.resolve(sessionParentPath);
-  const resolved = path78.resolve(filePath);
-  return resolved === parent || resolved.startsWith(`${parent}${path78.sep}`);
+  const parent = path77.resolve(sessionParentPath);
+  const resolved = path77.resolve(filePath);
+  return resolved === parent || resolved.startsWith(`${parent}${path77.sep}`);
 }
 function statMatchesCacheSync(entry) {
   try {
-    const stat3 = fs48.statSync(entry.path);
+    const stat3 = fs47.statSync(entry.path);
     return stat3.isFile() && stat3.mtimeMs === entry.mtimeMs && stat3.size === entry.size;
   } catch {
     return false;
@@ -52214,7 +52036,7 @@ function joinInflightResolve(cacheKey, factory) {
 }
 
 // ../bridge/src/files/read/resolve-file-for-read-core.ts
-import fs49 from "node:fs";
+import fs48 from "node:fs";
 import { isMainThread as isMainThread4 } from "node:worker_threads";
 function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   const cacheKey = resolveCacheKey(sessionParentPath, relativePath);
@@ -52224,13 +52046,13 @@ function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = fs49.lstatSync(resolved);
+    const lstat = fs48.lstatSync(resolved);
     if (lstat.isSymbolicLink()) {
-      real = fs49.realpathSync(resolved);
+      real = fs48.realpathSync(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat3 = fs49.statSync(real);
+      const stat3 = fs48.statSync(real);
       if (!stat3.isFile()) return { error: "Not a file" };
       size = stat3.size;
       mtimeMs = stat3.mtimeMs;
@@ -52258,13 +52080,13 @@ async function resolveFileForReadImpl(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = await fs49.promises.lstat(resolved);
+    const lstat = await fs48.promises.lstat(resolved);
     if (lstat.isSymbolicLink()) {
-      real = await fs49.promises.realpath(resolved);
+      real = await fs48.promises.realpath(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat3 = await fs49.promises.stat(real);
+      const stat3 = await fs48.promises.stat(real);
       if (!stat3.isFile()) return { error: "Not a file" };
       size = stat3.size;
       mtimeMs = stat3.mtimeMs;
@@ -52313,7 +52135,7 @@ async function resolveFilePathAsync(relativePath, sessionParentPath = getBridgeR
 
 // ../bridge/src/files/read/read-file-range-async.ts
 init_yield_to_event_loop();
-import fs50 from "node:fs";
+import fs49 from "node:fs";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 
 // ../bridge/src/files/read/read-file-range-line-zero.ts
@@ -52427,8 +52249,8 @@ function finishLineZeroTail(state, tail, resultLines, fileSize, lineChunkSize, l
 
 // ../bridge/src/files/read/read-file-range-async.ts
 async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE, fileSizeIn) {
-  const fileSize = fileSizeIn ?? (await fs50.promises.stat(filePath)).size;
-  const fd = await fs50.promises.open(filePath, "r");
+  const fileSize = fileSizeIn ?? (await fs49.promises.stat(filePath)).size;
+  const fd = await fs49.promises.open(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder2("utf8");
@@ -52529,7 +52351,7 @@ async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, li
 }
 
 // ../bridge/src/files/read/read-small-file-range-async.ts
-import fs51 from "node:fs";
+import fs50 from "node:fs";
 import { isMainThread as isMainThread5 } from "node:worker_threads";
 var SMALL_FILE_RANGE_MAX_BYTES = 512 * 1024;
 function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize) {
@@ -52559,7 +52381,7 @@ function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize,
   };
 }
 function readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const raw = fs51.readFileSync(filePath, "utf8");
+  const raw = fs50.readFileSync(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
@@ -52567,28 +52389,28 @@ async function readSmallFileRangeAsync(filePath, fileSize, startLine, endLine, l
   if (isMainThread5) {
     return readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize);
   }
-  const raw = await fs51.promises.readFile(filePath, "utf8");
+  const raw = await fs50.promises.readFile(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
 
 // ../bridge/src/files/read/read-file-buffer-full-async.ts
 init_yield_to_event_loop();
-import fs52 from "node:fs";
+import fs51 from "node:fs";
 import { isMainThread as isMainThread6 } from "node:worker_threads";
 var READ_CHUNK_BYTES = 256 * 1024;
 var MAIN_THREAD_SYNC_READ_MAX_BYTES = 512 * 1024;
 async function readFileBufferFullAsync(filePath, knownSize) {
   if (isMainThread6) {
-    const size2 = knownSize ?? fs52.statSync(filePath).size;
+    const size2 = knownSize ?? fs51.statSync(filePath).size;
     if (size2 <= MAIN_THREAD_SYNC_READ_MAX_BYTES) {
       await yieldToEventLoop();
-      const buffer = fs52.readFileSync(filePath);
+      const buffer = fs51.readFileSync(filePath);
       return { buffer, size: buffer.length };
     }
   }
-  const size = knownSize ?? (await fs52.promises.stat(filePath)).size;
-  const fd = await fs52.promises.open(filePath, "r");
+  const size = knownSize ?? (await fs51.promises.stat(filePath)).size;
+  const fd = await fs51.promises.open(filePath, "r");
   const chunks = [];
   let position = 0;
   let bytesSinceYield = 0;
@@ -52691,7 +52513,7 @@ async function readFileAsync(relativePath, startLine, endLine, lineOffset, lineC
     }
     if (hasRange) {
       if (fileSize == null) {
-        const stat3 = await fs53.promises.stat(resolvedPath);
+        const stat3 = await fs52.promises.stat(resolvedPath);
         fileSize = stat3.size;
       }
       const read2 = fileSize <= SMALL_FILE_RANGE_MAX_BYTES ? await readSmallFileRangeAsync(
@@ -52989,12 +52811,12 @@ function parseOptionalInt2(raw) {
   return Number.isInteger(parsed) ? parsed : void 0;
 }
 function parseCodeNavParams(url2) {
-  const path91 = url2.searchParams.get("path") ?? "";
+  const path88 = url2.searchParams.get("path") ?? "";
   const opRaw = url2.searchParams.get("op")?.trim();
   const op = opRaw === "references" ? "references" : opRaw === "symbols" ? "symbols" : opRaw === "definitions" ? "definitions" : "definition";
   const line = parseOptionalInt2(url2.searchParams.get("line")) ?? 1;
   const column = parseOptionalInt2(url2.searchParams.get("column")) ?? 0;
-  return { path: path91, op, line, column };
+  return { path: path88, op, line, column };
 }
 function parseCodeNavPath(url2) {
   const raw = url2.searchParams.get("path")?.trim();
@@ -53251,7 +53073,7 @@ async function createLocalShortcut(params) {
   };
 }
 
-// ../bridge/src/connection/create-bridge-connection-runtime.ts
+// ../bridge/src/connection/runtime/create-bridge-connection-runtime.ts
 async function createBridgeConnectionRuntime(options, params) {
   const { plugin, workspaceId } = options;
   const { state, getWs, logFn } = params;
@@ -53596,7 +53418,7 @@ function logDuplicateBridgeWarning(log2, result) {
   }
 }
 
-// ../bridge/src/connection/create-main-bridge-reconnect-state.ts
+// ../bridge/src/connection/reconnect/create-main-bridge-reconnect-state.ts
 function createMainBridgeReconnectState() {
   const state = {
     closedByUser: false,
@@ -53615,7 +53437,7 @@ function createMainBridgeReconnectState() {
   };
 }
 
-// ../bridge/src/connection/ensure-bridge-connection-databases.ts
+// ../bridge/src/connection/runtime/ensure-bridge-connection-databases.ts
 init_cli_database();
 init_code_nav_cache_availability();
 async function ensureBridgeConnectionDatabases(log2) {
@@ -53623,7 +53445,7 @@ async function ensureBridgeConnectionDatabases(log2) {
   void startCodeNavCacheInitialization(log2);
 }
 
-// ../bridge/src/types/api-to-bridge-messages.ts
+// ../bridge/src/connection/protocol/api-to-bridge-messages.ts
 var API_TO_BRIDGE_MESSAGE_TYPES = [
   "auth_token",
   "bridge_identified",
@@ -53641,14 +53463,10 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "session_discarded",
   "revert_turn_snapshot",
   "cursor_request_response",
-  "skill_call",
   "file_browser_request",
   "file_browser_search",
   "code_nav",
-  "skill_layout_request",
-  "install_skills",
   "install_agent",
-  "refresh_local_skills",
   "bridge_git_context_request",
   "list_repo_branches_request",
   "bridge_git_checkout_request"
@@ -53670,15 +53488,14 @@ function parseApiToBridgeMessage(data, log2) {
   return data;
 }
 
-// ../bridge/src/routing/handlers/auth-token.ts
+// ../bridge/src/connection/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 BUILDAUTOMATON_AUTH_TOKEN="${msg.token}"`);
 };
 
-// ../bridge/src/routing/handlers/bridge-identified.ts
-init_cli_process_interrupt();
+// ../bridge/src/connection/routing/handlers/bridge-identified.ts
 var handleBridgeIdentified = (msg, deps) => {
   if (typeof msg.bridgeName !== "string") return;
   deps.onBridgeIdentified({
@@ -53705,19 +53522,9 @@ var handleBridgeIdentified = (msg, deps) => {
       }
     })();
   });
-  setImmediate(() => {
-    if (isCliImmediateShutdownRequested()) return;
-    try {
-      deps.sendLocalSkillsReport?.();
-    } catch (e) {
-      deps.log(
-        `[Bridge service] Local skills report failed: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  });
 };
 
-// ../bridge/src/routing/handlers/installed-agent-auth-sync.ts
+// ../bridge/src/connection/routing/handlers/installed-agent-auth-sync.ts
 var handleInstalledAgentAuthSync = (msg) => {
   const entries = Array.isArray(msg.entries) ? msg.entries : [];
   setBridgeInstalledAgentAuthEnv(
@@ -53727,6 +53534,241 @@ var handleInstalledAgentAuthSync = (msg) => {
   );
 };
 
+// ../bridge/src/agents/install/run-streaming-command.ts
+import { spawn as spawn10 } from "node:child_process";
+import * as readline4 from "node:readline";
+function runStreamingCommand(command, args, options) {
+  return new Promise((resolve39, reject) => {
+    const child = spawn10(command, args, {
+      env: options.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let settled = false;
+    const timer = options.timeoutMs != null ? setTimeout(() => {
+      child.kill("SIGKILL");
+      if (!settled) {
+        settled = true;
+        reject(new Error(`Command timed out after ${options.timeoutMs}ms`));
+      }
+    }, options.timeoutMs) : null;
+    const onLine = (line) => {
+      if (line.length > 0) options.onLine?.(line);
+    };
+    if (child.stdout) {
+      readline4.createInterface({ input: child.stdout, crlfDelay: Infinity }).on("line", onLine);
+    }
+    if (child.stderr) {
+      readline4.createInterface({ input: child.stderr, crlfDelay: Infinity }).on("line", onLine);
+    }
+    child.on("error", (err) => {
+      if (timer) clearTimeout(timer);
+      if (!settled) {
+        settled = true;
+        reject(err);
+      }
+    });
+    child.on("close", (code, signal) => {
+      if (timer) clearTimeout(timer);
+      if (!settled) {
+        settled = true;
+        resolve39({ code, signal });
+      }
+    });
+  });
+}
+
+// ../bridge/src/agents/install/commands/run-npm-global-install.ts
+async function runNpmGlobalInstall(packageName, env, options) {
+  const result = await runStreamingCommand("npm", ["install", "-g", packageName], {
+    env: bridgeAgentPathEnv(env),
+    timeoutMs: options?.timeoutMs ?? 3e5,
+    onLine: options?.onLine
+  });
+  if (result.code !== 0) {
+    throw new Error(`npm install -g ${packageName} failed (exit ${result.code ?? "signal"})`);
+  }
+}
+
+// ../bridge/src/agents/install/commands/claude-code.ts
+var claudeCodeInstallCommand = {
+  agentType: "claude-code",
+  detectCommand: "claude",
+  async install(ctx) {
+    ctx.onProgress?.("Installing Anthropic Claude Code");
+    await runNpmGlobalInstall(
+      "@anthropic-ai/claude-code",
+      { ...ctx.env, ANTHROPIC_API_KEY: ctx.authToken },
+      { onLine: (line) => ctx.onProgress?.("Installing Anthropic Claude Code", line) }
+    );
+  }
+};
+
+// ../bridge/src/agents/install/commands/codex-acp.ts
+var codexAcpInstallCommand = {
+  agentType: "codex-acp",
+  detectCommand: "codex",
+  async install(ctx) {
+    ctx.onProgress?.("Installing Codex");
+    await runNpmGlobalInstall(
+      "@openai/codex",
+      { ...ctx.env, OPENAI_API_KEY: ctx.authToken },
+      { onLine: (line) => ctx.onProgress?.("Installing Codex", line) }
+    );
+  }
+};
+
+// ../bridge/src/agents/install/commands/cursor-cli.ts
+var cursorCliInstallCommand = {
+  agentType: "cursor-cli",
+  detectCommand: "agent",
+  alternateDetectCommands: ["cursor-agent"],
+  async install(ctx) {
+    ctx.onProgress?.("Installing Cursor CLI");
+    const result = await runStreamingCommand(
+      "bash",
+      ["-lc", "curl -fsSL https://cursor.com/install | bash"],
+      {
+        timeoutMs: 3e5,
+        env: { ...bridgeAgentPathEnv(ctx.env), CURSOR_API_KEY: ctx.authToken },
+        onLine: (line) => ctx.onProgress?.("Installing Cursor CLI", line)
+      }
+    );
+    if (result.code !== 0) {
+      throw new Error(`Cursor CLI install failed (exit ${result.code ?? "signal"})`);
+    }
+  }
+};
+
+// ../bridge/src/agents/install/commands/opencode.ts
+var opencodeInstallCommand = {
+  agentType: "opencode",
+  detectCommand: "opencode",
+  async install(ctx) {
+    ctx.onProgress?.("Installing OpenCode");
+    await runNpmGlobalInstall(
+      "opencode-ai",
+      { ...ctx.env, OPENCODE_API_KEY: ctx.authToken },
+      { onLine: (line) => ctx.onProgress?.("Installing OpenCode", line) }
+    );
+  }
+};
+
+// ../bridge/src/agents/install/commands/index.ts
+var COMMANDS = [
+  claudeCodeInstallCommand,
+  codexAcpInstallCommand,
+  cursorCliInstallCommand,
+  opencodeInstallCommand
+];
+var byType = new Map(COMMANDS.map((c) => [c.agentType, c]));
+function getAgentInstallCommand(agentType) {
+  return byType.get(agentType);
+}
+
+// ../bridge/src/agents/install/install-local-agent.ts
+async function installLocalAgentOnBridge(params) {
+  const spec = INSTALLABLE_BRIDGE_AGENTS.find((a) => a.value === params.agentType);
+  if (!spec) return { success: false, error: `Unsupported agent type: ${params.agentType}` };
+  const command = getAgentInstallCommand(params.agentType);
+  if (!command) return { success: false, error: `No install command for ${params.agentType}` };
+  params.onProgress?.(`Configuring ${spec.label} credentials`);
+  try {
+    await command.install({
+      authToken: params.authToken,
+      onProgress: params.onProgress,
+      env: { ...process.env, [spec.tokenEnvVar]: params.authToken }
+    });
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return { success: false, error: msg };
+  }
+  ensureBridgeAgentPathInProcessEnv();
+  const detectNames = [
+    command.detectCommand,
+    ...command.alternateDetectCommands ?? []
+  ];
+  let found = false;
+  for (const name of detectNames) {
+    if (await waitForCommandOnPath(name)) {
+      found = true;
+      break;
+    }
+  }
+  if (!found) {
+    return { success: false, error: `${command.detectCommand} not found on PATH after install` };
+  }
+  return { success: true };
+}
+
+// ../bridge/src/connection/routing/handlers/install-agent.ts
+var handleInstallAgentMessage = (msg, deps) => {
+  const processId = typeof msg.processId === "string" ? msg.processId : "";
+  const agentId = typeof msg.agentId === "string" ? msg.agentId : "";
+  const tokenId = typeof msg.tokenId === "string" ? msg.tokenId : "";
+  const agentType = typeof msg.agentType === "string" ? msg.agentType : "";
+  const authToken = typeof msg.authToken === "string" ? msg.authToken : "";
+  if (!processId || !agentId || !tokenId || !agentType || !authToken) return;
+  void (async () => {
+    const socket = deps.getWs();
+    let pendingLines = [];
+    let flushTimer = null;
+    const sendProgress = (message, logOutput) => {
+      if (!socket) return;
+      sendWsMessage(socket, {
+        type: "install_agent_progress",
+        processId,
+        agentId,
+        tokenId,
+        agentType,
+        step: "agent_install_package",
+        message,
+        ...logOutput ? { logOutput } : {}
+      });
+    };
+    const flushLines = (message) => {
+      if (flushTimer) {
+        clearTimeout(flushTimer);
+        flushTimer = null;
+      }
+      if (pendingLines.length === 0) return;
+      const logOutput = pendingLines.join("\n");
+      pendingLines = [];
+      sendProgress(message, logOutput);
+    };
+    const result = await installLocalAgentOnBridge({
+      agentType,
+      authToken,
+      onProgress: (message, logOutput) => {
+        if (logOutput == null) {
+          flushLines(message);
+          sendProgress(message);
+          return;
+        }
+        pendingLines.push(logOutput);
+        if (!flushTimer) {
+          flushTimer = setTimeout(() => flushLines(message), 100);
+        }
+      }
+    });
+    flushLines("Installing agent packages on the bridge machine.");
+    if (socket) {
+      sendWsMessage(socket, {
+        type: "install_agent_result",
+        processId,
+        agentId,
+        tokenId,
+        agentType,
+        success: result.success,
+        error: result.error
+      });
+    }
+    if (result.success) await deps.reportAutoDetectedAgents?.();
+    if (!result.success) {
+      deps.log(`[Bridge service] Install agent failed: ${result.error ?? "unknown"}`);
+    }
+  })();
+};
+
 // ../bridge/src/connection/heartbeat/ack.ts
 var handleBridgeHeartbeatAck = (msg, deps) => {
   const raw = msg.s;
@@ -53734,7 +53776,7 @@ var handleBridgeHeartbeatAck = (msg, deps) => {
   deps.onBridgeHeartbeatAck?.(Math.trunc(raw));
 };
 
-// ../bridge/src/routing/dispatch/connection.ts
+// ../bridge/src/connection/routing/dispatch/connection.ts
 function dispatchBridgeConnectionMessage(msg, deps) {
   switch (msg.type) {
     case "auth_token":
@@ -53746,13 +53788,16 @@ function dispatchBridgeConnectionMessage(msg, deps) {
     case "installed_agent_auth_sync":
       handleInstalledAgentAuthSync(msg, deps);
       break;
+    case "install_agent":
+      handleInstallAgentMessage(msg, deps);
+      break;
     case "ha":
       handleBridgeHeartbeatAck(msg, deps);
       break;
   }
 }
 
-// ../bridge/src/routing/handlers/preview-environment-control.ts
+// ../bridge/src/connection/routing/handlers/preview-environment-control.ts
 var handlePreviewEnvironmentControl = (msg, deps) => {
   let wire;
   try {
@@ -53767,7 +53812,7 @@ var handlePreviewEnvironmentControl = (msg, deps) => {
   deps.previewEnvironmentManager?.handleControl(environmentId, action);
 };
 
-// ../bridge/src/routing/handlers/preview-environments-config.ts
+// ../bridge/src/connection/routing/handlers/preview-environments-config.ts
 var VALID_PORT = (p) => typeof p === "number" && Number.isInteger(p) && p > 0 && p < 65536;
 var handlePreviewEnvironmentsConfig = (msg, deps) => {
   const previewEnvironments = msg.previewEnvironments;
@@ -53782,13 +53827,13 @@ var handlePreviewEnvironmentsConfig = (msg, deps) => {
   });
 };
 
-// ../bridge/src/routing/handlers/send-deploy-session-to-preview-result.ts
+// ../bridge/src/connection/routing/handlers/send-deploy-session-to-preview-result.ts
 function sendDeploySessionToPreviewResult(ws, id, payload) {
   if (!ws) return;
   sendWsMessage(ws, { type: "deploy_session_to_preview_result", id, ...payload });
 }
 
-// ../bridge/src/routing/handlers/deploy-session-to-preview.ts
+// ../bridge/src/connection/routing/handlers/deploy-session-to-preview.ts
 var handleDeploySessionToPreviewMessage = (msg, deps) => {
   if (typeof msg.id !== "string") return;
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -53816,7 +53861,7 @@ var handleDeploySessionToPreviewMessage = (msg, deps) => {
   })();
 };
 
-// ../bridge/src/routing/dispatch/preview.ts
+// ../bridge/src/connection/routing/dispatch/preview.ts
 function dispatchBridgePreviewMessage(msg, deps) {
   switch (msg.type) {
     case "preview_environments_config":
@@ -53837,7 +53882,7 @@ function handleBridgeAgentConfig(msg, { acpManager }) {
   acpManager.setPreferredAgentType(msg.agents[0].type);
 }
 
-// ../bridge/src/routing/handlers/agent-config.ts
+// ../bridge/src/connection/routing/handlers/agent-config.ts
 var handleAgentConfigMessage = (msg, deps) => {
   handleBridgeAgentConfig(msg, deps);
 };
@@ -54059,18 +54104,18 @@ function hasRunningTurn(turns) {
 }
 
 // ../bridge/src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
-import fs56 from "node:fs";
+import fs55 from "node:fs";
 
 // ../bridge/src/git/snapshot/capture.ts
-import * as fs55 from "node:fs";
-import * as path80 from "node:path";
+import * as fs54 from "node:fs";
+import * as path79 from "node:path";
 
 // ../bridge/src/git/snapshot/apply-pre-turn-snapshot.ts
-import * as fs54 from "node:fs";
+import * as fs53 from "node:fs";
 async function applyPreTurnSnapshot(filePath, log2) {
   let data;
   try {
-    data = JSON.parse(fs54.readFileSync(filePath, "utf8"));
+    data = JSON.parse(fs53.readFileSync(filePath, "utf8"));
   } catch (error51) {
     return { ok: false, error: error51 instanceof Error ? error51.message : String(error51) };
   }
@@ -54099,18 +54144,18 @@ async function applyPreTurnSnapshot(filePath, log2) {
 }
 
 // ../bridge/src/git/snapshot/resolve-repo-roots.ts
-import * as path79 from "node:path";
+import * as path78 from "node:path";
 async function resolveSnapshotRepoRoots(options) {
   const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
   if (worktreePaths?.length) {
-    const paths = [...new Set(worktreePaths.map((p) => path79.resolve(p)))];
+    const paths = [...new Set(worktreePaths.map((p) => path78.resolve(p)))];
     return (await Promise.all(paths.map(async (p) => await isGitRepoDirectory(p) ? p : null))).filter((p) => p != null);
   }
   try {
     const roots = (await discoverGitReposUnderRoot(fallbackCwd)).map((repo) => repo.absolutePath);
     const sid = sessionId?.trim();
     if (!sid) return roots;
-    const sessionRoots = roots.filter((root) => path79.basename(root) === sid);
+    const sessionRoots = roots.filter((root) => path78.basename(root) === sid);
     return sessionRoots.length > 0 ? sessionRoots : roots;
   } catch (error51) {
     log2(`[snapshot] Discover repositories failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
@@ -54132,7 +54177,7 @@ async function capturePreTurnSnapshot(options) {
   });
   const dir = snapshotsDirForCwd(agentCwd);
   try {
-    fs55.mkdirSync(dir, { recursive: true });
+    fs54.mkdirSync(dir, { recursive: true });
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -54141,9 +54186,9 @@ async function capturePreTurnSnapshot(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     repos
   };
-  const filePath = path80.join(dir, `${runId}.json`);
+  const filePath = path79.join(dir, `${runId}.json`);
   try {
-    fs55.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
+    fs54.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -54163,7 +54208,7 @@ async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   const agentBase = deps.sessionWorktreeManager.getSessionWorktreeRootForSession(sid) ?? getBridgeRoot();
   const file2 = snapshotFilePath(agentBase, tid);
   try {
-    await fs56.promises.access(file2, fs56.constants.F_OK);
+    await fs55.promises.access(file2, fs55.constants.F_OK);
   } catch {
     deps.log(
       `[Queue] requeued_with_revert: no pre-turn snapshot for ${tid.slice(0, 8)}\u2026; continuing without revert.`
@@ -54534,7 +54579,7 @@ function handleBridgePrompt(msg, deps) {
   });
 }
 
-// ../bridge/src/routing/handlers/prompt.ts
+// ../bridge/src/connection/routing/handlers/prompt.ts
 var handlePromptMessage = (msg, deps) => {
   handleBridgePrompt(msg, deps);
 };
@@ -54559,7 +54604,7 @@ function enqueueLatestPromptQueueStateWork(work) {
   });
 }
 
-// ../bridge/src/routing/handlers/prompt-queue-state.ts
+// ../bridge/src/connection/routing/handlers/prompt-queue-state.ts
 var handlePromptQueueStateMessage = (msg, deps) => {
   enqueueLatestPromptQueueStateWork(async () => {
     try {
@@ -54576,12 +54621,12 @@ function handleBridgeSessionRequestResponse(msg, { acpManager }) {
   acpManager.resolveRequest(msg.requestId, msg.result ?? {});
 }
 
-// ../bridge/src/routing/handlers/session-request-response.ts
+// ../bridge/src/connection/routing/handlers/session-request-response.ts
 var handleSessionRequestResponseMessage = (msg, deps) => {
   handleBridgeSessionRequestResponse(msg, deps);
 };
 
-// ../bridge/src/routing/handlers/git/handle-session-git-commit.ts
+// ../bridge/src/connection/routing/handlers/git/handle-session-git-commit.ts
 async function handleSessionGitCommitAction(deps, sessionId, msg, reply) {
   const branch = typeof msg.branch === "string" ? msg.branch : "";
   const message = typeof msg.message === "string" ? msg.message : "";
@@ -54611,7 +54656,7 @@ async function handleSessionGitCommitAction(deps, sessionId, msg, reply) {
   });
 }
 
-// ../bridge/src/routing/handlers/git/session-git-changes-params.ts
+// ../bridge/src/connection/routing/handlers/git/session-git-changes-params.ts
 function readString(value) {
   return typeof value === "string" ? value.trim() : "";
 }
@@ -54639,7 +54684,7 @@ function parseSessionGitChangesParams(msg) {
   };
 }
 
-// ../bridge/src/routing/handlers/git/handle-session-git-get-change-file-patch.ts
+// ../bridge/src/connection/routing/handlers/git/handle-session-git-get-change-file-patch.ts
 async function handleSessionGitGetChangeFilePatchAction(deps, msg, reply) {
   const changes = parseSessionGitChangesParams(msg);
   const { repoRelPath: repoRel, view, commitSha, fileWorkspaceRelPath, fileChange, fileMovedFromWorkspaceRelPath } = changes;
@@ -54672,7 +54717,7 @@ async function handleSessionGitGetChangeFilePatchAction(deps, msg, reply) {
   );
 }
 
-// ../bridge/src/routing/handlers/git/coalesce-list-changes.ts
+// ../bridge/src/connection/routing/handlers/git/coalesce-list-changes.ts
 var listChangesInflight = /* @__PURE__ */ new Map();
 function normalizeListChangesRepoPathRelativeToWorkspaceRoot(repoRelPath) {
   if (!repoRelPath?.trim()) return "";
@@ -54698,7 +54743,7 @@ function getSessionWorkingTreeChangeDetailsCoalesced(sessionWorktreeManager, ses
   return promise2;
 }
 
-// ../bridge/src/routing/handlers/git/handle-session-git-list-changes.ts
+// ../bridge/src/connection/routing/handlers/git/handle-session-git-list-changes.ts
 async function handleSessionGitListChangesAction(deps, msg, reply) {
   const changes = parseSessionGitChangesParams(msg);
   const { repoRelPath: repoRel, view, commitSha, recentCommitsLimit } = changes;
@@ -54724,7 +54769,7 @@ async function handleSessionGitListChangesAction(deps, msg, reply) {
   reply({ ok: true, repos }, ["repos"]);
 }
 
-// ../bridge/src/routing/handlers/git/handle-session-git-push.ts
+// ../bridge/src/connection/routing/handlers/git/handle-session-git-push.ts
 async function handleSessionGitPushAction(deps, sessionId, reply) {
   const pushRes = await deps.sessionWorktreeManager.pushSessionUpstream(sessionId);
   if (!pushRes.ok) {
@@ -54740,7 +54785,7 @@ async function handleSessionGitPushAction(deps, sessionId, reply) {
   });
 }
 
-// ../bridge/src/routing/handlers/git/handle-session-git-status.ts
+// ../bridge/src/connection/routing/handlers/git/handle-session-git-status.ts
 async function handleSessionGitStatusAction(deps, sessionId, reply) {
   const r = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
   reply({
@@ -54751,7 +54796,7 @@ async function handleSessionGitStatusAction(deps, sessionId, reply) {
   });
 }
 
-// ../bridge/src/routing/handlers/git/send-session-git-result.ts
+// ../bridge/src/connection/routing/handlers/git/send-session-git-result.ts
 function sendSessionGitResult(ws, id, payload, e2ee, encryptedFields = []) {
   if (!ws) return;
   const message = { type: "session_git_result", id, ...payload };
@@ -54762,7 +54807,7 @@ function sendSessionGitResult(ws, id, payload, e2ee, encryptedFields = []) {
   sendWsMessage(ws, wire);
 }
 
-// ../bridge/src/routing/handlers/git/session-git-request.ts
+// ../bridge/src/connection/routing/handlers/git/session-git-request.ts
 var handleSessionGitRequestMessage = (msg, deps) => {
   if (typeof msg.id !== "string") return;
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -54796,7 +54841,7 @@ var handleSessionGitRequestMessage = (msg, deps) => {
   })();
 };
 
-// ../bridge/src/routing/handlers/rename-session-branch.ts
+// ../bridge/src/connection/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 : "";
@@ -54804,7 +54849,7 @@ var handleRenameSessionBranchMessage = (msg, deps) => {
   void deps.sessionWorktreeManager.renameSessionBranch(sessionId, newBranch);
 };
 
-// ../bridge/src/routing/handlers/session-archived.ts
+// ../bridge/src/connection/routing/handlers/session-archived.ts
 var handleSessionArchivedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
@@ -54812,7 +54857,7 @@ var handleSessionArchivedMessage = (msg, deps) => {
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
-// ../bridge/src/routing/handlers/session-discarded.ts
+// ../bridge/src/connection/routing/handlers/session-discarded.ts
 var handleSessionDiscardedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
@@ -54820,8 +54865,8 @@ var handleSessionDiscardedMessage = (msg, deps) => {
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
-// ../bridge/src/routing/handlers/revert-turn-snapshot.ts
-import * as fs57 from "node:fs";
+// ../bridge/src/connection/routing/handlers/revert-turn-snapshot.ts
+import * as fs56 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -54834,7 +54879,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
     const file2 = snapshotFilePath(agentBase, turnId);
     try {
-      await fs57.promises.access(file2, fs57.constants.F_OK);
+      await fs56.promises.access(file2, fs56.constants.F_OK);
     } catch {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
@@ -54854,7 +54899,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
   })();
 };
 
-// ../bridge/src/routing/dispatch/session.ts
+// ../bridge/src/connection/routing/dispatch/session.ts
 function dispatchBridgeSessionMessage(msg, deps) {
   switch (msg.type) {
     case "agent_config":
@@ -54887,382 +54932,6 @@ function dispatchBridgeSessionMessage(msg, deps) {
   }
 }
 
-// ../bridge/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}`);
-  });
-}
-
-// ../bridge/src/routing/handlers/skill-call.ts
-var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
-  const skillId = typeof msg.skillId === "string" ? msg.skillId : "";
-  const operationId = typeof msg.operationId === "string" ? msg.operationId : "";
-  if (!skillId || !operationId) return;
-  const socket = getWs();
-  if (!socket) return;
-  handleSkillCall(
-    { id: msg.id, skillId, operationId, params: msg.params },
-    socket,
-    log2
-  );
-};
-
-// ../bridge/src/routing/handlers/skill-layout-request.ts
-function handleSkillLayoutRequest(msg, deps) {
-  const id = typeof msg.id === "string" ? msg.id : "";
-  void (async () => {
-    const socket = deps.getWs();
-    const roots = await discoverSkillLayoutRootsAsync(getBridgeRoot());
-    if (socket) {
-      sendWsMessage(socket, { type: "skill_layout_response", id, roots });
-    }
-  })();
-}
-
-// ../bridge/src/skills/install/is-valid-install-item.ts
-function isValidRemoteSkillInstallItem(item) {
-  if (item === null || typeof item !== "object") return false;
-  const o = item;
-  return typeof o.sourceId === "string" && typeof o.skillName === "string" && typeof o.versionHash === "string" && Array.isArray(o.files);
-}
-
-// ../bridge/src/skills/install/install-remote-skills-async.ts
-init_yield_to_event_loop();
-import fs58 from "node:fs";
-import path81 from "node:path";
-
-// ../bridge/src/skills/install/constants.ts
-var INSTALL_SKILLS_YIELD_EVERY = 16;
-
-// ../bridge/src/skills/install/install-remote-skills-async.ts
-async function writeInstallFileAsync(skillDir, f, filesWritten) {
-  if (typeof f.path !== "string" || !f.text && !f.base64) return;
-  if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
-    await yieldToEventLoop();
-  }
-  const dest = path81.join(skillDir, f.path);
-  await fs58.promises.mkdir(path81.dirname(dest), { recursive: true });
-  if (f.text !== void 0) {
-    await fs58.promises.writeFile(dest, f.text, "utf8");
-  } else if (f.base64) {
-    await fs58.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
-  }
-}
-async function installRemoteSkillsAsync(cwd, targetDir, items) {
-  const installed2 = [];
-  if (!Array.isArray(items)) {
-    return { success: false, error: "Invalid items" };
-  }
-  const filesWritten = { count: 0 };
-  try {
-    for (const item of items) {
-      if (!isValidRemoteSkillInstallItem(item)) continue;
-      const skillDir = path81.join(cwd, targetDir, item.skillName);
-      for (const f of item.files) {
-        await writeInstallFileAsync(skillDir, f, filesWritten);
-      }
-      installed2.push({
-        sourceId: item.sourceId,
-        skillName: item.skillName,
-        versionHash: item.versionHash
-      });
-    }
-    return { success: true, installed: installed2 };
-  } catch (e) {
-    return { success: false, error: e instanceof Error ? e.message : String(e) };
-  }
-}
-
-// ../bridge/src/routing/handlers/install-skills.ts
-var handleInstallSkillsMessage = (msg, deps) => {
-  const id = typeof msg.id === "string" ? msg.id : "";
-  const targetDir = typeof msg.targetDir === "string" && msg.targetDir.trim() ? msg.targetDir.trim() : ".agents/skills";
-  const rawItems = msg.items;
-  const cwd = getBridgeRoot();
-  void (async () => {
-    const socket = deps.getWs();
-    const result = await installRemoteSkillsAsync(cwd, targetDir, rawItems);
-    if (!result.success) {
-      const err = result.error ?? "Invalid items";
-      deps.log(`[Bridge service] Install skills failed: ${err}`);
-      if (socket) {
-        sendWsMessage(socket, { type: "install_skills_result", id, success: false, error: err });
-      }
-      return;
-    }
-    if (socket) {
-      sendWsMessage(socket, { type: "install_skills_result", id, success: true, installed: result.installed });
-    }
-  })();
-};
-
-// ../bridge/src/agents/install/run-streaming-command.ts
-import { spawn as spawn11 } from "node:child_process";
-import * as readline3 from "node:readline";
-function runStreamingCommand(command, args, options) {
-  return new Promise((resolve39, reject) => {
-    const child = spawn11(command, args, {
-      env: options.env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let settled = false;
-    const timer = options.timeoutMs != null ? setTimeout(() => {
-      child.kill("SIGKILL");
-      if (!settled) {
-        settled = true;
-        reject(new Error(`Command timed out after ${options.timeoutMs}ms`));
-      }
-    }, options.timeoutMs) : null;
-    const onLine = (line) => {
-      if (line.length > 0) options.onLine?.(line);
-    };
-    if (child.stdout) {
-      readline3.createInterface({ input: child.stdout, crlfDelay: Infinity }).on("line", onLine);
-    }
-    if (child.stderr) {
-      readline3.createInterface({ input: child.stderr, crlfDelay: Infinity }).on("line", onLine);
-    }
-    child.on("error", (err) => {
-      if (timer) clearTimeout(timer);
-      if (!settled) {
-        settled = true;
-        reject(err);
-      }
-    });
-    child.on("close", (code, signal) => {
-      if (timer) clearTimeout(timer);
-      if (!settled) {
-        settled = true;
-        resolve39({ code, signal });
-      }
-    });
-  });
-}
-
-// ../bridge/src/agents/install/commands/run-npm-global-install.ts
-async function runNpmGlobalInstall(packageName, env, options) {
-  const result = await runStreamingCommand("npm", ["install", "-g", packageName], {
-    env: bridgeAgentPathEnv(env),
-    timeoutMs: options?.timeoutMs ?? 3e5,
-    onLine: options?.onLine
-  });
-  if (result.code !== 0) {
-    throw new Error(`npm install -g ${packageName} failed (exit ${result.code ?? "signal"})`);
-  }
-}
-
-// ../bridge/src/agents/install/commands/claude-code.ts
-var claudeCodeInstallCommand = {
-  agentType: "claude-code",
-  detectCommand: "claude",
-  async install(ctx) {
-    ctx.onProgress?.("Installing Anthropic Claude Code");
-    await runNpmGlobalInstall(
-      "@anthropic-ai/claude-code",
-      { ...ctx.env, ANTHROPIC_API_KEY: ctx.authToken },
-      { onLine: (line) => ctx.onProgress?.("Installing Anthropic Claude Code", line) }
-    );
-  }
-};
-
-// ../bridge/src/agents/install/commands/codex-acp.ts
-var codexAcpInstallCommand = {
-  agentType: "codex-acp",
-  detectCommand: "codex",
-  async install(ctx) {
-    ctx.onProgress?.("Installing Codex");
-    await runNpmGlobalInstall(
-      "@openai/codex",
-      { ...ctx.env, OPENAI_API_KEY: ctx.authToken },
-      { onLine: (line) => ctx.onProgress?.("Installing Codex", line) }
-    );
-  }
-};
-
-// ../bridge/src/agents/install/commands/cursor-cli.ts
-var cursorCliInstallCommand = {
-  agentType: "cursor-cli",
-  detectCommand: "agent",
-  alternateDetectCommands: ["cursor-agent"],
-  async install(ctx) {
-    ctx.onProgress?.("Installing Cursor CLI");
-    const result = await runStreamingCommand(
-      "bash",
-      ["-lc", "curl -fsSL https://cursor.com/install | bash"],
-      {
-        timeoutMs: 3e5,
-        env: { ...bridgeAgentPathEnv(ctx.env), CURSOR_API_KEY: ctx.authToken },
-        onLine: (line) => ctx.onProgress?.("Installing Cursor CLI", line)
-      }
-    );
-    if (result.code !== 0) {
-      throw new Error(`Cursor CLI install failed (exit ${result.code ?? "signal"})`);
-    }
-  }
-};
-
-// ../bridge/src/agents/install/commands/opencode.ts
-var opencodeInstallCommand = {
-  agentType: "opencode",
-  detectCommand: "opencode",
-  async install(ctx) {
-    ctx.onProgress?.("Installing OpenCode");
-    await runNpmGlobalInstall(
-      "opencode-ai",
-      { ...ctx.env, OPENCODE_API_KEY: ctx.authToken },
-      { onLine: (line) => ctx.onProgress?.("Installing OpenCode", line) }
-    );
-  }
-};
-
-// ../bridge/src/agents/install/commands/index.ts
-var COMMANDS = [
-  claudeCodeInstallCommand,
-  codexAcpInstallCommand,
-  cursorCliInstallCommand,
-  opencodeInstallCommand
-];
-var byType = new Map(COMMANDS.map((c) => [c.agentType, c]));
-function getAgentInstallCommand(agentType) {
-  return byType.get(agentType);
-}
-
-// ../bridge/src/agents/install/install-local-agent.ts
-async function installLocalAgentOnBridge(params) {
-  const spec = INSTALLABLE_BRIDGE_AGENTS.find((a) => a.value === params.agentType);
-  if (!spec) return { success: false, error: `Unsupported agent type: ${params.agentType}` };
-  const command = getAgentInstallCommand(params.agentType);
-  if (!command) return { success: false, error: `No install command for ${params.agentType}` };
-  params.onProgress?.(`Configuring ${spec.label} credentials`);
-  try {
-    await command.install({
-      authToken: params.authToken,
-      onProgress: params.onProgress,
-      env: { ...process.env, [spec.tokenEnvVar]: params.authToken }
-    });
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
-    return { success: false, error: msg };
-  }
-  ensureBridgeAgentPathInProcessEnv();
-  const detectNames = [
-    command.detectCommand,
-    ...command.alternateDetectCommands ?? []
-  ];
-  let found = false;
-  for (const name of detectNames) {
-    if (await waitForCommandOnPath(name)) {
-      found = true;
-      break;
-    }
-  }
-  if (!found) {
-    return { success: false, error: `${command.detectCommand} not found on PATH after install` };
-  }
-  return { success: true };
-}
-
-// ../bridge/src/routing/handlers/install-agent.ts
-var handleInstallAgentMessage = (msg, deps) => {
-  const processId = typeof msg.processId === "string" ? msg.processId : "";
-  const agentId = typeof msg.agentId === "string" ? msg.agentId : "";
-  const tokenId = typeof msg.tokenId === "string" ? msg.tokenId : "";
-  const agentType = typeof msg.agentType === "string" ? msg.agentType : "";
-  const authToken = typeof msg.authToken === "string" ? msg.authToken : "";
-  if (!processId || !agentId || !tokenId || !agentType || !authToken) return;
-  void (async () => {
-    const socket = deps.getWs();
-    let pendingLines = [];
-    let flushTimer = null;
-    const sendProgress = (message, logOutput) => {
-      if (!socket) return;
-      sendWsMessage(socket, {
-        type: "install_agent_progress",
-        processId,
-        agentId,
-        tokenId,
-        agentType,
-        step: "agent_install_package",
-        message,
-        ...logOutput ? { logOutput } : {}
-      });
-    };
-    const flushLines = (message) => {
-      if (flushTimer) {
-        clearTimeout(flushTimer);
-        flushTimer = null;
-      }
-      if (pendingLines.length === 0) return;
-      const logOutput = pendingLines.join("\n");
-      pendingLines = [];
-      sendProgress(message, logOutput);
-    };
-    const result = await installLocalAgentOnBridge({
-      agentType,
-      authToken,
-      onProgress: (message, logOutput) => {
-        if (logOutput == null) {
-          flushLines(message);
-          sendProgress(message);
-          return;
-        }
-        pendingLines.push(logOutput);
-        if (!flushTimer) {
-          flushTimer = setTimeout(() => flushLines(message), 100);
-        }
-      }
-    });
-    flushLines("Installing agent packages on the bridge machine.");
-    if (socket) {
-      sendWsMessage(socket, {
-        type: "install_agent_result",
-        processId,
-        agentId,
-        tokenId,
-        agentType,
-        success: result.success,
-        error: result.error
-      });
-    }
-    if (result.success) await deps.reportAutoDetectedAgents?.();
-    if (!result.success) {
-      deps.log(`[Bridge service] Install agent failed: ${result.error ?? "unknown"}`);
-    }
-  })();
-};
-
-// ../bridge/src/routing/handlers/refresh-local-skills.ts
-var handleRefreshLocalSkills = (_msg, deps) => {
-  setImmediate(() => {
-    deps.sendLocalSkillsReport?.();
-  });
-};
-
-// ../bridge/src/routing/dispatch/skills.ts
-function dispatchBridgeSkillsMessage(msg, deps) {
-  switch (msg.type) {
-    case "skill_call":
-      handleSkillCallMessage(msg, deps);
-      break;
-    case "skill_layout_request":
-      handleSkillLayoutRequest(msg, deps);
-      break;
-    case "install_skills":
-      handleInstallSkillsMessage(msg, deps);
-      break;
-    case "install_agent":
-      handleInstallAgentMessage(msg, deps);
-      break;
-    case "refresh_local_skills":
-      handleRefreshLocalSkills(msg, deps);
-      break;
-  }
-}
-
 // ../bridge/src/files/browser/send-file-browser-message.ts
 function sendFileBrowserMessage(socket, e2ee, payload) {
   sendWsMessage(socket, e2ee ? e2ee.encryptFields(payload, ["entries", "content", "totalLines", "size", "lineOffset"]) : payload);
@@ -55324,13 +54993,13 @@ function handleFileBrowserRequest(msg, socket, e2ee, sessionWorktreeManager) {
 
 // ../bridge/src/files/handle-file-browser-search.ts
 init_yield_to_event_loop();
-import path82 from "node:path";
+import path80 from "node:path";
 var SEARCH_LIMIT = 100;
 function handleFileBrowserSearch(msg, socket, e2ee, sessionWorktreeManager) {
   void (async () => {
     await yieldToEventLoop();
     const q = typeof msg.q === "string" ? msg.q : "";
-    const sessionParentPath = path82.resolve(
+    const sessionParentPath = path80.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -55362,7 +55031,7 @@ function triggerFileIndexBuild(sessionParentPath = getBridgeRoot()) {
   });
 }
 
-// ../bridge/src/routing/handlers/file-browser-messages.ts
+// ../bridge/src/connection/routing/handlers/file-browser-messages.ts
 function handleFileBrowserRequestMessage(msg, { getWs, e2ee, sessionWorktreeManager }) {
   if (typeof msg.id !== "string" || typeof msg.path !== "string") return;
   const socket = getWs();
@@ -55406,7 +55075,7 @@ function handleCodeNavRequest(msg, socket, e2ee, sessionWorktreeManager) {
 // ../bridge/src/code-nav/handlers/trigger-symbol-index-build.ts
 init_normalize_resolved_path();
 
-// ../bridge/src/routing/handlers/code-nav-messages.ts
+// ../bridge/src/connection/routing/handlers/code-nav-messages.ts
 function handleFileBrowserCodeNavMessage(msg, { getWs, e2ee, sessionWorktreeManager }) {
   if (typeof msg.id !== "string" || typeof msg.path !== "string") return;
   const socket = getWs();
@@ -55428,7 +55097,7 @@ function handleFileBrowserCodeNavMessage(msg, { getWs, e2ee, sessionWorktreeMana
 }
 
 // ../bridge/src/git/bridge-git-context.ts
-import * as path83 from "node:path";
+import * as path81 from "node:path";
 init_yield_to_event_loop();
 
 // ../bridge/src/git/branches/get-current-branch.ts
@@ -55496,12 +55165,12 @@ function listPendingCheckouts() {
 // ../bridge/src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
-    return path83.basename(path83.resolve(bridgeRoot)) || "repo";
+    return path81.basename(path81.resolve(bridgeRoot)) || "repo";
   }
-  return path83.basename(relPath) || relPath;
+  return path81.basename(relPath) || relPath;
 }
 async function discoverGitReposForBridgeContext(bridgeRoot) {
-  const root = path83.resolve(bridgeRoot);
+  const root = path81.resolve(bridgeRoot);
   if (await isGitRepoDirectory(root)) {
     const remoteUrl = await getRemoteOriginUrl(root);
     return [{ absolutePath: root, remoteUrl }];
@@ -55509,19 +55178,19 @@ async function discoverGitReposForBridgeContext(bridgeRoot) {
   const [deep, shallow] = await Promise.all([discoverGitReposUnderRoot(root), discoverGitRepos(root)]);
   const byPath = /* @__PURE__ */ new Map();
   for (const repo of [...deep, ...shallow]) {
-    byPath.set(path83.resolve(repo.absolutePath), repo);
+    byPath.set(path81.resolve(repo.absolutePath), repo);
   }
   return [...byPath.values()];
 }
 async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path83.resolve(bridgeRoot);
+  const bridgeResolved = path81.resolve(bridgeRoot);
   const repos = await discoverGitReposForBridgeContext(bridgeResolved);
   const rows = [];
   for (let i = 0; i < repos.length; i++) {
     if (i > 0) await yieldToEventLoop();
     const repo = repos[i];
-    let rel = path83.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path83.isAbsolute(rel)) continue;
+    let rel = path81.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path81.isAbsolute(rel)) continue;
     const relPath = rel === "" ? "." : rel.replace(/\\/g, "/");
     const currentBranch = await getCurrentBranch(repo.absolutePath);
     const remoteUrl = repo.remoteUrl.trim() || null;
@@ -55552,17 +55221,17 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
   return rows;
 }
 async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path83.resolve(bridgeRoot);
+  const bridgeResolved = path81.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path83.join(bridgeResolved, rel);
-  const resolved = path83.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path83.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path81.join(bridgeResolved, rel);
+  const resolved = path81.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path81.sep) && resolved !== bridgeResolved) {
     return [];
   }
   return listRepoBranchRefs(resolved);
 }
 
-// ../bridge/src/routing/handlers/bridge-git-context-messages.ts
+// ../bridge/src/connection/routing/handlers/bridge-git-context-messages.ts
 function handleBridgeGitContextRequestMessage(msg, getWs) {
   void (async () => {
     const socket = getWs();
@@ -55606,8 +55275,8 @@ function handleListRepoBranchesRequestMessage(msg, getWs) {
 }
 
 // ../bridge/src/git/checkout/bridge-git-checkout.ts
-import * as fs60 from "node:fs/promises";
-import * as path85 from "node:path";
+import * as fs58 from "node:fs/promises";
+import * as path83 from "node:path";
 
 // ../bridge/src/git/checkout/normalize-clone-url.ts
 function normalizeCloneUrl(url2) {
@@ -55627,12 +55296,12 @@ function cloneUrlWithHttpsAuth(url2, auth) {
 }
 
 // ../bridge/src/git/checkout/resolve-checkout-target.ts
-import * as fs59 from "node:fs/promises";
-import * as path84 from "node:path";
+import * as fs57 from "node:fs/promises";
+import * as path82 from "node:path";
 var FOLDER_NAME_RE = /^[A-Za-z0-9._-]+$/;
 async function pathExists(p) {
   try {
-    await fs59.access(p);
+    await fs57.access(p);
     return true;
   } catch {
     return false;
@@ -55644,7 +55313,7 @@ async function resolveCheckoutTarget(opts) {
     if (await isGitRepoDirectory(bridgeRoot)) {
       throw new Error("Bridge root is already a git repository");
     }
-    const entries = await fs59.readdir(bridgeRoot).catch(() => []);
+    const entries = await fs57.readdir(bridgeRoot).catch(() => []);
     if (entries.length > 0) {
       throw new Error("Bridge root must be empty to initialize a monorepo checkout");
     }
@@ -55657,8 +55326,8 @@ async function resolveCheckoutTarget(opts) {
   if (await isGitRepoDirectory(bridgeRoot)) {
     throw new Error("Cannot add a nested repo while the bridge root is itself a git repository");
   }
-  const targetDir = path84.resolve(bridgeRoot, folder);
-  if (!targetDir.startsWith(bridgeRoot + path84.sep)) {
+  const targetDir = path82.resolve(bridgeRoot, folder);
+  if (!targetDir.startsWith(bridgeRoot + path82.sep)) {
     throw new Error("Invalid folderName");
   }
   if (await pathExists(targetDir)) {
@@ -55677,10 +55346,10 @@ async function bridgeGitCheckout(params) {
   });
   const folderName = relPath === "." ? "repo" : relPath;
   beginPendingCheckout({ relPath, folderName, remoteUrl: cloneUrl });
-  const parent = path85.dirname(targetDir);
-  await fs60.mkdir(parent, { recursive: true });
+  const parent = path83.dirname(targetDir);
+  await fs58.mkdir(parent, { recursive: true });
   if (relPath !== ".") {
-    await fs60.mkdir(targetDir, { recursive: true });
+    await fs58.mkdir(targetDir, { recursive: true });
   }
   const url2 = cloneUrlWithHttpsAuth(cloneUrl, params.auth ?? null);
   try {
@@ -55691,7 +55360,7 @@ async function bridgeGitCheckout(params) {
     return { relPath, folderName };
   } catch (e) {
     if (relPath !== ".") {
-      await fs60.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
+      await fs58.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
     }
     const msg = e instanceof Error ? e.message : String(e);
     throw new Error(
@@ -55702,7 +55371,7 @@ async function bridgeGitCheckout(params) {
   }
 }
 
-// ../bridge/src/routing/handlers/bridge-git-checkout-messages.ts
+// ../bridge/src/connection/routing/handlers/bridge-git-checkout-messages.ts
 function handleBridgeGitCheckoutRequestMessage(msg, getWs) {
   void (async () => {
     const socket = getWs();
@@ -55742,7 +55411,7 @@ function handleBridgeGitCheckoutRequestMessage(msg, getWs) {
   })();
 }
 
-// ../bridge/src/routing/dispatch/file-browser.ts
+// ../bridge/src/connection/routing/dispatch/file-browser.ts
 function dispatchBridgeFileBrowserMessage(msg, deps) {
   switch (msg.type) {
     case "file_browser_request":
@@ -55766,12 +55435,13 @@ function dispatchBridgeFileBrowserMessage(msg, deps) {
   }
 }
 
-// ../bridge/src/routing/dispatch/index.ts
+// ../bridge/src/connection/routing/dispatch/index.ts
 function dispatchBridgeMessage(msg, deps) {
   switch (msg.type) {
     case "auth_token":
     case "bridge_identified":
     case "installed_agent_auth_sync":
+    case "install_agent":
     case "ha":
       dispatchBridgeConnectionMessage(msg, deps);
       break;
@@ -55791,13 +55461,6 @@ function dispatchBridgeMessage(msg, deps) {
     case "cursor_request_response":
       dispatchBridgeSessionMessage(msg, deps);
       break;
-    case "skill_call":
-    case "skill_layout_request":
-    case "install_skills":
-    case "install_agent":
-    case "refresh_local_skills":
-      dispatchBridgeSkillsMessage(msg, deps);
-      break;
     case "file_browser_request":
     case "file_browser_search":
     case "code_nav":
@@ -55809,7 +55472,7 @@ function dispatchBridgeMessage(msg, deps) {
   }
 }
 
-// ../bridge/src/routing/handle-bridge-message.ts
+// ../bridge/src/connection/routing/handle-bridge-message.ts
 function normalizeInboundBridgeWebSocketJson(data) {
   if (data === null || typeof data !== "object" || Array.isArray(data)) return data;
   const o = data;
@@ -55827,7 +55490,7 @@ function handleBridgeMessage(data, deps, sourceWs) {
   dispatchBridgeMessage(msg, deps);
 }
 
-// ../bridge/src/connection/main-bridge-auth-refresh-handler.ts
+// ../bridge/src/connection/ws/main-bridge-auth-refresh-handler.ts
 function resetAfterAuthInvalid(params) {
   const { state } = params;
   state.reconnectAttempt = 0;
@@ -55874,7 +55537,7 @@ function createMainBridgeAuthRefreshHandler(params, connect) {
   };
 }
 
-// ../bridge/src/connection/main-bridge-ws-close-handler.ts
+// ../bridge/src/connection/ws/main-bridge-ws-close-handler.ts
 function createMainBridgeCloseHandler(params, connect) {
   const { state, logFn, bridgeHeartbeat } = params;
   return (code, reason) => {
@@ -55912,7 +55575,7 @@ function createMainBridgeCloseHandler(params, connect) {
   };
 }
 
-// ../bridge/src/connection/report-git-repos.ts
+// ../bridge/src/connection/reports/report-git-repos.ts
 function reportGitRepos(getWs, log2) {
   setImmediate(() => {
     discoverGitRepos().then((repos) => {
@@ -55933,7 +55596,7 @@ function reportGitRepos(getWs, log2) {
   });
 }
 
-// ../bridge/src/connection/main-bridge-ws-open-handler.ts
+// ../bridge/src/connection/ws/main-bridge-ws-open-handler.ts
 function createMainBridgeOpenHandler(params) {
   const {
     state,
@@ -55978,7 +55641,7 @@ function createMainBridgeOpenHandler(params) {
   };
 }
 
-// ../bridge/src/connection/main-bridge-ws-lifecycle.ts
+// ../bridge/src/connection/ws/main-bridge-ws-lifecycle.ts
 function createMainBridgeWebSocketLifecycle(params) {
   const {
     state,
@@ -56063,7 +55726,7 @@ function createMainBridgeWebSocketLifecycle(params) {
   return { connect };
 }
 
-// ../bridge/src/connection/create-bridge-connection.ts
+// ../bridge/src/connection/runtime/create-bridge-connection.ts
 init_log();
 async function createBridgeConnection(options) {
   const { plugin, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
@@ -56113,41 +55776,7 @@ async function createBridgeConnection(options) {
   };
 }
 
-// ../bridge/src/e2e-certificates/key-command.ts
-import * as readline4 from "node:readline";
-function installE2eCertificateKeyCommand({
-  log: log2,
-  onOpenCertificate,
-  onInterrupt
-}) {
-  if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== "function") {
-    log2("[E2EE] Press c to import the E2EE key in a browser when running in an interactive terminal.");
-    return () => {
-    };
-  }
-  readline4.emitKeypressEvents(process.stdin);
-  process.stdin.setRawMode(true);
-  process.stdin.resume();
-  const onKeypress = (str, key) => {
-    if (key?.ctrl && key.name === "c") {
-      onInterrupt();
-      return;
-    }
-    if (!key?.ctrl && !key?.meta && (key?.name === "c" || str === "c")) {
-      onOpenCertificate();
-    }
-  };
-  process.stdin.on("keypress", onKeypress);
-  log2("[E2EE] Press c to import the active E2EE key into the browser.");
-  return () => {
-    process.stdin.off("keypress", onKeypress);
-    if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
-      process.stdin.setRawMode(false);
-    }
-  };
-}
-
-// ../bridge/src/run-bridge-e2ee-key-command.ts
+// ../bridge/src/cli/run-bridge-e2ee-key-command.ts
 function installConnectedBridgeE2eeKeyCommand(params) {
   const openImport = params.plugin.cloud?.openCertificateImportUrl;
   if (!openImport) return () => {
@@ -56170,7 +55799,7 @@ function installConnectedBridgeE2eeKeyCommand(params) {
   });
 }
 
-// ../bridge/src/run-bridge-connected-signals.ts
+// ../bridge/src/cli/teardown/run-bridge-connected-signals.ts
 init_log();
 init_cli_process_interrupt();
 function installConnectedBridgeSignals(params) {
@@ -56204,7 +55833,7 @@ function installConnectedBridgeSignals(params) {
   };
 }
 
-// ../bridge/src/run-bridge-on-auth-invalid.ts
+// ../bridge/src/cli/teardown/run-bridge-on-auth-invalid.ts
 init_cli_process_interrupt();
 async function closeBridgeForReauth(params) {
   params.log("[Bridge service] Access token invalid or revoked; re-authenticating\u2026");
@@ -56215,7 +55844,7 @@ async function closeBridgeForReauth(params) {
   params.endConnectedSession();
 }
 
-// ../bridge/src/run-bridge-connected.ts
+// ../bridge/src/cli/run-bridge-connected.ts
 init_cli_database();
 async function runConnectedBridge(options, restartWithoutAuth) {
   const { plugin, workspaceId, authToken, refreshToken, justAuthenticated, worktreesRootPath, e2eCertificate } = options;
@@ -56290,7 +55919,7 @@ async function runConnectedBridge(options, restartWithoutAuth) {
   await restartWithoutAuth({ plugin, worktreesRootPath, e2eCertificate });
 }
 
-// ../bridge/src/run-bridge.ts
+// ../bridge/src/cli/run-bridge.ts
 init_cli_process_interrupt();
 async function runBridge(options) {
   installBridgeProcessResilience();
@@ -56367,99 +55996,13 @@ function startStreamingProxy(ws, log2, pr) {
   });
 }
 
-// ../bridge/src/e2e-certificates/certificates.ts
-import * as fs61 from "node:fs/promises";
-import * as path86 from "node:path";
-var E2E_CERTIFICATE_ALGORITHM = "A1";
-var CERTIFICATE_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".pem", ".key", ".crt"]);
-function certificateFromKey({
-  raw,
-  name,
-  createdAt
-}) {
-  try {
-    const key = parseE2eeKeyRecord(raw, name);
-    return {
-      ...key,
-      name: key.name || name,
-      algorithm: E2E_CERTIFICATE_ALGORITHM,
-      pemBundle: serializeE2eeKeyRecord({ ...key, createdAt: key.createdAt || createdAt })
-    };
-  } catch {
-    return void 0;
-  }
-}
-function baseNameForCertificate(fileName) {
-  return path86.basename(fileName, path86.extname(fileName)) || "BuildAutomaton E2EE certificate";
-}
-async function readCertificateFiles(directory) {
-  let entries;
-  try {
-    entries = await fs61.readdir(directory, { withFileTypes: true });
-  } catch (err) {
-    const nodeErr = err;
-    if (nodeErr.code === "ENOENT") return [];
-    throw err;
-  }
-  const certificates = [];
-  for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
-    if (!entry.isFile() || !CERTIFICATE_FILE_EXTENSIONS.has(path86.extname(entry.name).toLowerCase())) continue;
-    const filePath = path86.join(directory, entry.name);
-    const raw = await fs61.readFile(filePath, "utf8").catch(() => void 0);
-    if (!raw) continue;
-    const stat3 = await fs61.stat(filePath).catch(() => void 0);
-    const certificate = certificateFromKey({
-      raw,
-      name: baseNameForCertificate(entry.name),
-      createdAt: stat3?.mtime?.toISOString() ?? (/* @__PURE__ */ new Date()).toISOString()
-    });
-    if (certificate) {
-      certificates.push(certificate);
-    }
-  }
-  return certificates;
-}
-function createCertificate(directory) {
-  const baseName = path86.basename(directory) || "BuildAutomaton E2EE certificate";
-  const key = createE2eeKeyRecord(baseName);
-  return {
-    ...key,
-    algorithm: E2E_CERTIFICATE_ALGORITHM,
-    pemBundle: serializeE2eeKeyRecord(key)
-  };
-}
-async function loadOrCreateE2eCertificates(directory) {
-  const resolved = path86.resolve(directory);
-  await fs61.mkdir(resolved, { recursive: true, mode: 448 });
-  const existing = await readCertificateFiles(resolved);
-  if (existing.length > 0) {
-    return {
-      directory: resolved,
-      certificates: existing,
-      activeCertificate: existing[0],
-      generated: false
-    };
-  }
-  const certificate = createCertificate(resolved);
-  const fileName = `buildautomaton-e2ee-key-${certificate.id.slice(0, 12)}.pem`;
-  await fs61.writeFile(path86.join(resolved, fileName), certificate.pemBundle, {
-    mode: 384
-  });
-  return {
-    directory: resolved,
-    certificates: [certificate],
-    activeCertificate: certificate,
-    generated: true
-  };
-}
-
 // src/config.ts
-import fs62 from "node:fs";
-import path87 from "node:path";
+import fs59 from "node:fs";
+import path84 from "node:path";
 import os9 from "node:os";
 function getConfigPath() {
-  const dir = path87.join(os9.homedir(), ".buildautomaton");
-  return path87.join(dir, "config.json");
+  const dir = path84.join(os9.homedir(), ".buildautomaton");
+  return path84.join(dir, "config.json");
 }
 function normalizeApiUrl(url2) {
   return url2.replace(/\/$/, "");
@@ -56467,7 +56010,7 @@ function normalizeApiUrl(url2) {
 function readRawConfig() {
   try {
     const p = getConfigPath();
-    const raw = fs62.readFileSync(p, "utf8");
+    const raw = fs59.readFileSync(p, "utf8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -56495,14 +56038,14 @@ function readConfigForApi(apiUrl) {
 }
 function writeConfigForApi(apiUrl, auth) {
   const p = getConfigPath();
-  const dir = path87.dirname(p);
+  const dir = path84.dirname(p);
   const key = normalizeApiUrl(apiUrl);
   const prev = readRawConfig() ?? {};
   const servers = { ...prev.servers ?? {}, [key]: { ...auth } };
   const next = { ...prev, servers };
   try {
-    if (!fs62.existsSync(dir)) fs62.mkdirSync(dir, { recursive: true });
-    fs62.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
+    if (!fs59.existsSync(dir)) fs59.mkdirSync(dir, { recursive: true });
+    fs59.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
   } catch (e) {
     console.error("Could not save authentication config:", e);
   }
@@ -56511,22 +56054,22 @@ function clearConfigForApi(apiUrl) {
   const key = normalizeApiUrl(apiUrl);
   try {
     const p = getConfigPath();
-    if (!fs62.existsSync(p)) return;
+    if (!fs59.existsSync(p)) return;
     const prev = readRawConfig();
     if (!prev) return;
     const servers = { ...prev.servers ?? {} };
     delete servers[key];
     const next = { ...prev, servers };
     if (Object.keys(servers).length === 0 && !prev.workspaceId) {
-      fs62.unlinkSync(p);
+      fs59.unlinkSync(p);
       return;
     }
     if (Object.keys(servers).length === 0 && prev.workspaceId && prev.apiUrl && normalizeApiUrl(prev.apiUrl) === key) {
       const { workspaceId: _w, token: _t, refreshToken: _r, apiUrl: _a4, ...rest } = prev;
-      fs62.writeFileSync(p, JSON.stringify(rest, null, 2), "utf8");
+      fs59.writeFileSync(p, JSON.stringify(rest, null, 2), "utf8");
       return;
     }
-    fs62.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
+    fs59.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
   } catch {
   }
 }
@@ -56534,30 +56077,30 @@ function clearConfigForApi(apiUrl) {
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 import process8 from "node:process";
 import { Buffer as Buffer3 } from "node:buffer";
-import path88 from "node:path";
+import path85 from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 import { promisify as promisify8 } from "node:util";
 import childProcess from "node:child_process";
-import fs67, { constants as fsConstants2 } from "node:fs/promises";
+import fs64, { constants as fsConstants2 } from "node:fs/promises";
 
 // ../../node_modules/.pnpm/wsl-utils@0.1.0/node_modules/wsl-utils/index.js
 import process4 from "node:process";
-import fs66, { constants as fsConstants } from "node:fs/promises";
+import fs63, { constants as fsConstants } from "node:fs/promises";
 
 // ../../node_modules/.pnpm/is-wsl@3.1.1/node_modules/is-wsl/index.js
 import process3 from "node:process";
 import os10 from "node:os";
-import fs65 from "node:fs";
+import fs62 from "node:fs";
 
 // ../../node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
-import fs64 from "node:fs";
+import fs61 from "node:fs";
 
 // ../../node_modules/.pnpm/is-docker@3.0.0/node_modules/is-docker/index.js
-import fs63 from "node:fs";
+import fs60 from "node:fs";
 var isDockerCached;
 function hasDockerEnv() {
   try {
-    fs63.statSync("/.dockerenv");
+    fs60.statSync("/.dockerenv");
     return true;
   } catch {
     return false;
@@ -56565,7 +56108,7 @@ function hasDockerEnv() {
 }
 function hasDockerCGroup() {
   try {
-    return fs63.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
+    return fs60.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
   } catch {
     return false;
   }
@@ -56581,7 +56124,7 @@ function isDocker() {
 var cachedResult;
 var hasContainerEnv = () => {
   try {
-    fs64.statSync("/run/.containerenv");
+    fs61.statSync("/run/.containerenv");
     return true;
   } catch {
     return false;
@@ -56606,12 +56149,12 @@ var isWsl = () => {
     return true;
   }
   try {
-    if (fs65.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
+    if (fs62.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
       return !isInsideContainer();
     }
   } catch {
   }
-  if (fs65.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs65.existsSync("/run/WSL")) {
+  if (fs62.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs62.existsSync("/run/WSL")) {
     return !isInsideContainer();
   }
   return false;
@@ -56629,14 +56172,14 @@ var wslDrivesMountPoint = /* @__PURE__ */ (() => {
     const configFilePath2 = "/etc/wsl.conf";
     let isConfigFileExists = false;
     try {
-      await fs66.access(configFilePath2, fsConstants.F_OK);
+      await fs63.access(configFilePath2, fsConstants.F_OK);
       isConfigFileExists = true;
     } catch {
     }
     if (!isConfigFileExists) {
       return defaultMountPoint;
     }
-    const configContent = await fs66.readFile(configFilePath2, { encoding: "utf8" });
+    const configContent = await fs63.readFile(configFilePath2, { encoding: "utf8" });
     const configMountPoint = /(?<!#.*)root\s*=\s*(?<mountPoint>.*)/g.exec(configContent);
     if (!configMountPoint) {
       return defaultMountPoint;
@@ -56790,8 +56333,8 @@ async function defaultBrowser2() {
 
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 var execFile7 = promisify8(childProcess.execFile);
-var __dirname = path88.dirname(fileURLToPath7(import.meta.url));
-var localXdgOpenPath = path88.join(__dirname, "xdg-open");
+var __dirname = path85.dirname(fileURLToPath7(import.meta.url));
+var localXdgOpenPath = path85.join(__dirname, "xdg-open");
 var { platform, arch } = process8;
 async function getWindowsDefaultBrowserFromWsl() {
   const powershellPath = await powerShellPath();
@@ -56941,7 +56484,7 @@ var baseOpen = async (options) => {
       const isBundled = !__dirname || __dirname === "/";
       let exeLocalXdgOpen = false;
       try {
-        await fs67.access(localXdgOpenPath, fsConstants2.X_OK);
+        await fs64.access(localXdgOpenPath, fsConstants2.X_OK);
         exeLocalXdgOpen = true;
       } catch {
       }
@@ -57697,6 +57240,14 @@ function createBridgeMcpToolRegistry(shared) {
   };
 }
 
+// ../e2ee/src/encoding.ts
+function base64UrlEncode2(bytes) {
+  let binary = "";
+  for (let i = 0; i < bytes.length; i += 1) binary += String.fromCharCode(bytes[i]);
+  const b64 = btoa(binary);
+  return b64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
+}
+
 // src/agents/acp/fetch-session-attachments.ts
 function metaSaysEncrypted(meta3) {
   if (!meta3) return false;
@@ -57766,7 +57317,7 @@ async function fetchSessionAttachmentPayloadsForAgent(params) {
       if (!k || !n) {
         return { ok: false, error: "Invalid encrypted attachment metadata (missing key id or nonce)." };
       }
-      const c = base64UrlEncode(buf);
+      const c = base64UrlEncode2(buf);
       imageBytes = e2ee.decryptEnvelopeToBuffer({ k, n, c });
     } else {
       imageBytes = buf;
@@ -58353,13 +57904,13 @@ function toTokens(auth) {
 }
 
 // src/cli/chdir-to-bridge-root.ts
-import * as fs68 from "node:fs";
-import * as path89 from "node:path";
+import * as fs65 from "node:fs";
+import * as path86 from "node:path";
 function chdirToBridgeRoot(bridgeRootOpt) {
   if (!bridgeRootOpt) return;
-  const resolved = path89.resolve(process.cwd(), bridgeRootOpt);
+  const resolved = path86.resolve(process.cwd(), bridgeRootOpt);
   try {
-    if (!fs68.statSync(resolved).isDirectory()) {
+    if (!fs65.statSync(resolved).isDirectory()) {
       console.error(`Bridge root is not a directory: ${resolved}`);
       process.exit(1);
     }
@@ -58393,7 +57944,7 @@ async function runCliAction(program2, opts) {
   initBridgeRoot();
   console.log(colorize(GOLDEN_YELLOW, `[Bridge] Using ${getBridgeRoot()} as the bridge root.`));
   let worktreesRootPath;
-  if (opts.worktreesRoot?.trim()) worktreesRootPath = path90.resolve(opts.worktreesRoot.trim());
+  if (opts.worktreesRoot?.trim()) worktreesRootPath = path87.resolve(opts.worktreesRoot.trim());
   const e2eCertificates = opts.e2eeCertificatesDir?.trim() ? await loadOrCreateE2eCertificates(opts.e2eeCertificatesDir.trim()) : void 0;
   if (e2eCertificates) {
     const action = e2eCertificates.generated ? "Generated" : "Loaded";