@buildautomaton/cli 0.1.68 → 0.1.69

package/dist/index.js

@@ -4208,8 +4208,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path80, errorMaps, issueData } = params;
-      const fullPath = [...path80, ...issueData.path || []];
+      const { data, path: path82, errorMaps, issueData } = params;
+      const fullPath = [...path82, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -4517,11 +4517,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path80, key) {
+      constructor(parent, value, path82, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path80;
+        this._path = path82;
         this._key = key;
       }
       get path() {
@@ -8182,10 +8182,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path80) {
-  if (!path80)
+function getElementAtPath(obj, path82) {
+  if (!path82)
     return obj;
-  return path80.reduce((acc, key) => acc?.[key], obj);
+  return path82.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -8434,11 +8434,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path80, issues) {
+function prefixIssues(path82, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path80);
+    iss.path.unshift(path82);
     return iss;
   });
 }
@@ -8627,7 +8627,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path80 = []) => {
+  const processError = (error41, path82 = []) => {
     var _a2, _b;
     for (const issue2 of error41.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -8637,7 +8637,7 @@ function treeifyError(error40, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path80, ...issue2.path];
+        const fullpath = [...path82, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -8667,9 +8667,9 @@ function treeifyError(error40, _mapper) {
   processError(error40);
   return result;
 }
-function toDotPath(path80) {
+function toDotPath(path82) {
   const segs = [];
-  for (const seg of path80) {
+  for (const seg of path82) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -22376,7 +22376,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join(moduleDir, "..", sub, filename),
     join(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path80) => existsSync(path80));
+  const resolved = candidates.find((path82) => existsSync(path82));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -23447,7 +23447,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(path80, checkUnignored, mode) {
+      test(path82, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -23456,7 +23456,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path80);
+          const matched = rule[mode].test(path82);
           if (!matched) {
             return;
           }
@@ -23477,17 +23477,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path80, originalPath, doThrow) => {
-      if (!isString(path80)) {
+    var checkPath = (path82, originalPath, doThrow) => {
+      if (!isString(path82)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path80) {
+      if (!path82) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path80)) {
+      if (checkPath.isNotRelative(path82)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -23496,7 +23496,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path80) => REGEX_TEST_INVALID_PATH.test(path80);
+    var isNotRelative = (path82) => REGEX_TEST_INVALID_PATH.test(path82);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -23526,19 +23526,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path80 = originalPath && checkPath.convert(originalPath);
+        const path82 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path80,
+          path82,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path80, cache2, checkUnignored, slices);
+        return this._t(path82, cache2, checkUnignored, slices);
       }
-      checkIgnore(path80) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path80)) {
-          return this.test(path80);
+      checkIgnore(path82) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path82)) {
+          return this.test(path82);
         }
-        const slices = path80.split(SLASH).filter(Boolean);
+        const slices = path82.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -23551,18 +23551,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path80, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path82, false, MODE_CHECK_IGNORE);
       }
-      _t(path80, cache2, checkUnignored, slices) {
-        if (path80 in cache2) {
-          return cache2[path80];
+      _t(path82, cache2, checkUnignored, slices) {
+        if (path82 in cache2) {
+          return cache2[path82];
         }
         if (!slices) {
-          slices = path80.split(SLASH).filter(Boolean);
+          slices = path82.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path80] = this._rules.test(path80, checkUnignored, MODE_IGNORE);
+          return cache2[path82] = this._rules.test(path82, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -23570,29 +23570,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path80] = parent.ignored ? parent : this._rules.test(path80, checkUnignored, MODE_IGNORE);
+        return cache2[path82] = parent.ignored ? parent : this._rules.test(path82, checkUnignored, MODE_IGNORE);
       }
-      ignores(path80) {
-        return this._test(path80, this._ignoreCache, false).ignored;
+      ignores(path82) {
+        return this._test(path82, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path80) => !this.ignores(path80);
+        return (path82) => !this.ignores(path82);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path80) {
-        return this._test(path80, this._testCache, true);
+      test(path82) {
+        return this._test(path82, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path80) => checkPath(path80 && checkPath.convert(path80), path80, RETURN_FALSE);
+    var isPathValid = (path82) => checkPath(path82 && checkPath.convert(path82), path82, 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 = (path80) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path80) || isNotRelative(path80);
+      checkPath.isNotRelative = (path82) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path82) || isNotRelative(path82);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -27960,10 +27960,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(path80, isFile, isDirectory) {
-      log2(`checking %s`, path80);
+    function check2(path82, isFile, isDirectory) {
+      log2(`checking %s`, path82);
       try {
-        const stat2 = fs_1.statSync(path80);
+        const stat2 = fs_1.statSync(path82);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -27983,8 +27983,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path80, type = exports.READABLE) {
-      return check2(path80, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path82, type = exports.READABLE) {
+      return check2(path82, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -30338,8 +30338,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path80, body) {
-  const url2 = `http://127.0.0.1:${port}${path80}`;
+async function requestPreviewApi(port, secret, method, path82, body) {
+  const url2 = `http://127.0.0.1:${port}${path82}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -30351,7 +30351,7 @@ async function requestPreviewApi(port, secret, method, path80, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path80}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path82}: ${res.status}`);
   }
   return data;
 }
@@ -30574,7 +30574,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.68".length > 0 ? "0.1.68" : "0.0.0-dev";
+var CLI_VERSION = "0.1.69".length > 0 ? "0.1.69" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -34971,8 +34971,8 @@ async function execGitFile(args, options) {
 }
 
 // src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path80) {
-  return path80.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path82) {
+  return path82.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // src/git/changes/parse/parse-name-status-entries.ts
@@ -36481,6 +36481,21 @@ function createBridgeMcpToolRegistry(shared) {
 // src/mcp/bridge-access/start-server.ts
 import * as http from "node:http";
 
+// src/http/close-http-server.ts
+function isServerNotRunningError(err) {
+  return err.code === "ERR_SERVER_NOT_RUNNING";
+}
+function closeHttpServer(server) {
+  if (!server) return Promise.resolve();
+  return new Promise((resolve35) => {
+    server.close((err) => {
+      if (err && !isServerNotRunningError(err)) {
+      }
+      resolve35();
+    });
+  });
+}
+
 // src/mcp/bridge-access/read-json-body.ts
 function readJsonBody(req) {
   return new Promise((resolve35, reject) => {
@@ -36562,9 +36577,7 @@ function startBridgeAccessServer(registry2) {
       }
       resolve35({
         port: addr.port,
-        close: () => new Promise((closeResolve, closeReject) => {
-          server.close((err) => err ? closeReject(err) : closeResolve());
-        })
+        close: () => closeHttpServer(server)
       });
     });
   });
@@ -39169,8 +39182,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path80) {
-  return path80 instanceof String && cache.has(path80);
+function isPathSpec(path82) {
+  return path82 instanceof String && cache.has(path82);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -39259,8 +39272,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path80) {
-  return (0, import_file_exists.exists)(path80, import_file_exists.FOLDER);
+function folderExists(path82) {
+  return (0, import_file_exists.exists)(path82, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -39664,8 +39677,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path80) {
-      return /^\.(git)?$/.test(path80.trim());
+    parser(path82) {
+      return /^\.(git)?$/.test(path82.trim());
     }
   };
 }
@@ -40099,11 +40112,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path80, line, preview] = input.split(NULL);
-    paths.add(path80);
-    (results[path80] = results[path80] || []).push({
+    const [path82, line, preview] = input.split(NULL);
+    paths.add(path82);
+    (results[path82] = results[path82] || []).push({
       line: asNumber(line),
-      path: path80,
+      path: path82,
       preview
     });
   });
@@ -40868,14 +40881,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path80, text) {
+function parseInit(bare, path82, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path80, false, result[1]);
+    return new InitSummary(bare, path82, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path80, true, result[1]);
+    return new InitSummary(bare, path82, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -40886,7 +40899,7 @@ function parseInit(bare, path80, text) {
       break;
     }
   }
-  return new InitSummary(bare, path80, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path82, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -40895,9 +40908,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path80, existing, gitDir) {
+      constructor(bare, path82, existing, gitDir) {
         this.bare = bare;
-        this.path = path80;
+        this.path = path82;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -40909,7 +40922,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path80, customArgs) {
+function initTask(bare = false, path82, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -40918,7 +40931,7 @@ function initTask(bare = false, path80, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path80, text);
+      return parseInit(commands.includes("--bare"), path82, text);
     }
   };
 }
@@ -41734,12 +41747,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path80, index, working_dir) {
-        this.path = path80;
+      constructor(path82, index, working_dir) {
+        this.path = path82;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path80) || [null, path80, path80];
+          const detail = fromPathRegex.exec(path82) || [null, path82, path82];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -41770,14 +41783,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path80) {
+  function data(index, workingDir, path82) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path80);
+      handler(result, path82);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path80, index, workingDir));
+      result.files.push(new FileStatusSummary(path82, index, workingDir));
     }
   }
 }
@@ -42086,9 +42099,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path80, write) {
+      hashObject(path82, write) {
         return this._runTask(
-          hashObjectTask(path80, write === true),
+          hashObjectTask(path82, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -42441,8 +42454,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path80 = input.trim().replace(/^["']|["']$/g, "");
-  return path80 && normalize3(path80);
+  const path82 = input.trim().replace(/^["']|["']$/g, "");
+  return path82 && normalize3(path82);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -42756,8 +42769,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path80) {
-  return subModuleTask(["add", repo, path80]);
+function addSubModuleTask(repo, path82) {
+  return subModuleTask(["add", repo, path82]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -43090,8 +43103,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path80, then) {
-      return this._runTask(addSubModuleTask2(repo, path80), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path82, then) {
+      return this._runTask(addSubModuleTask2(repo, path82), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -43830,8 +43843,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path80, entry] of parseNumstatEntries(lines)) {
-    m.set(path80, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path82, entry] of parseNumstatEntries(lines)) {
+    m.set(path82, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -45626,9 +45639,8 @@ function parseSessionParent(v) {
   return null;
 }
 
-// src/worktrees/prepare-new-isolated-worktrees.ts
-import * as fs44 from "node:fs";
-import * as path64 from "node:path";
+// src/worktrees/prepare/prepare-new-isolated-worktrees.ts
+import * as fs46 from "node:fs";
 
 // src/git/discover-repos.ts
 import * as fs43 from "node:fs";
@@ -45699,6 +45711,10 @@ async function discoverGitReposUnderRoot(rootPath) {
   return out;
 }
 
+// src/worktrees/prepare/add-isolated-repo-worktree.ts
+import * as fs45 from "node:fs";
+import * as path65 from "node:path";
+
 // src/git/worktrees/worktree-add.ts
 async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch, baseRef = "HEAD") {
   const mainGit = cliSimpleGit(mainRepoPath);
@@ -45712,6 +45728,100 @@ async function gitWorktreeAddExistingBranch(mainRepoPath, worktreePath, branch)
   await mainGit.raw(["worktree", "add", worktreePath, branch]);
 }
 
+// src/worktrees/prepare/copy-bridge-files-along-worktree-path.ts
+import * as fs44 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;
+  const fileNames = options.fileNames ?? BRIDGE_FILES_ALONG_WORKTREE_PATH;
+  if (repoPathRelativeToBridgeRoot === ".") return;
+  const segments = repoPathRelativeToBridgeRoot.split("/").filter(Boolean);
+  for (let i = 0; i < segments.length; i++) {
+    const prefix = segments.slice(0, i).join("/");
+    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 = path64.join(srcDir, fileName);
+  if (!fs44.existsSync(src)) return;
+  const dest = path64.join(destDir, fileName);
+  try {
+    fs44.copyFileSync(src, dest);
+    log2?.(`[worktrees] Copied ${fileName} to ${dest}`);
+  } catch (e) {
+    log2?.(
+      `[worktrees] Failed to copy ${fileName} to ${dest}: ${e instanceof Error ? e.message : String(e)}`
+    );
+  }
+}
+
+// src/worktrees/prepare/resolve-base-ref-for-repo.ts
+function resolveBaseRefForRepo(repoPathRelativeToBridgeRoot, baseBranches) {
+  if (!baseBranches) return "HEAD";
+  const direct = baseBranches[repoPathRelativeToBridgeRoot]?.trim();
+  if (direct) return direct;
+  if (repoPathRelativeToBridgeRoot !== "." && baseBranches["."]?.trim()) {
+    return baseBranches["."].trim();
+  }
+  return "HEAD";
+}
+
+// src/worktrees/prepare/add-isolated-repo-worktree.ts
+async function addIsolatedRepoWorktree(options) {
+  const {
+    kind,
+    bridgeResolved,
+    scopeDir,
+    repoAbsolutePath,
+    branch,
+    existingBranch,
+    worktreeBaseBranches,
+    log: log2
+  } = options;
+  const repoPathRelativeToBridgeRootRaw = path65.relative(bridgeResolved, repoAbsolutePath);
+  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path65.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
+    return null;
+  }
+  const repoPathRelativeToBridgeRoot = normalizeRepoPathRelativeToWorkspaceRoot(
+    repoPathRelativeToBridgeRootRaw === "" ? "." : repoPathRelativeToBridgeRootRaw
+  );
+  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path65.join(scopeDir, repoPathRelativeToBridgeRoot);
+  if (repoPathRelativeToBridgeRoot !== ".") {
+    fs45.mkdirSync(path65.dirname(worktreePath), { recursive: true });
+    copyBridgeFilesAlongWorktreePath({
+      bridgeRoot: bridgeResolved,
+      scopeDir,
+      repoPathRelativeToBridgeRoot,
+      log: log2
+    });
+  }
+  const checkoutBranch = existingBranch?.trim() || branch;
+  try {
+    if (existingBranch?.trim()) {
+      await gitWorktreeAddExistingBranch(repoAbsolutePath, worktreePath, checkoutBranch);
+      log2(`[worktrees] Added ${kind} worktree ${worktreePath} (existing branch ${checkoutBranch}).`);
+    } else {
+      const baseRef = resolveBaseRefForRepo(repoPathRelativeToBridgeRoot, worktreeBaseBranches);
+      await gitWorktreeAddBranch(repoAbsolutePath, worktreePath, branch, baseRef);
+      log2(`[worktrees] Added ${kind} worktree ${worktreePath} (branch ${branch}, base ${baseRef}).`);
+    }
+    return worktreePath;
+  } catch (e) {
+    log2(
+      `[worktrees] Worktree add failed for ${repoAbsolutePath}: ${e instanceof Error ? e.message : String(e)}`
+    );
+    return null;
+  }
+}
+
+// src/worktrees/prepare/resolve-isolated-scope-dir.ts
+import * as path66 from "node:path";
+
 // src/worktrees/worktree-layout-kind.ts
 function sanitizeWorktreeBranchSegment(value) {
   return value.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "worktree";
@@ -45738,16 +45848,16 @@ function previewDeployBranchName(environmentId) {
   return `preview-deploy-${sanitizeWorktreeBranchSegment(environmentId.trim())}`;
 }
 
-// src/worktrees/prepare-new-isolated-worktrees.ts
-function resolveBaseRefForRepo(repoPathRelativeToBridgeRoot, baseBranches) {
-  if (!baseBranches) return "HEAD";
-  const direct = baseBranches[repoPathRelativeToBridgeRoot]?.trim();
-  if (direct) return direct;
-  if (repoPathRelativeToBridgeRoot !== "." && baseBranches["."]?.trim()) {
-    return baseBranches["."].trim();
-  }
-  return "HEAD";
+// src/worktrees/prepare/resolve-isolated-scope-dir.ts
+function resolveIsolatedScopeDir(options) {
+  const bridgeResolved = path66.resolve(options.bridgeRoot);
+  const cwdKey = allocateDirNameForLauncherCwd(options.layout, bridgeResolved);
+  const bridgeKeyDir = path66.join(options.worktreesRootPath, cwdKey);
+  const scopeDir = path66.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
+  return { bridgeResolved, scopeDir };
 }
+
+// src/worktrees/prepare/prepare-new-isolated-worktrees.ts
 async function prepareNewIsolatedWorktrees(options) {
   const {
     kind,
@@ -45760,45 +45870,32 @@ async function prepareNewIsolatedWorktrees(options) {
     worktreeBaseBranches,
     existingBranch
   } = options;
-  const bridgeResolved = path64.resolve(bridgeRoot);
-  const cwdKey = allocateDirNameForLauncherCwd(layout, bridgeResolved);
-  const bridgeKeyDir = path64.join(worktreesRootPath, cwdKey);
-  const scopeDir = path64.join(bridgeKeyDir, ...layoutDirSegments(kind, scopeId));
+  const { bridgeResolved, scopeDir } = resolveIsolatedScopeDir({
+    worktreesRootPath,
+    bridgeRoot,
+    kind,
+    scopeId,
+    layout
+  });
   const repos = await discoverGitReposUnderRoot(bridgeResolved);
   if (repos.length === 0) {
     log2(`[worktrees] No Git repositories under bridge root; skipping ${kind} worktree creation.`);
     return null;
   }
   const worktreePaths = [];
-  fs44.mkdirSync(scopeDir, { recursive: true });
+  fs46.mkdirSync(scopeDir, { recursive: true });
   await forEachWithGitYield(repos, async (repo) => {
-    const repoPathRelativeToBridgeRootRaw = path64.relative(bridgeResolved, repo.absolutePath);
-    if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path64.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
-      return;
-    }
-    const repoPathRelativeToBridgeRoot = normalizeRepoPathRelativeToWorkspaceRoot(
-      repoPathRelativeToBridgeRootRaw === "" ? "." : repoPathRelativeToBridgeRootRaw
-    );
-    const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path64.join(scopeDir, repoPathRelativeToBridgeRoot);
-    if (repoPathRelativeToBridgeRoot !== ".") {
-      fs44.mkdirSync(path64.dirname(worktreePath), { recursive: true });
-    }
-    const checkoutBranch = existingBranch?.trim() || branch;
-    try {
-      if (existingBranch?.trim()) {
-        await gitWorktreeAddExistingBranch(repo.absolutePath, worktreePath, checkoutBranch);
-        log2(`[worktrees] Added ${kind} worktree ${worktreePath} (existing branch ${checkoutBranch}).`);
-      } else {
-        const baseRef = resolveBaseRefForRepo(repoPathRelativeToBridgeRoot, worktreeBaseBranches);
-        await gitWorktreeAddBranch(repo.absolutePath, worktreePath, branch, baseRef);
-        log2(`[worktrees] Added ${kind} worktree ${worktreePath} (branch ${branch}, base ${baseRef}).`);
-      }
-      worktreePaths.push(worktreePath);
-    } catch (e) {
-      log2(
-        `[worktrees] Worktree add failed for ${repo.absolutePath}: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
+    const worktreePath = await addIsolatedRepoWorktree({
+      kind,
+      bridgeResolved,
+      scopeDir,
+      repoAbsolutePath: repo.absolutePath,
+      branch,
+      existingBranch,
+      worktreeBaseBranches,
+      log: log2
+    });
+    if (worktreePath) worktreePaths.push(worktreePath);
   });
   if (worktreePaths.length === 0) return null;
   return {
@@ -45858,10 +45955,10 @@ async function resolveExistingSessionParentPath(sessionId, cache2, discover) {
 }
 
 // src/worktrees/manager/resolve-explicit-session-parent-path.ts
-import * as path65 from "node:path";
+import * as path67 from "node:path";
 init_yield_to_event_loop();
 async function resolveExplicitSessionParentPath(params) {
-  const resolved = path65.resolve(params.parentPathRaw);
+  const resolved = path67.resolve(params.parentPathRaw);
   if (parseSessionParent(params.sessionParent) !== "worktrees_root") {
     return resolved;
   }
@@ -45878,7 +45975,7 @@ async function resolveExplicitSessionParentPath(params) {
     await yieldToEventLoop();
     const tryRoot = await discoverSessionWorktreesUnderSessionWorktreeRoot(cur, params.sessionId);
     if (tryRoot) return rememberAndReturn(tryRoot);
-    const next = path65.dirname(cur);
+    const next = path67.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -46026,15 +46123,15 @@ var SessionWorktreeManager = class {
 };
 
 // src/worktrees/discovery/discover-preview-worktree-on-disk.ts
-import * as fs45 from "node:fs";
-import * as path66 from "node:path";
+import * as fs47 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 fs45.promises.access(worktreesRootPath);
+    await fs47.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -46043,13 +46140,13 @@ async function discoverPreviewWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs45.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs47.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path66.join(worktreesRootPath, name);
+      const p = path68.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs45.promises.stat(p);
+        st = await fs47.promises.stat(p);
       } catch {
         continue;
       }
@@ -46063,7 +46160,7 @@ async function discoverPreviewWorktreeOnDisk(options) {
   const previewDirRel = layoutDirSegments("preview_environment", eid);
   for (const key of keys) {
     await yieldToEventLoop();
-    const previewDir = path66.join(worktreesRootPath, key, ...previewDirRel);
+    const previewDir = path68.join(worktreesRootPath, key, ...previewDirRel);
     const binding = await tryBindingFromIsolatedDirectory(previewDir);
     if (binding) return binding;
   }
@@ -46190,7 +46287,7 @@ var PreviewWorktreeManager = class {
 };
 
 // src/worktrees/deploy/deploy-session-to-preview-environment.ts
-import * as path70 from "node:path";
+import * as path72 from "node:path";
 
 // src/git/worktrees/reset-worktree-to-branch.ts
 async function gitResetWorktreeToBranch(worktreePath, branch) {
@@ -46201,8 +46298,8 @@ async function gitResetWorktreeToBranch(worktreePath, branch) {
 }
 
 // src/worktrees/deploy/capture-and-apply-wip.ts
-import * as fs46 from "node:fs";
-import * as path67 from "node:path";
+import * as fs48 from "node:fs";
+import * as path69 from "node:path";
 
 // src/git/snapshot/git.ts
 async function gitStashCreate(repoRoot, log2) {
@@ -46250,12 +46347,12 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
     if (!ap.ok) return ap;
   }
   await forEachWithGitYield(wip.untrackedPaths, async (rel) => {
-    const src = path67.join(sourceRepoPath, rel);
-    const dst = path67.join(targetRepoPath, rel);
+    const src = path69.join(sourceRepoPath, rel);
+    const dst = path69.join(targetRepoPath, rel);
     try {
-      if (!fs46.existsSync(src)) return;
-      fs46.mkdirSync(path67.dirname(dst), { recursive: true });
-      fs46.copyFileSync(src, dst);
+      if (!fs48.existsSync(src)) return;
+      fs48.mkdirSync(path69.dirname(dst), { recursive: true });
+      fs48.copyFileSync(src, dst);
     } catch (e) {
       log2(
         `[worktrees] Failed to copy untracked ${rel}: ${e instanceof Error ? e.message : String(e)}`
@@ -46266,14 +46363,14 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
 }
 
 // src/worktrees/deploy/resolve-isolated-checkout-for-repo-path-relative-to-workspace-root.ts
-import * as path68 from "node:path";
+import * as path70 from "node:path";
 async function resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot(options) {
   const { checkoutPaths, sessionParentPath, bridgeRoot, repoPathRelativeToWorkspaceRoot } = options;
-  const resolvedSessionParentPath = sessionParentPath ? path68.resolve(sessionParentPath) : null;
+  const resolvedSessionParentPath = sessionParentPath ? path70.resolve(sessionParentPath) : null;
   let match = null;
   await forEachWithGitYield(checkoutPaths, async (checkoutPath) => {
     if (match) return;
-    const resolvedCheckoutPath = path68.resolve(checkoutPath);
+    const resolvedCheckoutPath = path70.resolve(checkoutPath);
     if (!await isGitRepoDirectory(resolvedCheckoutPath)) return;
     const resolvedRepoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath: resolvedCheckoutPath,
@@ -46327,7 +46424,7 @@ async function applySessionWipToPreviewCheckouts(options) {
 }
 
 // src/worktrees/deploy/collect-session-repo-deploy-states.ts
-import * as path69 from "node:path";
+import * as path71 from "node:path";
 
 // src/git/branches/create-or-update-branch.ts
 async function gitCreateOrUpdateBranch(repoPath, branch, startRef, options) {
@@ -46364,19 +46461,19 @@ async function collectSessionRepoDeployStates(options) {
   const sessionParentPath = sessionWorktreeManager.getSessionParentPath(sid);
   const states = [];
   await forEachWithGitYield(sessionTargets, async (sessionCheckout) => {
-    const checkoutPath = path69.resolve(sessionCheckout);
+    const checkoutPath = path71.resolve(sessionCheckout);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
       bridgeRoot,
-      sessionParentPath: sessionParentPath ? path69.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 ? path69.resolve(previewParentPath) : null,
+      sessionParentPath: previewParentPath ? path71.resolve(previewParentPath) : null,
       bridgeRoot,
       repoPathRelativeToWorkspaceRoot
     }) : null;
@@ -46396,7 +46493,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 = path70.resolve(getBridgeRoot());
+  const bridgeRoot = path72.resolve(getBridgeRoot());
   await previewWorktreeManager.ensureCached(eid);
   const existingPreviewParentPath = previewWorktreeManager.getPreviewParentPath(eid) ?? null;
   const existingPreviewCheckoutPaths = previewWorktreeManager.getRepoCheckoutPaths(eid) ?? [];
@@ -46436,10 +46533,10 @@ async function deploySessionToPreviewEnvironment(options) {
 }
 
 // src/worktrees/manager/default-worktrees-root-path.ts
-import * as path71 from "node:path";
+import * as path73 from "node:path";
 import os9 from "node:os";
 function defaultWorktreesRootPath() {
-  return path71.join(os9.homedir(), ".buildautomaton", "worktrees");
+  return path73.join(os9.homedir(), ".buildautomaton", "worktrees");
 }
 
 // src/connection/create-bridge-worktree-managers.ts
@@ -46569,14 +46666,14 @@ function assertBridgeWorkspace(ctx) {
 }
 
 // src/files/list-dir/index.ts
-import fs48 from "node:fs";
+import fs50 from "node:fs";
 
 // src/files/ensure-under-cwd.ts
-import path72 from "node:path";
+import path74 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path72.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path72.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path72.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;
@@ -46589,15 +46686,15 @@ init_yield_to_event_loop();
 var LIST_DIR_YIELD_EVERY = 256;
 
 // src/files/list-dir/map-dir-entry.ts
-import path73 from "node:path";
-import fs47 from "node:fs";
+import path75 from "node:path";
+import fs49 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path73.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path73.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 fs47.promises.stat(fullPath);
+      const targetStat = await fs49.promises.stat(fullPath);
       isDir = targetStat.isDirectory();
     } catch {
       isDir = false;
@@ -46627,7 +46724,7 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs48.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs50.promises.readdir(resolved, { withFileTypes: true });
     const entries = [];
     for (let i = 0; i < names.length; i++) {
       if (i > 0 && i % LIST_DIR_YIELD_EVERY === 0) {
@@ -46643,13 +46740,13 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
 }
 
 // src/git/tree/resolve-repo-abs-path.ts
-import * as path74 from "node:path";
+import * as path76 from "node:path";
 function resolveRepoAbsPathFromBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path74.resolve(bridgeRoot);
+  const bridgeResolved = path76.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path74.join(bridgeResolved, rel);
-  const resolved = path74.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path74.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;
@@ -47130,25 +47227,25 @@ async function GET2(ctx) {
 init_in_flight();
 
 // src/files/read/read-file-async.ts
-import fs54 from "node:fs";
+import fs56 from "node:fs";
 init_yield_to_event_loop();
 
 // src/files/read/resolve-file-cache.ts
-import fs49 from "node:fs";
-import path75 from "node:path";
+import fs51 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 = path75.resolve(sessionParentPath);
-  const resolved = path75.resolve(filePath);
-  return resolved === parent || resolved.startsWith(`${parent}${path75.sep}`);
+  const parent = path77.resolve(sessionParentPath);
+  const resolved = path77.resolve(filePath);
+  return resolved === parent || resolved.startsWith(`${parent}${path77.sep}`);
 }
 function statMatchesCacheSync(entry) {
   try {
-    const stat2 = fs49.statSync(entry.path);
+    const stat2 = fs51.statSync(entry.path);
     return stat2.isFile() && stat2.mtimeMs === entry.mtimeMs && stat2.size === entry.size;
   } catch {
     return false;
@@ -47181,7 +47278,7 @@ function joinInflightResolve(cacheKey, factory) {
 }
 
 // src/files/read/resolve-file-for-read-core.ts
-import fs50 from "node:fs";
+import fs52 from "node:fs";
 import { isMainThread as isMainThread4 } from "node:worker_threads";
 function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   const cacheKey = resolveCacheKey(sessionParentPath, relativePath);
@@ -47191,13 +47288,13 @@ function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = fs50.lstatSync(resolved);
+    const lstat = fs52.lstatSync(resolved);
     if (lstat.isSymbolicLink()) {
-      real = fs50.realpathSync(resolved);
+      real = fs52.realpathSync(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat2 = fs50.statSync(real);
+      const stat2 = fs52.statSync(real);
       if (!stat2.isFile()) return { error: "Not a file" };
       size = stat2.size;
       mtimeMs = stat2.mtimeMs;
@@ -47225,13 +47322,13 @@ async function resolveFileForReadImpl(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = await fs50.promises.lstat(resolved);
+    const lstat = await fs52.promises.lstat(resolved);
     if (lstat.isSymbolicLink()) {
-      real = await fs50.promises.realpath(resolved);
+      real = await fs52.promises.realpath(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat2 = await fs50.promises.stat(real);
+      const stat2 = await fs52.promises.stat(real);
       if (!stat2.isFile()) return { error: "Not a file" };
       size = stat2.size;
       mtimeMs = stat2.mtimeMs;
@@ -47280,7 +47377,7 @@ async function resolveFilePathAsync(relativePath, sessionParentPath = getBridgeR
 
 // src/files/read/read-file-range-async.ts
 init_yield_to_event_loop();
-import fs51 from "node:fs";
+import fs53 from "node:fs";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 
 // src/files/read/read-file-range-line-zero.ts
@@ -47394,8 +47491,8 @@ function finishLineZeroTail(state, tail, resultLines, fileSize, lineChunkSize, l
 
 // src/files/read/read-file-range-async.ts
 async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE, fileSizeIn) {
-  const fileSize = fileSizeIn ?? (await fs51.promises.stat(filePath)).size;
-  const fd = await fs51.promises.open(filePath, "r");
+  const fileSize = fileSizeIn ?? (await fs53.promises.stat(filePath)).size;
+  const fd = await fs53.promises.open(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder2("utf8");
@@ -47496,7 +47593,7 @@ async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, li
 }
 
 // src/files/read/read-small-file-range-async.ts
-import fs52 from "node:fs";
+import fs54 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) {
@@ -47526,7 +47623,7 @@ function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize,
   };
 }
 function readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const raw = fs52.readFileSync(filePath, "utf8");
+  const raw = fs54.readFileSync(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
@@ -47534,28 +47631,28 @@ async function readSmallFileRangeAsync(filePath, fileSize, startLine, endLine, l
   if (isMainThread5) {
     return readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize);
   }
-  const raw = await fs52.promises.readFile(filePath, "utf8");
+  const raw = await fs54.promises.readFile(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
 
 // src/files/read/read-file-buffer-full-async.ts
 init_yield_to_event_loop();
-import fs53 from "node:fs";
+import fs55 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 ?? fs53.statSync(filePath).size;
+    const size2 = knownSize ?? fs55.statSync(filePath).size;
     if (size2 <= MAIN_THREAD_SYNC_READ_MAX_BYTES) {
       await yieldToEventLoop();
-      const buffer = fs53.readFileSync(filePath);
+      const buffer = fs55.readFileSync(filePath);
       return { buffer, size: buffer.length };
     }
   }
-  const size = knownSize ?? (await fs53.promises.stat(filePath)).size;
-  const fd = await fs53.promises.open(filePath, "r");
+  const size = knownSize ?? (await fs55.promises.stat(filePath)).size;
+  const fd = await fs55.promises.open(filePath, "r");
   const chunks = [];
   let position = 0;
   let bytesSinceYield = 0;
@@ -47658,7 +47755,7 @@ async function readFileAsync(relativePath, startLine, endLine, lineOffset, lineC
     }
     if (hasRange) {
       if (fileSize == null) {
-        const stat2 = await fs54.promises.stat(resolvedPath);
+        const stat2 = await fs56.promises.stat(resolvedPath);
         fileSize = stat2.size;
       }
       const read2 = fileSize <= SMALL_FILE_RANGE_MAX_BYTES ? await readSmallFileRangeAsync(
@@ -47956,12 +48053,12 @@ function parseOptionalInt2(raw) {
   return Number.isInteger(parsed) ? parsed : void 0;
 }
 function parseCodeNavParams(url2) {
-  const path80 = url2.searchParams.get("path") ?? "";
+  const path82 = 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: path80, op, line, column };
+  return { path: path82, op, line, column };
 }
 function parseCodeNavPath(url2) {
   const raw = url2.searchParams.get("path")?.trim();
@@ -48149,12 +48246,6 @@ function listenOnPort(server, port) {
     });
   });
 }
-function closeServer(server) {
-  if (!server) return Promise.resolve();
-  return new Promise((resolve35, reject) => {
-    server.close((err) => err ? reject(err) : resolve35());
-  });
-}
 function delay3(ms) {
   return new Promise((resolve35) => setTimeout(resolve35, ms));
 }
@@ -48179,8 +48270,7 @@ function startLocalShortcutServer(ctx) {
     if (restartAttempts >= MAX_RESTART_ATTEMPTS) return;
     restartAttempts += 1;
     restarting = (async () => {
-      await closeServer(currentServer).catch(() => {
-      });
+      await closeHttpServer(currentServer);
       currentServer = null;
       if (closed) return;
       await delay3(RESTART_DELAY_MS);
@@ -48200,7 +48290,7 @@ function startLocalShortcutServer(ctx) {
     token: ctx.token,
     close: async () => {
       closed = true;
-      await closeServer(currentServer);
+      await closeHttpServer(currentServer);
       currentServer = null;
     }
   }));
@@ -48577,15 +48667,15 @@ function syncRunningTurnQueueKeys(turns, queueKey) {
 }
 
 // src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
-import fs56 from "node:fs";
+import fs58 from "node:fs";
 
 // src/git/snapshot/capture.ts
-import * as fs55 from "node:fs";
-import * as path76 from "node:path";
+import * as fs57 from "node:fs";
+import * as path78 from "node:path";
 async function resolveSnapshotRepoRoots(options) {
   const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
   if (worktreePaths?.length) {
-    const uniq = [...new Set(worktreePaths.map((p) => path76.resolve(p)))];
+    const uniq = [...new Set(worktreePaths.map((p) => path78.resolve(p)))];
     return uniq;
   }
   try {
@@ -48593,7 +48683,7 @@ async function resolveSnapshotRepoRoots(options) {
     const mapped = repos.map((r) => r.absolutePath);
     const sid = sessionId?.trim();
     if (sid) {
-      const filtered = mapped.filter((root) => path76.basename(root) === sid);
+      const filtered = mapped.filter((root) => path78.basename(root) === sid);
       if (filtered.length > 0) return filtered;
     }
     return mapped;
@@ -48615,7 +48705,7 @@ async function capturePreTurnSnapshot(options) {
   });
   const dir = snapshotsDirForCwd(agentCwd);
   try {
-    fs55.mkdirSync(dir, { recursive: true });
+    fs57.mkdirSync(dir, { recursive: true });
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -48624,9 +48714,9 @@ async function capturePreTurnSnapshot(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     repos
   };
-  const filePath = path76.join(dir, `${runId}.json`);
+  const filePath = path78.join(dir, `${runId}.json`);
   try {
-    fs55.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
+    fs57.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -48639,7 +48729,7 @@ async function capturePreTurnSnapshot(options) {
 async function applyPreTurnSnapshot(filePath, log2) {
   let data;
   try {
-    const raw = fs55.readFileSync(filePath, "utf8");
+    const raw = fs57.readFileSync(filePath, "utf8");
     data = JSON.parse(raw);
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
@@ -48679,7 +48769,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 fs58.promises.access(file2, fs58.constants.F_OK);
   } catch {
     deps.log(
       `[Queue] requeued_with_revert: no pre-turn snapshot for ${tid.slice(0, 8)}\u2026; continuing without revert.`
@@ -49151,13 +49241,13 @@ function handleFileBrowserRequest(msg, socket, e2ee, sessionWorktreeManager) {
 
 // src/files/handle-file-browser-search.ts
 init_yield_to_event_loop();
-import path77 from "node:path";
+import path79 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 = path77.resolve(
+    const sessionParentPath = path79.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -49275,8 +49365,8 @@ function isValidRemoteSkillInstallItem(item) {
 
 // src/skills/install/install-remote-skills-async.ts
 init_yield_to_event_loop();
-import fs57 from "node:fs";
-import path78 from "node:path";
+import fs59 from "node:fs";
+import path80 from "node:path";
 
 // src/skills/install/constants.ts
 var INSTALL_SKILLS_YIELD_EVERY = 16;
@@ -49287,12 +49377,12 @@ async function writeInstallFileAsync(skillDir, f, filesWritten) {
   if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
     await yieldToEventLoop();
   }
-  const dest = path78.join(skillDir, f.path);
-  await fs57.promises.mkdir(path78.dirname(dest), { recursive: true });
+  const dest = path80.join(skillDir, f.path);
+  await fs59.promises.mkdir(path80.dirname(dest), { recursive: true });
   if (f.text !== void 0) {
-    await fs57.promises.writeFile(dest, f.text, "utf8");
+    await fs59.promises.writeFile(dest, f.text, "utf8");
   } else if (f.base64) {
-    await fs57.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
+    await fs59.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
   }
 }
 async function installRemoteSkillsAsync(cwd, targetDir, items) {
@@ -49304,7 +49394,7 @@ async function installRemoteSkillsAsync(cwd, targetDir, items) {
   try {
     for (const item of items) {
       if (!isValidRemoteSkillInstallItem(item)) continue;
-      const skillDir = path78.join(cwd, targetDir, item.skillName);
+      const skillDir = path80.join(cwd, targetDir, item.skillName);
       for (const f of item.files) {
         await writeInstallFileAsync(skillDir, f, filesWritten);
       }
@@ -49586,7 +49676,7 @@ var handleSessionDiscardedMessage = (msg, deps) => {
 };
 
 // src/routing/handlers/revert-turn-snapshot.ts
-import * as fs58 from "node:fs";
+import * as fs60 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -49599,7 +49689,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
     const file2 = snapshotFilePath(agentBase, turnId);
     try {
-      await fs58.promises.access(file2, fs58.constants.F_OK);
+      await fs60.promises.access(file2, fs60.constants.F_OK);
     } catch {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
@@ -49684,7 +49774,7 @@ var handleDeploySessionToPreviewMessage = (msg, deps) => {
 };
 
 // src/git/bridge-git-context.ts
-import * as path79 from "node:path";
+import * as path81 from "node:path";
 init_yield_to_event_loop();
 
 // src/git/branches/get-current-branch.ts
@@ -49735,12 +49825,12 @@ async function listRepoBranchRefs(repoPath) {
 // src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
-    return path79.basename(path79.resolve(bridgeRoot)) || "repo";
+    return path81.basename(path81.resolve(bridgeRoot)) || "repo";
   }
-  return path79.basename(relPath) || relPath;
+  return path81.basename(relPath) || relPath;
 }
 async function discoverGitReposForBridgeContext(bridgeRoot) {
-  const root = path79.resolve(bridgeRoot);
+  const root = path81.resolve(bridgeRoot);
   if (await isGitRepoDirectory(root)) {
     const remoteUrl = await getRemoteOriginUrl(root);
     return [{ absolutePath: root, remoteUrl }];
@@ -49748,19 +49838,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(path79.resolve(repo.absolutePath), repo);
+    byPath.set(path81.resolve(repo.absolutePath), repo);
   }
   return [...byPath.values()];
 }
 async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path79.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 = path79.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path79.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;
@@ -49775,11 +49865,11 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
   return rows;
 }
 async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path79.resolve(bridgeRoot);
+  const bridgeResolved = path81.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path79.join(bridgeResolved, rel);
-  const resolved = path79.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path79.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);
@@ -50295,15 +50385,18 @@ async function runConnectedBridge(options, restartWithoutAuth) {
   const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
   let cleanupKeyCommand;
   let bridgeClose = null;
+  let shutdownStarted = false;
   const onSignal = (kind) => {
     requestCliImmediateShutdown();
     abortActiveGitChildProcesses();
     cleanupKeyCommand?.();
+    if (shutdownStarted) return;
+    shutdownStarted = true;
     logImmediate(
       kind === "interrupt" ? "Keyboard interrupt (Ctrl+C) \u2014 stopping\u2026" : "Stop requested \u2014 shutting down\u2026"
     );
     if (bridgeClose) {
-      void bridgeClose().then(() => process.exit(0));
+      void bridgeClose().finally(() => process.exit(0));
       return;
     }
     process.exit(0);