@buildautomaton/cli 0.1.84 → 0.1.86

package/dist/index.js

@@ -4089,10 +4089,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path86) {
-  if (!path86)
+function getElementAtPath(obj, path88) {
+  if (!path88)
     return obj;
-  return path86.reduce((acc, key) => acc?.[key], obj);
+  return path88.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -4420,11 +4420,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path86, issues) {
+function prefixIssues(path88, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path86);
+    iss.path.unshift(path88);
     return iss;
   });
 }
@@ -4641,16 +4641,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path86 = []) => {
+  const processError = (error52, path88 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path86, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path88, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path86, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path86, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else {
-        const fullpath = [...path86, ...issue2.path];
+        const fullpath = [...path88, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -4677,17 +4677,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path86 = []) => {
+  const processError = (error52, path88 = []) => {
     var _a4, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path86, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path88, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path86, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path86, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path88, ...issue2.path]);
       } else {
-        const fullpath = [...path86, ...issue2.path];
+        const fullpath = [...path88, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -4719,8 +4719,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path86 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path86) {
+  const path88 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path88) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -18150,13 +18150,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path86 = ref.slice(1).split("/").filter(Boolean);
-  if (path86.length === 0) {
+  const path88 = ref.slice(1).split("/").filter(Boolean);
+  if (path88.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path86[0] === defsKey) {
-    const key = path86[1];
+  if (path88[0] === defsKey) {
+    const key = path88[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -21757,7 +21757,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join2(moduleDir, "..", sub, filename),
     join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path86) => existsSync(path86));
+  const resolved = candidates.find((path88) => existsSync(path88));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -22835,7 +22835,7 @@ var require_ignore = __commonJS({
       //   path matching.
       // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE`
       // @returns {TestResult} true if a file is ignored
-      test(path86, checkUnignored, mode) {
+      test(path88, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -22844,7 +22844,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path86);
+          const matched = rule[mode].test(path88);
           if (!matched) {
             return;
           }
@@ -22865,17 +22865,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path86, originalPath, doThrow) => {
-      if (!isString(path86)) {
+    var checkPath = (path88, originalPath, doThrow) => {
+      if (!isString(path88)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path86) {
+      if (!path88) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path86)) {
+      if (checkPath.isNotRelative(path88)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -22884,7 +22884,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path86) => REGEX_TEST_INVALID_PATH.test(path86);
+    var isNotRelative = (path88) => REGEX_TEST_INVALID_PATH.test(path88);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -22914,19 +22914,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path86 = originalPath && checkPath.convert(originalPath);
+        const path88 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path86,
+          path88,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path86, cache2, checkUnignored, slices);
+        return this._t(path88, cache2, checkUnignored, slices);
       }
-      checkIgnore(path86) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path86)) {
-          return this.test(path86);
+      checkIgnore(path88) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path88)) {
+          return this.test(path88);
         }
-        const slices = path86.split(SLASH).filter(Boolean);
+        const slices = path88.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -22939,18 +22939,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path86, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path88, false, MODE_CHECK_IGNORE);
       }
-      _t(path86, cache2, checkUnignored, slices) {
-        if (path86 in cache2) {
-          return cache2[path86];
+      _t(path88, cache2, checkUnignored, slices) {
+        if (path88 in cache2) {
+          return cache2[path88];
         }
         if (!slices) {
-          slices = path86.split(SLASH).filter(Boolean);
+          slices = path88.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path86] = this._rules.test(path86, checkUnignored, MODE_IGNORE);
+          return cache2[path88] = this._rules.test(path88, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -22958,29 +22958,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path86] = parent.ignored ? parent : this._rules.test(path86, checkUnignored, MODE_IGNORE);
+        return cache2[path88] = parent.ignored ? parent : this._rules.test(path88, checkUnignored, MODE_IGNORE);
       }
-      ignores(path86) {
-        return this._test(path86, this._ignoreCache, false).ignored;
+      ignores(path88) {
+        return this._test(path88, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path86) => !this.ignores(path86);
+        return (path88) => !this.ignores(path88);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path86) {
-        return this._test(path86, this._testCache, true);
+      test(path88) {
+        return this._test(path88, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path86) => checkPath(path86 && checkPath.convert(path86), path86, RETURN_FALSE);
+    var isPathValid = (path88) => checkPath(path88 && checkPath.convert(path88), path88, RETURN_FALSE);
     var setupWindows = () => {
       const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
       checkPath.convert = makePosix;
       const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-      checkPath.isNotRelative = (path86) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path86) || isNotRelative(path86);
+      checkPath.isNotRelative = (path88) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path88) || isNotRelative(path88);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -27064,7 +27064,7 @@ var require_has_flag = __commonJS({
 var require_supports_color = __commonJS({
   "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
-    var os10 = __require("os");
+    var os11 = __require("os");
     var tty = __require("tty");
     var hasFlag = require_has_flag();
     var { env } = process;
@@ -27112,7 +27112,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os10.release().split(".");
+        const osRelease = os11.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -27358,10 +27358,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(path86, isFile, isDirectory) {
-      log2(`checking %s`, path86);
+    function check2(path88, isFile, isDirectory) {
+      log2(`checking %s`, path88);
       try {
-        const stat2 = fs_1.statSync(path86);
+        const stat2 = fs_1.statSync(path88);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -27381,8 +27381,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path86, type = exports.READABLE) {
-      return check2(path86, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path88, type = exports.READABLE) {
+      return check2(path88, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -28423,8 +28423,8 @@ function getErrorMap() {
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path86, errorMaps, issueData } = params;
-  const fullPath = [...path86, ...issueData.path || []];
+  const { data, path: path88, errorMaps, issueData } = params;
+  const fullPath = [...path88, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -28540,11 +28540,11 @@ var errorUtil;
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path86, key) {
+  constructor(parent, value, path88, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path86;
+    this._path = path88;
     this._key = key;
   }
   get path() {
@@ -32858,6 +32858,11 @@ var INSTALLABLE_BRIDGE_AGENTS = [
   { value: "opencode", label: "OpenCode agent", tokenLabel: "Provider API key", tokenEnvVar: "OPENCODE_API_KEY" }
 ];
 
+// ../types/src/agent-subscriptions.ts
+var AGENT_SUBSCRIPTION_TYPES = INSTALLABLE_BRIDGE_AGENTS.map(
+  (a) => a.value
+);
+
 // src/agents/acp/safe-fs-path.ts
 import * as path2 from "node:path";
 function resolveSafePathUnderCwd(cwd, filePath) {
@@ -33875,8 +33880,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path86, body) {
-  const url2 = `http://127.0.0.1:${port}${path86}`;
+async function requestPreviewApi(port, secret, method, path88, body) {
+  const url2 = `http://127.0.0.1:${port}${path88}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -33888,7 +33893,7 @@ async function requestPreviewApi(port, secret, method, path86, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path86}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path88}: ${res.status}`);
   }
   return data;
 }
@@ -35190,7 +35195,7 @@ function createPendingAuthOnMessage(params) {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.84".length > 0 ? "0.1.84" : "0.0.0-dev";
+var CLI_VERSION = "0.1.86".length > 0 ? "0.1.86" : "0.0.0-dev";
 
 // src/auth/pending/pending-auth-on-open.ts
 function createPendingAuthOnOpen(params) {
@@ -36561,8 +36566,8 @@ async function cancelRun(ctx, runId) {
 }
 
 // src/agents/acp/ensure-acp-client.ts
-import * as fs23 from "node:fs";
-import * as path29 from "node:path";
+import * as fs24 from "node:fs";
+import * as path31 from "node:path";
 
 // src/paths/session-layout-paths.ts
 import * as path26 from "node:path";
@@ -36752,6 +36757,7 @@ init_log();
 function createCursorAcpSessionContext(options) {
   const suppressLoadReplayRef = { value: false };
   return {
+    cloudSessionId: options.cloudSessionId,
     cwd: options.cwd,
     onFileChange: options.onFileChange,
     mcpServers: options.mcpServers ?? [],
@@ -36844,14 +36850,80 @@ function createCursorAcpHandle(options) {
 // src/agents/acp/clients/cursor/cursor-acp-init.ts
 import * as readline from "node:readline";
 
+// src/agents/acp/clients/cursor/cursor-incoming-cursor-create-plan.ts
+function buildCursorCreatePlanToolCallUpdate(requestId, params) {
+  const toolCallId = params.toolCallId ?? params.tool_call_id;
+  if (typeof toolCallId !== "string" || !toolCallId.trim()) return null;
+  const name = typeof params.name === "string" ? params.name.trim() : "";
+  const overview = typeof params.overview === "string" ? params.overview : void 0;
+  const plan = typeof params.plan === "string" ? params.plan : "";
+  const todos = Array.isArray(params.todos) ? params.todos : void 0;
+  const phases = Array.isArray(params.phases) ? params.phases : void 0;
+  const isProject = typeof params.isProject === "boolean" ? params.isProject : void 0;
+  return {
+    sessionUpdate: "tool_call",
+    toolCallId,
+    title: name || "Plan",
+    status: "pending",
+    cursorPlan: {
+      requestId,
+      ...name ? { name } : {},
+      ...overview != null ? { overview } : {},
+      plan,
+      ...todos != null ? { todos } : {},
+      ...phases != null ? { phases } : {},
+      ...isProject != null ? { isProject } : {}
+    }
+  };
+}
+function queueCursorCreatePlanRequest(method, id, msg, deps) {
+  const params = msg.params ?? {};
+  const requestId = String(id);
+  deps.pendingRequests.set(id, { method, params });
+  const update = buildCursorCreatePlanToolCallUpdate(requestId, params);
+  if (update) deps.onSessionUpdate?.(update);
+  deps.onRequest?.({ requestId, method, params });
+}
+
+// src/agents/acp/clients/cursor/cursor-incoming-cursor-task.ts
+function buildCursorTaskToolCallUpdate(params) {
+  const toolCallId = params.toolCallId ?? params.tool_call_id;
+  if (typeof toolCallId !== "string" || !toolCallId.trim()) return null;
+  const description = typeof params.description === "string" ? params.description.trim() : "";
+  const prompt = typeof params.prompt === "string" ? params.prompt : void 0;
+  const subagentType = params.subagentType ?? params.subagent_type;
+  const model = typeof params.model === "string" ? params.model : void 0;
+  const agentId = typeof params.agentId === "string" ? params.agentId : typeof params.agent_id === "string" ? params.agent_id : void 0;
+  const durationMs = typeof params.durationMs === "number" ? params.durationMs : typeof params.duration_ms === "number" ? params.duration_ms : void 0;
+  return {
+    sessionUpdate: "tool_call_update",
+    toolCallId,
+    ...description ? { title: description } : {},
+    cursorTask: {
+      ...description ? { description } : {},
+      ...prompt != null ? { prompt } : {},
+      ...subagentType != null ? { subagentType } : {},
+      ...model != null ? { model } : {},
+      ...agentId != null ? { agentId } : {},
+      ...durationMs != null ? { durationMs } : {}
+    }
+  };
+}
+function handleCursorIncomingCursorTask(id, msg, deps) {
+  const params = msg.params ?? {};
+  deps.respond(id, {});
+  const update = buildCursorTaskToolCallUpdate(params);
+  if (update) deps.onSessionUpdate?.(update);
+}
+
 // src/agents/acp/clients/cursor/cursor-incoming-cursor-methods.ts
-var CURSOR_BRIDGE_METHODS = /* @__PURE__ */ new Set(["cursor/create_plan", "cursor/ask_question"]);
-var CURSOR_NOOP_METHODS = /* @__PURE__ */ new Set([
-  "cursor/update_todos",
-  "cursor/task",
-  "cursor/generate_image"
-]);
+var CURSOR_BRIDGE_METHODS = /* @__PURE__ */ new Set(["cursor/ask_question"]);
+var CURSOR_NOOP_METHODS = /* @__PURE__ */ new Set(["cursor/update_todos", "cursor/generate_image"]);
 function handleCursorIncomingCursorMethods(method, id, msg, deps) {
+  if (method === "cursor/create_plan") {
+    queueCursorCreatePlanRequest(method, id, msg, deps);
+    return true;
+  }
   if (CURSOR_BRIDGE_METHODS.has(method)) {
     const params = msg.params ?? {};
     deps.pendingRequests.set(id, { method, params });
@@ -36862,6 +36934,10 @@ function handleCursorIncomingCursorMethods(method, id, msg, deps) {
     });
     return true;
   }
+  if (method === "cursor/task") {
+    handleCursorIncomingCursorTask(id, msg, deps);
+    return true;
+  }
   if (CURSOR_NOOP_METHODS.has(method)) {
     deps.respond(id, {});
     return true;
@@ -36961,10 +37037,71 @@ function handleCursorIncomingPermissionRequest(id, method, msg, deps) {
   return true;
 }
 
+// src/agents/acp/clients/cursor/write-create-plan-file.ts
+import * as fs23 from "node:fs";
+import * as path28 from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
+
+// src/paths/session-plans-paths.ts
+import * as os8 from "node:os";
+import * as path27 from "node:path";
+function getSessionPlansRootDir() {
+  return path27.join(os8.homedir(), ".buildautomaton", "plans");
+}
+function sanitizeSessionPlansKey(sessionId) {
+  const t = sessionId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 220);
+  return t || "session";
+}
+function getSessionPlansDir(sessionId) {
+  return path27.join(getSessionPlansRootDir(), sanitizeSessionPlansKey(sessionId));
+}
+
+// src/agents/acp/clients/cursor/write-create-plan-file.ts
+function sanitizePlanFileBase(toolCallId) {
+  const t = toolCallId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 120);
+  return t || "plan";
+}
+function writeCreatePlanFile(params) {
+  const dir = getSessionPlansDir(params.cloudSessionId);
+  fs23.mkdirSync(dir, { recursive: true });
+  const filePath = path28.join(dir, `${sanitizePlanFileBase(params.toolCallId)}.md`);
+  fs23.writeFileSync(filePath, params.planMarkdown, "utf8");
+  return pathToFileURL2(filePath).href;
+}
+
+// src/agents/acp/clients/cursor/enrich-create-plan-rpc-result.ts
+function asRecord2(v) {
+  return v != null && typeof v === "object" && !Array.isArray(v) ? v : null;
+}
+function enrichCreatePlanRpcResult(result, pendingParams, cloudSessionId) {
+  const root = asRecord2(result);
+  const outcome = asRecord2(root?.outcome);
+  if (!outcome) return result;
+  const kind = typeof outcome.outcome === "string" ? outcome.outcome : "";
+  if (kind !== "accepted") {
+    const { plan: _drop, ...rest } = outcome;
+    return { ...root, outcome: rest };
+  }
+  const planMarkdown = typeof outcome.plan === "string" ? outcome.plan : "";
+  const toolCallIdRaw = pendingParams.toolCallId ?? pendingParams.tool_call_id;
+  const toolCallId = typeof toolCallIdRaw === "string" ? toolCallIdRaw.trim() : "";
+  const sessionId = cloudSessionId?.trim() ?? "";
+  if (planMarkdown && toolCallId && sessionId) {
+    const planUri = writeCreatePlanFile({ cloudSessionId: sessionId, toolCallId, planMarkdown });
+    return { outcome: { outcome: "accepted", planUri } };
+  }
+  return { outcome: { outcome: "accepted" } };
+}
+
 // src/agents/acp/clients/cursor/cursor-incoming-resolve-request.ts
-function resolveCursorIncomingRequest(pendingRequests2, respond, requestId, result) {
+function resolveCursorIncomingRequest(pendingRequests2, respond, requestId, result, cloudSessionId) {
   const pending2 = pendingRequests2.get(requestId);
-  const payload = pending2?.method === "session/request_permission" ? enrichAcpPermissionRpcResultFromRequestParams(result, pending2.params) : result;
+  let payload = result;
+  if (pending2?.method === "session/request_permission") {
+    payload = enrichAcpPermissionRpcResultFromRequestParams(result, pending2.params);
+  } else if (pending2?.method === "cursor/create_plan") {
+    payload = enrichCreatePlanRpcResult(result, pending2.params, cloudSessionId ?? void 0);
+  }
   respond(requestId, payload);
   pendingRequests2.delete(requestId);
 }
@@ -37021,10 +37158,17 @@ function createCursorAcpIncomingLineHandler(deps) {
     respond: deps.respond,
     respondJsonRpcError: deps.respondJsonRpcError,
     onRequest: deps.onRequest,
+    onSessionUpdate: deps.onSessionUpdate,
     pendingRequests: deps.pendingRequests
   };
   return {
-    resolveRequest: (requestId, result) => resolveCursorIncomingRequest(deps.pendingRequests, deps.respond, requestId, result),
+    resolveRequest: (requestId, result) => resolveCursorIncomingRequest(
+      deps.pendingRequests,
+      deps.respond,
+      requestId,
+      result,
+      deps.sessionCtx.cloudSessionId
+    ),
     handleLine(line) {
       const msg = safeJsonParse(line);
       if (!msg) return;
@@ -37227,6 +37371,7 @@ async function createCursorAcpClient(options) {
   const skipBrowserAuthenticate = cursorAgentUsesApiKeyAuth(spawnEnv);
   const sessionCtx = createCursorAcpSessionContext({
     cwd,
+    cloudSessionId: options.cloudSessionId,
     mcpServers: options.mcpServers,
     persistedAcpSessionId,
     backendAgentType,
@@ -37376,18 +37521,18 @@ import { existsSync as existsSync4, statSync } from "node:fs";
 
 // src/git/get-git-repo-root-sync.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
-import * as path27 from "node:path";
+import * as path29 from "node:path";
 var GIT_LOOKUP_TIMEOUT_MS = 2e3;
 function getGitRepoRootSync(startDir) {
   try {
     const out = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
-      cwd: path27.resolve(startDir),
+      cwd: path29.resolve(startDir),
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       maxBuffer: 1024 * 1024,
       timeout: GIT_LOOKUP_TIMEOUT_MS
     }).trim();
-    return out ? path27.resolve(out) : null;
+    return out ? path29.resolve(out) : null;
   } catch {
     return null;
   }
@@ -37396,26 +37541,26 @@ function getGitRepoRootSync(startDir) {
 // src/agents/acp/workspace-files.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { readFileSync as readFileSync4 } from "node:fs";
-import * as path28 from "node:path";
+import * as path30 from "node:path";
 var GIT_FILE_READ_TIMEOUT_MS = 2e3;
 function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
   const trimmed2 = rawPath.trim();
   if (!trimmed2) return null;
-  const normalizedSessionParent = path28.resolve(sessionParentPath);
+  const normalizedSessionParent = path30.resolve(sessionParentPath);
   let resolvedPath = resolveSafePathUnderCwd(sessionParentPath, trimmed2);
   if (!resolvedPath) {
-    const candidate = path28.isAbsolute(trimmed2) ? path28.normalize(trimmed2) : path28.normalize(path28.resolve(normalizedSessionParent, trimmed2));
+    const candidate = path30.isAbsolute(trimmed2) ? path30.normalize(trimmed2) : path30.normalize(path30.resolve(normalizedSessionParent, trimmed2));
     const gitRoot2 = getGitRepoRootSync(sessionParentPath);
     if (!gitRoot2) return null;
-    const rel = path28.relative(gitRoot2, candidate);
-    if (rel.startsWith("..") || path28.isAbsolute(rel)) return null;
+    const rel = path30.relative(gitRoot2, candidate);
+    if (rel.startsWith("..") || path30.isAbsolute(rel)) return null;
     resolvedPath = candidate;
   }
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const relFromRoot = path28.relative(gitRoot, resolvedPath);
-    if (!relFromRoot.startsWith("..") && !path28.isAbsolute(relFromRoot)) {
-      return { resolvedPath, display: relFromRoot.split(path28.sep).join("/") };
+    const relFromRoot = path30.relative(gitRoot, resolvedPath);
+    if (!relFromRoot.startsWith("..") && !path30.isAbsolute(relFromRoot)) {
+      return { resolvedPath, display: relFromRoot.split(path30.sep).join("/") };
     }
   }
   return { resolvedPath, display: toDisplayPathRelativeToCwd(sessionParentPath, resolvedPath) };
@@ -37424,9 +37569,9 @@ function readUtf8WorkspaceFile(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return "";
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const resolvedPath2 = path28.resolve(gitRoot, displayPath);
-    const rel = path28.relative(gitRoot, resolvedPath2);
-    if (!rel.startsWith("..") && !path28.isAbsolute(rel)) {
+    const resolvedPath2 = path30.resolve(gitRoot, displayPath);
+    const rel = path30.relative(gitRoot, resolvedPath2);
+    if (!rel.startsWith("..") && !path30.isAbsolute(rel)) {
       try {
         return readFileSync4(resolvedPath2, "utf8");
       } catch {
@@ -37445,9 +37590,9 @@ function tryWorkspaceDisplayToPath(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return null;
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const resolvedPath = path28.resolve(gitRoot, displayPath);
-    const rel = path28.relative(gitRoot, resolvedPath);
-    if (!rel.startsWith("..") && !path28.isAbsolute(rel)) return resolvedPath;
+    const resolvedPath = path30.resolve(gitRoot, displayPath);
+    const rel = path30.relative(gitRoot, resolvedPath);
+    if (!rel.startsWith("..") && !path30.isAbsolute(rel)) return resolvedPath;
   }
   return resolveSafePathUnderCwd(sessionParentPath, displayPath);
 }
@@ -38334,11 +38479,11 @@ init_cli_process_interrupt();
 var BRIDGE_MCP_SERVER_NAME2 = "buildautomaton-bridge";
 
 // src/mcp/resolve-bridge-mcp-server-path.ts
-import { dirname as dirname7, join as join7 } from "node:path";
+import { dirname as dirname7, join as join9 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function resolveBridgeMcpServerScriptPath() {
   const cliDir = dirname7(fileURLToPath7(import.meta.url));
-  return join7(cliDir, "bridge-mcp-server.js");
+  return join9(cliDir, "bridge-mcp-server.js");
 }
 
 // src/mcp/build-acp-mcp-servers.ts
@@ -38397,7 +38542,7 @@ async function ensureAcpClient(options) {
   if (state.acpStartPromise && !state.acpHandle) {
     await state.acpStartPromise;
   }
-  if (state.acpHandle && state.lastAcpCwd != null && path29.resolve(state.lastAcpCwd) !== path29.resolve(targetSessionParentPath)) {
+  if (state.acpHandle && state.lastAcpCwd != null && path31.resolve(state.lastAcpCwd) !== path31.resolve(targetSessionParentPath)) {
     try {
       state.acpHandle.disconnect();
     } catch {
@@ -38429,7 +38574,7 @@ async function ensureAcpClient(options) {
   if (!state.acpStartPromise) {
     let statOk = false;
     try {
-      const st = await fs23.promises.stat(targetSessionParentPath);
+      const st = await fs24.promises.stat(targetSessionParentPath);
       statOk = st.isDirectory();
       if (!statOk) {
         state.lastAcpStartError = `Agent cwd is not a directory: ${targetSessionParentPath}`;
@@ -38508,6 +38653,7 @@ async function ensureAcpClient(options) {
       },
       ...hooks,
       cwd: targetSessionParentPath,
+      cloudSessionId: cloudSessionId ?? null,
       mcpServers
     }).then(async (h) => {
       if (spawnEpoch !== state.clientEpoch || isCliImmediateShutdownRequested()) {
@@ -38727,8 +38873,8 @@ async function execGitFile(args, options) {
 }
 
 // src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path86) {
-  return path86.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path88) {
+  return path88.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // src/git/changes/parse/parse-name-status-entries.ts
@@ -38767,7 +38913,7 @@ function parseNameStatusLines(lines) {
 }
 
 // src/git/snapshot/diff/messages.ts
-import * as path30 from "node:path";
+import * as path32 from "node:path";
 
 // src/git/snapshot/diff/files.ts
 import { readFile, stat } from "node:fs/promises";
@@ -38798,7 +38944,7 @@ async function buildTrackedChangeMessage(options) {
   const diffArgs = entry.change === "moved" && oldRel ? ["diff", "--no-color", "-M", baselineRev, "--", oldRel, rel] : ["diff", "--no-color", "-M", baselineRev, "--", rel];
   const { stdout: patchContent } = await execGitFile(diffArgs, { cwd: repoPath });
   if (!patchContent.trim()) return null;
-  const workspaceFilePath = path30.join(repoPath, rel);
+  const workspaceFilePath = path32.join(repoPath, rel);
   const newText = entry.change === "removed" ? "" : await readWorkspaceFileAsUtf8(workspaceFilePath);
   const oldText = entry.change === "added" ? "" : await readGitBlobAsUtf8(repoPath, baselineRev, oldRel ?? rel);
   return {
@@ -38830,9 +38976,9 @@ function buildUntrackedChangeMessage(options) {
 }
 
 // src/git/snapshot/diff/paths.ts
-import * as path31 from "node:path";
+import * as path33 from "node:path";
 function repoDisplayPath(repoPath, multiRepo) {
-  const slug = path31.basename(repoPath).replace(/[^\w.-]+/g, "_") || "repo";
+  const slug = path33.basename(repoPath).replace(/[^\w.-]+/g, "_") || "repo";
   return (rel) => multiRepo ? `${slug}/${rel}` : rel;
 }
 function safeRelPath(rel) {
@@ -38844,12 +38990,12 @@ function newUntrackedPaths(raw, baselineUntracked, seen) {
 }
 
 // src/git/snapshot/diff/move-pairs.ts
-import * as path32 from "node:path";
+import * as path34 from "node:path";
 async function readUntrackedTexts(repoPath, untracked) {
   const out = /* @__PURE__ */ new Map();
   await forEachWithGitYield(untracked, async (rel) => {
     if (!safeRelPath(rel)) return;
-    const newText = await readWorkspaceFileAsUtf8(path32.join(repoPath, rel));
+    const newText = await readWorkspaceFileAsUtf8(path34.join(repoPath, rel));
     if (newText !== void 0) out.set(rel, newText);
   });
   return out;
@@ -38966,12 +39112,12 @@ async function collectRepoTurnChanges(options) {
 import { readFile as readFile2 } from "node:fs/promises";
 
 // src/git/snapshot/types.ts
-import * as path33 from "node:path";
+import * as path35 from "node:path";
 function snapshotsDirForCwd(agentCwd) {
-  return path33.join(agentCwd, ".buildautomaton", "snapshots");
+  return path35.join(agentCwd, ".buildautomaton", "snapshots");
 }
 function snapshotFilePath(agentCwd, runId) {
-  return path33.join(snapshotsDirForCwd(agentCwd), `${runId}.json`);
+  return path35.join(snapshotsDirForCwd(agentCwd), `${runId}.json`);
 }
 
 // src/git/snapshot/diff/load-pre-turn-snapshot.ts
@@ -39039,6 +39185,18 @@ function reportPostTurnEnrichment(options) {
   });
 }
 
+// src/agents/acp/clients/cursor/cleanup-session-plans.ts
+import * as fs25 from "node:fs";
+function cleanupSessionPlans(sessionId) {
+  const id = typeof sessionId === "string" ? sessionId.trim() : "";
+  if (!id) return;
+  const dir = getSessionPlansDir(id);
+  try {
+    fs25.rmSync(dir, { recursive: true, force: true });
+  } catch {
+  }
+}
+
 // src/agents/acp/prompts/finalize-and-send-prompt-result.ts
 async function finalizeAndSendPromptResult(params) {
   const {
@@ -39056,6 +39214,7 @@ async function finalizeAndSendPromptResult(params) {
     sendSessionUpdate,
     log: log2
   } = params;
+  cleanupSessionPlans(sessionId);
   const planningTodosSubmit = isPlanningSession ? await maybeSubmitPlanningTodosAfterAgentSuccess({
     sessionId,
     runId,
@@ -40350,7 +40509,7 @@ async function createBridgeAccessState(options = {}) {
 }
 
 // src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-import * as path35 from "node:path";
+import * as path37 from "node:path";
 
 // src/agents/detect-local-agent-types.ts
 init_yield_to_event_loop();
@@ -40455,7 +40614,7 @@ function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
 init_cli_database();
 
 // src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
-import * as path34 from "node:path";
+import * as path36 from "node:path";
 init_cli_database();
 init_cli_process_interrupt();
 async function probeOneAgentTypeForCapabilities(params) {
@@ -40495,7 +40654,7 @@ async function probeOneAgentTypeForCapabilities(params) {
     if (!canContinue()) return false;
     handle = await resolved.createClient({
       command: resolved.command,
-      cwd: path34.resolve(cwd),
+      cwd: path36.resolve(cwd),
       backendAgentType: agentType,
       sessionMode: "agent",
       persistedAcpSessionId: null,
@@ -40588,7 +40747,7 @@ async function warmupAgentCapabilitiesOnConnect(params) {
   const { workspaceId, log: log2, getWs } = params;
   const isCurrent = beginAgentCapabilityWarmupRun();
   if (!isCurrent()) return;
-  const cwd = path35.resolve(getBridgeRoot());
+  const cwd = path37.resolve(getBridgeRoot());
   async function sendBatchFromCache() {
     if (!isCurrent()) return;
     const socket = getWs();
@@ -40715,7 +40874,7 @@ async function createBridgeAccessAndAcp(options) {
 }
 
 // src/connection/create-bridge-preview-stack.ts
-import * as path38 from "node:path";
+import * as path40 from "node:path";
 
 // src/preview-environments/manager/firehose-messages.ts
 function buildFirehoseSnapshotMessage(params) {
@@ -41033,7 +41192,7 @@ function attachChildErrorHandler(d) {
 }
 
 // src/preview-environments/process/wire/handle-exit.ts
-import fs24 from "node:fs";
+import fs26 from "node:fs";
 function logStopLine(d, code, signal) {
   const { title } = d;
   if (signal) {
@@ -41072,7 +41231,7 @@ function attachChildExitHandler(d) {
     const cleanupDir = d.mergedCleanupDir;
     const mergedPath = d.mergedLogPath;
     if (mergedPath && !stale) {
-      fs24.readFile(mergedPath, (err, buf) => {
+      fs26.readFile(mergedPath, (err, buf) => {
         if (!err && buf.length > d.mergedReadPos.value) {
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
@@ -41118,7 +41277,7 @@ function wireChildOutputPipes(d) {
 }
 
 // src/preview-environments/process/wire/poll-merged-log.ts
-import fs25 from "node:fs";
+import fs27 from "node:fs";
 function startMergedLogPoll(d) {
   if (!d.mergedLogPath || !d.mergedCleanupDir) return;
   const { environmentId } = d;
@@ -41128,7 +41287,7 @@ function startMergedLogPoll(d) {
       d.setPollInterval(void 0);
       return;
     }
-    fs25.readFile(d.mergedLogPath, (err, buf) => {
+    fs27.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));
@@ -41343,7 +41502,7 @@ function previewEnvironmentSpawnOptions(lifecycle = DEFAULT_PREVIEW_ENVIRONMENT_
 }
 
 // src/preview-environments/manager/shell-spawn/utils.ts
-import fs26 from "node:fs";
+import fs28 from "node:fs";
 function mergePreviewEnvironmentSpawnOptions(opts, lifecycle = DEFAULT_PREVIEW_ENVIRONMENT_PROCESS_LIFECYCLE) {
   return { ...opts, ...previewEnvironmentSpawnOptions(lifecycle) };
 }
@@ -41352,7 +41511,7 @@ function isSpawnEbadf(e) {
 }
 function rmDirQuiet(dir) {
   try {
-    fs26.rmSync(dir, { recursive: true, force: true });
+    fs28.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -41360,7 +41519,7 @@ var cachedDevNullReadFd;
 function devNullReadFd() {
   if (cachedDevNullReadFd === void 0) {
     const devPath = process.platform === "win32" ? "nul" : "/dev/null";
-    cachedDevNullReadFd = fs26.openSync(devPath, "r");
+    cachedDevNullReadFd = fs28.openSync(devPath, "r");
   }
   return cachedDevNullReadFd;
 }
@@ -41440,15 +41599,15 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle)
 
 // src/preview-environments/manager/shell-spawn/try-spawn-merged-log-file.ts
 import { spawn as spawn7 } from "node:child_process";
-import fs27 from "node:fs";
+import fs29 from "node:fs";
 import { tmpdir } from "node:os";
-import path36 from "node:path";
+import path38 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs27.mkdtempSync(path36.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path36.join(tmpRoot, "combined.log");
+  const tmpRoot = fs29.mkdtempSync(path38.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path38.join(tmpRoot, "combined.log");
   let logFd;
   try {
-    logFd = fs27.openSync(logPath, "a");
+    logFd = fs29.openSync(logPath, "a");
   } catch {
     rmDirQuiet(tmpRoot);
     return null;
@@ -41472,7 +41631,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
         mergePreviewEnvironmentSpawnOptions({ env, cwd, stdio, ...signal ? { signal } : {} }, lifecycle)
       );
     }
-    fs27.closeSync(logFd);
+    fs29.closeSync(logFd);
     return {
       proc,
       pipedStdoutStderr: true,
@@ -41481,7 +41640,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
     };
   } catch (e) {
     try {
-      fs27.closeSync(logFd);
+      fs29.closeSync(logFd);
     } catch {
     }
     rmDirQuiet(tmpRoot);
@@ -41492,22 +41651,22 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
 
 // src/preview-environments/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
 import { spawn as spawn8 } from "node:child_process";
-import fs28 from "node:fs";
+import fs30 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path37 from "node:path";
+import path39 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs28.mkdtempSync(path37.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path37.join(tmpRoot, "combined.log");
-  const innerPath = path37.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path37.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs30.mkdtempSync(path39.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path39.join(tmpRoot, "combined.log");
+  const innerPath = path39.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path39.join(tmpRoot, "_run.sh");
   try {
-    fs28.writeFileSync(innerPath, `#!/bin/sh
+    fs30.writeFileSync(innerPath, `#!/bin/sh
 ${command}
 `);
-    fs28.writeFileSync(
+    fs30.writeFileSync(
       runnerPath,
       `#!/bin/sh
 cd ${shSingleQuote(cwd)}
@@ -41535,13 +41694,13 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs28.mkdtempSync(path37.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path37.join(tmpRoot, "combined.log");
-  const runnerPath = path37.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs30.mkdtempSync(path39.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path39.join(tmpRoot, "combined.log");
+  const runnerPath = path39.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
-    fs28.writeFileSync(
+    fs30.writeFileSync(
       runnerPath,
       `@ECHO OFF\r
 CD /D ${q(cwd)}\r
@@ -41859,8 +42018,8 @@ function createBridgePreviewStack(options) {
     scheduleInitialIndexBuilds(getBridgeRoot());
   };
   const identifyReportedPaths = {
-    bridgeRootPath: path38.resolve(getBridgeRoot()),
-    worktreesRootPath: path38.resolve(options.worktreesRootPath),
+    bridgeRootPath: path40.resolve(getBridgeRoot()),
+    worktreesRootPath: path40.resolve(options.worktreesRootPath),
     localShortcutPort: 0,
     localShortcutToken: ""
   };
@@ -42587,17 +42746,17 @@ async function yieldSkillDiscoveryWork(entryCount) {
 }
 
 // src/skills/discovery/discover-local-skills.ts
-import fs29 from "node:fs";
-import path39 from "node:path";
+import fs31 from "node:fs";
+import path41 from "node:path";
 function collectSkillFromDir(rel, base, name, seenKeys, out) {
-  const dir = path39.join(base, name);
+  const dir = path41.join(base, name);
   try {
-    if (!fs29.statSync(dir).isDirectory()) return;
+    if (!fs31.statSync(dir).isDirectory()) return;
   } catch {
     return;
   }
-  const skillMd = path39.join(dir, "SKILL.md");
-  if (!fs29.existsSync(skillMd)) return;
+  const skillMd = path41.join(dir, "SKILL.md");
+  if (!fs31.existsSync(skillMd)) return;
   const key = `${rel}/${name}`;
   if (seenKeys.has(key)) return;
   seenKeys.add(key);
@@ -42609,11 +42768,11 @@ async function discoverLocalSkillsAsync(cwd) {
   let work = 0;
   for (const rel of SKILL_DISCOVERY_ROOTS) {
     await yieldSkillDiscoveryWork(++work);
-    const base = path39.join(cwd, rel);
-    if (!fs29.existsSync(base) || !fs29.statSync(base).isDirectory()) continue;
+    const base = path41.join(cwd, rel);
+    if (!fs31.existsSync(base) || !fs31.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
-      entries = fs29.readdirSync(base);
+      entries = fs31.readdirSync(base);
     } catch {
       continue;
     }
@@ -42626,16 +42785,16 @@ async function discoverLocalSkillsAsync(cwd) {
 }
 
 // src/skills/discovery/discover-skill-layout-roots.ts
-import fs30 from "node:fs";
-import path40 from "node:path";
+import fs32 from "node:fs";
+import path42 from "node:path";
 function collectLayoutSkill(rel, base, name, skills2) {
-  const dir = path40.join(base, name);
+  const dir = path42.join(base, name);
   try {
-    if (!fs30.statSync(dir).isDirectory()) return;
+    if (!fs32.statSync(dir).isDirectory()) return;
   } catch {
     return;
   }
-  if (!fs30.existsSync(path40.join(dir, "SKILL.md"))) return;
+  if (!fs32.existsSync(path42.join(dir, "SKILL.md"))) return;
   const relPath = `${rel}/${name}`.replace(/\\/g, "/");
   skills2.push({ name, relPath });
 }
@@ -42644,11 +42803,11 @@ async function discoverSkillLayoutRootsAsync(cwd) {
   let work = 0;
   for (const rel of SKILL_DISCOVERY_ROOTS) {
     await yieldSkillDiscoveryWork(++work);
-    const base = path40.join(cwd, rel);
-    if (!fs30.existsSync(base) || !fs30.statSync(base).isDirectory()) continue;
+    const base = path42.join(cwd, rel);
+    if (!fs32.existsSync(base) || !fs32.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
-      entries = fs30.readdirSync(base);
+      entries = fs32.readdirSync(base);
     } catch {
       continue;
     }
@@ -42795,12 +42954,12 @@ function createBridgeRuntimeMessageSetup(options) {
 }
 
 // src/worktrees/worktree-layout-file.ts
-import * as fs31 from "node:fs";
-import * as path41 from "node:path";
-import os8 from "node:os";
+import * as fs33 from "node:fs";
+import * as path43 from "node:path";
+import os9 from "node:os";
 var LAYOUT_FILENAME = "worktree-launcher-layout.json";
 function defaultWorktreeLayoutPath() {
-  return path41.join(os8.homedir(), ".buildautomaton", LAYOUT_FILENAME);
+  return path43.join(os9.homedir(), ".buildautomaton", LAYOUT_FILENAME);
 }
 function normalizeLoadedLayout(raw) {
   if (raw && typeof raw === "object" && "launcherCwds" in raw) {
@@ -42812,8 +42971,8 @@ function normalizeLoadedLayout(raw) {
 function loadWorktreeLayout() {
   try {
     const p = defaultWorktreeLayoutPath();
-    if (!fs31.existsSync(p)) return { launcherCwds: [] };
-    const raw = JSON.parse(fs31.readFileSync(p, "utf8"));
+    if (!fs33.existsSync(p)) return { launcherCwds: [] };
+    const raw = JSON.parse(fs33.readFileSync(p, "utf8"));
     return normalizeLoadedLayout(raw);
   } catch {
     return { launcherCwds: [] };
@@ -42821,24 +42980,24 @@ function loadWorktreeLayout() {
 }
 function saveWorktreeLayout(layout) {
   try {
-    const dir = path41.dirname(defaultWorktreeLayoutPath());
-    fs31.mkdirSync(dir, { recursive: true });
-    fs31.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
+    const dir = path43.dirname(defaultWorktreeLayoutPath());
+    fs33.mkdirSync(dir, { recursive: true });
+    fs33.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
   } catch {
   }
 }
 function baseNameSafe(pathString) {
-  return path41.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
+  return path43.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
 }
 function getLauncherDirNameIfPresent(layout, bridgeRootPath2) {
-  const norm = path41.resolve(bridgeRootPath2);
-  const existing = layout.launcherCwds.find((e) => path41.resolve(e.absolutePath) === norm);
+  const norm = path43.resolve(bridgeRootPath2);
+  const existing = layout.launcherCwds.find((e) => path43.resolve(e.absolutePath) === norm);
   return existing?.dirName;
 }
 function allocateDirNameForLauncherCwd(layout, bridgeRootPath2) {
   const existing = getLauncherDirNameIfPresent(layout, bridgeRootPath2);
   if (existing) return existing;
-  const norm = path41.resolve(bridgeRootPath2);
+  const norm = path43.resolve(bridgeRootPath2);
   const base = baseNameSafe(norm);
   const used = new Set(layout.launcherCwds.map((e) => e.dirName));
   let name = base;
@@ -42931,8 +43090,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path86) {
-  return path86 instanceof String && cache.has(path86);
+function isPathSpec(path88) {
+  return path88 instanceof String && cache.has(path88);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -43021,8 +43180,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path86) {
-  return (0, import_file_exists.exists)(path86, import_file_exists.FOLDER);
+function folderExists(path88) {
+  return (0, import_file_exists.exists)(path88, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -43426,8 +43585,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path86) {
-      return /^\.(git)?$/.test(path86.trim());
+    parser(path88) {
+      return /^\.(git)?$/.test(path88.trim());
     }
   };
 }
@@ -43861,11 +44020,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path86, line, preview] = input.split(NULL);
-    paths.add(path86);
-    (results[path86] = results[path86] || []).push({
+    const [path88, line, preview] = input.split(NULL);
+    paths.add(path88);
+    (results[path88] = results[path88] || []).push({
       line: asNumber(line),
-      path: path86,
+      path: path88,
       preview
     });
   });
@@ -44630,14 +44789,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path86, text) {
+function parseInit(bare, path88, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path86, false, result[1]);
+    return new InitSummary(bare, path88, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path86, true, result[1]);
+    return new InitSummary(bare, path88, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -44648,7 +44807,7 @@ function parseInit(bare, path86, text) {
       break;
     }
   }
-  return new InitSummary(bare, path86, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path88, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -44657,9 +44816,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path86, existing, gitDir) {
+      constructor(bare, path88, existing, gitDir) {
         this.bare = bare;
-        this.path = path86;
+        this.path = path88;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -44671,7 +44830,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path86, customArgs) {
+function initTask(bare = false, path88, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -44680,7 +44839,7 @@ function initTask(bare = false, path86, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path86, text);
+      return parseInit(commands.includes("--bare"), path88, text);
     }
   };
 }
@@ -45496,12 +45655,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path86, index, working_dir) {
-        this.path = path86;
+      constructor(path88, index, working_dir) {
+        this.path = path88;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path86) || [null, path86, path86];
+          const detail = fromPathRegex.exec(path88) || [null, path88, path88];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -45532,14 +45691,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path86) {
+  function data(index, workingDir, path88) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path86);
+      handler(result, path88);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path86, index, workingDir));
+      result.files.push(new FileStatusSummary(path88, index, workingDir));
     }
   }
 }
@@ -45848,9 +46007,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path86, write) {
+      hashObject(path88, write) {
         return this._runTask(
-          hashObjectTask(path86, write === true),
+          hashObjectTask(path88, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -46203,8 +46362,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path86 = input.trim().replace(/^["']|["']$/g, "");
-  return path86 && normalize3(path86);
+  const path88 = input.trim().replace(/^["']|["']$/g, "");
+  return path88 && normalize3(path88);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -46518,8 +46677,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path86) {
-  return subModuleTask(["add", repo, path86]);
+function addSubModuleTask(repo, path88) {
+  return subModuleTask(["add", repo, path88]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -46852,8 +47011,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path86, then) {
-      return this._runTask(addSubModuleTask2(repo, path86), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path88, then) {
+      return this._runTask(addSubModuleTask2(repo, path88), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -47592,8 +47751,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path86, entry] of parseNumstatEntries(lines)) {
-    m.set(path86, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path88, entry] of parseNumstatEntries(lines)) {
+    m.set(path88, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -47722,7 +47881,7 @@ async function resolveDefaultRemoteBranchSha(g, remote) {
 }
 
 // src/git/commits/remote-tracking/resolve-base-sha-for-unpushed-commits.ts
-import * as path42 from "node:path";
+import * as path44 from "node:path";
 var BASE_SHA_CACHE_TTL_MS = 3e4;
 var baseShaCache = /* @__PURE__ */ new Map();
 async function resolveBaseShaForUnpushedCommitsUncached(g) {
@@ -47733,7 +47892,7 @@ async function resolveBaseShaForUnpushedCommitsUncached(g) {
 }
 async function resolveBaseShaForUnpushedCommits(g, repoDir) {
   if (repoDir) {
-    const key = path42.resolve(repoDir);
+    const key = path44.resolve(repoDir);
     const now = Date.now();
     const cached2 = baseShaCache.get(key);
     if (cached2 && cached2.expiresAt > now) return cached2.baseSha;
@@ -47868,17 +48027,17 @@ function formatRemoteDisplayLabel(remoteUrl) {
 }
 
 // src/git/changes/repo/get-working-tree-change-repo-details.ts
-import * as path52 from "node:path";
+import * as path54 from "node:path";
 
 // src/git/changes/repo/build-working-tree-change-repo-detail.ts
-import * as path51 from "node:path";
+import * as path53 from "node:path";
 
 // src/git/is-git-repo.ts
-import * as fs32 from "node:fs";
-import * as path43 from "node:path";
+import * as fs34 from "node:fs";
+import * as path45 from "node:path";
 async function isGitRepoDirectory(dirPath) {
   try {
-    await fs32.promises.access(path43.join(dirPath, ".git"));
+    await fs34.promises.access(path45.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -47886,8 +48045,8 @@ async function isGitRepoDirectory(dirPath) {
 }
 
 // src/git/changes/listing/apply-untracked-file-stats.ts
-import * as fs33 from "node:fs";
-import * as path44 from "node:path";
+import * as fs35 from "node:fs";
+import * as path46 from "node:path";
 
 // src/git/changes/lines/count-lines.ts
 import { createReadStream } from "node:fs";
@@ -47919,7 +48078,7 @@ function createUntrackedStatsApplier(options) {
     if (!options.untrackedSet.has(pathInRepo)) return;
     if (options.nameByPath.has(pathInRepo)) return;
     if (row.change === "moved") return;
-    const repoFilePath = path44.join(options.repoGitCwd, pathInRepo);
+    const repoFilePath = path46.join(options.repoGitCwd, pathInRepo);
     const fromGit = await numstatFromGitNoIndex(options.g, pathInRepo);
     if (fromGit) {
       row.additions = fromGit.additions;
@@ -47927,7 +48086,7 @@ function createUntrackedStatsApplier(options) {
       return;
     }
     try {
-      const st = await fs33.promises.stat(repoFilePath);
+      const st = await fs35.promises.stat(repoFilePath);
       row.additions = st.isFile() ? await countTextFileLines(repoFilePath) : 0;
     } catch {
       row.additions = 0;
@@ -48004,7 +48163,7 @@ async function buildChangedFileRowsFromPaths(options) {
 }
 
 // src/git/changes/listing/enrich-working-tree-file-rows.ts
-import * as path46 from "node:path";
+import * as path48 from "node:path";
 
 // src/git/changes/patch/patch-truncate.ts
 function truncatePatch(s) {
@@ -48092,10 +48251,10 @@ async function readGitBlobLines(repoCwd, pathInRepo) {
 }
 
 // src/git/changes/patch/hydrate/read-worktree-file-lines.ts
-import * as fs34 from "node:fs";
+import * as fs36 from "node:fs";
 async function readWorktreeFileLines(filePath) {
   try {
-    const raw = await fs34.promises.readFile(filePath, "utf8");
+    const raw = await fs36.promises.readFile(filePath, "utf8");
     return raw.split(/\r?\n/);
   } catch {
     return null;
@@ -48233,8 +48392,8 @@ async function unifiedDiffForFileInRange(repoCwd, range, pathInRepo, change, mov
 }
 
 // src/git/changes/total-lines/resolve-changed-file-total-lines.ts
-import * as fs35 from "node:fs";
-import * as path45 from "node:path";
+import * as fs37 from "node:fs";
+import * as path47 from "node:path";
 var MAX_BYTES = 512e3;
 async function countLinesInGitRef(repoGitCwd, ref, pathInRepo) {
   const spec = `${ref}:${pathInRepo}`;
@@ -48254,13 +48413,13 @@ async function countLinesInGitRef(repoGitCwd, ref, pathInRepo) {
 }
 async function resolveWorkingTreeFileTotalLines(options) {
   if (options.isBinary) return null;
-  const filePath = path45.join(options.repoGitCwd, options.pathInRepo);
+  const filePath = path47.join(options.repoGitCwd, options.pathInRepo);
   if (options.change === "removed") {
     return countLinesInGitRef(options.repoGitCwd, "HEAD", options.pathInRepo);
   }
   if (options.change === "moved" || options.change === "modified") {
     try {
-      const st = await fs35.promises.stat(filePath);
+      const st = await fs37.promises.stat(filePath);
       if (!st.isFile()) return null;
       return await countTextFileLines(filePath);
     } catch {
@@ -48303,7 +48462,7 @@ async function enrichWorkingTreeFileRows(options) {
       row.workspaceRelPath,
       options.repoPathRelativeToWorkspaceRoot
     );
-    const filePath = path46.join(options.repoGitCwd, filePathRelativeToRepoRoot);
+    const filePath = path48.join(options.repoGitCwd, filePathRelativeToRepoRoot);
     const hydrateKind = row.change === "moved" ? "modified" : row.change;
     let patch = await unifiedDiffForFile(
       options.repoGitCwd,
@@ -48461,7 +48620,7 @@ async function listChangedFilesForRepo(repoGitCwd, repoPathRelativeToWorkspaceRo
 }
 
 // src/git/changes/listing/list-changed-files-for-commit.ts
-import * as path47 from "node:path";
+import * as path49 from "node:path";
 
 // src/git/changes/listing/enrich-commit-file-rows.ts
 async function enrichCommitFileRows(options) {
@@ -48506,7 +48665,7 @@ async function parentForCommitDiff(g, sha) {
 var COMMIT_FILES_CACHE_TTL_MS = 5 * 6e4;
 var commitFilesCache = /* @__PURE__ */ new Map();
 function commitFilesCacheKey(repoGitCwd, commitSha) {
-  return `${path47.resolve(repoGitCwd)}:${commitSha}`;
+  return `${path49.resolve(repoGitCwd)}:${commitSha}`;
 }
 async function listChangedFilesForCommit(repoGitCwd, repoPathRelativeToWorkspaceRoot, commitSha, options = {}) {
   const cacheKey = commitFilesCacheKey(repoGitCwd, commitSha);
@@ -48561,7 +48720,7 @@ async function listChangedFilesForCommit(repoGitCwd, repoPathRelativeToWorkspace
 }
 
 // src/git/commits/list-unpushed-commits.ts
-import * as path48 from "node:path";
+import * as path50 from "node:path";
 
 // src/git/commits/lib/parse-log-lines.ts
 function parseLogShaDateSubjectLines(raw) {
@@ -48596,7 +48755,7 @@ async function gitLogNotReachableFromBase(g, baseSha, headSha) {
   }
 }
 async function listUnpushedCommits(repoDir) {
-  const key = path48.resolve(repoDir);
+  const key = path50.resolve(repoDir);
   const now = Date.now();
   const cached2 = unpushedCache.get(key);
   if (cached2 && cached2.expiresAt > now) return cached2.commits;
@@ -48657,7 +48816,7 @@ async function loadRecentAndUnpushedCommitsForRepoDetail(repoDir, recentCommitsL
 }
 
 // src/git/changes/repo/load-working-tree-change-repo-git-info.ts
-import * as path49 from "node:path";
+import * as path51 from "node:path";
 
 // src/git/remote-origin-url.ts
 async function getRemoteOriginUrl(gitDir) {
@@ -48672,7 +48831,7 @@ async function getRemoteOriginUrl(gitDir) {
 
 // src/git/changes/repo/load-working-tree-change-repo-git-info.ts
 async function loadWorkingTreeChangeRepoGitInfo(checkoutPath) {
-  const resolvedCheckoutPath = path49.resolve(checkoutPath);
+  const resolvedCheckoutPath = path51.resolve(checkoutPath);
   const git = cliSimpleGit(resolvedCheckoutPath);
   await yieldToEventLoop2();
   const [branch, remoteUrl] = await Promise.all([
@@ -48687,14 +48846,14 @@ async function loadWorkingTreeChangeRepoGitInfo(checkoutPath) {
 }
 
 // src/git/changes/repo/resolve-repo-path-relative-to-workspace-root.ts
-import * as path50 from "node:path";
+import * as path52 from "node:path";
 async function resolveRepoPathRelativeToWorkspaceRoot(options) {
-  const checkoutPath = path50.resolve(options.checkoutPath);
+  const checkoutPath = path52.resolve(options.checkoutPath);
   const git = cliSimpleGit(checkoutPath);
-  const sessionParentPath = options.sessionParentPath ? path50.resolve(options.sessionParentPath) : null;
+  const sessionParentPath = options.sessionParentPath ? path52.resolve(options.sessionParentPath) : null;
   let repoPathRelativeToWorkspaceRoot;
   if (sessionParentPath) {
-    const checkoutPathRelativeToSessionParent = path50.relative(sessionParentPath, checkoutPath);
+    const checkoutPathRelativeToSessionParent = path52.relative(sessionParentPath, checkoutPath);
     repoPathRelativeToWorkspaceRoot = checkoutPathRelativeToSessionParent === "" ? "." : checkoutPathRelativeToSessionParent.replace(/\\/g, "/");
   } else {
     let gitTopLevel = checkoutPath;
@@ -48704,8 +48863,8 @@ async function resolveRepoPathRelativeToWorkspaceRoot(options) {
     } catch {
       gitTopLevel = checkoutPath;
     }
-    const gitTopLevelRelativeToBridgeRoot = path50.relative(options.bridgeRoot, path50.resolve(gitTopLevel)).replace(/\\/g, "/") || ".";
-    repoPathRelativeToWorkspaceRoot = gitTopLevelRelativeToBridgeRoot.startsWith("..") ? path50.basename(path50.resolve(gitTopLevel)) : gitTopLevelRelativeToBridgeRoot;
+    const gitTopLevelRelativeToBridgeRoot = path52.relative(options.bridgeRoot, path52.resolve(gitTopLevel)).replace(/\\/g, "/") || ".";
+    repoPathRelativeToWorkspaceRoot = gitTopLevelRelativeToBridgeRoot.startsWith("..") ? path52.basename(path52.resolve(gitTopLevel)) : gitTopLevelRelativeToBridgeRoot;
   }
   return normalizeRepoPathRelativeToWorkspaceRoot(
     repoPathRelativeToWorkspaceRoot === "" ? "." : repoPathRelativeToWorkspaceRoot
@@ -48714,10 +48873,10 @@ async function resolveRepoPathRelativeToWorkspaceRoot(options) {
 
 // src/git/changes/repo/build-working-tree-change-repo-detail.ts
 async function buildWorkingTreeChangeRepoDetail(options) {
-  const checkoutPath = path51.resolve(options.targetPath);
+  const checkoutPath = path53.resolve(options.targetPath);
   if (!await isGitRepoDirectory(checkoutPath)) return null;
   const isCommitView = options.basis.kind === "commit";
-  const sessionParentPath = options.sessionParentPath ? path51.resolve(options.sessionParentPath) : null;
+  const sessionParentPath = options.sessionParentPath ? path53.resolve(options.sessionParentPath) : null;
   const git = cliSimpleGit(checkoutPath);
   const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
     checkoutPath,
@@ -48765,8 +48924,8 @@ async function buildWorkingTreeChangeRepoDetail(options) {
 
 // src/git/changes/repo/get-working-tree-change-repo-details.ts
 async function getWorkingTreeChangeRepoDetails(options) {
-  const bridgeRoot = path52.resolve(getBridgeRoot());
-  const sessionParentPath = options.sessionParentPath ? path52.resolve(options.sessionParentPath) : null;
+  const bridgeRoot = path54.resolve(getBridgeRoot());
+  const sessionParentPath = options.sessionParentPath ? path54.resolve(options.sessionParentPath) : null;
   const out = [];
   const filter = options.repoFilterRelPath != null ? normalizeRepoPathRelativeToWorkspaceRoot(options.repoFilterRelPath) : null;
   const basisInput = options.basis ?? { kind: "working" };
@@ -48797,9 +48956,9 @@ async function getWorkingTreeChangeRepoDetails(options) {
 }
 
 // src/git/changes/repo/get-working-tree-change-file-patch.ts
-import * as path53 from "node:path";
+import * as path55 from "node:path";
 async function getWorkingTreeChangeFilePatch(options) {
-  const repoGitCwd = path53.resolve(options.repoGitCwd);
+  const repoGitCwd = path55.resolve(options.repoGitCwd);
   if (!await isGitRepoDirectory(repoGitCwd)) {
     throw new Error("Not a git repository");
   }
@@ -48838,7 +48997,7 @@ async function getWorkingTreeChangeFilePatch(options) {
     });
     return { patchContent: patchContent2, totalLines: totalLines2 };
   }
-  const filePath = path53.join(repoGitCwd, filePathRelativeToRepoRoot);
+  const filePath = path55.join(repoGitCwd, filePathRelativeToRepoRoot);
   const hydrateKind = options.change === "moved" ? "modified" : options.change;
   let patchContent = await unifiedDiffForFile(
     repoGitCwd,
@@ -48884,18 +49043,18 @@ function parseWorkingTreeChangeKind(value) {
 }
 
 // src/worktrees/manager/git/get-session-working-tree-change-file-patch.ts
-import * as path54 from "node:path";
+import * as path56 from "node:path";
 async function getSessionWorkingTreeChangeFilePatch(cache2, sessionId, discover, opts) {
   const targets = await resolveCommitTargetsAsync(sessionId, cache2, discover);
-  const bridgeRoot = path54.resolve(getBridgeRoot());
-  const sessionParentPath = cache2.getSessionParentPath(sessionId) ? path54.resolve(cache2.getSessionParentPath(sessionId)) : null;
+  const bridgeRoot = path56.resolve(getBridgeRoot());
+  const sessionParentPath = cache2.getSessionParentPath(sessionId) ? path56.resolve(cache2.getSessionParentPath(sessionId)) : null;
   const repoPathRelativeToWorkspaceRootFilter = normalizeRepoPathRelativeToWorkspaceRoot(
     opts.repoRelPath.trim()
   );
   let result = null;
   await forEachWithGitYield(targets, async (targetPath) => {
     if (result) return;
-    const checkoutPath = path54.resolve(targetPath);
+    const checkoutPath = path56.resolve(targetPath);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
@@ -48928,13 +49087,13 @@ async function pushSessionUpstream(cache2, sessionId, discover) {
 }
 
 // src/worktrees/remove-session-worktrees.ts
-import * as fs38 from "node:fs";
+import * as fs40 from "node:fs";
 
 // src/git/worktrees/worktree-remove.ts
-import * as fs37 from "node:fs";
+import * as fs39 from "node:fs";
 
 // src/worktrees/is-removable-session-worktree-checkout-path.ts
-import path55 from "node:path";
+import path57 from "node:path";
 init_normalize_resolved_path();
 function isBridgeRootCheckoutPath(checkoutPath) {
   return normalizeResolvedPath(checkoutPath) === normalizeResolvedPath(getBridgeRoot());
@@ -48943,23 +49102,23 @@ function isRemovableSessionWorktreeCheckoutPath(checkoutPath, worktreesRootPath)
   if (isBridgeRootCheckoutPath(checkoutPath)) return false;
   const normalized = normalizeResolvedPath(checkoutPath);
   const worktreesRoot = normalizeResolvedPath(worktreesRootPath);
-  const rel = path55.relative(worktreesRoot, normalized);
-  if (rel === "" || rel.startsWith("..") || path55.isAbsolute(rel)) return false;
+  const rel = path57.relative(worktreesRoot, normalized);
+  if (rel === "" || rel.startsWith("..") || path57.isAbsolute(rel)) return false;
   return true;
 }
 
 // src/git/worktrees/resolve-main-repo-from-git-file.ts
-import * as fs36 from "node:fs";
-import * as path56 from "node:path";
+import * as fs38 from "node:fs";
+import * as path58 from "node:path";
 function resolveMainRepoFromWorktreeGitFile(wt) {
-  const gitDirFile = path56.join(wt, ".git");
-  if (!fs36.existsSync(gitDirFile) || !fs36.statSync(gitDirFile).isFile()) return "";
-  const first2 = fs36.readFileSync(gitDirFile, "utf8").trim();
+  const gitDirFile = path58.join(wt, ".git");
+  if (!fs38.existsSync(gitDirFile) || !fs38.statSync(gitDirFile).isFile()) return "";
+  const first2 = fs38.readFileSync(gitDirFile, "utf8").trim();
   const m = first2.match(/^gitdir:\s*(.+)$/im);
   if (!m) return "";
-  const gitWorktreePath = path56.resolve(wt, m[1].trim());
-  const gitDir = path56.dirname(path56.dirname(gitWorktreePath));
-  return path56.dirname(gitDir);
+  const gitWorktreePath = path58.resolve(wt, m[1].trim());
+  const gitDir = path58.dirname(path58.dirname(gitWorktreePath));
+  return path58.dirname(gitDir);
 }
 
 // src/git/worktrees/worktree-remove.ts
@@ -48970,7 +49129,7 @@ async function gitWorktreeRemoveForce(worktreePath) {
     return true;
   }
   if (isBridgeRootCheckoutPath(worktreePath)) return false;
-  fs37.rmSync(worktreePath, { recursive: true, force: true });
+  fs39.rmSync(worktreePath, { recursive: true, force: true });
   return true;
 }
 
@@ -48992,7 +49151,7 @@ async function removeSessionWorktrees(paths, worktreesRootPath, log2) {
       log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
       if (isRemovableSessionWorktreeCheckoutPath(wt, worktreesRootPath)) {
         try {
-          fs38.rmSync(wt, { recursive: true, force: true });
+          fs40.rmSync(wt, { recursive: true, force: true });
         } catch {
         }
       }
@@ -49048,12 +49207,12 @@ async function renameSessionWorktreeBranch(cache2, sessionId, newBranch, log2) {
 // src/worktrees/discovery/discover-session-worktree-on-disk.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as fs42 from "node:fs";
-import * as path61 from "node:path";
+import * as fs44 from "node:fs";
+import * as path63 from "node:path";
 
 // src/worktrees/discovery/collect-worktree-paths.ts
-import * as fs40 from "node:fs";
-import * as path58 from "node:path";
+import * as fs42 from "node:fs";
+import * as path60 from "node:path";
 
 // src/worktrees/discovery/disk-walk-constants.ts
 var DISK_WALK_YIELD_EVERY = 64;
@@ -49083,8 +49242,8 @@ function shouldSkipDiskWalkEntry(name) {
 // src/worktrees/discovery/disk-walk-utils.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as fs39 from "node:fs";
-import * as path57 from "node:path";
+import * as fs41 from "node:fs";
+import * as path59 from "node:path";
 async function yieldDuringDiskWalk(state) {
   state.entries++;
   if (state.entries % DISK_WALK_YIELD_EVERY !== 0) return true;
@@ -49094,7 +49253,7 @@ async function yieldDuringDiskWalk(state) {
 }
 async function isGitDir(dirPath) {
   try {
-    await fs39.promises.access(path57.join(dirPath, ".git"));
+    await fs41.promises.access(path59.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -49108,23 +49267,23 @@ async function collectGitRepoRootsUnderDirectory(rootPath) {
   const walk = async (dir) => {
     if (!await yieldDuringDiskWalk(state)) return;
     if (await isGitDir(dir)) {
-      out.push(path58.resolve(dir));
+      out.push(path60.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = await fs40.promises.readdir(dir, { withFileTypes: true });
+      entries = await fs42.promises.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path58.join(dir, e.name);
+      const full = path60.join(dir, e.name);
       if (!e.isDirectory()) continue;
       await walk(full);
     }
   };
-  await walk(path58.resolve(rootPath));
+  await walk(path60.resolve(rootPath));
   return { paths: [...new Set(out)], entriesVisited: state.entries };
 }
 async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK_MAX_DEPTH) {
@@ -49135,16 +49294,16 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
     if (!await yieldDuringDiskWalk(state)) return;
     let entries;
     try {
-      entries = await fs40.promises.readdir(dir, { withFileTypes: true });
+      entries = await fs42.promises.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path58.join(dir, e.name);
+      const full = path60.join(dir, e.name);
       if (!e.isDirectory()) continue;
       if (e.name === sessionId) {
-        if (await isGitDir(full)) out.push(path58.resolve(full));
+        if (await isGitDir(full)) out.push(path60.resolve(full));
         continue;
       }
       if (await isGitDir(full)) continue;
@@ -49156,14 +49315,14 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
 }
 
 // src/worktrees/discovery/layout-keys-for-bridge-root.ts
-import * as path59 from "node:path";
+import * as path61 from "node:path";
 function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
-  const bridge = path59.resolve(bridgeRoot);
+  const bridge = path61.resolve(bridgeRoot);
   const preferred = getLauncherDirNameIfPresent(layout, bridgeRoot);
   const relevant = layout.launcherCwds.filter((e) => {
-    const entry = path59.resolve(e.absolutePath);
-    return bridge === entry || bridge.startsWith(entry + path59.sep) || entry.startsWith(bridge + path59.sep);
-  }).sort((a, b) => path59.resolve(b.absolutePath).length - path59.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
+    const entry = path61.resolve(e.absolutePath);
+    return bridge === entry || bridge.startsWith(entry + path61.sep) || entry.startsWith(bridge + path61.sep);
+  }).sort((a, b) => path61.resolve(b.absolutePath).length - path61.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
   const ordered = [];
   const seen = /* @__PURE__ */ new Set();
   const add = (k) => {
@@ -49181,19 +49340,19 @@ function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
 }
 
 // src/worktrees/discovery/try-binding-from-isolated-directory.ts
-import * as fs41 from "node:fs";
-import * as path60 from "node:path";
+import * as fs43 from "node:fs";
+import * as path62 from "node:path";
 async function tryBindingFromIsolatedDirectory(scopeDir) {
   let st;
   try {
-    st = await fs41.promises.stat(scopeDir);
+    st = await fs43.promises.stat(scopeDir);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const { paths: worktreePaths } = await collectGitRepoRootsUnderDirectory(scopeDir);
   if (worktreePaths.length === 0) return null;
-  const abs = path60.resolve(scopeDir);
+  const abs = path62.resolve(scopeDir);
   return {
     parentPath: abs,
     repoCheckoutPaths: worktreePaths
@@ -49216,7 +49375,7 @@ async function discoverSessionWorktreeOnDisk(options) {
   const sid = sessionId.trim();
   if (!sid) return null;
   try {
-    await fs42.promises.access(worktreesRootPath);
+    await fs44.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -49225,13 +49384,13 @@ async function discoverSessionWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs42.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs44.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path61.join(worktreesRootPath, name);
+      const p = path63.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs42.promises.stat(p);
+        st = await fs44.promises.stat(p);
       } catch {
         continue;
       }
@@ -49245,23 +49404,23 @@ async function discoverSessionWorktreeOnDisk(options) {
   for (const key of keys) {
     if (isCliImmediateShutdownRequested()) return null;
     await yieldToEventLoop();
-    const layoutRoot = path61.join(worktreesRootPath, key);
+    const layoutRoot = path63.join(worktreesRootPath, key);
     let layoutSt;
     try {
-      layoutSt = await fs42.promises.stat(layoutRoot);
+      layoutSt = await fs44.promises.stat(layoutRoot);
     } catch {
       continue;
     }
     if (!layoutSt.isDirectory()) continue;
-    const sessionDir = path61.join(layoutRoot, sid);
+    const sessionDir = path63.join(layoutRoot, sid);
     const nested = await tryBindingFromSessionDirectory(sessionDir);
     if (nested) return nested;
     const legacy = await collectWorktreeRootsNamed(layoutRoot, sid);
     if (legacy.paths.length > 0) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacy.paths) ?? path61.resolve(legacy.paths[0]);
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacy.paths) ?? path63.resolve(legacy.paths[0]);
       return {
-        sessionParentPath: path61.resolve(isolated),
-        repoCheckoutPaths: legacy.paths.map((p) => path61.resolve(p))
+        sessionParentPath: path63.resolve(isolated),
+        repoCheckoutPaths: legacy.paths.map((p) => path63.resolve(p))
       };
     }
   }
@@ -49269,31 +49428,31 @@ async function discoverSessionWorktreeOnDisk(options) {
 }
 
 // src/worktrees/discovery/discover-session-worktrees-under-session-worktree-root.ts
-import * as fs43 from "node:fs";
-import * as path63 from "node:path";
+import * as fs45 from "node:fs";
+import * as path65 from "node:path";
 
 // src/worktrees/discovery/discover-legacy-binding-ascending-from-checkout.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as path62 from "node:path";
+import * as path64 from "node:path";
 async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPath) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hintR = path62.resolve(checkoutPath);
+  const hintR = path64.resolve(checkoutPath);
   let best = null;
-  let cur = path62.dirname(hintR);
+  let cur = path64.dirname(hintR);
   for (let i = 0; i < 40; i++) {
     if (isCliImmediateShutdownRequested()) return best;
     await yieldToEventLoop();
     const paths = await collectWorktreeRootsNamed(cur, sid);
-    if (paths.paths.some((p) => path62.resolve(p) === hintR)) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path62.resolve(paths.paths[0]);
+    if (paths.paths.some((p) => path64.resolve(p) === hintR)) {
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path64.resolve(paths.paths[0]);
       best = {
-        sessionParentPath: path62.resolve(isolated),
-        repoCheckoutPaths: paths.paths.map((p) => path62.resolve(p))
+        sessionParentPath: path64.resolve(isolated),
+        repoCheckoutPaths: paths.paths.map((p) => path64.resolve(p))
       };
     }
-    const next = path62.dirname(cur);
+    const next = path64.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -49304,12 +49463,12 @@ async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPat
 async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionParentPathOrHint, sessionId) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hint = path63.resolve(sessionParentPathOrHint);
-  const underHint = await tryBindingFromSessionDirectory(path63.join(hint, sid));
+  const hint = path65.resolve(sessionParentPathOrHint);
+  const underHint = await tryBindingFromSessionDirectory(path65.join(hint, sid));
   if (underHint) return underHint;
   const direct = await tryBindingFromSessionDirectory(hint);
   if (direct) {
-    if (path63.basename(hint) === sid && await isGitDir(hint)) {
+    if (path65.basename(hint) === sid && await isGitDir(hint)) {
       const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
       if (legacyFromCheckout && legacyFromCheckout.repoCheckoutPaths.length > direct.repoCheckoutPaths.length) {
         return legacyFromCheckout;
@@ -49317,23 +49476,23 @@ async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionParentPat
     }
     return direct;
   }
-  if (path63.basename(hint) === sid && await isGitDir(hint)) {
+  if (path65.basename(hint) === sid && await isGitDir(hint)) {
     const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
     if (legacyFromCheckout) return legacyFromCheckout;
   }
   let st;
   try {
-    st = await fs43.promises.stat(hint);
+    st = await fs45.promises.stat(hint);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const legacyPaths = await collectWorktreeRootsNamed(hint, sid);
   if (legacyPaths.paths.length === 0) return null;
-  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path63.resolve(legacyPaths.paths[0]);
+  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path65.resolve(legacyPaths.paths[0]);
   return {
-    sessionParentPath: path63.resolve(isolated),
-    repoCheckoutPaths: legacyPaths.paths.map((p) => path63.resolve(p))
+    sessionParentPath: path65.resolve(isolated),
+    repoCheckoutPaths: legacyPaths.paths.map((p) => path65.resolve(p))
   };
 }
 
@@ -49394,11 +49553,11 @@ function parseSessionParent(v) {
 }
 
 // src/worktrees/prepare/prepare-new-isolated-worktrees.ts
-import * as fs47 from "node:fs";
+import * as fs49 from "node:fs";
 
 // src/git/discover-repos.ts
-import * as fs44 from "node:fs";
-import * as path64 from "node:path";
+import * as fs46 from "node:fs";
+import * as path66 from "node:path";
 init_yield_to_event_loop();
 var GIT_DISCOVER_YIELD_EVERY = 32;
 async function yieldGitDiscoverWork(entryCount) {
@@ -49408,14 +49567,14 @@ async function yieldGitDiscoverWork(entryCount) {
 }
 async function discoverGitRepos(cwd = getBridgeRoot()) {
   const result = [];
-  const cwdResolved = path64.resolve(cwd);
+  const cwdResolved = path66.resolve(cwd);
   if (await isGitRepoDirectory(cwdResolved)) {
     const remoteUrl = await getRemoteOriginUrl(cwdResolved);
     result.push({ absolutePath: cwdResolved, remoteUrl });
   }
   let entries;
   try {
-    entries = fs44.readdirSync(cwdResolved, { withFileTypes: true });
+    entries = fs46.readdirSync(cwdResolved, { withFileTypes: true });
   } catch {
     return result;
   }
@@ -49423,7 +49582,7 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
     await yieldGitDiscoverWork(i + 1);
     const ent = entries[i];
     if (!ent.isDirectory()) continue;
-    const childPath2 = path64.join(cwdResolved, ent.name);
+    const childPath2 = path66.join(cwdResolved, ent.name);
     if (await isGitRepoDirectory(childPath2)) {
       const remoteUrl = await getRemoteOriginUrl(childPath2);
       result.push({ absolutePath: childPath2, remoteUrl });
@@ -49432,17 +49591,17 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
   return result;
 }
 async function discoverGitReposUnderRoot(rootPath) {
-  const root = path64.resolve(rootPath);
+  const root = path66.resolve(rootPath);
   const roots = [];
   let walkEntries = 0;
   async function walk(dir) {
     if (await isGitRepoDirectory(dir)) {
-      roots.push(path64.resolve(dir));
+      roots.push(path66.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = fs44.readdirSync(dir, { withFileTypes: true });
+      entries = fs46.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -49450,7 +49609,7 @@ async function discoverGitReposUnderRoot(rootPath) {
       await yieldGitDiscoverWork(++walkEntries);
       const ent = entries[i];
       if (!ent.isDirectory() || ent.name === ".git") continue;
-      await walk(path64.join(dir, ent.name));
+      await walk(path66.join(dir, ent.name));
     }
   }
   await walk(root);
@@ -49466,8 +49625,8 @@ async function discoverGitReposUnderRoot(rootPath) {
 }
 
 // src/worktrees/prepare/add-isolated-repo-worktree.ts
-import * as fs46 from "node:fs";
-import * as path66 from "node:path";
+import * as fs48 from "node:fs";
+import * as path68 from "node:path";
 
 // src/git/worktrees/worktree-add.ts
 async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch, baseRef = "HEAD") {
@@ -49483,8 +49642,8 @@ async function gitWorktreeAddExistingBranch(mainRepoPath, worktreePath, branch)
 }
 
 // src/worktrees/prepare/copy-bridge-files-along-worktree-path.ts
-import * as fs45 from "node:fs";
-import * as path65 from "node:path";
+import * as fs47 from "node:fs";
+import * as path67 from "node:path";
 var BRIDGE_FILES_ALONG_WORKTREE_PATH = ["AGENTS.md"];
 function copyBridgeFilesAlongWorktreePath(options) {
   const { bridgeRoot, scopeDir, repoPathRelativeToBridgeRoot, log: log2 } = options;
@@ -49493,19 +49652,19 @@ function copyBridgeFilesAlongWorktreePath(options) {
   const segments = repoPathRelativeToBridgeRoot.split("/").filter(Boolean);
   for (let i = 0; i < segments.length; i++) {
     const prefix = segments.slice(0, i).join("/");
-    const bridgeDir = prefix ? path65.join(bridgeRoot, prefix) : bridgeRoot;
-    const destDir = prefix ? path65.join(scopeDir, prefix) : scopeDir;
+    const bridgeDir = prefix ? path67.join(bridgeRoot, prefix) : bridgeRoot;
+    const destDir = prefix ? path67.join(scopeDir, prefix) : scopeDir;
     for (const fileName of fileNames) {
       copyFileIfPresent(bridgeDir, destDir, fileName, log2);
     }
   }
 }
 function copyFileIfPresent(srcDir, destDir, fileName, log2) {
-  const src = path65.join(srcDir, fileName);
-  if (!fs45.existsSync(src)) return;
-  const dest = path65.join(destDir, fileName);
+  const src = path67.join(srcDir, fileName);
+  if (!fs47.existsSync(src)) return;
+  const dest = path67.join(destDir, fileName);
   try {
-    fs45.copyFileSync(src, dest);
+    fs47.copyFileSync(src, dest);
     log2?.(`[worktrees] Copied ${fileName} to ${dest}`);
   } catch (e) {
     log2?.(
@@ -49537,16 +49696,16 @@ async function addIsolatedRepoWorktree(options) {
     worktreeBaseBranches,
     log: log2
   } = options;
-  const repoPathRelativeToBridgeRootRaw = path66.relative(bridgeResolved, repoAbsolutePath);
-  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path66.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
+  const repoPathRelativeToBridgeRootRaw = path68.relative(bridgeResolved, repoAbsolutePath);
+  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path68.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
     return null;
   }
   const repoPathRelativeToBridgeRoot = normalizeRepoPathRelativeToWorkspaceRoot(
     repoPathRelativeToBridgeRootRaw === "" ? "." : repoPathRelativeToBridgeRootRaw
   );
-  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path66.join(scopeDir, repoPathRelativeToBridgeRoot);
+  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path68.join(scopeDir, repoPathRelativeToBridgeRoot);
   if (repoPathRelativeToBridgeRoot !== ".") {
-    fs46.mkdirSync(path66.dirname(worktreePath), { recursive: true });
+    fs48.mkdirSync(path68.dirname(worktreePath), { recursive: true });
     copyBridgeFilesAlongWorktreePath({
       bridgeRoot: bridgeResolved,
       scopeDir,
@@ -49574,7 +49733,7 @@ async function addIsolatedRepoWorktree(options) {
 }
 
 // src/worktrees/prepare/resolve-isolated-scope-dir.ts
-import * as path67 from "node:path";
+import * as path69 from "node:path";
 
 // src/worktrees/worktree-layout-kind.ts
 function sanitizeWorktreeBranchSegment(value) {
@@ -49604,10 +49763,10 @@ function previewDeployBranchName(environmentId) {
 
 // src/worktrees/prepare/resolve-isolated-scope-dir.ts
 function resolveIsolatedScopeDir(options) {
-  const bridgeResolved = path67.resolve(options.bridgeRoot);
+  const bridgeResolved = path69.resolve(options.bridgeRoot);
   const cwdKey = allocateDirNameForLauncherCwd(options.layout, bridgeResolved);
-  const bridgeKeyDir = path67.join(options.worktreesRootPath, cwdKey);
-  const scopeDir = path67.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
+  const bridgeKeyDir = path69.join(options.worktreesRootPath, cwdKey);
+  const scopeDir = path69.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
   return { bridgeResolved, scopeDir };
 }
 
@@ -49637,7 +49796,7 @@ async function prepareNewIsolatedWorktrees(options) {
     return null;
   }
   const worktreePaths = [];
-  fs47.mkdirSync(scopeDir, { recursive: true });
+  fs49.mkdirSync(scopeDir, { recursive: true });
   await forEachWithGitYield(repos, async (repo) => {
     const worktreePath = await addIsolatedRepoWorktree({
       kind,
@@ -49709,10 +49868,10 @@ async function resolveExistingSessionParentPath(sessionId, cache2, discover) {
 }
 
 // src/worktrees/manager/resolve-explicit-session-parent-path.ts
-import * as path68 from "node:path";
+import * as path70 from "node:path";
 init_yield_to_event_loop();
 async function resolveExplicitSessionParentPath(params) {
-  const resolved = path68.resolve(params.parentPathRaw);
+  const resolved = path70.resolve(params.parentPathRaw);
   if (parseSessionParent(params.sessionParent) !== "worktrees_root") {
     return resolved;
   }
@@ -49729,7 +49888,7 @@ async function resolveExplicitSessionParentPath(params) {
     await yieldToEventLoop();
     const tryRoot = await discoverSessionWorktreesUnderSessionWorktreeRoot(cur, params.sessionId);
     if (tryRoot) return rememberAndReturn(tryRoot);
-    const next = path68.dirname(cur);
+    const next = path70.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -49890,15 +50049,15 @@ var SessionWorktreeManager = class {
 };
 
 // src/worktrees/discovery/discover-preview-worktree-on-disk.ts
-import * as fs48 from "node:fs";
-import * as path69 from "node:path";
+import * as fs50 from "node:fs";
+import * as path71 from "node:path";
 init_yield_to_event_loop();
 async function discoverPreviewWorktreeOnDisk(options) {
   const { environmentId, worktreesRootPath, layout, bridgeRoot } = options;
   const eid = environmentId.trim();
   if (!eid) return null;
   try {
-    await fs48.promises.access(worktreesRootPath);
+    await fs50.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -49907,13 +50066,13 @@ async function discoverPreviewWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs48.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs50.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path69.join(worktreesRootPath, name);
+      const p = path71.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs48.promises.stat(p);
+        st = await fs50.promises.stat(p);
       } catch {
         continue;
       }
@@ -49927,7 +50086,7 @@ async function discoverPreviewWorktreeOnDisk(options) {
   const previewDirRel = layoutDirSegments("preview_environment", eid);
   for (const key of keys) {
     await yieldToEventLoop();
-    const previewDir = path69.join(worktreesRootPath, key, ...previewDirRel);
+    const previewDir = path71.join(worktreesRootPath, key, ...previewDirRel);
     const binding = await tryBindingFromIsolatedDirectory(previewDir);
     if (binding) return binding;
   }
@@ -50054,7 +50213,7 @@ var PreviewWorktreeManager = class {
 };
 
 // src/worktrees/deploy/deploy-session-to-preview-environment.ts
-import * as path73 from "node:path";
+import * as path75 from "node:path";
 
 // src/git/worktrees/reset-worktree-to-branch.ts
 async function gitResetWorktreeToBranch(worktreePath, branch) {
@@ -50065,8 +50224,8 @@ async function gitResetWorktreeToBranch(worktreePath, branch) {
 }
 
 // src/worktrees/deploy/capture-and-apply-wip.ts
-import * as fs49 from "node:fs";
-import * as path70 from "node:path";
+import * as fs51 from "node:fs";
+import * as path72 from "node:path";
 
 // src/git/snapshot/git.ts
 var SNAPSHOT_GIT_TIMEOUT_MS = 5e3;
@@ -50121,12 +50280,12 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
     if (!ap.ok) return ap;
   }
   await forEachWithGitYield(wip.untrackedPaths, async (rel) => {
-    const src = path70.join(sourceRepoPath, rel);
-    const dst = path70.join(targetRepoPath, rel);
+    const src = path72.join(sourceRepoPath, rel);
+    const dst = path72.join(targetRepoPath, rel);
     try {
-      if (!fs49.existsSync(src)) return;
-      fs49.mkdirSync(path70.dirname(dst), { recursive: true });
-      fs49.copyFileSync(src, dst);
+      if (!fs51.existsSync(src)) return;
+      fs51.mkdirSync(path72.dirname(dst), { recursive: true });
+      fs51.copyFileSync(src, dst);
     } catch (e) {
       log2(
         `[worktrees] Failed to copy untracked ${rel}: ${e instanceof Error ? e.message : String(e)}`
@@ -50137,14 +50296,14 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
 }
 
 // src/worktrees/deploy/resolve-isolated-checkout-for-repo-path-relative-to-workspace-root.ts
-import * as path71 from "node:path";
+import * as path73 from "node:path";
 async function resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot(options) {
   const { checkoutPaths, sessionParentPath, bridgeRoot, repoPathRelativeToWorkspaceRoot } = options;
-  const resolvedSessionParentPath = sessionParentPath ? path71.resolve(sessionParentPath) : null;
+  const resolvedSessionParentPath = sessionParentPath ? path73.resolve(sessionParentPath) : null;
   let match = null;
   await forEachWithGitYield(checkoutPaths, async (checkoutPath) => {
     if (match) return;
-    const resolvedCheckoutPath = path71.resolve(checkoutPath);
+    const resolvedCheckoutPath = path73.resolve(checkoutPath);
     if (!await isGitRepoDirectory(resolvedCheckoutPath)) return;
     const resolvedRepoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath: resolvedCheckoutPath,
@@ -50198,7 +50357,7 @@ async function applySessionWipToPreviewCheckouts(options) {
 }
 
 // src/worktrees/deploy/collect-session-repo-deploy-states.ts
-import * as path72 from "node:path";
+import * as path74 from "node:path";
 
 // src/git/branches/create-or-update-branch.ts
 async function gitCreateOrUpdateBranch(repoPath, branch, startRef, options) {
@@ -50235,19 +50394,19 @@ async function collectSessionRepoDeployStates(options) {
   const sessionParentPath = sessionWorktreeManager.getSessionParentPath(sid);
   const states = [];
   await forEachWithGitYield(sessionTargets, async (sessionCheckout) => {
-    const checkoutPath = path72.resolve(sessionCheckout);
+    const checkoutPath = path74.resolve(sessionCheckout);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
       bridgeRoot,
-      sessionParentPath: sessionParentPath ? path72.resolve(sessionParentPath) : null
+      sessionParentPath: sessionParentPath ? path74.resolve(sessionParentPath) : null
     });
     if (!repoPathRelativeToWorkspaceRoot) return;
     const mainRepoPath = resolveMainRepoPath(checkoutPath);
     const headSha = (await cliSimpleGit(checkoutPath).revparse(["HEAD"])).trim();
     const previewCheckout = previewCheckoutPaths.length > 0 ? await resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot({
       checkoutPaths: previewCheckoutPaths,
-      sessionParentPath: previewParentPath ? path72.resolve(previewParentPath) : null,
+      sessionParentPath: previewParentPath ? path74.resolve(previewParentPath) : null,
       bridgeRoot,
       repoPathRelativeToWorkspaceRoot
     }) : null;
@@ -50267,7 +50426,7 @@ async function deploySessionToPreviewEnvironment(options) {
   const eid = options.environmentId.trim();
   if (!sid || !eid) return { ok: false, error: "sessionId and environmentId are required" };
   const deployBranch = previewDeployBranchName(eid);
-  const bridgeRoot = path73.resolve(getBridgeRoot());
+  const bridgeRoot = path75.resolve(getBridgeRoot());
   await previewWorktreeManager.ensureCached(eid);
   const existingPreviewParentPath = previewWorktreeManager.getPreviewParentPath(eid) ?? null;
   const existingPreviewCheckoutPaths = previewWorktreeManager.getRepoCheckoutPaths(eid) ?? [];
@@ -50307,10 +50466,10 @@ async function deploySessionToPreviewEnvironment(options) {
 }
 
 // src/worktrees/manager/default-worktrees-root-path.ts
-import * as path74 from "node:path";
-import os9 from "node:os";
+import * as path76 from "node:path";
+import os10 from "node:os";
 function defaultWorktreesRootPath() {
-  return path74.join(os9.homedir(), ".buildautomaton", "worktrees");
+  return path76.join(os10.homedir(), ".buildautomaton", "worktrees");
 }
 
 // src/connection/create-bridge-worktree-managers.ts
@@ -50440,14 +50599,14 @@ function assertBridgeWorkspace(ctx) {
 }
 
 // src/files/list-dir/index.ts
-import fs51 from "node:fs";
+import fs53 from "node:fs";
 
 // src/files/ensure-under-cwd.ts
-import path75 from "node:path";
+import path77 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path75.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path75.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path75.sep) && resolved !== cwd) {
+  const normalized = path77.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path77.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path77.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -50460,15 +50619,15 @@ init_yield_to_event_loop();
 var LIST_DIR_YIELD_EVERY = 256;
 
 // src/files/list-dir/map-dir-entry.ts
-import path76 from "node:path";
-import fs50 from "node:fs";
+import path78 from "node:path";
+import fs52 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path76.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path76.join(resolved, d.name);
+  const entryPath = path78.join(relativePath || ".", d.name).replace(/\\/g, "/");
+  const fullPath = path78.join(resolved, d.name);
   let isDir = d.isDirectory();
   if (d.isSymbolicLink()) {
     try {
-      const targetStat = await fs50.promises.stat(fullPath);
+      const targetStat = await fs52.promises.stat(fullPath);
       isDir = targetStat.isDirectory();
     } catch {
       isDir = false;
@@ -50498,7 +50657,7 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs51.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs53.promises.readdir(resolved, { withFileTypes: true });
     const entries = [];
     for (let i = 0; i < names.length; i++) {
       if (i > 0 && i % LIST_DIR_YIELD_EVERY === 0) {
@@ -50514,13 +50673,13 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
 }
 
 // src/git/tree/resolve-repo-abs-path.ts
-import * as path77 from "node:path";
+import * as path79 from "node:path";
 function resolveRepoAbsPathFromBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path77.resolve(bridgeRoot);
+  const bridgeResolved = path79.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path77.join(bridgeResolved, rel);
-  const resolved = path77.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path77.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path79.join(bridgeResolved, rel);
+  const resolved = path79.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path79.sep) && resolved !== bridgeResolved) {
     return null;
   }
   return resolved;
@@ -51001,25 +51160,25 @@ async function GET2(ctx) {
 init_in_flight();
 
 // src/files/read/read-file-async.ts
-import fs57 from "node:fs";
+import fs59 from "node:fs";
 init_yield_to_event_loop();
 
 // src/files/read/resolve-file-cache.ts
-import fs52 from "node:fs";
-import path78 from "node:path";
+import fs54 from "node:fs";
+import path80 from "node:path";
 var RESOLVE_CACHE_MAX = 4096;
 var resolveCache = /* @__PURE__ */ new Map();
 function resolveCacheKey(sessionParentPath, relativePath) {
   return `${sessionParentPath}\0${relativePath}`;
 }
 function pathStaysUnderParent(filePath, sessionParentPath) {
-  const parent = path78.resolve(sessionParentPath);
-  const resolved = path78.resolve(filePath);
-  return resolved === parent || resolved.startsWith(`${parent}${path78.sep}`);
+  const parent = path80.resolve(sessionParentPath);
+  const resolved = path80.resolve(filePath);
+  return resolved === parent || resolved.startsWith(`${parent}${path80.sep}`);
 }
 function statMatchesCacheSync(entry) {
   try {
-    const stat2 = fs52.statSync(entry.path);
+    const stat2 = fs54.statSync(entry.path);
     return stat2.isFile() && stat2.mtimeMs === entry.mtimeMs && stat2.size === entry.size;
   } catch {
     return false;
@@ -51052,7 +51211,7 @@ function joinInflightResolve(cacheKey, factory) {
 }
 
 // src/files/read/resolve-file-for-read-core.ts
-import fs53 from "node:fs";
+import fs55 from "node:fs";
 import { isMainThread as isMainThread4 } from "node:worker_threads";
 function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   const cacheKey = resolveCacheKey(sessionParentPath, relativePath);
@@ -51062,13 +51221,13 @@ function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = fs53.lstatSync(resolved);
+    const lstat = fs55.lstatSync(resolved);
     if (lstat.isSymbolicLink()) {
-      real = fs53.realpathSync(resolved);
+      real = fs55.realpathSync(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat2 = fs53.statSync(real);
+      const stat2 = fs55.statSync(real);
       if (!stat2.isFile()) return { error: "Not a file" };
       size = stat2.size;
       mtimeMs = stat2.mtimeMs;
@@ -51096,13 +51255,13 @@ async function resolveFileForReadImpl(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = await fs53.promises.lstat(resolved);
+    const lstat = await fs55.promises.lstat(resolved);
     if (lstat.isSymbolicLink()) {
-      real = await fs53.promises.realpath(resolved);
+      real = await fs55.promises.realpath(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat2 = await fs53.promises.stat(real);
+      const stat2 = await fs55.promises.stat(real);
       if (!stat2.isFile()) return { error: "Not a file" };
       size = stat2.size;
       mtimeMs = stat2.mtimeMs;
@@ -51151,7 +51310,7 @@ async function resolveFilePathAsync(relativePath, sessionParentPath = getBridgeR
 
 // src/files/read/read-file-range-async.ts
 init_yield_to_event_loop();
-import fs54 from "node:fs";
+import fs56 from "node:fs";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 
 // src/files/read/read-file-range-line-zero.ts
@@ -51265,8 +51424,8 @@ function finishLineZeroTail(state, tail, resultLines, fileSize, lineChunkSize, l
 
 // src/files/read/read-file-range-async.ts
 async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE, fileSizeIn) {
-  const fileSize = fileSizeIn ?? (await fs54.promises.stat(filePath)).size;
-  const fd = await fs54.promises.open(filePath, "r");
+  const fileSize = fileSizeIn ?? (await fs56.promises.stat(filePath)).size;
+  const fd = await fs56.promises.open(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder2("utf8");
@@ -51367,7 +51526,7 @@ async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, li
 }
 
 // src/files/read/read-small-file-range-async.ts
-import fs55 from "node:fs";
+import fs57 from "node:fs";
 import { isMainThread as isMainThread5 } from "node:worker_threads";
 var SMALL_FILE_RANGE_MAX_BYTES = 512 * 1024;
 function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize) {
@@ -51397,7 +51556,7 @@ function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize,
   };
 }
 function readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const raw = fs55.readFileSync(filePath, "utf8");
+  const raw = fs57.readFileSync(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
@@ -51405,28 +51564,28 @@ async function readSmallFileRangeAsync(filePath, fileSize, startLine, endLine, l
   if (isMainThread5) {
     return readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize);
   }
-  const raw = await fs55.promises.readFile(filePath, "utf8");
+  const raw = await fs57.promises.readFile(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
 
 // src/files/read/read-file-buffer-full-async.ts
 init_yield_to_event_loop();
-import fs56 from "node:fs";
+import fs58 from "node:fs";
 import { isMainThread as isMainThread6 } from "node:worker_threads";
 var READ_CHUNK_BYTES = 256 * 1024;
 var MAIN_THREAD_SYNC_READ_MAX_BYTES = 512 * 1024;
 async function readFileBufferFullAsync(filePath, knownSize) {
   if (isMainThread6) {
-    const size2 = knownSize ?? fs56.statSync(filePath).size;
+    const size2 = knownSize ?? fs58.statSync(filePath).size;
     if (size2 <= MAIN_THREAD_SYNC_READ_MAX_BYTES) {
       await yieldToEventLoop();
-      const buffer = fs56.readFileSync(filePath);
+      const buffer = fs58.readFileSync(filePath);
       return { buffer, size: buffer.length };
     }
   }
-  const size = knownSize ?? (await fs56.promises.stat(filePath)).size;
-  const fd = await fs56.promises.open(filePath, "r");
+  const size = knownSize ?? (await fs58.promises.stat(filePath)).size;
+  const fd = await fs58.promises.open(filePath, "r");
   const chunks = [];
   let position = 0;
   let bytesSinceYield = 0;
@@ -51529,7 +51688,7 @@ async function readFileAsync(relativePath, startLine, endLine, lineOffset, lineC
     }
     if (hasRange) {
       if (fileSize == null) {
-        const stat2 = await fs57.promises.stat(resolvedPath);
+        const stat2 = await fs59.promises.stat(resolvedPath);
         fileSize = stat2.size;
       }
       const read2 = fileSize <= SMALL_FILE_RANGE_MAX_BYTES ? await readSmallFileRangeAsync(
@@ -51827,12 +51986,12 @@ function parseOptionalInt2(raw) {
   return Number.isInteger(parsed) ? parsed : void 0;
 }
 function parseCodeNavParams(url2) {
-  const path86 = url2.searchParams.get("path") ?? "";
+  const path88 = url2.searchParams.get("path") ?? "";
   const opRaw = url2.searchParams.get("op")?.trim();
   const op = opRaw === "references" ? "references" : opRaw === "symbols" ? "symbols" : opRaw === "definitions" ? "definitions" : "definition";
   const line = parseOptionalInt2(url2.searchParams.get("line")) ?? 1;
   const column = parseOptionalInt2(url2.searchParams.get("column")) ?? 0;
-  return { path: path86, op, line, column };
+  return { path: path88, op, line, column };
 }
 function parseCodeNavPath(url2) {
   const raw = url2.searchParams.get("path")?.trim();
@@ -52630,18 +52789,18 @@ function hasRunningTurn(turns) {
 }
 
 // src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
-import fs60 from "node:fs";
+import fs62 from "node:fs";
 
 // src/git/snapshot/capture.ts
-import * as fs59 from "node:fs";
-import * as path80 from "node:path";
+import * as fs61 from "node:fs";
+import * as path82 from "node:path";
 
 // src/git/snapshot/apply-pre-turn-snapshot.ts
-import * as fs58 from "node:fs";
+import * as fs60 from "node:fs";
 async function applyPreTurnSnapshot(filePath, log2) {
   let data;
   try {
-    data = JSON.parse(fs58.readFileSync(filePath, "utf8"));
+    data = JSON.parse(fs60.readFileSync(filePath, "utf8"));
   } catch (error51) {
     return { ok: false, error: error51 instanceof Error ? error51.message : String(error51) };
   }
@@ -52670,18 +52829,18 @@ async function applyPreTurnSnapshot(filePath, log2) {
 }
 
 // src/git/snapshot/resolve-repo-roots.ts
-import * as path79 from "node:path";
+import * as path81 from "node:path";
 async function resolveSnapshotRepoRoots(options) {
   const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
   if (worktreePaths?.length) {
-    const paths = [...new Set(worktreePaths.map((p) => path79.resolve(p)))];
+    const paths = [...new Set(worktreePaths.map((p) => path81.resolve(p)))];
     return (await Promise.all(paths.map(async (p) => await isGitRepoDirectory(p) ? p : null))).filter((p) => p != null);
   }
   try {
     const roots = (await discoverGitReposUnderRoot(fallbackCwd)).map((repo) => repo.absolutePath);
     const sid = sessionId?.trim();
     if (!sid) return roots;
-    const sessionRoots = roots.filter((root) => path79.basename(root) === sid);
+    const sessionRoots = roots.filter((root) => path81.basename(root) === sid);
     return sessionRoots.length > 0 ? sessionRoots : roots;
   } catch (error51) {
     log2(`[snapshot] Discover repositories failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
@@ -52703,7 +52862,7 @@ async function capturePreTurnSnapshot(options) {
   });
   const dir = snapshotsDirForCwd(agentCwd);
   try {
-    fs59.mkdirSync(dir, { recursive: true });
+    fs61.mkdirSync(dir, { recursive: true });
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -52712,9 +52871,9 @@ async function capturePreTurnSnapshot(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     repos
   };
-  const filePath = path80.join(dir, `${runId}.json`);
+  const filePath = path82.join(dir, `${runId}.json`);
   try {
-    fs59.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
+    fs61.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -52734,7 +52893,7 @@ async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   const agentBase = deps.sessionWorktreeManager.getSessionWorktreeRootForSession(sid) ?? getBridgeRoot();
   const file2 = snapshotFilePath(agentBase, tid);
   try {
-    await fs60.promises.access(file2, fs60.constants.F_OK);
+    await fs62.promises.access(file2, fs62.constants.F_OK);
   } catch {
     deps.log(
       `[Queue] requeued_with_revert: no pre-turn snapshot for ${tid.slice(0, 8)}\u2026; continuing without revert.`
@@ -53385,6 +53544,7 @@ var handleRenameSessionBranchMessage = (msg, deps) => {
 var handleSessionArchivedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
+  cleanupSessionPlans(sessionId);
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
@@ -53392,11 +53552,12 @@ var handleSessionArchivedMessage = (msg, deps) => {
 var handleSessionDiscardedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
+  cleanupSessionPlans(sessionId);
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
 // src/routing/handlers/revert-turn-snapshot.ts
-import * as fs61 from "node:fs";
+import * as fs63 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -53409,7 +53570,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
     const file2 = snapshotFilePath(agentBase, turnId);
     try {
-      await fs61.promises.access(file2, fs61.constants.F_OK);
+      await fs63.promises.access(file2, fs63.constants.F_OK);
     } catch {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
@@ -53507,8 +53668,8 @@ function isValidRemoteSkillInstallItem(item) {
 
 // src/skills/install/install-remote-skills-async.ts
 init_yield_to_event_loop();
-import fs62 from "node:fs";
-import path81 from "node:path";
+import fs64 from "node:fs";
+import path83 from "node:path";
 
 // src/skills/install/constants.ts
 var INSTALL_SKILLS_YIELD_EVERY = 16;
@@ -53519,12 +53680,12 @@ async function writeInstallFileAsync(skillDir, f, filesWritten) {
   if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
     await yieldToEventLoop();
   }
-  const dest = path81.join(skillDir, f.path);
-  await fs62.promises.mkdir(path81.dirname(dest), { recursive: true });
+  const dest = path83.join(skillDir, f.path);
+  await fs64.promises.mkdir(path83.dirname(dest), { recursive: true });
   if (f.text !== void 0) {
-    await fs62.promises.writeFile(dest, f.text, "utf8");
+    await fs64.promises.writeFile(dest, f.text, "utf8");
   } else if (f.base64) {
-    await fs62.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
+    await fs64.promises.writeFile(dest, Buffer.from(f.base64, "base64"));
   }
 }
 async function installRemoteSkillsAsync(cwd, targetDir, items) {
@@ -53536,7 +53697,7 @@ async function installRemoteSkillsAsync(cwd, targetDir, items) {
   try {
     for (const item of items) {
       if (!isValidRemoteSkillInstallItem(item)) continue;
-      const skillDir = path81.join(cwd, targetDir, item.skillName);
+      const skillDir = path83.join(cwd, targetDir, item.skillName);
       for (const f of item.files) {
         await writeInstallFileAsync(skillDir, f, filesWritten);
       }
@@ -53899,13 +54060,13 @@ function handleFileBrowserRequest(msg, socket, e2ee, sessionWorktreeManager) {
 
 // src/files/handle-file-browser-search.ts
 init_yield_to_event_loop();
-import path82 from "node:path";
+import path84 from "node:path";
 var SEARCH_LIMIT = 100;
 function handleFileBrowserSearch(msg, socket, e2ee, sessionWorktreeManager) {
   void (async () => {
     await yieldToEventLoop();
     const q = typeof msg.q === "string" ? msg.q : "";
-    const sessionParentPath = path82.resolve(
+    const sessionParentPath = path84.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -54003,7 +54164,7 @@ function handleFileBrowserCodeNavMessage(msg, { getWs, e2ee, sessionWorktreeMana
 }
 
 // src/git/bridge-git-context.ts
-import * as path83 from "node:path";
+import * as path85 from "node:path";
 init_yield_to_event_loop();
 
 // src/git/branches/get-current-branch.ts
@@ -54071,12 +54232,12 @@ function listPendingCheckouts() {
 // src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
-    return path83.basename(path83.resolve(bridgeRoot)) || "repo";
+    return path85.basename(path85.resolve(bridgeRoot)) || "repo";
   }
-  return path83.basename(relPath) || relPath;
+  return path85.basename(relPath) || relPath;
 }
 async function discoverGitReposForBridgeContext(bridgeRoot) {
-  const root = path83.resolve(bridgeRoot);
+  const root = path85.resolve(bridgeRoot);
   if (await isGitRepoDirectory(root)) {
     const remoteUrl = await getRemoteOriginUrl(root);
     return [{ absolutePath: root, remoteUrl }];
@@ -54084,19 +54245,19 @@ async function discoverGitReposForBridgeContext(bridgeRoot) {
   const [deep, shallow] = await Promise.all([discoverGitReposUnderRoot(root), discoverGitRepos(root)]);
   const byPath = /* @__PURE__ */ new Map();
   for (const repo of [...deep, ...shallow]) {
-    byPath.set(path83.resolve(repo.absolutePath), repo);
+    byPath.set(path85.resolve(repo.absolutePath), repo);
   }
   return [...byPath.values()];
 }
 async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path83.resolve(bridgeRoot);
+  const bridgeResolved = path85.resolve(bridgeRoot);
   const repos = await discoverGitReposForBridgeContext(bridgeResolved);
   const rows = [];
   for (let i = 0; i < repos.length; i++) {
     if (i > 0) await yieldToEventLoop();
     const repo = repos[i];
-    let rel = path83.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path83.isAbsolute(rel)) continue;
+    let rel = path85.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path85.isAbsolute(rel)) continue;
     const relPath = rel === "" ? "." : rel.replace(/\\/g, "/");
     const currentBranch = await getCurrentBranch(repo.absolutePath);
     const remoteUrl = repo.remoteUrl.trim() || null;
@@ -54127,11 +54288,11 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
   return rows;
 }
 async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path83.resolve(bridgeRoot);
+  const bridgeResolved = path85.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path83.join(bridgeResolved, rel);
-  const resolved = path83.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path83.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path85.join(bridgeResolved, rel);
+  const resolved = path85.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path85.sep) && resolved !== bridgeResolved) {
     return [];
   }
   return listRepoBranchRefs(resolved);
@@ -54181,8 +54342,8 @@ function handleListRepoBranchesRequestMessage(msg, getWs) {
 }
 
 // src/git/checkout/bridge-git-checkout.ts
-import * as fs64 from "node:fs/promises";
-import * as path85 from "node:path";
+import * as fs66 from "node:fs/promises";
+import * as path87 from "node:path";
 
 // src/git/checkout/normalize-clone-url.ts
 function normalizeCloneUrl(url2) {
@@ -54202,12 +54363,12 @@ function cloneUrlWithHttpsAuth(url2, auth) {
 }
 
 // src/git/checkout/resolve-checkout-target.ts
-import * as fs63 from "node:fs/promises";
-import * as path84 from "node:path";
+import * as fs65 from "node:fs/promises";
+import * as path86 from "node:path";
 var FOLDER_NAME_RE = /^[A-Za-z0-9._-]+$/;
 async function pathExists(p) {
   try {
-    await fs63.access(p);
+    await fs65.access(p);
     return true;
   } catch {
     return false;
@@ -54219,7 +54380,7 @@ async function resolveCheckoutTarget(opts) {
     if (await isGitRepoDirectory(bridgeRoot)) {
       throw new Error("Bridge root is already a git repository");
     }
-    const entries = await fs63.readdir(bridgeRoot).catch(() => []);
+    const entries = await fs65.readdir(bridgeRoot).catch(() => []);
     if (entries.length > 0) {
       throw new Error("Bridge root must be empty to initialize a monorepo checkout");
     }
@@ -54232,8 +54393,8 @@ async function resolveCheckoutTarget(opts) {
   if (await isGitRepoDirectory(bridgeRoot)) {
     throw new Error("Cannot add a nested repo while the bridge root is itself a git repository");
   }
-  const targetDir = path84.resolve(bridgeRoot, folder);
-  if (!targetDir.startsWith(bridgeRoot + path84.sep)) {
+  const targetDir = path86.resolve(bridgeRoot, folder);
+  if (!targetDir.startsWith(bridgeRoot + path86.sep)) {
     throw new Error("Invalid folderName");
   }
   if (await pathExists(targetDir)) {
@@ -54252,10 +54413,10 @@ async function bridgeGitCheckout(params) {
   });
   const folderName = relPath === "." ? "repo" : relPath;
   beginPendingCheckout({ relPath, folderName, remoteUrl: cloneUrl });
-  const parent = path85.dirname(targetDir);
-  await fs64.mkdir(parent, { recursive: true });
+  const parent = path87.dirname(targetDir);
+  await fs66.mkdir(parent, { recursive: true });
   if (relPath !== ".") {
-    await fs64.mkdir(targetDir, { recursive: true });
+    await fs66.mkdir(targetDir, { recursive: true });
   }
   const url2 = cloneUrlWithHttpsAuth(cloneUrl, params.auth ?? null);
   try {
@@ -54266,7 +54427,7 @@ async function bridgeGitCheckout(params) {
     return { relPath, folderName };
   } catch (e) {
     if (relPath !== ".") {
-      await fs64.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
+      await fs66.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
     }
     const msg = e instanceof Error ? e.message : String(e);
     throw new Error(