@buildautomaton/cli 0.1.93 → 0.1.95

package/dist/index.js

@@ -4086,10 +4086,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path85) {
-  if (!path85)
+function getElementAtPath(obj, path83) {
+  if (!path83)
     return obj;
-  return path85.reduce((acc, key) => acc?.[key], obj);
+  return path83.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -4417,11 +4417,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path85, issues) {
+function prefixIssues(path83, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path85);
+    iss.path.unshift(path83);
     return iss;
   });
 }
@@ -4638,16 +4638,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path85 = []) => {
+  const processError = (error52, path83 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path85, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path83, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path85, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path83, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path85, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path83, ...issue2.path]);
       } else {
-        const fullpath = [...path85, ...issue2.path];
+        const fullpath = [...path83, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -4674,17 +4674,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path85 = []) => {
+  const processError = (error52, path83 = []) => {
     var _a4, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path85, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path83, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path85, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path83, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path85, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path83, ...issue2.path]);
       } else {
-        const fullpath = [...path85, ...issue2.path];
+        const fullpath = [...path83, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -4716,8 +4716,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path85 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path85) {
+  const path83 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path83) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -18147,13 +18147,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path85 = ref.slice(1).split("/").filter(Boolean);
-  if (path85.length === 0) {
+  const path83 = ref.slice(1).split("/").filter(Boolean);
+  if (path83.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path85[0] === defsKey) {
-    const key = path85[1];
+  if (path83[0] === defsKey) {
+    const key = path83[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -20756,12 +20756,22 @@ var init_acp = __esm({
   }
 });
 
+// ../bridge/src/runtime/yield-to-event-loop.ts
+function yieldToEventLoop() {
+  return new Promise((resolve36) => setImmediate(resolve36));
+}
+var init_yield_to_event_loop = __esm({
+  "../bridge/src/runtime/yield-to-event-loop.ts"() {
+  }
+});
+
 // ../bridge/src/files/index/constants.ts
 import path3 from "node:path";
 import os from "node:os";
 var INDEX_WORK_YIELD_EVERY, INDEX_DIR, INDEX_HASH_LEN;
 var init_constants = __esm({
   "../bridge/src/files/index/constants.ts"() {
+    "use strict";
     INDEX_WORK_YIELD_EVERY = 128;
     INDEX_DIR = path3.join(os.homedir(), ".buildautomaton");
     INDEX_HASH_LEN = 16;
@@ -21026,15 +21036,6 @@ var init_activity_tracker = __esm({
   }
 });
 
-// ../bridge/src/runtime/yield-to-event-loop.ts
-function yieldToEventLoop() {
-  return new Promise((resolve36) => setImmediate(resolve36));
-}
-var init_yield_to_event_loop = __esm({
-  "../bridge/src/runtime/yield-to-event-loop.ts"() {
-  }
-});
-
 // ../bridge/src/code-nav/symbol-index/deferred-indexing.ts
 function isSymbolIndexDeferredError(err) {
   return err instanceof SymbolIndexDeferredError;
@@ -21125,7 +21126,6 @@ function isCliSqliteLockError(e) {
 var CliSqliteInterrupted;
 var init_sqlite_errors = __esm({
   "../bridge/src/sqlite/sqlite-errors.ts"() {
-    "use strict";
     CliSqliteInterrupted = class extends Error {
       name = "CliSqliteInterrupted";
       constructor() {
@@ -21748,7 +21748,7 @@ function readMigrationSql(filename, ...searchSubdirs) {
     join2(moduleDir, "..", sub, filename),
     join2(moduleDir, "..", "..", "dist", sub, filename)
   ]);
-  const resolved = candidates.find((path85) => existsSync(path85));
+  const resolved = candidates.find((path83) => existsSync(path83));
   if (!resolved) {
     throw new Error(`Missing SQLite migration SQL: ${filename} (searched ${searchSubdirs.join(", ")})`);
   }
@@ -22065,7 +22065,6 @@ async function ensureCodeNavCacheSqliteInitialized() {
 var safeCloseCodeNavCacheSqliteDatabase, openCodeNavCacheSqliteConnection;
 var init_database = __esm({
   "../bridge/src/sqlite/code-nav-cache/database.ts"() {
-    "use strict";
     init_code_nav_cache_availability();
     init_instance();
     init_sqlite_errors();
@@ -22138,31 +22137,18 @@ var init_cli_sqlite_paths = __esm({
   }
 });
 
-// ../bridge/src/prompt-turn-queue/paths.ts
-import path7 from "node:path";
-import os4 from "node:os";
-function getPromptQueuesDirectory() {
-  const override = process.env.BUILDAMATON_PROMPT_QUEUES_DIR?.trim();
-  if (override) return path7.resolve(override);
-  return path7.join(os4.homedir(), ".buildautomaton", "queues");
-}
-var init_paths2 = __esm({
-  "../bridge/src/prompt-turn-queue/paths.ts"() {
-  }
-});
-
 // ../bridge/src/sqlite/legacy_migration/archive-to-old-version.ts
 import fs7 from "node:fs";
-import path8 from "node:path";
+import path7 from "node:path";
 function moveLegacyFileToOldVersionBackup(category, sourcePath) {
-  const destDir = path8.join(OLD_VERSION_DIR, category);
+  const destDir = path7.join(OLD_VERSION_DIR, category);
   fs7.mkdirSync(destDir, { recursive: true });
-  const base = path8.basename(sourcePath);
-  let dest = path8.join(destDir, base);
+  const base = path7.basename(sourcePath);
+  let dest = path7.join(destDir, base);
   if (fs7.existsSync(dest)) {
-    const ext = path8.extname(base);
+    const ext = path7.extname(base);
     const stem = ext ? base.slice(0, -ext.length) : base;
-    dest = path8.join(destDir, `${stem}-${Date.now()}${ext}`);
+    dest = path7.join(destDir, `${stem}-${Date.now()}${ext}`);
   }
   fs7.renameSync(sourcePath, dest);
 }
@@ -22171,19 +22157,19 @@ var init_archive_to_old_version = __esm({
   "../bridge/src/sqlite/legacy_migration/archive-to-old-version.ts"() {
     "use strict";
     init_constants();
-    OLD_VERSION_DIR = path8.join(INDEX_DIR, "old-version");
+    OLD_VERSION_DIR = path7.join(INDEX_DIR, "old-version");
   }
 });
 
 // ../bridge/src/sqlite/legacy_migration/archive-file-index-json.ts
 import fs8 from "node:fs";
-import path9 from "node:path";
+import path8 from "node:path";
 function archiveLegacyFileIndexJsonFiles() {
   try {
     if (!fs8.existsSync(INDEX_DIR)) return;
     for (const name of fs8.readdirSync(INDEX_DIR)) {
       if (name.startsWith(".file-index-") && name.endsWith(".json")) {
-        const full = path9.join(INDEX_DIR, name);
+        const full = path8.join(INDEX_DIR, name);
         try {
           moveLegacyFileToOldVersionBackup("file-index", full);
         } catch (err) {
@@ -22205,15 +22191,15 @@ var init_archive_file_index_json = __esm({
 
 // ../bridge/src/sqlite/legacy_migration/import-agent-sessions-from-disk.ts
 import fs9 from "node:fs";
-import path10 from "node:path";
-import os5 from "node:os";
+import path9 from "node:path";
+import os4 from "node:os";
 function importLegacyAgentSessionsFromDisk(db) {
   try {
     if (!fs9.existsSync(LEGACY_AGENT_SESSION_DIR)) return;
     const names = fs9.readdirSync(LEGACY_AGENT_SESSION_DIR).filter((n) => n.endsWith(".json"));
     for (const name of names) {
       const sessionKey = name.slice(0, -".json".length);
-      const full = path10.join(LEGACY_AGENT_SESSION_DIR, name);
+      const full = path9.join(LEGACY_AGENT_SESSION_DIR, name);
       let raw;
       try {
         raw = fs9.readFileSync(full, "utf8");
@@ -22250,89 +22236,27 @@ var init_import_agent_sessions_from_disk = __esm({
   "../bridge/src/sqlite/legacy_migration/import-agent-sessions-from-disk.ts"() {
     "use strict";
     init_archive_to_old_version();
-    LEGACY_AGENT_SESSION_DIR = path10.join(os5.homedir(), ".buildautomaton", "agent-sessions");
-  }
-});
-
-// ../bridge/src/sqlite/legacy_migration/parse-persisted-queue-json.ts
-function parsePersistedQueueFromJson(raw) {
-  try {
-    const o = JSON.parse(raw);
-    const queueKey = typeof o.queueKey === "string" ? o.queueKey : typeof o.queueKeyHash === "string" ? o.queueKeyHash : null;
-    if (!queueKey || typeof o.updatedAt !== "string" || !Array.isArray(o.turns)) return null;
-    return { queueKey, updatedAt: o.updatedAt, turns: o.turns };
-  } catch {
-    return null;
-  }
-}
-var init_parse_persisted_queue_json = __esm({
-  "../bridge/src/sqlite/legacy_migration/parse-persisted-queue-json.ts"() {
-    "use strict";
-  }
-});
-
-// ../bridge/src/sqlite/legacy_migration/import-prompt-queues-from-disk.ts
-import fs10 from "node:fs";
-import path11 from "node:path";
-function importLegacyPromptQueuesFromDisk(db) {
-  try {
-    const dir = getPromptQueuesDirectory();
-    if (!fs10.existsSync(dir)) return;
-    for (const name of fs10.readdirSync(dir)) {
-      if (!name.endsWith(".json")) continue;
-      const full = path11.join(dir, name);
-      let raw;
-      try {
-        raw = fs10.readFileSync(full, "utf8");
-      } catch {
-        continue;
-      }
-      const file2 = parsePersistedQueueFromJson(raw);
-      if (!file2) continue;
-      db.run(
-        `INSERT OR REPLACE INTO prompt_queue (queue_key, updated_at, turns_json) VALUES (?, ?, ?)`,
-        [file2.queueKey, file2.updatedAt, JSON.stringify(file2.turns)]
-      );
-      try {
-        moveLegacyFileToOldVersionBackup("queues", full);
-      } catch {
-      }
-    }
-  } catch (e) {
-    console.error("[cli-sqlite] legacy import: prompt queues from disk failed", e);
-  }
-}
-var init_import_prompt_queues_from_disk = __esm({
-  "../bridge/src/sqlite/legacy_migration/import-prompt-queues-from-disk.ts"() {
-    "use strict";
-    init_paths2();
-    init_archive_to_old_version();
-    init_parse_persisted_queue_json();
+    LEGACY_AGENT_SESSION_DIR = path9.join(os4.homedir(), ".buildautomaton", "agent-sessions");
   }
 });
 
 // ../bridge/src/sqlite/legacy_migration/import-cli-legacy-disk-data.ts
-import fs11 from "node:fs";
+import fs10 from "node:fs";
 function legacyCliDiskMigrationIsPending() {
   try {
-    if (fs11.existsSync(INDEX_DIR)) {
-      for (const name of fs11.readdirSync(INDEX_DIR)) {
+    if (fs10.existsSync(INDEX_DIR)) {
+      for (const name of fs10.readdirSync(INDEX_DIR)) {
         if (name.startsWith(".file-index-") && name.endsWith(".json")) return true;
       }
     }
   } catch {
   }
   try {
-    if (fs11.existsSync(LEGACY_AGENT_SESSION_DIR)) {
-      if (fs11.readdirSync(LEGACY_AGENT_SESSION_DIR).some((n) => n.endsWith(".json"))) return true;
+    if (fs10.existsSync(LEGACY_AGENT_SESSION_DIR)) {
+      if (fs10.readdirSync(LEGACY_AGENT_SESSION_DIR).some((n) => n.endsWith(".json"))) return true;
     }
   } catch {
   }
-  try {
-    const dir = getPromptQueuesDirectory();
-    if (fs11.existsSync(dir) && fs11.readdirSync(dir).some((n) => n.endsWith(".json"))) return true;
-  } catch {
-  }
   return false;
 }
 function importCliSqliteLegacyDiskData(db, log2) {
@@ -22342,7 +22266,6 @@ function importCliSqliteLegacyDiskData(db, log2) {
   }
   archiveLegacyFileIndexJsonFiles();
   importLegacyAgentSessionsFromDisk(db);
-  importLegacyPromptQueuesFromDisk(db);
   if (pending2 && log2) {
     log2("Legacy on-disk CLI data migration finished.");
   }
@@ -22351,10 +22274,8 @@ var init_import_cli_legacy_disk_data = __esm({
   "../bridge/src/sqlite/legacy_migration/import-cli-legacy-disk-data.ts"() {
     "use strict";
     init_constants();
-    init_paths2();
     init_archive_file_index_json();
     init_import_agent_sessions_from_disk();
-    init_import_prompt_queues_from_disk();
   }
 });
 
@@ -22464,15 +22385,15 @@ var init_cli_database = __esm({
 });
 
 // ../bridge/src/files/index/walk-workspace-tree.ts
-import fs12 from "node:fs";
-import path12 from "node:path";
+import fs11 from "node:fs";
+import path10 from "node:path";
 function shouldSkipWorkspaceWalkEntry(name) {
   return DEPENDENCY_INSTALL_DIR_NAMES.has(name);
 }
 async function walkWorkspaceTreeAsync(dir, baseDir, onFile, state) {
   let names;
   try {
-    names = await fs12.promises.readdir(dir);
+    names = await fs11.promises.readdir(dir);
   } catch {
     return;
   }
@@ -22487,14 +22408,14 @@ async function walkWorkspaceTreeAsync(dir, baseDir, onFile, state) {
       await yieldUntilFileBrowserReadsIdle();
     }
     state.n++;
-    const full = path12.join(dir, name);
+    const full = path10.join(dir, name);
     let stat2;
     try {
-      stat2 = await fs12.promises.stat(full);
+      stat2 = await fs11.promises.stat(full);
     } catch {
       continue;
     }
-    const relative6 = path12.relative(baseDir, full).replace(/\\/g, "/");
+    const relative6 = path10.relative(baseDir, full).replace(/\\/g, "/");
     if (stat2.isDirectory()) {
       await walkWorkspaceTreeAsync(full, baseDir, onFile, state);
     } else if (stat2.isFile()) {
@@ -22823,7 +22744,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(path85, checkUnignored, mode) {
+      test(path83, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -22832,7 +22753,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path85);
+          const matched = rule[mode].test(path83);
           if (!matched) {
             return;
           }
@@ -22853,17 +22774,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path85, originalPath, doThrow) => {
-      if (!isString(path85)) {
+    var checkPath = (path83, originalPath, doThrow) => {
+      if (!isString(path83)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path85) {
+      if (!path83) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path85)) {
+      if (checkPath.isNotRelative(path83)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -22872,7 +22793,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path85) => REGEX_TEST_INVALID_PATH.test(path85);
+    var isNotRelative = (path83) => REGEX_TEST_INVALID_PATH.test(path83);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore = class {
@@ -22902,19 +22823,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache2, checkUnignored, slices) {
-        const path85 = originalPath && checkPath.convert(originalPath);
+        const path83 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path85,
+          path83,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path85, cache2, checkUnignored, slices);
+        return this._t(path83, cache2, checkUnignored, slices);
       }
-      checkIgnore(path85) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path85)) {
-          return this.test(path85);
+      checkIgnore(path83) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path83)) {
+          return this.test(path83);
         }
-        const slices = path85.split(SLASH).filter(Boolean);
+        const slices = path83.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -22927,18 +22848,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path85, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path83, false, MODE_CHECK_IGNORE);
       }
-      _t(path85, cache2, checkUnignored, slices) {
-        if (path85 in cache2) {
-          return cache2[path85];
+      _t(path83, cache2, checkUnignored, slices) {
+        if (path83 in cache2) {
+          return cache2[path83];
         }
         if (!slices) {
-          slices = path85.split(SLASH).filter(Boolean);
+          slices = path83.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache2[path85] = this._rules.test(path85, checkUnignored, MODE_IGNORE);
+          return cache2[path83] = this._rules.test(path83, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -22946,29 +22867,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache2[path85] = parent.ignored ? parent : this._rules.test(path85, checkUnignored, MODE_IGNORE);
+        return cache2[path83] = parent.ignored ? parent : this._rules.test(path83, checkUnignored, MODE_IGNORE);
       }
-      ignores(path85) {
-        return this._test(path85, this._ignoreCache, false).ignored;
+      ignores(path83) {
+        return this._test(path83, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path85) => !this.ignores(path85);
+        return (path83) => !this.ignores(path83);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path85) {
-        return this._test(path85, this._testCache, true);
+      test(path83) {
+        return this._test(path83, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path85) => checkPath(path85 && checkPath.convert(path85), path85, RETURN_FALSE);
+    var isPathValid = (path83) => checkPath(path83 && checkPath.convert(path83), path83, 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 = (path85) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path85) || isNotRelative(path85);
+      checkPath.isNotRelative = (path83) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path83) || isNotRelative(path83);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -22984,8 +22905,8 @@ var require_ignore = __commonJS({
 });
 
 // ../bridge/src/code-nav/gitignore-filter.ts
-import fs13 from "node:fs";
-import path13 from "node:path";
+import fs12 from "node:fs";
+import path11 from "node:path";
 function normalizeRelPath(relPath) {
   return relPath.replace(/\\/g, "/");
 }
@@ -22995,12 +22916,12 @@ function isUnderDir(relPath, dirRel) {
 async function createGitignoreFilterForRelativePath(root, relPath) {
   const filter = new GitignoreFilter();
   await filter.enterDirectory(root, "");
-  const dirRel = normalizeRelPath(path13.dirname(relPath));
+  const dirRel = normalizeRelPath(path11.dirname(relPath));
   if (dirRel === "." || dirRel === "") return filter;
   let abs = root;
   let rel = "";
   for (const segment of dirRel.split("/")) {
-    abs = path13.join(abs, segment);
+    abs = path11.join(abs, segment);
     rel = rel ? `${rel}/${segment}` : segment;
     await filter.enterDirectory(abs, rel);
   }
@@ -23022,7 +22943,7 @@ var init_gitignore_filter = __esm({
       /** Load `.gitignore` in `absDir` and push a layer when the file exists. */
       async enterDirectory(absDir, dirRel) {
         try {
-          const content = await fs13.promises.readFile(path13.join(absDir, ".gitignore"), "utf8");
+          const content = await fs12.promises.readFile(path11.join(absDir, ".gitignore"), "utf8");
           this.layers.push({ dirRel, ig: (0, import_ignore.default)().add(content) });
         } catch {
         }
@@ -23049,7 +22970,7 @@ var init_gitignore_filter = __esm({
 });
 
 // ../bridge/src/code-nav/language-registry.ts
-import path14 from "node:path";
+import path12 from "node:path";
 function languageAssetPaths(key, wasmFile) {
   return {
     wasmFile,
@@ -23057,7 +22978,7 @@ function languageAssetPaths(key, wasmFile) {
   };
 }
 function getLanguageKeyForFilePath(filePath) {
-  const ext = path14.extname(filePath).replace(/^\./, "").toLowerCase();
+  const ext = path12.extname(filePath).replace(/^\./, "").toLowerCase();
   if (!ext) return null;
   return EXT_TO_LANGUAGE_KEY[ext] ?? null;
 }
@@ -23107,13 +23028,13 @@ var init_language_registry = __esm({
 });
 
 // ../bridge/src/code-nav/walk-code-nav-files.ts
-import fs14 from "node:fs";
-import path15 from "node:path";
+import fs13 from "node:fs";
+import path13 from "node:path";
 async function walkCodeNavFilesInDirectory(dir, baseDir, relDir, filter, onFile, state) {
   await filter.enterDirectory(dir, relDir);
   let names;
   try {
-    names = await fs14.promises.readdir(dir);
+    names = await fs13.promises.readdir(dir);
   } catch {
     filter.leaveDirectory(relDir);
     return;
@@ -23130,10 +23051,10 @@ async function walkCodeNavFilesInDirectory(dir, baseDir, relDir, filter, onFile,
     }
     state.n++;
     const relPath = relDir ? `${relDir}/${name}` : name;
-    const full = path15.join(dir, name);
+    const full = path13.join(dir, name);
     let stat2;
     try {
-      stat2 = await fs14.promises.stat(full);
+      stat2 = await fs13.promises.stat(full);
     } catch {
       continue;
     }
@@ -23150,7 +23071,7 @@ async function walkCodeNavFilesInDirectory(dir, baseDir, relDir, filter, onFile,
   filter.leaveDirectory(relDir);
 }
 async function walkCodeNavFilesAsync(rootDir, onFile, state = createWalkYieldState()) {
-  const resolved = path15.resolve(rootDir);
+  const resolved = path13.resolve(rootDir);
   const filter = new GitignoreFilter();
   await walkCodeNavFilesInDirectory(resolved, resolved, "", filter, onFile, state);
 }
@@ -23913,7 +23834,7 @@ var init_persist_single_file = __esm({
 });
 
 // ../bridge/src/code-nav/resolve-module-import-path.ts
-import path16 from "node:path";
+import path14 from "node:path";
 function normalizeWorkspacePath(filePath) {
   return filePath.replace(/\\/g, "/").replace(/^\/+/, "");
 }
@@ -23953,28 +23874,28 @@ function tsJsImportCandidates(joined) {
 function resolveModuleImportPath(importerFilePath, moduleSpecifier, workspaceFiles) {
   const spec = moduleSpecifier.trim();
   if (!spec || !isRelativeModuleSpecifier(spec)) return null;
-  const importerDir = path16.posix.dirname(normalizeWorkspacePath(importerFilePath));
-  const joined = normalizeWorkspacePath(path16.posix.normalize(path16.posix.join(importerDir, spec)));
+  const importerDir = path14.posix.dirname(normalizeWorkspacePath(importerFilePath));
+  const joined = normalizeWorkspacePath(path14.posix.normalize(path14.posix.join(importerDir, spec)));
   return firstExistingPath(tsJsImportCandidates(joined), workspaceFiles);
 }
 function resolvePythonModulePath(importerFilePath, moduleSpecifier, workspaceFiles) {
   const moduleName = moduleSpecifier.trim().replace(/\s+/g, "");
   if (!moduleName) return null;
-  const importerDir = path16.posix.dirname(normalizeWorkspacePath(importerFilePath));
+  const importerDir = path14.posix.dirname(normalizeWorkspacePath(importerFilePath));
   if (moduleName.startsWith(".")) {
     const dotMatch = /^(\.+)(.*)$/.exec(moduleName);
     const dotCount = dotMatch?.[1]?.length ?? 1;
     const rest = (dotMatch?.[2] ?? "").replace(/^\./, "");
     let baseDir = importerDir;
     for (let i = 1; i < dotCount; i++) {
-      baseDir = path16.posix.dirname(baseDir);
+      baseDir = path14.posix.dirname(baseDir);
     }
     const dottedPath2 = rest ? rest.split(".").join("/") : "";
-    const relativeBase = dottedPath2 ? path16.posix.join(baseDir, dottedPath2) : baseDir;
+    const relativeBase = dottedPath2 ? path14.posix.join(baseDir, dottedPath2) : baseDir;
     return firstExistingPath(
       [
         ...withSuffixes(relativeBase, PYTHON_EXTENSIONS),
-        ...withSuffixes(path16.posix.join(relativeBase, "__init__"), [".py"])
+        ...withSuffixes(path14.posix.join(relativeBase, "__init__"), [".py"])
       ],
       workspaceFiles
     );
@@ -23983,7 +23904,7 @@ function resolvePythonModulePath(importerFilePath, moduleSpecifier, workspaceFil
   return firstExistingPath(
     [
       ...withSuffixes(dottedPath, PYTHON_EXTENSIONS),
-      ...withSuffixes(path16.posix.join(importerDir, dottedPath), PYTHON_EXTENSIONS)
+      ...withSuffixes(path14.posix.join(importerDir, dottedPath), PYTHON_EXTENSIONS)
     ],
     workspaceFiles
   );
@@ -23991,9 +23912,9 @@ function resolvePythonModulePath(importerFilePath, moduleSpecifier, workspaceFil
 function resolveIncludePath(importerFilePath, includePath, workspaceFiles) {
   const spec = includePath.trim().replace(/^["']|["']$/g, "");
   if (!spec) return null;
-  const importerDir = path16.posix.dirname(normalizeWorkspacePath(importerFilePath));
+  const importerDir = path14.posix.dirname(normalizeWorkspacePath(importerFilePath));
   const joined = normalizeWorkspacePath(
-    path16.posix.normalize(path16.posix.join(importerDir, spec.replace(/\\/g, "/")))
+    path14.posix.normalize(path14.posix.join(importerDir, spec.replace(/\\/g, "/")))
   );
   if (workspaceFiles.has(joined)) return joined;
   return firstExistingPath(withSuffixes(joined, C_CPP_EXTENSIONS), workspaceFiles);
@@ -24012,8 +23933,8 @@ function resolveGoImportPath(importerFilePath, moduleSpecifier, workspaceFiles)
   const spec = moduleSpecifier.trim();
   if (!spec) return null;
   if (isRelativeModuleSpecifier(spec)) {
-    const importerDir = path16.posix.dirname(normalizeWorkspacePath(importerFilePath));
-    const joined = normalizeWorkspacePath(path16.posix.normalize(path16.posix.join(importerDir, spec)));
+    const importerDir = path14.posix.dirname(normalizeWorkspacePath(importerFilePath));
+    const joined = normalizeWorkspacePath(path14.posix.normalize(path14.posix.join(importerDir, spec)));
     if (workspaceFiles.has(joined)) return joined;
     return firstExistingPath(withSuffixes(joined, [".go"]), workspaceFiles);
   }
@@ -25441,12 +25362,12 @@ var init_workspace_files = __esm({
 });
 
 // ../bridge/src/code-nav/symbol-index/build/extract-file-symbol-data.ts
-import fs15 from "node:fs";
-import path17 from "node:path";
+import fs14 from "node:fs";
+import path15 from "node:path";
 import { isMainThread as isMainThread3 } from "node:worker_threads";
 async function extractFileSymbolData(resolved, relPath, workspaceFilesOverride) {
   await yieldForBridgeInteractivePriority();
-  const absPath = path17.join(resolved, relPath);
+  const absPath = path15.join(resolved, relPath);
   let tags = [];
   let source = null;
   if (isCodeNavSupportedPath(relPath) && !await isPathGitIgnored(resolved, relPath)) {
@@ -25454,16 +25375,16 @@ async function extractFileSymbolData(resolved, relPath, workspaceFilesOverride)
       assertBackgroundIndexingAllowed();
       let fileSource = null;
       if (isMainThread3) {
-        const stat2 = await fs15.promises.stat(absPath);
+        const stat2 = await fs14.promises.stat(absPath);
         if (stat2.isFile() && stat2.size <= MAX_INDEX_FILE_BYTES) {
           assertBackgroundIndexingAllowed();
-          fileSource = await fs15.promises.readFile(absPath, "utf8");
+          fileSource = await fs14.promises.readFile(absPath, "utf8");
         }
       } else {
-        const stat2 = fs15.statSync(absPath);
+        const stat2 = fs14.statSync(absPath);
         if (stat2.isFile() && stat2.size <= MAX_INDEX_FILE_BYTES) {
           assertBackgroundIndexingAllowed();
-          fileSource = fs15.readFileSync(absPath, "utf8");
+          fileSource = fs14.readFileSync(absPath, "utf8");
         }
       }
       source = fileSource;
@@ -25665,12 +25586,12 @@ var init_ensure_symbol_index_file_host = __esm({
 });
 
 // ../bridge/src/code-nav/symbol-index/lifecycle/normalize-symbol-index-path.ts
-import path18 from "node:path";
+import path16 from "node:path";
 function normalizeSymbolIndexRelPath2(parentPath, changedPath) {
-  const resolvedParent = path18.resolve(parentPath);
-  const abs = path18.isAbsolute(changedPath) ? path18.resolve(changedPath) : path18.resolve(resolvedParent, changedPath);
-  const rel = path18.relative(resolvedParent, abs).replace(/\\/g, "/");
-  if (rel.startsWith("..") || path18.isAbsolute(rel)) return null;
+  const resolvedParent = path16.resolve(parentPath);
+  const abs = path16.isAbsolute(changedPath) ? path16.resolve(changedPath) : path16.resolve(resolvedParent, changedPath);
+  const rel = path16.relative(resolvedParent, abs).replace(/\\/g, "/");
+  if (rel.startsWith("..") || path16.isAbsolute(rel)) return null;
   return rel;
 }
 var init_normalize_symbol_index_path = __esm({
@@ -27051,7 +26972,7 @@ var require_has_flag = __commonJS({
 var require_supports_color = __commonJS({
   "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
-    var os11 = __require("os");
+    var os10 = __require("os");
     var tty = __require("tty");
     var hasFlag = require_has_flag();
     var { env } = process;
@@ -27099,7 +27020,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os11.release().split(".");
+        const osRelease = os10.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -27345,10 +27266,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(path85, isFile, isDirectory) {
-      log2(`checking %s`, path85);
+    function check2(path83, isFile, isDirectory) {
+      log2(`checking %s`, path83);
       try {
-        const stat2 = fs_1.statSync(path85);
+        const stat2 = fs_1.statSync(path83);
         if (stat2.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -27368,8 +27289,8 @@ var require_src2 = __commonJS({
         throw e;
       }
     }
-    function exists2(path85, type = exports.READABLE) {
-      return check2(path85, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+    function exists2(path83, type = exports.READABLE) {
+      return check2(path83, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -27443,6 +27364,12 @@ var wrapper_default = import_websocket.default;
 // ../bridge/src/connection/ws/cli-ws-client.ts
 import https from "node:https";
 var CLI_WEBSOCKET_CLIENT_PING_MS = 25e3;
+var CLI_WEBSOCKET_HANDSHAKE_TIMEOUT_MS = 15e3;
+var sharedWssAgent = null;
+function cliWssAgent() {
+  sharedWssAgent ??= new https.Agent({ rejectUnauthorized: false, keepAlive: true });
+  return sharedWssAgent;
+}
 function attachWebSocketClientPing(ws, intervalMs) {
   let timer = null;
   function clear() {
@@ -27463,9 +27390,12 @@ function attachWebSocketClientPing(ws, intervalMs) {
   return clear;
 }
 function buildCliWebSocketClientOptions(wsUrl) {
-  const wsOptions = { perMessageDeflate: false };
+  const wsOptions = {
+    perMessageDeflate: false,
+    handshakeTimeout: CLI_WEBSOCKET_HANDSHAKE_TIMEOUT_MS
+  };
   if (wsUrl.startsWith("wss://")) {
-    wsOptions.agent = new https.Agent({ rejectUnauthorized: false });
+    wsOptions.agent = cliWssAgent();
   }
   return wsOptions;
 }
@@ -27479,6 +27409,15 @@ function safeCloseWebSocket(ws) {
       ws.removeAllListeners();
       return;
     }
+    if (ws.readyState === wrapper_default.CONNECTING) {
+      ws.once("error", () => {
+      });
+      ws.once("close", () => {
+        ws.removeAllListeners();
+      });
+      ws.terminate();
+      return;
+    }
     ws.once("close", () => {
       ws.removeAllListeners();
     });
@@ -28435,8 +28374,8 @@ function getErrorMap() {
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path85, errorMaps, issueData } = params;
-  const fullPath = [...path85, ...issueData.path || []];
+  const { data, path: path83, errorMaps, issueData } = params;
+  const fullPath = [...path83, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -28552,11 +28491,11 @@ var errorUtil;
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path85, key) {
+  constructor(parent, value, path83, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path85;
+    this._path = path83;
     this._key = key;
   }
   get path() {
@@ -32466,83 +32405,8 @@ function isUserEndedSessionTurnErrorText(errorText) {
 }
 
 // ../types/src/session-kind.ts
-var SESSION_KINDS = ["regular", "planning", "planned"];
+var SESSION_KINDS = ["regular", "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/diff/line-diff.ts
 function normalizeDiffLineText(line) {
@@ -32783,19 +32647,6 @@ 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";
@@ -33501,7 +33352,25 @@ function spawnSdkStdioProcess(options) {
   return { child, stderrCapture };
 }
 
+// ../bridge/src/agents/acp/clients/listen-for-acp-client-abort.ts
+function listenForAcpClientAbort(child, signal, onAbort) {
+  if (!signal) return () => {
+  };
+  const fire = () => {
+    killChildProcessTree(child, "SIGKILL");
+    onAbort();
+  };
+  if (signal.aborted) {
+    fire();
+    return () => {
+    };
+  }
+  signal.addEventListener("abort", fire, { once: true });
+  return () => signal.removeEventListener("abort", fire);
+}
+
 // ../bridge/src/agents/acp/clients/sdk/sdk-stdio-acp-client.ts
+init_yield_to_event_loop();
 async function createSdkStdioAcpClient(options) {
   const { PROTOCOL_VERSION: PROTOCOL_VERSION2 } = await Promise.resolve().then(() => (init_acp(), acp_exports));
   const {
@@ -33519,13 +33388,18 @@ async function createSdkStdioAcpClient(options) {
     onAcpConfigOptionsUpdated,
     getActiveConfigOptions,
     afterSessionEstablished,
-    createExtNotificationHandler
+    createExtNotificationHandler,
+    signal
   } = options;
+  if (signal?.aborted) {
+    throw new Error("ACP client aborted");
+  }
   const { child, stderrCapture } = spawnSdkStdioProcess({
     command,
     cwd,
     onAgentSubprocessExit
   });
+  await yieldToEventLoop();
   const sessionCtx = createSdkStdioSessionContext({
     cwd,
     mcpServers: options.mcpServers,
@@ -33541,7 +33415,11 @@ async function createSdkStdioAcpClient(options) {
   });
   return new Promise((resolve36, reject) => {
     const init = createSdkStdioInitSettle(child);
+    const stopAbort = listenForAcpClientAbort(child, signal, () => {
+      init.settleReject(reject, new Error("ACP client aborted"));
+    });
     child.on("error", (err) => {
+      stopAbort();
       init.settleReject(reject, new Error(formatSpawnError(err, command[0])));
     });
     attachSdkStdioStderrAuthWatch({
@@ -33575,7 +33453,9 @@ async function createSdkStdioAcpClient(options) {
             killSubprocessAfterCancelMs
           })
         );
+        stopAbort();
       } catch (err) {
+        stopAbort();
         if (init.settled) return;
         init.settleReject(
           reject,
@@ -33847,22 +33727,12 @@ function installBridgeProcessResilience() {
 init_log();
 
 // ../bridge/src/agents/acp/clients/bridge-agent-path.ts
-import { execFileSync } from "node:child_process";
 import { homedir } from "node:os";
 import { join } from "node:path";
 function getBridgeAgentPathEntries(home = process.env.HOME ?? homedir()) {
-  const entries = [
-    join(home, ".local", "bin"),
-    join(home, ".npm-global", "bin"),
-    "/usr/local/bin"
-  ];
+  const entries = [join(home, ".local", "bin"), join(home, ".npm-global", "bin"), "/usr/local/bin"];
   const prefix = process.env.NPM_CONFIG_PREFIX;
   if (prefix) entries.push(join(prefix, "bin"));
-  try {
-    const npmBin = execFileSync("npm", ["bin", "-g"], { encoding: "utf8", timeout: 2e3 }).trim();
-    if (npmBin) entries.push(npmBin);
-  } catch {
-  }
   return entries;
 }
 function augmentPath(pathValue, extra) {
@@ -33887,7 +33757,7 @@ function bridgeAgentPathEnv(base = process.env) {
 }
 
 // ../bridge/src/files/watch-file-index.ts
-import path23 from "node:path";
+import path21 from "node:path";
 
 // ../bridge/src/files/index/index.ts
 init_paths();
@@ -33896,7 +33766,7 @@ init_paths();
 init_in_flight();
 init_cli_process_interrupt();
 init_database();
-import path19 from "node:path";
+import path17 from "node:path";
 
 // ../bridge/src/files/index/file-index-sqlite-lock.ts
 var fileIndexChain = Promise.resolve();
@@ -34003,7 +33873,7 @@ function assertNotShutdown2() {
   if (isCliImmediateShutdownRequested()) throw new CliSqliteInterrupted();
 }
 async function buildFileIndexAsync(cwd) {
-  const resolved = path19.resolve(cwd);
+  const resolved = path17.resolve(cwd);
   await yieldForBridgeInteractivePriority();
   assertNotShutdown2();
   const paths = await collectWorkspacePathsAsync(resolved);
@@ -34016,7 +33886,7 @@ async function buildFileIndexAsync(cwd) {
 }
 
 // ../bridge/src/files/index/ensure-file-index.ts
-import path20 from "node:path";
+import path18 from "node:path";
 
 // ../bridge/src/files/index/search-file-index.ts
 init_yield_to_event_loop();
@@ -34071,7 +33941,7 @@ async function searchBridgeFilePathsAsync(resolvedCwd, query, limit = 100) {
 
 // ../bridge/src/files/index/ensure-file-index.ts
 async function ensureFileIndexAsync(cwd) {
-  const resolved = path20.resolve(cwd);
+  const resolved = path18.resolve(cwd);
   if (await bridgeFileIndexIsPopulated(resolved)) {
     return { fromCache: true, pathCount: await bridgeFileIndexPathCount(resolved) };
   }
@@ -34823,16 +34693,16 @@ init_database();
 init_cli_process_interrupt();
 
 // ../bridge/src/files/index/file-index-incremental-symbol-updates.ts
-import fs16 from "node:fs";
-import path21 from "node:path";
+import fs15 from "node:fs";
+import path19 from "node:path";
 init_cli_process_interrupt();
 init_yield_to_event_loop();
 init_database();
 async function applyIncrementalSymbolIndexUpdates(resolved, relPaths) {
   for (const rel of relPaths) {
-    const absPath = path21.join(resolved, rel);
+    const absPath = path19.join(resolved, rel);
     try {
-      const stat2 = await fs16.promises.stat(absPath);
+      const stat2 = await fs15.promises.stat(absPath);
       if (stat2.isFile()) {
         await updateSymbolIndexForFile(resolved, absPath);
       } else {
@@ -34946,11 +34816,11 @@ function createFileIndexFsWatcher(resolved, schedule) {
 }
 
 // ../bridge/src/files/index/file-index-initial-builds.ts
-import path22 from "node:path";
+import path20 from "node:path";
 init_database();
 init_code_nav_cache_availability();
 async function runInitialIndexBuilds(cwd = getBridgeRoot()) {
-  const resolved = path22.resolve(cwd);
+  const resolved = path20.resolve(cwd);
   try {
     if (!await startCodeNavCacheInitialization()) return;
     await buildFileIndexAsync(resolved);
@@ -34969,7 +34839,7 @@ function scheduleInitialIndexBuilds(cwd = getBridgeRoot()) {
 
 // ../bridge/src/files/watch-file-index.ts
 function startFileIndexWatcher(cwd = getBridgeRoot()) {
-  const resolved = path23.resolve(cwd);
+  const resolved = path21.resolve(cwd);
   const rebuildState = createFileIndexWatchRebuildState();
   let timer = null;
   const schedule = (relPath) => {
@@ -35104,6 +34974,22 @@ function beginDeferredDisconnectForReconnect(options) {
   }
 }
 
+// ../bridge/src/connection/ws/dispose-previous-bridge-socket.ts
+function disposePreviousBridgeSocket(ws) {
+  if (!ws) return;
+  ws.removeAllListeners();
+  ws.once("error", () => {
+  });
+  ws.once("close", () => {
+    ws.removeAllListeners();
+  });
+  try {
+    if (ws.readyState === wrapper_default.CONNECTING) ws.terminate();
+    else ws.close();
+  } catch {
+  }
+}
+
 // ../bridge/src/connection/runtime/close-bridge-connection.ts
 async function closeBridgeConnection(state, acpManager, previewEnvironmentManager, log2) {
   requestCliImmediateShutdown();
@@ -35120,16 +35006,7 @@ async function closeBridgeConnection(state, acpManager, previewEnvironmentManage
   await acpManager.disconnect();
   if (state.currentWs) {
     say("Closing bridge connection to the cloud\u2026");
-    state.currentWs.removeAllListeners();
-    const wsState = state.currentWs.readyState;
-    if (wsState === 1 || wsState === 2) {
-      state.currentWs.close();
-    } else {
-      state.currentWs.on("error", () => {
-      });
-      state.currentWs.on("close", () => {
-      });
-    }
+    disposePreviousBridgeSocket(state.currentWs);
     state.currentWs = null;
   }
   if (previewEnvironmentManager) {
@@ -35222,20 +35099,20 @@ async function cancelRun(ctx, runId) {
 }
 
 // ../bridge/src/agents/acp/ensure-acp-client.ts
-import * as fs19 from "node:fs";
-import * as path29 from "node:path";
+import * as fs18 from "node:fs";
+import * as path27 from "node:path";
 
 // ../bridge/src/paths/session-layout-paths.ts
-import * as path24 from "node:path";
+import * as path22 from "node:path";
 function resolveIsolatedSessionParentPathFromCheckouts(worktreePaths) {
-  const resolved = worktreePaths.map((p) => path24.resolve(p)).filter(Boolean);
+  const resolved = worktreePaths.map((p) => path22.resolve(p)).filter(Boolean);
   if (resolved.length === 0) return null;
   resolved.sort();
   return resolved[0];
 }
 function resolveSessionParentPathForAgentProcess(resolvedSessionParentPath) {
   if (resolvedSessionParentPath != null && String(resolvedSessionParentPath).trim() !== "") {
-    return path24.resolve(String(resolvedSessionParentPath).trim());
+    return path22.resolve(String(resolvedSessionParentPath).trim());
   }
   return getBridgeRoot();
 }
@@ -35616,20 +35493,20 @@ var codexProvider = {
 };
 
 // ../bridge/src/agents/providers/cursor/cleanup-session-plans.ts
-import * as fs17 from "node:fs";
+import * as fs16 from "node:fs";
 
 // ../bridge/src/paths/session-plans-paths.ts
-import * as os6 from "node:os";
-import * as path25 from "node:path";
+import * as os5 from "node:os";
+import * as path23 from "node:path";
 function getSessionPlansRootDir() {
-  return path25.join(os6.homedir(), ".buildautomaton", "plans");
+  return path23.join(os5.homedir(), ".buildautomaton", "plans");
 }
 function sanitizeSessionPlansKey(sessionId) {
   const t = sessionId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 220);
   return t || "session";
 }
 function getSessionPlansDir(sessionId) {
-  return path25.join(getSessionPlansRootDir(), sanitizeSessionPlansKey(sessionId));
+  return path23.join(getSessionPlansRootDir(), sanitizeSessionPlansKey(sessionId));
 }
 
 // ../bridge/src/agents/providers/cursor/cleanup-session-plans.ts
@@ -35638,7 +35515,7 @@ function cleanupSessionPlans(sessionId) {
   if (!id) return;
   const dir = getSessionPlansDir(id);
   try {
-    fs17.rmSync(dir, { recursive: true, force: true });
+    fs16.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -36006,8 +35883,8 @@ function handleCursorIncomingPermissionRequest(id, method, msg, deps) {
 }
 
 // ../bridge/src/agents/providers/cursor/write-create-plan-file.ts
-import * as fs18 from "node:fs";
-import * as path26 from "node:path";
+import * as fs17 from "node:fs";
+import * as path24 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 function sanitizePlanFileBase(toolCallId) {
   const t = toolCallId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 120);
@@ -36015,9 +35892,9 @@ function sanitizePlanFileBase(toolCallId) {
 }
 function writeCreatePlanFile(params) {
   const dir = getSessionPlansDir(params.cloudSessionId);
-  fs18.mkdirSync(dir, { recursive: true });
-  const filePath = path26.join(dir, `${sanitizePlanFileBase(params.toolCallId)}.md`);
-  fs18.writeFileSync(filePath, params.planMarkdown, "utf8");
+  fs17.mkdirSync(dir, { recursive: true });
+  const filePath = path24.join(dir, `${sanitizePlanFileBase(params.toolCallId)}.md`);
+  fs17.writeFileSync(filePath, params.planMarkdown, "utf8");
   return pathToFileURL2(filePath).href;
 }
 
@@ -36323,7 +36200,8 @@ async function createCursorAcpClient(options) {
     onAcpSessionEstablished,
     onAcpConfigOptionsUpdated,
     onAgentSubprocessExit,
-    afterSessionEstablished
+    afterSessionEstablished,
+    signal
   } = options;
   const dbgFs = process.env.BUILDAUTOMATON_DEBUG_ACP_FS === "1";
   const spawnEnv = bridgeInstalledAgentAuthProcessEnv(process.env);
@@ -36348,7 +36226,11 @@ async function createCursorAcpClient(options) {
     stderrCapture
   });
   return new Promise((resolve36, reject) => {
+    const stopAbort = listenForAcpClientAbort(child, signal, () => {
+      reject(new Error("ACP client aborted"));
+    });
     child.on("error", (err) => {
+      stopAbort();
       killChildProcessTree(child, "SIGKILL");
       reject(new Error(formatSpawnError(err, command[0])));
     });
@@ -36360,6 +36242,7 @@ async function createCursorAcpClient(options) {
           skipBrowserAuthenticate,
           incomingDeps: { dbgFs, sessionCtx, onSessionUpdate, onRequest }
         });
+        stopAbort();
         resolve36(
           createCursorAcpHandle({
             child,
@@ -36372,6 +36255,7 @@ async function createCursorAcpClient(options) {
           })
         );
       } catch (err) {
+        stopAbort();
         killChildProcessTree(child, "SIGKILL");
         const merged = mergeErrorWithStderr(formatJsonRpcStyleError(err), stderrCapture.getText());
         reject(merged ? new Error(merged) : err instanceof Error ? err : new Error(String(err)));
@@ -36538,7 +36422,7 @@ function getAgentTypeDisplayName(agentType) {
 import { existsSync as existsSync4, statSync } from "node:fs";
 
 // ../bridge/src/git/git-exec.ts
-import { execFile as execFile2, execFileSync as execFileSync2, spawn as spawn4 } from "node:child_process";
+import { execFile as execFile2, execFileSync, spawn as spawn4 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 
 // ../bridge/src/git/git-runtime.ts
@@ -36596,7 +36480,7 @@ init_cli_process_interrupt();
 var execFileAsync2 = promisify3(execFile2);
 var GIT_SYNC_STDIO = ["ignore", "pipe", "pipe"];
 function execGitFileSync(args, options) {
-  return execFileSync2("git", args, {
+  return execFileSync("git", args, {
     encoding: "utf8",
     maxBuffer: 10 * 1024 * 1024,
     ...options,
@@ -36624,16 +36508,16 @@ async function execGitFile(args, options) {
 }
 
 // ../bridge/src/git/get-git-repo-root-sync.ts
-import * as path27 from "node:path";
+import * as path25 from "node:path";
 var GIT_LOOKUP_TIMEOUT_MS = 2e3;
 function getGitRepoRootSync(startDir) {
   try {
     const out = execGitFileSync(["rev-parse", "--show-toplevel"], {
-      cwd: path27.resolve(startDir),
+      cwd: path25.resolve(startDir),
       maxBuffer: 1024 * 1024,
       timeout: GIT_LOOKUP_TIMEOUT_MS
     }).trim();
-    return out ? path27.resolve(out) : null;
+    return out ? path25.resolve(out) : null;
   } catch {
     return null;
   }
@@ -36641,26 +36525,26 @@ function getGitRepoRootSync(startDir) {
 
 // ../bridge/src/agents/acp/workspace-files.ts
 import { readFileSync as readFileSync4 } from "node:fs";
-import * as path28 from "node:path";
+import * as path26 from "node:path";
 var GIT_FILE_READ_TIMEOUT_MS = 2e3;
 function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
   const trimmed2 = rawPath.trim();
   if (!trimmed2) return null;
-  const normalizedSessionParent = path28.resolve(sessionParentPath);
+  const normalizedSessionParent = path26.resolve(sessionParentPath);
   let resolvedPath = resolveSafePathUnderCwd(sessionParentPath, trimmed2);
   if (!resolvedPath) {
-    const candidate = path28.isAbsolute(trimmed2) ? path28.normalize(trimmed2) : path28.normalize(path28.resolve(normalizedSessionParent, trimmed2));
+    const candidate = path26.isAbsolute(trimmed2) ? path26.normalize(trimmed2) : path26.normalize(path26.resolve(normalizedSessionParent, trimmed2));
     const gitRoot2 = getGitRepoRootSync(sessionParentPath);
     if (!gitRoot2) return null;
-    const rel = path28.relative(gitRoot2, candidate);
-    if (rel.startsWith("..") || path28.isAbsolute(rel)) return null;
+    const rel = path26.relative(gitRoot2, candidate);
+    if (rel.startsWith("..") || path26.isAbsolute(rel)) return null;
     resolvedPath = candidate;
   }
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const relFromRoot = path28.relative(gitRoot, resolvedPath);
-    if (!relFromRoot.startsWith("..") && !path28.isAbsolute(relFromRoot)) {
-      return { resolvedPath, display: relFromRoot.split(path28.sep).join("/") };
+    const relFromRoot = path26.relative(gitRoot, resolvedPath);
+    if (!relFromRoot.startsWith("..") && !path26.isAbsolute(relFromRoot)) {
+      return { resolvedPath, display: relFromRoot.split(path26.sep).join("/") };
     }
   }
   return { resolvedPath, display: toDisplayPathRelativeToCwd(sessionParentPath, resolvedPath) };
@@ -36669,9 +36553,9 @@ function readUtf8WorkspaceFile(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return "";
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const resolvedPath2 = path28.resolve(gitRoot, displayPath);
-    const rel = path28.relative(gitRoot, resolvedPath2);
-    if (!rel.startsWith("..") && !path28.isAbsolute(rel)) {
+    const resolvedPath2 = path26.resolve(gitRoot, displayPath);
+    const rel = path26.relative(gitRoot, resolvedPath2);
+    if (!rel.startsWith("..") && !path26.isAbsolute(rel)) {
       try {
         return readFileSync4(resolvedPath2, "utf8");
       } catch {
@@ -36690,9 +36574,9 @@ function tryWorkspaceDisplayToPath(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return null;
   const gitRoot = getGitRepoRootSync(sessionParentPath);
   if (gitRoot) {
-    const resolvedPath = path28.resolve(gitRoot, displayPath);
-    const rel = path28.relative(gitRoot, resolvedPath);
-    if (!rel.startsWith("..") && !path28.isAbsolute(rel)) return resolvedPath;
+    const resolvedPath = path26.resolve(gitRoot, displayPath);
+    const rel = path26.relative(gitRoot, resolvedPath);
+    if (!rel.startsWith("..") && !path26.isAbsolute(rel)) return resolvedPath;
   }
   return resolveSafePathUnderCwd(sessionParentPath, displayPath);
 }
@@ -36992,11 +36876,13 @@ var PathSnapshotTracker = class {
 };
 
 // ../bridge/src/agents/acp/hooks/bridge-on-session-update/send-session-info-title-update.ts
+var PLACEHOLDER_TITLES = /* @__PURE__ */ new Set(["session", "new session", "untitled"]);
 function extractSessionInfoTitle(params) {
   if (!params || typeof params !== "object") return null;
   const p = params;
   const title = typeof p.title === "string" ? p.title.trim() : "";
-  return title ? title : null;
+  if (!title || PLACEHOLDER_TITLES.has(title.toLowerCase())) return null;
+  return title;
 }
 function sendSessionInfoTitleUpdate(params) {
   const title = extractSessionInfoTitle(params.payload);
@@ -37317,74 +37203,12 @@ function resolveBridgeToolPaths(params, isToolUpdate, sessionParentPath) {
   return isToolUpdate ? extractToolTargetDisplayPaths(params, sessionParentPath) : [];
 }
 
-// ../bridge/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;
-}
-
-// ../bridge/src/agents/planning/planning-session-turn-buffer.ts
-var MAX_PLANNING_BUFFER_CHARS = 512 * 1024;
-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.length < MAX_PLANNING_BUFFER_CHARS) {
-    const room = MAX_PLANNING_BUFFER_CHARS - state.messageBuffer.length;
-    state.messageBuffer += room >= text.length ? text : text.slice(0, room);
-  }
-  return true;
-}
-function getPlanningSessionTurnOutput(runId) {
-  return buffersByRunId.get(runId)?.messageBuffer ?? "";
-}
-function consumePlanningSessionTurnOutput(runId) {
-  const state = buffersByRunId.get(runId);
-  buffersByRunId.delete(runId);
-  return state?.messageBuffer ?? "";
-}
-
 // ../bridge/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({
@@ -37640,7 +37464,7 @@ async function ensureAcpClient(options) {
   if (state.acpStartPromise && !state.acpHandle) {
     await state.acpStartPromise;
   }
-  if (state.acpHandle && state.lastAcpCwd != null && path29.resolve(state.lastAcpCwd) !== path29.resolve(targetSessionParentPath)) {
+  if (state.acpHandle && state.lastAcpCwd != null && path27.resolve(state.lastAcpCwd) !== path27.resolve(targetSessionParentPath)) {
     try {
       state.acpHandle.disconnect();
     } catch {
@@ -37672,7 +37496,7 @@ async function ensureAcpClient(options) {
   if (!state.acpStartPromise) {
     let statOk = false;
     try {
-      const st = await fs19.promises.stat(targetSessionParentPath);
+      const st = await fs18.promises.stat(targetSessionParentPath);
       statOk = st.isDirectory();
       if (!statOk) {
         state.lastAcpStartError = `Agent cwd is not a directory: ${targetSessionParentPath}`;
@@ -37832,8 +37656,8 @@ function augmentPromptResultAuthFields(agentType, errorText) {
 init_yield_to_event_loop();
 
 // ../bridge/src/git/changes/parse/normalize-git-diff-path.ts
-function normalizeGitDiffPath(path85) {
-  return path85.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
+function normalizeGitDiffPath(path83) {
+  return path83.replace(/\\/g, "/").replace(/\/ +/g, "/").trim();
 }
 
 // ../bridge/src/git/changes/parse/parse-name-status-entries.ts
@@ -37872,7 +37696,7 @@ function parseNameStatusLines(lines) {
 }
 
 // ../bridge/src/git/snapshot/diff/messages.ts
-import * as path30 from "node:path";
+import * as path28 from "node:path";
 
 // ../bridge/src/git/snapshot/diff/files.ts
 import { readFile, stat } from "node:fs/promises";
@@ -37903,7 +37727,7 @@ async function buildTrackedChangeMessage(options) {
   const diffArgs = entry.change === "moved" && oldRel ? ["diff", "--no-color", "-M", baselineRev, "--", oldRel, rel] : ["diff", "--no-color", "-M", baselineRev, "--", rel];
   const { stdout: patchContent } = await execGitFile(diffArgs, { cwd: repoPath });
   if (!patchContent.trim()) return null;
-  const workspaceFilePath = path30.join(repoPath, rel);
+  const workspaceFilePath = path28.join(repoPath, rel);
   const newText = entry.change === "removed" ? "" : await readWorkspaceFileAsUtf8(workspaceFilePath);
   const oldText = entry.change === "added" ? "" : await readGitBlobAsUtf8(repoPath, baselineRev, oldRel ?? rel);
   return {
@@ -37935,9 +37759,9 @@ function buildUntrackedChangeMessage(options) {
 }
 
 // ../bridge/src/git/snapshot/diff/paths.ts
-import * as path31 from "node:path";
+import * as path29 from "node:path";
 function repoDisplayPath(repoPath, multiRepo) {
-  const slug = path31.basename(repoPath).replace(/[^\w.-]+/g, "_") || "repo";
+  const slug = path29.basename(repoPath).replace(/[^\w.-]+/g, "_") || "repo";
   return (rel) => multiRepo ? `${slug}/${rel}` : rel;
 }
 function safeRelPath(rel) {
@@ -37949,12 +37773,12 @@ function newUntrackedPaths(raw, baselineUntracked, seen) {
 }
 
 // ../bridge/src/git/snapshot/diff/move-pairs.ts
-import * as path32 from "node:path";
+import * as path30 from "node:path";
 async function readUntrackedTexts(repoPath, untracked) {
   const out = /* @__PURE__ */ new Map();
   await forEachWithGitYield(untracked, async (rel) => {
     if (!safeRelPath(rel)) return;
-    const newText = await readWorkspaceFileAsUtf8(path32.join(repoPath, rel));
+    const newText = await readWorkspaceFileAsUtf8(path30.join(repoPath, rel));
     if (newText !== void 0) out.set(rel, newText);
   });
   return out;
@@ -38071,12 +37895,12 @@ async function collectRepoTurnChanges(options) {
 import { readFile as readFile2 } from "node:fs/promises";
 
 // ../bridge/src/git/snapshot/types.ts
-import * as path33 from "node:path";
+import * as path31 from "node:path";
 function snapshotsDirForCwd(agentCwd) {
-  return path33.join(agentCwd, ".buildautomaton", "snapshots");
+  return path31.join(agentCwd, ".buildautomaton", "snapshots");
 }
 function snapshotFilePath(agentCwd, runId) {
-  return path33.join(snapshotsDirForCwd(agentCwd), `${runId}.json`);
+  return path31.join(snapshotsDirForCwd(agentCwd), `${runId}.json`);
 }
 
 // ../bridge/src/git/snapshot/diff/load-pre-turn-snapshot.ts
@@ -38153,22 +37977,12 @@ async function finalizeAndSendPromptResult(params) {
     promptId,
     agentType,
     agentCwd,
-    isPlanningSession,
     followUpCatalogPromptId,
-    plugin,
     sendResult,
     sendSessionUpdate,
     log: log2
   } = params;
   notifyAgentProvidersPromptTurnFinished(sessionId);
-  const planningTodosSubmit = isPlanningSession && plugin?.cloud?.maybeSubmitPlanningTodos ? await plugin.cloud.maybeSubmitPlanningTodos({
-    sessionId,
-    runId,
-    resultSuccess: result.success === true,
-    output: result.output,
-    log: log2
-  }) : { suppressOutput: false };
-  const planningFallbackOutput = !planningTodosSubmit.suppressOutput && isPlanningSession && runId ? consumePlanningSessionTurnOutput(runId) : "";
   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);
@@ -38178,7 +37992,6 @@ async function finalizeAndSendPromptResult(params) {
     ...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" } : {}
@@ -38206,14 +38019,12 @@ async function finalizeAndSendPromptResult(params) {
 async function prepareAgentPromptText(params) {
   const { promptText, sessionId, runId, isNewSession, plugin } = params;
   if (plugin?.cloud?.prepareAgentPromptText) {
-    const prepared = await plugin.cloud.prepareAgentPromptText({
+    return plugin.cloud.prepareAgentPromptText({
       promptText,
       sessionId,
       runId,
       isNewSession
     });
-    if (prepared.isPlanningSession && runId) registerPlanningSessionTurn(runId);
-    return prepared;
   }
   return { agentPromptText: promptText, isPlanningSession: false };
 }
@@ -38289,7 +38100,6 @@ async function sendPromptToAgent(options) {
     attachments,
     isNewSession = false
   } = options;
-  let isPlanningSession = false;
   try {
     const prepared = await prepareAgentPromptText({
       promptText,
@@ -38298,7 +38108,6 @@ async function sendPromptToAgent(options) {
       isNewSession,
       plugin
     });
-    isPlanningSession = prepared.isPlanningSession;
     const imagesResolved = await resolveSendPromptImages({
       attachments,
       sessionId,
@@ -38327,7 +38136,6 @@ async function sendPromptToAgent(options) {
       promptId,
       agentType,
       agentCwd,
-      isPlanningSession,
       followUpCatalogPromptId,
       plugin,
       sendResult,
@@ -38347,8 +38155,6 @@ async function sendPromptToAgent(options) {
       ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
       ...augmentPromptResultAuthFields(agentType, errMsg)
     });
-  } finally {
-    if (runId && isPlanningSession) clearPlanningSessionTurn(runId);
   }
 }
 
@@ -38523,6 +38329,7 @@ async function createAcpManager(options) {
     logPromptReceivedFromBridge: (opts) => logPromptReceivedFromBridge(ctx, opts),
     handlePrompt: (opts) => handlePrompt(ctx, opts),
     cancelRun: (runId) => cancelRun(ctx, runId),
+    isRegisteredRun: (runId) => ctx.promptRouting.isRegisteredRun(runId),
     resolveRequest(requestId, result) {
       for (const state of ctx.acpAgents.values()) {
         state.acpHandle?.resolveRequest?.(requestId, result);
@@ -38885,7 +38692,7 @@ async function createBridgeAccessState(options) {
 }
 
 // ../bridge/src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
-import * as path35 from "node:path";
+import * as path33 from "node:path";
 
 // ../bridge/src/agents/detect-local-agent-types.ts
 init_yield_to_event_loop();
@@ -38984,58 +38791,67 @@ function listCliAgentCapabilityCacheForWorkspace(db, workspaceId) {
 // ../bridge/src/agents/capabilities/probe-agent-capabilities-for-types.ts
 init_cli_database();
 
+// ../bridge/src/agents/capabilities/agent-capability-warmup-run.ts
+init_cli_process_interrupt();
+var warmupEpoch = 0;
+var probedTypesThisProcess = /* @__PURE__ */ new Set();
+function cancelInFlightAgentCapabilityWarmup() {
+  warmupEpoch += 1;
+}
+function beginAgentCapabilityWarmupRun() {
+  const epoch = warmupEpoch += 1;
+  return () => epoch === warmupEpoch && !isCliImmediateShutdownRequested();
+}
+function wasAgentCapabilityTypeProbedThisProcess(agentType) {
+  return probedTypesThisProcess.has(agentType);
+}
+function markAgentCapabilityTypeProbedThisProcess(agentType) {
+  probedTypesThisProcess.add(agentType);
+}
+function shouldSkipCapabilityProbeThisProcess(agentType) {
+  if (process.env.BUILDAUTOMATON_FORCE_PROBE_ACP_CAPABILITIES === "1") return false;
+  return wasAgentCapabilityTypeProbedThisProcess(agentType);
+}
+
 // ../bridge/src/agents/capabilities/probe-one-agent-type-for-capabilities.ts
-import * as path34 from "node:path";
+import * as path32 from "node:path";
 init_cli_database();
+init_yield_to_event_loop();
 init_cli_process_interrupt();
+var ACP_CAPABILITY_PROBE_TIMEOUT_MS = 12e3;
 async function probeOneAgentTypeForCapabilities(params) {
   const { agentType, cwd, workspaceId, log: log2, reportAgentCapabilities, bridgeReport = true, shouldContinue } = params;
-  const canContinue = () => shouldContinue?.() !== false;
+  const canContinue = () => shouldContinue?.() !== false && !isCliImmediateShutdownRequested();
   if (!canContinue()) return false;
   const resolved = resolveAgentCommand(agentType);
   if (!resolved) return false;
-  let sqliteChanged = false;
-  const reportedRef = { done: false };
-  const tryReport = (co) => {
-    if (reportedRef.done) return;
-    if (!Array.isArray(co) || co.length === 0) return;
-    reportedRef.done = true;
-    let changed = false;
-    try {
-      changed = withCliSqliteSync(
-        (db) => upsertCliAgentCapabilityCache(db, {
-          workspaceId,
-          agentType,
-          configOptions: co
-        })
-      );
-    } catch {
-    }
-    sqliteChanged ||= changed;
-    if (bridgeReport && changed) {
-      reportAgentCapabilities?.({ agentType, configOptions: co });
-    }
-  };
+  await yieldToEventLoop();
+  if (!canContinue()) return false;
+  markAgentCapabilityTypeProbedThisProcess(agentType);
+  let pendingCo = null;
+  const ac = new AbortController();
+  const abortTimer = setTimeout(() => ac.abort(), ACP_CAPABILITY_PROBE_TIMEOUT_MS);
+  abortTimer.unref?.();
+  const abortIfStale = setInterval(() => {
+    if (!canContinue()) ac.abort();
+  }, 50);
+  abortIfStale.unref?.();
   let handle = null;
-  const killTimer = setTimeout(() => {
-    void handle?.disconnectGracefully();
-  }, 28e3);
-  killTimer.unref?.();
   try {
-    if (!canContinue()) return false;
     handle = await resolved.createClient({
       command: resolved.command,
-      cwd: path34.resolve(cwd),
+      cwd: path32.resolve(cwd),
       backendAgentType: agentType,
       sessionMode: "agent",
       persistedAcpSessionId: null,
       agentConfig: null,
+      signal: ac.signal,
       getActiveConfigOptions: () => null,
       onAcpSessionEstablished: (info) => {
-        tryReport(info.configOptions ?? null);
+        if (Array.isArray(info.configOptions) && info.configOptions.length > 0) pendingCo = info.configOptions;
       },
       onAcpConfigOptionsUpdated: (co) => {
-        tryReport(co);
+        if (Array.isArray(co) && co.length > 0) pendingCo = co;
       },
       onAgentSubprocessExit: () => {
       },
@@ -39048,13 +38864,21 @@ async function probeOneAgentTypeForCapabilities(params) {
       `[Bridge service] Agent capability probe (${agentType}): ${e instanceof Error ? e.message : String(e)}`
     );
   } finally {
-    clearTimeout(killTimer);
+    clearTimeout(abortTimer);
+    clearInterval(abortIfStale);
     try {
       await handle?.disconnectGracefully();
     } catch {
     }
   }
-  return sqliteChanged;
+  if (!pendingCo || !canContinue()) return false;
+  const configOptions = pendingCo;
+  await yieldToEventLoop();
+  const changed = await withCliSqlite(
+    (db) => upsertCliAgentCapabilityCache(db, { workspaceId, agentType, configOptions })
+  );
+  if (bridgeReport && changed) reportAgentCapabilities?.({ agentType, configOptions });
+  return changed;
 }
 
 // ../bridge/src/agents/capabilities/probe-agent-capabilities-for-types.ts
@@ -39073,9 +38897,10 @@ async function probeAgentCapabilitiesForDetectedTypes(params) {
   let changedCount = 0;
   for (let i = 0; i < agentTypes.length; i++) {
     if (!canContinue()) return changedCount;
-    if (i > 0) await yieldToEventLoop();
+    await yieldToEventLoop();
     const agentType = agentTypes[i];
     if (!agentType.trim()) continue;
+    if (shouldSkipCapabilityProbeThisProcess(agentType)) continue;
     if (!forceAllTypes) {
       try {
         if (process.env.BUILDAUTOMATON_FORCE_PROBE_ACP_CAPABILITIES !== "1" && await withCliSqlite((db) => hasNonEmptyAgentCapabilityCache(db, workspaceId, agentType))) {
@@ -39101,32 +38926,18 @@ async function probeAgentCapabilitiesForDetectedTypes(params) {
 // ../bridge/src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
 init_yield_to_event_loop();
 init_cli_database();
-
-// ../bridge/src/agents/capabilities/agent-capability-warmup-run.ts
-init_cli_process_interrupt();
-var warmupEpoch = 0;
-function cancelInFlightAgentCapabilityWarmup() {
-  warmupEpoch += 1;
-}
-function beginAgentCapabilityWarmupRun() {
-  const epoch = warmupEpoch += 1;
-  return () => epoch === warmupEpoch && !isCliImmediateShutdownRequested();
-}
-
-// ../bridge/src/agents/capabilities/warmup-agent-capabilities-on-connect.ts
 async function warmupAgentCapabilitiesOnConnect(params) {
   const { workspaceId, log: log2, getWs } = params;
   const isCurrent = beginAgentCapabilityWarmupRun();
   if (!isCurrent()) return;
-  const cwd = path35.resolve(getBridgeRoot());
+  const cwd = path33.resolve(getBridgeRoot());
   async function sendBatchFromCache() {
     if (!isCurrent()) return;
     const socket = getWs();
     if (!socket || socket.readyState !== wrapper_default.OPEN) return;
     try {
       const rows = await withCliSqlite((db) => listCliAgentCapabilityCacheForWorkspace(db, workspaceId));
-      if (!isCurrent()) return;
-      if (rows.length === 0) return;
+      if (!isCurrent() || rows.length === 0) return;
       sendWsMessage(socket, {
         type: "agent_capabilities_batch",
         items: rows.map((r) => ({ agentType: r.agentType, configOptions: r.configOptions }))
@@ -39140,46 +38951,30 @@ async function warmupAgentCapabilitiesOnConnect(params) {
   }
   await sendBatchFromCache();
   if (!isCurrent()) return;
-  let types = [];
-  try {
-    types = [...await detectLocalAgentTypes()];
-  } catch (e) {
-    log2(`[Bridge service] detectLocalAgentTypes failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  if (!isCurrent()) return;
-  try {
-    const n = await probeAgentCapabilitiesForDetectedTypes({
-      agentTypes: types,
-      cwd,
-      workspaceId,
-      log: log2,
-      bridgeReport: false,
-      forceAllTypes: false,
-      shouldContinue: isCurrent
-    });
-    if (n > 0) await sendBatchFromCache();
-  } catch (e) {
-    if (e instanceof CliSqliteInterrupted) return;
-    log2(`[Bridge service] Agent capability probe (missing cache) failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  if (!isCurrent()) return;
   void (async () => {
     try {
       await yieldToEventLoop();
       if (!isCurrent()) return;
+      let types = [];
+      try {
+        types = [...await detectLocalAgentTypes()];
+      } catch (e) {
+        log2(`[Bridge service] detectLocalAgentTypes failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+      if (!isCurrent()) return;
       const n = await probeAgentCapabilitiesForDetectedTypes({
         agentTypes: types,
         cwd,
         workspaceId,
         log: log2,
         bridgeReport: false,
-        forceAllTypes: true,
+        forceAllTypes: false,
         shouldContinue: isCurrent
       });
       if (n > 0) await sendBatchFromCache();
     } catch (e) {
       if (e instanceof CliSqliteInterrupted) return;
-      log2(`[Bridge service] Agent capability lazy refresh failed: ${e instanceof Error ? e.message : String(e)}`);
+      log2(`[Bridge service] Agent capability probe failed: ${e instanceof Error ? e.message : String(e)}`);
     }
   })();
 }
@@ -39244,7 +39039,7 @@ async function createBridgeAccessAndAcp(options) {
 }
 
 // ../bridge/src/connection/setup/create-bridge-preview-stack.ts
-import * as path38 from "node:path";
+import * as path36 from "node:path";
 
 // ../bridge/src/preview-environments/manager/firehose-messages.ts
 function buildFirehoseSnapshotMessage(params) {
@@ -39562,7 +39357,7 @@ function attachChildErrorHandler(d) {
 }
 
 // ../bridge/src/preview-environments/process/wire/handle-exit.ts
-import fs20 from "node:fs";
+import fs19 from "node:fs";
 function logStopLine(d, code, signal) {
   const { title } = d;
   if (signal) {
@@ -39601,7 +39396,7 @@ function attachChildExitHandler(d) {
     const cleanupDir = d.mergedCleanupDir;
     const mergedPath = d.mergedLogPath;
     if (mergedPath && !stale) {
-      fs20.readFile(mergedPath, (err, buf) => {
+      fs19.readFile(mergedPath, (err, buf) => {
         if (!err && buf.length > d.mergedReadPos.value) {
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
@@ -39647,7 +39442,7 @@ function wireChildOutputPipes(d) {
 }
 
 // ../bridge/src/preview-environments/process/wire/poll-merged-log.ts
-import fs21 from "node:fs";
+import fs20 from "node:fs";
 function startMergedLogPoll(d) {
   if (!d.mergedLogPath || !d.mergedCleanupDir) return;
   const { environmentId } = d;
@@ -39657,7 +39452,7 @@ function startMergedLogPoll(d) {
       d.setPollInterval(void 0);
       return;
     }
-    fs21.readFile(d.mergedLogPath, (err, buf) => {
+    fs20.readFile(d.mergedLogPath, (err, buf) => {
       if (err || (d.getSpawnGeneration() ?? 0) !== d.scheduledGen) return;
       if (buf.length <= d.mergedReadPos.value) return;
       const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
@@ -39872,7 +39667,7 @@ function previewEnvironmentSpawnOptions(lifecycle = DEFAULT_PREVIEW_ENVIRONMENT_
 }
 
 // ../bridge/src/preview-environments/manager/shell-spawn/utils.ts
-import fs22 from "node:fs";
+import fs21 from "node:fs";
 function mergePreviewEnvironmentSpawnOptions(opts, lifecycle = DEFAULT_PREVIEW_ENVIRONMENT_PROCESS_LIFECYCLE) {
   return { ...opts, ...previewEnvironmentSpawnOptions(lifecycle) };
 }
@@ -39881,7 +39676,7 @@ function isSpawnEbadf(e) {
 }
 function rmDirQuiet(dir) {
   try {
-    fs22.rmSync(dir, { recursive: true, force: true });
+    fs21.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -39889,7 +39684,7 @@ var cachedDevNullReadFd;
 function devNullReadFd() {
   if (cachedDevNullReadFd === void 0) {
     const devPath = process.platform === "win32" ? "nul" : "/dev/null";
-    cachedDevNullReadFd = fs22.openSync(devPath, "r");
+    cachedDevNullReadFd = fs21.openSync(devPath, "r");
   }
   return cachedDevNullReadFd;
 }
@@ -39969,15 +39764,15 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal, lifecycle)
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-merged-log-file.ts
 import { spawn as spawn7 } from "node:child_process";
-import fs23 from "node:fs";
+import fs22 from "node:fs";
 import { tmpdir } from "node:os";
-import path36 from "node:path";
+import path34 from "node:path";
 function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs23.mkdtempSync(path36.join(tmpdir(), "ba-devsrv-log-"));
-  const logPath = path36.join(tmpRoot, "combined.log");
+  const tmpRoot = fs22.mkdtempSync(path34.join(tmpdir(), "ba-devsrv-log-"));
+  const logPath = path34.join(tmpRoot, "combined.log");
   let logFd;
   try {
-    logFd = fs23.openSync(logPath, "a");
+    logFd = fs22.openSync(logPath, "a");
   } catch {
     rmDirQuiet(tmpRoot);
     return null;
@@ -40001,7 +39796,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
         mergePreviewEnvironmentSpawnOptions({ env, cwd, stdio, ...signal ? { signal } : {} }, lifecycle)
       );
     }
-    fs23.closeSync(logFd);
+    fs22.closeSync(logFd);
     return {
       proc,
       pipedStdoutStderr: true,
@@ -40010,7 +39805,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
     };
   } catch (e) {
     try {
-      fs23.closeSync(logFd);
+      fs22.closeSync(logFd);
     } catch {
     }
     rmDirQuiet(tmpRoot);
@@ -40021,22 +39816,22 @@ function trySpawnMergedLogFile(command, env, cwd, signal, lifecycle) {
 
 // ../bridge/src/preview-environments/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
 import { spawn as spawn8 } from "node:child_process";
-import fs24 from "node:fs";
+import fs23 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import path37 from "node:path";
+import path35 from "node:path";
 function shSingleQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 function trySpawnShellScriptLogRedirectUnix(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs24.mkdtempSync(path37.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path37.join(tmpRoot, "combined.log");
-  const innerPath = path37.join(tmpRoot, "_cmd.sh");
-  const runnerPath = path37.join(tmpRoot, "_run.sh");
+  const tmpRoot = fs23.mkdtempSync(path35.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path35.join(tmpRoot, "combined.log");
+  const innerPath = path35.join(tmpRoot, "_cmd.sh");
+  const runnerPath = path35.join(tmpRoot, "_run.sh");
   try {
-    fs24.writeFileSync(innerPath, `#!/bin/sh
+    fs23.writeFileSync(innerPath, `#!/bin/sh
 ${command}
 `);
-    fs24.writeFileSync(
+    fs23.writeFileSync(
       runnerPath,
       `#!/bin/sh
 cd ${shSingleQuote(cwd)}
@@ -40064,13 +39859,13 @@ cd ${shSingleQuote(cwd)}
   }
 }
 function trySpawnShellScriptLogRedirectWin(command, env, cwd, signal, lifecycle) {
-  const tmpRoot = fs24.mkdtempSync(path37.join(tmpdir2(), "ba-devsrv-sh-"));
-  const logPath = path37.join(tmpRoot, "combined.log");
-  const runnerPath = path37.join(tmpRoot, "_run.bat");
+  const tmpRoot = fs23.mkdtempSync(path35.join(tmpdir2(), "ba-devsrv-sh-"));
+  const logPath = path35.join(tmpRoot, "combined.log");
+  const runnerPath = path35.join(tmpRoot, "_run.bat");
   const q = (p) => `"${p.replace(/"/g, '""')}"`;
   const com = process.env.ComSpec || "cmd.exe";
   try {
-    fs24.writeFileSync(
+    fs23.writeFileSync(
       runnerPath,
       `@ECHO OFF\r
 CD /D ${q(cwd)}\r
@@ -40388,8 +40183,8 @@ function createBridgePreviewStack(options) {
     scheduleInitialIndexBuilds(getBridgeRoot());
   };
   const identifyReportedPaths = {
-    bridgeRootPath: path38.resolve(getBridgeRoot()),
-    worktreesRootPath: path38.resolve(options.worktreesRootPath),
+    bridgeRootPath: path36.resolve(getBridgeRoot()),
+    worktreesRootPath: path36.resolve(options.worktreesRootPath),
     localShortcutPort: 0,
     localShortcutToken: ""
   };
@@ -40591,7 +40386,7 @@ function createBridgeHeartbeatController(params) {
 }
 
 // ../bridge/src/cli/cli-version.ts
-var CLI_VERSION = "0.1.93".length > 0 ? "0.1.93" : "0.0.0-dev";
+var CLI_VERSION = "0.1.95".length > 0 ? "0.1.95" : "0.0.0-dev";
 
 // ../bridge/src/connection/identify/send-bridge-identify.ts
 function sendBridgeIdentify(ws, params) {
@@ -40762,12 +40557,12 @@ function createBridgeRuntimeMessageSetup(options) {
 }
 
 // ../bridge/src/worktrees/worktree-layout-file.ts
-import * as fs25 from "node:fs";
-import * as path39 from "node:path";
-import os7 from "node:os";
+import * as fs24 from "node:fs";
+import * as path37 from "node:path";
+import os6 from "node:os";
 var LAYOUT_FILENAME = "worktree-launcher-layout.json";
 function defaultWorktreeLayoutPath() {
-  return path39.join(os7.homedir(), ".buildautomaton", LAYOUT_FILENAME);
+  return path37.join(os6.homedir(), ".buildautomaton", LAYOUT_FILENAME);
 }
 function normalizeLoadedLayout(raw) {
   if (raw && typeof raw === "object" && "launcherCwds" in raw) {
@@ -40779,8 +40574,8 @@ function normalizeLoadedLayout(raw) {
 function loadWorktreeLayout() {
   try {
     const p = defaultWorktreeLayoutPath();
-    if (!fs25.existsSync(p)) return { launcherCwds: [] };
-    const raw = JSON.parse(fs25.readFileSync(p, "utf8"));
+    if (!fs24.existsSync(p)) return { launcherCwds: [] };
+    const raw = JSON.parse(fs24.readFileSync(p, "utf8"));
     return normalizeLoadedLayout(raw);
   } catch {
     return { launcherCwds: [] };
@@ -40788,24 +40583,24 @@ function loadWorktreeLayout() {
 }
 function saveWorktreeLayout(layout) {
   try {
-    const dir = path39.dirname(defaultWorktreeLayoutPath());
-    fs25.mkdirSync(dir, { recursive: true });
-    fs25.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
+    const dir = path37.dirname(defaultWorktreeLayoutPath());
+    fs24.mkdirSync(dir, { recursive: true });
+    fs24.writeFileSync(defaultWorktreeLayoutPath(), JSON.stringify(layout, null, 2), "utf8");
   } catch {
   }
 }
 function baseNameSafe(pathString) {
-  return path39.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
+  return path37.basename(pathString).replace(/[^a-zA-Z0-9._-]+/g, "-") || "cwd";
 }
 function getLauncherDirNameIfPresent(layout, bridgeRootPath2) {
-  const norm = path39.resolve(bridgeRootPath2);
-  const existing = layout.launcherCwds.find((e) => path39.resolve(e.absolutePath) === norm);
+  const norm = path37.resolve(bridgeRootPath2);
+  const existing = layout.launcherCwds.find((e) => path37.resolve(e.absolutePath) === norm);
   return existing?.dirName;
 }
 function allocateDirNameForLauncherCwd(layout, bridgeRootPath2) {
   const existing = getLauncherDirNameIfPresent(layout, bridgeRootPath2);
   if (existing) return existing;
-  const norm = path39.resolve(bridgeRootPath2);
+  const norm = path37.resolve(bridgeRootPath2);
   const base = baseNameSafe(norm);
   const used = new Set(layout.launcherCwds.map((e) => e.dirName));
   let name = base;
@@ -40898,8 +40693,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path85) {
-  return path85 instanceof String && cache.has(path85);
+function isPathSpec(path83) {
+  return path83 instanceof String && cache.has(path83);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -40988,8 +40783,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path85) {
-  return (0, import_file_exists.exists)(path85, import_file_exists.FOLDER);
+function folderExists(path83) {
+  return (0, import_file_exists.exists)(path83, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -41393,8 +41188,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path85) {
-      return /^\.(git)?$/.test(path85.trim());
+    parser(path83) {
+      return /^\.(git)?$/.test(path83.trim());
     }
   };
 }
@@ -41828,11 +41623,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path85, line, preview] = input.split(NULL);
-    paths.add(path85);
-    (results[path85] = results[path85] || []).push({
+    const [path83, line, preview] = input.split(NULL);
+    paths.add(path83);
+    (results[path83] = results[path83] || []).push({
       line: asNumber(line),
-      path: path85,
+      path: path83,
       preview
     });
   });
@@ -42597,14 +42392,14 @@ var init_hash_object = __esm2({
     init_task();
   }
 });
-function parseInit(bare, path85, text) {
+function parseInit(bare, path83, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path85, false, result[1]);
+    return new InitSummary(bare, path83, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path85, true, result[1]);
+    return new InitSummary(bare, path83, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -42615,7 +42410,7 @@ function parseInit(bare, path85, text) {
       break;
     }
   }
-  return new InitSummary(bare, path85, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path83, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -42624,9 +42419,9 @@ var init_InitSummary = __esm2({
   "src/lib/responses/InitSummary.ts"() {
     "use strict";
     InitSummary = class {
-      constructor(bare, path85, existing, gitDir) {
+      constructor(bare, path83, existing, gitDir) {
         this.bare = bare;
-        this.path = path85;
+        this.path = path83;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -42638,7 +42433,7 @@ var init_InitSummary = __esm2({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path85, customArgs) {
+function initTask(bare = false, path83, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -42647,7 +42442,7 @@ function initTask(bare = false, path85, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path85, text);
+      return parseInit(commands.includes("--bare"), path83, text);
     }
   };
 }
@@ -43463,12 +43258,12 @@ var init_FileStatusSummary = __esm2({
     "use strict";
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path85, index, working_dir) {
-        this.path = path85;
+      constructor(path83, index, working_dir) {
+        this.path = path83;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path85) || [null, path85, path85];
+          const detail = fromPathRegex.exec(path83) || [null, path83, path83];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -43499,14 +43294,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path85) {
+  function data(index, workingDir, path83) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path85);
+      handler(result, path83);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path85, index, workingDir));
+      result.files.push(new FileStatusSummary(path83, index, workingDir));
     }
   }
 }
@@ -43815,9 +43610,9 @@ var init_simple_git_api = __esm2({
           next
         );
       }
-      hashObject(path85, write) {
+      hashObject(path83, write) {
         return this._runTask(
-          hashObjectTask(path85, write === true),
+          hashObjectTask(path83, write === true),
           trailingFunctionArgument(arguments)
         );
       }
@@ -44170,8 +43965,8 @@ var init_branch = __esm2({
   }
 });
 function toPath(input) {
-  const path85 = input.trim().replace(/^["']|["']$/g, "");
-  return path85 && normalize3(path85);
+  const path83 = input.trim().replace(/^["']|["']$/g, "");
+  return path83 && normalize3(path83);
 }
 var parseCheckIgnore;
 var init_CheckIgnore = __esm2({
@@ -44485,8 +44280,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path85) {
-  return subModuleTask(["add", repo, path85]);
+function addSubModuleTask(repo, path83) {
+  return subModuleTask(["add", repo, path83]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -44819,8 +44614,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path85, then) {
-      return this._runTask(addSubModuleTask2(repo, path85), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path83, then) {
+      return this._runTask(addSubModuleTask2(repo, path83), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(
@@ -45559,8 +45354,8 @@ function parseNumstatEntries(lines) {
 }
 function parseNumstat(lines) {
   const m = /* @__PURE__ */ new Map();
-  for (const [path85, entry] of parseNumstatEntries(lines)) {
-    m.set(path85, { additions: entry.additions, deletions: entry.deletions });
+  for (const [path83, entry] of parseNumstatEntries(lines)) {
+    m.set(path83, { additions: entry.additions, deletions: entry.deletions });
   }
   return m;
 }
@@ -45689,7 +45484,7 @@ async function resolveDefaultRemoteBranchSha(g, remote) {
 }
 
 // ../bridge/src/git/commits/remote-tracking/resolve-base-sha-for-unpushed-commits.ts
-import * as path40 from "node:path";
+import * as path38 from "node:path";
 var BASE_SHA_CACHE_TTL_MS = 3e4;
 var baseShaCache = /* @__PURE__ */ new Map();
 async function resolveBaseShaForUnpushedCommitsUncached(g) {
@@ -45700,7 +45495,7 @@ async function resolveBaseShaForUnpushedCommitsUncached(g) {
 }
 async function resolveBaseShaForUnpushedCommits(g, repoDir) {
   if (repoDir) {
-    const key = path40.resolve(repoDir);
+    const key = path38.resolve(repoDir);
     const now = Date.now();
     const cached2 = baseShaCache.get(key);
     if (cached2 && cached2.expiresAt > now) return cached2.baseSha;
@@ -45835,17 +45630,17 @@ function formatRemoteDisplayLabel(remoteUrl) {
 }
 
 // ../bridge/src/git/changes/repo/get-working-tree-change-repo-details.ts
-import * as path50 from "node:path";
+import * as path48 from "node:path";
 
 // ../bridge/src/git/changes/repo/build-working-tree-change-repo-detail.ts
-import * as path49 from "node:path";
+import * as path47 from "node:path";
 
 // ../bridge/src/git/is-git-repo.ts
-import * as fs26 from "node:fs";
-import * as path41 from "node:path";
+import * as fs25 from "node:fs";
+import * as path39 from "node:path";
 async function isGitRepoDirectory(dirPath) {
   try {
-    await fs26.promises.access(path41.join(dirPath, ".git"));
+    await fs25.promises.access(path39.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -45853,8 +45648,8 @@ async function isGitRepoDirectory(dirPath) {
 }
 
 // ../bridge/src/git/changes/listing/apply-untracked-file-stats.ts
-import * as fs27 from "node:fs";
-import * as path42 from "node:path";
+import * as fs26 from "node:fs";
+import * as path40 from "node:path";
 
 // ../bridge/src/git/changes/lines/count-lines.ts
 import { createReadStream } from "node:fs";
@@ -45886,7 +45681,7 @@ function createUntrackedStatsApplier(options) {
     if (!options.untrackedSet.has(pathInRepo)) return;
     if (options.nameByPath.has(pathInRepo)) return;
     if (row.change === "moved") return;
-    const repoFilePath = path42.join(options.repoGitCwd, pathInRepo);
+    const repoFilePath = path40.join(options.repoGitCwd, pathInRepo);
     const fromGit = await numstatFromGitNoIndex(options.g, pathInRepo);
     if (fromGit) {
       row.additions = fromGit.additions;
@@ -45894,7 +45689,7 @@ function createUntrackedStatsApplier(options) {
       return;
     }
     try {
-      const st = await fs27.promises.stat(repoFilePath);
+      const st = await fs26.promises.stat(repoFilePath);
       row.additions = st.isFile() ? await countTextFileLines(repoFilePath) : 0;
     } catch {
       row.additions = 0;
@@ -45971,7 +45766,7 @@ async function buildChangedFileRowsFromPaths(options) {
 }
 
 // ../bridge/src/git/changes/listing/enrich-working-tree-file-rows.ts
-import * as path44 from "node:path";
+import * as path42 from "node:path";
 
 // ../bridge/src/git/changes/patch/patch-truncate.ts
 function truncatePatch(s) {
@@ -46059,10 +45854,10 @@ async function readGitBlobLines(repoCwd, pathInRepo) {
 }
 
 // ../bridge/src/git/changes/patch/hydrate/read-worktree-file-lines.ts
-import * as fs28 from "node:fs";
+import * as fs27 from "node:fs";
 async function readWorktreeFileLines(filePath) {
   try {
-    const raw = await fs28.promises.readFile(filePath, "utf8");
+    const raw = await fs27.promises.readFile(filePath, "utf8");
     return raw.split(/\r?\n/);
   } catch {
     return null;
@@ -46200,8 +45995,8 @@ async function unifiedDiffForFileInRange(repoCwd, range, pathInRepo, change, mov
 }
 
 // ../bridge/src/git/changes/total-lines/resolve-changed-file-total-lines.ts
-import * as fs29 from "node:fs";
-import * as path43 from "node:path";
+import * as fs28 from "node:fs";
+import * as path41 from "node:path";
 var MAX_BYTES = 512e3;
 async function countLinesInGitRef(repoGitCwd, ref, pathInRepo) {
   const spec = `${ref}:${pathInRepo}`;
@@ -46221,13 +46016,13 @@ async function countLinesInGitRef(repoGitCwd, ref, pathInRepo) {
 }
 async function resolveWorkingTreeFileTotalLines(options) {
   if (options.isBinary) return null;
-  const filePath = path43.join(options.repoGitCwd, options.pathInRepo);
+  const filePath = path41.join(options.repoGitCwd, options.pathInRepo);
   if (options.change === "removed") {
     return countLinesInGitRef(options.repoGitCwd, "HEAD", options.pathInRepo);
   }
   if (options.change === "moved" || options.change === "modified") {
     try {
-      const st = await fs29.promises.stat(filePath);
+      const st = await fs28.promises.stat(filePath);
       if (!st.isFile()) return null;
       return await countTextFileLines(filePath);
     } catch {
@@ -46270,7 +46065,7 @@ async function enrichWorkingTreeFileRows(options) {
       row.workspaceRelPath,
       options.repoPathRelativeToWorkspaceRoot
     );
-    const filePath = path44.join(options.repoGitCwd, filePathRelativeToRepoRoot);
+    const filePath = path42.join(options.repoGitCwd, filePathRelativeToRepoRoot);
     const hydrateKind = row.change === "moved" ? "modified" : row.change;
     let patch = await unifiedDiffForFile(
       options.repoGitCwd,
@@ -46428,7 +46223,7 @@ async function listChangedFilesForRepo(repoGitCwd, repoPathRelativeToWorkspaceRo
 }
 
 // ../bridge/src/git/changes/listing/list-changed-files-for-commit.ts
-import * as path45 from "node:path";
+import * as path43 from "node:path";
 
 // ../bridge/src/git/changes/listing/enrich-commit-file-rows.ts
 async function enrichCommitFileRows(options) {
@@ -46473,7 +46268,7 @@ async function parentForCommitDiff(g, sha) {
 var COMMIT_FILES_CACHE_TTL_MS = 5 * 6e4;
 var commitFilesCache = /* @__PURE__ */ new Map();
 function commitFilesCacheKey(repoGitCwd, commitSha) {
-  return `${path45.resolve(repoGitCwd)}:${commitSha}`;
+  return `${path43.resolve(repoGitCwd)}:${commitSha}`;
 }
 async function listChangedFilesForCommit(repoGitCwd, repoPathRelativeToWorkspaceRoot, commitSha, options = {}) {
   const cacheKey = commitFilesCacheKey(repoGitCwd, commitSha);
@@ -46528,7 +46323,7 @@ async function listChangedFilesForCommit(repoGitCwd, repoPathRelativeToWorkspace
 }
 
 // ../bridge/src/git/commits/list-unpushed-commits.ts
-import * as path46 from "node:path";
+import * as path44 from "node:path";
 
 // ../bridge/src/git/commits/lib/parse-log-lines.ts
 function parseLogShaDateSubjectLines(raw) {
@@ -46563,7 +46358,7 @@ async function gitLogNotReachableFromBase(g, baseSha, headSha) {
   }
 }
 async function listUnpushedCommits(repoDir) {
-  const key = path46.resolve(repoDir);
+  const key = path44.resolve(repoDir);
   const now = Date.now();
   const cached2 = unpushedCache.get(key);
   if (cached2 && cached2.expiresAt > now) return cached2.commits;
@@ -46624,7 +46419,7 @@ async function loadRecentAndUnpushedCommitsForRepoDetail(repoDir, recentCommitsL
 }
 
 // ../bridge/src/git/changes/repo/load-working-tree-change-repo-git-info.ts
-import * as path47 from "node:path";
+import * as path45 from "node:path";
 
 // ../bridge/src/git/remote-origin-url.ts
 async function getRemoteOriginUrl(gitDir) {
@@ -46639,7 +46434,7 @@ async function getRemoteOriginUrl(gitDir) {
 
 // ../bridge/src/git/changes/repo/load-working-tree-change-repo-git-info.ts
 async function loadWorkingTreeChangeRepoGitInfo(checkoutPath) {
-  const resolvedCheckoutPath = path47.resolve(checkoutPath);
+  const resolvedCheckoutPath = path45.resolve(checkoutPath);
   const git = cliSimpleGit(resolvedCheckoutPath);
   await yieldToEventLoop2();
   const [branch, remoteUrl] = await Promise.all([
@@ -46654,14 +46449,14 @@ async function loadWorkingTreeChangeRepoGitInfo(checkoutPath) {
 }
 
 // ../bridge/src/git/changes/repo/resolve-repo-path-relative-to-workspace-root.ts
-import * as path48 from "node:path";
+import * as path46 from "node:path";
 async function resolveRepoPathRelativeToWorkspaceRoot(options) {
-  const checkoutPath = path48.resolve(options.checkoutPath);
+  const checkoutPath = path46.resolve(options.checkoutPath);
   const git = cliSimpleGit(checkoutPath);
-  const sessionParentPath = options.sessionParentPath ? path48.resolve(options.sessionParentPath) : null;
+  const sessionParentPath = options.sessionParentPath ? path46.resolve(options.sessionParentPath) : null;
   let repoPathRelativeToWorkspaceRoot;
   if (sessionParentPath) {
-    const checkoutPathRelativeToSessionParent = path48.relative(sessionParentPath, checkoutPath);
+    const checkoutPathRelativeToSessionParent = path46.relative(sessionParentPath, checkoutPath);
     repoPathRelativeToWorkspaceRoot = checkoutPathRelativeToSessionParent === "" ? "." : checkoutPathRelativeToSessionParent.replace(/\\/g, "/");
   } else {
     let gitTopLevel = checkoutPath;
@@ -46671,8 +46466,8 @@ async function resolveRepoPathRelativeToWorkspaceRoot(options) {
     } catch {
       gitTopLevel = checkoutPath;
     }
-    const gitTopLevelRelativeToBridgeRoot = path48.relative(options.bridgeRoot, path48.resolve(gitTopLevel)).replace(/\\/g, "/") || ".";
-    repoPathRelativeToWorkspaceRoot = gitTopLevelRelativeToBridgeRoot.startsWith("..") ? path48.basename(path48.resolve(gitTopLevel)) : gitTopLevelRelativeToBridgeRoot;
+    const gitTopLevelRelativeToBridgeRoot = path46.relative(options.bridgeRoot, path46.resolve(gitTopLevel)).replace(/\\/g, "/") || ".";
+    repoPathRelativeToWorkspaceRoot = gitTopLevelRelativeToBridgeRoot.startsWith("..") ? path46.basename(path46.resolve(gitTopLevel)) : gitTopLevelRelativeToBridgeRoot;
   }
   return normalizeRepoPathRelativeToWorkspaceRoot(
     repoPathRelativeToWorkspaceRoot === "" ? "." : repoPathRelativeToWorkspaceRoot
@@ -46681,10 +46476,10 @@ async function resolveRepoPathRelativeToWorkspaceRoot(options) {
 
 // ../bridge/src/git/changes/repo/build-working-tree-change-repo-detail.ts
 async function buildWorkingTreeChangeRepoDetail(options) {
-  const checkoutPath = path49.resolve(options.targetPath);
+  const checkoutPath = path47.resolve(options.targetPath);
   if (!await isGitRepoDirectory(checkoutPath)) return null;
   const isCommitView = options.basis.kind === "commit";
-  const sessionParentPath = options.sessionParentPath ? path49.resolve(options.sessionParentPath) : null;
+  const sessionParentPath = options.sessionParentPath ? path47.resolve(options.sessionParentPath) : null;
   const git = cliSimpleGit(checkoutPath);
   const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
     checkoutPath,
@@ -46732,8 +46527,8 @@ async function buildWorkingTreeChangeRepoDetail(options) {
 
 // ../bridge/src/git/changes/repo/get-working-tree-change-repo-details.ts
 async function getWorkingTreeChangeRepoDetails(options) {
-  const bridgeRoot = path50.resolve(getBridgeRoot());
-  const sessionParentPath = options.sessionParentPath ? path50.resolve(options.sessionParentPath) : null;
+  const bridgeRoot = path48.resolve(getBridgeRoot());
+  const sessionParentPath = options.sessionParentPath ? path48.resolve(options.sessionParentPath) : null;
   const out = [];
   const filter = options.repoFilterRelPath != null ? normalizeRepoPathRelativeToWorkspaceRoot(options.repoFilterRelPath) : null;
   const basisInput = options.basis ?? { kind: "working" };
@@ -46764,9 +46559,9 @@ async function getWorkingTreeChangeRepoDetails(options) {
 }
 
 // ../bridge/src/git/changes/repo/get-working-tree-change-file-patch.ts
-import * as path51 from "node:path";
+import * as path49 from "node:path";
 async function getWorkingTreeChangeFilePatch(options) {
-  const repoGitCwd = path51.resolve(options.repoGitCwd);
+  const repoGitCwd = path49.resolve(options.repoGitCwd);
   if (!await isGitRepoDirectory(repoGitCwd)) {
     throw new Error("Not a git repository");
   }
@@ -46805,7 +46600,7 @@ async function getWorkingTreeChangeFilePatch(options) {
     });
     return { patchContent: patchContent2, totalLines: totalLines2 };
   }
-  const filePath = path51.join(repoGitCwd, filePathRelativeToRepoRoot);
+  const filePath = path49.join(repoGitCwd, filePathRelativeToRepoRoot);
   const hydrateKind = options.change === "moved" ? "modified" : options.change;
   let patchContent = await unifiedDiffForFile(
     repoGitCwd,
@@ -46851,18 +46646,18 @@ function parseWorkingTreeChangeKind(value) {
 }
 
 // ../bridge/src/worktrees/manager/git/get-session-working-tree-change-file-patch.ts
-import * as path52 from "node:path";
+import * as path50 from "node:path";
 async function getSessionWorkingTreeChangeFilePatch(cache2, sessionId, discover, opts) {
   const targets = await resolveCommitTargetsAsync(sessionId, cache2, discover);
-  const bridgeRoot = path52.resolve(getBridgeRoot());
-  const sessionParentPath = cache2.getSessionParentPath(sessionId) ? path52.resolve(cache2.getSessionParentPath(sessionId)) : null;
+  const bridgeRoot = path50.resolve(getBridgeRoot());
+  const sessionParentPath = cache2.getSessionParentPath(sessionId) ? path50.resolve(cache2.getSessionParentPath(sessionId)) : null;
   const repoPathRelativeToWorkspaceRootFilter = normalizeRepoPathRelativeToWorkspaceRoot(
     opts.repoRelPath.trim()
   );
   let result = null;
   await forEachWithGitYield(targets, async (targetPath) => {
     if (result) return;
-    const checkoutPath = path52.resolve(targetPath);
+    const checkoutPath = path50.resolve(targetPath);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
@@ -46895,13 +46690,13 @@ async function pushSessionUpstream(cache2, sessionId, discover) {
 }
 
 // ../bridge/src/worktrees/remove-session-worktrees.ts
-import * as fs32 from "node:fs";
+import * as fs31 from "node:fs";
 
 // ../bridge/src/git/worktrees/worktree-remove.ts
-import * as fs31 from "node:fs";
+import * as fs30 from "node:fs";
 
 // ../bridge/src/worktrees/is-removable-session-worktree-checkout-path.ts
-import path53 from "node:path";
+import path51 from "node:path";
 init_normalize_resolved_path();
 function isBridgeRootCheckoutPath(checkoutPath) {
   return normalizeResolvedPath(checkoutPath) === normalizeResolvedPath(getBridgeRoot());
@@ -46910,23 +46705,23 @@ function isRemovableSessionWorktreeCheckoutPath(checkoutPath, worktreesRootPath)
   if (isBridgeRootCheckoutPath(checkoutPath)) return false;
   const normalized = normalizeResolvedPath(checkoutPath);
   const worktreesRoot = normalizeResolvedPath(worktreesRootPath);
-  const rel = path53.relative(worktreesRoot, normalized);
-  if (rel === "" || rel.startsWith("..") || path53.isAbsolute(rel)) return false;
+  const rel = path51.relative(worktreesRoot, normalized);
+  if (rel === "" || rel.startsWith("..") || path51.isAbsolute(rel)) return false;
   return true;
 }
 
 // ../bridge/src/git/worktrees/resolve-main-repo-from-git-file.ts
-import * as fs30 from "node:fs";
-import * as path54 from "node:path";
+import * as fs29 from "node:fs";
+import * as path52 from "node:path";
 function resolveMainRepoFromWorktreeGitFile(wt) {
-  const gitDirFile = path54.join(wt, ".git");
-  if (!fs30.existsSync(gitDirFile) || !fs30.statSync(gitDirFile).isFile()) return "";
-  const first2 = fs30.readFileSync(gitDirFile, "utf8").trim();
+  const gitDirFile = path52.join(wt, ".git");
+  if (!fs29.existsSync(gitDirFile) || !fs29.statSync(gitDirFile).isFile()) return "";
+  const first2 = fs29.readFileSync(gitDirFile, "utf8").trim();
   const m = first2.match(/^gitdir:\s*(.+)$/im);
   if (!m) return "";
-  const gitWorktreePath = path54.resolve(wt, m[1].trim());
-  const gitDir = path54.dirname(path54.dirname(gitWorktreePath));
-  return path54.dirname(gitDir);
+  const gitWorktreePath = path52.resolve(wt, m[1].trim());
+  const gitDir = path52.dirname(path52.dirname(gitWorktreePath));
+  return path52.dirname(gitDir);
 }
 
 // ../bridge/src/git/worktrees/worktree-remove.ts
@@ -46937,7 +46732,7 @@ async function gitWorktreeRemoveForce(worktreePath) {
     return true;
   }
   if (isBridgeRootCheckoutPath(worktreePath)) return false;
-  fs31.rmSync(worktreePath, { recursive: true, force: true });
+  fs30.rmSync(worktreePath, { recursive: true, force: true });
   return true;
 }
 
@@ -46959,7 +46754,7 @@ async function removeSessionWorktrees(paths, worktreesRootPath, log2) {
       log2(`[worktrees] Remove failed for ${wt}: ${e instanceof Error ? e.message : String(e)}`);
       if (isRemovableSessionWorktreeCheckoutPath(wt, worktreesRootPath)) {
         try {
-          fs32.rmSync(wt, { recursive: true, force: true });
+          fs31.rmSync(wt, { recursive: true, force: true });
         } catch {
         }
       }
@@ -47015,12 +46810,12 @@ async function renameSessionWorktreeBranch(cache2, sessionId, newBranch, log2) {
 // ../bridge/src/worktrees/discovery/discover-session-worktree-on-disk.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as fs36 from "node:fs";
-import * as path59 from "node:path";
+import * as fs35 from "node:fs";
+import * as path57 from "node:path";
 
 // ../bridge/src/worktrees/discovery/collect-worktree-paths.ts
-import * as fs34 from "node:fs";
-import * as path56 from "node:path";
+import * as fs33 from "node:fs";
+import * as path54 from "node:path";
 
 // ../bridge/src/worktrees/discovery/disk-walk-constants.ts
 var DISK_WALK_YIELD_EVERY = 64;
@@ -47050,8 +46845,8 @@ function shouldSkipDiskWalkEntry(name) {
 // ../bridge/src/worktrees/discovery/disk-walk-utils.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as fs33 from "node:fs";
-import * as path55 from "node:path";
+import * as fs32 from "node:fs";
+import * as path53 from "node:path";
 async function yieldDuringDiskWalk(state) {
   state.entries++;
   if (state.entries % DISK_WALK_YIELD_EVERY !== 0) return true;
@@ -47061,7 +46856,7 @@ async function yieldDuringDiskWalk(state) {
 }
 async function isGitDir(dirPath) {
   try {
-    await fs33.promises.access(path55.join(dirPath, ".git"));
+    await fs32.promises.access(path53.join(dirPath, ".git"));
     return true;
   } catch {
     return false;
@@ -47075,23 +46870,23 @@ async function collectGitRepoRootsUnderDirectory(rootPath) {
   const walk = async (dir) => {
     if (!await yieldDuringDiskWalk(state)) return;
     if (await isGitDir(dir)) {
-      out.push(path56.resolve(dir));
+      out.push(path54.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = await fs34.promises.readdir(dir, { withFileTypes: true });
+      entries = await fs33.promises.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path56.join(dir, e.name);
+      const full = path54.join(dir, e.name);
       if (!e.isDirectory()) continue;
       await walk(full);
     }
   };
-  await walk(path56.resolve(rootPath));
+  await walk(path54.resolve(rootPath));
   return { paths: [...new Set(out)], entriesVisited: state.entries };
 }
 async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK_MAX_DEPTH) {
@@ -47102,16 +46897,16 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
     if (!await yieldDuringDiskWalk(state)) return;
     let entries;
     try {
-      entries = await fs34.promises.readdir(dir, { withFileTypes: true });
+      entries = await fs33.promises.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
       if (shouldSkipDiskWalkEntry(e.name)) continue;
-      const full = path56.join(dir, e.name);
+      const full = path54.join(dir, e.name);
       if (!e.isDirectory()) continue;
       if (e.name === sessionId) {
-        if (await isGitDir(full)) out.push(path56.resolve(full));
+        if (await isGitDir(full)) out.push(path54.resolve(full));
         continue;
       }
       if (await isGitDir(full)) continue;
@@ -47123,14 +46918,14 @@ async function collectWorktreeRootsNamed(root, sessionId, maxDepth = LEGACY_WALK
 }
 
 // ../bridge/src/worktrees/discovery/layout-keys-for-bridge-root.ts
-import * as path57 from "node:path";
+import * as path55 from "node:path";
 function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
-  const bridge = path57.resolve(bridgeRoot);
+  const bridge = path55.resolve(bridgeRoot);
   const preferred = getLauncherDirNameIfPresent(layout, bridgeRoot);
   const relevant = layout.launcherCwds.filter((e) => {
-    const entry = path57.resolve(e.absolutePath);
-    return bridge === entry || bridge.startsWith(entry + path57.sep) || entry.startsWith(bridge + path57.sep);
-  }).sort((a, b) => path57.resolve(b.absolutePath).length - path57.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
+    const entry = path55.resolve(e.absolutePath);
+    return bridge === entry || bridge.startsWith(entry + path55.sep) || entry.startsWith(bridge + path55.sep);
+  }).sort((a, b) => path55.resolve(b.absolutePath).length - path55.resolve(a.absolutePath).length).map((e) => e.dirName).filter((name) => keysOnDisk.includes(name));
   const ordered = [];
   const seen = /* @__PURE__ */ new Set();
   const add = (k) => {
@@ -47148,19 +46943,19 @@ function layoutKeysForBridgeRoot(layout, bridgeRoot, keysOnDisk) {
 }
 
 // ../bridge/src/worktrees/discovery/try-binding-from-isolated-directory.ts
-import * as fs35 from "node:fs";
-import * as path58 from "node:path";
+import * as fs34 from "node:fs";
+import * as path56 from "node:path";
 async function tryBindingFromIsolatedDirectory(scopeDir) {
   let st;
   try {
-    st = await fs35.promises.stat(scopeDir);
+    st = await fs34.promises.stat(scopeDir);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const { paths: worktreePaths } = await collectGitRepoRootsUnderDirectory(scopeDir);
   if (worktreePaths.length === 0) return null;
-  const abs = path58.resolve(scopeDir);
+  const abs = path56.resolve(scopeDir);
   return {
     parentPath: abs,
     repoCheckoutPaths: worktreePaths
@@ -47183,7 +46978,7 @@ async function discoverSessionWorktreeOnDisk(options) {
   const sid = sessionId.trim();
   if (!sid) return null;
   try {
-    await fs36.promises.access(worktreesRootPath);
+    await fs35.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -47192,13 +46987,13 @@ async function discoverSessionWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs36.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs35.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path59.join(worktreesRootPath, name);
+      const p = path57.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs36.promises.stat(p);
+        st = await fs35.promises.stat(p);
       } catch {
         continue;
       }
@@ -47212,23 +47007,23 @@ async function discoverSessionWorktreeOnDisk(options) {
   for (const key of keys) {
     if (isCliImmediateShutdownRequested()) return null;
     await yieldToEventLoop();
-    const layoutRoot = path59.join(worktreesRootPath, key);
+    const layoutRoot = path57.join(worktreesRootPath, key);
     let layoutSt;
     try {
-      layoutSt = await fs36.promises.stat(layoutRoot);
+      layoutSt = await fs35.promises.stat(layoutRoot);
     } catch {
       continue;
     }
     if (!layoutSt.isDirectory()) continue;
-    const sessionDir = path59.join(layoutRoot, sid);
+    const sessionDir = path57.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) ?? path59.resolve(legacy.paths[0]);
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacy.paths) ?? path57.resolve(legacy.paths[0]);
       return {
-        sessionParentPath: path59.resolve(isolated),
-        repoCheckoutPaths: legacy.paths.map((p) => path59.resolve(p))
+        sessionParentPath: path57.resolve(isolated),
+        repoCheckoutPaths: legacy.paths.map((p) => path57.resolve(p))
       };
     }
   }
@@ -47236,31 +47031,31 @@ async function discoverSessionWorktreeOnDisk(options) {
 }
 
 // ../bridge/src/worktrees/discovery/discover-session-worktrees-under-session-worktree-root.ts
-import * as fs37 from "node:fs";
-import * as path61 from "node:path";
+import * as fs36 from "node:fs";
+import * as path59 from "node:path";
 
 // ../bridge/src/worktrees/discovery/discover-legacy-binding-ascending-from-checkout.ts
 init_cli_process_interrupt();
 init_yield_to_event_loop();
-import * as path60 from "node:path";
+import * as path58 from "node:path";
 async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPath) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hintR = path60.resolve(checkoutPath);
+  const hintR = path58.resolve(checkoutPath);
   let best = null;
-  let cur = path60.dirname(hintR);
+  let cur = path58.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) => path60.resolve(p) === hintR)) {
-      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path60.resolve(paths.paths[0]);
+    if (paths.paths.some((p) => path58.resolve(p) === hintR)) {
+      const isolated = resolveIsolatedSessionParentPathFromCheckouts(paths.paths) ?? path58.resolve(paths.paths[0]);
       best = {
-        sessionParentPath: path60.resolve(isolated),
-        repoCheckoutPaths: paths.paths.map((p) => path60.resolve(p))
+        sessionParentPath: path58.resolve(isolated),
+        repoCheckoutPaths: paths.paths.map((p) => path58.resolve(p))
       };
     }
-    const next = path60.dirname(cur);
+    const next = path58.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -47271,12 +47066,12 @@ async function discoverLegacyBindingAscendingFromCheckout(sessionId, checkoutPat
 async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionParentPathOrHint, sessionId) {
   const sid = sessionId.trim();
   if (!sid) return null;
-  const hint = path61.resolve(sessionParentPathOrHint);
-  const underHint = await tryBindingFromSessionDirectory(path61.join(hint, sid));
+  const hint = path59.resolve(sessionParentPathOrHint);
+  const underHint = await tryBindingFromSessionDirectory(path59.join(hint, sid));
   if (underHint) return underHint;
   const direct = await tryBindingFromSessionDirectory(hint);
   if (direct) {
-    if (path61.basename(hint) === sid && await isGitDir(hint)) {
+    if (path59.basename(hint) === sid && await isGitDir(hint)) {
       const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
       if (legacyFromCheckout && legacyFromCheckout.repoCheckoutPaths.length > direct.repoCheckoutPaths.length) {
         return legacyFromCheckout;
@@ -47284,23 +47079,23 @@ async function discoverSessionWorktreesUnderSessionWorktreeRoot(sessionParentPat
     }
     return direct;
   }
-  if (path61.basename(hint) === sid && await isGitDir(hint)) {
+  if (path59.basename(hint) === sid && await isGitDir(hint)) {
     const legacyFromCheckout = await discoverLegacyBindingAscendingFromCheckout(sid, hint);
     if (legacyFromCheckout) return legacyFromCheckout;
   }
   let st;
   try {
-    st = await fs37.promises.stat(hint);
+    st = await fs36.promises.stat(hint);
   } catch {
     return null;
   }
   if (!st.isDirectory()) return null;
   const legacyPaths = await collectWorktreeRootsNamed(hint, sid);
   if (legacyPaths.paths.length === 0) return null;
-  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path61.resolve(legacyPaths.paths[0]);
+  const isolated = resolveIsolatedSessionParentPathFromCheckouts(legacyPaths.paths) ?? path59.resolve(legacyPaths.paths[0]);
   return {
-    sessionParentPath: path61.resolve(isolated),
-    repoCheckoutPaths: legacyPaths.paths.map((p) => path61.resolve(p))
+    sessionParentPath: path59.resolve(isolated),
+    repoCheckoutPaths: legacyPaths.paths.map((p) => path59.resolve(p))
   };
 }
 
@@ -47361,11 +47156,11 @@ function parseSessionParent(v) {
 }
 
 // ../bridge/src/worktrees/prepare/prepare-new-isolated-worktrees.ts
-import * as fs41 from "node:fs";
+import * as fs40 from "node:fs";
 
 // ../bridge/src/git/discover-repos.ts
-import * as fs38 from "node:fs";
-import * as path62 from "node:path";
+import * as fs37 from "node:fs";
+import * as path60 from "node:path";
 init_yield_to_event_loop();
 var GIT_DISCOVER_YIELD_EVERY = 32;
 async function yieldGitDiscoverWork(entryCount) {
@@ -47375,14 +47170,14 @@ async function yieldGitDiscoverWork(entryCount) {
 }
 async function discoverGitRepos(cwd = getBridgeRoot()) {
   const result = [];
-  const cwdResolved = path62.resolve(cwd);
+  const cwdResolved = path60.resolve(cwd);
   if (await isGitRepoDirectory(cwdResolved)) {
     const remoteUrl = await getRemoteOriginUrl(cwdResolved);
     result.push({ absolutePath: cwdResolved, remoteUrl });
   }
   let entries;
   try {
-    entries = fs38.readdirSync(cwdResolved, { withFileTypes: true });
+    entries = fs37.readdirSync(cwdResolved, { withFileTypes: true });
   } catch {
     return result;
   }
@@ -47390,7 +47185,7 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
     await yieldGitDiscoverWork(i + 1);
     const ent = entries[i];
     if (!ent.isDirectory()) continue;
-    const childPath2 = path62.join(cwdResolved, ent.name);
+    const childPath2 = path60.join(cwdResolved, ent.name);
     if (await isGitRepoDirectory(childPath2)) {
       const remoteUrl = await getRemoteOriginUrl(childPath2);
       result.push({ absolutePath: childPath2, remoteUrl });
@@ -47399,17 +47194,17 @@ async function discoverGitRepos(cwd = getBridgeRoot()) {
   return result;
 }
 async function discoverGitReposUnderRoot(rootPath) {
-  const root = path62.resolve(rootPath);
+  const root = path60.resolve(rootPath);
   const roots = [];
   let walkEntries = 0;
   async function walk(dir) {
     if (await isGitRepoDirectory(dir)) {
-      roots.push(path62.resolve(dir));
+      roots.push(path60.resolve(dir));
       return;
     }
     let entries;
     try {
-      entries = fs38.readdirSync(dir, { withFileTypes: true });
+      entries = fs37.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -47417,7 +47212,7 @@ async function discoverGitReposUnderRoot(rootPath) {
       await yieldGitDiscoverWork(++walkEntries);
       const ent = entries[i];
       if (!ent.isDirectory() || ent.name === ".git") continue;
-      await walk(path62.join(dir, ent.name));
+      await walk(path60.join(dir, ent.name));
     }
   }
   await walk(root);
@@ -47433,8 +47228,8 @@ async function discoverGitReposUnderRoot(rootPath) {
 }
 
 // ../bridge/src/worktrees/prepare/add-isolated-repo-worktree.ts
-import * as fs40 from "node:fs";
-import * as path64 from "node:path";
+import * as fs39 from "node:fs";
+import * as path62 from "node:path";
 
 // ../bridge/src/git/worktrees/worktree-add.ts
 async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch, baseRef = "HEAD") {
@@ -47450,8 +47245,8 @@ async function gitWorktreeAddExistingBranch(mainRepoPath, worktreePath, branch)
 }
 
 // ../bridge/src/worktrees/prepare/copy-bridge-files-along-worktree-path.ts
-import * as fs39 from "node:fs";
-import * as path63 from "node:path";
+import * as fs38 from "node:fs";
+import * as path61 from "node:path";
 var BRIDGE_FILES_ALONG_WORKTREE_PATH = ["AGENTS.md"];
 function copyBridgeFilesAlongWorktreePath(options) {
   const { bridgeRoot, scopeDir, repoPathRelativeToBridgeRoot, log: log2 } = options;
@@ -47460,19 +47255,19 @@ function copyBridgeFilesAlongWorktreePath(options) {
   const segments = repoPathRelativeToBridgeRoot.split("/").filter(Boolean);
   for (let i = 0; i < segments.length; i++) {
     const prefix = segments.slice(0, i).join("/");
-    const bridgeDir = prefix ? path63.join(bridgeRoot, prefix) : bridgeRoot;
-    const destDir = prefix ? path63.join(scopeDir, prefix) : scopeDir;
+    const bridgeDir = prefix ? path61.join(bridgeRoot, prefix) : bridgeRoot;
+    const destDir = prefix ? path61.join(scopeDir, prefix) : scopeDir;
     for (const fileName of fileNames) {
       copyFileIfPresent(bridgeDir, destDir, fileName, log2);
     }
   }
 }
 function copyFileIfPresent(srcDir, destDir, fileName, log2) {
-  const src = path63.join(srcDir, fileName);
-  if (!fs39.existsSync(src)) return;
-  const dest = path63.join(destDir, fileName);
+  const src = path61.join(srcDir, fileName);
+  if (!fs38.existsSync(src)) return;
+  const dest = path61.join(destDir, fileName);
   try {
-    fs39.copyFileSync(src, dest);
+    fs38.copyFileSync(src, dest);
     log2?.(`[worktrees] Copied ${fileName} to ${dest}`);
   } catch (e) {
     log2?.(
@@ -47504,16 +47299,16 @@ async function addIsolatedRepoWorktree(options) {
     worktreeBaseBranches,
     log: log2
   } = options;
-  const repoPathRelativeToBridgeRootRaw = path64.relative(bridgeResolved, repoAbsolutePath);
-  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path64.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
+  const repoPathRelativeToBridgeRootRaw = path62.relative(bridgeResolved, repoAbsolutePath);
+  if (repoPathRelativeToBridgeRootRaw.startsWith("..") || path62.isAbsolute(repoPathRelativeToBridgeRootRaw)) {
     return null;
   }
   const repoPathRelativeToBridgeRoot = normalizeRepoPathRelativeToWorkspaceRoot(
     repoPathRelativeToBridgeRootRaw === "" ? "." : repoPathRelativeToBridgeRootRaw
   );
-  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path64.join(scopeDir, repoPathRelativeToBridgeRoot);
+  const worktreePath = repoPathRelativeToBridgeRoot === "." ? scopeDir : path62.join(scopeDir, repoPathRelativeToBridgeRoot);
   if (repoPathRelativeToBridgeRoot !== ".") {
-    fs40.mkdirSync(path64.dirname(worktreePath), { recursive: true });
+    fs39.mkdirSync(path62.dirname(worktreePath), { recursive: true });
     copyBridgeFilesAlongWorktreePath({
       bridgeRoot: bridgeResolved,
       scopeDir,
@@ -47541,7 +47336,7 @@ async function addIsolatedRepoWorktree(options) {
 }
 
 // ../bridge/src/worktrees/prepare/resolve-isolated-scope-dir.ts
-import * as path65 from "node:path";
+import * as path63 from "node:path";
 
 // ../bridge/src/worktrees/worktree-layout-kind.ts
 function sanitizeWorktreeBranchSegment(value) {
@@ -47571,10 +47366,10 @@ function previewDeployBranchName(environmentId) {
 
 // ../bridge/src/worktrees/prepare/resolve-isolated-scope-dir.ts
 function resolveIsolatedScopeDir(options) {
-  const bridgeResolved = path65.resolve(options.bridgeRoot);
+  const bridgeResolved = path63.resolve(options.bridgeRoot);
   const cwdKey = allocateDirNameForLauncherCwd(options.layout, bridgeResolved);
-  const bridgeKeyDir = path65.join(options.worktreesRootPath, cwdKey);
-  const scopeDir = path65.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
+  const bridgeKeyDir = path63.join(options.worktreesRootPath, cwdKey);
+  const scopeDir = path63.join(bridgeKeyDir, ...layoutDirSegments(options.kind, options.scopeId));
   return { bridgeResolved, scopeDir };
 }
 
@@ -47604,7 +47399,7 @@ async function prepareNewIsolatedWorktrees(options) {
     return null;
   }
   const worktreePaths = [];
-  fs41.mkdirSync(scopeDir, { recursive: true });
+  fs40.mkdirSync(scopeDir, { recursive: true });
   await forEachWithGitYield(repos, async (repo) => {
     const worktreePath = await addIsolatedRepoWorktree({
       kind,
@@ -47676,10 +47471,10 @@ async function resolveExistingSessionParentPath(sessionId, cache2, discover) {
 }
 
 // ../bridge/src/worktrees/manager/resolve-explicit-session-parent-path.ts
-import * as path66 from "node:path";
+import * as path64 from "node:path";
 init_yield_to_event_loop();
 async function resolveExplicitSessionParentPath(params) {
-  const resolved = path66.resolve(params.parentPathRaw);
+  const resolved = path64.resolve(params.parentPathRaw);
   if (parseSessionParent(params.sessionParent) !== "worktrees_root") {
     return resolved;
   }
@@ -47696,7 +47491,7 @@ async function resolveExplicitSessionParentPath(params) {
     await yieldToEventLoop();
     const tryRoot = await discoverSessionWorktreesUnderSessionWorktreeRoot(cur, params.sessionId);
     if (tryRoot) return rememberAndReturn(tryRoot);
-    const next = path66.dirname(cur);
+    const next = path64.dirname(cur);
     if (next === cur) break;
     cur = next;
   }
@@ -47857,15 +47652,15 @@ var SessionWorktreeManager = class {
 };
 
 // ../bridge/src/worktrees/discovery/discover-preview-worktree-on-disk.ts
-import * as fs42 from "node:fs";
-import * as path67 from "node:path";
+import * as fs41 from "node:fs";
+import * as path65 from "node:path";
 init_yield_to_event_loop();
 async function discoverPreviewWorktreeOnDisk(options) {
   const { environmentId, worktreesRootPath, layout, bridgeRoot } = options;
   const eid = environmentId.trim();
   if (!eid) return null;
   try {
-    await fs42.promises.access(worktreesRootPath);
+    await fs41.promises.access(worktreesRootPath);
   } catch {
     return null;
   }
@@ -47874,13 +47669,13 @@ async function discoverPreviewWorktreeOnDisk(options) {
   if (preferredKey) keysOnDisk.push(preferredKey);
   const scanState = { entries: 0 };
   try {
-    for (const name of await fs42.promises.readdir(worktreesRootPath)) {
+    for (const name of await fs41.promises.readdir(worktreesRootPath)) {
       if (!await yieldDuringDiskWalk(scanState)) break;
       if (name.startsWith(".")) continue;
-      const p = path67.join(worktreesRootPath, name);
+      const p = path65.join(worktreesRootPath, name);
       let st;
       try {
-        st = await fs42.promises.stat(p);
+        st = await fs41.promises.stat(p);
       } catch {
         continue;
       }
@@ -47894,7 +47689,7 @@ async function discoverPreviewWorktreeOnDisk(options) {
   const previewDirRel = layoutDirSegments("preview_environment", eid);
   for (const key of keys) {
     await yieldToEventLoop();
-    const previewDir = path67.join(worktreesRootPath, key, ...previewDirRel);
+    const previewDir = path65.join(worktreesRootPath, key, ...previewDirRel);
     const binding = await tryBindingFromIsolatedDirectory(previewDir);
     if (binding) return binding;
   }
@@ -48021,7 +47816,7 @@ var PreviewWorktreeManager = class {
 };
 
 // ../bridge/src/worktrees/deploy/deploy-session-to-preview-environment.ts
-import * as path71 from "node:path";
+import * as path69 from "node:path";
 
 // ../bridge/src/git/worktrees/reset-worktree-to-branch.ts
 async function gitResetWorktreeToBranch(worktreePath, branch) {
@@ -48032,8 +47827,8 @@ async function gitResetWorktreeToBranch(worktreePath, branch) {
 }
 
 // ../bridge/src/worktrees/deploy/capture-and-apply-wip.ts
-import * as fs43 from "node:fs";
-import * as path68 from "node:path";
+import * as fs42 from "node:fs";
+import * as path66 from "node:path";
 
 // ../bridge/src/git/is-not-a-git-repository-error.ts
 function isNotAGitRepositoryError(e) {
@@ -48095,12 +47890,12 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
     if (!ap.ok) return ap;
   }
   await forEachWithGitYield(wip.untrackedPaths, async (rel) => {
-    const src = path68.join(sourceRepoPath, rel);
-    const dst = path68.join(targetRepoPath, rel);
+    const src = path66.join(sourceRepoPath, rel);
+    const dst = path66.join(targetRepoPath, rel);
     try {
-      if (!fs43.existsSync(src)) return;
-      fs43.mkdirSync(path68.dirname(dst), { recursive: true });
-      fs43.copyFileSync(src, dst);
+      if (!fs42.existsSync(src)) return;
+      fs42.mkdirSync(path66.dirname(dst), { recursive: true });
+      fs42.copyFileSync(src, dst);
     } catch (e) {
       log2(
         `[worktrees] Failed to copy untracked ${rel}: ${e instanceof Error ? e.message : String(e)}`
@@ -48111,14 +47906,14 @@ async function applyWorkingTreeWip(targetRepoPath, sourceRepoPath, wip, log2) {
 }
 
 // ../bridge/src/worktrees/deploy/resolve-isolated-checkout-for-repo-path-relative-to-workspace-root.ts
-import * as path69 from "node:path";
+import * as path67 from "node:path";
 async function resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot(options) {
   const { checkoutPaths, sessionParentPath, bridgeRoot, repoPathRelativeToWorkspaceRoot } = options;
-  const resolvedSessionParentPath = sessionParentPath ? path69.resolve(sessionParentPath) : null;
+  const resolvedSessionParentPath = sessionParentPath ? path67.resolve(sessionParentPath) : null;
   let match = null;
   await forEachWithGitYield(checkoutPaths, async (checkoutPath) => {
     if (match) return;
-    const resolvedCheckoutPath = path69.resolve(checkoutPath);
+    const resolvedCheckoutPath = path67.resolve(checkoutPath);
     if (!await isGitRepoDirectory(resolvedCheckoutPath)) return;
     const resolvedRepoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath: resolvedCheckoutPath,
@@ -48172,7 +47967,7 @@ async function applySessionWipToPreviewCheckouts(options) {
 }
 
 // ../bridge/src/worktrees/deploy/collect-session-repo-deploy-states.ts
-import * as path70 from "node:path";
+import * as path68 from "node:path";
 
 // ../bridge/src/git/branches/create-or-update-branch.ts
 async function gitCreateOrUpdateBranch(repoPath, branch, startRef, options) {
@@ -48209,19 +48004,19 @@ async function collectSessionRepoDeployStates(options) {
   const sessionParentPath = sessionWorktreeManager.getSessionParentPath(sid);
   const states = [];
   await forEachWithGitYield(sessionTargets, async (sessionCheckout) => {
-    const checkoutPath = path70.resolve(sessionCheckout);
+    const checkoutPath = path68.resolve(sessionCheckout);
     if (!await isGitRepoDirectory(checkoutPath)) return;
     const repoPathRelativeToWorkspaceRoot = await resolveRepoPathRelativeToWorkspaceRoot({
       checkoutPath,
       bridgeRoot,
-      sessionParentPath: sessionParentPath ? path70.resolve(sessionParentPath) : null
+      sessionParentPath: sessionParentPath ? path68.resolve(sessionParentPath) : null
     });
     if (!repoPathRelativeToWorkspaceRoot) return;
     const mainRepoPath = resolveMainRepoPath(checkoutPath);
     const headSha = (await cliSimpleGit(checkoutPath).revparse(["HEAD"])).trim();
     const previewCheckout = previewCheckoutPaths.length > 0 ? await resolveIsolatedCheckoutForRepoPathRelativeToWorkspaceRoot({
       checkoutPaths: previewCheckoutPaths,
-      sessionParentPath: previewParentPath ? path70.resolve(previewParentPath) : null,
+      sessionParentPath: previewParentPath ? path68.resolve(previewParentPath) : null,
       bridgeRoot,
       repoPathRelativeToWorkspaceRoot
     }) : null;
@@ -48241,7 +48036,7 @@ async function deploySessionToPreviewEnvironment(options) {
   const eid = options.environmentId.trim();
   if (!sid || !eid) return { ok: false, error: "sessionId and environmentId are required" };
   const deployBranch = previewDeployBranchName(eid);
-  const bridgeRoot = path71.resolve(getBridgeRoot());
+  const bridgeRoot = path69.resolve(getBridgeRoot());
   await previewWorktreeManager.ensureCached(eid);
   const existingPreviewParentPath = previewWorktreeManager.getPreviewParentPath(eid) ?? null;
   const existingPreviewCheckoutPaths = previewWorktreeManager.getRepoCheckoutPaths(eid) ?? [];
@@ -48281,10 +48076,10 @@ async function deploySessionToPreviewEnvironment(options) {
 }
 
 // ../bridge/src/worktrees/manager/default-worktrees-root-path.ts
-import * as path72 from "node:path";
-import os8 from "node:os";
+import * as path70 from "node:path";
+import os7 from "node:os";
 function defaultWorktreesRootPath() {
-  return path72.join(os8.homedir(), ".buildautomaton", "worktrees");
+  return path70.join(os7.homedir(), ".buildautomaton", "worktrees");
 }
 
 // ../bridge/src/connection/setup/create-bridge-worktree-managers.ts
@@ -48409,14 +48204,14 @@ function assertBridgeWorkspace(ctx) {
 }
 
 // ../bridge/src/files/list-dir/index.ts
-import fs45 from "node:fs";
+import fs44 from "node:fs";
 
 // ../bridge/src/files/ensure-under-cwd.ts
-import path73 from "node:path";
+import path71 from "node:path";
 function ensureUnderCwd(relativePath, cwd = getBridgeRoot()) {
-  const normalized = path73.normalize(relativePath).replace(/^(\.\/)+/, "");
-  const resolved = path73.resolve(cwd, normalized);
-  if (!resolved.startsWith(cwd + path73.sep) && resolved !== cwd) {
+  const normalized = path71.normalize(relativePath).replace(/^(\.\/)+/, "");
+  const resolved = path71.resolve(cwd, normalized);
+  if (!resolved.startsWith(cwd + path71.sep) && resolved !== cwd) {
     return null;
   }
   return resolved;
@@ -48429,15 +48224,15 @@ init_yield_to_event_loop();
 var LIST_DIR_YIELD_EVERY = 256;
 
 // ../bridge/src/files/list-dir/map-dir-entry.ts
-import path74 from "node:path";
-import fs44 from "node:fs";
+import path72 from "node:path";
+import fs43 from "node:fs";
 async function mapDirEntry(d, relativePath, resolved) {
-  const entryPath = path74.join(relativePath || ".", d.name).replace(/\\/g, "/");
-  const fullPath = path74.join(resolved, d.name);
+  const entryPath = path72.join(relativePath || ".", d.name).replace(/\\/g, "/");
+  const fullPath = path72.join(resolved, d.name);
   let isDir = d.isDirectory();
   if (d.isSymbolicLink()) {
     try {
-      const targetStat = await fs44.promises.stat(fullPath);
+      const targetStat = await fs43.promises.stat(fullPath);
       isDir = targetStat.isDirectory();
     } catch {
       isDir = false;
@@ -48467,7 +48262,7 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs45.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs44.promises.readdir(resolved, { withFileTypes: true });
     const entries = [];
     for (let i = 0; i < names.length; i++) {
       if (i > 0 && i % LIST_DIR_YIELD_EVERY === 0) {
@@ -48483,13 +48278,13 @@ async function listDirAsync(relativePath, sessionParentPath = getBridgeRoot()) {
 }
 
 // ../bridge/src/git/tree/resolve-repo-abs-path.ts
-import * as path75 from "node:path";
+import * as path73 from "node:path";
 function resolveRepoAbsPathFromBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path75.resolve(bridgeRoot);
+  const bridgeResolved = path73.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path75.join(bridgeResolved, rel);
-  const resolved = path75.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path75.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path73.join(bridgeResolved, rel);
+  const resolved = path73.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path73.sep) && resolved !== bridgeResolved) {
     return null;
   }
   return resolved;
@@ -48970,25 +48765,25 @@ async function GET2(ctx) {
 init_in_flight();
 
 // ../bridge/src/files/read/read-file-async.ts
-import fs51 from "node:fs";
+import fs50 from "node:fs";
 init_yield_to_event_loop();
 
 // ../bridge/src/files/read/resolve-file-cache.ts
-import fs46 from "node:fs";
-import path76 from "node:path";
+import fs45 from "node:fs";
+import path74 from "node:path";
 var RESOLVE_CACHE_MAX = 4096;
 var resolveCache = /* @__PURE__ */ new Map();
 function resolveCacheKey(sessionParentPath, relativePath) {
   return `${sessionParentPath}\0${relativePath}`;
 }
 function pathStaysUnderParent(filePath, sessionParentPath) {
-  const parent = path76.resolve(sessionParentPath);
-  const resolved = path76.resolve(filePath);
-  return resolved === parent || resolved.startsWith(`${parent}${path76.sep}`);
+  const parent = path74.resolve(sessionParentPath);
+  const resolved = path74.resolve(filePath);
+  return resolved === parent || resolved.startsWith(`${parent}${path74.sep}`);
 }
 function statMatchesCacheSync(entry) {
   try {
-    const stat2 = fs46.statSync(entry.path);
+    const stat2 = fs45.statSync(entry.path);
     return stat2.isFile() && stat2.mtimeMs === entry.mtimeMs && stat2.size === entry.size;
   } catch {
     return false;
@@ -49021,7 +48816,7 @@ function joinInflightResolve(cacheKey, factory) {
 }
 
 // ../bridge/src/files/read/resolve-file-for-read-core.ts
-import fs47 from "node:fs";
+import fs46 from "node:fs";
 import { isMainThread as isMainThread4 } from "node:worker_threads";
 function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   const cacheKey = resolveCacheKey(sessionParentPath, relativePath);
@@ -49031,13 +48826,13 @@ function resolveFileForReadImplSync(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = fs47.lstatSync(resolved);
+    const lstat = fs46.lstatSync(resolved);
     if (lstat.isSymbolicLink()) {
-      real = fs47.realpathSync(resolved);
+      real = fs46.realpathSync(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat2 = fs47.statSync(real);
+      const stat2 = fs46.statSync(real);
       if (!stat2.isFile()) return { error: "Not a file" };
       size = stat2.size;
       mtimeMs = stat2.mtimeMs;
@@ -49065,13 +48860,13 @@ async function resolveFileForReadImpl(relativePath, sessionParentPath) {
   let size;
   let mtimeMs;
   try {
-    const lstat = await fs47.promises.lstat(resolved);
+    const lstat = await fs46.promises.lstat(resolved);
     if (lstat.isSymbolicLink()) {
-      real = await fs47.promises.realpath(resolved);
+      real = await fs46.promises.realpath(resolved);
       if (!pathStaysUnderParent(real, sessionParentPath)) {
         return { error: "Path is outside working directory" };
       }
-      const stat2 = await fs47.promises.stat(real);
+      const stat2 = await fs46.promises.stat(real);
       if (!stat2.isFile()) return { error: "Not a file" };
       size = stat2.size;
       mtimeMs = stat2.mtimeMs;
@@ -49120,7 +48915,7 @@ async function resolveFilePathAsync(relativePath, sessionParentPath = getBridgeR
 
 // ../bridge/src/files/read/read-file-range-async.ts
 init_yield_to_event_loop();
-import fs48 from "node:fs";
+import fs47 from "node:fs";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 
 // ../bridge/src/files/read/read-file-range-line-zero.ts
@@ -49234,8 +49029,8 @@ function finishLineZeroTail(state, tail, resultLines, fileSize, lineChunkSize, l
 
 // ../bridge/src/files/read/read-file-range-async.ts
 async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE, fileSizeIn) {
-  const fileSize = fileSizeIn ?? (await fs48.promises.stat(filePath)).size;
-  const fd = await fs48.promises.open(filePath, "r");
+  const fileSize = fileSizeIn ?? (await fs47.promises.stat(filePath)).size;
+  const fd = await fs47.promises.open(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder2("utf8");
@@ -49336,7 +49131,7 @@ async function readFileRangeAsync(filePath, startLine, endLine, lineOffsetIn, li
 }
 
 // ../bridge/src/files/read/read-small-file-range-async.ts
-import fs49 from "node:fs";
+import fs48 from "node:fs";
 import { isMainThread as isMainThread5 } from "node:worker_threads";
 var SMALL_FILE_RANGE_MAX_BYTES = 512 * 1024;
 function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize) {
@@ -49366,7 +49161,7 @@ function sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize,
   };
 }
 function readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const raw = fs49.readFileSync(filePath, "utf8");
+  const raw = fs48.readFileSync(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
@@ -49374,28 +49169,28 @@ async function readSmallFileRangeAsync(filePath, fileSize, startLine, endLine, l
   if (isMainThread5) {
     return readSmallFileRangeSync(filePath, fileSize, startLine, endLine, lineOffsetIn, lineChunkSize);
   }
-  const raw = await fs49.promises.readFile(filePath, "utf8");
+  const raw = await fs48.promises.readFile(filePath, "utf8");
   const lines = raw.split(/\r?\n/);
   return sliceLineRange(lines, startLine, endLine, lineOffsetIn, lineChunkSize, fileSize);
 }
 
 // ../bridge/src/files/read/read-file-buffer-full-async.ts
 init_yield_to_event_loop();
-import fs50 from "node:fs";
+import fs49 from "node:fs";
 import { isMainThread as isMainThread6 } from "node:worker_threads";
 var READ_CHUNK_BYTES = 256 * 1024;
 var MAIN_THREAD_SYNC_READ_MAX_BYTES = 512 * 1024;
 async function readFileBufferFullAsync(filePath, knownSize) {
   if (isMainThread6) {
-    const size2 = knownSize ?? fs50.statSync(filePath).size;
+    const size2 = knownSize ?? fs49.statSync(filePath).size;
     if (size2 <= MAIN_THREAD_SYNC_READ_MAX_BYTES) {
       await yieldToEventLoop();
-      const buffer = fs50.readFileSync(filePath);
+      const buffer = fs49.readFileSync(filePath);
       return { buffer, size: buffer.length };
     }
   }
-  const size = knownSize ?? (await fs50.promises.stat(filePath)).size;
-  const fd = await fs50.promises.open(filePath, "r");
+  const size = knownSize ?? (await fs49.promises.stat(filePath)).size;
+  const fd = await fs49.promises.open(filePath, "r");
   const chunks = [];
   let position = 0;
   let bytesSinceYield = 0;
@@ -49498,7 +49293,7 @@ async function readFileAsync(relativePath, startLine, endLine, lineOffset, lineC
     }
     if (hasRange) {
       if (fileSize == null) {
-        const stat2 = await fs51.promises.stat(resolvedPath);
+        const stat2 = await fs50.promises.stat(resolvedPath);
         fileSize = stat2.size;
       }
       const read2 = fileSize <= SMALL_FILE_RANGE_MAX_BYTES ? await readSmallFileRangeAsync(
@@ -49796,12 +49591,12 @@ function parseOptionalInt2(raw) {
   return Number.isInteger(parsed) ? parsed : void 0;
 }
 function parseCodeNavParams(url2) {
-  const path85 = url2.searchParams.get("path") ?? "";
+  const path83 = url2.searchParams.get("path") ?? "";
   const opRaw = url2.searchParams.get("op")?.trim();
   const op = opRaw === "references" ? "references" : opRaw === "symbols" ? "symbols" : opRaw === "definitions" ? "definitions" : "definition";
   const line = parseOptionalInt2(url2.searchParams.get("line")) ?? 1;
   const column = parseOptionalInt2(url2.searchParams.get("column")) ?? 0;
-  return { path: path85, op, line, column };
+  return { path: path83, op, line, column };
 }
 function parseCodeNavPath(url2) {
   const raw = url2.searchParams.get("path")?.trim();
@@ -50490,7 +50285,6 @@ var handleBridgeIdentified = (msg, deps) => {
   });
   setImmediate(() => {
     void (async () => {
-      cancelInFlightAgentCapabilityWarmup();
       try {
         await deps.reportAutoDetectedAgents?.();
       } catch (e) {
@@ -50498,13 +50292,11 @@ var handleBridgeIdentified = (msg, deps) => {
           `[Bridge service] Auto-detect agents failed: ${e instanceof Error ? e.message : String(e)}`
         );
       }
-      try {
-        await deps.warmupAgentCapabilitiesOnConnect?.();
-      } catch (e) {
+      void deps.warmupAgentCapabilitiesOnConnect?.()?.catch((e) => {
         deps.log(
           `[Bridge service] Agent capability warmup failed: ${e instanceof Error ? e.message : String(e)}`
         );
-      }
+      });
     })();
   });
 };
@@ -50737,19 +50529,34 @@ var handleAgentConfigMessage = (msg, deps) => {
   handleBridgeAgentConfig(msg, deps);
 };
 
-// ../bridge/src/prompt-turn-queue/runner/dispatch-started-prompt-queue-runs.ts
+// ../bridge/src/prompt-queue/runner/apply-prompt-queue-state-from-server.ts
 init_yield_to_event_loop();
 
-// ../bridge/src/prompt-turn-queue/disk-store.ts
+// ../bridge/src/prompt-queue/snapshots/types.ts
+function parseServerTurnSnapshot(raw) {
+  if (!raw || typeof raw !== "object") return null;
+  const o = raw;
+  const turnId = typeof o.turnId === "string" ? o.turnId : "";
+  const sessionId = typeof o.sessionId === "string" ? o.sessionId : "";
+  const turnOrd = typeof o.turnOrd === "number" ? o.turnOrd : Number(o.turnOrd) || 0;
+  const serverState = o.serverState ?? o.bridgeServerState;
+  const lastCliState = o.lastClientState ?? o.lastCliState ?? null;
+  const payload = o.payload && typeof o.payload === "object" ? o.payload : {};
+  if (!turnId || !sessionId) return null;
+  return { turnId, sessionId, turnOrd, serverState, lastCliState, payload };
+}
+function promptQueueSnapshotEntries(queues) {
+  const entries = [];
+  for (const [queueKey, rawTurns] of Object.entries(queues)) {
+    if (!Array.isArray(rawTurns)) continue;
+    const turns = rawTurns.map(parseServerTurnSnapshot).filter((t) => t !== null);
+    entries.push([queueKey, turns]);
+  }
+  return entries;
+}
+
+// ../bridge/src/prompt-queue/persistence/read-persisted-queue.ts
 init_cli_database();
-var MERGEABLE_BRIDGE_SERVER_STATES = /* @__PURE__ */ new Set([
-  "queued",
-  "requeued",
-  "requeued_with_revert",
-  "cancel_requested",
-  "stopping",
-  "discarded"
-]);
 async function readPersistedQueue(queueKey) {
   return withCliSqlite((db) => {
     const row = db.get("SELECT queue_key, updated_at, turns_json FROM prompt_queue WHERE queue_key = ?", [
@@ -50765,6 +50572,9 @@ async function readPersistedQueue(queueKey) {
     }
   });
 }
+
+// ../bridge/src/prompt-queue/persistence/write-persisted-queue.ts
+init_cli_database();
 async function writePersistedQueue(file2) {
   await withCliSqlite((db) => {
     db.run(
@@ -50774,36 +50584,103 @@ async function writePersistedQueue(file2) {
     );
   });
 }
-async function mergeBridgeServerQueueSnapshot(queueKey, serverTurns) {
-  const prev = await readPersistedQueue(queueKey);
+
+// ../bridge/src/prompt-queue/reconciliation/merge-turns.ts
+var MERGEABLE_BRIDGE_SERVER_STATES = /* @__PURE__ */ new Set([
+  "queued",
+  "requeued",
+  "requeued_with_revert",
+  "cancel_requested",
+  "stopping",
+  "discarded"
+]);
+function mergeServerSnapshotWithLocal(queueKey, serverTurns, prev) {
   const turns = [];
-  for (const raw of serverTurns) {
-    if (!raw || typeof raw !== "object") continue;
-    const o = raw;
-    const turnId = typeof o.turnId === "string" ? o.turnId : "";
-    const sessionId = typeof o.sessionId === "string" ? o.sessionId : "";
-    const turnOrd = typeof o.turnOrd === "number" ? o.turnOrd : Number(o.turnOrd) || 0;
-    const bridgeServerState = o.serverState ?? o.bridgeServerState;
-    const lastCliState = o.lastClientState ?? o.lastCliState ?? null;
-    const payload = o.payload && typeof o.payload === "object" ? o.payload : {};
-    if (!turnId || !sessionId) continue;
-    if (!MERGEABLE_BRIDGE_SERVER_STATES.has(String(bridgeServerState))) continue;
-    const old = prev?.turns.find((t) => t.turnId === turnId);
-    const mergedCli = old?.lastCliState === "running" && lastCliState == null ? "running" : lastCliState;
+  for (const s of serverTurns) {
+    if (!MERGEABLE_BRIDGE_SERVER_STATES.has(String(s.serverState))) continue;
+    const old = prev?.turns.find((t) => t.turnId === s.turnId);
+    const mergedCli = old?.lastCliState === "running" && s.lastCliState == null ? "running" : s.lastCliState;
     turns.push({
-      turnId,
-      sessionId,
-      turnOrd,
-      bridgeServerState,
+      turnId: s.turnId,
+      sessionId: s.sessionId,
+      turnOrd: s.turnOrd,
+      bridgeServerState: s.serverState,
       lastCliState: mergedCli,
-      payload
+      payload: s.payload
     });
   }
   turns.sort((a, b) => a.turnOrd - b.turnOrd);
   return { queueKey, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), turns };
 }
+function hasLiveRunningTurn(turns, isLiveRun) {
+  return turns.some((t) => t.lastCliState === "running" && isLiveRun(t.turnId));
+}
+function isTerminalCliState(state) {
+  return state === "stopped" || state === "failed" || state === "cancelled";
+}
+function isSkippedServerState(state) {
+  return state === "discarded" || state === "stopping" || state === "cancel_requested";
+}
+
+// ../bridge/src/prompt-queue/reconciliation/pick-actions.ts
+function pickNextRunnableTurn(turns) {
+  for (const t of turns) {
+    if (isSkippedServerState(t.bridgeServerState)) continue;
+    if (!isRunnableBridgePromptTurnServerState(t.bridgeServerState)) continue;
+    if (isTerminalCliState(t.lastCliState) || t.lastCliState === "running") continue;
+    return t;
+  }
+  return null;
+}
+function normalizeStaleRunning(turns, isLiveRun) {
+  return turns.map((t) => {
+    if (t.lastCliState !== "running") return t;
+    if (isLiveRun(t.turnId)) return t;
+    if (t.bridgeServerState === "cancel_requested") return t;
+    return { ...t, lastCliState: null };
+  });
+}
+function reconcileQueueActions(queueKey, turns, isLiveRun) {
+  const actions = [];
+  for (const t of turns) {
+    if (t.bridgeServerState === "cancel_requested" && t.lastCliState === "running" && isLiveRun(t.turnId)) {
+      actions.push({ type: "cancel_run", queueKey, turnId: t.turnId });
+    }
+  }
+  for (const t of turns) {
+    if (t.bridgeServerState !== "cancel_requested") continue;
+    if (t.lastCliState !== "running") continue;
+    if (isLiveRun(t.turnId)) continue;
+    actions.push({ type: "finalize_stale", queueKey, turnId: t.turnId, cliState: "cancelled" });
+  }
+  const normalized = normalizeStaleRunning(turns, isLiveRun);
+  if (hasLiveRunningTurn(normalized, isLiveRun)) return actions;
+  const next = pickNextRunnableTurn(normalized);
+  if (next) {
+    actions.push({ type: "start_run", queueKey, turn: next });
+    actions.push({ type: "report_cli_state", queueKey, turnId: next.turnId, cliState: "running" });
+  }
+  return actions;
+}
+function applyStaleRunningNormalization(turns, isLiveRun) {
+  return normalizeStaleRunning(turns, isLiveRun);
+}
+
+// ../bridge/src/prompt-queue/runner/execute-actions.ts
+init_yield_to_event_loop();
 
-// ../bridge/src/prompt-turn-queue/runner/dispatch-local-prompt.ts
+// ../bridge/src/prompt-queue/runner/client-report.ts
+function sendPromptQueueClientReport(ws, queues) {
+  if (!ws) return false;
+  const wireQueues = {};
+  for (const [queueKey, rows] of Object.entries(queues)) {
+    wireQueues[queueKey] = rows.map((r) => ({ turnId: r.turnId, clientState: r.cliState }));
+  }
+  sendWsMessage(ws, { type: "prompt_queue_client_report", queues: wireQueues });
+  return true;
+}
+
+// ../bridge/src/prompt-queue/runner/dispatch-local-prompt.ts
 function dispatchLocalPrompt(next, deps) {
   const pl = next.payload;
   const rawParent = pl["sessionParent"];
@@ -50830,20 +50707,17 @@ function dispatchLocalPrompt(next, deps) {
   handleBridgePrompt(msg, deps);
 }
 
-// ../bridge/src/prompt-turn-queue/runner/run-id-queue-key-map.ts
+// ../bridge/src/prompt-queue/runner/run-id-queue-key-map.ts
 var runIdToQueueKey = /* @__PURE__ */ new Map();
-var locallyDispatchedRunIds = /* @__PURE__ */ new Set();
 function getRunIdQueueKey(runId) {
   return runIdToQueueKey.get(runId);
 }
 function setRunIdQueueKey(runId, queueKey) {
   runIdToQueueKey.set(runId, queueKey);
-  locallyDispatchedRunIds.add(runId);
 }
 function deleteRunIdQueueKey(runId) {
   const queueKey = runIdToQueueKey.get(runId);
   runIdToQueueKey.delete(runId);
-  locallyDispatchedRunIds.delete(runId);
   return queueKey;
 }
 function syncRunningTurnQueueKeys(turns, queueKey) {
@@ -50852,33 +50726,7 @@ function syncRunningTurnQueueKeys(turns, queueKey) {
   }
 }
 
-// ../bridge/src/prompt-turn-queue/runner/dispatch-started-prompt-queue-runs.ts
-async function dispatchStartedPromptQueueRuns(entries, started, deps) {
-  for (const [queueKey] of entries) {
-    const file2 = await readPersistedQueue(queueKey);
-    const running2 = file2?.turns.find((turn) => turn.lastCliState === "running");
-    if (running2 && started.has(running2.turnId) && getRunIdQueueKey(running2.turnId) === queueKey) {
-      dispatchLocalPrompt(running2, deps);
-    }
-    await yieldToEventLoop();
-  }
-}
-
-// ../bridge/src/prompt-turn-queue/runner/handle-prompt-queue-cancellations.ts
-init_yield_to_event_loop();
-
-// ../bridge/src/prompt-turn-queue/client-report.ts
-function sendPromptQueueClientReport(ws, queues) {
-  if (!ws) return false;
-  const wireQueues = {};
-  for (const [queueKey, rows] of Object.entries(queues)) {
-    wireQueues[queueKey] = rows.map((r) => ({ turnId: r.turnId, clientState: r.cliState }));
-  }
-  sendWsMessage(ws, { type: "prompt_queue_client_report", queues: wireQueues });
-  return true;
-}
-
-// ../bridge/src/prompt-turn-queue/runner/finalize-prompt-turn-on-bridge.ts
+// ../bridge/src/prompt-queue/runner/finalize-prompt-turn-on-bridge.ts
 async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
   if (!runId) return false;
   const queueKey = deleteRunIdQueueKey(runId);
@@ -50893,79 +50741,19 @@ async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
   return true;
 }
 
-// ../bridge/src/prompt-turn-queue/runner/handle-prompt-queue-cancellations.ts
-async function handlePromptQueueCancellations(entries, deps) {
-  for (const [queueKey] of entries) {
-    const file2 = await readPersistedQueue(queueKey);
-    const turn = file2?.turns.find((row) => row.bridgeServerState === "cancel_requested" && row.lastCliState === "running");
-    if (!turn || getRunIdQueueKey(turn.turnId) !== queueKey) {
-      await yieldToEventLoop();
-      continue;
-    }
-    deps.log(`[Queue] Cancellation request received for turn ${turn.turnId.slice(0, 8)}\u2026`);
-    if (await deps.acpManager.cancelRun(turn.turnId)) {
-      await yieldToEventLoop();
-      continue;
-    }
-    deps.log(`[Queue] No local ACP run remains for ${turn.turnId.slice(0, 8)}\u2026; reconciling cancelled turn.`);
-    await finalizePromptTurnOnBridge(deps.getWs, turn.turnId, false, { terminalCliState: "cancelled" });
-    await yieldToEventLoop();
-  }
-}
-
-// ../bridge/src/prompt-turn-queue/runner/persist-prompt-queue-snapshot.ts
-init_yield_to_event_loop();
-async function persistPromptQueueSnapshot(entries) {
-  for (const [queueKey, serverTurns] of entries) {
-    const file2 = await mergeBridgeServerQueueSnapshot(queueKey, serverTurns);
-    await writePersistedQueue(file2);
-    await yieldToEventLoop();
-  }
-  for (const [queueKey] of entries) {
-    const file2 = await readPersistedQueue(queueKey);
-    if (file2) syncRunningTurnQueueKeys(file2.turns, queueKey);
-    await yieldToEventLoop();
-  }
-}
-
-// ../bridge/src/prompt-turn-queue/runner/prompt-queue-snapshot-types.ts
-function promptQueueSnapshotEntries(queues) {
-  return Object.entries(queues).filter((entry) => Array.isArray(entry[1]));
-}
-
-// ../bridge/src/prompt-turn-queue/runner/start-prompt-queue-runs.ts
-init_yield_to_event_loop();
-
-// ../bridge/src/prompt-turn-queue/runner/queue-selection.ts
-function pickNextRunnableTurn(turns) {
-  for (const t of turns) {
-    if (t.bridgeServerState === "discarded" || t.bridgeServerState === "stopping") continue;
-    if (t.bridgeServerState === "cancel_requested") continue;
-    if (!isRunnableBridgePromptTurnServerState(t.bridgeServerState)) continue;
-    if (t.lastCliState === "running" || t.lastCliState === "stopped" || t.lastCliState === "failed" || t.lastCliState === "cancelled") {
-      continue;
-    }
-    return t;
-  }
-  return null;
-}
-function hasRunningTurn(turns) {
-  return turns.some((t) => t.lastCliState === "running");
-}
-
-// ../bridge/src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
-import fs54 from "node:fs";
+// ../bridge/src/prompt-queue/runner/run-local-revert-before-queued-prompt.ts
+import fs53 from "node:fs";
 
 // ../bridge/src/git/snapshot/capture.ts
-import * as fs53 from "node:fs";
-import * as path78 from "node:path";
+import * as fs52 from "node:fs";
+import * as path76 from "node:path";
 
 // ../bridge/src/git/snapshot/apply-pre-turn-snapshot.ts
-import * as fs52 from "node:fs";
+import * as fs51 from "node:fs";
 async function applyPreTurnSnapshot(filePath, log2) {
   let data;
   try {
-    data = JSON.parse(fs52.readFileSync(filePath, "utf8"));
+    data = JSON.parse(fs51.readFileSync(filePath, "utf8"));
   } catch (error51) {
     return { ok: false, error: error51 instanceof Error ? error51.message : String(error51) };
   }
@@ -50994,18 +50782,18 @@ async function applyPreTurnSnapshot(filePath, log2) {
 }
 
 // ../bridge/src/git/snapshot/resolve-repo-roots.ts
-import * as path77 from "node:path";
+import * as path75 from "node:path";
 async function resolveSnapshotRepoRoots(options) {
   const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
   if (worktreePaths?.length) {
-    const paths = [...new Set(worktreePaths.map((p) => path77.resolve(p)))];
+    const paths = [...new Set(worktreePaths.map((p) => path75.resolve(p)))];
     return (await Promise.all(paths.map(async (p) => await isGitRepoDirectory(p) ? p : null))).filter((p) => p != null);
   }
   try {
     const roots = (await discoverGitReposUnderRoot(fallbackCwd)).map((repo) => repo.absolutePath);
     const sid = sessionId?.trim();
     if (!sid) return roots;
-    const sessionRoots = roots.filter((root) => path77.basename(root) === sid);
+    const sessionRoots = roots.filter((root) => path75.basename(root) === sid);
     return sessionRoots.length > 0 ? sessionRoots : roots;
   } catch (error51) {
     log2(`[snapshot] Discover repositories failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
@@ -51027,7 +50815,7 @@ async function capturePreTurnSnapshot(options) {
   });
   const dir = snapshotsDirForCwd(agentCwd);
   try {
-    fs53.mkdirSync(dir, { recursive: true });
+    fs52.mkdirSync(dir, { recursive: true });
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -51036,9 +50824,9 @@ async function capturePreTurnSnapshot(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     repos
   };
-  const filePath = path78.join(dir, `${runId}.json`);
+  const filePath = path76.join(dir, `${runId}.json`);
   try {
-    fs53.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
+    fs52.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
   } catch (e) {
     return { ok: false, error: e instanceof Error ? e.message : String(e) };
   }
@@ -51049,7 +50837,7 @@ async function capturePreTurnSnapshot(options) {
   return { ok: true, filePath, repos };
 }
 
-// ../bridge/src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
+// ../bridge/src/prompt-queue/runner/run-local-revert-before-queued-prompt.ts
 async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   if (next.bridgeServerState !== "requeued_with_revert") return true;
   const sid = next.sessionId;
@@ -51058,7 +50846,7 @@ async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   const agentBase = deps.sessionWorktreeManager.getSessionWorktreeRootForSession(sid) ?? getBridgeRoot();
   const file2 = snapshotFilePath(agentBase, tid);
   try {
-    await fs54.promises.access(file2, fs54.constants.F_OK);
+    await fs53.promises.access(file2, fs53.constants.F_OK);
   } catch {
     deps.log(
       `[Queue] requeued_with_revert: no pre-turn snapshot for ${tid.slice(0, 8)}\u2026; continuing without revert.`
@@ -51072,49 +50860,120 @@ async function runLocalRevertBeforeQueuedPrompt(next, deps) {
   return res.ok;
 }
 
-// ../bridge/src/prompt-turn-queue/runner/start-prompt-queue-runs.ts
-async function startPromptQueueRuns(entries, deps) {
-  const report = {};
+// ../bridge/src/prompt-queue/runner/execute-actions.ts
+async function executePromptQueueActions(actions, deps) {
   const started = /* @__PURE__ */ new Set();
-  for (const [queueKey] of entries) {
-    const file2 = await readPersistedQueue(queueKey);
-    if (!file2 || hasRunningTurn(file2.turns)) continue;
-    const next = pickNextRunnableTurn(file2.turns);
-    if (!next) continue;
-    if (!await runLocalRevertBeforeQueuedPrompt(next, deps)) {
-      next.lastCliState = "failed";
-      await writePersistedQueue(file2);
-      sendPromptQueueClientReport(deps.getWs(), { [queueKey]: [{ turnId: next.turnId, cliState: "failed" }] });
+  const report = {};
+  for (const action of actions) {
+    if (action.type === "cancel_run") {
+      if (getRunIdQueueKey(action.turnId) !== action.queueKey) continue;
+      deps.log(`[Queue] Cancellation request received for turn ${action.turnId.slice(0, 8)}\u2026`);
+      if (await deps.acpManager.cancelRun(action.turnId)) continue;
+      deps.log(`[Queue] No local ACP run remains for ${action.turnId.slice(0, 8)}\u2026; reconciling cancelled turn.`);
+      await finalizePromptTurnOnBridge(deps.getWs, action.turnId, false, { terminalCliState: "cancelled" });
       continue;
     }
-    next.lastCliState = "running";
-    await writePersistedQueue(file2);
-    setRunIdQueueKey(next.turnId, queueKey);
-    started.add(next.turnId);
-    report[queueKey] = [{ turnId: next.turnId, cliState: "running" }];
+    if (action.type === "finalize_stale") {
+      await applyCliState(action.queueKey, action.turnId, action.cliState);
+      deleteRunIdQueueKey(action.turnId);
+      report[action.queueKey] = [{ turnId: action.turnId, cliState: action.cliState }];
+      continue;
+    }
+    if (action.type === "start_run") {
+      const ok = await markTurnRunning(action.queueKey, action.turn, deps);
+      if (!ok) {
+        report[action.queueKey] = [{ turnId: action.turn.turnId, cliState: "failed" }];
+        continue;
+      }
+      started.add(action.turn.turnId);
+      report[action.queueKey] = [{ turnId: action.turn.turnId, cliState: "running" }];
+    }
     await yieldToEventLoop();
   }
   if (Object.keys(report).length) sendPromptQueueClientReport(deps.getWs(), report);
+  for (const runId of started) {
+    const queueKey = getRunIdQueueKey(runId);
+    if (!queueKey) continue;
+    const file2 = await readPersistedQueue(queueKey);
+    const turn = file2?.turns.find((t) => t.turnId === runId);
+    if (turn) dispatchLocalPrompt(turn, deps);
+    await yieldToEventLoop();
+  }
   return started;
 }
+async function markTurnRunning(queueKey, turn, deps) {
+  const file2 = await readPersistedQueue(queueKey);
+  if (!file2) return false;
+  const row = file2.turns.find((t) => t.turnId === turn.turnId);
+  if (!row) return false;
+  if (!await runLocalRevertBeforeQueuedPrompt(row, deps)) {
+    row.lastCliState = "failed";
+    await writePersistedQueue(file2);
+    return false;
+  }
+  row.lastCliState = "running";
+  await writePersistedQueue(file2);
+  setRunIdQueueKey(row.turnId, queueKey);
+  return true;
+}
+async function applyCliState(queueKey, turnId, cliState) {
+  const file2 = await readPersistedQueue(queueKey);
+  if (!file2) return;
+  const turn = file2.turns.find((t) => t.turnId === turnId);
+  if (!turn) return;
+  turn.lastCliState = cliState;
+  await writePersistedQueue(file2);
+}
 
-// ../bridge/src/prompt-turn-queue/runner/apply-prompt-queue-state-from-server.ts
+// ../bridge/src/prompt-queue/runner/apply-prompt-queue-state-from-server.ts
 var SLOW_QUEUE_SYNC_MS = 2e3;
+async function persistAndReconcileQueue(queueKey, serverTurns, deps) {
+  const prev = await readPersistedQueue(queueKey);
+  const merged = mergeServerSnapshotWithLocal(queueKey, serverTurns, prev);
+  const liveCheck = (runId) => deps.acpManager.isRegisteredRun(runId);
+  const actions = reconcileQueueActions(queueKey, merged.turns, liveCheck);
+  merged.turns = applyStaleRunningNormalization(merged.turns, liveCheck);
+  await writePersistedQueue(merged);
+  syncRunningTurnQueueKeys(merged.turns, queueKey);
+  return actions;
+}
 async function applyPromptQueueStateFromServer(msg, deps) {
   const raw = msg.queues;
   if (!raw || typeof raw !== "object") return;
   const startedAt = Date.now();
   const entries = promptQueueSnapshotEntries(raw);
-  await persistPromptQueueSnapshot(entries);
-  await handlePromptQueueCancellations(entries, deps);
-  const started = await startPromptQueueRuns(entries, deps);
-  await dispatchStartedPromptQueueRuns(entries, started, deps);
+  const allActions = [];
+  for (const [queueKey, serverTurns] of entries) {
+    allActions.push(...await persistAndReconcileQueue(queueKey, serverTurns, deps));
+    await yieldToEventLoop();
+  }
+  await executePromptQueueActions(allActions, deps);
   const durationMs = Date.now() - startedAt;
   if (durationMs >= SLOW_QUEUE_SYNC_MS) {
     deps.log(`[Queue] Queue state sync and dispatch took ${durationMs}ms.`);
   }
 }
 
+// ../bridge/src/prompt-queue/runner/serial-prompt-queue-work.ts
+var running = false;
+var latestWork = null;
+async function drain() {
+  while (latestWork) {
+    const work = latestWork;
+    latestWork = null;
+    await work();
+  }
+}
+function enqueueLatestPromptQueueStateWork(work) {
+  latestWork = work;
+  if (running) return;
+  running = true;
+  void drain().finally(() => {
+    running = false;
+    if (latestWork) enqueueLatestPromptQueueStateWork(latestWork);
+  });
+}
+
 // ../bridge/src/agents/acp/from-bridge/pending-prompt-results.ts
 var pending = [];
 function enqueuePendingPromptResult(message) {
@@ -51434,26 +51293,6 @@ var handlePromptMessage = (msg, deps) => {
   handleBridgePrompt(msg, deps);
 };
 
-// ../bridge/src/prompt-turn-queue/runner/serial-prompt-queue-work.ts
-var running = false;
-var latestWork = null;
-async function drain() {
-  while (latestWork) {
-    const work = latestWork;
-    latestWork = null;
-    await work();
-  }
-}
-function enqueueLatestPromptQueueStateWork(work) {
-  latestWork = work;
-  if (running) return;
-  running = true;
-  void drain().finally(() => {
-    running = false;
-    if (latestWork) enqueueLatestPromptQueueStateWork(latestWork);
-  });
-}
-
 // ../bridge/src/connection/routing/handlers/prompt-queue-state.ts
 var handlePromptQueueStateMessage = (msg, deps) => {
   enqueueLatestPromptQueueStateWork(async () => {
@@ -51716,7 +51555,7 @@ var handleSessionDiscardedMessage = (msg, deps) => {
 };
 
 // ../bridge/src/connection/routing/handlers/revert-turn-snapshot.ts
-import * as fs55 from "node:fs";
+import * as fs54 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -51729,7 +51568,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
     const file2 = snapshotFilePath(agentBase, turnId);
     try {
-      await fs55.promises.access(file2, fs55.constants.F_OK);
+      await fs54.promises.access(file2, fs54.constants.F_OK);
     } catch {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
@@ -51843,13 +51682,13 @@ function handleFileBrowserRequest(msg, socket, e2ee, sessionWorktreeManager) {
 
 // ../bridge/src/files/handle-file-browser-search.ts
 init_yield_to_event_loop();
-import path79 from "node:path";
+import path77 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 = path79.resolve(
+    const sessionParentPath = path77.resolve(
       sessionWorktreeManager != null ? await resolveFileBrowserSessionParent(sessionWorktreeManager, msg.sessionId) : getBridgeRoot()
     );
     if (!await bridgeFileIndexIsPopulated(sessionParentPath)) {
@@ -51947,7 +51786,7 @@ function handleFileBrowserCodeNavMessage(msg, { getWs, e2ee, sessionWorktreeMana
 }
 
 // ../bridge/src/git/bridge-git-context.ts
-import * as path80 from "node:path";
+import * as path78 from "node:path";
 init_yield_to_event_loop();
 
 // ../bridge/src/git/branches/get-current-branch.ts
@@ -52015,12 +51854,12 @@ function listPendingCheckouts() {
 // ../bridge/src/git/bridge-git-context.ts
 function folderNameForRelPath(relPath, bridgeRoot) {
   if (relPath === "." || relPath === "") {
-    return path80.basename(path80.resolve(bridgeRoot)) || "repo";
+    return path78.basename(path78.resolve(bridgeRoot)) || "repo";
   }
-  return path80.basename(relPath) || relPath;
+  return path78.basename(relPath) || relPath;
 }
 async function discoverGitReposForBridgeContext(bridgeRoot) {
-  const root = path80.resolve(bridgeRoot);
+  const root = path78.resolve(bridgeRoot);
   if (await isGitRepoDirectory(root)) {
     const remoteUrl = await getRemoteOriginUrl(root);
     return [{ absolutePath: root, remoteUrl }];
@@ -52028,19 +51867,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(path80.resolve(repo.absolutePath), repo);
+    byPath.set(path78.resolve(repo.absolutePath), repo);
   }
   return [...byPath.values()];
 }
 async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path80.resolve(bridgeRoot);
+  const bridgeResolved = path78.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 = path80.relative(bridgeResolved, repo.absolutePath);
-    if (rel.startsWith("..") || path80.isAbsolute(rel)) continue;
+    let rel = path78.relative(bridgeResolved, repo.absolutePath);
+    if (rel.startsWith("..") || path78.isAbsolute(rel)) continue;
     const relPath = rel === "" ? "." : rel.replace(/\\/g, "/");
     const currentBranch = await getCurrentBranch(repo.absolutePath);
     const remoteUrl = repo.remoteUrl.trim() || null;
@@ -52071,11 +51910,11 @@ async function getBridgeGitContext(bridgeRoot = getBridgeRoot()) {
   return rows;
 }
 async function listRepoBranchesForBridge(repoRelPath, bridgeRoot = getBridgeRoot()) {
-  const bridgeResolved = path80.resolve(bridgeRoot);
+  const bridgeResolved = path78.resolve(bridgeRoot);
   const rel = repoRelPath.trim() === "." ? "" : repoRelPath.trim().replace(/\\/g, "/");
-  const repoPath = rel === "" ? bridgeResolved : path80.join(bridgeResolved, rel);
-  const resolved = path80.resolve(repoPath);
-  if (!resolved.startsWith(bridgeResolved + path80.sep) && resolved !== bridgeResolved) {
+  const repoPath = rel === "" ? bridgeResolved : path78.join(bridgeResolved, rel);
+  const resolved = path78.resolve(repoPath);
+  if (!resolved.startsWith(bridgeResolved + path78.sep) && resolved !== bridgeResolved) {
     return [];
   }
   return listRepoBranchRefs(resolved);
@@ -52125,8 +51964,8 @@ function handleListRepoBranchesRequestMessage(msg, getWs) {
 }
 
 // ../bridge/src/git/checkout/bridge-git-checkout.ts
-import * as fs57 from "node:fs/promises";
-import * as path82 from "node:path";
+import * as fs56 from "node:fs/promises";
+import * as path80 from "node:path";
 
 // ../bridge/src/git/checkout/normalize-clone-url.ts
 function normalizeCloneUrl(url2) {
@@ -52146,12 +51985,12 @@ function cloneUrlWithHttpsAuth(url2, auth) {
 }
 
 // ../bridge/src/git/checkout/resolve-checkout-target.ts
-import * as fs56 from "node:fs/promises";
-import * as path81 from "node:path";
+import * as fs55 from "node:fs/promises";
+import * as path79 from "node:path";
 var FOLDER_NAME_RE = /^[A-Za-z0-9._-]+$/;
 async function pathExists(p) {
   try {
-    await fs56.access(p);
+    await fs55.access(p);
     return true;
   } catch {
     return false;
@@ -52163,7 +52002,7 @@ async function resolveCheckoutTarget(opts) {
     if (await isGitRepoDirectory(bridgeRoot)) {
       throw new Error("Bridge root is already a git repository");
     }
-    const entries = await fs56.readdir(bridgeRoot).catch(() => []);
+    const entries = await fs55.readdir(bridgeRoot).catch(() => []);
     if (entries.length > 0) {
       throw new Error("Bridge root must be empty to initialize a monorepo checkout");
     }
@@ -52176,8 +52015,8 @@ async function resolveCheckoutTarget(opts) {
   if (await isGitRepoDirectory(bridgeRoot)) {
     throw new Error("Cannot add a nested repo while the bridge root is itself a git repository");
   }
-  const targetDir = path81.resolve(bridgeRoot, folder);
-  if (!targetDir.startsWith(bridgeRoot + path81.sep)) {
+  const targetDir = path79.resolve(bridgeRoot, folder);
+  if (!targetDir.startsWith(bridgeRoot + path79.sep)) {
     throw new Error("Invalid folderName");
   }
   if (await pathExists(targetDir)) {
@@ -52196,10 +52035,10 @@ async function bridgeGitCheckout(params) {
   });
   const folderName = relPath === "." ? "repo" : relPath;
   beginPendingCheckout({ relPath, folderName, remoteUrl: cloneUrl });
-  const parent = path82.dirname(targetDir);
-  await fs57.mkdir(parent, { recursive: true });
+  const parent = path80.dirname(targetDir);
+  await fs56.mkdir(parent, { recursive: true });
   if (relPath !== ".") {
-    await fs57.mkdir(targetDir, { recursive: true });
+    await fs56.mkdir(targetDir, { recursive: true });
   }
   const url2 = cloneUrlWithHttpsAuth(cloneUrl, params.auth ?? null);
   try {
@@ -52210,7 +52049,7 @@ async function bridgeGitCheckout(params) {
     return { relPath, folderName };
   } catch (e) {
     if (relPath !== ".") {
-      await fs57.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
+      await fs56.rm(targetDir, { recursive: true, force: true }).catch(() => void 0);
     }
     const msg = e instanceof Error ? e.message : String(e);
     throw new Error(
@@ -52392,6 +52231,7 @@ function createMainBridgeCloseHandler(params, connect) {
   const { state, logFn, bridgeHeartbeat } = params;
   return (code, reason, closedWs) => {
     if (state.currentWs !== closedWs) return;
+    cancelInFlightAgentCapabilityWarmup();
     bridgeHeartbeat?.stop();
     try {
       state.currentWs = null;
@@ -52519,20 +52359,8 @@ function createMainBridgeWebSocketLifecycle(params) {
       }
     }
     bridgeHeartbeat?.stop();
-    const prev = state.currentWs;
-    if (prev) {
-      prev.removeAllListeners();
-      prev.once("error", () => {
-      });
-      prev.once("close", () => {
-        prev.removeAllListeners();
-      });
-      try {
-        prev.close();
-      } catch {
-      }
-      state.currentWs = null;
-    }
+    disposePreviousBridgeSocket(state.currentWs);
+    state.currentWs = null;
     try {
       const url2 = plugin.transport.resolveControlPlaneUrl({
         workspaceId,
@@ -52862,30 +52690,30 @@ function startStreamingProxy(ws, log2, pr) {
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 import process8 from "node:process";
 import { Buffer as Buffer3 } from "node:buffer";
-import path83 from "node:path";
+import path81 from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 import { promisify as promisify8 } from "node:util";
 import childProcess from "node:child_process";
-import fs62, { constants as fsConstants2 } from "node:fs/promises";
+import fs61, { constants as fsConstants2 } from "node:fs/promises";
 
 // ../../node_modules/.pnpm/wsl-utils@0.1.0/node_modules/wsl-utils/index.js
 import process4 from "node:process";
-import fs61, { constants as fsConstants } from "node:fs/promises";
+import fs60, { constants as fsConstants } from "node:fs/promises";
 
 // ../../node_modules/.pnpm/is-wsl@3.1.1/node_modules/is-wsl/index.js
 import process3 from "node:process";
-import os9 from "node:os";
-import fs60 from "node:fs";
+import os8 from "node:os";
+import fs59 from "node:fs";
 
 // ../../node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
-import fs59 from "node:fs";
+import fs58 from "node:fs";
 
 // ../../node_modules/.pnpm/is-docker@3.0.0/node_modules/is-docker/index.js
-import fs58 from "node:fs";
+import fs57 from "node:fs";
 var isDockerCached;
 function hasDockerEnv() {
   try {
-    fs58.statSync("/.dockerenv");
+    fs57.statSync("/.dockerenv");
     return true;
   } catch {
     return false;
@@ -52893,7 +52721,7 @@ function hasDockerEnv() {
 }
 function hasDockerCGroup() {
   try {
-    return fs58.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
+    return fs57.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
   } catch {
     return false;
   }
@@ -52909,7 +52737,7 @@ function isDocker() {
 var cachedResult;
 var hasContainerEnv = () => {
   try {
-    fs59.statSync("/run/.containerenv");
+    fs58.statSync("/run/.containerenv");
     return true;
   } catch {
     return false;
@@ -52927,19 +52755,19 @@ var isWsl = () => {
   if (process3.platform !== "linux") {
     return false;
   }
-  if (os9.release().toLowerCase().includes("microsoft")) {
+  if (os8.release().toLowerCase().includes("microsoft")) {
     if (isInsideContainer()) {
       return false;
     }
     return true;
   }
   try {
-    if (fs60.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
+    if (fs59.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
       return !isInsideContainer();
     }
   } catch {
   }
-  if (fs60.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs60.existsSync("/run/WSL")) {
+  if (fs59.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs59.existsSync("/run/WSL")) {
     return !isInsideContainer();
   }
   return false;
@@ -52957,14 +52785,14 @@ var wslDrivesMountPoint = /* @__PURE__ */ (() => {
     const configFilePath2 = "/etc/wsl.conf";
     let isConfigFileExists = false;
     try {
-      await fs61.access(configFilePath2, fsConstants.F_OK);
+      await fs60.access(configFilePath2, fsConstants.F_OK);
       isConfigFileExists = true;
     } catch {
     }
     if (!isConfigFileExists) {
       return defaultMountPoint;
     }
-    const configContent = await fs61.readFile(configFilePath2, { encoding: "utf8" });
+    const configContent = await fs60.readFile(configFilePath2, { encoding: "utf8" });
     const configMountPoint = /(?<!#.*)root\s*=\s*(?<mountPoint>.*)/g.exec(configContent);
     if (!configMountPoint) {
       return defaultMountPoint;
@@ -53029,7 +52857,7 @@ async function defaultBrowserId() {
 // ../../node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js
 import process6 from "node:process";
 import { promisify as promisify5 } from "node:util";
-import { execFile as execFile4, execFileSync as execFileSync3 } from "node:child_process";
+import { execFile as execFile4, execFileSync as execFileSync2 } from "node:child_process";
 var execFileAsync4 = promisify5(execFile4);
 async function runAppleScript(script, { humanReadableOutput = true, signal } = {}) {
   if (process6.platform !== "darwin") {
@@ -53118,8 +52946,8 @@ async function defaultBrowser2() {
 
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 var execFile7 = promisify8(childProcess.execFile);
-var __dirname = path83.dirname(fileURLToPath7(import.meta.url));
-var localXdgOpenPath = path83.join(__dirname, "xdg-open");
+var __dirname = path81.dirname(fileURLToPath7(import.meta.url));
+var localXdgOpenPath = path81.join(__dirname, "xdg-open");
 var { platform, arch } = process8;
 async function getWindowsDefaultBrowserFromWsl() {
   const powershellPath = await powerShellPath();
@@ -53269,7 +53097,7 @@ var baseOpen = async (options) => {
       const isBundled = !__dirname || __dirname === "/";
       let exeLocalXdgOpen = false;
       try {
-        await fs62.access(localXdgOpenPath, fsConstants2.X_OK);
+        await fs61.access(localXdgOpenPath, fsConstants2.X_OK);
         exeLocalXdgOpen = true;
       } catch {
       }
@@ -53516,7 +53344,7 @@ function createPendingAuthOnMessage(params) {
 }
 
 // src/cli-version.ts
-var CLI_VERSION2 = "0.1.93".length > 0 ? "0.1.93" : "0.0.0-dev";
+var CLI_VERSION2 = "0.1.95".length > 0 ? "0.1.95" : "0.0.0-dev";
 
 // src/auth/pending/pending-auth-on-open.ts
 function createPendingAuthOnOpen(params) {
@@ -53627,12 +53455,12 @@ async function refreshBridgeTokens(params) {
 }
 
 // src/config.ts
-import fs63 from "node:fs";
-import path84 from "node:path";
-import os10 from "node:os";
+import fs62 from "node:fs";
+import path82 from "node:path";
+import os9 from "node:os";
 function getConfigPath() {
-  const dir = path84.join(os10.homedir(), ".buildautomaton");
-  return path84.join(dir, "config.json");
+  const dir = path82.join(os9.homedir(), ".buildautomaton");
+  return path82.join(dir, "config.json");
 }
 function normalizeApiUrl(url2) {
   return url2.replace(/\/$/, "");
@@ -53640,7 +53468,7 @@ function normalizeApiUrl(url2) {
 function readRawConfig() {
   try {
     const p = getConfigPath();
-    const raw = fs63.readFileSync(p, "utf8");
+    const raw = fs62.readFileSync(p, "utf8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -53648,14 +53476,14 @@ function readRawConfig() {
 }
 function writeConfigForApi(apiUrl, auth) {
   const p = getConfigPath();
-  const dir = path84.dirname(p);
+  const dir = path82.dirname(p);
   const key = normalizeApiUrl(apiUrl);
   const prev = readRawConfig() ?? {};
   const servers = { ...prev.servers ?? {}, [key]: { ...auth } };
   const next = { ...prev, servers };
   try {
-    if (!fs63.existsSync(dir)) fs63.mkdirSync(dir, { recursive: true });
-    fs63.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
+    if (!fs62.existsSync(dir)) fs62.mkdirSync(dir, { recursive: true });
+    fs62.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
   } catch (e) {
     console.error("Could not save authentication config:", e);
   }
@@ -53664,22 +53492,22 @@ function clearConfigForApi(apiUrl) {
   const key = normalizeApiUrl(apiUrl);
   try {
     const p = getConfigPath();
-    if (!fs63.existsSync(p)) return;
+    if (!fs62.existsSync(p)) return;
     const prev = readRawConfig();
     if (!prev) return;
     const servers = { ...prev.servers ?? {} };
     delete servers[key];
     const next = { ...prev, servers };
     if (Object.keys(servers).length === 0 && !prev.workspaceId) {
-      fs63.unlinkSync(p);
+      fs62.unlinkSync(p);
       return;
     }
     if (Object.keys(servers).length === 0 && prev.workspaceId && prev.apiUrl && normalizeApiUrl(prev.apiUrl) === key) {
       const { workspaceId: _w, token: _t, refreshToken: _r, apiUrl: _a4, ...rest } = prev;
-      fs63.writeFileSync(p, JSON.stringify(rest, null, 2), "utf8");
+      fs62.writeFileSync(p, JSON.stringify(rest, null, 2), "utf8");
       return;
     }
-    fs63.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
+    fs62.writeFileSync(p, JSON.stringify(next, null, 2), "utf8");
   } catch {
   }
 }
@@ -54252,34 +54080,10 @@ function enrichIntegrationContentPromptForAgent(params) {
   return injectIntegrationContentAgentPromptNote(params.agentPromptText, params.sessionId);
 }
 
-// src/agents/planning/enrich-planning-session-prompt-for-agent.ts
-async function enrichPlanningSessionPromptForAgent(params) {
-  const meta3 = await fetchCloudSessionMeta({
-    sessionId: params.sessionId,
-    cloudApiBaseUrl: params.cloudApiBaseUrl,
-    getCloudAccessToken: params.getCloudAccessToken
-  });
-  if (!meta3.ok) return { promptText: params.promptText, isPlanningSession: false };
-  const sessionKind = parseSessionKind(meta3.data.sessionKind);
-  if (sessionKind !== "planning") return { promptText: params.promptText, isPlanningSession: false };
-  const todos = Array.isArray(meta3.data.planningTodos) ? meta3.data.planningTodos : [];
-  if (params.isNewSession || todos.length === 0) {
-    return {
-      promptText: buildPlanningSessionAgentPrompt(params.promptText),
-      isPlanningSession: true
-    };
-  }
-  return {
-    promptText: buildPlanningSessionFollowUpAgentPrompt(params.promptText, todos),
-    isPlanningSession: true
-  };
-}
-
 // src/plugin/prepare-ba-agent-prompt.ts
 async function prepareBuildAutomatonAgentPrompt(params) {
-  const { promptText, sessionId, runId, isNewSession, cloudApiBaseUrl, getCloudAccessToken } = params;
+  const { promptText, sessionId, cloudApiBaseUrl, getCloudAccessToken } = params;
   let agentPromptText = promptText;
-  let isPlanningSession = false;
   if (sessionId) {
     agentPromptText = await enrichForkedSessionPromptForAgent({
       sessionId,
@@ -54287,88 +54091,15 @@ async function prepareBuildAutomatonAgentPrompt(params) {
       cloudApiBaseUrl,
       getCloudAccessToken
     });
-    const planningEnriched = await enrichPlanningSessionPromptForAgent({
-      sessionId,
-      promptText: agentPromptText,
-      isNewSession,
-      cloudApiBaseUrl,
-      getCloudAccessToken
-    });
-    agentPromptText = planningEnriched.promptText;
-    isPlanningSession = planningEnriched.isPlanningSession;
-  }
-  if (sessionId) {
     agentPromptText = enrichIntegrationContentPromptForAgent({
       sessionId,
       originalPromptText: promptText,
       agentPromptText
     });
   }
-  return { agentPromptText, isPlanningSession };
-}
-
-// src/agents/planning/submit-planning-todos-for-turn.ts
-var PLANNING_TODO_SUBMIT_TIMEOUT_MS = 3e3;
-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`;
-  let res;
-  try {
-    res = await fetch(url2, {
-      method: "POST",
-      signal: AbortSignal.timeout(PLANNING_TODO_SUBMIT_TIMEOUT_MS),
-      headers: {
-        Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        sessionId: params.sessionId,
-        turnId: params.turnId,
-        items: params.items
-      })
-    });
-  } catch (error51) {
-    return { ok: false, error: error51 instanceof Error ? error51.message : String(error51) };
-  }
-  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/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 };
-  }
-  if (!cloudApiBaseUrl || !getCloudAccessToken) {
-    return { submitted: false, suppressOutput: false };
-  }
-  const items = parsePlanningTodoAgentJson(outputStr);
-  if (items.length === 0) {
-    return { submitted: false, suppressOutput: false };
-  }
-  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 };
+  void params.runId;
+  void params.isNewSession;
+  return { agentPromptText, isPlanningSession: false };
 }
 
 // src/e2e-certificates/open-import-url.ts
@@ -54727,11 +54458,6 @@ function createBuildAutomatonPlugin(options) {
         cloudApiBaseUrl: apiUrl,
         getCloudAccessToken: getAccessToken
       }),
-      maybeSubmitPlanningTodos: (params) => maybeSubmitPlanningTodosAfterAgentSuccess({
-        ...params,
-        cloudApiBaseUrl: apiUrl,
-        getCloudAccessToken: getAccessToken
-      }),
       persistTokens: (tokens) => writeConfigForApi(apiUrl, {
         workspaceId: tokens.workspaceId,
         token: tokens.token,