@buildautomaton/cli 0.1.57 → 0.1.59

package/dist/cli.js

@@ -973,7 +973,7 @@ var require_command = __commonJS({
   "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js"(exports) {
     var EventEmitter2 = __require("node:events").EventEmitter;
     var childProcess2 = __require("node:child_process");
-    var path75 = __require("node:path");
+    var path76 = __require("node:path");
     var fs53 = __require("node:fs");
     var process8 = __require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
@@ -1906,9 +1906,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path75.resolve(baseDir, baseName);
+          const localBin = path76.resolve(baseDir, baseName);
           if (fs53.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path75.extname(baseName))) return void 0;
+          if (sourceExt.includes(path76.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
             (ext) => fs53.existsSync(`${localBin}${ext}`)
           );
@@ -1926,17 +1926,17 @@ Expecting one of '${allowedValues.join("', '")}'`);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path75.resolve(
-            path75.dirname(resolvedScriptPath),
+          executableDir = path76.resolve(
+            path76.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path75.basename(
+            const legacyName = path76.basename(
               this._scriptPath,
-              path75.extname(this._scriptPath)
+              path76.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -1947,7 +1947,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path75.extname(executableFile));
+        launchWithNode = sourceExt.includes(path76.extname(executableFile));
         let proc;
         if (process8.platform !== "win32") {
           if (launchWithNode) {
@@ -2787,7 +2787,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path75.basename(filename, path75.extname(filename));
+        this._name = path76.basename(filename, path76.extname(filename));
         return this;
       }
       /**
@@ -2801,9 +2801,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path76) {
-        if (path76 === void 0) return this._executableDir;
-        this._executableDir = path76;
+      executableDir(path77) {
+        if (path77 === void 0) return this._executableDir;
+        this._executableDir = path77;
         return this;
       }
       /**
@@ -7061,8 +7061,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path75, errorMaps, issueData } = params;
-      const fullPath = [...path75, ...issueData.path || []];
+      const { data, path: path76, errorMaps, issueData } = params;
+      const fullPath = [...path76, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -7370,11 +7370,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path75, key) {
+      constructor(parent, value, path76, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path75;
+        this._path = path76;
         this._key = key;
       }
       get path() {
@@ -11099,10 +11099,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path75) {
-  if (!path75)
+function getElementAtPath(obj, path76) {
+  if (!path76)
     return obj;
-  return path75.reduce((acc, key) => acc?.[key], obj);
+  return path76.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -11351,11 +11351,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path75, issues) {
+function prefixIssues(path76, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path75);
+    iss.path.unshift(path76);
     return iss;
   });
 }
@@ -11544,7 +11544,7 @@ function treeifyError(error40, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error41, path75 = []) => {
+  const processError = (error41, path76 = []) => {
     var _a2, _b;
     for (const issue2 of error41.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -11554,7 +11554,7 @@ function treeifyError(error40, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path75, ...issue2.path];
+        const fullpath = [...path76, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11584,9 +11584,9 @@ function treeifyError(error40, _mapper) {
   processError(error40);
   return result;
 }
-function toDotPath(path75) {
+function toDotPath(path76) {
   const segs = [];
-  for (const seg of path75) {
+  for (const seg of path76) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -24592,7 +24592,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(path75, checkUnignored, mode) {
+      test(path76, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -24601,7 +24601,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path75);
+          const matched = rule[mode].test(path76);
           if (!matched) {
             return;
           }
@@ -24622,17 +24622,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path75, originalPath, doThrow) => {
-      if (!isString(path75)) {
+    var checkPath = (path76, originalPath, doThrow) => {
+      if (!isString(path76)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path75) {
+      if (!path76) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path75)) {
+      if (checkPath.isNotRelative(path76)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -24641,7 +24641,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path75) => REGEX_TEST_INVALID_PATH.test(path75);
+    var isNotRelative = (path76) => REGEX_TEST_INVALID_PATH.test(path76);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -24671,19 +24671,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path75 = originalPath && checkPath.convert(originalPath);
+        const path76 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path75,
+          path76,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path75, cache2, checkUnignored, slices);
+        return this._t(path76, cache2, checkUnignored, slices);
       }
-      checkIgnore(path75) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path75)) {
-          return this.test(path75);
+      checkIgnore(path76) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path76)) {
+          return this.test(path76);
         }
-        const slices = path75.split(SLASH).filter(Boolean);
+        const slices = path76.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -24696,18 +24696,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path75, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path76, false, MODE_CHECK_IGNORE);
       }
-      _t(path75, cache2, checkUnignored, slices) {
-        if (path75 in cache2) {
-          return cache2[path75];
+      _t(path76, cache2, checkUnignored, slices) {
+        if (path76 in cache2) {
+          return cache2[path76];
         }
         if (!slices) {
-          slices = path75.split(SLASH).filter(Boolean);
+          slices = path76.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path75] = this._rules.test(path75, checkUnignored, MODE_IGNORE);
+          return cache2[path76] = this._rules.test(path76, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -24715,29 +24715,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path75] = parent.ignored ? parent : this._rules.test(path75, checkUnignored, MODE_IGNORE);
+        return cache2[path76] = parent.ignored ? parent : this._rules.test(path76, checkUnignored, MODE_IGNORE);
       }
-      ignores(path75) {
-        return this._test(path75, this._ignoreCache, false).ignored;
+      ignores(path76) {
+        return this._test(path76, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path75) => !this.ignores(path75);
+        return (path76) => !this.ignores(path76);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path75) {
-        return this._test(path75, this._testCache, true);
+      test(path76) {
+        return this._test(path76, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path75) => checkPath(path75 && checkPath.convert(path75), path75, RETURN_FALSE);
+    var isPathValid = (path76) => checkPath(path76 && checkPath.convert(path76), path76, 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 = (path75) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path75) || isNotRelative(path75);
+      checkPath.isNotRelative = (path76) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path76) || isNotRelative(path76);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -25526,10 +25526,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(path75, isFile, isDirectory) {
-      log2(`checking %s`, path75);
+    function check2(path76, isFile, isDirectory) {
+      log2(`checking %s`, path76);
       try {
-        const stat3 = fs_1.statSync(path75);
+        const stat3 = fs_1.statSync(path76);
         if (stat3.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -25549,8 +25549,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path75, type = exports.READABLE) {
-      return check2(path75, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path76, type = exports.READABLE) {
+      return check2(path76, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -25631,7 +25631,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.57".length > 0 ? "0.1.57" : "0.0.0-dev";
+var CLI_VERSION = "0.1.59".length > 0 ? "0.1.59" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -25639,7 +25639,7 @@ var DEFAULT_FIREHOSE_URL = "https://buildautomaton-firehose.fly.dev";
 
 // src/cli/run-cli-action.ts
 import * as fs52 from "node:fs";
-import * as path74 from "node:path";
+import * as path75 from "node:path";
 
 // src/cli-log-level.ts
 var verbosity = "info";
@@ -27859,7 +27859,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join2(moduleDir, "..", sub, filename),
     join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path75) => existsSync(path75));
+  const resolved = candidates.find((path76) => existsSync(path76));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -28757,6 +28757,81 @@ function isUserEndedSessionTurnErrorText(errorText) {
 // ../types/src/session-kind.ts
 var SESSION_KINDS = ["regular", "planning", "planned"];
 var SESSION_KIND_SET = new Set(SESSION_KINDS);
+function parseSessionKind(raw) {
+  if (raw === "todo") return "planned";
+  if (typeof raw === "string" && SESSION_KIND_SET.has(raw)) return raw;
+  return "regular";
+}
+
+// ../types/src/planning-todo.ts
+function planningTodoTitle(item) {
+  return item.content.title;
+}
+
+// ../types/src/parse-planning-todo-agent-json.ts
+function parsePlanningTodoAgentJson(raw) {
+  if (raw == null || raw.trim() === "") return [];
+  let text = raw.trim();
+  const fence = text.match(/```(?:json)?\s*([\s\S]*?)```/i);
+  if (fence?.[1]) text = fence[1].trim();
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    const start = text.indexOf("[");
+    const end = text.lastIndexOf("]");
+    if (start < 0 || end <= start) return [];
+    try {
+      parsed = JSON.parse(text.slice(start, end + 1));
+    } catch {
+      return [];
+    }
+  }
+  if (!Array.isArray(parsed)) return [];
+  const rows = [];
+  for (const item of parsed) {
+    if (!item || typeof item !== "object" || Array.isArray(item)) continue;
+    const o = item;
+    const title = typeof o.title === "string" ? o.title.trim() : "";
+    const prompt = typeof o.prompt === "string" ? o.prompt.trim() : typeof o.promptText === "string" ? o.promptText.trim() : "";
+    if (!title || !prompt) continue;
+    rows.push({ title, prompt });
+  }
+  return rows;
+}
+
+// ../types/src/build-planning-session-agent-prompt.ts
+var PLANNING_INSTRUCTIONS = [
+  "PLANNING MODE: You must NOT make any changes to the codebase, filesystem, or environment.",
+  "Do not run tools that modify files or execute commands that change state.",
+  "Your only task is to analyze and produce a plan.",
+  "",
+  "Respond with ONLY a single JSON array \u2014 no markdown fences, no other text before or after.",
+  "Each array element must be an object with exactly:",
+  '- "title": a one-line summary of the task',
+  '- "prompt": the full prompt to use when creating a new draft session from this todo',
+  "",
+  "Example:",
+  '[{"title":"Add user login","prompt":"Implement a login form with email and password..."}]'
+].join("\n");
+function buildPlanningSessionAgentPrompt(userPrompt) {
+  return [PLANNING_INSTRUCTIONS, "", "User request:", userPrompt.trim()].join("\n");
+}
+function buildPlanningSessionFollowUpAgentPrompt(userPrompt, existingTodos) {
+  const todoLines = existingTodos.length > 0 ? existingTodos.map((t) => {
+    const status = t.plannedSessionId ? "DONE (draft session already created)" : "OPEN";
+    return `- [${status}] ${planningTodoTitle(t)}`;
+  }).join("\n") : "(none yet)";
+  return [
+    PLANNING_INSTRUCTIONS,
+    "",
+    "Existing todo items from this planning session (consider these when responding; do not duplicate completed items):",
+    todoLines,
+    "",
+    "User follow-up:",
+    userPrompt.trim()
+  ].join("\n");
+}
 
 // ../types/src/change-summary-path.ts
 function normalizeRepoRelativePath(p) {
@@ -28813,9 +28888,9 @@ function parseChangeSummaryJson(raw, allowedPaths, options) {
     const rawPath = typeof o.path === "string" ? o.path.trim() : "";
     const summary = typeof o.summary === "string" ? o.summary.trim() : "";
     if (!rawPath || !summary) continue;
-    const path75 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
-    if (!path75) continue;
-    rows.push({ path: path75, summary: clampSummaryToAtMostTwoLines(summary) });
+    const path76 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
+    if (!path76) continue;
+    rows.push({ path: path76, summary: clampSummaryToAtMostTwoLines(summary) });
   }
   return rows;
 }
@@ -29140,6 +29215,19 @@ function buildCliAutoApprovedPermissionRpcResult(requestParams) {
   };
 }
 
+// ../types/src/acp-agent-text-stream-bucket.ts
+function resolveAgentTextStreamBucket(params) {
+  const k = params.transcriptRowKind;
+  const su = params.sessionUpdate;
+  if (k === "agent_thought_chunk" || su === "agent_thought_chunk" || k === "thinking" || su === "thinking") {
+    return "thought";
+  }
+  if (k === "agent_message_chunk" || su === "agent_message_chunk" || k === "update" || su === "update") {
+    return "message";
+  }
+  return null;
+}
+
 // ../types/src/agent-config.ts
 var AGENT_CONFIG_CLAUDE_PERMISSION_MODE_KEY = "claude_permission_mode";
 var AGENT_CONFIG_CLI_PERMISSION_MODE_KEY = "cli_permission_mode";
@@ -34109,176 +34197,6 @@ function createBridgeOnRequest(opts) {
   };
 }
 
-// src/agents/acp/hooks/extract-acp-file-diffs-from-update/paths-and-text.ts
-import { fileURLToPath as fileURLToPath5 } from "node:url";
-function readOptionalTextField(v) {
-  if (v === null || v === void 0) return "";
-  if (typeof v === "string") return v;
-  return "";
-}
-function normalizePathField(raw) {
-  const t = raw.trim();
-  if (t.startsWith("file://")) {
-    try {
-      return fileURLToPath5(t);
-    } catch {
-      return t;
-    }
-  }
-  return t;
-}
-function extractDiffPath(o) {
-  for (const k of ["path", "file", "filePath", "filepath", "target_path", "targetPath"]) {
-    const v = o[k];
-    if (typeof v === "string" && v.trim()) return normalizePathField(v);
-  }
-  return null;
-}
-
-// src/agents/acp/hooks/extract-acp-file-diffs-from-update/push-diff.ts
-function pushDiffIfComplete(o, sessionParentPath, out) {
-  const t = o.type;
-  if (typeof t !== "string" || t.toLowerCase() !== "diff") return;
-  const rawPath = extractDiffPath(o);
-  if (!rawPath) return;
-  const resolved = resolveWorkspaceFilePath(sessionParentPath, rawPath);
-  if (!resolved) return;
-  const oldText = readOptionalTextField(o.oldText ?? o.old_text ?? o.before ?? o.oldContent);
-  const newText = readOptionalTextField(o.newText ?? o.new_text ?? o.after ?? o.newContent);
-  out.push({ path: resolved.display, oldText, newText });
-}
-
-// src/agents/acp/hooks/extract-acp-file-diffs-from-update/walk-update-for-diffs.ts
-var NEST_KEYS = [
-  "content",
-  "contents",
-  "result",
-  "output",
-  "delta",
-  "toolResult",
-  "tool_result",
-  "data",
-  "arguments"
-];
-function walkValue(value, sessionParentPath, depth, out) {
-  if (depth > 12 || value == null) return;
-  if (Array.isArray(value)) {
-    for (const x of value) walkValue(x, sessionParentPath, depth + 1, out);
-    return;
-  }
-  if (typeof value !== "object") return;
-  const o = value;
-  pushDiffIfComplete(o, sessionParentPath, out);
-  if (o.type === "content" && o.content != null && typeof o.content === "object") {
-    walkValue(o.content, sessionParentPath, depth + 1, out);
-  }
-  for (const k of NEST_KEYS) {
-    if (o.type === "content" && k === "content") continue;
-    const v = o[k];
-    if (v == null) continue;
-    if (k === "arguments" && typeof v === "string") {
-      try {
-        walkValue(JSON.parse(v), sessionParentPath, depth + 1, out);
-      } catch {
-      }
-      continue;
-    }
-    walkValue(v, sessionParentPath, depth + 1, out);
-  }
-}
-
-// src/agents/acp/hooks/extract-acp-file-diffs-from-update/extract.ts
-function extractAcpFileDiffsFromUpdate(update, sessionParentPath) {
-  if (!update || typeof update !== "object") return [];
-  const u = update;
-  const out = [];
-  const content = u.content;
-  if (Array.isArray(content)) {
-    for (const x of content) walkValue(x, sessionParentPath, 0, out);
-  }
-  const byPath = /* @__PURE__ */ new Map();
-  for (const d of out) byPath.set(d.path, d);
-  return [...byPath.values()];
-}
-
-// src/agents/acp/hooks/extract-tool-target-paths.ts
-function addPath(sessionParentPath, raw, out) {
-  if (typeof raw !== "string") return;
-  const trimmed2 = raw.trim();
-  if (!trimmed2) return;
-  const resolved = resolveWorkspaceFilePath(sessionParentPath, trimmed2);
-  if (!resolved) return;
-  out.add(resolved.display);
-}
-function walkLocations(sessionParentPath, loc, out) {
-  if (!Array.isArray(loc)) return;
-  for (const item of loc) {
-    if (item && typeof item === "object") addPath(sessionParentPath, item.path, out);
-  }
-}
-var PATH_KEYS = [
-  "path",
-  "file",
-  "filePath",
-  "filepath",
-  "target_path",
-  "targetPath",
-  "file_path",
-  "target_file"
-];
-function collectFromObject(sessionParentPath, obj, out, depth) {
-  if (depth > 10) return;
-  for (const k of PATH_KEYS) {
-    if (k in obj) addPath(sessionParentPath, obj[k], out);
-  }
-  for (const v of Object.values(obj)) {
-    if (v != null && typeof v === "object") collectUnknown(sessionParentPath, v, out, depth + 1);
-  }
-}
-function collectUnknown(sessionParentPath, v, out, depth) {
-  if (depth > 10 || v == null) return;
-  if (Array.isArray(v)) {
-    for (const x of v) collectUnknown(sessionParentPath, x, out, depth + 1);
-    return;
-  }
-  if (typeof v === "object") collectFromObject(sessionParentPath, v, out, depth);
-}
-function walkContentArray(sessionParentPath, content, out) {
-  if (!Array.isArray(content)) return;
-  for (const item of content) {
-    if (!item || typeof item !== "object") continue;
-    const o = item;
-    if (typeof o.type === "string" && o.type.toLowerCase() === "diff") {
-      for (const k of PATH_KEYS) if (k in o) addPath(sessionParentPath, o[k], out);
-    }
-    if (o.type === "content" && o.content != null && typeof o.content === "object") {
-      const inner = o.content;
-      if (typeof inner.type === "string" && inner.type.toLowerCase() === "diff") {
-        for (const k of PATH_KEYS) if (k in inner) addPath(sessionParentPath, inner[k], out);
-      }
-    }
-  }
-}
-function extractToolTargetDisplayPaths(update, sessionParentPath) {
-  const out = /* @__PURE__ */ new Set();
-  if (!update || typeof update !== "object") return [];
-  const u = update;
-  walkLocations(sessionParentPath, u.locations, out);
-  walkLocations(sessionParentPath, u.fileLocations, out);
-  walkLocations(sessionParentPath, u.file_locations, out);
-  const tc = u.toolCall ?? u.tool_call;
-  if (tc && typeof tc.arguments === "string") {
-    try {
-      const parsed = JSON.parse(tc.arguments);
-      collectUnknown(sessionParentPath, parsed, out, 0);
-    } catch {
-    }
-  }
-  walkContentArray(sessionParentPath, u.content, out);
-  collectFromObject(sessionParentPath, u, out, 0);
-  return [...out];
-}
-
 // src/agents/acp/hooks/bridge-on-session-update/constants.ts
 var PATH_SNAPSHOT_DEBOUNCE_MS = 500;
 
@@ -34426,56 +34344,6 @@ var PathSnapshotTracker = class {
   }
 };
 
-// src/agents/acp/hooks/bridge-on-session-update/send-structured-file-changes.ts
-function sendExtractedDiffsAsSessionFileChanges(diffs, send, sessionParentPath, sessionId, runId, sentPaths, log2) {
-  for (const d of diffs) {
-    try {
-      const patchContent = editSnippetToUnifiedDiff(d.path, d.oldText, d.newText);
-      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, d.path);
-      send({
-        type: "session_file_change",
-        sessionId,
-        runId,
-        path: d.path,
-        oldText: d.oldText,
-        newText: d.newText,
-        patchContent,
-        isDirectory: dirFlags.isDirectory,
-        directoryRemoved: dirFlags.directoryRemoved
-      });
-      sentPaths.add(d.path);
-    } catch (err) {
-      log2(`[Bridge service] Session file change failed for ${d.path}: ${errorMessage(err)}`);
-    }
-  }
-}
-function sendGitHeadVsWorkspaceForToolPaths(mergedPaths, sentPaths, send, sessionParentPath, sessionId, runId, log2) {
-  for (const displayPath of mergedPaths) {
-    if (sentPaths.has(displayPath)) continue;
-    const oldText = readGitHeadBlob(sessionParentPath, displayPath);
-    const newText = readUtf8WorkspaceFile(sessionParentPath, displayPath);
-    if (oldText === newText) continue;
-    try {
-      const patchContent = editSnippetToUnifiedDiff(displayPath, oldText, newText);
-      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, displayPath);
-      send({
-        type: "session_file_change",
-        sessionId,
-        runId,
-        path: displayPath,
-        oldText,
-        newText,
-        patchContent,
-        isDirectory: dirFlags.isDirectory,
-        directoryRemoved: dirFlags.directoryRemoved
-      });
-      sentPaths.add(displayPath);
-    } catch (err) {
-      log2(`[Bridge service] Session file change failed for ${displayPath}: ${errorMessage(err)}`);
-    }
-  }
-}
-
 // src/agents/acp/hooks/bridge-on-session-update/send-session-info-title-update.ts
 function extractSessionInfoTitle(params) {
   if (!params || typeof params !== "object") return null;
@@ -34498,6 +34366,391 @@ function sendSessionInfoTitleUpdate(params) {
   }
 }
 
+// src/agents/acp/hooks/bridge-on-session-update/parse-bridge-session-update.ts
+function parseBridgeSessionUpdate(params) {
+  const p = params;
+  const updateKind = p.sessionUpdate ?? p.session_update ?? p.type ?? "update";
+  const isCompletedToolCallUpdate = updateKind === "tool_call_update" && isCompletedToolStatus(p.status);
+  const toolName = p.toolCall?.name ?? p.tool_call?.name ?? "";
+  const isToolUpdate = updateKind === "tool_call" || updateKind === "tool_call_update" || typeof toolName === "string" && toolName.length > 0;
+  return { updateKind, toolName, isToolUpdate, isCompletedToolCallUpdate };
+}
+
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/paths-and-text.ts
+import { fileURLToPath as fileURLToPath5 } from "node:url";
+function readOptionalTextField(v) {
+  if (v === null || v === void 0) return "";
+  if (typeof v === "string") return v;
+  return "";
+}
+function normalizePathField(raw) {
+  const t = raw.trim();
+  if (t.startsWith("file://")) {
+    try {
+      return fileURLToPath5(t);
+    } catch {
+      return t;
+    }
+  }
+  return t;
+}
+function extractDiffPath(o) {
+  for (const k of ["path", "file", "filePath", "filepath", "target_path", "targetPath"]) {
+    const v = o[k];
+    if (typeof v === "string" && v.trim()) return normalizePathField(v);
+  }
+  return null;
+}
+
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/push-diff.ts
+function pushDiffIfComplete(o, sessionParentPath, out) {
+  const t = o.type;
+  if (typeof t !== "string" || t.toLowerCase() !== "diff") return;
+  const rawPath = extractDiffPath(o);
+  if (!rawPath) return;
+  const resolved = resolveWorkspaceFilePath(sessionParentPath, rawPath);
+  if (!resolved) return;
+  const oldText = readOptionalTextField(o.oldText ?? o.old_text ?? o.before ?? o.oldContent);
+  const newText = readOptionalTextField(o.newText ?? o.new_text ?? o.after ?? o.newContent);
+  out.push({ path: resolved.display, oldText, newText });
+}
+
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/walk-update-for-diffs.ts
+var NEST_KEYS = [
+  "content",
+  "contents",
+  "result",
+  "output",
+  "delta",
+  "toolResult",
+  "tool_result",
+  "data",
+  "arguments"
+];
+function walkValue(value, sessionParentPath, depth, out) {
+  if (depth > 12 || value == null) return;
+  if (Array.isArray(value)) {
+    for (const x of value) walkValue(x, sessionParentPath, depth + 1, out);
+    return;
+  }
+  if (typeof value !== "object") return;
+  const o = value;
+  pushDiffIfComplete(o, sessionParentPath, out);
+  if (o.type === "content" && o.content != null && typeof o.content === "object") {
+    walkValue(o.content, sessionParentPath, depth + 1, out);
+  }
+  for (const k of NEST_KEYS) {
+    if (o.type === "content" && k === "content") continue;
+    const v = o[k];
+    if (v == null) continue;
+    if (k === "arguments" && typeof v === "string") {
+      try {
+        walkValue(JSON.parse(v), sessionParentPath, depth + 1, out);
+      } catch {
+      }
+      continue;
+    }
+    walkValue(v, sessionParentPath, depth + 1, out);
+  }
+}
+
+// src/agents/acp/hooks/extract-acp-file-diffs-from-update/extract.ts
+function extractAcpFileDiffsFromUpdate(update, sessionParentPath) {
+  if (!update || typeof update !== "object") return [];
+  const u = update;
+  const out = [];
+  const content = u.content;
+  if (Array.isArray(content)) {
+    for (const x of content) walkValue(x, sessionParentPath, 0, out);
+  }
+  const byPath = /* @__PURE__ */ new Map();
+  for (const d of out) byPath.set(d.path, d);
+  return [...byPath.values()];
+}
+
+// src/agents/acp/hooks/extract-tool-target-paths.ts
+function addPath(sessionParentPath, raw, out) {
+  if (typeof raw !== "string") return;
+  const trimmed2 = raw.trim();
+  if (!trimmed2) return;
+  const resolved = resolveWorkspaceFilePath(sessionParentPath, trimmed2);
+  if (!resolved) return;
+  out.add(resolved.display);
+}
+function walkLocations(sessionParentPath, loc, out) {
+  if (!Array.isArray(loc)) return;
+  for (const item of loc) {
+    if (item && typeof item === "object") addPath(sessionParentPath, item.path, out);
+  }
+}
+var PATH_KEYS = [
+  "path",
+  "file",
+  "filePath",
+  "filepath",
+  "target_path",
+  "targetPath",
+  "file_path",
+  "target_file"
+];
+function collectFromObject(sessionParentPath, obj, out, depth) {
+  if (depth > 10) return;
+  for (const k of PATH_KEYS) {
+    if (k in obj) addPath(sessionParentPath, obj[k], out);
+  }
+  for (const v of Object.values(obj)) {
+    if (v != null && typeof v === "object") collectUnknown(sessionParentPath, v, out, depth + 1);
+  }
+}
+function collectUnknown(sessionParentPath, v, out, depth) {
+  if (depth > 10 || v == null) return;
+  if (Array.isArray(v)) {
+    for (const x of v) collectUnknown(sessionParentPath, x, out, depth + 1);
+    return;
+  }
+  if (typeof v === "object") collectFromObject(sessionParentPath, v, out, depth);
+}
+function walkContentArray(sessionParentPath, content, out) {
+  if (!Array.isArray(content)) return;
+  for (const item of content) {
+    if (!item || typeof item !== "object") continue;
+    const o = item;
+    if (typeof o.type === "string" && o.type.toLowerCase() === "diff") {
+      for (const k of PATH_KEYS) if (k in o) addPath(sessionParentPath, o[k], out);
+    }
+    if (o.type === "content" && o.content != null && typeof o.content === "object") {
+      const inner = o.content;
+      if (typeof inner.type === "string" && inner.type.toLowerCase() === "diff") {
+        for (const k of PATH_KEYS) if (k in inner) addPath(sessionParentPath, inner[k], out);
+      }
+    }
+  }
+}
+function extractToolTargetDisplayPaths(update, sessionParentPath) {
+  const out = /* @__PURE__ */ new Set();
+  if (!update || typeof update !== "object") return [];
+  const u = update;
+  walkLocations(sessionParentPath, u.locations, out);
+  walkLocations(sessionParentPath, u.fileLocations, out);
+  walkLocations(sessionParentPath, u.file_locations, out);
+  const tc = u.toolCall ?? u.tool_call;
+  if (tc && typeof tc.arguments === "string") {
+    try {
+      const parsed = JSON.parse(tc.arguments);
+      collectUnknown(sessionParentPath, parsed, out, 0);
+    } catch {
+    }
+  }
+  walkContentArray(sessionParentPath, u.content, out);
+  collectFromObject(sessionParentPath, u, out, 0);
+  return [...out];
+}
+
+// src/agents/acp/hooks/bridge-on-session-update/send-structured-file-changes.ts
+function sendExtractedDiffsAsSessionFileChanges(diffs, send, sessionParentPath, sessionId, runId, sentPaths, log2) {
+  for (const d of diffs) {
+    try {
+      const patchContent = editSnippetToUnifiedDiff(d.path, d.oldText, d.newText);
+      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, d.path);
+      send({
+        type: "session_file_change",
+        sessionId,
+        runId,
+        path: d.path,
+        oldText: d.oldText,
+        newText: d.newText,
+        patchContent,
+        isDirectory: dirFlags.isDirectory,
+        directoryRemoved: dirFlags.directoryRemoved
+      });
+      sentPaths.add(d.path);
+    } catch (err) {
+      log2(`[Bridge service] Session file change failed for ${d.path}: ${errorMessage(err)}`);
+    }
+  }
+}
+function sendGitHeadVsWorkspaceForToolPaths(mergedPaths, sentPaths, send, sessionParentPath, sessionId, runId, log2) {
+  for (const displayPath of mergedPaths) {
+    if (sentPaths.has(displayPath)) continue;
+    const oldText = readGitHeadBlob(sessionParentPath, displayPath);
+    const newText = readUtf8WorkspaceFile(sessionParentPath, displayPath);
+    if (oldText === newText) continue;
+    try {
+      const patchContent = editSnippetToUnifiedDiff(displayPath, oldText, newText);
+      const dirFlags = getSessionFileChangeDirectoryFlags(sessionParentPath, displayPath);
+      send({
+        type: "session_file_change",
+        sessionId,
+        runId,
+        path: displayPath,
+        oldText,
+        newText,
+        patchContent,
+        isDirectory: dirFlags.isDirectory,
+        directoryRemoved: dirFlags.directoryRemoved
+      });
+      sentPaths.add(displayPath);
+    } catch (err) {
+      log2(`[Bridge service] Session file change failed for ${displayPath}: ${errorMessage(err)}`);
+    }
+  }
+}
+
+// src/agents/acp/hooks/bridge-on-session-update/handle-bridge-tool-session-update.ts
+function handleBridgeToolSessionUpdate(params) {
+  const {
+    params: updateParams,
+    updateKind,
+    isToolUpdate,
+    isCompletedToolCallUpdate,
+    toolKey,
+    toolPaths,
+    status,
+    sessionParentPath,
+    pathTracker,
+    sentFileChangePaths,
+    send,
+    runId,
+    sessionId,
+    log: log2
+  } = params;
+  if (updateKind === "tool_call") {
+    pathTracker.resetToolSnapshots(toolKey);
+  }
+  if (isToolUpdate) {
+    accumulateToolPaths(toolKey, toolPaths, pathTracker.accumulatedPathsByToolKey);
+  }
+  if (isToolUpdate) {
+    const deliver = send && runId && sessionId ? (msg) => send(msg) : null;
+    pathTracker.handleToolCallLifecycle(
+      updateKind,
+      toolKey,
+      toolPaths,
+      status,
+      sessionParentPath,
+      sentFileChangePaths,
+      deliver,
+      runId,
+      sessionId,
+      log2
+    );
+  }
+  const diffs = extractAcpFileDiffsFromUpdate(updateParams, sessionParentPath);
+  if (diffs.length > 0 && send && runId && sessionId) {
+    sendExtractedDiffsAsSessionFileChanges(
+      diffs,
+      send,
+      sessionParentPath,
+      sessionId,
+      runId,
+      sentFileChangePaths,
+      log2
+    );
+  } else if (diffs.length > 0) {
+    log2(
+      `[Bridge service] Agent file diff(s) not forwarded (${diffs.length}): session or run not wired to the bridge.`
+    );
+  }
+  if (isCompletedToolCallUpdate && send && runId && sessionId) {
+    const acc = pathTracker.accumulatedPathsByToolKey.get(toolKey);
+    const merged = [.../* @__PURE__ */ new Set([...acc ? [...acc] : [], ...toolPaths])];
+    sendGitHeadVsWorkspaceForToolPaths(
+      merged,
+      sentFileChangePaths,
+      send,
+      sessionParentPath,
+      sessionId,
+      runId,
+      log2
+    );
+    pathTracker.accumulatedPathsByToolKey.delete(toolKey);
+  }
+}
+function resolveBridgeToolPaths(params, isToolUpdate, sessionParentPath) {
+  return isToolUpdate ? extractToolTargetDisplayPaths(params, sessionParentPath) : [];
+}
+
+// src/agents/planning/extract-session-update-message-text.ts
+function extractSessionUpdateMessageText(params) {
+  if (params == null || typeof params !== "object" || Array.isArray(params)) return null;
+  const o = params;
+  if (typeof o.text === "string" && o.text.length > 0) return o.text;
+  const content = o.content;
+  if (typeof content === "string" && content.length > 0) return content;
+  if (content != null && typeof content === "object" && !Array.isArray(content)) {
+    const c = content;
+    if (typeof c.text === "string" && c.text.length > 0) return c.text;
+  }
+  const update = o.update;
+  if (typeof update === "string" && update.length > 0) return update;
+  if (update != null && typeof update === "object" && !Array.isArray(update)) {
+    const u = update;
+    const innerContent = u.content;
+    if (typeof innerContent === "string" && innerContent.length > 0) return innerContent;
+    if (innerContent != null && typeof innerContent === "object" && !Array.isArray(innerContent)) {
+      const ic = innerContent;
+      if (typeof ic.text === "string" && ic.text.length > 0) return ic.text;
+    }
+  }
+  return null;
+}
+
+// src/agents/planning/planning-session-turn-buffer.ts
+var buffersByRunId = /* @__PURE__ */ new Map();
+function registerPlanningSessionTurn(runId) {
+  buffersByRunId.set(runId, { messageBuffer: "" });
+}
+function clearPlanningSessionTurn(runId) {
+  buffersByRunId.delete(runId);
+}
+function capturePlanningSessionUpdate(params) {
+  const state = buffersByRunId.get(params.runId);
+  if (!state) return false;
+  const sessionUpdate = params.payload != null && typeof params.payload === "object" && !Array.isArray(params.payload) ? params.payload.sessionUpdate ?? params.payload.session_update : void 0;
+  const bucket = resolveAgentTextStreamBucket({
+    transcriptRowKind: params.updateKind,
+    sessionUpdate: typeof sessionUpdate === "string" ? sessionUpdate : void 0
+  });
+  if (bucket !== "message") return false;
+  const text = extractSessionUpdateMessageText(params.payload);
+  if (text) state.messageBuffer += text;
+  return true;
+}
+function getPlanningSessionTurnOutput(runId) {
+  return buffersByRunId.get(runId)?.messageBuffer ?? "";
+}
+function consumePlanningSessionTurnOutput(runId) {
+  const state = buffersByRunId.get(runId);
+  buffersByRunId.delete(runId);
+  return state?.messageBuffer ?? "";
+}
+
+// src/agents/acp/hooks/bridge-on-session-update/forward-bridge-session-update.ts
+function forwardBridgeSessionUpdate(params) {
+  const { runId, sessionId, updateKind, payload, send, nextTranscriptStreamSeq, log: log2 } = params;
+  if (updateKind === "permission") {
+    return;
+  }
+  if (capturePlanningSessionUpdate({ runId, updateKind, payload })) {
+    return;
+  }
+  try {
+    const transcriptStreamSeq = nextTranscriptStreamSeq?.(runId);
+    send({
+      type: "session_update",
+      ...sessionId ? { sessionId } : {},
+      runId,
+      kind: updateKind,
+      payload,
+      ...transcriptStreamSeq != null ? { transcriptStreamSeq } : {}
+    });
+  } catch (err) {
+    log2(
+      `[Bridge service] Session update send failed (${formatSessionUpdateKindForLog(updateKind)}): ${errorMessage(err)}`
+    );
+  }
+}
+
 // src/agents/acp/hooks/bridge-on-session-update/create-bridge-on-session-update.ts
 function createBridgeOnSessionUpdate(opts) {
   const { resolveRouting, getSendSessionUpdate, log: log2, sessionParentPath, nextTranscriptStreamSeq } = opts;
@@ -34509,8 +34762,7 @@ function createBridgeOnSessionUpdate(opts) {
     pathTracker.onRunIdChanged(runId);
     const send = getSendSessionUpdate();
     const sentFileChangePaths = /* @__PURE__ */ new Set();
-    const p = params;
-    const updateKind = p.sessionUpdate ?? p.session_update ?? p.type ?? "update";
+    const { updateKind, isToolUpdate, isCompletedToolCallUpdate } = parseBridgeSessionUpdate(params);
     if (updateKind === "config_option_update") {
       return;
     }
@@ -34518,81 +34770,35 @@ function createBridgeOnSessionUpdate(opts) {
       sendSessionInfoTitleUpdate({ payload: params, runId, sessionId, send, log: log2 });
       return;
     }
-    const isCompletedToolCallUpdate = updateKind === "tool_call_update" && isCompletedToolStatus(p.status);
-    const toolName = p.toolCall?.name ?? p.tool_call?.name ?? "";
-    const isToolUpdate = updateKind === "tool_call" || updateKind === "tool_call_update" || typeof toolName === "string" && toolName.length > 0;
-    const toolPaths = isToolUpdate ? extractToolTargetDisplayPaths(params, sessionParentPath) : [];
+    const toolPaths = resolveBridgeToolPaths(params, isToolUpdate, sessionParentPath);
     const toolKey = isToolUpdate ? pathTracker.resolveToolKey(params, updateKind) : "";
-    if (updateKind === "tool_call") {
-      pathTracker.resetToolSnapshots(toolKey);
-    }
-    if (isToolUpdate) {
-      accumulateToolPaths(toolKey, toolPaths, pathTracker.accumulatedPathsByToolKey);
-    }
-    if (isToolUpdate) {
-      const deliver = send && runId && sessionId ? (msg) => send(msg) : null;
-      pathTracker.handleToolCallLifecycle(
-        updateKind,
-        toolKey,
-        toolPaths,
-        p.status,
-        sessionParentPath,
-        sentFileChangePaths,
-        deliver,
-        runId ?? "",
-        sessionId ?? "",
-        log2
-      );
-    }
-    const diffs = extractAcpFileDiffsFromUpdate(params, sessionParentPath);
-    if (diffs.length > 0 && send && runId && sessionId) {
-      sendExtractedDiffsAsSessionFileChanges(
-        diffs,
-        send,
-        sessionParentPath,
-        sessionId,
+    const status = params.status;
+    handleBridgeToolSessionUpdate({
+      params,
+      updateKind,
+      isToolUpdate,
+      isCompletedToolCallUpdate,
+      toolKey,
+      toolPaths,
+      status,
+      sessionParentPath,
+      pathTracker,
+      sentFileChangePaths,
+      send,
+      runId: runId ?? "",
+      sessionId: sessionId ?? "",
+      log: log2
+    });
+    if (runId && send) {
+      forwardBridgeSessionUpdate({
         runId,
-        sentFileChangePaths,
-        log2
-      );
-    } else if (diffs.length > 0) {
-      log2(
-        `[Bridge service] Agent file diff(s) not forwarded (${diffs.length}): session or run not wired to the bridge.`
-      );
-    }
-    if (isCompletedToolCallUpdate && send && runId && sessionId) {
-      const acc = pathTracker.accumulatedPathsByToolKey.get(toolKey);
-      const merged = [.../* @__PURE__ */ new Set([...acc ? [...acc] : [], ...toolPaths])];
-      sendGitHeadVsWorkspaceForToolPaths(
-        merged,
-        sentFileChangePaths,
-        send,
-        sessionParentPath,
         sessionId,
-        runId,
-        log2
-      );
-      pathTracker.accumulatedPathsByToolKey.delete(toolKey);
-    }
-    if (runId && send) {
-      if (updateKind === "permission") {
-        return;
-      }
-      try {
-        const transcriptStreamSeq = nextTranscriptStreamSeq?.(runId);
-        send({
-          type: "session_update",
-          ...sessionId ? { sessionId } : {},
-          runId,
-          kind: updateKind,
-          payload: params,
-          ...transcriptStreamSeq != null ? { transcriptStreamSeq } : {}
-        });
-      } catch (err) {
-        log2(
-          `[Bridge service] Session update send failed (${formatSessionUpdateKindForLog(updateKind)}): ${errorMessage(err)}`
-        );
-      }
+        updateKind,
+        payload: params,
+        send,
+        nextTranscriptStreamSeq,
+        log: log2
+      });
     }
   };
 }
@@ -34932,6 +35138,40 @@ async function disconnectAll(ctx) {
   ctx.pendingCancelRunIds.clear();
 }
 
+// src/agents/acp/manager/resolve-prompt-run-context.ts
+function resolvePromptRunContext(ctx, opts) {
+  const { runId, mode, agentType, agentConfig, sessionId } = opts;
+  const preferredForPrompt = agentType ?? ctx.backendFallbackAgentType ?? null;
+  if (!runId) {
+    ctx.log("[Agent] Prompt ignored: missing runId (cannot route session updates).");
+    return null;
+  }
+  const acpAgentKey = computeAcpAgentKey(preferredForPrompt, mode, agentConfig ?? null);
+  if (!acpAgentKey) {
+    return null;
+  }
+  const activeAcpSessionAgentKey = computeAcpSessionAgentKey(sessionId, acpAgentKey);
+  ctx.pendingCancelRunIds.delete(runId);
+  ctx.promptRouting.registerRun({ sessionId, runId });
+  ctx.runDispatch.set(runId, { acpSessionAgentKey: activeAcpSessionAgentKey });
+  return {
+    activeRunId: runId,
+    activeAcpAgentKey: acpAgentKey,
+    activeAcpSessionAgentKey,
+    preferredForPrompt
+  };
+}
+
+// src/agents/acp/send-prompt-result-augment.ts
+function augmentPromptResultAuthFields(agentType, errorText) {
+  const err = errorText ?? "";
+  const at = agentType ?? null;
+  const evaluated = Boolean(at && err.trim());
+  const suggestsAuth = evaluated && at ? localAgentErrorSuggestsAuth(at, err) : false;
+  if (!suggestsAuth || !agentType) return {};
+  return { agentAuthRequired: true, agentType };
+}
+
 // src/git/git-runtime.ts
 var activeGitChildProcesses = /* @__PURE__ */ new Set();
 function abortActiveGitChildProcesses() {
@@ -35006,8 +35246,8 @@ async function execGitFile(args, options) {
 }
 
 // src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path75) {
-  return path75.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path76) {
+  return path76.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // src/git/changes/parse/parse-name-status-entries.ts
@@ -35294,9 +35534,9 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
 // src/agents/acp/put-summarize-change-summaries.ts
 async function putEncryptedChangeSummaryRows(params) {
   const base = params.apiBaseUrl.replace(/\/+$/, "");
-  const entries = params.rows.map(({ path: path75, summary }) => {
+  const entries = params.rows.map(({ path: path76, summary }) => {
     const enc = params.e2ee.encryptFields({ summary }, ["summary"]);
-    return { path: path75, summary: JSON.stringify(enc) };
+    return { path: path76, summary: JSON.stringify(enc) };
   });
   const res = await fetch(
     `${base}/internal/sessions/${encodeURIComponent(params.sessionId)}/follow-ups/summarize-changes`,
@@ -35387,104 +35627,136 @@ async function maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess(params) {
   }
 }
 
-// src/agents/acp/send-prompt-result-augment.ts
-function augmentPromptResultAuthFields(agentType, errorText) {
-  const err = errorText ?? "";
-  const at = agentType ?? null;
-  const evaluated = Boolean(at && err.trim());
-  const suggestsAuth = evaluated && at ? localAgentErrorSuggestsAuth(at, err) : false;
-  if (!suggestsAuth || !agentType) return {};
-  return { agentAuthRequired: true, agentType };
+// src/agents/planning/submit-planning-todos-for-turn.ts
+async function submitPlanningTodosForTurn(params) {
+  const token = params.getCloudAccessToken();
+  if (!token.trim()) return { ok: false, error: "Missing cloud access token" };
+  const base = params.cloudApiBaseUrl.replace(/\/$/, "");
+  const url2 = `${base}/internal/sessions/todos/submit`;
+  const res = await fetch(url2, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      sessionId: params.sessionId,
+      turnId: params.turnId,
+      items: params.items
+    })
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => null);
+    return { ok: false, error: body?.error ?? `Planning todo submit failed (${res.status})` };
+  }
+  return { ok: true };
 }
 
-// src/agents/acp/fetch-session-attachments.ts
-function metaSaysEncrypted(meta) {
-  if (!meta) return false;
-  const e = meta.encrypted;
-  return e === true || e === "true" || e === 1;
-}
-function warnIfDecodedImageMagicUnexpected(buf, mimeType, idShort) {
-  const m = mimeType.toLowerCase();
-  if (!m.startsWith("image/") || buf.length < 4) return;
-  const b0 = buf[0];
-  const b1 = buf[1];
-  const b2 = buf[2];
-  const b3 = buf[3];
-  let looksOk = false;
-  if (m.includes("png") && b0 === 137 && b1 === 80 && b2 === 78 && b3 === 71) looksOk = true;
-  else if ((m.includes("jpeg") || m.includes("jpg")) && b0 === 255 && b1 === 216 && b2 === 255) looksOk = true;
-  else if (m.includes("gif") && b0 === 71 && b1 === 73 && b2 === 70) looksOk = true;
-  else if (m.includes("webp") && buf.length >= 12 && buf.subarray(0, 4).toString("ascii") === "RIFF" && buf.subarray(8, 12).toString("ascii") === "WEBP")
-    looksOk = true;
-  else if (!/(png|jpe?g|gif|webp)/i.test(m)) looksOk = true;
-  if (!looksOk) {
-    logDebug(
-      `[Agent] Attachment ${idShort} (${mimeType}): decoded bytes do not match common image signatures \u2014 wrong E2EE key, corrupt blob, or metadata mismatch. First 12 bytes (hex): ${buf.subarray(0, Math.min(12, buf.length)).toString("hex")}`
-    );
+// src/agents/planning/maybe-submit-planning-todos-after-agent-success.ts
+async function maybeSubmitPlanningTodosAfterAgentSuccess(params) {
+  const { sessionId, runId, resultSuccess, output, cloudApiBaseUrl, getCloudAccessToken, log: log2 } = params;
+  const buffered = runId ? getPlanningSessionTurnOutput(runId) : "";
+  const outputFromResult = typeof output === "string" ? output : "";
+  const outputStr = buffered.trim() !== "" ? buffered : outputFromResult;
+  if (!sessionId || !runId || !resultSuccess || outputStr.trim() === "") {
+    return { submitted: false, suppressOutput: false };
   }
-}
-async function fetchSessionAttachmentPayloadsForAgent(params) {
-  const { attachments, sessionId, cloudApiBaseUrl, getCloudAccessToken, e2ee, log: log2 } = params;
-  const token = getCloudAccessToken();
-  if (!token) {
-    return { ok: false, error: "Missing cloud access token; cannot download attachments." };
+  if (!cloudApiBaseUrl || !getCloudAccessToken) {
+    return { submitted: false, suppressOutput: false };
   }
-  const wantedCount = attachments.filter((a) => typeof a.attachmentId === "string" && a.attachmentId.trim() !== "").length;
-  if (wantedCount === 0) {
-    return { ok: false, error: "No valid attachment ids in prompt." };
+  const items = parsePlanningTodoAgentJson(outputStr);
+  if (items.length === 0) {
+    return { submitted: false, suppressOutput: false };
   }
-  const base = cloudApiBaseUrl.replace(/\/+$/, "");
-  const out = [];
-  for (const a of attachments) {
-    const id = typeof a.attachmentId === "string" ? a.attachmentId.trim() : "";
-    if (!id) continue;
-    const metaUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/meta`;
-    const blobUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/blob`;
-    const metaRes = await fetch(metaUrl, { headers: { Authorization: `Bearer ${token}` } });
-    if (!metaRes.ok) {
-      const t = await metaRes.text().catch(() => "");
-      log2(`[Agent] Attachment meta fetch failed ${metaRes.status}: ${t.slice(0, 200)}`);
-      return { ok: false, error: `Could not load attachment (${id.slice(0, 8)}\u2026): ${metaRes.status}` };
-    }
-    const meta = await metaRes.json().catch(() => null);
-    const mimeType = typeof meta?.mimeType === "string" && meta.mimeType.trim() ? meta.mimeType.trim() : a.mimeType;
-    const blobRes = await fetch(blobUrl, { headers: { Authorization: `Bearer ${token}` } });
-    if (!blobRes.ok) {
-      const t = await blobRes.text().catch(() => "");
-      log2(`[Agent] Attachment blob fetch failed ${blobRes.status}: ${t.slice(0, 200)}`);
-      return { ok: false, error: `Could not load attachment data (${id.slice(0, 8)}\u2026): ${blobRes.status}` };
-    }
-    const buf = Buffer.from(await blobRes.arrayBuffer());
-    let imageBytes;
-    const encrypted = metaSaysEncrypted(meta);
-    if (encrypted) {
-      if (!e2ee) {
-        return { ok: false, error: "Encrypted attachments require E2EE keys on this bridge." };
-      }
-      const k = typeof meta?.k === "string" ? meta.k : "";
-      const n = typeof meta?.n === "string" ? meta.n : "";
-      if (!k || !n) {
-        return { ok: false, error: "Invalid encrypted attachment metadata (missing key id or nonce)." };
-      }
-      const c = base64UrlEncode(buf);
-      imageBytes = e2ee.decryptEnvelopeToBuffer({ k, n, c });
+  const result = await submitPlanningTodosForTurn({
+    sessionId,
+    turnId: runId,
+    items,
+    cloudApiBaseUrl,
+    getCloudAccessToken
+  });
+  if (!result.ok) {
+    log2(`[Agent] Planning todo submit failed: ${result.error}`);
+    return { submitted: false, suppressOutput: false };
+  }
+  if (runId) consumePlanningSessionTurnOutput(runId);
+  log2(`[Agent] Planning session: stored ${items.length} todo(s) via internal API`);
+  return { submitted: true, suppressOutput: true };
+}
+
+// src/agents/acp/prompts/finalize-and-send-prompt-result.ts
+async function finalizeAndSendPromptResult(params) {
+  const {
+    result,
+    sessionId,
+    runId,
+    promptId,
+    agentType,
+    agentCwd,
+    isPlanningSession,
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee,
+    sendResult,
+    sendSessionUpdate,
+    log: log2
+  } = params;
+  if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
+    await collectTurnGitDiffFromPreTurnSnapshot({
+      sessionId,
+      runId,
+      agentCwd,
+      sendSessionUpdate,
+      log: log2
+    });
+  }
+  await maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess({
+    sessionId,
+    runId,
+    resultSuccess: result.success === true,
+    output: result.output,
+    e2ee,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths,
+    log: log2
+  });
+  const planningTodosSubmit = await maybeSubmitPlanningTodosAfterAgentSuccess({
+    sessionId,
+    runId,
+    resultSuccess: result.success === true,
+    output: result.output,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    log: log2
+  });
+  const errStr = typeof result.error === "string" ? result.error : void 0;
+  const resultStop = typeof result.stopReason === "string" ? result.stopReason.trim() : "";
+  const cancelledByAgent = resultStop.toLowerCase() === "cancelled" || errStr != null && isUserEndedSessionTurnErrorText(errStr);
+  const planningFallbackOutput = !planningTodosSubmit.suppressOutput && isPlanningSession && runId ? consumePlanningSessionTurnOutput(runId) : "";
+  sendResult({
+    type: "prompt_result",
+    id: promptId,
+    ...sessionId ? { sessionId } : {},
+    ...runId ? { runId } : {},
+    ...result,
+    ...planningTodosSubmit.suppressOutput ? { output: void 0 } : planningFallbackOutput.trim() !== "" ? { output: planningFallbackOutput } : {},
+    ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+    ...augmentPromptResultAuthFields(agentType, errStr),
+    ...!result.success && cancelledByAgent ? { stopReason: "cancelled" } : {}
+  });
+  if (!result.success) {
+    if (cancelledByAgent) {
+      log2("[Agent] Run ended after stop request (stopped by user).");
     } else {
-      imageBytes = buf;
+      log2(
+        `[Agent] Prompt did not run successfully on the agent (no successful start/completion): ${result.error ?? "Unknown error"}`
+      );
     }
-    warnIfDecodedImageMagicUnexpected(imageBytes, mimeType, id.slice(0, 8));
-    logDebug(
-      `[Agent] Loaded prompt image ${id.slice(0, 8)}\u2026: ${imageBytes.length} bytes, mime=${mimeType}, ${encrypted ? "E2EE decrypted" : "plaintext from storage"}`
-    );
-    const dataBase64 = imageBytes.toString("base64");
-    out.push({ mimeType, dataBase64 });
   }
-  if (out.length !== wantedCount) {
-    return {
-      ok: false,
-      error: `Expected ${wantedCount} image attachment(s) but only loaded ${out.length} (check attachment ids and empty rows).`
-    };
-  }
-  return { ok: true, images: out };
 }
 
 // src/agents/acp/build-forked-session-agent-prompt.ts
@@ -35675,7 +35947,213 @@ function enrichIntegrationContentPromptForAgent(params) {
   return injectIntegrationContentAgentPromptNote(params.agentPromptText, params.sessionId);
 }
 
-// src/agents/acp/send-prompt-to-agent.ts
+// src/agents/planning/enrich-planning-session-prompt-for-agent.ts
+async function enrichPlanningSessionPromptForAgent(params) {
+  const meta = await fetchCloudSessionMeta({
+    sessionId: params.sessionId,
+    cloudApiBaseUrl: params.cloudApiBaseUrl,
+    getCloudAccessToken: params.getCloudAccessToken
+  });
+  if (!meta.ok) return { promptText: params.promptText, isPlanningSession: false };
+  const sessionKind = parseSessionKind(meta.data.sessionKind);
+  if (sessionKind !== "planning") return { promptText: params.promptText, isPlanningSession: false };
+  const todos = Array.isArray(meta.data.planningTodos) ? meta.data.planningTodos : [];
+  if (params.isNewSession || todos.length === 0) {
+    return {
+      promptText: buildPlanningSessionAgentPrompt(params.promptText),
+      isPlanningSession: true
+    };
+  }
+  return {
+    promptText: buildPlanningSessionFollowUpAgentPrompt(params.promptText, todos),
+    isPlanningSession: true
+  };
+}
+
+// src/agents/acp/prompts/prepare-agent-prompt-text.ts
+async function prepareAgentPromptText(params) {
+  const { promptText, sessionId, runId, isNewSession, cloudApiBaseUrl, getCloudAccessToken } = params;
+  let agentPromptText = promptText;
+  let isPlanningSession = false;
+  if (sessionId && cloudApiBaseUrl && getCloudAccessToken) {
+    agentPromptText = await enrichForkedSessionPromptForAgent({
+      sessionId,
+      promptText,
+      cloudApiBaseUrl,
+      getCloudAccessToken
+    });
+    const planningEnriched = await enrichPlanningSessionPromptForAgent({
+      sessionId,
+      promptText: agentPromptText,
+      isNewSession,
+      cloudApiBaseUrl,
+      getCloudAccessToken
+    });
+    agentPromptText = planningEnriched.promptText;
+    isPlanningSession = planningEnriched.isPlanningSession;
+  }
+  if (isPlanningSession && runId) {
+    registerPlanningSessionTurn(runId);
+  }
+  if (sessionId) {
+    agentPromptText = enrichIntegrationContentPromptForAgent({
+      sessionId,
+      originalPromptText: promptText,
+      agentPromptText
+    });
+  }
+  return { agentPromptText, isPlanningSession };
+}
+
+// src/agents/acp/fetch-session-attachments.ts
+function metaSaysEncrypted(meta) {
+  if (!meta) return false;
+  const e = meta.encrypted;
+  return e === true || e === "true" || e === 1;
+}
+function warnIfDecodedImageMagicUnexpected(buf, mimeType, idShort) {
+  const m = mimeType.toLowerCase();
+  if (!m.startsWith("image/") || buf.length < 4) return;
+  const b0 = buf[0];
+  const b1 = buf[1];
+  const b2 = buf[2];
+  const b3 = buf[3];
+  let looksOk = false;
+  if (m.includes("png") && b0 === 137 && b1 === 80 && b2 === 78 && b3 === 71) looksOk = true;
+  else if ((m.includes("jpeg") || m.includes("jpg")) && b0 === 255 && b1 === 216 && b2 === 255) looksOk = true;
+  else if (m.includes("gif") && b0 === 71 && b1 === 73 && b2 === 70) looksOk = true;
+  else if (m.includes("webp") && buf.length >= 12 && buf.subarray(0, 4).toString("ascii") === "RIFF" && buf.subarray(8, 12).toString("ascii") === "WEBP")
+    looksOk = true;
+  else if (!/(png|jpe?g|gif|webp)/i.test(m)) looksOk = true;
+  if (!looksOk) {
+    logDebug(
+      `[Agent] Attachment ${idShort} (${mimeType}): decoded bytes do not match common image signatures \u2014 wrong E2EE key, corrupt blob, or metadata mismatch. First 12 bytes (hex): ${buf.subarray(0, Math.min(12, buf.length)).toString("hex")}`
+    );
+  }
+}
+async function fetchSessionAttachmentPayloadsForAgent(params) {
+  const { attachments, sessionId, cloudApiBaseUrl, getCloudAccessToken, e2ee, log: log2 } = params;
+  const token = getCloudAccessToken();
+  if (!token) {
+    return { ok: false, error: "Missing cloud access token; cannot download attachments." };
+  }
+  const wantedCount = attachments.filter((a) => typeof a.attachmentId === "string" && a.attachmentId.trim() !== "").length;
+  if (wantedCount === 0) {
+    return { ok: false, error: "No valid attachment ids in prompt." };
+  }
+  const base = cloudApiBaseUrl.replace(/\/+$/, "");
+  const out = [];
+  for (const a of attachments) {
+    const id = typeof a.attachmentId === "string" ? a.attachmentId.trim() : "";
+    if (!id) continue;
+    const metaUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/meta`;
+    const blobUrl = `${base}/internal/sessions/${encodeURIComponent(sessionId)}/attachments/${encodeURIComponent(id)}/blob`;
+    const metaRes = await fetch(metaUrl, { headers: { Authorization: `Bearer ${token}` } });
+    if (!metaRes.ok) {
+      const t = await metaRes.text().catch(() => "");
+      log2(`[Agent] Attachment meta fetch failed ${metaRes.status}: ${t.slice(0, 200)}`);
+      return { ok: false, error: `Could not load attachment (${id.slice(0, 8)}\u2026): ${metaRes.status}` };
+    }
+    const meta = await metaRes.json().catch(() => null);
+    const mimeType = typeof meta?.mimeType === "string" && meta.mimeType.trim() ? meta.mimeType.trim() : a.mimeType;
+    const blobRes = await fetch(blobUrl, { headers: { Authorization: `Bearer ${token}` } });
+    if (!blobRes.ok) {
+      const t = await blobRes.text().catch(() => "");
+      log2(`[Agent] Attachment blob fetch failed ${blobRes.status}: ${t.slice(0, 200)}`);
+      return { ok: false, error: `Could not load attachment data (${id.slice(0, 8)}\u2026): ${blobRes.status}` };
+    }
+    const buf = Buffer.from(await blobRes.arrayBuffer());
+    let imageBytes;
+    const encrypted = metaSaysEncrypted(meta);
+    if (encrypted) {
+      if (!e2ee) {
+        return { ok: false, error: "Encrypted attachments require E2EE keys on this bridge." };
+      }
+      const k = typeof meta?.k === "string" ? meta.k : "";
+      const n = typeof meta?.n === "string" ? meta.n : "";
+      if (!k || !n) {
+        return { ok: false, error: "Invalid encrypted attachment metadata (missing key id or nonce)." };
+      }
+      const c = base64UrlEncode(buf);
+      imageBytes = e2ee.decryptEnvelopeToBuffer({ k, n, c });
+    } else {
+      imageBytes = buf;
+    }
+    warnIfDecodedImageMagicUnexpected(imageBytes, mimeType, id.slice(0, 8));
+    logDebug(
+      `[Agent] Loaded prompt image ${id.slice(0, 8)}\u2026: ${imageBytes.length} bytes, mime=${mimeType}, ${encrypted ? "E2EE decrypted" : "plaintext from storage"}`
+    );
+    const dataBase64 = imageBytes.toString("base64");
+    out.push({ mimeType, dataBase64 });
+  }
+  if (out.length !== wantedCount) {
+    return {
+      ok: false,
+      error: `Expected ${wantedCount} image attachment(s) but only loaded ${out.length} (check attachment ids and empty rows).`
+    };
+  }
+  return { ok: true, images: out };
+}
+
+// src/agents/acp/prompts/resolve-send-prompt-images.ts
+async function resolveSendPromptImages(params) {
+  const {
+    attachments,
+    sessionId,
+    promptId,
+    runId,
+    agentType,
+    followUpCatalogPromptId,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee,
+    log: log2
+  } = params;
+  if (!attachments || attachments.length === 0) {
+    return { ok: true, sendOpts: {} };
+  }
+  if (!sessionId || !cloudApiBaseUrl || !getCloudAccessToken) {
+    return {
+      ok: false,
+      errorResult: {
+        type: "prompt_result",
+        id: promptId,
+        ...sessionId ? { sessionId } : {},
+        ...runId ? { runId } : {},
+        success: false,
+        error: "Prompt includes images but the bridge is not configured with a cloud API URL and token to fetch them.",
+        ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+        ...augmentPromptResultAuthFields(agentType, "missing cloud for images download")
+      }
+    };
+  }
+  const resolved = await fetchSessionAttachmentPayloadsForAgent({
+    attachments,
+    sessionId,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee,
+    log: log2
+  });
+  if (!resolved.ok) {
+    return {
+      ok: false,
+      errorResult: {
+        type: "prompt_result",
+        id: promptId,
+        ...sessionId ? { sessionId } : {},
+        ...runId ? { runId } : {},
+        success: false,
+        error: resolved.error,
+        ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+        ...augmentPromptResultAuthFields(agentType, resolved.error)
+      }
+    };
+  }
+  return { ok: true, sendOpts: { images: resolved.images } };
+}
+
+// src/agents/acp/prompts/send-prompt-to-agent.ts
 async function sendPromptToAgent(options) {
   const {
     handle,
@@ -35693,107 +36171,54 @@ async function sendPromptToAgent(options) {
     cloudApiBaseUrl,
     getCloudAccessToken,
     e2ee,
-    attachments
+    attachments,
+    isNewSession = false
   } = options;
+  let isPlanningSession = false;
   try {
-    let agentPromptText = promptText;
-    if (sessionId && cloudApiBaseUrl && getCloudAccessToken) {
-      agentPromptText = await enrichForkedSessionPromptForAgent({
-        sessionId,
-        promptText,
-        cloudApiBaseUrl,
-        getCloudAccessToken
-      });
-    }
-    if (sessionId) {
-      agentPromptText = enrichIntegrationContentPromptForAgent({
-        sessionId,
-        originalPromptText: promptText,
-        agentPromptText
-      });
-    }
-    let sendOpts = {};
-    if (attachments && attachments.length > 0) {
-      if (!sessionId || !cloudApiBaseUrl || !getCloudAccessToken) {
-        sendResult({
-          type: "prompt_result",
-          id: promptId,
-          ...sessionId ? { sessionId } : {},
-          ...runId ? { runId } : {},
-          success: false,
-          error: "Prompt includes images but the bridge is not configured with a cloud API URL and token to fetch them.",
-          ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-          ...augmentPromptResultAuthFields(agentType, "missing cloud for images download")
-        });
-        return;
-      }
-      const resolved = await fetchSessionAttachmentPayloadsForAgent({
-        attachments,
-        sessionId,
-        cloudApiBaseUrl,
-        getCloudAccessToken,
-        e2ee,
-        log: log2
-      });
-      if (!resolved.ok) {
-        sendResult({
-          type: "prompt_result",
-          id: promptId,
-          ...sessionId ? { sessionId } : {},
-          ...runId ? { runId } : {},
-          success: false,
-          error: resolved.error,
-          ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-          ...augmentPromptResultAuthFields(agentType, resolved.error)
-        });
-        return;
-      }
-      sendOpts = { images: resolved.images };
-    }
-    const result = await handle.sendPrompt(agentPromptText, sendOpts);
-    if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
-      await collectTurnGitDiffFromPreTurnSnapshot({
-        sessionId,
-        runId,
-        agentCwd,
-        sendSessionUpdate,
-        log: log2
-      });
-    }
-    await maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess({
+    const prepared = await prepareAgentPromptText({
+      promptText,
       sessionId,
       runId,
-      resultSuccess: result.success === true,
-      output: result.output,
-      e2ee,
+      isNewSession,
+      cloudApiBaseUrl,
+      getCloudAccessToken
+    });
+    isPlanningSession = prepared.isPlanningSession;
+    const imagesResolved = await resolveSendPromptImages({
+      attachments,
+      sessionId,
+      promptId,
+      runId,
+      agentType,
+      followUpCatalogPromptId,
       cloudApiBaseUrl,
       getCloudAccessToken,
+      e2ee,
+      log: log2
+    });
+    if (!imagesResolved.ok) {
+      sendResult(imagesResolved.errorResult);
+      return;
+    }
+    const result = await handle.sendPrompt(prepared.agentPromptText, imagesResolved.sendOpts);
+    await finalizeAndSendPromptResult({
+      result,
+      sessionId,
+      runId,
+      promptId,
+      agentType,
+      agentCwd,
+      isPlanningSession,
       followUpCatalogPromptId,
       sessionChangeSummaryFilePaths,
+      cloudApiBaseUrl,
+      getCloudAccessToken,
+      e2ee,
+      sendResult,
+      sendSessionUpdate,
       log: log2
     });
-    const errStr = typeof result.error === "string" ? result.error : void 0;
-    const resultStop = typeof result.stopReason === "string" ? result.stopReason.trim() : "";
-    const cancelledByAgent = resultStop.toLowerCase() === "cancelled" || errStr != null && isUserEndedSessionTurnErrorText(errStr);
-    sendResult({
-      type: "prompt_result",
-      id: promptId,
-      ...sessionId ? { sessionId } : {},
-      ...runId ? { runId } : {},
-      ...result,
-      ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-      ...augmentPromptResultAuthFields(agentType, errStr),
-      ...!result.success && cancelledByAgent ? { stopReason: "cancelled" } : {}
-    });
-    if (!result.success) {
-      if (cancelledByAgent) {
-        log2("[Agent] Run ended after stop request (stopped by user).");
-      } else {
-        log2(
-          `[Agent] Prompt did not run successfully on the agent (no successful start/completion): ${result.error ?? "Unknown error"}`
-        );
-      }
-    }
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
     log2(`[Agent] Send failed: ${errMsg}`);
@@ -35807,6 +36232,8 @@ async function sendPromptToAgent(options) {
       ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
       ...augmentPromptResultAuthFields(agentType, errMsg)
     });
+  } finally {
+    if (runId && isPlanningSession) clearPlanningSessionTurn(runId);
   }
 }
 
@@ -35820,15 +36247,36 @@ function getAcpSessionAgentState(ctx, acpSessionAgentKey) {
   return state;
 }
 
-// src/agents/acp/manager/handle-prompt.ts
-function handlePrompt(ctx, opts) {
+// src/agents/acp/manager/handle-pending-prompt-cancel.ts
+async function handlePendingPromptCancel(params) {
+  const { ctx, activeRunId, promptId, sessionId, handle, sendResult } = params;
+  if (!ctx.pendingCancelRunIds.has(activeRunId)) {
+    return false;
+  }
+  ctx.pendingCancelRunIds.delete(activeRunId);
+  try {
+    await handle.cancel?.();
+  } catch {
+  }
+  sendResult({
+    type: "prompt_result",
+    id: promptId,
+    ...sessionId ? { sessionId } : {},
+    runId: activeRunId,
+    success: false,
+    error: "Stopped by user",
+    stopReason: "cancelled"
+  });
+  return true;
+}
+
+// src/agents/acp/manager/run-acp-prompt.ts
+async function runAcpPrompt(ctx, runCtx, opts) {
   const {
     promptText,
     promptId,
     sessionId,
-    runId,
     mode,
-    agentType,
     agentConfig,
     sessionParentPath,
     sendResult,
@@ -35838,109 +36286,99 @@ function handlePrompt(ctx, opts) {
     cloudApiBaseUrl,
     getCloudAccessToken,
     e2ee,
-    attachments
+    attachments,
+    isNewSession
   } = opts;
-  const preferredForPrompt = agentType ?? ctx.backendFallbackAgentType ?? null;
-  if (!runId) {
-    ctx.log("[Agent] Prompt ignored: missing runId (cannot route session updates).");
-    return;
-  }
-  const activeRunId = runId;
-  const acpAgentKey = computeAcpAgentKey(preferredForPrompt, mode, agentConfig ?? null);
-  if (!acpAgentKey) {
+  const { activeRunId, activeAcpAgentKey, activeAcpSessionAgentKey, preferredForPrompt } = runCtx;
+  const acpAgentState = getAcpSessionAgentState(ctx, activeAcpSessionAgentKey);
+  const handle = await ensureAcpClient({
+    state: acpAgentState,
+    acpAgentKey: activeAcpAgentKey,
+    preferredAgentType: preferredForPrompt,
+    mode,
+    agentConfig: agentConfig ?? null,
+    sessionParentPath,
+    resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpSessionAgentKey),
+    cloudSessionId: sessionId,
+    bridgeAccessPort: ctx.getBridgeAccessPort(),
+    sendSessionUpdate,
+    sendRequest: sendSessionUpdate,
+    log: ctx.log,
+    reportAgentCapabilities: ctx.reportAgentCapabilities
+  });
+  if (!handle) {
+    const errMsg = acpAgentState.lastAcpStartError || "No agent configured. Register local agents on this bridge in the app.";
+    const evaluated = Boolean(preferredForPrompt && errMsg.trim());
+    const suggestsAuth = evaluated ? localAgentErrorSuggestsAuth(preferredForPrompt, errMsg) : false;
+    const auth = suggestsAuth && preferredForPrompt ? { agentAuthRequired: true, agentType: preferredForPrompt } : {};
     sendResult({
       type: "prompt_result",
       id: promptId,
       ...sessionId ? { sessionId } : {},
       runId: activeRunId,
       success: false,
-      error: "No agent type: ensure the app sends agentType on prompts or agent_config for this bridge."
+      error: errMsg,
+      ...auth
     });
     return;
   }
-  const activeAcpAgentKey = acpAgentKey;
-  const activeAcpSessionAgentKey = computeAcpSessionAgentKey(sessionId, activeAcpAgentKey);
-  ctx.pendingCancelRunIds.delete(activeRunId);
-  ctx.promptRouting.registerRun({ sessionId, runId: activeRunId });
-  ctx.runDispatch.set(activeRunId, { acpSessionAgentKey: activeAcpSessionAgentKey });
-  async function run() {
-    const acpAgentState = getAcpSessionAgentState(ctx, activeAcpSessionAgentKey);
-    const handle = await ensureAcpClient({
-      state: acpAgentState,
-      acpAgentKey: activeAcpAgentKey,
-      preferredAgentType: preferredForPrompt,
-      mode,
-      agentConfig: agentConfig ?? null,
-      sessionParentPath,
-      resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpSessionAgentKey),
-      cloudSessionId: sessionId,
-      bridgeAccessPort: ctx.getBridgeAccessPort(),
+  if (!ctx.promptRouting.isRegisteredRun(activeRunId)) {
+    return;
+  }
+  const cancelled = await handlePendingPromptCancel({
+    ctx,
+    activeRunId,
+    promptId,
+    sessionId,
+    handle,
+    sendResult
+  });
+  if (cancelled) return;
+  ctx.promptRouting.setStreamingRunId(activeAcpSessionAgentKey, activeRunId);
+  try {
+    await sendPromptToAgent({
+      handle,
+      promptText,
+      promptId,
+      sessionId,
+      runId: activeRunId,
+      agentType: preferredForPrompt,
+      agentCwd: resolveSessionParentPathForAgentProcess(sessionParentPath),
+      sendResult,
       sendSessionUpdate,
-      sendRequest: sendSessionUpdate,
       log: ctx.log,
-      reportAgentCapabilities: ctx.reportAgentCapabilities
+      followUpCatalogPromptId,
+      sessionChangeSummaryFilePaths,
+      cloudApiBaseUrl,
+      getCloudAccessToken,
+      e2ee,
+      attachments,
+      isNewSession
     });
-    if (!handle) {
-      const errMsg = acpAgentState.lastAcpStartError || "No agent configured. Register local agents on this bridge in the app.";
-      const evaluated = Boolean(preferredForPrompt && errMsg.trim());
-      const suggestsAuth = evaluated ? localAgentErrorSuggestsAuth(preferredForPrompt, errMsg) : false;
-      const auth = suggestsAuth && preferredForPrompt ? { agentAuthRequired: true, agentType: preferredForPrompt } : {};
-      sendResult({
-        type: "prompt_result",
-        id: promptId,
-        ...sessionId ? { sessionId } : {},
-        runId: activeRunId,
-        success: false,
-        error: errMsg,
-        ...auth
-      });
-      return;
-    }
-    if (!ctx.promptRouting.isRegisteredRun(activeRunId)) {
-      return;
-    }
-    if (ctx.pendingCancelRunIds.has(activeRunId)) {
-      ctx.pendingCancelRunIds.delete(activeRunId);
-      try {
-        await handle.cancel?.();
-      } catch {
-      }
+  } finally {
+    ctx.promptRouting.clearStreamingRunId(activeAcpSessionAgentKey, activeRunId);
+  }
+}
+
+// src/agents/acp/manager/handle-prompt.ts
+function handlePrompt(ctx, opts) {
+  const { promptId, sessionId, runId, mode, agentType, agentConfig, sendResult } = opts;
+  const runCtx = resolvePromptRunContext(ctx, { runId, mode, agentType, agentConfig, sessionId });
+  if (!runCtx) {
+    if (runId) {
       sendResult({
         type: "prompt_result",
         id: promptId,
         ...sessionId ? { sessionId } : {},
-        runId: activeRunId,
+        runId,
         success: false,
-        error: "Stopped by user",
-        stopReason: "cancelled"
-      });
-      return;
-    }
-    ctx.promptRouting.setStreamingRunId(activeAcpSessionAgentKey, activeRunId);
-    try {
-      await sendPromptToAgent({
-        handle,
-        promptText,
-        promptId,
-        sessionId,
-        runId: activeRunId,
-        agentType: preferredForPrompt,
-        agentCwd: resolveSessionParentPathForAgentProcess(sessionParentPath),
-        sendResult,
-        sendSessionUpdate,
-        log: ctx.log,
-        followUpCatalogPromptId,
-        sessionChangeSummaryFilePaths,
-        cloudApiBaseUrl,
-        getCloudAccessToken,
-        e2ee,
-        attachments
+        error: "No agent type: ensure the app sends agentType on prompts or agent_config for this bridge."
       });
-    } finally {
-      ctx.promptRouting.clearStreamingRunId(activeAcpSessionAgentKey, activeRunId);
     }
+    return;
   }
-  void run().finally(() => {
+  const { activeRunId } = runCtx;
+  void runAcpPrompt(ctx, runCtx, opts).finally(() => {
     ctx.promptRouting.unregisterRun(activeRunId);
     ctx.runDispatch.delete(activeRunId);
     ctx.pendingCancelRunIds.delete(activeRunId);
@@ -36131,8 +36569,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path75) {
-  return path75 instanceof String && cache.has(path75);
+function isPathSpec(path76) {
+  return path76 instanceof String && cache.has(path76);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -36221,8 +36659,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path75) {
-  return (0, import_file_exists.exists)(path75, import_file_exists.FOLDER);
+function folderExists(path76) {
+  return (0, import_file_exists.exists)(path76, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -36626,8 +37064,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path75) {
-      return /^\.(git)?$/.test(path75.trim());
+    parser(path76) {
+      return /^\.(git)?$/.test(path76.trim());
     }
   };
 }
@@ -37061,11 +37499,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path75, line, preview] = input.split(NULL);
-    paths.add(path75);
-    (results[path75] = results[path75] || []).push({
+    const [path76, line, preview] = input.split(NULL);
+    paths.add(path76);
+    (results[path76] = results[path76] || []).push({
       line: asNumber(line),
-      path: path75,
+      path: path76,
       preview
     });
   });
@@ -37830,14 +38268,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path75, text) {
+function parseInit(bare, path76, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path75, false, result[1]);
+    return new InitSummary(bare, path76, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path75, true, result[1]);
+    return new InitSummary(bare, path76, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -37848,7 +38286,7 @@ function parseInit(bare, path75, text) {
       break;
     }
   }
-  return new InitSummary(bare, path75, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path76, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -37857,9 +38295,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path75, existing, gitDir) {
+      constructor(bare, path76, existing, gitDir) {
         this.bare = bare;
-        this.path = path75;
+        this.path = path76;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -37871,7 +38309,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path75, customArgs) {
+function initTask(bare = false, path76, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -37880,7 +38318,7 @@ function initTask(bare = false, path75, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path75, text);
+      return parseInit(commands.includes("--bare"), path76, text);
     }
   };
 }
@@ -38696,12 +39134,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path75, index, working_dir) {
-        this.path = path75;
+      constructor(path76, index, working_dir) {
+        this.path = path76;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path75) || [null, path75, path75];
+          const detail = fromPathRegex.exec(path76) || [null, path76, path76];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -38732,14 +39170,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path75) {
+  function data(index, workingDir, path76) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path75);
+      handler(result, path76);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path75, index, workingDir));
+      result.files.push(new FileStatusSummary(path76, index, workingDir));
     }
   }
 }
@@ -39048,9 +39486,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path75, write) {
+      hashObject(path76, write) {
         return this._runTask(
-          hashObjectTask(path75, write === true),
+          hashObjectTask(path76, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -39403,8 +39841,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path75 = input.trim().replace(/^["']|["']$/g, "");
-  return path75 && normalize3(path75);
+  const path76 = input.trim().replace(/^["']|["']$/g, "");
+  return path76 && normalize3(path76);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -39718,8 +40156,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path75) {
-  return subModuleTask(["add", repo, path75]);
+function addSubModuleTask(repo, path76) {
+  return subModuleTask(["add", repo, path76]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -40052,8 +40490,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path75, then) {
-      return this._runTask(addSubModuleTask2(repo, path75), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path76, then) {
+      return this._runTask(addSubModuleTask2(repo, path76), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -40789,8 +41227,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path75, entry] of parseNumstatEntries(lines)) {
-    m.set(path75, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path76, entry] of parseNumstatEntries(lines)) {
+    m.set(path76, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -42097,18 +42535,32 @@ import * as fs28 from "node:fs";
 // src/git/worktrees/worktree-remove.ts
 import * as fs27 from "node:fs";
 
+// src/worktrees/is-removable-session-worktree-checkout-path.ts
+import path43 from "node:path";
+function isBridgeRootCheckoutPath(checkoutPath) {
+  return normalizeResolvedPath(checkoutPath) === normalizeResolvedPath(getBridgeRoot());
+}
+function isRemovableSessionWorktreeCheckoutPath(checkoutPath, worktreesRootPath) {
+  if (isBridgeRootCheckoutPath(checkoutPath)) return false;
+  const normalized = normalizeResolvedPath(checkoutPath);
+  const worktreesRoot = normalizeResolvedPath(worktreesRootPath);
+  const rel = path43.relative(worktreesRoot, normalized);
+  if (rel === "" || rel.startsWith("..") || path43.isAbsolute(rel)) return false;
+  return true;
+}
+
 // src/git/worktrees/resolve-main-repo-from-git-file.ts
 import * as fs26 from "node:fs";
-import * as path43 from "node:path";
+import * as path44 from "node:path";
 function resolveMainRepoFromWorktreeGitFile(wt) {
-  const gitDirFile = path43.join(wt, ".git");
+  const gitDirFile = path44.join(wt, ".git");
   if (!fs26.existsSync(gitDirFile) || !fs26.statSync(gitDirFile).isFile()) return "";
   const first2 = fs26.readFileSync(gitDirFile, "utf8").trim();
   const m = first2.match(/^gitdir:\s*(.+)$/im);
   if (!m) return "";
-  const gitWorktreePath = path43.resolve(wt, m[1].trim());
-  const gitDir = path43.dirname(path43.dirname(gitWorktreePath));
-  return path43.dirname(gitDir);
+  const gitWorktreePath = path44.resolve(wt, m[1].trim());
+  const gitDir = path44.dirname(path44.dirname(gitWorktreePath));
+  return path44.dirname(gitDir);
 }
 
 // src/git/worktrees/worktree-remove.ts
@@ -42116,32 +42568,44 @@ async function gitWorktreeRemoveForce(worktreePath) {
   const mainRepo = resolveMainRepoFromWorktreeGitFile(worktreePath);
   if (mainRepo) {
     await cliSimpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
-  } else {
-    fs27.rmSync(worktreePath, { recursive: true, force: true });
+    return true;
   }
+  if (isBridgeRootCheckoutPath(worktreePath)) return false;
+  fs27.rmSync(worktreePath, { recursive: true, force: true });
+  return true;
 }
 
 // src/worktrees/remove-session-worktrees.ts
-async function removeSessionWorktrees(paths, log2) {
+async function removeSessionWorktrees(paths, worktreesRootPath, log2) {
   for (const wt of paths) {
+    if (!isRemovableSessionWorktreeCheckoutPath(wt, worktreesRootPath)) {
+      log2(`[worktrees] Skipping removal of ${wt} (bridge root or outside worktrees root).`);
+      continue;
+    }
     try {
-      await gitWorktreeRemoveForce(wt);
-      log2(`[worktrees] Removed worktree ${wt}`);
+      const removed = await gitWorktreeRemoveForce(wt);
+      if (removed) {
+        log2(`[worktrees] Removed worktree ${wt}`);
+      } else {
+        log2(`[worktrees] Skipping removal of ${wt} (bridge root).`);
+      }
     } catch (e) {
       log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
-      try {
-        fs28.rmSync(wt, { recursive: true, force: true });
-      } catch {
+      if (isRemovableSessionWorktreeCheckoutPath(wt, worktreesRootPath)) {
+        try {
+          fs28.rmSync(wt, { recursive: true, force: true });
+        } catch {
+        }
       }
     }
   }
 }
 
 // src/worktrees/manager/git/remove-session-worktree-checkouts.ts
-async function removeSessionWorktreeCheckouts(cache2, sessionId, log2) {
+async function removeSessionWorktreeCheckouts(cache2, sessionId, worktreesRootPath, log2) {
   const paths = cache2.clearSession(sessionId);
   if (!paths?.length) return;
-  await removeSessionWorktrees(paths, log2);
+  await removeSessionWorktrees(paths, worktreesRootPath, log2);
 }
 
 // src/git/branches/rename-branch.ts
@@ -42174,11 +42638,11 @@ async function renameSessionWorktreeBranch(cache2, sessionId, newBranch, log2) {
 
 // src/worktrees/discovery/discover-session-worktree-on-disk.ts
 import * as fs32 from "node:fs";
-import * as path48 from "node:path";
+import * as path49 from "node:path";
 
 // src/worktrees/discovery/collect-worktree-paths.ts
 import * as fs30 from "node:fs";
-import * as path45 from "node:path";
+import * as path46 from "node:path";
 
 // src/worktrees/discovery/disk-walk-constants.ts
 var DISK_WALK_YIELD_EVERY = 64;
@@ -42207,7 +42671,7 @@ function shouldSkipDiskWalkEntry(name) {
 
 // src/worktrees/discovery/disk-walk-utils.ts
 import * as fs29 from "node:fs";
-import * as path44 from "node:path";
+import * as path45 from "node:path";
 async function yieldDuringDiskWalk(state) {
   state.entries++;
   if (state.entries % DISK_WALK_YIELD_EVERY !== 0) return true;
@@ -42217,7 +42681,7 @@ async function yieldDuringDiskWalk(state) {
 }
 async function isGitDir(dirPath) {
   try {
-    await fs29.promises.access(path44.join(dirPath, ".git"));
+    await fs29.promises.access(path45.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -42231,7 +42695,7 @@ async function collectGitRepoRootsUnderDirectory(rootPath) {
   const walk = async (dir) => {
     if (!await yieldDuringDiskWalk(state)) return;
     if (await isGitDir(dir)) {
-      out.push(path45.resolve(dir));
+      out.push(path46.resolve(dir));
       return;
     }
     let entries;
@@ -42242,12 +42706,12 @@ async function collectGitRepoRootsUnderDirectory(rootPath) {
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path45.join(dir, e.name);
+      const full = path46.join(dir, e.name);
       if (!e.isDirectory()) continue;
       await walk(full);
     }
   };
-  await walk(path45.resolve(rootPath));
+  await walk(path46.resolve(rootPath));
   return { paths: [...new Set(out)], entriesVisited: state.entries };
 }
 async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK_MAX_DEPTH) {
@@ -42264,10 +42728,10 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path45.join(dir, e.name);
+      const full = path46.join(dir, e.name);
       if (!e.isDirectory()) continue;
       if (e.name === sessionId) {
-        if (await isGitDir(full)) out.push(path45.resolve(full));
+        if (await isGitDir(full)) out.push(path46.resolve(full));
         continue;
       }
       if (await isGitDir(full)) continue;
@@ -42279,14 +42743,14 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
 }
 
 // src/worktrees/discovery/layout-keys-for-bridge-root.ts
-import * as path46 from "node:path";
+import * as path47 from "node:path";
 function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
-  const bridge = path46.resolve(bridgeRoot);
+  const bridge = path47.resolve(bridgeRoot);
   const preferred = getLauncherDirNameIfPresent(layout, bridgeRoot);
   const relevant = layout.launcherCwds.filter((e) => {
-    const entry = path46.resolve(e.absolutePath);
-    return bridge === entry || bridge.startsWith(entry + path46.sep) || entry.startsWith(bridge + path46.sep);
-  }).sort((a, b) => path46.resolve(b.absolutePath).length - path46.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
+    const entry = path47.resolve(e.absolutePath);
+    return bridge === entry || bridge.startsWith(entry + path47.sep) || entry.startsWith(bridge + path47.sep);
+  }).sort((a, b) => path47.resolve(b.absolutePath).length - path47.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
   const ordered = [];
   const seen = /* @__PURE__ */ new Set();
   const add = (k) => {
@@ -42305,7 +42769,7 @@ function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
 
 // src/worktrees/discovery/try-binding-from-session-directory.ts
 import * as fs31 from "node:fs";
-import * as path47 from "node:path";
+import * as path48 from "node:path";
 async function tryBindingFromSessionDirectory(sessionDir) {
   let st;
   try {
@@ -42316,7 +42780,7 @@ async function tryBindingFromSessionDirectory(sessionDir) {
   if (!st.isDirectory()) return null;
   const { paths: worktreePaths } = await collectGitRepoRootsUnderDirectory(sessionDir);
   if (worktreePaths.length === 0) return null;
-  const abs = path47.resolve(sessionDir);
+  const abs = path48.resolve(sessionDir);
   return {
     sessionParentPath: abs,
     workingTreeRelRoot: abs,
@@ -42340,7 +42804,7 @@ async function discoverSessionWorktreeOnDisk(options) {
   try {
     for (const name of await fs32.promises.readdir(worktreesRootPath)) {
       if (name.startsWith(".")) continue;
-      const p = path48.join(worktreesRootPath, name);
+      const p = path49.join(worktreesRootPath, name);
       let st;
       try {
         st = await fs32.promises.stat(p);
@@ -42357,7 +42821,7 @@ async function discoverSessionWorktreeOnDisk(options) {
   for (const key of keys) {
     if (isCliImmediateShutdownRequested()) return null;
     await yieldToEventLoop();
-    const layoutRoot = path48.join(worktreesRootPath, key);
+    const layoutRoot = path49.join(worktreesRootPath, key);
     let layoutSt;
     try {
       layoutSt = await fs32.promises.stat(layoutRoot);
@@ -42365,16 +42829,16 @@ async function discoverSessionWorktreeOnDisk(options) {
       continue;
     }
     if (!layoutSt.isDirectory()) continue;
-    const sessionDir = path48.join(layoutRoot, sid);
+    const sessionDir = path49.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) ?? path48.resolve(legacy.paths[0]);
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacy.paths) ?? path49.resolve(legacy.paths[0]);
       return {
-        sessionParentPath: path48.resolve(isolated),
-        workingTreeRelRoot: path48.resolve(layoutRoot),
-        repoCheckoutPaths: legacy.paths.map((p) => path48.resolve(p))
+        sessionParentPath: path49.resolve(isolated),
+        workingTreeRelRoot: path49.resolve(layoutRoot),
+        repoCheckoutPaths: legacy.paths.map((p) => path49.resolve(p))
       };
     }
   }
@@ -42383,29 +42847,29 @@ async function discoverSessionWorktreeOnDisk(options) {
 
 // src/worktrees/discovery/discover-session-worktrees-under-session-worktree-root.ts
 import * as fs33 from "node:fs";
-import * as path50 from "node:path";
+import * as path51 from "node:path";
 
 // src/worktrees/discovery/discover-legacy-binding-ascending-from-checkout.ts
-import * as path49 from "node:path";
+import * as path50 from "node:path";
 async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPath) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hintR = path49.resolve(checkoutPath);
+  const hintR = path50.resolve(checkoutPath);
   let best = null;
-  let cur = path49.dirname(hintR);
+  let cur = path50.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) => path49.resolve(p) === hintR)) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path49.resolve(paths.paths[0]);
+    if (paths.paths.some((p) => path50.resolve(p) === hintR)) {
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path50.resolve(paths.paths[0]);
       best = {
-        sessionParentPath: path49.resolve(isolated),
-        workingTreeRelRoot: path49.resolve(cur),
-        repoCheckoutPaths: paths.paths.map((p) => path49.resolve(p))
+        sessionParentPath: path50.resolve(isolated),
+        workingTreeRelRoot: path50.resolve(cur),
+        repoCheckoutPaths: paths.paths.map((p) => path50.resolve(p))
       };
     }
-    const next = path49.dirname(cur);
+    const next = path50.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -42416,12 +42880,12 @@ async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPat
 async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionWorktreeRootPathOrHint, sessionId) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hint = path50.resolve(sessionWorktreeRootPathOrHint);
-  const underHint = await tryBindingFromSessionDirectory(path50.join(hint, sid));
+  const hint = path51.resolve(sessionWorktreeRootPathOrHint);
+  const underHint = await tryBindingFromSessionDirectory(path51.join(hint, sid));
   if (underHint) return underHint;
   const direct = await tryBindingFromSessionDirectory(hint);
   if (direct) {
-    if (path50.basename(hint) === sid && await isGitDir(hint)) {
+    if (path51.basename(hint) === sid && await isGitDir(hint)) {
       const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
       if (legacyFromCheckout && legacyFromCheckout.repoCheckoutPaths.length > direct.repoCheckoutPaths.length) {
         return legacyFromCheckout;
@@ -42429,7 +42893,7 @@ async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionWorktreeR
     }
     return direct;
   }
-  if (path50.basename(hint) === sid && await isGitDir(hint)) {
+  if (path51.basename(hint) === sid && await isGitDir(hint)) {
     const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
     if (legacyFromCheckout) return legacyFromCheckout;
   }
@@ -42442,11 +42906,11 @@ async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionWorktreeR
   if (!st.isDirectory()) return null;
   const legacyPaths = await collectWorktreeRootsNamed(hint, sid);
   if (legacyPaths.paths.length === 0) return null;
-  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path50.resolve(legacyPaths.paths[0]);
+  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path51.resolve(legacyPaths.paths[0]);
   return {
-    sessionParentPath: path50.resolve(isolated),
+    sessionParentPath: path51.resolve(isolated),
     workingTreeRelRoot: hint,
-    repoCheckoutPaths: legacyPaths.paths.map((p) => path50.resolve(p))
+    repoCheckoutPaths: legacyPaths.paths.map((p) => path51.resolve(p))
   };
 }
 
@@ -42508,11 +42972,11 @@ function parseSessionParent(v) {
 
 // src/worktrees/prepare-new-session-worktrees.ts
 import * as fs35 from "node:fs";
-import * as path52 from "node:path";
+import * as path53 from "node:path";
 
 // src/git/discover-repos.ts
 import * as fs34 from "node:fs";
-import * as path51 from "node:path";
+import * as path52 from "node:path";
 var GIT_DISCOVER_YIELD_EVERY = 32;
 async function yieldGitDiscoverWork(entryCount) {
   if (entryCount > 0 && entryCount % GIT_DISCOVER_YIELD_EVERY === 0) {
@@ -42521,7 +42985,7 @@ async function yieldGitDiscoverWork(entryCount) {
 }
 async function discoverGitRepos(cwd = getBridgeRoot()) {
   const result = [];
-  const cwdResolved = path51.resolve(cwd);
+  const cwdResolved = path52.resolve(cwd);
   if (await isGitRepoDirectory(cwdResolved)) {
     const remoteUrl = await getRemoteOriginUrl(cwdResolved);
     result.push({ absolutePath: cwdResolved, remoteUrl });
@@ -42536,7 +43000,7 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
     await yieldGitDiscoverWork(i + 1);
     const ent = entries[i];
     if (!ent.isDirectory()) continue;
-    const childPath2 = path51.join(cwdResolved, ent.name);
+    const childPath2 = path52.join(cwdResolved, ent.name);
     if (await isGitRepoDirectory(childPath2)) {
       const remoteUrl = await getRemoteOriginUrl(childPath2);
       result.push({ absolutePath: childPath2, remoteUrl });
@@ -42545,12 +43009,12 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
   return result;
 }
 async function discoverGitReposUnderRoot(rootPath) {
-  const root = path51.resolve(rootPath);
+  const root = path52.resolve(rootPath);
   const roots = [];
   let walkEntries = 0;
   async function walk(dir) {
     if (await isGitRepoDirectory(dir)) {
-      roots.push(path51.resolve(dir));
+      roots.push(path52.resolve(dir));
       return;
     }
     let entries;
@@ -42563,7 +43027,7 @@ async function discoverGitReposUnderRoot(rootPath) {
       await yieldGitDiscoverWork(++walkEntries);
       const ent = entries[i];
       if (!ent.isDirectory() || ent.name === ".git") continue;
-      await walk(path51.join(dir, ent.name));
+      await walk(path52.join(dir, ent.name));
     }
   }
   await walk(root);
@@ -42598,10 +43062,10 @@ function resolveBaseRefForRepo(relNorm, baseBranches) {
 }
 async function prepareNewSessionWorktrees(options) {
   const { worktreesRootPath, bridgeRoot, sessionId, layout, log: log2, worktreeBaseBranches } = options;
-  const bridgeResolved = path52.resolve(bridgeRoot);
+  const bridgeResolved = path53.resolve(bridgeRoot);
   const cwdKey = allocateDirNameForLauncherCwd(layout, bridgeResolved);
-  const bridgeKeyDir = path52.join(worktreesRootPath, cwdKey);
-  const sessionDir = path52.join(bridgeKeyDir, sessionId);
+  const bridgeKeyDir = path53.join(worktreesRootPath, cwdKey);
+  const sessionDir = path53.join(bridgeKeyDir, sessionId);
   const repos = await discoverGitReposUnderRoot(bridgeResolved);
   if (repos.length === 0) {
     log2("[worktrees] No Git repositories under bridge root; skipping worktree creation.");
@@ -42611,12 +43075,12 @@ async function prepareNewSessionWorktrees(options) {
   const worktreePaths = [];
   fs35.mkdirSync(sessionDir, { recursive: true });
   for (const repo of repos) {
-    let rel = path52.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path52.isAbsolute(rel)) continue;
+    let rel = path53.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path53.isAbsolute(rel)) continue;
     const relNorm = normalizeRepoRelPath2(rel === "" ? "." : rel);
-    const wtPath = relNorm === "." ? sessionDir : path52.join(sessionDir, relNorm);
+    const wtPath = relNorm === "." ? sessionDir : path53.join(sessionDir, relNorm);
     if (relNorm !== ".") {
-      fs35.mkdirSync(path52.dirname(wtPath), { recursive: true });
+      fs35.mkdirSync(path53.dirname(wtPath), { recursive: true });
     }
     const baseRef = resolveBaseRefForRepo(relNorm, worktreeBaseBranches);
     try {
@@ -42669,9 +43133,9 @@ async function resolveExistingSessionParentPath(sessionId, cache2, discover) {
 }
 
 // src/worktrees/manager/resolve-explicit-session-parent-path.ts
-import * as path53 from "node:path";
+import * as path54 from "node:path";
 async function resolveExplicitSessionParentPath(params) {
-  const resolved = path53.resolve(params.parentPathRaw);
+  const resolved = path54.resolve(params.parentPathRaw);
   if (parseSessionParent(params.sessionParent) !== "worktrees_root") {
     return resolved;
   }
@@ -42688,7 +43152,7 @@ async function resolveExplicitSessionParentPath(params) {
     await yieldToEventLoop();
     const tryRoot = await discoverSessionWorktreesUnderSessionWorktreeRoot(cur, params.sessionId);
     if (tryRoot) return rememberAndReturn(tryRoot);
-    const next = path53.dirname(cur);
+    const next = path54.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -42798,7 +43262,7 @@ function createSessionWorktreeGitApi(ctx) {
       await renameSessionWorktreeBranch(ctx.cache, sessionId, newBranch, ctx.log);
     },
     async removeSessionWorktrees(sessionId) {
-      await removeSessionWorktreeCheckouts(ctx.cache, sessionId, ctx.log);
+      await removeSessionWorktreeCheckouts(ctx.cache, sessionId, ctx.worktreesRootPath, ctx.log);
     },
     async commitSession(params) {
       return commitSessionWorktree(ctx.cache, params);
@@ -42827,17 +43291,17 @@ var SessionWorktreeManager = class {
 };
 
 // src/worktrees/manager/default-worktrees-root-path.ts
-import * as path54 from "node:path";
+import * as path55 from "node:path";
 import os9 from "node:os";
 function defaultWorktreesRootPath() {
-  return path54.join(os9.homedir(), ".buildautomaton", "worktrees");
+  return path55.join(os9.homedir(), ".buildautomaton", "worktrees");
 }
 
 // src/files/watch-file-index.ts
-import path59 from "node:path";
+import path60 from "node:path";
 
 // src/files/index/build-file-index.ts
-import path55 from "node:path";
+import path56 from "node:path";
 
 // src/files/index/file-index-sqlite-lock.ts
 var fileIndexChain = Promise.resolve();
@@ -42928,7 +43392,7 @@ function assertNotShutdown2() {
   if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
 }
 async function buildFileIndexAsync(cwd) {
-  const resolved = path55.resolve(cwd);
+  const resolved = path56.resolve(cwd);
   await yieldToEventLoop();
   assertNotShutdown2();
   const paths = await collectWorkspacePathsAsync(resolved);
@@ -42941,7 +43405,7 @@ async function buildFileIndexAsync(cwd) {
 }
 
 // src/files/index/ensure-file-index.ts
-import path56 from "node:path";
+import path57 from "node:path";
 
 // src/files/index/search-file-index.ts
 function escapeLikePattern(fragment) {
@@ -42993,7 +43457,7 @@ async function searchBridgeFilePathsAsync(resolvedCwd, query, limit = 100) {
 
 // src/files/index/ensure-file-index.ts
 async function ensureFileIndexAsync(cwd) {
-  const resolved = path56.resolve(cwd);
+  const resolved = path57.resolve(cwd);
   if (await bridgeFileIndexIsPopulated(resolved)) {
     return { fromCache: true, pathCount: await bridgeFileIndexPathCount(resolved) };
   }
@@ -43042,10 +43506,10 @@ function createFileIndexFsWatcher(resolved, schedule) {
 
 // src/files/index/file-index-incremental-symbol-updates.ts
 import fs36 from "node:fs";
-import path57 from "node:path";
+import path58 from "node:path";
 async function applyIncrementalSymbolIndexUpdates(resolved, relPaths) {
   for (const rel of relPaths) {
-    const absPath = path57.join(resolved, rel);
+    const absPath = path58.join(resolved, rel);
     try {
       const stat3 = await fs36.promises.stat(absPath);
       if (stat3.isFile()) {
@@ -43065,9 +43529,9 @@ async function applyIncrementalSymbolIndexUpdates(resolved, relPaths) {
 }
 
 // src/files/index/file-index-initial-builds.ts
-import path58 from "node:path";
+import path59 from "node:path";
 async function runInitialIndexBuilds(cwd = getBridgeRoot()) {
-  const resolved = path58.resolve(cwd);
+  const resolved = path59.resolve(cwd);
   try {
     await buildFileIndexAsync(resolved);
     await buildSymbolIndexAsync(resolved);
@@ -43085,7 +43549,7 @@ function scheduleInitialIndexBuilds(cwd = getBridgeRoot()) {
 // src/files/watch-file-index.ts
 var MAX_INCREMENTAL_SYMBOL_UPDATES = 512;
 function startFileIndexWatcher(cwd = getBridgeRoot()) {
-  const resolved = path59.resolve(cwd);
+  const resolved = path60.resolve(cwd);
   let timer = null;
   const pendingSymbolUpdates = /* @__PURE__ */ new Set();
   let needsFullSymbolRebuild = false;
@@ -43147,7 +43611,7 @@ function startFileIndexWatcher(cwd = getBridgeRoot()) {
 }
 
 // src/connection/create-bridge-connection.ts
-import * as path73 from "node:path";
+import * as path74 from "node:path";
 
 // src/dev-servers/manager/dev-server-manager.ts
 import { rm as rm2 } from "node:fs/promises";
@@ -43457,10 +43921,10 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
 import { spawn as spawn7 } from "node:child_process";
 import fs39 from "node:fs";
 import { tmpdir } from "node:os";
-import path60 from "node:path";
+import path61 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal) {
-  const tmpRoot = fs39.mkdtempSync(path60.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path60.join(tmpRoot, "combined.log");
+  const tmpRoot = fs39.mkdtempSync(path61.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path61.join(tmpRoot, "combined.log");
   let logFd;
   try {
     logFd = fs39.openSync(logPath, "a");
@@ -43504,15 +43968,15 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
 import { spawn as spawn8 } from "node:child_process";
 import fs40 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path61 from "node:path";
+import path62 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal) {
-  const tmpRoot = fs40.mkdtempSync(path61.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path61.join(tmpRoot, "combined.log");
-  const innerPath = path61.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path61.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs40.mkdtempSync(path62.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path62.join(tmpRoot, "combined.log");
+  const innerPath = path62.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path62.join(tmpRoot, "_run.sh");
   try {
     fs40.writeFileSync(innerPath, `#!/bin/sh
 ${command}
@@ -43543,9 +44007,9 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal) {
-  const tmpRoot = fs40.mkdtempSync(path61.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path61.join(tmpRoot, "combined.log");
-  const runnerPath = path61.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs40.mkdtempSync(path62.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path62.join(tmpRoot, "combined.log");
+  const runnerPath = path62.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
@@ -44495,15 +44959,15 @@ async function yieldSkillDiscoveryWork(entryCount) {
 
 // src/skills/discovery/discover-local-skills.ts
 import fs41 from "node:fs";
-import path62 from "node:path";
+import path63 from "node:path";
 function collectSkillFromDir(rel, base, name, seenKeys, out) {
-  const dir = path62.join(base, name);
+  const dir = path63.join(base, name);
   try {
     if (!fs41.statSync(dir).isDirectory()) return;
   } catch {
     return;
   }
-  const skillMd = path62.join(dir, "SKILL.md");
+  const skillMd = path63.join(dir, "SKILL.md");
   if (!fs41.existsSync(skillMd)) return;
   const key = `${rel}/${name}`;
   if (seenKeys.has(key)) return;
@@ -44516,7 +44980,7 @@ async function discoverLocalSkillsAsync(cwd) {
   let work = 0;
   for (const rel of SKILL_DISCOVERY_ROOTS) {
     await yieldSkillDiscoveryWork(++work);
-    const base = path62.join(cwd, rel);
+    const base = path63.join(cwd, rel);
     if (!fs41.existsSync(base) || !fs41.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
@@ -44534,15 +44998,15 @@ async function discoverLocalSkillsAsync(cwd) {
 
 // src/skills/discovery/discover-skill-layout-roots.ts
 import fs42 from "node:fs";
-import path63 from "node:path";
+import path64 from "node:path";
 function collectLayoutSkill(rel, base, name, skills2) {
-  const dir = path63.join(base, name);
+  const dir = path64.join(base, name);
   try {
     if (!fs42.statSync(dir).isDirectory()) return;
   } catch {
     return;
   }
-  if (!fs42.existsSync(path63.join(dir, "SKILL.md"))) return;
+  if (!fs42.existsSync(path64.join(dir, "SKILL.md"))) return;
   const relPath = `${rel}/${name}`.replace(/\\/g, "/");
   skills2.push({ name, relPath });
 }
@@ -44551,7 +45015,7 @@ async function discoverSkillLayoutRootsAsync(cwd) {
   let work = 0;
   for (const rel of SKILL_DISCOVERY_ROOTS) {
     await yieldSkillDiscoveryWork(++work);
-    const base = path63.join(cwd, rel);
+    const base = path64.join(cwd, rel);
     if (!fs42.existsSync(base) || !fs42.statSync(base).isDirectory()) continue;
     let entries = [];
     try {
@@ -44903,7 +45367,7 @@ import fs44 from "node:fs";
 
 // src/git/snapshot/capture.ts
 import * as fs43 from "node:fs";
-import * as path64 from "node:path";
+import * as path65 from "node:path";
 
 // src/git/snapshot/git.ts
 async function gitStashCreate(repoRoot, log2) {
@@ -44943,7 +45407,7 @@ async function gitRun(repoRoot, args, log2, label) {
 async function resolveSnapshotRepoRoots(options) {
   const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
   if (worktreePaths?.length) {
-    const uniq = [...new Set(worktreePaths.map((p) => path64.resolve(p)))];
+    const uniq = [...new Set(worktreePaths.map((p) => path65.resolve(p)))];
     return uniq;
   }
   try {
@@ -44951,7 +45415,7 @@ async function resolveSnapshotRepoRoots(options) {
     const mapped = repos.map((r) => r.absolutePath);
     const sid = sessionId?.trim();
     if (sid) {
-      const filtered = mapped.filter((root) => path64.basename(root) === sid);
+      const filtered = mapped.filter((root) => path65.basename(root) === sid);
       if (filtered.length > 0) return filtered;
     }
     return mapped;
@@ -44982,7 +45446,7 @@ async function capturePreTurnSnapshot(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     repos
   };
-  const filePath = path64.join(dir, `${runId}.json`);
+  const filePath = path65.join(dir, `${runId}.json`);
   try {
     fs43.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
   } catch (e) {
@@ -45325,9 +45789,9 @@ function parseChangeSummarySnapshots(raw) {
   for (const item of raw) {
     if (!item || typeof item !== "object") continue;
     const o = item;
-    const path75 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
-    if (!path75) continue;
-    const row = { path: path75 };
+    const path76 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
+    if (!path76) continue;
+    const row = { path: path76 };
     if (typeof o.patchContent === "string") row.patchContent = o.patchContent;
     if (typeof o.oldText === "string") row.oldText = o.oldText;
     if (typeof o.newText === "string") row.newText = o.newText;
@@ -45406,7 +45870,8 @@ async function runPreambleAndPrompt(params) {
     cloudApiBaseUrl: deps.cloudApiBaseUrl,
     getCloudAccessToken: deps.getCloudAccessToken,
     e2ee: deps.e2ee,
-    ...attachments.length > 0 ? { attachments } : {}
+    ...attachments.length > 0 ? { attachments } : {},
+    isNewSession: msg.isNewSession === true
   });
 }
 
@@ -45537,8 +46002,8 @@ function randomSecret() {
   }
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function requestPreviewApi(port, secret, method, path75, body) {
-  const url2 = `http://127.0.0.1:${port}${path75}`;
+async function requestPreviewApi(port, secret, method, path76, body) {
+  const url2 = `http://127.0.0.1:${port}${path76}`;
   const headers = {
     [PREVIEW_SECRET_HEADER]: secret,
     "Content-Type": "application/json"
@@ -45550,7 +46015,7 @@ async function requestPreviewApi(port, secret, method, path75, body) {
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) {
-    throw new Error(data?.error ?? `Preview API ${method} ${path75}: ${res.status}`);
+    throw new Error(data?.error ?? `Preview API ${method} ${path76}: ${res.status}`);
   }
   return data;
 }
@@ -45729,11 +46194,11 @@ async function resolveFileBrowserSessionParent(sessionWorktreeManager, sessionId
 import fs46 from "node:fs";
 
 // src/files/ensure-under-cwd.ts
-import path65 from "node:path";
+import path66 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path65.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path65.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path65.sep) && resolved !== cwd) {
+  const normalized = path66.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path66.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path66.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -45743,11 +46208,11 @@ function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
 var LIST_DIR_YIELD_EVERY = 256;
 
 // src/files/list-dir/map-dir-entry.ts
-import path66 from "node:path";
+import path67 from "node:path";
 import fs45 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path66.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path66.join(resolved, d.name);
+  const entryPath = path67.join(relativePath || ".", d.name).replace(/\\/g, "/");
+  const fullPath = path67.join(resolved, d.name);
   let isDir = d.isDirectory();
   if (d.isSymbolicLink()) {
     try {
@@ -45797,13 +46262,13 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
 }
 
 // src/files/handle-file-browser-search.ts
-import path67 from "node:path";
+import path68 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 = path67.resolve(
+    const sessionParentPath = path68.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -46013,13 +46478,13 @@ function triggerSymbolIndexBuild(parentPath) {
 }
 
 // src/git/tree/resolve-repo-abs-path.ts
-import * as path68 from "node:path";
+import * as path69 from "node:path";
 function resolveRepoAbsPathFromBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path68.resolve(bridgeRoot);
+  const bridgeResolved = path69.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path68.join(bridgeResolved, rel);
-  const resolved = path68.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path68.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path69.join(bridgeResolved, rel);
+  const resolved = path69.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path69.sep) && resolved !== bridgeResolved) {
     return null;
   }
   return resolved;
@@ -46802,7 +47267,7 @@ function isValidRemoteSkillInstallItem(item) {
 
 // src/skills/install/install-remote-skills-async.ts
 import fs50 from "node:fs";
-import path69 from "node:path";
+import path70 from "node:path";
 
 // src/skills/install/constants.ts
 var INSTALL_SKILLS_YIELD_EVERY = 16;
@@ -46813,8 +47278,8 @@ async function writeInstallFileAsync(skillDir, f, filesWritten) {
   if (++filesWritten.count % INSTALL_SKILLS_YIELD_EVERY === 0) {
     await yieldToEventLoop();
   }
-  const dest = path69.join(skillDir, f.path);
-  await fs50.promises.mkdir(path69.dirname(dest), { recursive: true });
+  const dest = path70.join(skillDir, f.path);
+  await fs50.promises.mkdir(path70.dirname(dest), { recursive: true });
   if (f.text !== void 0) {
     await fs50.promises.writeFile(dest, f.text, "utf8");
   } else if (f.base64) {
@@ -46830,7 +47295,7 @@ async function installRemoteSkillsAsync(cwd, targetDir, items) {
   try {
     for (const item of items) {
       if (!isValidRemoteSkillInstallItem(item)) continue;
-      const skillDir = path69.join(cwd, targetDir, item.skillName);
+      const skillDir = path70.join(cwd, targetDir, item.skillName);
       for (const f of item.files) {
         await writeInstallFileAsync(skillDir, f, filesWritten);
       }
@@ -47169,7 +47634,7 @@ var handleDevServersConfig = (msg, deps) => {
 };
 
 // src/git/bridge-git-context.ts
-import * as path70 from "node:path";
+import * as path71 from "node:path";
 
 // src/git/branches/get-current-branch.ts
 async function getCurrentBranch(repoPath) {
@@ -47219,12 +47684,12 @@ async function listRepoBranchRefs(repoPath) {
 // src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
-    return path70.basename(path70.resolve(bridgeRoot)) || "repo";
+    return path71.basename(path71.resolve(bridgeRoot)) || "repo";
   }
-  return path70.basename(relPath) || relPath;
+  return path71.basename(relPath) || relPath;
 }
 async function discoverGitReposForBridgeContext(bridgeRoot) {
-  const root = path70.resolve(bridgeRoot);
+  const root = path71.resolve(bridgeRoot);
   if (await isGitRepoDirectory(root)) {
     const remoteUrl = await getRemoteOriginUrl(root);
     return [{ absolutePath: root, remoteUrl }];
@@ -47232,19 +47697,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(path70.resolve(repo.absolutePath), repo);
+    byPath.set(path71.resolve(repo.absolutePath), repo);
   }
   return [...byPath.values()];
 }
 async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path70.resolve(bridgeRoot);
+  const bridgeResolved = path71.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 = path70.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path70.isAbsolute(rel)) continue;
+    let rel = path71.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path71.isAbsolute(rel)) continue;
     const relPath = rel === "" ? "." : rel.replace(/\\/g, "/");
     const currentBranch = await getCurrentBranch(repo.absolutePath);
     const remoteUrl = repo.remoteUrl.trim() || null;
@@ -47259,11 +47724,11 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
   return rows;
 }
 async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path70.resolve(bridgeRoot);
+  const bridgeResolved = path71.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path70.join(bridgeResolved, rel);
-  const resolved = path70.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path70.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path71.join(bridgeResolved, rel);
+  const resolved = path71.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path71.sep) && resolved !== bridgeResolved) {
     return [];
   }
   return listRepoBranchRefs(resolved);
@@ -48140,7 +48605,7 @@ async function createBridgeAccessState(options = {}) {
 }
 
 // src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-import * as path72 from "node:path";
+import * as path73 from "node:path";
 
 // src/sqlite/hash-json-sha256.ts
 import { createHash as createHash2 } from "node:crypto";
@@ -48207,7 +48672,7 @@ function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
 }
 
 // src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
-import * as path71 from "node:path";
+import * as path72 from "node:path";
 async function probeOneAgentTypeForCapabilities(params) {
   const { agentType, cwd, workspaceId, log: log2, reportAgentCapabilities, bridgeReport = true, shouldContinue } = params;
   const canContinue = () => shouldContinue?.() !== false;
@@ -48245,7 +48710,7 @@ async function probeOneAgentTypeForCapabilities(params) {
     if (!canContinue()) return false;
     handle = await resolved.createClient({
       command: resolved.command,
-      cwd: path71.resolve(cwd),
+      cwd: path72.resolve(cwd),
       backendAgentType: agentType,
       sessionMode: "agent",
       persistedAcpSessionId: null,
@@ -48323,7 +48788,7 @@ async function warmupAgentCapabilitiesOnConnect(params) {
   const { workspaceId, log: log2, getWs } = params;
   const isCurrent = beginAgentCapabilityWarmupRun();
   if (!isCurrent()) return;
-  const cwd = path72.resolve(getBridgeRoot());
+  const cwd = path73.resolve(getBridgeRoot());
   async function sendBatchFromCache() {
     if (!isCurrent()) return;
     const socket = getWs();
@@ -48558,8 +49023,8 @@ async function createBridgeConnection(options) {
     getCloudAccessToken: () => tokens.accessToken
   });
   const identifyReportedPaths = {
-    bridgeRootPath: path73.resolve(getBridgeRoot()),
-    worktreesRootPath: path73.resolve(worktreesRootPath)
+    bridgeRootPath: path74.resolve(getBridgeRoot()),
+    worktreesRootPath: path74.resolve(worktreesRootPath)
   };
   const { connect } = createMainBridgeWebSocketLifecycle({
     state,
@@ -48816,7 +49281,7 @@ async function runCliAction(program2, opts) {
   const firehoseServerUrl = opts.firehoseUrl ?? opts.proxyUrl ?? process.env.BUILDAUTOMATON_FIREHOSE_URL ?? process.env.BUILDAUTOMATON_PROXY_URL ?? DEFAULT_FIREHOSE_URL;
   const bridgeRootOpt = (opts.bridgeRoot && typeof opts.bridgeRoot === "string" && opts.bridgeRoot.trim() ? opts.bridgeRoot.trim() : null) ?? (opts.cwd && typeof opts.cwd === "string" && opts.cwd.trim() ? opts.cwd.trim() : null);
   if (bridgeRootOpt) {
-    const resolvedBridgeRoot = path74.resolve(process.cwd(), bridgeRootOpt);
+    const resolvedBridgeRoot = path75.resolve(process.cwd(), bridgeRootOpt);
     try {
       const st = fs52.statSync(resolvedBridgeRoot);
       if (!st.isDirectory()) {
@@ -48838,7 +49303,7 @@ async function runCliAction(program2, opts) {
   );
   let worktreesRootPath;
   if (opts.worktreesRoot && opts.worktreesRoot.trim()) {
-    worktreesRootPath = path74.resolve(opts.worktreesRoot.trim());
+    worktreesRootPath = path75.resolve(opts.worktreesRoot.trim());
   }
   const e2eCertificates = opts.e2eeCertificatesDir?.trim() ? await loadOrCreateE2eCertificates(opts.e2eeCertificatesDir.trim()) : void 0;
   if (e2eCertificates) {