@buildautomaton/cli 0.1.17 → 0.1.19

package/dist/index.js

@@ -4065,8 +4065,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path32, errorMaps, issueData } = params;
-      const fullPath = [...path32, ...issueData.path || []];
+      const { data, path: path34, errorMaps, issueData } = params;
+      const fullPath = [...path34, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -4374,11 +4374,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path32, key) {
+      constructor(parent, value, path34, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path32;
+        this._path = path34;
         this._key = key;
       }
       get path() {
@@ -7993,10 +7993,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path32) {
-  if (!path32)
+function getElementAtPath(obj, path34) {
+  if (!path34)
     return obj;
-  return path32.reduce((acc, key) => acc?.[key], obj);
+  return path34.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(path32, issues) {
+function prefixIssues(path34, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path32);
+    iss.path.unshift(path34);
     return iss;
   });
 }
@@ -8438,7 +8438,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path32 = []) => {
+  const processError = (error41, path34 = []) => {
     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 = [...path32, ...issue2.path];
+        const fullpath = [...path34, ...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(path32) {
+function toDotPath(path34) {
   const segs = [];
-  for (const seg of path32) {
+  for (const seg of path34) {
     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((resolve15) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve15());
+        this.#closedPromise = new Promise((resolve17) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve17());
         });
         this.#receive();
       }
@@ -21093,8 +21093,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve15, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve15, reject });
+        const responsePromise = new Promise((resolve17, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve17, 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(path32, isFile, isDirectory) {
-      log2(`checking %s`, path32);
+    function check2(path34, isFile, isDirectory) {
+      log2(`checking %s`, path34);
       try {
-        const stat2 = fs_1.statSync(path32);
+        const stat2 = fs_1.statSync(path34);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -21986,8 +21986,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path32, type = exports.READABLE) {
-      return check2(path32, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path34, type = exports.READABLE) {
+      return check2(path34, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -22413,7 +22413,7 @@ async function createSdkStdioAcpClient(options) {
   child.once("close", (code, signal) => {
     onAgentSubprocessExit?.({ code, signal });
   });
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve17, reject) => {
     let initSettled = false;
     const settleReject = (err) => {
       if (initSettled) return;
@@ -22427,7 +22427,7 @@ async function createSdkStdioAcpClient(options) {
     const settleResolve = (handle) => {
       if (initSettled) return;
       initSettled = true;
-      resolve15(handle);
+      resolve17(handle);
     };
     child.on("error", (err) => {
       settleReject(new Error(formatSpawnError(err, command[0])));
@@ -22463,8 +22463,8 @@ async function createSdkStdioAcpClient(options) {
               });
             } catch {
             }
-            return await new Promise((resolve16) => {
-              pendingPermissionResolvers.set(requestId, resolve16);
+            return await new Promise((resolve18) => {
+              pendingPermissionResolvers.set(requestId, resolve18);
             });
           },
           async readTextFile(params) {
@@ -22572,9 +22572,9 @@ async function createSdkStdioAcpClient(options) {
             }
           },
           async cancel() {
-            for (const [id, resolve16] of [...pendingPermissionResolvers.entries()]) {
+            for (const [id, resolve18] of [...pendingPermissionResolvers.entries()]) {
               pendingPermissionResolvers.delete(id);
-              resolve16({ outcome: { outcome: "cancelled" } });
+              resolve18({ outcome: { outcome: "cancelled" } });
             }
             try {
               await connection.cancel({ sessionId });
@@ -22590,10 +22590,10 @@ async function createSdkStdioAcpClient(options) {
             }
           },
           resolveRequest(requestId, result) {
-            const resolve16 = pendingPermissionResolvers.get(requestId);
-            if (!resolve16) return;
+            const resolve18 = pendingPermissionResolvers.get(requestId);
+            if (!resolve18) return;
             pendingPermissionResolvers.delete(requestId);
-            resolve16(result);
+            resolve18(result);
           },
           disconnect() {
             child.kill();
@@ -22700,7 +22700,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((resolve15) => {
+    const once = await new Promise((resolve17) => {
       const req = mod.request(opts, (res) => {
         const chunks = [];
         res.on("data", (c) => chunks.push(c));
@@ -22711,7 +22711,7 @@ async function proxyToLocal(request) {
             if (typeof v === "string") headers[k] = v;
             else if (Array.isArray(v) && v[0]) headers[k] = v[0];
           }
-          resolve15({
+          resolve17({
             id: request.id,
             statusCode: res.statusCode ?? 0,
             headers,
@@ -22720,7 +22720,7 @@ async function proxyToLocal(request) {
         });
       });
       req.on("error", (err) => {
-        resolve15({
+        resolve17({
           id: request.id,
           statusCode: 0,
           headers: {},
@@ -22802,8 +22802,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path32, body) {
-  const url2 = `http://127.0.0.1:${port}${path32}`;
+async function requestPreviewApi(port, secret, method, path34, body) {
+  const url2 = `http://127.0.0.1:${port}${path34}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -22815,7 +22815,7 @@ async function requestPreviewApi(port, secret, method, path32, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path32}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path34}: ${res.status}`);
   }
   return data;
 }
@@ -23040,6 +23040,9 @@ function installBridgeProcessResilience() {
   });
 }
 
+// src/cli-version.ts
+var CLI_VERSION = "0.1.19".length > 0 ? "0.1.19" : "0.0.0-dev";
+
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 import process7 from "node:process";
 import { Buffer as Buffer2 } from "node:buffer";
@@ -23473,14 +23476,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve17, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve15(subprocess);
+        resolve17(subprocess);
       });
     });
   }
@@ -23776,8 +23779,8 @@ function runPendingAuth(options) {
   let hasOpenedBrowser = false;
   let resolved = false;
   let resolveAuth;
-  const authPromise = new Promise((resolve15) => {
-    resolveAuth = resolve15;
+  const authPromise = new Promise((resolve17) => {
+    resolveAuth = resolve17;
   });
   let reconnectAttempt = 0;
   const signInQuiet = createEmptyReconnectQuietSlot();
@@ -23829,7 +23832,7 @@ function runPendingAuth(options) {
       url: url2,
       onOpen: () => {
         clearQuietOnOpen();
-        sendWsMessage(ws, { type: "identify", role: "cli" });
+        sendWsMessage(ws, { type: "identify", role: "cli", cliVersion: CLI_VERSION });
         keepaliveInterval = setInterval(() => {
           if (resolved || !ws || ws.readyState !== 1) return;
           sendWsMessage(ws, { type: "ping", timestamp: Date.now() });
@@ -23899,7 +23902,7 @@ function runPendingAuth(options) {
 async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
   const say = log2 ?? logImmediate;
   say("Cleaning up connections\u2026");
-  await new Promise((resolve15) => setImmediate(resolve15));
+  await new Promise((resolve17) => setImmediate(resolve17));
   state.closedByUser = true;
   clearReconnectQuietTimer(state.mainQuiet);
   clearReconnectQuietTimer(state.firehoseQuiet);
@@ -23994,8 +23997,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path32) {
-  return path32 instanceof String && cache.has(path32);
+function isPathSpec(path34) {
+  return path34 instanceof String && cache.has(path34);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -24084,8 +24087,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path32) {
-  return (0, import_file_exists.exists)(path32, import_file_exists.FOLDER);
+function folderExists(path34) {
+  return (0, import_file_exists.exists)(path34, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -24489,8 +24492,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path32) {
-      return /^\.(git)?$/.test(path32.trim());
+    parser(path34) {
+      return /^\.(git)?$/.test(path34.trim());
     }
   };
 }
@@ -24924,11 +24927,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path32, line, preview] = input.split(NULL);
-    paths.add(path32);
-    (results[path32] = results[path32] || []).push({
+    const [path34, line, preview] = input.split(NULL);
+    paths.add(path34);
+    (results[path34] = results[path34] || []).push({
       line: asNumber(line),
-      path: path32,
+      path: path34,
       preview
     });
   });
@@ -25693,14 +25696,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path32, text) {
+function parseInit(bare, path34, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path32, false, result[1]);
+    return new InitSummary(bare, path34, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path32, true, result[1]);
+    return new InitSummary(bare, path34, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -25711,7 +25714,7 @@ function parseInit(bare, path32, text) {
       break;
     }
   }
-  return new InitSummary(bare, path32, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path34, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -25720,9 +25723,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path32, existing, gitDir) {
+      constructor(bare, path34, existing, gitDir) {
         this.bare = bare;
-        this.path = path32;
+        this.path = path34;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -25734,7 +25737,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path32, customArgs) {
+function initTask(bare = false, path34, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -25743,7 +25746,7 @@ function initTask(bare = false, path32, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path32, text);
+      return parseInit(commands.includes("--bare"), path34, text);
     }
   };
 }
@@ -26559,12 +26562,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path32, index, working_dir) {
-        this.path = path32;
+      constructor(path34, index, working_dir) {
+        this.path = path34;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path32) || [null, path32, path32];
+          const detail = fromPathRegex.exec(path34) || [null, path34, path34];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -26595,14 +26598,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path32) {
+  function data(index, workingDir, path34) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path32);
+      handler(result, path34);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path32, index, workingDir));
+      result.files.push(new FileStatusSummary(path34, index, workingDir));
     }
   }
 }
@@ -26911,9 +26914,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path32, write) {
+      hashObject(path34, write) {
         return this._runTask(
-          hashObjectTask(path32, write === true),
+          hashObjectTask(path34, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -27266,8 +27269,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path32 = input.trim().replace(/^["']|["']$/g, "");
-  return path32 && normalize2(path32);
+  const path34 = input.trim().replace(/^["']|["']$/g, "");
+  return path34 && normalize2(path34);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -27581,8 +27584,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path32) {
-  return subModuleTask(["add", repo, path32]);
+function addSubModuleTask(repo, path34) {
+  return subModuleTask(["add", repo, path34]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -27915,8 +27918,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path32, then) {
-      return this._runTask(addSubModuleTask2(repo, path32), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path34, then) {
+      return this._runTask(addSubModuleTask2(repo, path34), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -29048,9 +29051,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 path32 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
-    if (!path32) continue;
-    rows.push({ path: path32, summary: clampSummaryToAtMostTwoLines(summary) });
+    const path34 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
+    if (!path34) continue;
+    rows.push({ path: path34, summary: clampSummaryToAtMostTwoLines(summary) });
   }
   return rows;
 }
@@ -29165,9 +29168,9 @@ var GitRepoMetaSchema = external_exports.object({
 // src/agents/acp/put-summarize-change-summaries.ts
 async function putEncryptedChangeSummaryRows(params) {
   const base = params.apiBaseUrl.replace(/\/+$/, "");
-  const entries = params.rows.map(({ path: path32, summary }) => {
+  const entries = params.rows.map(({ path: path34, summary }) => {
     const enc = params.e2ee.encryptFields({ summary }, ["summary"]);
-    return { path: path32, summary: JSON.stringify(enc) };
+    return { path: path34, summary: JSON.stringify(enc) };
   });
   const res = await fetch(
     `${base}/api/sessions/${encodeURIComponent(params.sessionId)}/follow-ups/summarize-changes`,
@@ -29510,7 +29513,7 @@ async function createCursorAcpClient(options) {
   });
   const stderrCapture = createStderrCapture(child);
   child.stderr?.on("data", (chunk) => stderrCapture.append(chunk));
-  return new Promise((resolve15, reject) => {
+  return new Promise((resolve17, reject) => {
     child.on("error", (err) => {
       child.kill();
       reject(new Error(formatSpawnError2(err, command[0])));
@@ -29697,7 +29700,7 @@ async function createCursorAcpClient(options) {
         const newResult = await send("session/new", { cwd, mcpServers: [] });
         const sessionId = newResult?.sessionId ?? "";
         if (!sessionId) throw new Error("Cursor ACP session/new did not return sessionId");
-        resolve15({
+        resolve17({
           sessionId,
           async sendPrompt(prompt, _options) {
             promptOutputBuffer = "";
@@ -30765,7 +30768,7 @@ async function createAcpManager(options) {
 }
 
 // src/worktrees/session-worktree-manager.ts
-import * as path16 from "node:path";
+import * as path17 from "node:path";
 import os4 from "node:os";
 
 // src/worktrees/prepare-new-session-worktrees.ts
@@ -30814,10 +30817,15 @@ function saveWorktreeLayout(layout) {
 function baseNameSafe(abs) {
   return path11.basename(abs).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
 }
-function allocateDirNameForLauncherCwd(layout, launcherCwdAbs) {
+function getLauncherDirNameIfPresent(layout, launcherCwdAbs) {
   const norm = path11.resolve(launcherCwdAbs);
   const existing = layout.launcherCwds.find((e) => path11.resolve(e.absolutePath) === norm);
-  if (existing) return existing.dirName;
+  return existing?.dirName;
+}
+function allocateDirNameForLauncherCwd(layout, launcherCwdAbs) {
+  const existing = getLauncherDirNameIfPresent(layout, launcherCwdAbs);
+  if (existing) return existing;
+  const norm = path11.resolve(launcherCwdAbs);
   const base = baseNameSafe(norm);
   const used = new Set(layout.launcherCwds.map((e) => e.dirName));
   let name = base;
@@ -31595,11 +31603,88 @@ async function commitSessionWorktrees(options) {
   }
 }
 
+// src/worktrees/discover-session-worktree-on-disk.ts
+import * as fs17 from "node:fs";
+import * as path16 from "node:path";
+function isGitDir(abs) {
+  try {
+    return fs17.existsSync(path16.join(abs, ".git"));
+  } catch {
+    return false;
+  }
+}
+function collectWorktreeRootsNamed(root, sessionId, maxDepth) {
+  const out = [];
+  const walk = (dir, depth) => {
+    if (depth > maxDepth) return;
+    let entries;
+    try {
+      entries = fs17.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const e of entries) {
+      if (e.name.startsWith(".")) continue;
+      const full = path16.join(dir, e.name);
+      if (!e.isDirectory()) continue;
+      if (e.name === sessionId) {
+        if (isGitDir(full)) out.push(path16.resolve(full));
+      } else {
+        walk(full, depth + 1);
+      }
+    }
+  };
+  walk(root, 0);
+  return out;
+}
+function discoverSessionWorktreeOnDisk(options) {
+  const { sessionId, worktreesRootAbs, layout, launcherCwd } = options;
+  if (!sessionId.trim() || !fs17.existsSync(worktreesRootAbs)) return null;
+  const preferredKey = getLauncherDirNameIfPresent(layout, launcherCwd);
+  const keys = [];
+  if (preferredKey) keys.push(preferredKey);
+  try {
+    for (const name of fs17.readdirSync(worktreesRootAbs)) {
+      if (name.startsWith(".")) continue;
+      const p = path16.join(worktreesRootAbs, name);
+      if (!fs17.statSync(p).isDirectory()) continue;
+      if (name !== preferredKey) keys.push(name);
+    }
+  } catch {
+    return null;
+  }
+  for (const key of keys) {
+    const mirrorRoot = path16.join(worktreesRootAbs, key);
+    if (!fs17.existsSync(mirrorRoot) || !fs17.statSync(mirrorRoot).isDirectory()) continue;
+    const worktreePaths = collectWorktreeRootsNamed(mirrorRoot, sessionId, 24);
+    if (worktreePaths.length > 0) {
+      return { agentCwd: path16.resolve(mirrorRoot), worktreePaths };
+    }
+  }
+  return null;
+}
+function discoverSessionWorktreesUnderMirrorRoot(mirrorRootAbs, sessionId) {
+  const mirrorRoot = path16.resolve(mirrorRootAbs);
+  if (!sessionId.trim() || !fs17.existsSync(mirrorRoot)) return null;
+  try {
+    if (!fs17.statSync(mirrorRoot).isDirectory()) return null;
+  } catch {
+    return null;
+  }
+  const worktreePaths = collectWorktreeRootsNamed(mirrorRoot, sessionId, 24);
+  if (worktreePaths.length === 0) return null;
+  return { agentCwd: mirrorRoot, worktreePaths };
+}
+
 // src/worktrees/session-worktree-manager.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 {
   rootAbs;
   log;
-  bridgeWantsWorktrees = false;
   sessionPaths = /* @__PURE__ */ new Map();
   sessionAgentCwd = /* @__PURE__ */ new Map();
   layout;
@@ -31608,22 +31693,67 @@ var SessionWorktreeManager = class {
     this.log = options.log;
     this.layout = loadWorktreeLayout();
   }
-  setBridgeSessionWorktrees(enabled) {
-    this.bridgeWantsWorktrees = enabled;
+  rememberWorktrees(sessionId, agentCwd, worktreePaths) {
+    this.sessionPaths.set(sessionId, worktreePaths);
+    this.sessionAgentCwd.set(sessionId, path17.resolve(agentCwd));
   }
-  effective() {
-    return this.bridgeWantsWorktrees;
+  tryDiscoverFromDisk(sessionId) {
+    return discoverSessionWorktreeOnDisk({
+      sessionId,
+      worktreesRootAbs: this.rootAbs,
+      layout: this.layout,
+      launcherCwd: getBridgeWorkspaceDirectory()
+    });
   }
   /**
    * Returns cwd for the agent (mirror of launcher tree), or undefined to use the bridge workspace directory.
    */
   async resolveCwdForPrompt(sessionId, opts) {
-    if (!sessionId || !this.effective() || !opts.sessionWorktreesEnabled) {
+    if (!sessionId) return void 0;
+    const parentPathRaw = opts.sessionParentPath?.trim();
+    if (parentPathRaw) {
+      const agentCwd = path17.resolve(parentPathRaw);
+      const sid = sessionId?.trim();
+      if (sid && parseSessionParent(opts.sessionParent) === "worktrees_root") {
+        const fromMirror = discoverSessionWorktreesUnderMirrorRoot(agentCwd, sid);
+        if (fromMirror) this.rememberWorktrees(sid, fromMirror.agentCwd, fromMirror.worktreePaths);
+      }
+      return agentCwd;
+    }
+    const parentKind = parseSessionParent(opts.sessionParent);
+    if (parentKind === "bridge_root") {
       return void 0;
     }
+    if (parentKind === "worktrees_root") {
+      if (!opts.isNewSession) {
+        const cached2 = this.sessionAgentCwd.get(sessionId);
+        if (cached2) return path17.resolve(cached2);
+        const disc = this.tryDiscoverFromDisk(sessionId);
+        if (disc) {
+          this.rememberWorktrees(sessionId, disc.agentCwd, disc.worktreePaths);
+          return path17.resolve(disc.agentCwd);
+        }
+        return void 0;
+      }
+      const prep2 = await prepareNewSessionWorktrees({
+        rootAbs: this.rootAbs,
+        launcherCwd: getBridgeWorkspaceDirectory(),
+        sessionId,
+        layout: this.layout,
+        log: this.log
+      });
+      if (!prep2) return void 0;
+      this.rememberWorktrees(sessionId, prep2.agentCwd, prep2.worktreePaths);
+      return path17.resolve(prep2.agentCwd);
+    }
     if (!opts.isNewSession) {
-      const agentCwd = this.sessionAgentCwd.get(sessionId);
-      if (agentCwd) return path16.resolve(agentCwd);
+      const cached2 = this.sessionAgentCwd.get(sessionId);
+      if (cached2) return path17.resolve(cached2);
+      const disc = this.tryDiscoverFromDisk(sessionId);
+      if (disc) {
+        this.rememberWorktrees(sessionId, disc.agentCwd, disc.worktreePaths);
+        return path17.resolve(disc.agentCwd);
+      }
       return void 0;
     }
     const prep = await prepareNewSessionWorktrees({
@@ -31634,9 +31764,8 @@ var SessionWorktreeManager = class {
       log: this.log
     });
     if (!prep) return void 0;
-    this.sessionPaths.set(sessionId, prep.worktreePaths);
-    this.sessionAgentCwd.set(sessionId, prep.agentCwd);
-    return path16.resolve(prep.agentCwd);
+    this.rememberWorktrees(sessionId, prep.agentCwd, prep.worktreePaths);
+    return path17.resolve(prep.agentCwd);
   }
   async renameSessionBranch(sessionId, newBranch) {
     const paths = this.sessionPaths.get(sessionId);
@@ -31657,7 +31786,7 @@ var SessionWorktreeManager = class {
   getAgentCwdForSession(sessionId) {
     if (!sessionId) return null;
     const c = this.sessionAgentCwd.get(sessionId);
-    return c ? path16.resolve(c) : null;
+    return c ? path17.resolve(c) : null;
   }
   async removeSessionWorktrees(sessionId) {
     const paths = this.sessionPaths.get(sessionId);
@@ -31678,7 +31807,13 @@ var SessionWorktreeManager = class {
   }
   resolveCommitTargets(sessionId) {
     const paths = this.sessionPaths.get(sessionId);
-    return paths?.length ? paths : [getBridgeWorkspaceDirectory()];
+    if (paths?.length) return paths;
+    const disc = this.tryDiscoverFromDisk(sessionId);
+    if (disc?.worktreePaths.length) {
+      this.rememberWorktrees(sessionId, disc.agentCwd, disc.worktreePaths);
+      return disc.worktreePaths;
+    }
+    return [getBridgeWorkspaceDirectory()];
   }
   async getSessionWorkingTreeStatus(sessionId) {
     return aggregateSessionPathsWorkingTreeStatus(this.resolveCommitTargets(sessionId));
@@ -31705,30 +31840,30 @@ var SessionWorktreeManager = class {
   }
 };
 function defaultWorktreesRootAbs() {
-  return path16.join(os4.homedir(), ".buildautomaton", "worktrees");
+  return path17.join(os4.homedir(), ".buildautomaton", "worktrees");
 }
 
 // src/files/watch-file-index.ts
 import { watch } from "node:fs";
-import path23 from "node:path";
+import path24 from "node:path";
 
 // src/files/index/build-file-index.ts
-import path20 from "node:path";
+import path21 from "node:path";
 
 // src/runtime/yield-to-event-loop.ts
 function yieldToEventLoop() {
-  return new Promise((resolve15) => setImmediate(resolve15));
+  return new Promise((resolve17) => setImmediate(resolve17));
 }
 
 // src/files/index/walk-workspace-tree.ts
-import fs17 from "node:fs";
-import path18 from "node:path";
+import fs18 from "node:fs";
+import path19 from "node:path";
 
 // src/files/index/constants.ts
-import path17 from "node:path";
+import path18 from "node:path";
 import os5 from "node:os";
 var INDEX_WORK_YIELD_EVERY = 256;
-var INDEX_DIR = path17.join(os5.homedir(), ".buildautomaton");
+var INDEX_DIR = path18.join(os5.homedir(), ".buildautomaton");
 var INDEX_HASH_LEN = 16;
 var INDEX_VERSION = 2;
 var INDEX_LOG_PREFIX = "[file-index]";
@@ -31737,20 +31872,20 @@ var INDEX_LOG_PREFIX = "[file-index]";
 function walkWorkspaceTreeSync(dir, baseDir, out) {
   let names;
   try {
-    names = fs17.readdirSync(dir);
+    names = fs18.readdirSync(dir);
   } catch {
     return;
   }
   for (const name of names) {
     if (name.startsWith(".")) continue;
-    const full = path18.join(dir, name);
+    const full = path19.join(dir, name);
     let stat2;
     try {
-      stat2 = fs17.statSync(full);
+      stat2 = fs18.statSync(full);
     } catch {
       continue;
     }
-    const relative5 = path18.relative(baseDir, full).replace(/\\/g, "/");
+    const relative5 = path19.relative(baseDir, full).replace(/\\/g, "/");
     if (stat2.isDirectory()) {
       walkWorkspaceTreeSync(full, baseDir, out);
     } else if (stat2.isFile()) {
@@ -31761,7 +31896,7 @@ function walkWorkspaceTreeSync(dir, baseDir, out) {
 async function walkWorkspaceTreeAsync(dir, baseDir, out, state) {
   let names;
   try {
-    names = await fs17.promises.readdir(dir);
+    names = await fs18.promises.readdir(dir);
   } catch {
     return;
   }
@@ -31771,14 +31906,14 @@ async function walkWorkspaceTreeAsync(dir, baseDir, out, state) {
       await yieldToEventLoop();
     }
     state.n++;
-    const full = path18.join(dir, name);
+    const full = path19.join(dir, name);
     let stat2;
     try {
-      stat2 = await fs17.promises.stat(full);
+      stat2 = await fs18.promises.stat(full);
     } catch {
       continue;
     }
-    const relative5 = path18.relative(baseDir, full).replace(/\\/g, "/");
+    const relative5 = path19.relative(baseDir, full).replace(/\\/g, "/");
     if (stat2.isDirectory()) {
       await walkWorkspaceTreeAsync(full, baseDir, out, state);
     } else if (stat2.isFile()) {
@@ -31859,22 +31994,22 @@ async function buildTrigramMapForPathsAsync(paths) {
 }
 
 // src/files/index/write-index-file.ts
-import fs18 from "node:fs";
+import fs19 from "node:fs";
 
 // src/files/index/paths.ts
-import path19 from "node:path";
+import path20 from "node:path";
 import crypto2 from "node:crypto";
 function getIndexPathForCwd(resolvedCwd) {
   const hash = crypto2.createHash("sha256").update(resolvedCwd).digest("hex").slice(0, INDEX_HASH_LEN);
-  return path19.join(INDEX_DIR, `.file-index-${hash}.json`);
+  return path20.join(INDEX_DIR, `.file-index-${hash}.json`);
 }
 
 // src/files/index/write-index-file.ts
 function writeIndexFileSync(resolvedCwd, data) {
   const indexPath = getIndexPathForCwd(resolvedCwd);
   try {
-    if (!fs18.existsSync(INDEX_DIR)) fs18.mkdirSync(INDEX_DIR, { recursive: true });
-    fs18.writeFileSync(indexPath, JSON.stringify(data), "utf8");
+    if (!fs19.existsSync(INDEX_DIR)) fs19.mkdirSync(INDEX_DIR, { recursive: true });
+    fs19.writeFileSync(indexPath, JSON.stringify(data), "utf8");
   } catch (e) {
     console.error(`${INDEX_LOG_PREFIX} Failed to write index:`, e);
   }
@@ -31882,8 +32017,8 @@ function writeIndexFileSync(resolvedCwd, data) {
 async function writeIndexFileAsync(resolvedCwd, data) {
   const indexPath = getIndexPathForCwd(resolvedCwd);
   try {
-    await fs18.promises.mkdir(INDEX_DIR, { recursive: true });
-    await fs18.promises.writeFile(indexPath, JSON.stringify(data), "utf8");
+    await fs19.promises.mkdir(INDEX_DIR, { recursive: true });
+    await fs19.promises.writeFile(indexPath, JSON.stringify(data), "utf8");
   } catch (e) {
     console.error(`${INDEX_LOG_PREFIX} Failed to write index:`, e);
   }
@@ -31897,7 +32032,7 @@ function sortPaths(paths) {
   paths.sort((a, b) => a.localeCompare(b, void 0, { sensitivity: "base" }));
 }
 function buildFileIndex(cwd) {
-  const resolved = path20.resolve(cwd);
+  const resolved = path21.resolve(cwd);
   const paths = [];
   walkWorkspaceTreeSync(resolved, resolved, paths);
   sortPaths(paths);
@@ -31907,7 +32042,7 @@ function buildFileIndex(cwd) {
   return data;
 }
 async function buildFileIndexAsync(cwd) {
-  const resolved = path20.resolve(cwd);
+  const resolved = path21.resolve(cwd);
   const paths = [];
   await walkWorkspaceTreeAsync(resolved, resolved, paths, createWalkYieldState());
   await yieldToEventLoop();
@@ -31919,13 +32054,13 @@ async function buildFileIndexAsync(cwd) {
 }
 
 // src/files/index/load-file-index.ts
-import fs19 from "node:fs";
-import path21 from "node:path";
+import fs20 from "node:fs";
+import path22 from "node:path";
 function loadFileIndex(cwd) {
-  const resolved = path21.resolve(cwd);
+  const resolved = path22.resolve(cwd);
   const indexPath = getIndexPathForCwd(resolved);
   try {
-    const raw = fs19.readFileSync(indexPath, "utf8");
+    const raw = fs20.readFileSync(indexPath, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed !== null && typeof parsed === "object" && Array.isArray(parsed.paths)) {
       const obj = parsed;
@@ -31944,9 +32079,9 @@ function loadFileIndex(cwd) {
 }
 
 // src/files/index/ensure-file-index.ts
-import path22 from "node:path";
+import path23 from "node:path";
 async function ensureFileIndexAsync(cwd) {
-  const resolved = path22.resolve(cwd);
+  const resolved = path23.resolve(cwd);
   const cached2 = loadFileIndex(resolved);
   if (cached2 !== null) return { data: cached2, fromCache: true };
   const data = await buildFileIndexAsync(resolved);
@@ -32029,7 +32164,7 @@ function createFsWatcher(resolved, schedule) {
   }
 }
 function startFileIndexWatcher(cwd = getBridgeWorkspaceDirectory()) {
-  const resolved = path23.resolve(cwd);
+  const resolved = path24.resolve(cwd);
   void buildFileIndexAsync(resolved).catch((e) => {
     console.error("[file-index] Initial index build failed:", e);
   });
@@ -32056,6 +32191,9 @@ function startFileIndexWatcher(cwd = getBridgeWorkspaceDirectory()) {
   };
 }
 
+// src/bridge/connection/create-bridge-connection.ts
+import * as path33 from "node:path";
+
 // src/dev-servers/manager/dev-server-manager.ts
 import { rm as rm2 } from "node:fs/promises";
 
@@ -32076,15 +32214,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((resolve15) => {
-    proc.once("exit", () => resolve15());
+  const exited = new Promise((resolve17) => {
+    proc.once("exit", () => resolve17());
   });
   log2(`[dev-server] Sending SIGTERM to ${shortId} (pid=${proc.pid ?? "?"}).`);
   try {
     proc.kill("SIGTERM");
   } catch {
   }
-  await Promise.race([exited, new Promise((resolve15) => setTimeout(resolve15, graceMs))]);
+  await Promise.race([exited, new Promise((resolve17) => setTimeout(resolve17, graceMs))]);
 }
 function forceKillChild(proc, log2, shortId, graceMs) {
   log2(
@@ -32098,7 +32236,7 @@ function forceKillChild(proc, log2, shortId, graceMs) {
 }
 
 // src/dev-servers/process/wire-dev-server-child-process.ts
-import fs20 from "node:fs";
+import fs21 from "node:fs";
 
 // src/dev-servers/manager/forward-pipe.ts
 function forwardChildPipe(childReadable, terminal, onData) {
@@ -32134,7 +32272,7 @@ function wireDevServerChildProcess(d) {
         d.setPollInterval(void 0);
         return;
       }
-      fs20.readFile(d.mergedLogPath, (err, buf) => {
+      fs21.readFile(d.mergedLogPath, (err, buf) => {
         if (err || (d.getSpawnGeneration() ?? 0) !== d.scheduledGen) return;
         if (buf.length <= d.mergedReadPos.value) return;
         const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
@@ -32172,7 +32310,7 @@ ${errTail}` : ""}`);
       d.sendStatus(code === 0 || code == null ? "stopped" : "error", detail, tails);
     };
     if (mergedPath) {
-      fs20.readFile(mergedPath, (err, buf) => {
+      fs21.readFile(mergedPath, (err, buf) => {
         if (!err && buf.length > d.mergedReadPos.value) {
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
@@ -32274,13 +32412,13 @@ function parseDevServerDefs(servers) {
 }
 
 // src/dev-servers/manager/shell-spawn/utils.ts
-import fs21 from "node:fs";
+import fs22 from "node:fs";
 function isSpawnEbadf(e) {
   return typeof e === "object" && e !== null && "code" in e && e.code === "EBADF";
 }
 function rmDirQuiet(dir) {
   try {
-    fs21.rmSync(dir, { recursive: true, force: true });
+    fs22.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -32288,7 +32426,7 @@ var cachedDevNullReadFd;
 function devNullReadFd() {
   if (cachedDevNullReadFd === void 0) {
     const devPath = process.platform === "win32" ? "nul" : "/dev/null";
-    cachedDevNullReadFd = fs21.openSync(devPath, "r");
+    cachedDevNullReadFd = fs22.openSync(devPath, "r");
   }
   return cachedDevNullReadFd;
 }
@@ -32362,15 +32500,15 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
 
 // src/dev-servers/manager/shell-spawn/try-spawn-merged-log-file.ts
 import { spawn as spawn7 } from "node:child_process";
-import fs22 from "node:fs";
+import fs23 from "node:fs";
 import { tmpdir } from "node:os";
-import path24 from "node:path";
+import path25 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal) {
-  const tmpRoot = fs22.mkdtempSync(path24.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path24.join(tmpRoot, "combined.log");
+  const tmpRoot = fs23.mkdtempSync(path25.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path25.join(tmpRoot, "combined.log");
   let logFd;
   try {
-    logFd = fs22.openSync(logPath, "a");
+    logFd = fs23.openSync(logPath, "a");
   } catch {
     rmDirQuiet(tmpRoot);
     return null;
@@ -32389,7 +32527,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
     } else {
       proc = spawn7("/bin/sh", ["-c", command], { env, cwd, stdio, ...signal ? { signal } : {} });
     }
-    fs22.closeSync(logFd);
+    fs23.closeSync(logFd);
     return {
       proc,
       pipedStdoutStderr: true,
@@ -32398,7 +32536,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
     };
   } catch (e) {
     try {
-      fs22.closeSync(logFd);
+      fs23.closeSync(logFd);
     } catch {
     }
     rmDirQuiet(tmpRoot);
@@ -32409,22 +32547,22 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
 
 // src/dev-servers/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
 import { spawn as spawn8 } from "node:child_process";
-import fs23 from "node:fs";
+import fs24 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path25 from "node:path";
+import path26 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal) {
-  const tmpRoot = fs23.mkdtempSync(path25.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path25.join(tmpRoot, "combined.log");
-  const innerPath = path25.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path25.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs24.mkdtempSync(path26.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path26.join(tmpRoot, "combined.log");
+  const innerPath = path26.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path26.join(tmpRoot, "_run.sh");
   try {
-    fs23.writeFileSync(innerPath, `#!/bin/sh
+    fs24.writeFileSync(innerPath, `#!/bin/sh
 ${command}
 `);
-    fs23.writeFileSync(
+    fs24.writeFileSync(
       runnerPath,
       `#!/bin/sh
 cd ${shSingleQuote(cwd)}
@@ -32450,13 +32588,13 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal) {
-  const tmpRoot = fs23.mkdtempSync(path25.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path25.join(tmpRoot, "combined.log");
-  const runnerPath = path25.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs24.mkdtempSync(path26.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path26.join(tmpRoot, "combined.log");
+  const runnerPath = path26.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
-    fs23.writeFileSync(
+    fs24.writeFileSync(
       runnerPath,
       `@ECHO OFF\r
 CD /D ${q(cwd)}\r
@@ -33158,10 +33296,9 @@ function attachFirehoseAfterIdentified(ctx, params) {
 
 // src/bridge/connection/create-bridge-identified-handler.ts
 function createOnBridgeIdentified(opts) {
-  const { sessionWorktreeManager, devServerManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
+  const { devServerManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
   const firehoseCtx = { state, devServerManager, logFn };
   return (msg) => {
-    sessionWorktreeManager.setBridgeSessionWorktrees(msg.sessionWorktreesEnabled === true);
     const bridgeName = msg.bridgeName;
     const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts : [];
     const devServers = msg.devServers ?? [];
@@ -33180,30 +33317,30 @@ function createOnBridgeIdentified(opts) {
 }
 
 // src/skills/discover-local-agent-skills.ts
-import fs24 from "node:fs";
-import path26 from "node:path";
+import fs25 from "node:fs";
+import path27 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 = path26.join(cwd, rel);
-    if (!fs24.existsSync(base) || !fs24.statSync(base).isDirectory()) continue;
+    const base = path27.join(cwd, rel);
+    if (!fs25.existsSync(base) || !fs25.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
-      entries = fs24.readdirSync(base);
+      entries = fs25.readdirSync(base);
     } catch {
       continue;
     }
     for (const name of entries) {
-      const dir = path26.join(base, name);
+      const dir = path27.join(base, name);
       try {
-        if (!fs24.statSync(dir).isDirectory()) continue;
+        if (!fs25.statSync(dir).isDirectory()) continue;
       } catch {
         continue;
       }
-      const skillMd = path26.join(dir, "SKILL.md");
-      if (!fs24.existsSync(skillMd)) continue;
+      const skillMd = path27.join(dir, "SKILL.md");
+      if (!fs25.existsSync(skillMd)) continue;
       const key = `${rel}/${name}`;
       if (seenKeys.has(key)) continue;
       seenKeys.add(key);
@@ -33215,23 +33352,23 @@ function discoverLocalSkills(cwd) {
 function discoverSkillLayoutRoots(cwd) {
   const roots = [];
   for (const rel of SKILL_DISCOVERY_ROOTS) {
-    const base = path26.join(cwd, rel);
-    if (!fs24.existsSync(base) || !fs24.statSync(base).isDirectory()) continue;
+    const base = path27.join(cwd, rel);
+    if (!fs25.existsSync(base) || !fs25.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
-      entries = fs24.readdirSync(base);
+      entries = fs25.readdirSync(base);
     } catch {
       continue;
     }
     const skills2 = [];
     for (const name of entries) {
-      const dir = path26.join(base, name);
+      const dir = path27.join(base, name);
       try {
-        if (!fs24.statSync(dir).isDirectory()) continue;
+        if (!fs25.statSync(dir).isDirectory()) continue;
       } catch {
         continue;
       }
-      if (!fs24.existsSync(path26.join(dir, "SKILL.md"))) continue;
+      if (!fs25.existsSync(path27.join(dir, "SKILL.md"))) continue;
       const relPath = `${rel}/${name}`.replace(/\\/g, "/");
       skills2.push({ name, relPath });
     }
@@ -33276,7 +33413,7 @@ function createSendLocalSkillsReport(getWs, logFn) {
         const socket = getWs();
         if (!socket || socket.readyState !== wrapper_default.OPEN) return;
         const skills2 = discoverLocalSkills(getBridgeWorkspaceDirectory());
-        socket.send(JSON.stringify({ type: "local_skills", skills: skills2 }));
+        sendWsMessage(socket, { type: "local_skills", skills: skills2 });
       } catch (e) {
         logFn(
           `[Bridge service] Local skills report failed: ${e instanceof Error ? e.message : String(e)}`
@@ -33329,6 +33466,41 @@ function reportGitRepos(getWs, log2) {
   });
 }
 
+// src/types/api-to-bridge-messages.ts
+var API_TO_BRIDGE_MESSAGE_TYPES = [
+  "auth_token",
+  "bridge_identified",
+  "dev_servers_config",
+  "server_control",
+  "agent_config",
+  "prompt",
+  "session_git_request",
+  "rename_session_branch",
+  "session_archived",
+  "session_discarded",
+  "revert_turn_snapshot",
+  "cancel_run",
+  "cursor_request_response",
+  "skill_call",
+  "file_browser_request",
+  "file_browser_search",
+  "skill_layout_request",
+  "install_skills",
+  "refresh_local_skills"
+];
+var API_TO_BRIDGE_TYPE_SET = new Set(API_TO_BRIDGE_MESSAGE_TYPES);
+function parseApiToBridgeMessage(data, log2) {
+  if (data === null || typeof data !== "object" || Array.isArray(data)) return null;
+  const t = data.type;
+  if (typeof t !== "string" || !API_TO_BRIDGE_TYPE_SET.has(t)) {
+    if (typeof t === "string") {
+      log2?.(`[Bridge service] unhandled message type: ${t}`);
+    }
+    return null;
+  }
+  return data;
+}
+
 // src/bridge/routing/handlers/auth-token.ts
 var handleAuthToken = (msg, { log: log2 }) => {
   if (typeof msg.token !== "string") return;
@@ -33339,9 +33511,11 @@ var handleAuthToken = (msg, { log: log2 }) => {
 // src/bridge/routing/handlers/bridge-identified.ts
 var handleBridgeIdentified = (msg, deps) => {
   if (typeof msg.bridgeName !== "string") return;
-  deps.onBridgeIdentified(
-    msg
-  );
+  deps.onBridgeIdentified({
+    bridgeName: msg.bridgeName,
+    proxyPorts: msg.proxyPorts,
+    devServers: msg.devServers
+  });
   setImmediate(() => {
     void (async () => {
       try {
@@ -33376,7 +33550,7 @@ var handleAgentConfigMessage = (msg, deps) => {
 };
 
 // src/agents/acp/from-bridge/handle-bridge-prompt.ts
-import * as path28 from "node:path";
+import * as path29 from "node:path";
 
 // src/agents/acp/from-bridge/bridge-prompt-wiring.ts
 function createBridgePromptSenders(deps, getWs) {
@@ -33417,7 +33591,7 @@ import { execFile as execFile10 } from "node:child_process";
 import { promisify as promisify10 } from "node:util";
 
 // src/git/bridge-queue-key.ts
-import * as path27 from "node:path";
+import * as path28 from "node:path";
 import { createHash } from "node:crypto";
 function normalizeCanonicalGitUrl(url2) {
   let s = url2.trim();
@@ -33445,11 +33619,11 @@ function canonicalUrlToRepoIdSync(url2) {
   return createHash("sha256").update(normalized).digest("hex").slice(0, 32);
 }
 function fallbackRepoIdFromPath(absPath) {
-  return createHash("sha256").update(path27.resolve(absPath)).digest("hex").slice(0, 32);
+  return createHash("sha256").update(path28.resolve(absPath)).digest("hex").slice(0, 32);
 }
 async function resolveBridgeQueueBindFields(options) {
   const { effectiveCwd, worktreePaths, primaryRepoRoots, log: log2 } = options;
-  const cwdAbs = worktreePaths.length > 0 ? path27.resolve(worktreePaths[0]) : path27.resolve(effectiveCwd);
+  const cwdAbs = worktreePaths.length > 0 ? path28.resolve(worktreePaths[0]) : path28.resolve(effectiveCwd);
   if (!primaryRepoRoots.length) {
     log2("[Bridge service] Prompt queue bind skipped: no Git repository roots under the working directory.");
     return null;
@@ -33510,11 +33684,15 @@ async function runBridgePromptPreamble(params) {
   }
   if (s && sessionId) {
     const cliGitBranch = await readGitBranch(effectiveCwd);
+    const usesWt = sessionWorktreeManager.usesWorktreeSession(sessionId);
+    const mirrorAbs = sessionWorktreeManager.getAgentCwdForSession(sessionId);
     sendWsMessage(s, {
       type: "session_git_context_report",
       sessionId,
       cliGitBranch,
-      agentUsesWorktree: sessionWorktreeManager.usesWorktreeSession(sessionId)
+      agentUsesWorktree: usesWt,
+      sessionParent: usesWt ? "worktrees_root" : "bridge_root",
+      sessionParentPath: usesWt ? mirrorAbs : getBridgeWorkspaceDirectory()
     });
   }
   if (s && sessionId && runId) {
@@ -33533,9 +33711,9 @@ function parseChangeSummarySnapshots(raw) {
   for (const item of raw) {
     if (!item || typeof item !== "object") continue;
     const o = item;
-    const path32 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
-    if (!path32) continue;
-    const row = { path: path32 };
+    const path34 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
+    if (!path34) continue;
+    const row = { path: path34 };
     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;
@@ -33660,12 +33838,14 @@ function handleBridgePrompt(msg, deps) {
     return;
   }
   const isNewSession = msg.isNewSession === true;
-  const sessionWorktreesEnabled = msg.sessionWorktreesEnabled === true;
+  const rawParent = msg.sessionParent;
+  const sessionParent = rawParent === "bridge_root" || rawParent === "worktrees_root" ? rawParent : rawParent === "session_worktrees_root" ? "worktrees_root" : null;
+  const sessionParentPath = typeof msg.sessionParentPath === "string" && msg.sessionParentPath.trim() ? msg.sessionParentPath.trim() : null;
   const agentType = typeof msg.agentType === "string" && msg.agentType.trim() ? msg.agentType.trim() : void 0;
   const mode = typeof msg.mode === "string" && msg.mode.trim() ? msg.mode.trim() : void 0;
   acpManager.logPromptReceivedFromBridge({ agentType, mode });
   async function preambleAndPrompt(resolvedCwd) {
-    const effectiveCwd = path28.resolve(resolvedCwd ?? getBridgeWorkspaceDirectory());
+    const effectiveCwd = path29.resolve(resolvedCwd ?? getBridgeWorkspaceDirectory());
     await runBridgePromptPreamble({
       getWs,
       log: log2,
@@ -33708,7 +33888,7 @@ function handleBridgePrompt(msg, deps) {
       e2ee: deps.e2ee
     });
   }
-  void sessionWorktreeManager.resolveCwdForPrompt(sessionId, { isNewSession, sessionWorktreesEnabled }).then((cwd) => preambleAndPrompt(cwd)).catch((err) => {
+  void sessionWorktreeManager.resolveCwdForPrompt(sessionId, { isNewSession, sessionParent, sessionParentPath }).then((cwd) => preambleAndPrompt(cwd)).catch((err) => {
     log2(`[Agent] Worktree resolve failed: ${err instanceof Error ? err.message : String(err)}`);
     void preambleAndPrompt(void 0);
   });
@@ -33768,26 +33948,28 @@ function handleSkillCall(msg, socket, log2) {
 
 // src/bridge/routing/handlers/skill-call.ts
 var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
-  if (!msg.skillId || msg.operationId === void 0) return;
+  const skillId = typeof msg.skillId === "string" ? msg.skillId : "";
+  const operationId = typeof msg.operationId === "string" ? msg.operationId : "";
+  if (!skillId || !operationId) return;
   const socket = getWs();
   if (!socket) return;
   handleSkillCall(
-    msg,
+    { id: msg.id, skillId, operationId, params: msg.params },
     socket,
     log2
   );
 };
 
 // src/files/list-dir.ts
-import fs25 from "node:fs";
-import path30 from "node:path";
+import fs26 from "node:fs";
+import path31 from "node:path";
 
 // src/files/ensure-under-cwd.ts
-import path29 from "node:path";
+import path30 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeWorkspaceDirectory()) {
-  const normalized = path29.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path29.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path29.sep) && resolved !== cwd) {
+  const normalized = path30.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path30.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path30.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -33801,7 +33983,7 @@ async function listDirAsync(relativePath) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs25.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs26.promises.readdir(resolved, { withFileTypes: true });
     const visible = names.filter((d) => !d.name.startsWith("."));
     const entries = [];
     for (let i = 0; i < visible.length; i++) {
@@ -33809,12 +33991,12 @@ async function listDirAsync(relativePath) {
         await yieldToEventLoop();
       }
       const d = visible[i];
-      const entryPath = path30.join(relativePath || ".", d.name).replace(/\\/g, "/");
-      const fullPath = path30.join(resolved, d.name);
+      const entryPath = path31.join(relativePath || ".", d.name).replace(/\\/g, "/");
+      const fullPath = path31.join(resolved, d.name);
       let isDir = d.isDirectory();
       if (d.isSymbolicLink()) {
         try {
-          const targetStat = await fs25.promises.stat(fullPath);
+          const targetStat = await fs26.promises.stat(fullPath);
           isDir = targetStat.isDirectory();
         } catch {
           isDir = false;
@@ -33839,25 +34021,25 @@ async function listDirAsync(relativePath) {
 }
 
 // src/files/read-file.ts
-import fs26 from "node:fs";
+import fs27 from "node:fs";
 import { StringDecoder } from "node:string_decoder";
 function resolveFilePath(relativePath) {
   const resolved = ensureUnderCwd(relativePath, getBridgeWorkspaceDirectory());
   if (!resolved) return { error: "Path is outside working directory" };
   let real;
   try {
-    real = fs26.realpathSync(resolved);
+    real = fs27.realpathSync(resolved);
   } catch {
     real = resolved;
   }
-  const stat2 = fs26.statSync(real);
+  const stat2 = fs27.statSync(real);
   if (!stat2.isFile()) return { error: "Not a file" };
   return real;
 }
 var LINE_CHUNK_SIZE = 64 * 1024;
 function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const fileSize = fs26.statSync(filePath).size;
-  const fd = fs26.openSync(filePath, "r");
+  const fileSize = fs27.statSync(filePath).size;
+  const fd = fs27.openSync(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder("utf8");
@@ -33870,7 +34052,7 @@ function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize
   let line0Accum = "";
   try {
     let bytesRead;
-    while (!done && (bytesRead = fs26.readSync(fd, buf, 0, bufSize, null)) > 0) {
+    while (!done && (bytesRead = fs27.readSync(fd, buf, 0, bufSize, null)) > 0) {
       const text = partial2 + decoder.write(buf.subarray(0, bytesRead));
       partial2 = "";
       let lineStart = 0;
@@ -34005,7 +34187,7 @@ function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize
     }
     return { content: resultLines.join("\n"), size: fileSize };
   } finally {
-    fs26.closeSync(fd);
+    fs27.closeSync(fd);
   }
 }
 function readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize = LINE_CHUNK_SIZE) {
@@ -34016,8 +34198,8 @@ function readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize =
     if (hasRange) {
       return readFileRange(result, startLine, endLine, lineOffset, lineChunkSize);
     }
-    const stat2 = fs26.statSync(result);
-    const raw = fs26.readFileSync(result, "utf8");
+    const stat2 = fs27.statSync(result);
+    const raw = fs27.readFileSync(result, "utf8");
     const lines = raw.split(/\r?\n/);
     return { content: raw, totalLines: lines.length, size: stat2.size };
   } catch (err) {
@@ -34129,12 +34311,14 @@ function handleSkillLayoutRequest(msg, deps) {
   const socket = deps.getWs();
   const id = typeof msg.id === "string" ? msg.id : "";
   const roots = discoverSkillLayoutRoots(getBridgeWorkspaceDirectory());
-  socket?.send(JSON.stringify({ type: "skill_layout_response", id, roots }));
+  if (socket) {
+    sendWsMessage(socket, { type: "skill_layout_response", id, roots });
+  }
 }
 
 // src/skills/install-remote-skills.ts
-import fs27 from "node:fs";
-import path31 from "node:path";
+import fs28 from "node:fs";
+import path32 from "node:path";
 function installRemoteSkills(cwd, targetDir, items) {
   const installed2 = [];
   if (!Array.isArray(items)) {
@@ -34145,15 +34329,15 @@ 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 = path31.join(cwd, targetDir, item.skillName);
+      const skillDir = path32.join(cwd, targetDir, item.skillName);
       for (const f of item.files) {
         if (typeof f.path !== "string" || !f.text && !f.base64) continue;
-        const dest = path31.join(skillDir, f.path);
-        fs27.mkdirSync(path31.dirname(dest), { recursive: true });
+        const dest = path32.join(skillDir, f.path);
+        fs28.mkdirSync(path32.dirname(dest), { recursive: true });
         if (f.text !== void 0) {
-          fs27.writeFileSync(dest, f.text, "utf8");
+          fs28.writeFileSync(dest, f.text, "utf8");
         } else if (f.base64) {
-          fs27.writeFileSync(dest, Buffer.from(f.base64, "base64"));
+          fs28.writeFileSync(dest, Buffer.from(f.base64, "base64"));
         }
       }
       installed2.push({
@@ -34179,10 +34363,14 @@ var handleInstallSkillsMessage = (msg, deps) => {
   if (!result.success) {
     const err = result.error ?? "Invalid items";
     deps.log(`[Bridge service] Install skills failed: ${err}`);
-    socket?.send(JSON.stringify({ type: "install_skills_result", id, success: false, error: err }));
+    if (socket) {
+      sendWsMessage(socket, { type: "install_skills_result", id, success: false, error: err });
+    }
     return;
   }
-  socket?.send(JSON.stringify({ type: "install_skills_result", id, success: true, installed: result.installed }));
+  if (socket) {
+    sendWsMessage(socket, { type: "install_skills_result", id, success: true, installed: result.installed });
+  }
 };
 
 // src/bridge/routing/handlers/refresh-local-skills.ts
@@ -34299,7 +34487,7 @@ var handleSessionDiscardedMessage = (msg, deps) => {
 };
 
 // src/bridge/routing/handlers/revert-turn-snapshot.ts
-import * as fs28 from "node:fs";
+import * as fs29 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -34311,7 +34499,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     if (!s) return;
     const agentBase = sessionWorktreeManager.getAgentCwdForSession(sessionId) ?? getBridgeWorkspaceDirectory();
     const file2 = snapshotFilePath(agentBase, turnId);
-    if (!fs28.existsSync(file2)) {
+    if (!fs29.existsSync(file2)) {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
         id,
@@ -34332,7 +34520,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
 
 // src/bridge/routing/handlers/dev-server-control.ts
 var handleDevServerControl = (msg, deps) => {
-  let wire = msg;
+  let wire;
   try {
     wire = deps.e2ee ? deps.e2ee.decryptMessage(msg) : msg;
   } catch (e) {
@@ -34353,9 +34541,7 @@ var handleDevServersConfig = (msg, deps) => {
 
 // src/bridge/routing/dispatch-bridge-message.ts
 function dispatchBridgeMessage(msg, deps) {
-  const type = msg.type;
-  if (typeof type !== "string") return;
-  switch (type) {
+  switch (msg.type) {
     case "auth_token":
       handleAuthToken(msg, deps);
       break;
@@ -34413,15 +34599,14 @@ function dispatchBridgeMessage(msg, deps) {
     case "refresh_local_skills":
       handleRefreshLocalSkills(msg, deps);
       break;
-    default:
-      deps.log?.(`[Bridge service] unhandled message type: ${type}`);
   }
 }
 
 // src/bridge/routing/handle-bridge-message.ts
 function handleBridgeMessage(data, deps) {
-  const msg = data;
   if (!deps.getWs()) return;
+  const msg = parseApiToBridgeMessage(data, deps.log);
+  if (!msg) return;
   setImmediate(() => {
     dispatchBridgeMessage(msg, deps);
   });
@@ -34467,7 +34652,8 @@ function createMainBridgeWebSocketLifecycle(params) {
     tokens,
     persistTokens,
     onAuthInvalid,
-    e2ee
+    e2ee,
+    identifyReportedPaths
   } = params;
   let authRefreshInFlight = false;
   function handleOpen() {
@@ -34480,7 +34666,14 @@ function createMainBridgeWebSocketLifecycle(params) {
     }
     const socket = getWs();
     if (socket) {
-      sendWsMessage(socket, { type: "identify", role: "cli", ...e2ee ? { e: e2ee.handshake } : {} });
+      sendWsMessage(socket, {
+        type: "identify",
+        role: "cli",
+        cliVersion: CLI_VERSION,
+        bridgeRootPath: identifyReportedPaths.bridgeRootPath,
+        worktreesRootPath: identifyReportedPaths.worktreesRootPath,
+        ...e2ee ? { e: e2ee.handshake } : {}
+      });
       reportGitRepos(getWs, logFn);
     }
     if (justAuthenticated && socket) {
@@ -34674,7 +34867,6 @@ async function createBridgeConnection(options) {
   const e2ee = options.e2eCertificate ? createCliE2eeRuntime(options.e2eCertificate) : void 0;
   const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeCwd: getBridgeWorkspaceDirectory, e2ee });
   const onBridgeIdentified = createOnBridgeIdentified({
-    sessionWorktreeManager,
     devServerManager,
     firehoseServerUrl,
     workspaceId,
@@ -34696,6 +34888,10 @@ async function createBridgeConnection(options) {
     cloudApiBaseUrl: apiUrl,
     getCloudAccessToken: () => tokens.accessToken
   };
+  const identifyReportedPaths = {
+    bridgeRootPath: path33.resolve(getBridgeWorkspaceDirectory()),
+    worktreesRootPath: path33.resolve(worktreesRootAbs)
+  };
   const { connect } = createMainBridgeWebSocketLifecycle({
     state,
     getWs,
@@ -34707,7 +34903,8 @@ async function createBridgeConnection(options) {
     tokens,
     persistTokens,
     onAuthInvalid,
-    e2ee
+    e2ee,
+    identifyReportedPaths
   });
   connect();
   const stopFileIndexWatcher = startFileIndexWatcher(getBridgeWorkspaceDirectory());