@buildautomaton/cli 0.1.38 → 0.1.40

package/dist/index.js

@@ -4065,8 +4065,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path41, errorMaps, issueData } = params;
-      const fullPath = [...path41, ...issueData.path || []];
+      const { data, path: path44, errorMaps, issueData } = params;
+      const fullPath = [...path44, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -4374,11 +4374,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path41, key) {
+      constructor(parent, value, path44, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path41;
+        this._path = path44;
         this._key = key;
       }
       get path() {
@@ -7993,10 +7993,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path41) {
-  if (!path41)
+function getElementAtPath(obj, path44) {
+  if (!path44)
     return obj;
-  return path41.reduce((acc, key) => acc?.[key], obj);
+  return path44.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -8245,11 +8245,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path41, issues) {
+function prefixIssues(path44, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path41);
+    iss.path.unshift(path44);
     return iss;
   });
 }
@@ -8438,7 +8438,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path41 = []) => {
+  const processError = (error41, path44 = []) => {
     var _a2, _b;
     for (const issue2 of error41.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -8448,7 +8448,7 @@ function treeifyError(error40, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path41, ...issue2.path];
+        const fullpath = [...path44, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -8478,9 +8478,9 @@ function treeifyError(error40, _mapper) {
   processError(error40);
   return result;
 }
-function toDotPath(path41) {
+function toDotPath(path44) {
   const segs = [];
-  for (const seg of path41) {
+  for (const seg of path44) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -20943,8 +20943,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve18) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve18());
+        this.#closedPromise = new Promise((resolve20) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve20());
         });
         this.#receive();
       }
@@ -21093,8 +21093,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve18, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve18, reject });
+        const responsePromise = new Promise((resolve20, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve20, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -21963,10 +21963,10 @@ var require_src2 = __commonJS({
     var fs_1 = __require("fs");
     var debug_1 = __importDefault(require_src());
     var log2 = debug_1.default("@kwsites/file-exists");
-    function check2(path41, isFile, isDirectory) {
-      log2(`checking %s`, path41);
+    function check2(path44, isFile, isDirectory) {
+      log2(`checking %s`, path44);
       try {
-        const stat2 = fs_1.statSync(path41);
+        const stat2 = fs_1.statSync(path44);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -21986,8 +21986,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path41, type = exports.READABLE) {
-      return check2(path41, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path44, type = exports.READABLE) {
+      return check2(path44, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -22093,9 +22093,9 @@ function attachWebSocketClientPing(ws, intervalMs) {
   return clear;
 }
 function buildCliWebSocketClientOptions(wsUrl) {
-  const wsOptions = { perMessageDeflate: false, family: 4 };
+  const wsOptions = { perMessageDeflate: false };
   if (wsUrl.startsWith("wss://")) {
-    wsOptions.agent = new https.Agent({ rejectUnauthorized: false, family: 4 });
+    wsOptions.agent = new https.Agent({ rejectUnauthorized: false });
   }
   return wsOptions;
 }
@@ -22130,11 +22130,47 @@ function safeSendWebSocketBinary(ws, data) {
   }
 }
 
+// src/connection/parse-compact-heartbeat-ack.ts
+function tryParseCompactHeartbeatAck(raw) {
+  let str = null;
+  if (typeof raw === "string") {
+    str = raw;
+  } else if (Buffer.isBuffer(raw)) {
+    str = raw.toString("utf8");
+  } else if (raw instanceof ArrayBuffer) {
+    str = Buffer.from(raw).toString("utf8");
+  } else {
+    return null;
+  }
+  if (str.length > 64 || !str.includes('"ha"')) return null;
+  try {
+    const parsed = JSON.parse(str);
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+    const o = parsed;
+    if (o.t !== "ha") return null;
+    const s = o.s;
+    if (typeof s !== "number" || !Number.isFinite(s)) return null;
+    return Math.trunc(s);
+  } catch {
+    return null;
+  }
+}
+
 // src/connection/create-ws-bridge.ts
 var BRIDGE_AUTH_ERROR_HEADER = "x-bridge-auth-error";
 var BRIDGE_AUTH_ERROR_TOKEN_INVALID = "token_invalid";
 function createWsBridge(options) {
-  const { url: url2, onMessage, onOpen, onClose, onError: onError2, onAuthInvalid, clientPingIntervalMs } = options;
+  const {
+    url: url2,
+    onMessage,
+    onOpen,
+    onClose,
+    onError: onError2,
+    onAuthInvalid,
+    clientPingIntervalMs,
+    onCompactHeartbeatAck,
+    isActiveSocket
+  } = options;
   applyCliOutboundNetworkPreferences();
   const ws = new wrapper_default(url2, buildCliWebSocketClientOptions(url2));
   let clearClientPing = null;
@@ -22158,7 +22194,13 @@ function createWsBridge(options) {
     onOpen?.();
   });
   ws.on("message", (raw) => {
+    const ackSeq = tryParseCompactHeartbeatAck(raw);
+    if (ackSeq != null) {
+      onCompactHeartbeatAck?.(ackSeq);
+      return;
+    }
     setImmediate(() => {
+      if (isActiveSocket && !isActiveSocket(ws)) return;
       try {
         let data;
         if (typeof raw === "string") {
@@ -22169,9 +22211,9 @@ function createWsBridge(options) {
         } else {
           data = raw;
         }
-        onMessage?.(data);
+        onMessage?.(data, ws);
       } catch {
-        onMessage?.(raw);
+        onMessage?.(raw, ws);
       }
     });
   });
@@ -22794,9 +22836,9 @@ function parseChangeSummaryJson(raw, allowedPaths, options) {
     const rawPath = typeof o.path === "string" ? o.path.trim() : "";
     const summary = typeof o.summary === "string" ? o.summary.trim() : "";
     if (!rawPath || !summary) continue;
-    const path41 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
-    if (!path41) continue;
-    rows.push({ path: path41, summary: clampSummaryToAtMostTwoLines(summary) });
+    const path44 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
+    if (!path44) continue;
+    rows.push({ path: path44, summary: clampSummaryToAtMostTwoLines(summary) });
   }
   return rows;
 }
@@ -23442,11 +23484,11 @@ async function sendAcpPromptViaTransport(transport, ctx, sessionId, promptText,
 // src/agents/acp/clients/sdk/sdk-stdio-permission-request-handshake.ts
 function awaitSdkStdioPermissionRequestHandshake(params) {
   const { requestId, paramsRecord, pending, onRequest } = params;
-  return new Promise((resolve18) => {
-    pending.set(requestId, { resolve: resolve18, params: paramsRecord });
+  return new Promise((resolve20) => {
+    pending.set(requestId, { resolve: resolve20, params: paramsRecord });
     if (onRequest == null) {
       pending.delete(requestId);
-      resolve18({ outcome: { outcome: "denied" } });
+      resolve20({ outcome: { outcome: "denied" } });
       return;
     }
     try {
@@ -23512,7 +23554,7 @@ async function createSdkStdioAcpClient(options) {
   child.once("close", (code, signal) => {
     onAgentSubprocessExit?.({ code, signal });
   });
-  return new Promise((resolve18, reject) => {
+  return new Promise((resolve20, reject) => {
     let initSettled = false;
     const settleReject = (err) => {
       if (initSettled) return;
@@ -23526,7 +23568,7 @@ async function createSdkStdioAcpClient(options) {
     const settleResolve = (handle) => {
       if (initSettled) return;
       initSettled = true;
-      resolve18(handle);
+      resolve20(handle);
     };
     child.on("error", (err) => {
       settleReject(new Error(formatSpawnError(err, command[0])));
@@ -23746,7 +23788,7 @@ async function proxyToLocal(request) {
   };
   const maxAttempts = isIdempotentProxyMethod(request.method) ? LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS.length + 1 : 1;
   for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-    const once = await new Promise((resolve18) => {
+    const once = await new Promise((resolve20) => {
       const req = mod.request(opts, (res) => {
         const chunks = [];
         res.on("data", (c) => chunks.push(c));
@@ -23757,7 +23799,7 @@ async function proxyToLocal(request) {
             if (typeof v === "string") headers[k] = v;
             else if (Array.isArray(v) && v[0]) headers[k] = v[0];
           }
-          resolve18({
+          resolve20({
             id: request.id,
             statusCode: res.statusCode ?? 0,
             headers,
@@ -23766,7 +23808,7 @@ async function proxyToLocal(request) {
         });
       });
       req.on("error", (err) => {
-        resolve18({
+        resolve20({
           id: request.id,
           statusCode: 0,
           headers: {},
@@ -23848,8 +23890,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path41, body) {
-  const url2 = `http://127.0.0.1:${port}${path41}`;
+async function requestPreviewApi(port, secret, method, path44, body) {
+  const url2 = `http://127.0.0.1:${port}${path44}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -23861,7 +23903,7 @@ async function requestPreviewApi(port, secret, method, path41, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path41}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path44}: ${res.status}`);
   }
   return data;
 }
@@ -24076,7 +24118,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.38".length > 0 ? "0.1.38" : "0.0.0-dev";
+var CLI_VERSION = "0.1.40".length > 0 ? "0.1.40" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -24517,14 +24559,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve18, reject) => {
+    return new Promise((resolve20, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve18(subprocess);
+        resolve20(subprocess);
       });
     });
   }
@@ -24965,6 +25007,61 @@ function scheduleMainBridgeReconnect(state, connect, log2, closeMeta) {
   });
 }
 
+// src/connection/reconnect/duplicate-bridge-connection-detect.ts
+var BRIDGE_SUPERSEDED_CLOSE_REASON_SNIPPET = "superseded";
+var DUPLICATE_BRIDGE_SHORT_SESSION_MS = 25e3;
+var DUPLICATE_BRIDGE_FLAP_MIN_COUNT = 2;
+var DUPLICATE_BRIDGE_FLAP_WINDOW_MS = 9e4;
+var DUPLICATE_BRIDGE_STABLE_SESSION_MS = BRIDGE_APP_HEARTBEAT_INTERVAL_MS * BRIDGE_HEARTBEAT_MISSED_ACKS_BEFORE_RECONNECT + 5e3;
+var DUPLICATE_BRIDGE_WARNING_MESSAGE = "[Bridge service] It looks like two bridges are using the same token and disconnecting each other. Stop any duplicate @buildautomaton/cli process for this workspace/token (only one bridge should run).";
+function createEmptyDuplicateBridgeFlapTracker() {
+  return {
+    sessionOpenedAtMs: null,
+    shortDisconnectAtMs: []
+  };
+}
+function isSupersededByNewBridgeClose(code, reason) {
+  if (code !== 1e3) return false;
+  return reason.toLowerCase().includes(BRIDGE_SUPERSEDED_CLOSE_REASON_SNIPPET);
+}
+function pruneShortDisconnects(tracker, nowMs) {
+  const cutoff = nowMs - DUPLICATE_BRIDGE_FLAP_WINDOW_MS;
+  tracker.shortDisconnectAtMs = tracker.shortDisconnectAtMs.filter((t) => t >= cutoff);
+}
+function recordBridgeSessionOpened(tracker, nowMs) {
+  tracker.sessionOpenedAtMs = nowMs;
+}
+function evaluateDuplicateBridgeDisconnect(tracker, nowMs, code, reason) {
+  if (isSupersededByNewBridgeClose(code, reason)) {
+    return { kind: "warn", trigger: "superseded_close" };
+  }
+  const openedAt = tracker.sessionOpenedAtMs;
+  tracker.sessionOpenedAtMs = null;
+  if (openedAt == null) {
+    return { kind: "none" };
+  }
+  const sessionMs = nowMs - openedAt;
+  if (sessionMs >= DUPLICATE_BRIDGE_STABLE_SESSION_MS) {
+    tracker.shortDisconnectAtMs = [];
+    return { kind: "none" };
+  }
+  if (sessionMs < DUPLICATE_BRIDGE_SHORT_SESSION_MS) {
+    pruneShortDisconnects(tracker, nowMs);
+    tracker.shortDisconnectAtMs.push(nowMs);
+    if (tracker.shortDisconnectAtMs.length >= DUPLICATE_BRIDGE_FLAP_MIN_COUNT) {
+      return { kind: "warn", trigger: "rapid_short_disconnects" };
+    }
+  }
+  return { kind: "none" };
+}
+function logDuplicateBridgeWarning(log2, result) {
+  if (result.kind !== "warn") return;
+  try {
+    log2(DUPLICATE_BRIDGE_WARNING_MESSAGE);
+  } catch {
+  }
+}
+
 // src/connection/reconnect/firehose-reconnect.ts
 function beginFirehoseDeferredDisconnect(ctx, code, reason, log2) {
   beginTieredSilentReconnectDisconnect({
@@ -25013,8 +25110,8 @@ function runPendingAuth(options) {
   let hasOpenedBrowser = false;
   let resolved = false;
   let resolveAuth;
-  const authPromise = new Promise((resolve18) => {
-    resolveAuth = resolve18;
+  const authPromise = new Promise((resolve20) => {
+    resolveAuth = resolve20;
   });
   let reconnectAttempt = 0;
   const signInQuiet = createEmptyReconnectQuietSlot();
@@ -25165,7 +25262,7 @@ import sqliteWasm from "node-sqlite3-wasm";
 
 // src/runtime/yield-to-event-loop.ts
 function yieldToEventLoop() {
-  return new Promise((resolve18) => setImmediate(resolve18));
+  return new Promise((resolve20) => setImmediate(resolve20));
 }
 
 // src/sqlite/cli-sqlite-paths.ts
@@ -25730,8 +25827,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path41) {
-  return path41 instanceof String && cache.has(path41);
+function isPathSpec(path44) {
+  return path44 instanceof String && cache.has(path44);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -25820,8 +25917,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path41) {
-  return (0, import_file_exists.exists)(path41, import_file_exists.FOLDER);
+function folderExists(path44) {
+  return (0, import_file_exists.exists)(path44, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -26225,8 +26322,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path41) {
-      return /^\.(git)?$/.test(path41.trim());
+    parser(path44) {
+      return /^\.(git)?$/.test(path44.trim());
     }
   };
 }
@@ -26660,11 +26757,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path41, line, preview] = input.split(NULL);
-    paths.add(path41);
-    (results[path41] = results[path41] || []).push({
+    const [path44, line, preview] = input.split(NULL);
+    paths.add(path44);
+    (results[path44] = results[path44] || []).push({
       line: asNumber(line),
-      path: path41,
+      path: path44,
       preview
     });
   });
@@ -27429,14 +27526,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path41, text) {
+function parseInit(bare, path44, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path41, false, result[1]);
+    return new InitSummary(bare, path44, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path41, true, result[1]);
+    return new InitSummary(bare, path44, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -27447,7 +27544,7 @@ function parseInit(bare, path41, text) {
       break;
     }
   }
-  return new InitSummary(bare, path41, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path44, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -27456,9 +27553,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path41, existing, gitDir) {
+      constructor(bare, path44, existing, gitDir) {
         this.bare = bare;
-        this.path = path41;
+        this.path = path44;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -27470,7 +27567,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path41, customArgs) {
+function initTask(bare = false, path44, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -27479,7 +27576,7 @@ function initTask(bare = false, path41, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path41, text);
+      return parseInit(commands.includes("--bare"), path44, text);
     }
   };
 }
@@ -28295,12 +28392,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path41, index, working_dir) {
-        this.path = path41;
+      constructor(path44, index, working_dir) {
+        this.path = path44;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path41) || [null, path41, path41];
+          const detail = fromPathRegex.exec(path44) || [null, path44, path44];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -28331,14 +28428,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path41) {
+  function data(index, workingDir, path44) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path41);
+      handler(result, path44);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path41, index, workingDir));
+      result.files.push(new FileStatusSummary(path44, index, workingDir));
     }
   }
 }
@@ -28647,9 +28744,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path41, write) {
+      hashObject(path44, write) {
         return this._runTask(
-          hashObjectTask(path41, write === true),
+          hashObjectTask(path44, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -29002,8 +29099,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path41 = input.trim().replace(/^["']|["']$/g, "");
-  return path41 && normalize2(path41);
+  const path44 = input.trim().replace(/^["']|["']$/g, "");
+  return path44 && normalize2(path44);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -29317,8 +29414,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path41) {
-  return subModuleTask(["add", repo, path41]);
+function addSubModuleTask(repo, path44) {
+  return subModuleTask(["add", repo, path44]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -29651,8 +29748,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path41, then) {
-      return this._runTask(addSubModuleTask2(repo, path41), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path44, then) {
+      return this._runTask(addSubModuleTask2(repo, path44), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -30289,8 +30386,8 @@ async function runGitTask(fn) {
 }
 async function yieldToEventLoop2() {
   throwIfGitShutdownRequested();
-  await new Promise((resolve18) => {
-    setImmediate(resolve18);
+  await new Promise((resolve20) => {
+    setImmediate(resolve20);
   });
   throwIfGitShutdownRequested();
 }
@@ -30615,9 +30712,9 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
 // src/agents/acp/put-summarize-change-summaries.ts
 async function putEncryptedChangeSummaryRows(params) {
   const base = params.apiBaseUrl.replace(/\/+$/, "");
-  const entries = params.rows.map(({ path: path41, summary }) => {
+  const entries = params.rows.map(({ path: path44, summary }) => {
     const enc = params.e2ee.encryptFields({ summary }, ["summary"]);
-    return { path: path41, summary: JSON.stringify(enc) };
+    return { path: path44, summary: JSON.stringify(enc) };
   });
   const res = await fetch(
     `${base}/api/sessions/${encodeURIComponent(params.sessionId)}/follow-ups/summarize-changes`,
@@ -31171,7 +31268,7 @@ async function createCursorAcpClient(options) {
     logDebug,
     getStderrText: () => stderrCapture.getText()
   };
-  return new Promise((resolve18, reject) => {
+  return new Promise((resolve20, reject) => {
     child.on("error", (err) => {
       child.kill();
       reject(new Error(formatSpawnError2(err, command[0])));
@@ -31347,7 +31444,7 @@ async function createCursorAcpClient(options) {
           clientInfo: { name: "buildautomaton-cli", version: "0.1.0" }
         });
         const sessionId = established.sessionId;
-        resolve18({
+        resolve20({
           sessionId,
           async sendPrompt(prompt, options2) {
             const imgs = options2?.images?.map((im) => ({ type: "image", mimeType: im.mimeType, data: im.dataBase64 }));
@@ -32593,266 +32690,65 @@ async function createAcpManager(options) {
   };
 }
 
-// src/worktrees/session-worktree-manager.ts
-import * as path25 from "node:path";
-import os8 from "node:os";
-
-// src/worktrees/prepare-new-session-worktrees.ts
-import * as fs17 from "node:fs";
-import * as path20 from "node:path";
-
-// src/git/worktrees/worktree-add.ts
-async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch) {
-  const mainGit = cliSimpleGit(mainRepoPath);
-  await mainGit.raw(["worktree", "add", "-b", branch, worktreePath, "HEAD"]);
-}
-
-// src/worktrees/worktree-layout-file.ts
-import * as fs16 from "node:fs";
-import * as path19 from "node:path";
-import os7 from "node:os";
-var LAYOUT_FILENAME = "worktree-launcher-layout.json";
-function defaultWorktreeLayoutPath() {
-  return path19.join(os7.homedir(), ".buildautomaton", LAYOUT_FILENAME);
-}
-function normalizeLoadedLayout(raw) {
-  if (raw && typeof raw === "object" && "launcherCwds" in raw) {
-    const j = raw;
-    if (Array.isArray(j.launcherCwds)) return { launcherCwds: j.launcherCwds };
-  }
-  return { launcherCwds: [] };
-}
-function loadWorktreeLayout() {
-  try {
-    const p = defaultWorktreeLayoutPath();
-    if (!fs16.existsSync(p)) return { launcherCwds: [] };
-    const raw = JSON.parse(fs16.readFileSync(p, "utf8"));
-    return normalizeLoadedLayout(raw);
-  } catch {
-    return { launcherCwds: [] };
-  }
-}
-function saveWorktreeLayout(layout) {
-  try {
-    const dir = path19.dirname(defaultWorktreeLayoutPath());
-    fs16.mkdirSync(dir, { recursive: true });
-    fs16.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
-  } catch {
-  }
-}
-function baseNameSafe(pathString) {
-  return path19.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
-}
-function getLauncherDirNameIfPresent(layout, bridgeRootPath2) {
-  const norm = path19.resolve(bridgeRootPath2);
-  const existing = layout.launcherCwds.find((e) => path19.resolve(e.absolutePath) === norm);
-  return existing?.dirName;
-}
-function allocateDirNameForLauncherCwd(layout, bridgeRootPath2) {
-  const existing = getLauncherDirNameIfPresent(layout, bridgeRootPath2);
-  if (existing) return existing;
-  const norm = path19.resolve(bridgeRootPath2);
-  const base = baseNameSafe(norm);
-  const used = new Set(layout.launcherCwds.map((e) => e.dirName));
-  let name = base;
-  let n = 2;
-  while (used.has(name)) {
-    name = `${base}-${n}`;
-    n += 1;
-  }
-  layout.launcherCwds.push({ absolutePath: norm, dirName: name });
-  saveWorktreeLayout(layout);
-  return name;
-}
-
-// src/worktrees/prepare-new-session-worktrees.ts
-async function prepareNewSessionWorktrees(options) {
-  const { worktreesRootPath, bridgeRoot, sessionId, layout, log: log2 } = options;
-  const bridgeResolved = path20.resolve(bridgeRoot);
-  const cwdKey = allocateDirNameForLauncherCwd(layout, bridgeResolved);
-  const bridgeKeyDir = path20.join(worktreesRootPath, cwdKey);
-  const sessionDir = path20.join(bridgeKeyDir, sessionId);
-  const repos = await discoverGitReposUnderRoot(bridgeResolved);
-  if (repos.length === 0) {
-    log2("[worktrees] No Git repositories under bridge root; skipping worktree creation.");
-    return null;
-  }
-  const branch = `session-${sessionId}`;
-  const worktreePaths = [];
-  fs17.mkdirSync(sessionDir, { recursive: true });
-  for (const repo of repos) {
-    let rel = path20.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path20.isAbsolute(rel)) continue;
-    const relNorm = rel === "" ? "." : rel;
-    const wtPath = relNorm === "." ? sessionDir : path20.join(sessionDir, relNorm);
-    if (relNorm !== ".") {
-      fs17.mkdirSync(path20.dirname(wtPath), { recursive: true });
-    }
-    try {
-      await gitWorktreeAddBranch(repo.absolutePath, wtPath, branch);
-      log2(`[worktrees] Added worktree ${wtPath} (branch ${branch}).`);
-      worktreePaths.push(wtPath);
-    } catch (e) {
-      log2(
-        `[worktrees] Worktree add failed for ${repo.absolutePath}: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  }
-  if (worktreePaths.length === 0) return null;
-  return {
-    worktreePaths,
-    sessionParentPath: sessionDir,
-    workingTreeRelRoot: sessionDir
-  };
-}
-
-// src/git/branches/rename-branch.ts
-async function gitRenameCurrentBranch(repoDir, newName) {
-  const g = cliSimpleGit(repoDir);
-  await g.raw(["branch", "-m", newName]);
-}
-
-// src/worktrees/rename-session-worktree-branches.ts
-async function renameSessionWorktreeBranches(paths, newBranch, log2) {
-  const safe = newBranch.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "session-branch";
-  for (const wt of paths) {
-    try {
-      await gitRenameCurrentBranch(wt, safe);
-      log2(`[worktrees] Renamed branch in ${wt} \u2192 ${safe}`);
-    } catch (e) {
-      log2(
-        `[worktrees] Branch rename failed in ${wt}: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-  }
-}
-
-// src/worktrees/remove-session-worktrees.ts
-import * as fs20 from "node:fs";
-
-// src/git/worktrees/worktree-remove.ts
-import * as fs19 from "node:fs";
-
-// src/git/worktrees/resolve-main-repo-from-git-file.ts
-import * as fs18 from "node:fs";
-import * as path21 from "node:path";
-function resolveMainRepoFromWorktreeGitFile(wt) {
-  const gitDirFile = path21.join(wt, ".git");
-  if (!fs18.existsSync(gitDirFile) || !fs18.statSync(gitDirFile).isFile()) return "";
-  const first2 = fs18.readFileSync(gitDirFile, "utf8").trim();
-  const m = first2.match(/^gitdir:\s*(.+)$/im);
-  if (!m) return "";
-  const gitWorktreePath = path21.resolve(wt, m[1].trim());
-  const gitDir = path21.dirname(path21.dirname(gitWorktreePath));
-  return path21.dirname(gitDir);
-}
+// src/git/changes/types.ts
+var MAX_PATCH_CHARS = 35e4;
 
-// src/git/worktrees/worktree-remove.ts
-async function gitWorktreeRemoveForce(worktreePath) {
-  const mainRepo = resolveMainRepoFromWorktreeGitFile(worktreePath);
-  if (mainRepo) {
-    await cliSimpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
-  } else {
-    fs19.rmSync(worktreePath, { recursive: true, force: true });
-  }
+// src/git/changes/lib/repo-format.ts
+function posixJoinDirFile(dir, file2) {
+  const d = dir === "." || dir === "" ? "" : dir.replace(/\\/g, "/").replace(/\/+$/, "");
+  const f = file2.replace(/\\/g, "/").replace(/^\/+/, "");
+  return d ? `${d}/${f}` : f;
 }
-
-// src/worktrees/remove-session-worktrees.ts
-async function removeSessionWorktrees(paths, log2) {
-  for (const wt of paths) {
+function formatRepoShortTitle(remoteUrl, repoRelPath) {
+  const u = remoteUrl.trim();
+  if (u) {
     try {
-      await gitWorktreeRemoveForce(wt);
-      log2(`[worktrees] Removed worktree ${wt}`);
-    } catch (e) {
-      log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
-      try {
-        fs20.rmSync(wt, { recursive: true, force: true });
-      } catch {
+      if (u.startsWith("git@")) {
+        const colon = u.indexOf(":");
+        if (colon > 0) {
+          const pathPart = u.slice(colon + 1).replace(/\.git$/i, "").replace(/\/+$/, "");
+          if (pathPart.includes("/")) return pathPart;
+        }
+      } else {
+        const parsed = new URL(u);
+        const p = parsed.pathname.replace(/^\//, "").replace(/\.git$/i, "");
+        const parts = p.split("/").filter(Boolean);
+        if (parts.length >= 2) {
+          return `${parts[parts.length - 2]}/${parts[parts.length - 1]}`;
+        }
+        if (parts.length === 1) return parts[0];
       }
+    } catch {
     }
   }
-}
-
-// src/git/changes/lib/parse-git-status.ts
-function parseNameStatusLines(lines) {
-  const m = /* @__PURE__ */ new Map();
-  for (const line of lines) {
-    if (!line.trim()) continue;
-    const tabParts = line.split("	");
-    if (tabParts.length < 2) continue;
-    const status = tabParts[0].trim();
-    const code = status[0];
-    if (code === "A") {
-      m.set(tabParts[tabParts.length - 1], "added");
-    } else if (code === "D") {
-      m.set(tabParts[tabParts.length - 1], "removed");
-    } else if (code === "R" || code === "C") {
-      if (tabParts.length >= 3) m.set(tabParts[tabParts.length - 1], "modified");
-    } else if (code === "M" || code === "U" || code === "T") {
-      m.set(tabParts[tabParts.length - 1], "modified");
-    }
-  }
-  return m;
-}
-function parseNumstatFirstLine(line) {
-  const parts = line.split("	");
-  if (parts.length < 3) return null;
-  const [a, d] = parts;
-  const additions = a === "-" ? 0 : parseInt(String(a), 10) || 0;
-  const deletions = d === "-" ? 0 : parseInt(String(d), 10) || 0;
-  return { additions, deletions };
-}
-function parseNumstat(lines) {
-  const m = /* @__PURE__ */ new Map();
-  for (const line of lines) {
-    if (!line.trim()) continue;
-    const parts = line.split("	");
-    if (parts.length < 3) continue;
-    const [a, d, p] = parts;
-    const additions = a === "-" ? 0 : parseInt(String(a), 10) || 0;
-    const deletions = d === "-" ? 0 : parseInt(String(d), 10) || 0;
-    m.set(p, { additions, deletions });
+  if (repoRelPath && repoRelPath !== ".") {
+    const segments = repoRelPath.split("/").filter(Boolean);
+    const last2 = segments[segments.length - 1];
+    if (last2) return last2;
   }
-  return m;
+  return "Repository";
 }
-async function numstatFromGitNoIndex(g, pathInRepo) {
-  const devNull = process.platform === "win32" ? "NUL" : "/dev/null";
+function formatRemoteDisplayLabel(remoteUrl) {
+  const u = remoteUrl.trim();
+  if (!u) return "";
+  let hostPath = u;
   try {
-    const out = await g.raw(["diff", "--numstat", "--no-index", "--", devNull, pathInRepo]);
-    const first2 = String(out).split("\n").find((l) => l.trim()) ?? "";
-    return parseNumstatFirstLine(first2);
+    if (u.startsWith("git@")) {
+      const rest = u.slice("git@".length);
+      const slash = rest.indexOf(":");
+      if (slash > 0) hostPath = `${rest.slice(0, slash)}/${rest.slice(slash + 1)}`;
+    } else {
+      const parsed = new URL(u);
+      hostPath = `${parsed.hostname}${parsed.pathname}`.replace(/\/\.git$/i, "").replace(/\.git$/i, "");
+    }
   } catch {
-    return null;
-  }
-}
-
-// src/git/changes/lib/working-tree-changed-path-count.ts
-function workingTreeChangedPathCount(nameStatusLines, numstatLines, untrackedLines) {
-  const kindByPath = parseNameStatusLines(nameStatusLines);
-  const numByPath = parseNumstat(numstatLines);
-  const paths = /* @__PURE__ */ new Set([...kindByPath.keys(), ...numByPath.keys()]);
-  for (const p of untrackedLines.map((s) => s.trim()).filter(Boolean)) {
-    paths.add(p);
+    hostPath = u.replace(/^https?:\/\//i, "").replace(/\.git$/i, "");
   }
-  return paths.size;
+  return `origin \xB7 ${hostPath}`;
 }
 
-// src/git/changes/count-working-tree-changed-files.ts
-async function countWorkingTreeChangedFilesForRepo(repoGitCwd) {
-  return runGitTask(async () => {
-    const g = cliSimpleGit(repoGitCwd);
-    const [nameStatusRaw, numstatRaw, untrackedRaw] = await Promise.all([
-      g.raw(["diff", "--name-status", "HEAD"]).catch(() => ""),
-      g.raw(["diff", "HEAD", "--numstat"]).catch(() => ""),
-      g.raw(["ls-files", "--others", "--exclude-standard"]).catch(() => "")
-    ]);
-    return workingTreeChangedPathCount(
-      String(nameStatusRaw).split("\n"),
-      String(numstatRaw).split("\n"),
-      String(untrackedRaw).split("\n")
-    );
-  });
-}
+// src/git/changes/get-working-tree-change-repo-details.ts
+import * as path20 from "node:path";
 
 // src/git/commits/resolve-remote-tracking.ts
 async function tryConfigGet(g, key) {
@@ -32952,96 +32848,6 @@ async function commitsAheadOfRemoteTracking(repoDir) {
   }
 }
 
-// src/git/status/working-tree-status.ts
-async function getRepoWorkingTreeStatus(repoDir) {
-  return runGitTask(async () => {
-    const uncommittedFileCount = await countWorkingTreeChangedFilesForRepo(repoDir);
-    const hasUncommittedChanges = uncommittedFileCount > 0;
-    const ahead = await commitsAheadOfRemoteTracking(repoDir);
-    return { hasUncommittedChanges, hasUnpushedCommits: ahead > 0, uncommittedFileCount };
-  });
-}
-async function aggregateSessionPathsWorkingTreeStatus(paths) {
-  let hasUncommittedChanges = false;
-  let hasUnpushedCommits = false;
-  let uncommittedFileCount = 0;
-  await forEachWithGitYield(paths, async (p) => {
-    const s = await getRepoWorkingTreeStatus(p);
-    uncommittedFileCount += s.uncommittedFileCount;
-    if (s.hasUncommittedChanges) hasUncommittedChanges = true;
-    if (s.hasUnpushedCommits) hasUnpushedCommits = true;
-  });
-  return { hasUncommittedChanges, hasUnpushedCommits, uncommittedFileCount };
-}
-async function pushAheadOfUpstreamForPaths(paths) {
-  await forEachWithGitYield(paths, async (p) => {
-    const g = cliSimpleGit(p);
-    const ahead = await commitsAheadOfRemoteTracking(p);
-    if (ahead <= 0) return;
-    await g.push();
-  });
-}
-
-// src/git/changes/types.ts
-var MAX_PATCH_CHARS = 35e4;
-
-// src/git/changes/lib/repo-format.ts
-function posixJoinDirFile(dir, file2) {
-  const d = dir === "." || dir === "" ? "" : dir.replace(/\\/g, "/").replace(/\/+$/, "");
-  const f = file2.replace(/\\/g, "/").replace(/^\/+/, "");
-  return d ? `${d}/${f}` : f;
-}
-function formatRepoShortTitle(remoteUrl, repoRelPath) {
-  const u = remoteUrl.trim();
-  if (u) {
-    try {
-      if (u.startsWith("git@")) {
-        const colon = u.indexOf(":");
-        if (colon > 0) {
-          const pathPart = u.slice(colon + 1).replace(/\.git$/i, "").replace(/\/+$/, "");
-          if (pathPart.includes("/")) return pathPart;
-        }
-      } else {
-        const parsed = new URL(u);
-        const p = parsed.pathname.replace(/^\//, "").replace(/\.git$/i, "");
-        const parts = p.split("/").filter(Boolean);
-        if (parts.length >= 2) {
-          return `${parts[parts.length - 2]}/${parts[parts.length - 1]}`;
-        }
-        if (parts.length === 1) return parts[0];
-      }
-    } catch {
-    }
-  }
-  if (repoRelPath && repoRelPath !== ".") {
-    const segments = repoRelPath.split("/").filter(Boolean);
-    const last2 = segments[segments.length - 1];
-    if (last2) return last2;
-  }
-  return "Repository";
-}
-function formatRemoteDisplayLabel(remoteUrl) {
-  const u = remoteUrl.trim();
-  if (!u) return "";
-  let hostPath = u;
-  try {
-    if (u.startsWith("git@")) {
-      const rest = u.slice("git@".length);
-      const slash = rest.indexOf(":");
-      if (slash > 0) hostPath = `${rest.slice(0, slash)}/${rest.slice(slash + 1)}`;
-    } else {
-      const parsed = new URL(u);
-      hostPath = `${parsed.hostname}${parsed.pathname}`.replace(/\/\.git$/i, "").replace(/\.git$/i, "");
-    }
-  } catch {
-    hostPath = u.replace(/^https?:\/\//i, "").replace(/\.git$/i, "");
-  }
-  return `origin \xB7 ${hostPath}`;
-}
-
-// src/git/changes/get-working-tree-change-repo-details.ts
-import * as path23 from "node:path";
-
 // src/git/commits/lib/parse-log-lines.ts
 function parseLogShaDateSubjectLines(raw) {
   const out = [];
@@ -33112,6 +32918,59 @@ async function listRecentCommits(repoDir, limitInput) {
   }
 }
 
+// src/git/changes/lib/parse-git-status.ts
+function parseNameStatusLines(lines) {
+  const m = /* @__PURE__ */ new Map();
+  for (const line of lines) {
+    if (!line.trim()) continue;
+    const tabParts = line.split("	");
+    if (tabParts.length < 2) continue;
+    const status = tabParts[0].trim();
+    const code = status[0];
+    if (code === "A") {
+      m.set(tabParts[tabParts.length - 1], "added");
+    } else if (code === "D") {
+      m.set(tabParts[tabParts.length - 1], "removed");
+    } else if (code === "R" || code === "C") {
+      if (tabParts.length >= 3) m.set(tabParts[tabParts.length - 1], "modified");
+    } else if (code === "M" || code === "U" || code === "T") {
+      m.set(tabParts[tabParts.length - 1], "modified");
+    }
+  }
+  return m;
+}
+function parseNumstatFirstLine(line) {
+  const parts = line.split("	");
+  if (parts.length < 3) return null;
+  const [a, d] = parts;
+  const additions = a === "-" ? 0 : parseInt(String(a), 10) || 0;
+  const deletions = d === "-" ? 0 : parseInt(String(d), 10) || 0;
+  return { additions, deletions };
+}
+function parseNumstat(lines) {
+  const m = /* @__PURE__ */ new Map();
+  for (const line of lines) {
+    if (!line.trim()) continue;
+    const parts = line.split("	");
+    if (parts.length < 3) continue;
+    const [a, d, p] = parts;
+    const additions = a === "-" ? 0 : parseInt(String(a), 10) || 0;
+    const deletions = d === "-" ? 0 : parseInt(String(d), 10) || 0;
+    m.set(p, { additions, deletions });
+  }
+  return m;
+}
+async function numstatFromGitNoIndex(g, pathInRepo) {
+  const devNull = process.platform === "win32" ? "NUL" : "/dev/null";
+  try {
+    const out = await g.raw(["diff", "--numstat", "--no-index", "--", devNull, pathInRepo]);
+    const first2 = String(out).split("\n").find((l) => l.trim()) ?? "";
+    return parseNumstatFirstLine(first2);
+  } catch {
+    return null;
+  }
+}
+
 // src/git/changes/lib/patch-truncate.ts
 function truncatePatch(s) {
   if (s.length <= MAX_PATCH_CHARS) return s;
@@ -33177,8 +33036,8 @@ async function listChangedFilesForCommit(repoGitCwd, repoRelPath, commitSha) {
 }
 
 // src/git/changes/list-changed-files-for-repo.ts
-import * as fs22 from "node:fs";
-import * as path22 from "node:path";
+import * as fs17 from "node:fs";
+import * as path19 from "node:path";
 
 // src/git/changes/lib/count-lines.ts
 import { createReadStream } from "node:fs";
@@ -33202,7 +33061,7 @@ async function countTextFileLines(filePath) {
 }
 
 // src/git/changes/hydrate-patch.ts
-import * as fs21 from "node:fs";
+import * as fs16 from "node:fs";
 var UNIFIED_HUNK_HEADER_RE = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
 var MAX_HYDRATE_LINES_PER_GAP = 8e3;
 var MAX_HYDRATE_LINES_PER_FILE = 8e4;
@@ -33217,7 +33076,7 @@ async function readGitBlobLines(repoCwd, pathInRepo) {
 }
 async function readWorktreeFileLines(filePath) {
   try {
-    const raw = await fs21.promises.readFile(filePath, "utf8");
+    const raw = await fs16.promises.readFile(filePath, "utf8");
     return raw.split(/\r?\n/);
   } catch {
     return null;
@@ -33342,7 +33201,7 @@ async function listChangedFilesForRepo(repoGitCwd, repoRelPath) {
   const rows = [];
   await forEachWithGitYield([...paths], async (pathInRepo) => {
     const relLauncher = posixJoinDirFile(repoRelPath, pathInRepo.replace(/\\/g, "/"));
-    const repoFilePath = path22.join(repoGitCwd, pathInRepo);
+    const repoFilePath = path19.join(repoGitCwd, pathInRepo);
     const nums = numByPath.get(pathInRepo);
     let additions = nums?.additions ?? 0;
     let deletions = nums?.deletions ?? 0;
@@ -33355,7 +33214,7 @@ async function listChangedFilesForRepo(repoGitCwd, repoRelPath) {
         deletions = fromGit.deletions;
       } else {
         try {
-          const st = await fs22.promises.stat(repoFilePath);
+          const st = await fs17.promises.stat(repoFilePath);
           if (st.isFile()) additions = await countTextFileLines(repoFilePath);
           else additions = 0;
         } catch {
@@ -33381,7 +33240,7 @@ async function listChangedFilesForRepo(repoGitCwd, repoRelPath) {
     } else {
       pathInRepo = row.pathRelLauncher;
     }
-    const filePath = path22.join(repoGitCwd, pathInRepo);
+    const filePath = path19.join(repoGitCwd, pathInRepo);
     let patch = await unifiedDiffForFile(repoGitCwd, pathInRepo, row.change);
     if (patch) {
       patch = await hydrateUnifiedPatchWithFileContext(patch, filePath, repoGitCwd, pathInRepo, row.change);
@@ -33397,8 +33256,8 @@ function normRepoRel(p) {
   return x === "" ? "." : x;
 }
 async function getWorkingTreeChangeRepoDetails(options) {
-  const bridgeRoot = path23.resolve(getBridgeRoot());
-  const sessionWtRoot = options.sessionWorktreeRootPath ? path23.resolve(options.sessionWorktreeRootPath) : null;
+  const bridgeRoot = path20.resolve(getBridgeRoot());
+  const sessionWtRoot = options.sessionWorktreeRootPath ? path20.resolve(options.sessionWorktreeRootPath) : null;
   const legacyNested = options.legacyRepoNestedSessionLayout === true;
   const out = [];
   const filter = options.repoFilterRelPath != null ? normRepoRel(options.repoFilterRelPath) : null;
@@ -33413,7 +33272,7 @@ async function getWorkingTreeChangeRepoDetails(options) {
   for (let i = 0; i < options.commitTargetPaths.length; i++) {
     if (i > 0) await yieldToEventLoop2();
     const target = options.commitTargetPaths[i];
-    const t = path23.resolve(target);
+    const t = path20.resolve(target);
     if (!await isGitRepoDirectory(t)) continue;
     const g = cliSimpleGit(t);
     let branch = "HEAD";
@@ -33426,8 +33285,8 @@ async function getWorkingTreeChangeRepoDetails(options) {
     const remoteDisplay = formatRemoteDisplayLabel(remoteUrl);
     let repoRelPath;
     if (sessionWtRoot) {
-      const anchor = legacyNested ? path23.dirname(t) : t;
-      const relNorm = path23.relative(sessionWtRoot, anchor);
+      const anchor = legacyNested ? path20.dirname(t) : t;
+      const relNorm = path20.relative(sessionWtRoot, anchor);
       repoRelPath = relNorm === "" ? "." : relNorm.replace(/\\/g, "/");
     } else {
       let top = t;
@@ -33436,8 +33295,8 @@ async function getWorkingTreeChangeRepoDetails(options) {
       } catch {
         top = t;
       }
-      const rel = path23.relative(bridgeRoot, path23.resolve(top)).replace(/\\/g, "/") || ".";
-      repoRelPath = rel.startsWith("..") ? path23.basename(path23.resolve(top)) : rel;
+      const rel = path20.relative(bridgeRoot, path20.resolve(top)).replace(/\\/g, "/") || ".";
+      repoRelPath = rel.startsWith("..") ? path20.basename(path20.resolve(top)) : rel;
     }
     const norm = normRepoRel(repoRelPath === "" ? "." : repoRelPath);
     if (filter && norm !== filter) continue;
@@ -33469,6 +33328,64 @@ async function getWorkingTreeChangeRepoDetails(options) {
   return out;
 }
 
+// src/git/changes/lib/working-tree-changed-path-count.ts
+function workingTreeChangedPathCount(nameStatusLines, numstatLines, untrackedLines) {
+  const kindByPath = parseNameStatusLines(nameStatusLines);
+  const numByPath = parseNumstat(numstatLines);
+  const paths = /* @__PURE__ */ new Set([...kindByPath.keys(), ...numByPath.keys()]);
+  for (const p of untrackedLines.map((s) => s.trim()).filter(Boolean)) {
+    paths.add(p);
+  }
+  return paths.size;
+}
+
+// src/git/changes/count-working-tree-changed-files.ts
+async function countWorkingTreeChangedFilesForRepo(repoGitCwd) {
+  return runGitTask(async () => {
+    const g = cliSimpleGit(repoGitCwd);
+    const [nameStatusRaw, numstatRaw, untrackedRaw] = await Promise.all([
+      g.raw(["diff", "--name-status", "HEAD"]).catch(() => ""),
+      g.raw(["diff", "HEAD", "--numstat"]).catch(() => ""),
+      g.raw(["ls-files", "--others", "--exclude-standard"]).catch(() => "")
+    ]);
+    return workingTreeChangedPathCount(
+      String(nameStatusRaw).split("\n"),
+      String(numstatRaw).split("\n"),
+      String(untrackedRaw).split("\n")
+    );
+  });
+}
+
+// src/git/status/working-tree-status.ts
+async function getRepoWorkingTreeStatus(repoDir) {
+  return runGitTask(async () => {
+    const uncommittedFileCount = await countWorkingTreeChangedFilesForRepo(repoDir);
+    const hasUncommittedChanges = uncommittedFileCount > 0;
+    const ahead = await commitsAheadOfRemoteTracking(repoDir);
+    return { hasUncommittedChanges, hasUnpushedCommits: ahead > 0, uncommittedFileCount };
+  });
+}
+async function aggregateSessionPathsWorkingTreeStatus(paths) {
+  let hasUncommittedChanges = false;
+  let hasUnpushedCommits = false;
+  let uncommittedFileCount = 0;
+  await forEachWithGitYield(paths, async (p) => {
+    const s = await getRepoWorkingTreeStatus(p);
+    uncommittedFileCount += s.uncommittedFileCount;
+    if (s.hasUncommittedChanges) hasUncommittedChanges = true;
+    if (s.hasUnpushedCommits) hasUnpushedCommits = true;
+  });
+  return { hasUncommittedChanges, hasUnpushedCommits, uncommittedFileCount };
+}
+async function pushAheadOfUpstreamForPaths(paths) {
+  await forEachWithGitYield(paths, async (p) => {
+    const g = cliSimpleGit(p);
+    const ahead = await commitsAheadOfRemoteTracking(p);
+    if (ahead <= 0) return;
+    await g.push();
+  });
+}
+
 // src/git/branches/commit-and-push.ts
 async function gitCommitAllIfDirty(repoDir, message, options) {
   const g = cliSimpleGit(repoDir);
@@ -33506,12 +33423,137 @@ async function commitSessionWorktrees(options) {
   }
 }
 
+// src/worktrees/remove-session-worktrees.ts
+import * as fs20 from "node:fs";
+
+// src/git/worktrees/worktree-remove.ts
+import * as fs19 from "node:fs";
+
+// src/git/worktrees/resolve-main-repo-from-git-file.ts
+import * as fs18 from "node:fs";
+import * as path21 from "node:path";
+function resolveMainRepoFromWorktreeGitFile(wt) {
+  const gitDirFile = path21.join(wt, ".git");
+  if (!fs18.existsSync(gitDirFile) || !fs18.statSync(gitDirFile).isFile()) return "";
+  const first2 = fs18.readFileSync(gitDirFile, "utf8").trim();
+  const m = first2.match(/^gitdir:\s*(.+)$/im);
+  if (!m) return "";
+  const gitWorktreePath = path21.resolve(wt, m[1].trim());
+  const gitDir = path21.dirname(path21.dirname(gitWorktreePath));
+  return path21.dirname(gitDir);
+}
+
+// src/git/worktrees/worktree-remove.ts
+async function gitWorktreeRemoveForce(worktreePath) {
+  const mainRepo = resolveMainRepoFromWorktreeGitFile(worktreePath);
+  if (mainRepo) {
+    await cliSimpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
+  } else {
+    fs19.rmSync(worktreePath, { recursive: true, force: true });
+  }
+}
+
+// src/worktrees/remove-session-worktrees.ts
+async function removeSessionWorktrees(paths, log2) {
+  for (const wt of paths) {
+    try {
+      await gitWorktreeRemoveForce(wt);
+      log2(`[worktrees] Removed worktree ${wt}`);
+    } catch (e) {
+      log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
+      try {
+        fs20.rmSync(wt, { recursive: true, force: true });
+      } catch {
+      }
+    }
+  }
+}
+
+// src/git/branches/rename-branch.ts
+async function gitRenameCurrentBranch(repoDir, newName) {
+  const g = cliSimpleGit(repoDir);
+  await g.raw(["branch", "-m", newName]);
+}
+
+// src/worktrees/rename-session-worktree-branches.ts
+async function renameSessionWorktreeBranches(paths, newBranch, log2) {
+  const safe = newBranch.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "session-branch";
+  for (const wt of paths) {
+    try {
+      await gitRenameCurrentBranch(wt, safe);
+      log2(`[worktrees] Renamed branch in ${wt} \u2192 ${safe}`);
+    } catch (e) {
+      log2(
+        `[worktrees] Branch rename failed in ${wt}: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
+}
+
+// src/worktrees/worktree-layout-file.ts
+import * as fs21 from "node:fs";
+import * as path22 from "node:path";
+import os7 from "node:os";
+var LAYOUT_FILENAME = "worktree-launcher-layout.json";
+function defaultWorktreeLayoutPath() {
+  return path22.join(os7.homedir(), ".buildautomaton", LAYOUT_FILENAME);
+}
+function normalizeLoadedLayout(raw) {
+  if (raw && typeof raw === "object" && "launcherCwds" in raw) {
+    const j = raw;
+    if (Array.isArray(j.launcherCwds)) return { launcherCwds: j.launcherCwds };
+  }
+  return { launcherCwds: [] };
+}
+function loadWorktreeLayout() {
+  try {
+    const p = defaultWorktreeLayoutPath();
+    if (!fs21.existsSync(p)) return { launcherCwds: [] };
+    const raw = JSON.parse(fs21.readFileSync(p, "utf8"));
+    return normalizeLoadedLayout(raw);
+  } catch {
+    return { launcherCwds: [] };
+  }
+}
+function saveWorktreeLayout(layout) {
+  try {
+    const dir = path22.dirname(defaultWorktreeLayoutPath());
+    fs21.mkdirSync(dir, { recursive: true });
+    fs21.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
+  } catch {
+  }
+}
+function baseNameSafe(pathString) {
+  return path22.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
+}
+function getLauncherDirNameIfPresent(layout, bridgeRootPath2) {
+  const norm = path22.resolve(bridgeRootPath2);
+  const existing = layout.launcherCwds.find((e) => path22.resolve(e.absolutePath) === norm);
+  return existing?.dirName;
+}
+function allocateDirNameForLauncherCwd(layout, bridgeRootPath2) {
+  const existing = getLauncherDirNameIfPresent(layout, bridgeRootPath2);
+  if (existing) return existing;
+  const norm = path22.resolve(bridgeRootPath2);
+  const base = baseNameSafe(norm);
+  const used = new Set(layout.launcherCwds.map((e) => e.dirName));
+  let name = base;
+  let n = 2;
+  while (used.has(name)) {
+    name = `${base}-${n}`;
+    n += 1;
+  }
+  layout.launcherCwds.push({ absolutePath: norm, dirName: name });
+  saveWorktreeLayout(layout);
+  return name;
+}
+
 // src/worktrees/discover-session-worktree-on-disk.ts
-import * as fs23 from "node:fs";
-import * as path24 from "node:path";
+import * as fs22 from "node:fs";
+import * as path23 from "node:path";
 function isGitDir(dirPath) {
   try {
-    return fs23.existsSync(path24.join(dirPath, ".git"));
+    return fs22.existsSync(path23.join(dirPath, ".git"));
   } catch {
     return false;
   }
@@ -33520,23 +33562,23 @@ function collectGitRepoRootsUnderDirectory(rootPath) {
   const out = [];
   const walk = (dir) => {
     if (isGitDir(dir)) {
-      out.push(path24.resolve(dir));
+      out.push(path23.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = fs23.readdirSync(dir, { withFileTypes: true });
+      entries = fs22.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (e.name.startsWith(".")) continue;
-      const full = path24.join(dir, e.name);
+      const full = path23.join(dir, e.name);
       if (!e.isDirectory()) continue;
       walk(full);
     }
   };
-  walk(path24.resolve(rootPath));
+  walk(path23.resolve(rootPath));
   return [...new Set(out)];
 }
 function collectWorktreeRootsNamed(root, sessionId, maxDepth) {
@@ -33545,16 +33587,16 @@ function collectWorktreeRootsNamed(root, sessionId, maxDepth) {
     if (depth > maxDepth) return;
     let entries;
     try {
-      entries = fs23.readdirSync(dir, { withFileTypes: true });
+      entries = fs22.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (e.name.startsWith(".")) continue;
-      const full = path24.join(dir, e.name);
+      const full = path23.join(dir, e.name);
       if (!e.isDirectory()) continue;
       if (e.name === sessionId) {
-        if (isGitDir(full)) out.push(path24.resolve(full));
+        if (isGitDir(full)) out.push(path23.resolve(full));
       } else {
         walk(full, depth + 1);
       }
@@ -33566,14 +33608,14 @@ function collectWorktreeRootsNamed(root, sessionId, maxDepth) {
 function tryBindingFromSessionDirectory(sessionDir) {
   let st;
   try {
-    st = fs23.statSync(sessionDir);
+    st = fs22.statSync(sessionDir);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const worktreePaths = collectGitRepoRootsUnderDirectory(sessionDir);
   if (worktreePaths.length === 0) return null;
-  const abs = path24.resolve(sessionDir);
+  const abs = path23.resolve(sessionDir);
   return {
     sessionParentPath: abs,
     workingTreeRelRoot: abs,
@@ -33583,20 +33625,20 @@ function tryBindingFromSessionDirectory(sessionDir) {
 function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPath) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hintR = path24.resolve(checkoutPath);
+  const hintR = path23.resolve(checkoutPath);
   let best = null;
-  let cur = path24.dirname(hintR);
+  let cur = path23.dirname(hintR);
   for (let i = 0; i < 40; i++) {
     const paths = collectWorktreeRootsNamed(cur, sid, 24);
-    if (paths.some((p) => path24.resolve(p) === hintR)) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths) ?? path24.resolve(paths[0]);
+    if (paths.some((p) => path23.resolve(p) === hintR)) {
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths) ?? path23.resolve(paths[0]);
       best = {
-        sessionParentPath: path24.resolve(isolated),
-        workingTreeRelRoot: path24.resolve(cur),
-        repoCheckoutPaths: paths.map((p) => path24.resolve(p))
+        sessionParentPath: path23.resolve(isolated),
+        workingTreeRelRoot: path23.resolve(cur),
+        repoCheckoutPaths: paths.map((p) => path23.resolve(p))
       };
     }
-    const next = path24.dirname(cur);
+    const next = path23.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -33604,33 +33646,33 @@ function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPath) {
 }
 function discoverSessionWorktreeOnDisk(options) {
   const { sessionId, worktreesRootPath, layout, bridgeRoot } = options;
-  if (!sessionId.trim() || !fs23.existsSync(worktreesRootPath)) return null;
+  if (!sessionId.trim() || !fs22.existsSync(worktreesRootPath)) return null;
   const preferredKey = getLauncherDirNameIfPresent(layout, bridgeRoot);
   const keys = [];
   if (preferredKey) keys.push(preferredKey);
   try {
-    for (const name of fs23.readdirSync(worktreesRootPath)) {
+    for (const name of fs22.readdirSync(worktreesRootPath)) {
       if (name.startsWith(".")) continue;
-      const p = path24.join(worktreesRootPath, name);
-      if (!fs23.statSync(p).isDirectory()) continue;
+      const p = path23.join(worktreesRootPath, name);
+      if (!fs22.statSync(p).isDirectory()) continue;
       if (name !== preferredKey) keys.push(name);
     }
   } catch {
     return null;
   }
   for (const key of keys) {
-    const layoutRoot = path24.join(worktreesRootPath, key);
-    if (!fs23.existsSync(layoutRoot) || !fs23.statSync(layoutRoot).isDirectory()) continue;
-    const sessionDir = path24.join(layoutRoot, sessionId);
+    const layoutRoot = path23.join(worktreesRootPath, key);
+    if (!fs22.existsSync(layoutRoot) || !fs22.statSync(layoutRoot).isDirectory()) continue;
+    const sessionDir = path23.join(layoutRoot, sessionId);
     const nested = tryBindingFromSessionDirectory(sessionDir);
     if (nested) return nested;
     const legacyPaths = collectWorktreeRootsNamed(layoutRoot, sessionId, 24);
     if (legacyPaths.length > 0) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths) ?? path24.resolve(legacyPaths[0]);
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths) ?? path23.resolve(legacyPaths[0]);
       return {
-        sessionParentPath: path24.resolve(isolated),
-        workingTreeRelRoot: path24.resolve(layoutRoot),
-        repoCheckoutPaths: legacyPaths.map((p) => path24.resolve(p))
+        sessionParentPath: path23.resolve(isolated),
+        workingTreeRelRoot: path23.resolve(layoutRoot),
+        repoCheckoutPaths: legacyPaths.map((p) => path23.resolve(p))
       };
     }
   }
@@ -33639,12 +33681,12 @@ function discoverSessionWorktreeOnDisk(options) {
 function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionWorktreeRootPathOrHint, sessionId) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hint = path24.resolve(sessionWorktreeRootPathOrHint);
-  const underHint = tryBindingFromSessionDirectory(path24.join(hint, sid));
+  const hint = path23.resolve(sessionWorktreeRootPathOrHint);
+  const underHint = tryBindingFromSessionDirectory(path23.join(hint, sid));
   if (underHint) return underHint;
   const direct = tryBindingFromSessionDirectory(hint);
   if (direct) {
-    if (path24.basename(hint) === sid && isGitDir(hint)) {
+    if (path23.basename(hint) === sid && isGitDir(hint)) {
       const legacyFromCheckout = discoverLegacyBindingAscendingFromCheckout(sid, hint);
       if (legacyFromCheckout && legacyFromCheckout.repoCheckoutPaths.length > direct.repoCheckoutPaths.length) {
         return legacyFromCheckout;
@@ -33652,216 +33694,349 @@ function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionWorktreeRootPat
     }
     return direct;
   }
-  if (path24.basename(hint) === sid && isGitDir(hint)) {
+  if (path23.basename(hint) === sid && isGitDir(hint)) {
     const legacyFromCheckout = discoverLegacyBindingAscendingFromCheckout(sid, hint);
     if (legacyFromCheckout) return legacyFromCheckout;
   }
   let st;
   try {
-    st = fs23.statSync(hint);
+    st = fs22.statSync(hint);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const legacyPaths = collectWorktreeRootsNamed(hint, sid, 24);
   if (legacyPaths.length === 0) return null;
-  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths) ?? path24.resolve(legacyPaths[0]);
+  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths) ?? path23.resolve(legacyPaths[0]);
   return {
-    sessionParentPath: path24.resolve(isolated),
+    sessionParentPath: path23.resolve(isolated),
     workingTreeRelRoot: hint,
-    repoCheckoutPaths: legacyPaths.map((p) => path24.resolve(p))
+    repoCheckoutPaths: legacyPaths.map((p) => path23.resolve(p))
   };
 }
 
-// src/worktrees/session-worktree-manager.ts
+// src/worktrees/manager/discover-session-binding.ts
+function discoverSessionBinding(params) {
+  return discoverSessionWorktreeOnDisk({
+    sessionId: params.sessionId,
+    worktreesRootPath: params.worktreesRootPath,
+    layout: params.layout,
+    bridgeRoot: getBridgeRoot()
+  });
+}
+
+// src/worktrees/manager/resolve-isolated-session-parent-path.ts
+function resolveIsolatedSessionParentPath(sessionId, cache2, ensureRepoCheckoutPaths) {
+  if (!sessionId) return null;
+  const sid = sessionId.trim();
+  const cached2 = cache2.getSessionParentPath(sid);
+  if (cached2) return cached2;
+  const paths = ensureRepoCheckoutPaths(sid);
+  if (!paths?.length) return null;
+  return resolveIsolatedSessionParentPathFromCheckouts(paths);
+}
+function ensureRepoCheckoutPathsForSession(sessionId, cache2, discover) {
+  if (!sessionId?.trim()) return void 0;
+  const sid = sessionId.trim();
+  const cached2 = cache2.getRepoCheckoutPaths(sid);
+  if (cached2?.length) return cached2;
+  const disc = discover(sid);
+  if (disc?.repoCheckoutPaths.length) {
+    cache2.remember(sid, disc);
+    return [...disc.repoCheckoutPaths];
+  }
+  return void 0;
+}
+
+// src/worktrees/manager/resolve-commit-targets.ts
+function resolveCommitTargets(sessionId, cache2, discover) {
+  const paths = cache2.getRepoCheckoutPathsRef(sessionId);
+  if (paths?.length) return paths;
+  const disc = discover(sessionId);
+  if (disc?.repoCheckoutPaths.length) {
+    cache2.remember(sessionId, disc);
+    return disc.repoCheckoutPaths;
+  }
+  return [getBridgeRoot()];
+}
+
+// src/worktrees/manager/parse-session-parent.ts
 function parseSessionParent(v) {
   if (v === "bridge_root" || v === "worktrees_root") return v;
   if (v === "session_worktrees_root") return "worktrees_root";
   return null;
 }
-var SessionWorktreeManager = class {
-  worktreesRootPath;
-  log;
+
+// src/worktrees/prepare-new-session-worktrees.ts
+import * as fs23 from "node:fs";
+import * as path24 from "node:path";
+
+// src/git/worktrees/worktree-add.ts
+async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch, baseRef = "HEAD") {
+  const mainGit = cliSimpleGit(mainRepoPath);
+  const base = baseRef.trim() || "HEAD";
+  await mainGit.raw(["worktree", "add", "-b", branch, worktreePath, base]);
+}
+
+// src/worktrees/prepare-new-session-worktrees.ts
+function normalizeRepoRelPath(rel) {
+  return rel === "" ? "." : rel.replace(/\\/g, "/");
+}
+function resolveBaseRefForRepo(relNorm, baseBranches) {
+  if (!baseBranches) return "HEAD";
+  const direct = baseBranches[relNorm]?.trim();
+  if (direct) return direct;
+  if (relNorm !== "." && baseBranches["."]?.trim()) return baseBranches["."].trim();
+  return "HEAD";
+}
+async function prepareNewSessionWorktrees(options) {
+  const { worktreesRootPath, bridgeRoot, sessionId, layout, log: log2, worktreeBaseBranches } = options;
+  const bridgeResolved = path24.resolve(bridgeRoot);
+  const cwdKey = allocateDirNameForLauncherCwd(layout, bridgeResolved);
+  const bridgeKeyDir = path24.join(worktreesRootPath, cwdKey);
+  const sessionDir = path24.join(bridgeKeyDir, sessionId);
+  const repos = await discoverGitReposUnderRoot(bridgeResolved);
+  if (repos.length === 0) {
+    log2("[worktrees] No Git repositories under bridge root; skipping worktree creation.");
+    return null;
+  }
+  const branch = `session-${sessionId}`;
+  const worktreePaths = [];
+  fs23.mkdirSync(sessionDir, { recursive: true });
+  for (const repo of repos) {
+    let rel = path24.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path24.isAbsolute(rel)) continue;
+    const relNorm = normalizeRepoRelPath(rel === "" ? "." : rel);
+    const wtPath = relNorm === "." ? sessionDir : path24.join(sessionDir, relNorm);
+    if (relNorm !== ".") {
+      fs23.mkdirSync(path24.dirname(wtPath), { recursive: true });
+    }
+    const baseRef = resolveBaseRefForRepo(relNorm, worktreeBaseBranches);
+    try {
+      await gitWorktreeAddBranch(repo.absolutePath, wtPath, branch, baseRef);
+      log2(`[worktrees] Added worktree ${wtPath} (branch ${branch}, base ${baseRef}).`);
+      worktreePaths.push(wtPath);
+    } catch (e) {
+      log2(
+        `[worktrees] Worktree add failed for ${repo.absolutePath}: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
+  if (worktreePaths.length === 0) return null;
+  return {
+    worktreePaths,
+    sessionParentPath: sessionDir,
+    workingTreeRelRoot: sessionDir
+  };
+}
+
+// src/worktrees/manager/prepare-and-remember-session-worktrees.ts
+async function prepareAndRememberSessionWorktrees(params) {
+  const prep = await prepareNewSessionWorktrees({
+    worktreesRootPath: params.worktreesRootPath,
+    bridgeRoot: getBridgeRoot(),
+    sessionId: params.sessionId,
+    layout: params.layout,
+    log: params.log,
+    ...params.worktreeBaseBranches && Object.keys(params.worktreeBaseBranches).length > 0 ? { worktreeBaseBranches: params.worktreeBaseBranches } : {}
+  });
+  if (!prep) return void 0;
+  params.cache.remember(params.sessionId, {
+    sessionParentPath: prep.sessionParentPath,
+    workingTreeRelRoot: prep.workingTreeRelRoot,
+    repoCheckoutPaths: prep.worktreePaths
+  });
+  return params.cache.getSessionParentPath(params.sessionId);
+}
+
+// src/worktrees/manager/resolve-existing-session-parent-path.ts
+function resolveExistingSessionParentPath(sessionId, cache2, discover) {
+  const cached2 = cache2.getSessionParentPath(sessionId);
+  if (cached2) return cached2;
+  const disc = discover();
+  if (disc) {
+    cache2.remember(sessionId, disc);
+    return cache2.getSessionParentPath(sessionId);
+  }
+  return void 0;
+}
+
+// src/worktrees/manager/resolve-explicit-session-parent-path.ts
+import * as path25 from "node:path";
+function resolveExplicitSessionParentPath(params) {
+  const resolved = path25.resolve(params.parentPathRaw);
+  if (parseSessionParent(params.sessionParent) !== "worktrees_root") {
+    return resolved;
+  }
+  const rememberAndReturn = (binding) => {
+    params.cache.remember(params.sessionId, binding);
+    return params.cache.getSessionParentPath(params.sessionId) ?? resolved;
+  };
+  const diskFirst = params.discover();
+  if (diskFirst) return rememberAndReturn(diskFirst);
+  const fromRoot = discoverSessionWorktreesUnderSessionWorktreeRoot(resolved, params.sessionId);
+  if (fromRoot) return rememberAndReturn(fromRoot);
+  let cur = resolved;
+  for (let i = 0; i < 16; i++) {
+    const tryRoot = discoverSessionWorktreesUnderSessionWorktreeRoot(cur, params.sessionId);
+    if (tryRoot) return rememberAndReturn(tryRoot);
+    const next = path25.dirname(cur);
+    if (next === cur) break;
+    cur = next;
+  }
+  return resolved;
+}
+
+// src/worktrees/manager/resolve-session-parent-path-for-prompt.ts
+async function resolveSessionParentPathForPrompt(params) {
+  const { sessionId, cache: cache2, worktreesRootPath, layout, log: log2, discover, opts } = params;
+  if (!sessionId) return void 0;
+  const sid = sessionId.trim();
+  const parentPathRaw = opts.sessionParentPath?.trim();
+  if (parentPathRaw) {
+    return resolveExplicitSessionParentPath({
+      sessionId: sid,
+      sessionParent: opts.sessionParent,
+      parentPathRaw,
+      cache: cache2,
+      discover: () => discover(sid)
+    });
+  }
+  const parentKind = parseSessionParent(opts.sessionParent);
+  if (parentKind === "bridge_root") {
+    return void 0;
+  }
+  if (parentKind === "worktrees_root") {
+    if (!opts.isNewSession) {
+      return resolveExistingSessionParentPath(sid, cache2, () => discover(sid));
+    }
+    return prepareAndRememberSessionWorktrees({
+      cache: cache2,
+      sessionId: sid,
+      worktreesRootPath,
+      layout,
+      log: log2,
+      ...opts.worktreeBaseBranches ? { worktreeBaseBranches: opts.worktreeBaseBranches } : {}
+    });
+  }
+  if (!opts.isNewSession) {
+    return resolveExistingSessionParentPath(sid, cache2, () => discover(sid));
+  }
+  return prepareAndRememberSessionWorktrees({
+    cache: cache2,
+    sessionId: sid,
+    worktreesRootPath,
+    layout,
+    log: log2
+  });
+}
+
+// src/worktrees/manager/session-worktree-cache.ts
+import * as path26 from "node:path";
+var SessionWorktreeCache = class {
   sessionRepoCheckoutPaths = /* @__PURE__ */ new Map();
   sessionParentPathBySession = /* @__PURE__ */ new Map();
   sessionWorkingTreeRelRootBySession = /* @__PURE__ */ new Map();
-  layout;
-  constructor(options) {
-    this.worktreesRootPath = options.worktreesRootPath;
-    this.log = options.log;
-    this.layout = loadWorktreeLayout();
-  }
-  rememberSessionWorktrees(sessionId, binding) {
-    const paths = binding.repoCheckoutPaths.map((p) => path25.resolve(p));
+  remember(sessionId, binding) {
+    const paths = binding.repoCheckoutPaths.map((p) => path26.resolve(p));
     this.sessionRepoCheckoutPaths.set(sessionId, paths);
-    this.sessionParentPathBySession.set(sessionId, path25.resolve(binding.sessionParentPath));
-    this.sessionWorkingTreeRelRootBySession.set(sessionId, path25.resolve(binding.workingTreeRelRoot));
+    this.sessionParentPathBySession.set(sessionId, path26.resolve(binding.sessionParentPath));
+    this.sessionWorkingTreeRelRootBySession.set(sessionId, path26.resolve(binding.workingTreeRelRoot));
+  }
+  clearSession(sessionId) {
+    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
+    this.sessionRepoCheckoutPaths.delete(sessionId);
+    this.sessionParentPathBySession.delete(sessionId);
+    this.sessionWorkingTreeRelRootBySession.delete(sessionId);
+    return paths;
   }
-  sessionParentPathAfterRemember(sessionId) {
+  getSessionParentPath(sessionId) {
     return this.sessionParentPathBySession.get(sessionId);
   }
-  tryDiscoverFromDisk(sessionId) {
-    return discoverSessionWorktreeOnDisk({
-      sessionId,
-      worktreesRootPath: this.worktreesRootPath,
-      layout: this.layout,
-      bridgeRoot: getBridgeRoot()
-    });
+  getWorkingTreeRelRoot(sessionId) {
+    return this.sessionWorkingTreeRelRootBySession.get(sessionId) ?? null;
+  }
+  hasSession(sessionId) {
+    return this.sessionParentPathBySession.has(sessionId);
+  }
+  getRepoCheckoutPaths(sessionId) {
+    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
+    return paths?.length ? [...paths] : void 0;
+  }
+  getRepoCheckoutPathsRef(sessionId) {
+    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
+    return paths?.length ? paths : void 0;
   }
   isLegacyNestedLayout(sessionId) {
     const parent = this.sessionParentPathBySession.get(sessionId);
     const relRoot = this.sessionWorkingTreeRelRootBySession.get(sessionId);
     if (!parent || !relRoot) return false;
-    return path25.resolve(parent) !== path25.resolve(relRoot);
+    return path26.resolve(parent) !== path26.resolve(relRoot);
+  }
+};
+
+// src/worktrees/manager/manager.ts
+var SessionWorktreeManager = class {
+  worktreesRootPath;
+  log;
+  cache = new SessionWorktreeCache();
+  layout;
+  constructor(options) {
+    this.worktreesRootPath = options.worktreesRootPath;
+    this.log = options.log;
+    this.layout = loadWorktreeLayout();
+  }
+  discover(sessionId) {
+    return discoverSessionBinding({
+      sessionId,
+      worktreesRootPath: this.worktreesRootPath,
+      layout: this.layout
+    });
   }
-  /**
-   * Session parent path for `worktrees_root`: the per-session directory (new layout) or primary checkout (legacy).
-   */
   getIsolatedSessionParentPathForSession(sessionId) {
-    if (!sessionId) return null;
-    const sid = sessionId.trim();
-    const cached2 = this.sessionParentPathBySession.get(sid);
-    if (cached2) return path25.resolve(cached2);
-    const paths = this.ensureRepoCheckoutPathsForSession(sid) ?? this.getRepoCheckoutPathsForSession(sid);
-    if (!paths?.length) return null;
-    return resolveIsolatedSessionParentPathFromCheckouts(paths);
-  }
-  /**
-   * Resolved **session parent path** for the agent: session directory in worktrees mode,
-   * or `undefined` meaning use {@link getBridgeRoot}.
-   */
-  async resolveSessionParentPathForPrompt(sessionId, opts) {
-    if (!sessionId) return void 0;
-    const sid = sessionId.trim();
-    const parentPathRaw = opts.sessionParentPath?.trim();
-    if (parentPathRaw) {
-      const resolved = path25.resolve(parentPathRaw);
-      if (sid && parseSessionParent(opts.sessionParent) === "worktrees_root") {
-        const diskFirst = this.tryDiscoverFromDisk(sid);
-        if (diskFirst) {
-          this.rememberSessionWorktrees(sid, diskFirst);
-          return this.sessionParentPathAfterRemember(sid);
-        }
-        const fromRoot = discoverSessionWorktreesUnderSessionWorktreeRoot(resolved, sid);
-        if (fromRoot) {
-          this.rememberSessionWorktrees(sid, fromRoot);
-          return this.sessionParentPathAfterRemember(sid);
-        }
-        let cur = resolved;
-        for (let i = 0; i < 16; i++) {
-          const tryRoot = discoverSessionWorktreesUnderSessionWorktreeRoot(cur, sid);
-          if (tryRoot) {
-            this.rememberSessionWorktrees(sid, tryRoot);
-            return this.sessionParentPathAfterRemember(sid);
-          }
-          const next = path25.dirname(cur);
-          if (next === cur) break;
-          cur = next;
-        }
-      }
-      return resolved;
-    }
-    const parentKind = parseSessionParent(opts.sessionParent);
-    if (parentKind === "bridge_root") {
-      return void 0;
-    }
-    if (parentKind === "worktrees_root") {
-      if (!opts.isNewSession) {
-        const cached2 = this.sessionParentPathAfterRemember(sid);
-        if (cached2) return cached2;
-        const disc = this.tryDiscoverFromDisk(sid);
-        if (disc) {
-          this.rememberSessionWorktrees(sid, disc);
-          return this.sessionParentPathAfterRemember(sid);
-        }
-        return void 0;
-      }
-      const prep2 = await prepareNewSessionWorktrees({
-        worktreesRootPath: this.worktreesRootPath,
-        bridgeRoot: getBridgeRoot(),
-        sessionId: sid,
-        layout: this.layout,
-        log: this.log
-      });
-      if (!prep2) return void 0;
-      this.rememberSessionWorktrees(sid, {
-        sessionParentPath: prep2.sessionParentPath,
-        workingTreeRelRoot: prep2.workingTreeRelRoot,
-        repoCheckoutPaths: prep2.worktreePaths
-      });
-      return this.sessionParentPathAfterRemember(sid);
-    }
-    if (!opts.isNewSession) {
-      const cached2 = this.sessionParentPathAfterRemember(sid);
-      if (cached2) return cached2;
-      const disc = this.tryDiscoverFromDisk(sid);
-      if (disc) {
-        this.rememberSessionWorktrees(sid, disc);
-        return this.sessionParentPathAfterRemember(sid);
-      }
-      return void 0;
-    }
-    const prep = await prepareNewSessionWorktrees({
+    return resolveIsolatedSessionParentPath(
+      sessionId,
+      this.cache,
+      (sid) => this.ensureRepoCheckoutPathsForSession(sid)
+    );
+  }
+  resolveSessionParentPathForPrompt(sessionId, opts) {
+    return resolveSessionParentPathForPrompt({
+      sessionId,
+      cache: this.cache,
       worktreesRootPath: this.worktreesRootPath,
-      bridgeRoot: getBridgeRoot(),
-      sessionId: sid,
       layout: this.layout,
-      log: this.log
-    });
-    if (!prep) return void 0;
-    this.rememberSessionWorktrees(sid, {
-      sessionParentPath: prep.sessionParentPath,
-      workingTreeRelRoot: prep.workingTreeRelRoot,
-      repoCheckoutPaths: prep.worktreePaths
+      log: this.log,
+      discover: (sid) => this.discover(sid),
+      opts
     });
-    return this.sessionParentPathAfterRemember(sid);
   }
   async renameSessionBranch(sessionId, newBranch) {
-    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
+    const paths = this.cache.getRepoCheckoutPathsRef(sessionId);
     if (!paths?.length) return;
     await renameSessionWorktreeBranches(paths, newBranch, this.log);
   }
-  /** True when this session uses an isolated worktree layout (not the bridge root). */
   usesWorktreeSession(sessionId) {
     if (!sessionId) return false;
-    return this.sessionParentPathBySession.has(sessionId);
+    return this.cache.hasSession(sessionId);
   }
-  /** Per-repo git checkout directories for this session (for snapshots, commits, change lists). */
   getRepoCheckoutPathsForSession(sessionId) {
     if (!sessionId) return void 0;
-    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
-    return paths?.length ? [...paths] : void 0;
+    return this.cache.getRepoCheckoutPaths(sessionId);
   }
-  /**
-   * Same paths as {@link getRepoCheckoutPathsForSession}, but loads from disk into memory when the CLI
-   * restarted or maps were not yet populated (avoids discovering every repo under the worktrees root).
-   */
   ensureRepoCheckoutPathsForSession(sessionId) {
-    if (!sessionId?.trim()) return void 0;
-    const sid = sessionId.trim();
-    const cached2 = this.sessionRepoCheckoutPaths.get(sid);
-    if (cached2?.length) return [...cached2];
-    const disc = this.tryDiscoverFromDisk(sid);
-    if (disc?.repoCheckoutPaths.length) {
-      this.rememberSessionWorktrees(sid, disc);
-      return [...disc.repoCheckoutPaths];
-    }
-    return void 0;
+    return ensureRepoCheckoutPathsForSession(sessionId, this.cache, (sid) => this.discover(sid));
   }
-  /** Session parent directory when in worktrees mode; null otherwise (same as {@link getIsolatedSessionParentPathForSession} path). */
   getSessionWorktreeRootForSession(sessionId) {
     return this.getIsolatedSessionParentPathForSession(sessionId);
   }
   async removeSessionWorktrees(sessionId) {
-    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
-    this.sessionRepoCheckoutPaths.delete(sessionId);
-    this.sessionParentPathBySession.delete(sessionId);
-    this.sessionWorkingTreeRelRootBySession.delete(sessionId);
+    const paths = this.cache.clearSession(sessionId);
     if (!paths?.length) return;
     await removeSessionWorktrees(paths, this.log);
   }
   async commitSession(params) {
-    const paths = this.sessionRepoCheckoutPaths.get(params.sessionId);
+    const paths = this.cache.getRepoCheckoutPathsRef(params.sessionId);
     const targets = paths?.length ? paths : [getBridgeRoot()];
     return commitSessionWorktrees({
       paths: targets,
@@ -33870,28 +34045,17 @@ var SessionWorktreeManager = class {
       push: params.push
     });
   }
-  resolveCommitTargets(sessionId) {
-    const paths = this.sessionRepoCheckoutPaths.get(sessionId);
-    if (paths?.length) return paths;
-    const disc = this.tryDiscoverFromDisk(sessionId);
-    if (disc?.repoCheckoutPaths.length) {
-      this.rememberSessionWorktrees(sessionId, disc);
-      return disc.repoCheckoutPaths;
-    }
-    return [getBridgeRoot()];
-  }
   async getSessionWorkingTreeStatus(sessionId) {
-    return aggregateSessionPathsWorkingTreeStatus(this.resolveCommitTargets(sessionId));
+    return aggregateSessionPathsWorkingTreeStatus(
+      resolveCommitTargets(sessionId, this.cache, (sid) => this.discover(sid))
+    );
   }
-  /** Per-repo changed files vs HEAD (or a single commit vs parent) for the same git roots used for commit/push. */
   async getSessionWorkingTreeChangeDetails(sessionId, opts) {
-    const targets = this.resolveCommitTargets(sessionId);
-    const sessionWorkingTreeRelRoot = this.sessionWorkingTreeRelRootBySession.get(sessionId) ?? null;
-    const legacyNested = this.isLegacyNestedLayout(sessionId);
+    const targets = resolveCommitTargets(sessionId, this.cache, (sid) => this.discover(sid));
     return getWorkingTreeChangeRepoDetails({
       commitTargetPaths: targets,
-      sessionWorktreeRootPath: sessionWorkingTreeRelRoot,
-      legacyRepoNestedSessionLayout: legacyNested,
+      sessionWorktreeRootPath: this.cache.getWorkingTreeRelRoot(sessionId),
+      legacyRepoNestedSessionLayout: this.cache.isLegacyNestedLayout(sessionId),
       repoFilterRelPath: opts?.repoRelPath?.trim() ? opts.repoRelPath.trim() : null,
       basis: opts?.basis,
       recentCommitsLimit: opts?.recentCommitsLimit
@@ -33899,7 +34063,9 @@ var SessionWorktreeManager = class {
   }
   async pushSessionUpstream(sessionId) {
     try {
-      await pushAheadOfUpstreamForPaths(this.resolveCommitTargets(sessionId));
+      await pushAheadOfUpstreamForPaths(
+        resolveCommitTargets(sessionId, this.cache, (sid) => this.discover(sid))
+      );
       return { ok: true };
     } catch (e) {
       const err = e instanceof Error ? e.message : String(e);
@@ -33907,27 +34073,31 @@ var SessionWorktreeManager = class {
     }
   }
 };
+
+// src/worktrees/manager/default-worktrees-root-path.ts
+import * as path27 from "node:path";
+import os8 from "node:os";
 function defaultWorktreesRootPath() {
-  return path25.join(os8.homedir(), ".buildautomaton", "worktrees");
+  return path27.join(os8.homedir(), ".buildautomaton", "worktrees");
 }
 
 // src/files/watch-file-index.ts
 import { watch } from "node:fs";
-import path30 from "node:path";
+import path32 from "node:path";
 
 // src/files/index/paths.ts
-import path26 from "node:path";
+import path28 from "node:path";
 import crypto2 from "node:crypto";
 function getCwdHashForFileIndex(resolvedCwd) {
-  return crypto2.createHash("sha256").update(path26.resolve(resolvedCwd)).digest("hex").slice(0, INDEX_HASH_LEN);
+  return crypto2.createHash("sha256").update(path28.resolve(resolvedCwd)).digest("hex").slice(0, INDEX_HASH_LEN);
 }
 
 // src/files/index/build-file-index.ts
-import path28 from "node:path";
+import path30 from "node:path";
 
 // src/files/index/walk-workspace-tree.ts
 import fs24 from "node:fs";
-import path27 from "node:path";
+import path29 from "node:path";
 var DEPENDENCY_INSTALL_DIR_NAMES = /* @__PURE__ */ new Set([
   "node_modules",
   "bower_components",
@@ -33956,18 +34126,18 @@ async function walkWorkspaceTreeAsync(dir, baseDir, onFile, state) {
       if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
     }
     state.n++;
-    const full = path27.join(dir, name);
+    const full = path29.join(dir, name);
     let stat2;
     try {
       stat2 = await fs24.promises.stat(full);
     } catch {
       continue;
     }
-    const relative5 = path27.relative(baseDir, full).replace(/\\/g, "/");
+    const relative6 = path29.relative(baseDir, full).replace(/\\/g, "/");
     if (stat2.isDirectory()) {
       await walkWorkspaceTreeAsync(full, baseDir, onFile, state);
     } else if (stat2.isFile()) {
-      onFile(relative5);
+      onFile(relative6);
     }
   }
 }
@@ -34065,7 +34235,7 @@ async function collectWorkspacePathsAsync(resolved) {
 }
 async function buildFileIndexAsync(cwd) {
   return withFileIndexSqliteLock(async () => {
-    const resolved = path28.resolve(cwd);
+    const resolved = path30.resolve(cwd);
     await yieldToEventLoop();
     assertNotShutdown();
     const paths = await collectWorkspacePathsAsync(resolved);
@@ -34077,7 +34247,7 @@ async function buildFileIndexAsync(cwd) {
 }
 
 // src/files/index/ensure-file-index.ts
-import path29 from "node:path";
+import path31 from "node:path";
 
 // src/files/index/search-file-index.ts
 function escapeLikePattern(fragment) {
@@ -34129,7 +34299,7 @@ async function searchBridgeFilePathsAsync(resolvedCwd, query, limit = 100) {
 
 // src/files/index/ensure-file-index.ts
 async function ensureFileIndexAsync(cwd) {
-  const resolved = path29.resolve(cwd);
+  const resolved = path31.resolve(cwd);
   if (await bridgeFileIndexIsPopulated(resolved)) {
     return { fromCache: true, pathCount: await bridgeFileIndexPathCount(resolved) };
   }
@@ -34173,7 +34343,7 @@ function createFsWatcher(resolved, schedule) {
   }
 }
 function startFileIndexWatcher(cwd = getBridgeRoot()) {
-  const resolved = path30.resolve(cwd);
+  const resolved = path32.resolve(cwd);
   void buildFileIndexAsync(resolved).catch((e) => {
     if (e instanceof CliSqliteInterrupted) return;
     console.error("[file-index] Initial index build failed:", e);
@@ -34203,7 +34373,7 @@ function startFileIndexWatcher(cwd = getBridgeRoot()) {
 }
 
 // src/connection/create-bridge-connection.ts
-import * as path40 from "node:path";
+import * as path43 from "node:path";
 
 // src/dev-servers/manager/dev-server-manager.ts
 import { rm as rm2 } from "node:fs/promises";
@@ -34225,15 +34395,15 @@ function sendDevServerStatus(getWs, serverId, status, options) {
 
 // src/dev-servers/process/terminate-child-process.ts
 async function sigtermAndWaitForExit(proc, graceMs, log2, shortId) {
-  const exited = new Promise((resolve18) => {
-    proc.once("exit", () => resolve18());
+  const exited = new Promise((resolve20) => {
+    proc.once("exit", () => resolve20());
   });
   log2(`[dev-server] Sending SIGTERM to ${shortId} (pid=${proc.pid ?? "?"}).`);
   try {
     proc.kill("SIGTERM");
   } catch {
   }
-  await Promise.race([exited, new Promise((resolve18) => setTimeout(resolve18, graceMs))]);
+  await Promise.race([exited, new Promise((resolve20) => setTimeout(resolve20, graceMs))]);
 }
 function forceKillChild(proc, log2, shortId, graceMs) {
   log2(
@@ -34513,10 +34683,10 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
 import { spawn as spawn8 } from "node:child_process";
 import fs28 from "node:fs";
 import { tmpdir } from "node:os";
-import path31 from "node:path";
+import path33 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal) {
-  const tmpRoot = fs28.mkdtempSync(path31.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path31.join(tmpRoot, "combined.log");
+  const tmpRoot = fs28.mkdtempSync(path33.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path33.join(tmpRoot, "combined.log");
   let logFd;
   try {
     logFd = fs28.openSync(logPath, "a");
@@ -34560,15 +34730,15 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
 import { spawn as spawn9 } from "node:child_process";
 import fs29 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path32 from "node:path";
+import path34 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal) {
-  const tmpRoot = fs29.mkdtempSync(path32.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path32.join(tmpRoot, "combined.log");
-  const innerPath = path32.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path32.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs29.mkdtempSync(path34.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path34.join(tmpRoot, "combined.log");
+  const innerPath = path34.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path34.join(tmpRoot, "_run.sh");
   try {
     fs29.writeFileSync(innerPath, `#!/bin/sh
 ${command}
@@ -34599,9 +34769,9 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal) {
-  const tmpRoot = fs29.mkdtempSync(path32.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path32.join(tmpRoot, "combined.log");
-  const runnerPath = path32.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs29.mkdtempSync(path34.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path34.join(tmpRoot, "combined.log");
+  const runnerPath = path34.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
@@ -35375,13 +35545,13 @@ function createOnBridgeIdentified(opts) {
 
 // src/skills/discover-local-agent-skills.ts
 import fs30 from "node:fs";
-import path33 from "node:path";
+import path35 from "node:path";
 var SKILL_DISCOVERY_ROOTS = [".agents/skills", ".claude/skills", ".cursor/skills", "skills"];
 function discoverLocalSkills(cwd) {
   const out = [];
   const seenKeys = /* @__PURE__ */ new Set();
   for (const rel of SKILL_DISCOVERY_ROOTS) {
-    const base = path33.join(cwd, rel);
+    const base = path35.join(cwd, rel);
     if (!fs30.existsSync(base) || !fs30.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
@@ -35390,13 +35560,13 @@ function discoverLocalSkills(cwd) {
       continue;
     }
     for (const name of entries) {
-      const dir = path33.join(base, name);
+      const dir = path35.join(base, name);
       try {
         if (!fs30.statSync(dir).isDirectory()) continue;
       } catch {
         continue;
       }
-      const skillMd = path33.join(dir, "SKILL.md");
+      const skillMd = path35.join(dir, "SKILL.md");
       if (!fs30.existsSync(skillMd)) continue;
       const key = `${rel}/${name}`;
       if (seenKeys.has(key)) continue;
@@ -35409,7 +35579,7 @@ function discoverLocalSkills(cwd) {
 function discoverSkillLayoutRoots(cwd) {
   const roots = [];
   for (const rel of SKILL_DISCOVERY_ROOTS) {
-    const base = path33.join(cwd, rel);
+    const base = path35.join(cwd, rel);
     if (!fs30.existsSync(base) || !fs30.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
@@ -35419,13 +35589,13 @@ function discoverSkillLayoutRoots(cwd) {
     }
     const skills2 = [];
     for (const name of entries) {
-      const dir = path33.join(base, name);
+      const dir = path35.join(base, name);
       try {
         if (!fs30.statSync(dir).isDirectory()) continue;
       } catch {
         continue;
       }
-      if (!fs30.existsSync(path33.join(dir, "SKILL.md"))) continue;
+      if (!fs30.existsSync(path35.join(dir, "SKILL.md"))) continue;
       const relPath = `${rel}/${name}`.replace(/\\/g, "/");
       skills2.push({ name, relPath });
     }
@@ -35548,7 +35718,9 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "file_browser_search",
   "skill_layout_request",
   "install_skills",
-  "refresh_local_skills"
+  "refresh_local_skills",
+  "bridge_git_context_request",
+  "list_repo_branches_request"
 ];
 var API_TO_BRIDGE_TYPE_SET = new Set(API_TO_BRIDGE_MESSAGE_TYPES);
 function parseApiToBridgeMessage(data, log2) {
@@ -35632,9 +35804,6 @@ var handleAgentConfigMessage = (msg, deps) => {
   handleBridgeAgentConfig(msg, deps);
 };
 
-// src/prompt-turn-queue/runner.ts
-import fs31 from "node:fs";
-
 // src/prompt-turn-queue/client-report.ts
 function sendPromptQueueClientReport(ws, queues) {
   if (!ws) return false;
@@ -35704,8 +35873,36 @@ async function mergeServerQueueSnapshot(queueKey, serverTurns) {
   return { queueKey, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), turns };
 }
 
-// src/prompt-turn-queue/runner.ts
-var runIdToQueueKey = /* @__PURE__ */ new Map();
+// src/prompt-turn-queue/runner/dispatch-local-prompt.ts
+function dispatchLocalPrompt(next, deps) {
+  const pl = next.payload;
+  const rawParent = pl["sessionParent"];
+  const sessionParent = rawParent === "bridge_root" || rawParent === "worktrees_root" ? rawParent : void 0;
+  const rawParentPath = pl["sessionParentPath"];
+  const sessionParentPath = typeof rawParentPath === "string" && rawParentPath.trim() !== "" ? rawParentPath.trim() : void 0;
+  const rawBaseBranches = pl["worktreeBaseBranches"];
+  const worktreeBaseBranches = rawBaseBranches != null && typeof rawBaseBranches === "object" && !Array.isArray(rawBaseBranches) ? rawBaseBranches : void 0;
+  const msg = {
+    type: "prompt",
+    sessionId: next.sessionId,
+    runId: next.turnId,
+    prompt: pl.prompt,
+    mode: typeof pl.mode === "string" ? pl.mode : "agent",
+    isNewSession: pl.isNewSession === true,
+    ...sessionParent ? { sessionParent } : {},
+    ...sessionParentPath ? { sessionParentPath } : {},
+    ...worktreeBaseBranches && Object.keys(worktreeBaseBranches).length > 0 ? { worktreeBaseBranches } : {},
+    ...typeof pl.followUpCatalogPromptId === "string" ? { followUpCatalogPromptId: pl.followUpCatalogPromptId } : {},
+    ...Array.isArray(pl.sessionChangeSummaryFilePaths) ? { sessionChangeSummaryFilePaths: pl.sessionChangeSummaryFilePaths } : {},
+    ...Array.isArray(pl.sessionChangeSummaryFileSnapshots) ? { sessionChangeSummaryFileSnapshots: pl.sessionChangeSummaryFileSnapshots } : {},
+    ...typeof pl.agentType === "string" && pl.agentType.trim() ? { agentType: pl.agentType.trim() } : {},
+    ...pl.agentConfig != null && typeof pl.agentConfig === "object" && !Array.isArray(pl.agentConfig) && Object.keys(pl.agentConfig).length > 0 ? { agentConfig: pl.agentConfig } : {},
+    ...Array.isArray(pl.attachments) && pl.attachments.length > 0 ? { attachments: pl.attachments } : {}
+  };
+  handleBridgePrompt(msg, deps);
+}
+
+// src/prompt-turn-queue/runner/queue-selection.ts
 function isRunnableServerState(s) {
   return s === "queued" || s === "requeued" || s === "requeued_with_revert";
 }
@@ -35724,6 +35921,28 @@ function pickNextRunnableTurn(turns) {
 function hasRunningTurn(turns) {
   return turns.some((t) => t.lastClientState === "running");
 }
+
+// src/prompt-turn-queue/runner/run-id-queue-key-map.ts
+var runIdToQueueKey = /* @__PURE__ */ new Map();
+function getRunIdQueueKey(runId) {
+  return runIdToQueueKey.get(runId);
+}
+function setRunIdQueueKey(runId, queueKey) {
+  runIdToQueueKey.set(runId, queueKey);
+}
+function deleteRunIdQueueKey(runId) {
+  const queueKey = runIdToQueueKey.get(runId);
+  runIdToQueueKey.delete(runId);
+  return queueKey;
+}
+function syncRunningTurnQueueKeys(turns, queueKey) {
+  for (const running of turns.filter((t) => t.lastClientState === "running")) {
+    runIdToQueueKey.set(running.turnId, queueKey);
+  }
+}
+
+// src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
+import fs31 from "node:fs";
 async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   if (next.serverState !== "requeued_with_revert") return true;
   const sid = next.sessionId;
@@ -35745,30 +35964,23 @@ async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   }
   return res.ok;
 }
-function dispatchLocalPrompt(next, deps) {
-  const pl = next.payload;
-  const rawParent = pl["sessionParent"];
-  const sessionParent = rawParent === "bridge_root" || rawParent === "worktrees_root" ? rawParent : void 0;
-  const rawParentPath = pl["sessionParentPath"];
-  const sessionParentPath = typeof rawParentPath === "string" && rawParentPath.trim() !== "" ? rawParentPath.trim() : void 0;
-  const msg = {
-    type: "prompt",
-    sessionId: next.sessionId,
-    runId: next.turnId,
-    prompt: pl.prompt,
-    mode: typeof pl.mode === "string" ? pl.mode : "agent",
-    isNewSession: pl.isNewSession === true,
-    ...sessionParent ? { sessionParent } : {},
-    ...sessionParentPath ? { sessionParentPath } : {},
-    ...typeof pl.followUpCatalogPromptId === "string" ? { followUpCatalogPromptId: pl.followUpCatalogPromptId } : {},
-    ...Array.isArray(pl.sessionChangeSummaryFilePaths) ? { sessionChangeSummaryFilePaths: pl.sessionChangeSummaryFilePaths } : {},
-    ...Array.isArray(pl.sessionChangeSummaryFileSnapshots) ? { sessionChangeSummaryFileSnapshots: pl.sessionChangeSummaryFileSnapshots } : {},
-    ...typeof pl.agentType === "string" && pl.agentType.trim() ? { agentType: pl.agentType.trim() } : {},
-    ...pl.agentConfig != null && typeof pl.agentConfig === "object" && !Array.isArray(pl.agentConfig) && Object.keys(pl.agentConfig).length > 0 ? { agentConfig: pl.agentConfig } : {},
-    ...Array.isArray(pl.attachments) && pl.attachments.length > 0 ? { attachments: pl.attachments } : {}
-  };
-  handleBridgePrompt(msg, deps);
+
+// src/prompt-turn-queue/runner/finalize-prompt-turn-on-bridge.ts
+async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
+  if (!runId) return false;
+  const queueKey = deleteRunIdQueueKey(runId);
+  if (!queueKey) return false;
+  const f = await readPersistedQueue(queueKey);
+  if (!f) return false;
+  const t = f.turns.find((x) => x.turnId === runId);
+  if (!t) return false;
+  t.lastClientState = opts?.terminalClientState ?? (success2 ? "stopped" : "failed");
+  await writePersistedQueue(f);
+  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, clientState: t.lastClientState }] });
+  return true;
 }
+
+// src/prompt-turn-queue/runner/apply-prompt-queue-state-from-server.ts
 async function applyPromptQueueStateFromServer(msg, deps) {
   const raw = msg.queues;
   if (!raw || typeof raw !== "object") return;
@@ -35782,9 +35994,7 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     if (!Array.isArray(serverTurns)) continue;
     const file2 = await readPersistedQueue(queueKey);
     if (!file2) continue;
-    for (const running of file2.turns.filter((t) => t.lastClientState === "running")) {
-      runIdToQueueKey.set(running.turnId, queueKey);
-    }
+    syncRunningTurnQueueKeys(file2.turns, queueKey);
   }
   for (const [queueKey, serverTurns] of Object.entries(raw)) {
     if (!Array.isArray(serverTurns)) continue;
@@ -35829,7 +36039,7 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     }
     next.lastClientState = "running";
     await writePersistedQueue(file2);
-    runIdToQueueKey.set(next.turnId, queueKey);
+    setRunIdQueueKey(next.turnId, queueKey);
     startedThisTick.add(next.turnId);
     report[queueKey] = [{ turnId: next.turnId, clientState: "running" }];
   }
@@ -35842,24 +36052,10 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     if (!file2) continue;
     const running = file2.turns.find((t) => t.lastClientState === "running");
     if (!running || !startedThisTick.has(running.turnId)) continue;
-    if (runIdToQueueKey.get(running.turnId) !== queueKey) continue;
+    if (getRunIdQueueKey(running.turnId) !== queueKey) continue;
     dispatchLocalPrompt(running, deps);
   }
 }
-async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
-  if (!runId) return false;
-  const queueKey = runIdToQueueKey.get(runId);
-  runIdToQueueKey.delete(runId);
-  if (!queueKey) return false;
-  const f = await readPersistedQueue(queueKey);
-  if (!f) return false;
-  const t = f.turns.find((x) => x.turnId === runId);
-  if (!t) return false;
-  t.lastClientState = opts?.terminalClientState ?? (success2 ? "stopped" : "failed");
-  await writePersistedQueue(f);
-  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, clientState: t.lastClientState }] });
-  return true;
-}
 
 // src/agents/acp/from-bridge/bridge-prompt-wiring.ts
 function createBridgePromptSenders(deps, getWs) {
@@ -35906,6 +36102,91 @@ function createBridgePromptSenders(deps, getWs) {
   return { sendBridgeMessage, sendResult: sendResult2, sendSessionUpdate };
 }
 
+// src/agents/acp/from-bridge/handle-bridge-prompt/parse-bridge-attachments.ts
+function parseBridgeAttachments(msg) {
+  const raw = msg.attachments;
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const x of raw) {
+    if (x === null || typeof x !== "object" || Array.isArray(x)) continue;
+    const o = x;
+    const id = typeof o.attachmentId === "string" ? o.attachmentId.trim() : "";
+    if (!id) continue;
+    const mt = typeof o.mimeType === "string" && o.mimeType.trim() ? o.mimeType.trim() : "application/octet-stream";
+    out.push({ attachmentId: id, mimeType: mt });
+  }
+  return out;
+}
+
+// src/agents/acp/from-bridge/handle-bridge-prompt/parse-worktree-base-branches.ts
+function parseWorktreeBaseBranches(msg) {
+  const raw = msg.worktreeBaseBranches;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const out = {};
+  for (const [k, v] of Object.entries(raw)) {
+    if (typeof k !== "string" || typeof v !== "string") continue;
+    const rel = k.trim();
+    const branch = v.trim();
+    if (rel && branch) out[rel] = branch;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+
+// src/agents/acp/change-summary/decrypt-change-summary-file-input.ts
+function decryptChangeSummaryFileInput(row, e2ee) {
+  if (!e2ee) return row;
+  for (const field of ["path", "patchContent", "oldText", "newText"]) {
+    const raw = row[field];
+    if (typeof raw !== "string" || raw.trim() === "") continue;
+    let o;
+    try {
+      o = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    if (!isE2eeEnvelope(o.ee)) continue;
+    try {
+      const d = e2ee.decryptMessage(o);
+      const out = {
+        path: typeof d.path === "string" ? d.path : row.path
+      };
+      if (d.directoryRemoved === true) out.directoryRemoved = true;
+      else if (row.directoryRemoved === true) out.directoryRemoved = true;
+      if (typeof d.patchContent === "string") out.patchContent = d.patchContent;
+      else if (typeof row.patchContent === "string" && row.patchContent !== raw) out.patchContent = row.patchContent;
+      if (typeof d.oldText === "string") out.oldText = d.oldText;
+      else if (typeof row.oldText === "string") out.oldText = row.oldText;
+      if (typeof d.newText === "string") out.newText = d.newText;
+      else if (typeof row.newText === "string") out.newText = row.newText;
+      return out;
+    } catch {
+      return row;
+    }
+  }
+  return row;
+}
+
+// src/agents/acp/change-summary/resolve-change-summary-prompt-for-agent.ts
+function hasSummarizePayload(f) {
+  return f.directoryRemoved === true || f.patchContent != null && f.patchContent.trim() !== "" || f.oldText != null && f.oldText.trim() !== "" || f.newText != null && f.newText.trim() !== "";
+}
+function resolveChangeSummaryPromptForAgent(params) {
+  const isBuiltin = params.followUpCatalogPromptId === BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID;
+  const snaps = params.sessionChangeSummaryFileSnapshots;
+  if (!isBuiltin || !snaps || snaps.length === 0) {
+    return { promptText: params.bridgePromptText, sessionChangeSummaryFilePaths: void 0 };
+  }
+  const decrypted = dedupeSessionFileChangesByPath(snaps.map((row) => decryptChangeSummaryFileInput(row, params.e2ee)));
+  const withPayload = decrypted.filter(hasSummarizePayload);
+  if (withPayload.length === 0) {
+    return { promptText: params.bridgePromptText, sessionChangeSummaryFilePaths: void 0 };
+  }
+  return {
+    promptText: buildSessionChangeSummaryPrompt(withPayload),
+    sessionChangeSummaryFilePaths: withPayload.map((f) => f.path)
+  };
+}
+
 // src/agents/acp/from-bridge/bridge-prompt-preamble.ts
 import { execFile as execFile8 } from "node:child_process";
 import { promisify as promisify8 } from "node:util";
@@ -35958,9 +36239,9 @@ function parseChangeSummarySnapshots(raw) {
   for (const item of raw) {
     if (!item || typeof item !== "object") continue;
     const o = item;
-    const path41 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
-    if (!path41) continue;
-    const row = { path: path41 };
+    const path44 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
+    if (!path44) continue;
+    const row = { path: path44 };
     if (typeof o.patchContent === "string") row.patchContent = o.patchContent;
     if (typeof o.oldText === "string") row.oldText = o.oldText;
     if (typeof o.newText === "string") row.newText = o.newText;
@@ -35977,76 +36258,73 @@ function parseFollowUpFieldsFromPromptMessage(msg) {
   return { followUpCatalogPromptId, sessionChangeSummaryFilePaths, sessionChangeSummaryFileSnapshots };
 }
 
-// src/agents/acp/change-summary/decrypt-change-summary-file-input.ts
-function decryptChangeSummaryFileInput(row, e2ee) {
-  if (!e2ee) return row;
-  for (const field of ["path", "patchContent", "oldText", "newText"]) {
-    const raw = row[field];
-    if (typeof raw !== "string" || raw.trim() === "") continue;
-    let o;
-    try {
-      o = JSON.parse(raw);
-    } catch {
-      continue;
-    }
-    if (!isE2eeEnvelope(o.ee)) continue;
-    try {
-      const d = e2ee.decryptMessage(o);
-      const out = {
-        path: typeof d.path === "string" ? d.path : row.path
-      };
-      if (d.directoryRemoved === true) out.directoryRemoved = true;
-      else if (row.directoryRemoved === true) out.directoryRemoved = true;
-      if (typeof d.patchContent === "string") out.patchContent = d.patchContent;
-      else if (typeof row.patchContent === "string" && row.patchContent !== raw) out.patchContent = row.patchContent;
-      if (typeof d.oldText === "string") out.oldText = d.oldText;
-      else if (typeof row.oldText === "string") out.oldText = row.oldText;
-      if (typeof d.newText === "string") out.newText = d.newText;
-      else if (typeof row.newText === "string") out.newText = row.newText;
-      return out;
-    } catch {
-      return row;
-    }
-  }
-  return row;
-}
-
-// src/agents/acp/change-summary/resolve-change-summary-prompt-for-agent.ts
-function hasSummarizePayload(f) {
-  return f.directoryRemoved === true || f.patchContent != null && f.patchContent.trim() !== "" || f.oldText != null && f.oldText.trim() !== "" || f.newText != null && f.newText.trim() !== "";
-}
-function resolveChangeSummaryPromptForAgent(params) {
-  const isBuiltin = params.followUpCatalogPromptId === BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID;
-  const snaps = params.sessionChangeSummaryFileSnapshots;
-  if (!isBuiltin || !snaps || snaps.length === 0) {
-    return { promptText: params.bridgePromptText, sessionChangeSummaryFilePaths: void 0 };
-  }
-  const decrypted = dedupeSessionFileChangesByPath(snaps.map((row) => decryptChangeSummaryFileInput(row, params.e2ee)));
-  const withPayload = decrypted.filter(hasSummarizePayload);
-  if (withPayload.length === 0) {
-    return { promptText: params.bridgePromptText, sessionChangeSummaryFilePaths: void 0 };
+// src/agents/acp/from-bridge/handle-bridge-prompt/run-preamble-and-prompt.ts
+async function runPreambleAndPrompt(params) {
+  const {
+    deps,
+    msg,
+    getWs,
+    log: log2,
+    sessionWorktreeManager,
+    sessionId,
+    runId,
+    promptText,
+    attachments,
+    mode,
+    agentType,
+    agentId,
+    agentConfig,
+    resolvedCwd,
+    senders: { sendResult: sendResult2, sendSessionUpdate }
+  } = params;
+  const effectiveCwd = resolveSessionParentPathForAgentProcess(resolvedCwd);
+  await runBridgePromptPreamble({
+    getWs,
+    log: log2,
+    sessionWorktreeManager,
+    sessionId,
+    runId,
+    effectiveCwd
+  });
+  const {
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths: pathsFromBridge,
+    sessionChangeSummaryFileSnapshots
+  } = parseFollowUpFieldsFromPromptMessage(msg);
+  const { promptText: resolvedPromptText, sessionChangeSummaryFilePaths } = resolveChangeSummaryPromptForAgent({
+    followUpCatalogPromptId,
+    sessionChangeSummaryFileSnapshots,
+    bridgePromptText: promptText,
+    e2ee: deps.e2ee
+  });
+  if (sessionChangeSummaryFileSnapshots && sessionChangeSummaryFileSnapshots.length > 0 && resolvedPromptText === promptText) {
+    deps.log(
+      "[Agent] Change-summary snapshots were present but the prompt was not rebuilt (decrypt failed or empty payloads); sending the bridge prompt as-is."
+    );
   }
-  return {
-    promptText: buildSessionChangeSummaryPrompt(withPayload),
-    sessionChangeSummaryFilePaths: withPayload.map((f) => f.path)
-  };
+  const pathsForUpload = sessionChangeSummaryFilePaths ?? pathsFromBridge;
+  deps.acpManager.handlePrompt({
+    promptText: resolvedPromptText,
+    promptId: msg.id,
+    sessionId,
+    runId,
+    mode,
+    agentType,
+    agentId,
+    agentConfig,
+    sessionParentPath: effectiveCwd,
+    sendResult: sendResult2,
+    sendSessionUpdate,
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths: pathsForUpload,
+    cloudApiBaseUrl: deps.cloudApiBaseUrl,
+    getCloudAccessToken: deps.getCloudAccessToken,
+    e2ee: deps.e2ee,
+    ...attachments.length > 0 ? { attachments } : {}
+  });
 }
 
-// src/agents/acp/from-bridge/handle-bridge-prompt.ts
-function parseBridgeAttachments(msg) {
-  const raw = msg.attachments;
-  if (!Array.isArray(raw)) return [];
-  const out = [];
-  for (const x of raw) {
-    if (x === null || typeof x !== "object" || Array.isArray(x)) continue;
-    const o = x;
-    const id = typeof o.attachmentId === "string" ? o.attachmentId.trim() : "";
-    if (!id) continue;
-    const mt = typeof o.mimeType === "string" && o.mimeType.trim() ? o.mimeType.trim() : "application/octet-stream";
-    out.push({ attachmentId: id, mimeType: mt });
-  }
-  return out;
-}
+// src/agents/acp/from-bridge/handle-bridge-prompt/handle-bridge-prompt.ts
 function handleBridgePrompt(msg, deps) {
   const { getWs, log: log2, acpManager, sessionWorktreeManager } = deps;
   const rawPrompt = msg.prompt;
@@ -36055,12 +36333,12 @@ function handleBridgePrompt(msg, deps) {
   const sessionId = msg.sessionId;
   const runId = typeof msg.runId === "string" ? msg.runId : void 0;
   const promptId = typeof msg.id === "string" ? msg.id : void 0;
-  const { sendBridgeMessage, sendResult: sendResult2, sendSessionUpdate } = createBridgePromptSenders(deps, getWs);
+  const senders = createBridgePromptSenders(deps, getWs);
   if (!promptText.trim() && attachments.length === 0) {
     log2(
       `[Bridge service] Prompt ignored: empty or missing prompt text (session ${typeof msg.sessionId === "string" ? msg.sessionId.slice(0, 8) : "\u2014"}\u2026, run ${typeof msg.runId === "string" ? msg.runId.slice(0, 8) : "\u2014"}\u2026).`
     );
-    sendBridgeMessage(
+    senders.sendBridgeMessage(
       {
         type: "prompt_result",
         ...promptId ? { id: promptId } : {},
@@ -36082,57 +36360,50 @@ function handleBridgePrompt(msg, deps) {
   const agentId = typeof rawAgentId === "string" && rawAgentId.trim() !== "" ? rawAgentId.trim() : null;
   const mode = typeof msg.mode === "string" && msg.mode.trim() ? msg.mode.trim() : void 0;
   const agentConfig = msg.agentConfig != null && typeof msg.agentConfig === "object" && !Array.isArray(msg.agentConfig) ? msg.agentConfig : void 0;
+  const worktreeBaseBranches = parseWorktreeBaseBranches(msg);
   acpManager.logPromptReceivedFromBridge({ agentType, mode });
-  async function preambleAndPrompt(resolvedCwd) {
-    const effectiveCwd = resolveSessionParentPathForAgentProcess(resolvedCwd);
-    await runBridgePromptPreamble({
+  void sessionWorktreeManager.resolveSessionParentPathForPrompt(sessionId, {
+    isNewSession,
+    sessionParent,
+    sessionParentPath,
+    ...worktreeBaseBranches ? { worktreeBaseBranches } : {}
+  }).then(
+    (cwd) => runPreambleAndPrompt({
+      deps,
+      msg,
       getWs,
       log: log2,
       sessionWorktreeManager,
       sessionId,
       runId,
-      effectiveCwd
-    });
-    const {
-      followUpCatalogPromptId,
-      sessionChangeSummaryFilePaths: pathsFromBridge,
-      sessionChangeSummaryFileSnapshots
-    } = parseFollowUpFieldsFromPromptMessage(msg);
-    const { promptText: resolvedPromptText, sessionChangeSummaryFilePaths } = resolveChangeSummaryPromptForAgent({
-      followUpCatalogPromptId,
-      sessionChangeSummaryFileSnapshots,
-      bridgePromptText: promptText,
-      e2ee: deps.e2ee
-    });
-    if (sessionChangeSummaryFileSnapshots && sessionChangeSummaryFileSnapshots.length > 0 && resolvedPromptText === promptText) {
-      deps.log(
-        "[Agent] Change-summary snapshots were present but the prompt was not rebuilt (decrypt failed or empty payloads); sending the bridge prompt as-is."
-      );
-    }
-    const pathsForUpload = sessionChangeSummaryFilePaths ?? pathsFromBridge;
-    acpManager.handlePrompt({
-      promptText: resolvedPromptText,
-      promptId: msg.id,
+      promptText,
+      attachments,
+      mode,
+      agentType,
+      agentId,
+      agentConfig,
+      resolvedCwd: cwd,
+      senders
+    })
+  ).catch((err) => {
+    log2(`[Agent] Session parent path resolve failed: ${err instanceof Error ? err.message : String(err)}`);
+    void runPreambleAndPrompt({
+      deps,
+      msg,
+      getWs,
+      log: log2,
+      sessionWorktreeManager,
       sessionId,
       runId,
+      promptText,
+      attachments,
       mode,
       agentType,
       agentId,
       agentConfig,
-      sessionParentPath: effectiveCwd,
-      sendResult: sendResult2,
-      sendSessionUpdate,
-      followUpCatalogPromptId,
-      sessionChangeSummaryFilePaths: pathsForUpload,
-      cloudApiBaseUrl: deps.cloudApiBaseUrl,
-      getCloudAccessToken: deps.getCloudAccessToken,
-      e2ee: deps.e2ee,
-      ...attachments.length > 0 ? { attachments } : {}
+      resolvedCwd: void 0,
+      senders
     });
-  }
-  void sessionWorktreeManager.resolveSessionParentPathForPrompt(sessionId, { isNewSession, sessionParent, sessionParentPath }).then((cwd) => preambleAndPrompt(cwd)).catch((err) => {
-    log2(`[Agent] Session parent path resolve failed: ${err instanceof Error ? err.message : String(err)}`);
-    void preambleAndPrompt(void 0);
   });
 }
 
@@ -36187,11 +36458,11 @@ var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
 import fs33 from "node:fs";
 
 // src/files/ensure-under-cwd.ts
-import path34 from "node:path";
+import path36 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path34.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path34.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path34.sep) && resolved !== cwd) {
+  const normalized = path36.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path36.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path36.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -36201,11 +36472,11 @@ function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
 var LIST_DIR_YIELD_EVERY = 256;
 
 // src/files/list-dir/map-dir-entry.ts
-import path35 from "node:path";
+import path37 from "node:path";
 import fs32 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path35.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path35.join(resolved, d.name);
+  const entryPath = path37.join(relativePath || ".", d.name).replace(/\\/g, "/");
+  const fullPath = path37.join(resolved, d.name);
   let isDir = d.isDirectory();
   if (d.isSymbolicLink()) {
     try {
@@ -36556,13 +36827,13 @@ function resolveFileBrowserSessionParent(sessionWorktreeManager, sessionId) {
 }
 
 // src/files/handle-file-browser-search.ts
-import path36 from "node:path";
+import path38 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 = path36.resolve(
+    const sessionParentPath = path38.resolve(
       sessionWorktreeManager != null ? resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -36682,7 +36953,7 @@ function handleSkillLayoutRequest(msg, deps) {
 
 // src/skills/install-remote-skills.ts
 import fs37 from "node:fs";
-import path37 from "node:path";
+import path39 from "node:path";
 function installRemoteSkills(cwd, targetDir, items) {
   const installed2 = [];
   if (!Array.isArray(items)) {
@@ -36693,11 +36964,11 @@ function installRemoteSkills(cwd, targetDir, items) {
       if (typeof item.sourceId !== "string" || typeof item.skillName !== "string" || typeof item.versionHash !== "string" || !Array.isArray(item.files)) {
         continue;
       }
-      const skillDir = path37.join(cwd, targetDir, item.skillName);
+      const skillDir = path39.join(cwd, targetDir, item.skillName);
       for (const f of item.files) {
         if (typeof f.path !== "string" || !f.text && !f.base64) continue;
-        const dest = path37.join(skillDir, f.path);
-        fs37.mkdirSync(path37.dirname(dest), { recursive: true });
+        const dest = path39.join(skillDir, f.path);
+        fs37.mkdirSync(path39.dirname(dest), { recursive: true });
         if (f.text !== void 0) {
           fs37.writeFileSync(dest, f.text, "utf8");
         } else if (f.base64) {
@@ -36913,6 +37184,148 @@ var handleDevServersConfig = (msg, deps) => {
   deps.devServerManager?.applyConfig(devServers ?? []);
 };
 
+// src/git/bridge-git-context.ts
+import * as path40 from "node:path";
+
+// src/git/branches/get-current-branch.ts
+async function getCurrentBranch(repoPath) {
+  try {
+    const git = cliSimpleGit(repoPath);
+    const branch = await git.revparse(["--abbrev-ref", "HEAD"]);
+    const trimmed2 = typeof branch === "string" ? branch.trim() : "";
+    if (!trimmed2 || trimmed2 === "HEAD") return null;
+    return trimmed2;
+  } catch {
+    return null;
+  }
+}
+
+// src/git/branches/list-repo-branch-refs.ts
+function normalizeBranchRef(raw) {
+  const trimmed2 = raw.trim();
+  if (!trimmed2 || trimmed2 === "HEAD") return null;
+  if (trimmed2.startsWith("refs/heads/")) return trimmed2.slice("refs/heads/".length);
+  if (trimmed2.startsWith("refs/remotes/")) return trimmed2.slice("refs/remotes/".length);
+  return trimmed2;
+}
+async function listRepoBranchRefs(repoPath) {
+  try {
+    const git = cliSimpleGit(repoPath);
+    const out = await git.raw([
+      "for-each-ref",
+      "--sort=-committerdate",
+      "--format=%(refname:short)",
+      "refs/heads",
+      "refs/remotes"
+    ]);
+    const lines = out.split("\n").map((line) => normalizeBranchRef(line)).filter((line) => Boolean(line));
+    const seen = /* @__PURE__ */ new Set();
+    const ordered = [];
+    for (const name of lines) {
+      if (seen.has(name)) continue;
+      seen.add(name);
+      ordered.push(name);
+    }
+    return ordered;
+  } catch {
+    return [];
+  }
+}
+
+// src/git/bridge-git-context.ts
+function folderNameForRelPath(relPath, bridgeRoot) {
+  if (relPath === "." || relPath === "") {
+    return path40.basename(path40.resolve(bridgeRoot)) || "repo";
+  }
+  return path40.basename(relPath) || relPath;
+}
+async function discoverGitReposForBridgeContext(bridgeRoot) {
+  const root = path40.resolve(bridgeRoot);
+  if (await isGitRepoDirectory(root)) {
+    const remoteUrl = await getRemoteOriginUrl(root);
+    return [{ absolutePath: root, remoteUrl }];
+  }
+  const [deep, shallow] = await Promise.all([discoverGitReposUnderRoot(root), discoverGitRepos(root)]);
+  const byPath = /* @__PURE__ */ new Map();
+  for (const repo of [...deep, ...shallow]) {
+    byPath.set(path40.resolve(repo.absolutePath), repo);
+  }
+  return [...byPath.values()];
+}
+async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
+  const bridgeResolved = path40.resolve(bridgeRoot);
+  const repos = await discoverGitReposForBridgeContext(bridgeResolved);
+  const rows = [];
+  for (const repo of repos) {
+    let rel = path40.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path40.isAbsolute(rel)) continue;
+    const relPath = rel === "" ? "." : rel.replace(/\\/g, "/");
+    const currentBranch = await getCurrentBranch(repo.absolutePath);
+    const remoteUrl = repo.remoteUrl.trim() || null;
+    rows.push({
+      relPath,
+      folderName: folderNameForRelPath(relPath, bridgeResolved),
+      currentBranch,
+      remoteUrl
+    });
+  }
+  rows.sort((a, b) => a.relPath.localeCompare(b.relPath));
+  return rows;
+}
+async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
+  const bridgeResolved = path40.resolve(bridgeRoot);
+  const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
+  const repoPath = rel === "" ? bridgeResolved : path40.join(bridgeResolved, rel);
+  const resolved = path40.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path40.sep) && resolved !== bridgeResolved) {
+    return [];
+  }
+  return listRepoBranchRefs(resolved);
+}
+
+// src/routing/handlers/bridge-git-context-messages.ts
+function handleBridgeGitContextRequestMessage(msg, getWs) {
+  void (async () => {
+    const socket = getWs();
+    if (!socket) return;
+    try {
+      const repos = await getBridgeGitContext();
+      sendWsMessage(socket, { type: "bridge_git_context_response", id: msg.id, repos });
+    } catch (e) {
+      sendWsMessage(socket, {
+        type: "bridge_git_context_response",
+        id: msg.id,
+        error: e instanceof Error ? e.message : String(e)
+      });
+    }
+  })();
+}
+function handleListRepoBranchesRequestMessage(msg, getWs) {
+  void (async () => {
+    const socket = getWs();
+    if (!socket) return;
+    const repoRelPath = typeof msg.repoRelPath === "string" ? msg.repoRelPath.trim() : "";
+    if (!repoRelPath) {
+      sendWsMessage(socket, {
+        type: "list_repo_branches_response",
+        id: msg.id,
+        error: "repoRelPath required"
+      });
+      return;
+    }
+    try {
+      const branches = await listRepoBranchesForBridge(repoRelPath);
+      sendWsMessage(socket, { type: "list_repo_branches_response", id: msg.id, branches });
+    } catch (e) {
+      sendWsMessage(socket, {
+        type: "list_repo_branches_response",
+        id: msg.id,
+        error: e instanceof Error ? e.message : String(e)
+      });
+    }
+  })();
+}
+
 // src/routing/dispatch-bridge-message.ts
 function dispatchBridgeMessage(msg, deps) {
   switch (msg.type) {
@@ -36976,6 +37389,12 @@ function dispatchBridgeMessage(msg, deps) {
     case "refresh_local_skills":
       handleRefreshLocalSkills(msg, deps);
       break;
+    case "bridge_git_context_request":
+      handleBridgeGitContextRequestMessage(msg, deps.getWs);
+      break;
+    case "list_repo_branches_request":
+      handleListRepoBranchesRequestMessage(msg, deps.getWs);
+      break;
   }
 }
 
@@ -36988,8 +37407,10 @@ function normalizeInboundBridgeWebSocketJson(data) {
   }
   return data;
 }
-function handleBridgeMessage(data, deps) {
-  if (!deps.getWs()) return;
+function handleBridgeMessage(data, deps, sourceWs) {
+  const active = deps.getWs();
+  if (!active) return;
+  if (sourceWs != null && sourceWs !== active) return;
   const msg = parseApiToBridgeMessage(normalizeInboundBridgeWebSocketJson(data), deps.log);
   if (!msg) return;
   dispatchBridgeMessage(msg, deps);
@@ -37041,6 +37462,7 @@ function createMainBridgeWebSocketLifecycle(params) {
   } = params;
   let authRefreshInFlight = false;
   function handleOpen() {
+    recordBridgeSessionOpened(state.duplicateBridgeFlap, Date.now());
     const logOpenAsPostRefreshReconnect = state.logBridgeOpenAsReconnect;
     clearMainBridgeReconnectQuietOnOpen(state, logFn);
     state.reconnectAttempt = 0;
@@ -37075,6 +37497,15 @@ function createMainBridgeWebSocketLifecycle(params) {
       state.currentWs = null;
       if (was) was.removeAllListeners();
       const willReconnect = !state.closedByUser;
+      if (willReconnect) {
+        const duplicateResult = evaluateDuplicateBridgeDisconnect(
+          state.duplicateBridgeFlap,
+          Date.now(),
+          code,
+          reason
+        );
+        logDuplicateBridgeWarning(logFn, duplicateResult);
+      }
       beginMainBridgeDeferredDisconnect(state, code, reason, logFn, willReconnect);
       if (willReconnect) {
         state.lastReconnectCloseMeta = { code, reason };
@@ -37124,6 +37555,10 @@ function createMainBridgeWebSocketLifecycle(params) {
       state.currentWs = createWsBridge({
         url: url2,
         clientPingIntervalMs: CLI_WEBSOCKET_CLIENT_PING_MS,
+        isActiveSocket: (socket) => state.currentWs === socket,
+        onCompactHeartbeatAck: (seq) => {
+          messageDeps.onBridgeHeartbeatAck?.(seq);
+        },
         onAuthInvalid: () => {
           if (authRefreshInFlight) return;
           void (async () => {
@@ -37177,9 +37612,9 @@ function createMainBridgeWebSocketLifecycle(params) {
           } catch {
           }
         },
-        onMessage: (data) => {
+        onMessage: (data, sourceWs) => {
           try {
-            handleBridgeMessage(data, messageDeps);
+            handleBridgeMessage(data, messageDeps, sourceWs);
           } catch {
           }
         }
@@ -37426,10 +37861,10 @@ function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
 }
 
 // src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-import * as path39 from "node:path";
+import * as path42 from "node:path";
 
 // src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
-import * as path38 from "node:path";
+import * as path41 from "node:path";
 async function probeOneAgentTypeForCapabilities(params) {
   const { agentType, cwd, workspaceId, log: log2, reportAgentCapabilities, bridgeReport = true } = params;
   if (isCliImmediateShutdownRequested()) return false;
@@ -37469,7 +37904,7 @@ async function probeOneAgentTypeForCapabilities(params) {
     if (isCliImmediateShutdownRequested()) return false;
     handle = await resolved.createClient({
       command: resolved.command,
-      cwd: path38.resolve(cwd),
+      cwd: path41.resolve(cwd),
       backendAgentType: agentType,
       sessionMode: "agent",
       persistedAcpSessionId: null,
@@ -37543,7 +37978,7 @@ async function probeAgentCapabilitiesForDetectedTypes(params) {
 async function warmupAgentCapabilitiesOnConnect(params) {
   const { workspaceId, log: log2, getWs } = params;
   if (isCliImmediateShutdownRequested()) return;
-  const cwd = path39.resolve(getBridgeRoot());
+  const cwd = path42.resolve(getBridgeRoot());
   async function sendBatchFromCache() {
     const socket = getWs();
     if (!socket || socket.readyState !== wrapper_default.OPEN) return;
@@ -37623,6 +38058,7 @@ async function createBridgeConnection(options) {
     currentWs: null,
     mainQuiet: createEmptyReconnectQuietSlot(),
     mainOutage: createEmptyReconnectOutageTracker(),
+    duplicateBridgeFlap: createEmptyDuplicateBridgeFlapTracker(),
     firehoseHandle: null,
     lastFirehoseParams: null,
     firehoseReconnectTimeout: null,
@@ -37710,8 +38146,8 @@ async function createBridgeConnection(options) {
     getCloudAccessToken: () => tokens.accessToken
   };
   const identifyReportedPaths = {
-    bridgeRootPath: path40.resolve(getBridgeRoot()),
-    worktreesRootPath: path40.resolve(worktreesRootPath)
+    bridgeRootPath: path43.resolve(getBridgeRoot()),
+    worktreesRootPath: path43.resolve(worktreesRootPath)
   };
   const { connect } = createMainBridgeWebSocketLifecycle({
     state,