@sideboard-ai/core 0.1.116 → 0.1.120

package/dist/index.cjs

@@ -1955,6 +1955,7 @@ __export(thread_store_exports, {
   createEmptyThread: () => createEmptyThread,
   deleteThreadRecord: () => deleteThreadRecord,
   findThreadByRef: () => findThreadByRef,
+  isThreadRecordFile: () => isThreadRecordFile,
   listThreads: () => listThreads,
   normalizeThread: () => normalizeThread,
   readThread: () => readThread,
@@ -2065,7 +2066,8 @@ function writeThread(thread) {
 function idPath(id) {
   return id;
 }
-function isThreadRecordFile(name) {
+function isThreadRecordFile(nameOrPath) {
+  const name = (0, import_node_path10.basename)(nameOrPath);
   return name.endsWith(".json") && !name.endsWith(".live.json");
 }
 function listThreads(opts) {
@@ -2116,12 +2118,13 @@ function findThreadByRef(ref) {
     (t) => t.id === ref || t.id.startsWith(ref) || t.branchName === ref || t.title === ref
   ) ?? null;
 }
-var import_node_crypto3, import_node_fs9, import_proper_lockfile;
+var import_node_crypto3, import_node_fs9, import_node_path10, import_proper_lockfile;
 var init_thread_store = __esm({
   "src/store/thread-store.ts"() {
     "use strict";
     import_node_crypto3 = require("crypto");
     import_node_fs9 = require("fs");
+    import_node_path10 = require("path");
     import_proper_lockfile = __toESM(require("proper-lockfile"), 1);
     init_thinking_effort();
     init_paths();
@@ -2160,7 +2163,7 @@ var init_orchestrator_capable = __esm({
 
 // src/store/schedules.ts
 function schedulesPath() {
-  return (0, import_node_path10.join)(appDataDir(), "schedules.json");
+  return (0, import_node_path11.join)(appDataDir(), "schedules.json");
 }
 function parseDurationMs(every) {
   const m = every.trim().match(DURATION_RE);
@@ -2383,13 +2386,13 @@ function recordScheduleRun(id, result) {
   writeAll(rows);
   return next;
 }
-var import_node_crypto4, import_node_fs10, import_node_path10, import_croner, DURATION_RE, UNIT_MS;
+var import_node_crypto4, import_node_fs10, import_node_path11, import_croner, DURATION_RE, UNIT_MS;
 var init_schedules = __esm({
   "src/store/schedules.ts"() {
     "use strict";
     import_node_crypto4 = require("crypto");
     import_node_fs10 = require("fs");
-    import_node_path10 = require("path");
+    import_node_path11 = require("path");
     import_croner = require("croner");
     init_orchestrator_capable();
     init_paths();
@@ -2406,7 +2409,7 @@ var init_schedules = __esm({
 
 // src/store/desktop-host.ts
 function desktopHostPidPath() {
-  return (0, import_node_path11.join)(appDataDir(), "desktop-host.pid");
+  return (0, import_node_path12.join)(appDataDir(), "desktop-host.pid");
 }
 function claimDesktopHost(pid = process.pid) {
   (0, import_node_fs11.writeFileSync)(desktopHostPidPath(), `${pid}
@@ -2447,12 +2450,12 @@ function thisProcessShouldDrainAgentQueues() {
   if (isThisProcessDesktopHost()) return true;
   return !isDesktopHostAlive();
 }
-var import_node_fs11, import_node_path11;
+var import_node_fs11, import_node_path12;
 var init_desktop_host = __esm({
   "src/store/desktop-host.ts"() {
     "use strict";
     import_node_fs11 = require("fs");
-    import_node_path11 = require("path");
+    import_node_path12 = require("path");
     init_paths();
   }
 });
@@ -3404,18 +3407,18 @@ var init_gh_errors = __esm({
 function githubAgentAuthDir() {
   const override = process.env.SIDEBOARD_GIT_AUTH_DIR?.trim();
   if (override) return override;
-  return (0, import_node_path12.join)((0, import_node_os4.homedir)(), ".sideboard-git-auth");
+  return (0, import_node_path13.join)((0, import_node_os4.homedir)(), ".sideboard-git-auth");
 }
 function githubCredentialStorePath() {
-  return (0, import_node_path12.join)(githubAgentAuthDir(), "git-credentials");
+  return (0, import_node_path13.join)(githubAgentAuthDir(), "git-credentials");
 }
 function githubGhConfigDir() {
-  return (0, import_node_path12.join)(githubAgentAuthDir(), "gh");
+  return (0, import_node_path13.join)(githubAgentAuthDir(), "gh");
 }
 function writePrivateFile2(file, body) {
-  (0, import_node_fs12.mkdirSync)((0, import_node_path12.dirname)(file), { recursive: true, mode: 448 });
+  (0, import_node_fs12.mkdirSync)((0, import_node_path13.dirname)(file), { recursive: true, mode: 448 });
   try {
-    (0, import_node_fs12.chmodSync)((0, import_node_path12.dirname)(file), 448);
+    (0, import_node_fs12.chmodSync)((0, import_node_path13.dirname)(file), 448);
   } catch {
   }
   (0, import_node_fs12.writeFileSync)(file, body, { encoding: "utf8", mode: 384 });
@@ -3453,11 +3456,11 @@ function materializeGithubAgentAuth(token, user) {
   writePrivateFile2(githubCredentialStorePath(), gitCredentialStoreContents(trimmed));
   const ghDir = githubGhConfigDir();
   (0, import_node_fs12.mkdirSync)(ghDir, { recursive: true, mode: 448 });
-  writePrivateFile2((0, import_node_path12.join)(ghDir, "hosts.yml"), ghHostsYml(trimmed, user));
-  writePrivateFile2((0, import_node_path12.join)(ghDir, "config.yml"), "git_protocol: https\nprompt: disabled\n");
+  writePrivateFile2((0, import_node_path13.join)(ghDir, "hosts.yml"), ghHostsYml(trimmed, user));
+  writePrivateFile2((0, import_node_path13.join)(ghDir, "config.yml"), "git_protocol: https\nprompt: disabled\n");
 }
 function githubAgentAuthReady() {
-  return (0, import_node_fs12.existsSync)(githubCredentialStorePath()) && (0, import_node_fs12.existsSync)((0, import_node_path12.join)(githubGhConfigDir(), "hosts.yml"));
+  return (0, import_node_fs12.existsSync)(githubCredentialStorePath()) && (0, import_node_fs12.existsSync)((0, import_node_path13.join)(githubGhConfigDir(), "hosts.yml"));
 }
 function githubCredentialHelperGitConfig() {
   const file = githubCredentialStorePath();
@@ -3472,13 +3475,13 @@ function githubGhConfigEnv() {
     GH_PROMPT_DISABLED: "1"
   };
 }
-var import_node_fs12, import_node_os4, import_node_path12;
+var import_node_fs12, import_node_os4, import_node_path13;
 var init_github_agent_auth = __esm({
   "src/git/github-agent-auth.ts"() {
     "use strict";
     import_node_fs12 = require("fs");
     import_node_os4 = require("os");
-    import_node_path12 = require("path");
+    import_node_path13 = require("path");
   }
 });
 
@@ -3486,15 +3489,15 @@ var init_github_agent_auth = __esm({
 function prependPathDir(env, dir) {
   if (!dir || !(0, import_node_fs13.existsSync)(dir)) return;
   const current = env.PATH ?? "";
-  const parts = current.split(import_node_path13.delimiter).filter(Boolean);
+  const parts = current.split(import_node_path14.delimiter).filter(Boolean);
   if (parts.includes(dir)) {
     env.PATH = current;
     return;
   }
-  env.PATH = [dir, ...parts].join(import_node_path13.delimiter);
+  env.PATH = [dir, ...parts].join(import_node_path14.delimiter);
 }
 function conductorBundledBinDir(home = process.env.HOME || process.env.USERPROFILE || (0, import_node_os5.homedir)()) {
-  return (0, import_node_path13.join)(home, "Library", "Application Support", "com.conductor.app", "bin");
+  return (0, import_node_path14.join)(home, "Library", "Application Support", "com.conductor.app", "bin");
 }
 function isConductorBundledCli(filePath) {
   const p = (filePath ?? "").replace(/\\/g, "/");
@@ -3503,10 +3506,10 @@ function isConductorBundledCli(filePath) {
 function ensureAgentPath(env = process.env) {
   const home = env.HOME || env.USERPROFILE || (0, import_node_os5.homedir)();
   const current = env.PATH ?? "";
-  const parts = current.split(import_node_path13.delimiter).filter(Boolean);
+  const parts = current.split(import_node_path14.delimiter).filter(Boolean);
   const seen = new Set(parts);
   const extras = [
-    ...EXTRA_BIN_DIRS.map((rel) => (0, import_node_path13.join)(home, rel)),
+    ...EXTRA_BIN_DIRS.map((rel) => (0, import_node_path14.join)(home, rel)),
     "/opt/homebrew/bin",
     "/usr/local/bin",
     // Keep after Homebrew/npm so a user-installed CLI still wins.
@@ -3517,7 +3520,7 @@ function ensureAgentPath(env = process.env) {
     parts.unshift(dir);
     seen.add(dir);
   }
-  const next = parts.join(import_node_path13.delimiter);
+  const next = parts.join(import_node_path14.delimiter);
   env.PATH = next;
   return next;
 }
@@ -3531,7 +3534,7 @@ function enrichPathWithNpmGlobalBin(env = process.env) {
       stdio: ["ignore", "pipe", "ignore"]
     }).trim().split(/\r?\n/).find(Boolean);
     if (prefix) {
-      const binDir = process.platform === "win32" ? prefix : (0, import_node_path13.join)(prefix, "bin");
+      const binDir = process.platform === "win32" ? prefix : (0, import_node_path14.join)(prefix, "bin");
       prependPathDir(env, binDir);
     }
   } catch {
@@ -3559,14 +3562,14 @@ function withExportedPath(command, pathValue) {
   if (/^(export\s+PATH=|PATH=)/.test(trimmed)) return trimmed;
   return `export PATH=${posixShellSingleQuote(pathValue)} && ${trimmed}`;
 }
-var import_node_fs13, import_node_child_process3, import_node_os5, import_node_path13, EXTRA_BIN_DIRS;
+var import_node_fs13, import_node_child_process3, import_node_os5, import_node_path14, EXTRA_BIN_DIRS;
 var init_path = __esm({
   "src/agents/path.ts"() {
     "use strict";
     import_node_fs13 = require("fs");
     import_node_child_process3 = require("child_process");
     import_node_os5 = require("os");
-    import_node_path13 = require("path");
+    import_node_path14 = require("path");
     EXTRA_BIN_DIRS = [
       ".local/bin",
       ".cargo/bin",
@@ -3588,7 +3591,7 @@ function isIndexLockError(text4) {
   return /Unable to create ['"][^'"]*index\.lock['"]: File exists/i.test(text4);
 }
 function clearStaleIndexLock(gitDir, maxAgeMs = STALE_INDEX_LOCK_MS, now = Date.now()) {
-  const lockPath = (0, import_node_path14.join)(gitDir, "index.lock");
+  const lockPath = (0, import_node_path15.join)(gitDir, "index.lock");
   try {
     if (!(0, import_node_fs14.existsSync)(lockPath)) return null;
     if (now - (0, import_node_fs14.statSync)(lockPath).mtimeMs < maxAgeMs) return null;
@@ -3607,12 +3610,12 @@ function clearStaleIndexLocks(gitDirs, maxAgeMs = STALE_INDEX_LOCK_MS) {
   }
   return removed;
 }
-var import_node_fs14, import_node_path14, STALE_INDEX_LOCK_MS;
+var import_node_fs14, import_node_path15, STALE_INDEX_LOCK_MS;
 var init_stale_lock = __esm({
   "src/git/stale-lock.ts"() {
     "use strict";
     import_node_fs14 = require("fs");
-    import_node_path14 = require("path");
+    import_node_path15 = require("path");
     STALE_INDEX_LOCK_MS = 2e4;
   }
 });
@@ -3820,7 +3823,7 @@ async function warmGithubAgentAuth(opts) {
 }
 function normalizeWritableRoot(raw) {
   const trimmed = raw.trim().replace(/\/+$/, "");
-  return trimmed && (0, import_node_path15.isAbsolute)(trimmed) ? trimmed : null;
+  return trimmed && (0, import_node_path16.isAbsolute)(trimmed) ? trimmed : null;
 }
 async function resolveCodexGitWritableRoots(cwd) {
   const roots = /* @__PURE__ */ new Set();
@@ -3897,11 +3900,11 @@ function formatGitAuthModeDirective(mode) {
       ].join("\n");
   }
 }
-var import_node_path15, HTTPS_REWRITE, TOKEN_TTL_MS, tokenMemo, GITHUB_CHILD_TOKEN_KEYS;
+var import_node_path16, HTTPS_REWRITE, TOKEN_TTL_MS, tokenMemo, GITHUB_CHILD_TOKEN_KEYS;
 var init_git_auth_mode = __esm({
   "src/git/git-auth-mode.ts"() {
     "use strict";
-    import_node_path15 = require("path");
+    import_node_path16 = require("path");
     init_app_settings();
     init_github_agent_auth();
     init_run();
@@ -5099,7 +5102,7 @@ function isLocalPrFetchBranch(ref) {
 }
 async function createThreadWorktree(opts) {
   let branchName = `thread/${opts.slug}`;
-  const worktreePath = (0, import_node_path16.join)(worktreesRoot(opts.repoPath), opts.slug);
+  const worktreePath = (0, import_node_path17.join)(worktreesRoot(opts.repoPath), opts.slug);
   if ((0, import_node_fs15.existsSync)(worktreePath)) {
     throw new Error(`Worktree already exists at ${worktreePath}`);
   }
@@ -5167,7 +5170,7 @@ ${add.stdout}`;
 async function createExistingBranchWorktree(opts) {
   const branchName = opts.branchName.trim();
   if (!branchName) throw new Error("branch name required");
-  const worktreePath = (0, import_node_path16.join)(worktreesRoot(opts.repoPath), opts.slug);
+  const worktreePath = (0, import_node_path17.join)(worktreesRoot(opts.repoPath), opts.slug);
   if ((0, import_node_fs15.existsSync)(worktreePath)) {
     throw new Error(`Worktree already exists at ${worktreePath}`);
   }
@@ -5459,7 +5462,7 @@ function sameRepoPath(a, b) {
   return normalizeWorktreePath(a) === normalizeWorktreePath(b);
 }
 function listLocalThreadBranchSlugs(repoPath) {
-  const refsDir = (0, import_node_path16.join)(repoPath, ".git", "refs", "heads", "thread");
+  const refsDir = (0, import_node_path17.join)(repoPath, ".git", "refs", "heads", "thread");
   if (!(0, import_node_fs15.existsSync)(refsDir)) return [];
   try {
     return (0, import_node_fs15.readdirSync)(refsDir).filter((name) => !name.startsWith(".")).map((name) => normalizeTakenSlug(name));
@@ -5492,18 +5495,18 @@ function allocateTeamSlug(repoPath) {
   const taken = collectTakenTeamSlugs(repoPath);
   for (let attempt = 0; attempt < 32; attempt++) {
     const team = allocateTeamName(taken);
-    const path2 = (0, import_node_path16.join)(worktreesRoot(repoPath), team.slug);
+    const path2 = (0, import_node_path17.join)(worktreesRoot(repoPath), team.slug);
     if (!(0, import_node_fs15.existsSync)(path2)) return team;
     taken.add(team.slug);
   }
   throw new Error("No available soccer team worktree directories left");
 }
-var import_node_fs15, import_node_path16;
+var import_node_fs15, import_node_path17;
 var init_worktree = __esm({
   "src/git/worktree.ts"() {
     "use strict";
     import_node_fs15 = require("fs");
-    import_node_path16 = require("path");
+    import_node_path17 = require("path");
     init_paths();
     init_thread_store();
     init_teams();
@@ -5588,7 +5591,7 @@ function ensureGlobalCoordinatorCwd(opts) {
   let orchId = opts?.orchestratorThreadId?.trim() || "";
   if (!orchId) {
     try {
-      const existing = (0, import_node_fs16.readFileSync)((0, import_node_path17.join)(dir, "AGENTS.md"), "utf8");
+      const existing = (0, import_node_fs16.readFileSync)((0, import_node_path18.join)(dir, "AGENTS.md"), "utf8");
       const m = existing.match(
         /YOUR orchestration thread id is `([0-9a-f-]{36})`/i
       );
@@ -5630,9 +5633,9 @@ function ensureGlobalCoordinatorCwd(opts) {
     "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
   ].join("\n");
   try {
-    (0, import_node_fs16.writeFileSync)((0, import_node_path17.join)(dir, "CLAUDE.md"), `${body}
+    (0, import_node_fs16.writeFileSync)((0, import_node_path18.join)(dir, "CLAUDE.md"), `${body}
 `, "utf8");
-    (0, import_node_fs16.writeFileSync)((0, import_node_path17.join)(dir, "AGENTS.md"), `${body}
+    (0, import_node_fs16.writeFileSync)((0, import_node_path18.join)(dir, "AGENTS.md"), `${body}
 `, "utf8");
   } catch {
   }
@@ -5664,12 +5667,12 @@ function coordinatorSystemPrompt(opts) {
     formatWorkspaceInventory(opts.workspaces)
   ].join("\n");
 }
-var import_node_fs16, import_node_path17, COORDINATOR_TOOL_PLAYBOOK, SLACK_REPLY_FORMATTING;
+var import_node_fs16, import_node_path18, COORDINATOR_TOOL_PLAYBOOK, SLACK_REPLY_FORMATTING;
 var init_coordinator_prompt = __esm({
   "src/orchestrator/coordinator-prompt.ts"() {
     "use strict";
     import_node_fs16 = require("fs");
-    import_node_path17 = require("path");
+    import_node_path18 = require("path");
     init_worktree();
     init_app_settings();
     init_paths();
@@ -6012,7 +6015,7 @@ var init_api = __esm({
 
 // src/slack/reply-target.ts
 function storePath() {
-  return (0, import_node_path18.join)(appDataDir(), "slack-reply-to.json");
+  return (0, import_node_path19.join)(appDataDir(), "slack-reply-to.json");
 }
 function readStore() {
   const path2 = storePath();
@@ -6033,12 +6036,12 @@ function setSlackReplyTarget(target) {
 function getSlackReplyTarget(threadId) {
   return readStore()[threadId] ?? null;
 }
-var import_node_fs17, import_node_path18;
+var import_node_fs17, import_node_path19;
 var init_reply_target = __esm({
   "src/slack/reply-target.ts"() {
     "use strict";
     import_node_fs17 = require("fs");
-    import_node_path18 = require("path");
+    import_node_path19 = require("path");
     init_paths();
     init_private_file();
     init_secure_file();
@@ -6047,7 +6050,7 @@ var init_reply_target = __esm({
 
 // src/slack/workspaces.ts
 function storePath2() {
-  return (0, import_node_path19.join)(appDataDir(), "slack-workspaces.json");
+  return (0, import_node_path20.join)(appDataDir(), "slack-workspaces.json");
 }
 function readStore2() {
   try {
@@ -6154,11 +6157,11 @@ function requireSlackWorkspace(teamId) {
   }
   return ws;
 }
-var import_node_path19;
+var import_node_path20;
 var init_workspaces = __esm({
   "src/slack/workspaces.ts"() {
     "use strict";
-    import_node_path19 = require("path");
+    import_node_path20 = require("path");
     init_paths();
     init_secure_file();
     init_api();
@@ -6167,7 +6170,7 @@ var init_workspaces = __esm({
 
 // src/slack/outbound-watch.ts
 function storePath3() {
-  return (0, import_node_path20.join)(appDataDir(), "slack-outbound-watch.json");
+  return (0, import_node_path21.join)(appDataDir(), "slack-outbound-watch.json");
 }
 function watchId(teamId, channelId, ts) {
   return `${teamId}:${channelId}:${ts}`;
@@ -6542,12 +6545,12 @@ async function refreshSlackReplyBadges(opts) {
   if (changed) writeStore2(watches);
   return listSlackReplyBadges();
 }
-var import_node_fs18, import_node_path20, MAX_WATCHES, MAX_REPLIES_PER_WATCH, WATCH_TTL_MS, POLL_INTERVAL_MS, lastPollMs, nameCache;
+var import_node_fs18, import_node_path21, MAX_WATCHES, MAX_REPLIES_PER_WATCH, WATCH_TTL_MS, POLL_INTERVAL_MS, lastPollMs, nameCache;
 var init_outbound_watch = __esm({
   "src/slack/outbound-watch.ts"() {
     "use strict";
     import_node_fs18 = require("fs");
-    import_node_path20 = require("path");
+    import_node_path21 = require("path");
     init_paths();
     init_private_file();
     init_secure_file();
@@ -6682,7 +6685,7 @@ function summarizeTurnStderr(tail, maxChars = 500) {
 function looksLikeInvalidAgentSession(text4) {
   const lower = text4.trim().toLowerCase();
   if (!lower) return false;
-  return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower);
+  return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /\brun\b.{0,80}\bnot found for agent\b/.test(lower);
 }
 function looksLikeRetryableRunnerCrash(text4) {
   if (looksLikeAgentFailureMessage(text4)) return false;
@@ -6797,7 +6800,7 @@ var init_error_detail = __esm({
 
 // src/brightsy/config.ts
 function brightsyConfigPath() {
-  return (0, import_node_path21.join)((0, import_node_os6.homedir)(), ".brightsy", "config.json");
+  return (0, import_node_path22.join)((0, import_node_os6.homedir)(), ".brightsy", "config.json");
 }
 function loadBrightsyConfig() {
   const path2 = brightsyConfigPath();
@@ -6816,13 +6819,13 @@ function saveBrightsyConfig(cfg) {
     mode: 384
   });
 }
-var import_node_fs19, import_node_os6, import_node_path21;
+var import_node_fs19, import_node_os6, import_node_path22;
 var init_config = __esm({
   "src/brightsy/config.ts"() {
     "use strict";
     import_node_fs19 = require("fs");
     import_node_os6 = require("os");
-    import_node_path21 = require("path");
+    import_node_path22 = require("path");
   }
 });
 
@@ -6925,7 +6928,7 @@ __export(connected_teams_exports, {
   listConnectedBrightsyTeams: () => listConnectedBrightsyTeams
 });
 function storePath4() {
-  return (0, import_node_path22.join)(appDataDir(), "brightsy-teams.json");
+  return (0, import_node_path23.join)(appDataDir(), "brightsy-teams.json");
 }
 function readStore4() {
   const path2 = storePath4();
@@ -7102,12 +7105,12 @@ function brightsyMcpServerName(slug) {
   const cleaned = slug.replace(/[^A-Za-z0-9_-]/g, "_").replace(/^_+|_+$/g, "");
   return `brightsy_${cleaned || "team"}`;
 }
-var import_node_fs20, import_node_path22;
+var import_node_fs20, import_node_path23;
 var init_connected_teams = __esm({
   "src/brightsy/connected-teams.ts"() {
     "use strict";
     import_node_fs20 = require("fs");
-    import_node_path22 = require("path");
+    import_node_path23 = require("path");
     init_paths();
     init_accounts();
     init_config();
@@ -7912,6 +7915,11 @@ function parseDiffStat(result) {
   }
   return {};
 }
+function withPartTimes(next, prev) {
+  const now = Date.now();
+  const startedAt = prev && typeof prev.startedAt === "number" ? prev.startedAt : now;
+  return { ...next, startedAt, updatedAt: now };
+}
 function applyAgentEvent(parts, event) {
   if (event.type === "stdout") {
     const data = event.data;
@@ -7919,17 +7927,22 @@ function applyAgentEvent(parts, event) {
     const next = [...parts];
     const last = next[next.length - 1];
     if (last?.type === "text" && sameParentId(last.parentId, event.parentId)) {
-      next[next.length - 1] = {
-        type: "text",
-        text: last.text + data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      };
+      next[next.length - 1] = withPartTimes(
+        {
+          type: "text",
+          text: last.text + data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        },
+        last
+      );
     } else {
-      next.push({
-        type: "text",
-        text: data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      });
+      next.push(
+        withPartTimes({
+          type: "text",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
     }
     return next;
   }
@@ -7941,34 +7954,44 @@ function applyAgentEvent(parts, event) {
       for (let i = next.length - 1; i >= 0; i--) {
         const prev = next[i];
         if (prev?.type === "thinking" && sameParentId(prev.parentId, event.parentId)) {
-          next[i] = {
-            type: "thinking",
-            text: data,
-            ...event.parentId ? { parentId: event.parentId } : {}
-          };
+          next[i] = withPartTimes(
+            {
+              type: "thinking",
+              text: data,
+              ...event.parentId ? { parentId: event.parentId } : {}
+            },
+            prev
+          );
           return next;
         }
       }
-      next.push({
-        type: "thinking",
-        text: data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      });
+      next.push(
+        withPartTimes({
+          type: "thinking",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
       return next;
     }
     const last = next[next.length - 1];
     if (last?.type === "thinking" && sameParentId(last.parentId, event.parentId)) {
-      next[next.length - 1] = {
-        type: "thinking",
-        text: last.text + data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      };
+      next[next.length - 1] = withPartTimes(
+        {
+          type: "thinking",
+          text: last.text + data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        },
+        last
+      );
     } else {
-      next.push({
-        type: "thinking",
-        text: data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      });
+      next.push(
+        withPartTimes({
+          type: "thinking",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
     }
     return next;
   }
@@ -7984,22 +8007,25 @@ function applyAgentEvent(parts, event) {
         ...input ?? {}
       };
       const mergedRecord = Object.keys(mergedInput).length > 0 ? mergedInput : void 0;
-      next[existing] = {
-        ...prev,
-        name: event.name || prev.name,
-        input: mergedRecord,
-        description: toolDescription(event.name || prev.name, mergedRecord),
-        detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
-        filePath: toolFilePath(mergedRecord) ?? prev.filePath,
-        additions: diff.additions ?? prev.additions,
-        deletions: diff.deletions ?? prev.deletions,
-        parentId: event.parentId ?? prev.parentId
-      };
+      next[existing] = withPartTimes(
+        {
+          ...prev,
+          name: event.name || prev.name,
+          input: mergedRecord,
+          description: toolDescription(event.name || prev.name, mergedRecord),
+          detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
+          filePath: toolFilePath(mergedRecord) ?? prev.filePath,
+          additions: diff.additions ?? prev.additions,
+          deletions: diff.deletions ?? prev.deletions,
+          parentId: event.parentId ?? prev.parentId
+        },
+        prev
+      );
       return next;
     }
     return [
       ...parts,
-      {
+      withPartTimes({
         type: "tool",
         id: event.id,
         name: event.name,
@@ -8010,7 +8036,7 @@ function applyAgentEvent(parts, event) {
         filePath: toolFilePath(input),
         ...event.parentId ? { parentId: event.parentId } : {},
         ...diff
-      }
+      })
     ];
   }
   if (event.type === "tool_result") {
@@ -8020,7 +8046,7 @@ function applyAgentEvent(parts, event) {
       if (existing < 0) {
         return [
           ...parts,
-          {
+          withPartTimes({
             type: "tool",
             id: event.id,
             name: "tool",
@@ -8028,22 +8054,25 @@ function applyAgentEvent(parts, event) {
             status: event.isError ? "error" : "running",
             result: event.content,
             ...event.parentId ? { parentId: event.parentId } : {}
-          }
+          })
         ];
       }
       return parts.map((p, i) => {
         if (i !== existing || p.type !== "tool") return p;
         if (p.status === "done" || p.status === "error") return p;
-        return {
-          ...p,
-          result: event.content ?? p.result
-        };
+        return withPartTimes(
+          {
+            ...p,
+            result: event.content ?? p.result
+          },
+          p
+        );
       });
     }
     if (existing < 0) {
       return [
         ...parts,
-        {
+        withPartTimes({
           type: "tool",
           id: event.id,
           name: "tool",
@@ -8053,18 +8082,21 @@ function applyAgentEvent(parts, event) {
           ...event.parentId ? { parentId: event.parentId } : {},
           ...fromResult.additions != null ? { additions: fromResult.additions } : {},
           ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-        }
+        })
       ];
     }
     return parts.map((p, i) => {
       if (i !== existing || p.type !== "tool") return p;
-      return {
-        ...p,
-        status: event.isError ? "error" : "done",
-        result: event.content,
-        ...fromResult.additions != null ? { additions: fromResult.additions } : {},
-        ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-      };
+      return withPartTimes(
+        {
+          ...p,
+          status: event.isError ? "error" : "done",
+          result: event.content,
+          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
+          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
+        },
+        p
+      );
     });
   }
   return parts;
@@ -8132,43 +8164,43 @@ function electronResourcesPath() {
 function packagedCursorRuntimeDir() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const dir = (0, import_node_path23.join)(resources, "cursor-runtime");
-  if (!(0, import_node_fs22.existsSync)((0, import_node_path23.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
+  const dir = (0, import_node_path24.join)(resources, "cursor-runtime");
+  if (!(0, import_node_fs22.existsSync)((0, import_node_path24.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
   return dir;
 }
 function packagedCursorRunnerPath() {
   const dir = packagedCursorRuntimeDir();
-  return dir ? (0, import_node_path23.join)(dir, "core-dist", "agents", "cursor-runner.js") : null;
+  return dir ? (0, import_node_path24.join)(dir, "core-dist", "agents", "cursor-runner.js") : null;
 }
 function packagedMcpDir() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const dir = (0, import_node_path23.join)(resources, "sideboard-mcp");
-  if (!(0, import_node_fs22.existsSync)((0, import_node_path23.join)(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
+  const dir = (0, import_node_path24.join)(resources, "sideboard-mcp");
+  if (!(0, import_node_fs22.existsSync)((0, import_node_path24.join)(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
   return dir;
 }
 function packagedMcpStdioPath() {
   const dir = packagedMcpDir();
-  return dir ? (0, import_node_path23.join)(dir, "core-dist", "mcp", "run-stdio.js") : null;
+  return dir ? (0, import_node_path24.join)(dir, "core-dist", "mcp", "run-stdio.js") : null;
 }
 function packagedBundledNodePath() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const bin = (0, import_node_path23.join)(resources, "node", "bin", "node");
+  const bin = (0, import_node_path24.join)(resources, "node", "bin", "node");
   if (!(0, import_node_fs22.existsSync)(bin)) return null;
   return bin;
 }
 function packagedCursorRipgrepCandidate(platformPkg, binName) {
   const dir = packagedCursorRuntimeDir();
   if (!dir) return null;
-  return (0, import_node_path23.join)(dir, "node_modules", platformPkg, "bin", binName);
+  return (0, import_node_path24.join)(dir, "node_modules", platformPkg, "bin", binName);
 }
-var import_node_fs22, import_node_path23;
+var import_node_fs22, import_node_path24;
 var init_packaged_runtime = __esm({
   "src/agents/packaged-runtime.ts"() {
     "use strict";
     import_node_fs22 = require("fs");
-    import_node_path23 = require("path");
+    import_node_path24 = require("path");
   }
 });
 
@@ -8251,28 +8283,28 @@ function versionDirNodeBins(root, toBin) {
 }
 function defaultNodeBinCandidates(home = (0, import_node_os7.homedir)()) {
   const kegs = ["/opt/homebrew", "/usr/local"].flatMap(
-    (prefix) => PREFERRED_LTS_MAJORS.map((major) => (0, import_node_path24.join)(prefix, "opt", `node@${major}`, "bin", "node"))
+    (prefix) => PREFERRED_LTS_MAJORS.map((major) => (0, import_node_path25.join)(prefix, "opt", `node@${major}`, "bin", "node"))
   );
   return [
     ...kegs,
     "/opt/homebrew/bin/node",
     "/usr/local/bin/node",
-    (0, import_node_path24.join)(home, ".local/share/fnm/aliases/default/bin/node"),
-    (0, import_node_path24.join)(home, ".nvm/current/bin/node"),
-    (0, import_node_path24.join)(home, ".volta/bin/node"),
-    (0, import_node_path24.join)(home, ".asdf/shims/node"),
-    (0, import_node_path24.join)(home, ".local/share/mise/shims/node"),
+    (0, import_node_path25.join)(home, ".local/share/fnm/aliases/default/bin/node"),
+    (0, import_node_path25.join)(home, ".nvm/current/bin/node"),
+    (0, import_node_path25.join)(home, ".volta/bin/node"),
+    (0, import_node_path25.join)(home, ".asdf/shims/node"),
+    (0, import_node_path25.join)(home, ".local/share/mise/shims/node"),
     ...versionDirNodeBins(
-      (0, import_node_path24.join)(home, ".nvm", "versions", "node"),
-      (name) => (0, import_node_path24.join)(home, ".nvm", "versions", "node", name, "bin", "node")
+      (0, import_node_path25.join)(home, ".nvm", "versions", "node"),
+      (name) => (0, import_node_path25.join)(home, ".nvm", "versions", "node", name, "bin", "node")
     ),
     ...versionDirNodeBins(
-      (0, import_node_path24.join)(home, ".local/share/fnm", "node-versions"),
-      (name) => (0, import_node_path24.join)(home, ".local/share/fnm", "node-versions", name, "installation", "bin", "node")
+      (0, import_node_path25.join)(home, ".local/share/fnm", "node-versions"),
+      (name) => (0, import_node_path25.join)(home, ".local/share/fnm", "node-versions", name, "installation", "bin", "node")
     ),
     ...versionDirNodeBins(
-      (0, import_node_path24.join)(home, ".volta", "tools", "image", "node"),
-      (name) => (0, import_node_path24.join)(home, ".volta", "tools", "image", "node", name, "bin", "node")
+      (0, import_node_path25.join)(home, ".volta", "tools", "image", "node"),
+      (name) => (0, import_node_path25.join)(home, ".volta", "tools", "image", "node", name, "bin", "node")
     )
   ];
 }
@@ -8364,13 +8396,13 @@ async function resolveNodeLaunch(scriptPath) {
     env: { ELECTRON_RUN_AS_NODE: "1" }
   };
 }
-var import_node_fs23, import_node_os7, import_node_path24, AGENT_RUNNER_MAX_OLD_SPACE_MB, MAX_OLD_SPACE_FLAG, PREFERRED_LTS_MAJORS;
+var import_node_fs23, import_node_os7, import_node_path25, AGENT_RUNNER_MAX_OLD_SPACE_MB, MAX_OLD_SPACE_FLAG, PREFERRED_LTS_MAJORS;
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
     import_node_fs23 = require("fs");
     import_node_os7 = require("os");
-    import_node_path24 = require("path");
+    import_node_path25 = require("path");
     init_nested_electron_env();
     init_run();
     init_packaged_runtime();
@@ -8463,13 +8495,13 @@ function corePackageDir() {
   try {
     const url = import_meta.url;
     if (typeof url === "string" && url.length > 0) {
-      return (0, import_node_path25.dirname)((0, import_node_url.fileURLToPath)(url));
+      return (0, import_node_path26.dirname)((0, import_node_url.fileURLToPath)(url));
     }
   } catch {
   }
   try {
-    const req = (0, import_node_module.createRequire)((0, import_node_path25.join)(process.cwd(), "package.json"));
-    return (0, import_node_path25.dirname)(req.resolve("@sideboard-ai/core"));
+    const req = (0, import_node_module.createRequire)((0, import_node_path26.join)(process.cwd(), "package.json"));
+    return (0, import_node_path26.dirname)(req.resolve("@sideboard-ai/core"));
   } catch {
     return process.cwd();
   }
@@ -8482,18 +8514,18 @@ function findSideboardMcpJsEntry() {
   let dir = corePackageDir();
   for (let i = 0; i < 10; i++) {
     const candidates = [
-      (0, import_node_path25.join)(dir, "mcp/run-stdio.js"),
-      (0, import_node_path25.join)(dir, "mcp/run-stdio.cjs"),
-      (0, import_node_path25.join)(dir, "dist/mcp/run-stdio.js"),
-      (0, import_node_path25.join)(dir, "dist/mcp/run-stdio.cjs"),
-      (0, import_node_path25.join)(dir, "packages/core/dist/mcp/run-stdio.js"),
-      (0, import_node_path25.join)(dir, "packages/cli/dist/index.js"),
-      (0, import_node_path25.join)(dir, "cli/dist/index.js")
+      (0, import_node_path26.join)(dir, "mcp/run-stdio.js"),
+      (0, import_node_path26.join)(dir, "mcp/run-stdio.cjs"),
+      (0, import_node_path26.join)(dir, "dist/mcp/run-stdio.js"),
+      (0, import_node_path26.join)(dir, "dist/mcp/run-stdio.cjs"),
+      (0, import_node_path26.join)(dir, "packages/core/dist/mcp/run-stdio.js"),
+      (0, import_node_path26.join)(dir, "packages/cli/dist/index.js"),
+      (0, import_node_path26.join)(dir, "cli/dist/index.js")
     ];
     for (const p of candidates) {
       if ((0, import_node_fs24.existsSync)(p) && !isAsarPath(p)) return p;
     }
-    const parent = (0, import_node_path25.dirname)(dir);
+    const parent = (0, import_node_path26.dirname)(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -8635,22 +8667,22 @@ function writeMcpServersConfig(servers) {
       ...env ? { env } : {}
     };
   }
-  const dir = (0, import_node_fs24.mkdtempSync)((0, import_node_path25.join)((0, import_node_os8.tmpdir)(), "sideboard-mcp-"));
-  const cfgPath = (0, import_node_path25.join)(dir, "mcp.json");
+  const dir = (0, import_node_fs24.mkdtempSync)((0, import_node_path26.join)((0, import_node_os8.tmpdir)(), "sideboard-mcp-"));
+  const cfgPath = (0, import_node_path26.join)(dir, "mcp.json");
   (0, import_node_fs24.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
   return cfgPath;
 }
 async function writeInjectedMcpConfig(opts) {
   return writeMcpServersConfig(await buildInjectedMcpServers(opts));
 }
-var import_node_fs24, import_node_module, import_node_os8, import_node_path25, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, BRIGHTSY_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
+var import_node_fs24, import_node_module, import_node_os8, import_node_path26, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, BRIGHTSY_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
 var init_injected_mcp = __esm({
   "src/agents/injected-mcp.ts"() {
     "use strict";
     import_node_fs24 = require("fs");
     import_node_module = require("module");
     import_node_os8 = require("os");
-    import_node_path25 = require("path");
+    import_node_path26 = require("path");
     import_node_url = require("url");
     init_run();
     init_config();
@@ -9256,8 +9288,8 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    (0, import_node_path26.join)((0, import_node_os9.homedir)(), ".codex", "config.toml"),
-    (0, import_node_path26.join)((0, import_node_os9.homedir)(), ".config", "codex", "config.toml")
+    (0, import_node_path27.join)((0, import_node_os9.homedir)(), ".codex", "config.toml"),
+    (0, import_node_path27.join)((0, import_node_os9.homedir)(), ".config", "codex", "config.toml")
   ];
   for (const path2 of candidates) {
     if (!(0, import_node_fs26.existsSync)(path2)) continue;
@@ -9293,7 +9325,7 @@ function asRecord2(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = (0, import_node_path26.join)((0, import_node_os9.homedir)(), ".codex", "auth.json");
+  const authPath = (0, import_node_path27.join)((0, import_node_os9.homedir)(), ".codex", "auth.json");
   if (!(0, import_node_fs26.existsSync)(authPath)) return false;
   try {
     return (0, import_node_fs26.statSync)(authPath).size > 2;
@@ -9301,13 +9333,13 @@ function codexLooksAuthenticated() {
     return false;
   }
 }
-var import_node_fs26, import_node_os9, import_node_path26, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
+var import_node_fs26, import_node_os9, import_node_path27, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
 var init_codex = __esm({
   "src/agents/codex.ts"() {
     "use strict";
     import_node_fs26 = require("fs");
     import_node_os9 = require("os");
-    import_node_path26 = require("path");
+    import_node_path27 = require("path");
     init_run();
     init_app_settings();
     init_global_workspace();
@@ -9787,7 +9819,7 @@ function platformRipgrepPackage() {
 }
 function usableRipgrepPath(candidate) {
   const raw = candidate?.trim();
-  if (!raw || !(0, import_node_path27.isAbsolute)(raw)) return null;
+  if (!raw || !(0, import_node_path28.isAbsolute)(raw)) return null;
   const readable = nodeReadableScriptPath(raw);
   if (!(0, import_node_fs27.existsSync)(readable) || isAsarPath(readable)) return null;
   return readable;
@@ -9796,12 +9828,12 @@ function walkForBundledRipgrep(startFile) {
   if (!startFile) return null;
   const pkg = platformRipgrepPackage();
   const name = rgBinaryName();
-  let dir = (0, import_node_path27.dirname)((0, import_node_path27.resolve)(startFile));
-  const root = (0, import_node_path27.parse)(dir).root;
+  let dir = (0, import_node_path28.dirname)((0, import_node_path28.resolve)(startFile));
+  const root = (0, import_node_path28.parse)(dir).root;
   while (dir !== root) {
-    const hit = usableRipgrepPath((0, import_node_path27.join)(dir, "node_modules", pkg, "bin", name));
+    const hit = usableRipgrepPath((0, import_node_path28.join)(dir, "node_modules", pkg, "bin", name));
     if (hit) return hit;
-    const next = (0, import_node_path27.dirname)(dir);
+    const next = (0, import_node_path28.dirname)(dir);
     if (next === dir) break;
     dir = next;
   }
@@ -9811,7 +9843,7 @@ function requireResolveBundledRipgrep(fromFile) {
   try {
     const req = (0, import_node_module2.createRequire)(fromFile);
     const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
-    return usableRipgrepPath((0, import_node_path27.join)((0, import_node_path27.dirname)(pkgJson), "bin", rgBinaryName()));
+    return usableRipgrepPath((0, import_node_path28.join)((0, import_node_path28.dirname)(pkgJson), "bin", rgBinaryName()));
   } catch {
     return null;
   }
@@ -9833,13 +9865,13 @@ function cursorRipgrepEnv(opts) {
   const path2 = resolveCursorRipgrepPath(opts);
   return path2 ? { [RIPGREP_ENV]: path2 } : {};
 }
-var import_node_fs27, import_node_module2, import_node_path27, RIPGREP_ENV;
+var import_node_fs27, import_node_module2, import_node_path28, RIPGREP_ENV;
 var init_cursor_ripgrep = __esm({
   "src/agents/cursor-ripgrep.ts"() {
     "use strict";
     import_node_fs27 = require("fs");
     import_node_module2 = require("module");
-    import_node_path27 = require("path");
+    import_node_path28 = require("path");
     init_node_launch();
     init_packaged_runtime();
     RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
@@ -9885,11 +9917,11 @@ function entryDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return (0, import_node_path28.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    return (0, import_node_path29.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
   } catch {
     try {
       const req = (0, import_node_module3.createRequire)(process.cwd() + "/");
-      return (0, import_node_path28.dirname)(req.resolve("@sideboard-ai/core"));
+      return (0, import_node_path29.dirname)(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -9900,27 +9932,27 @@ function cursorRunnerPath() {
   if (packaged) return packaged;
   const root = entryDir();
   const candidates = [
-    (0, import_node_path28.join)(root, "agents", "cursor-runner.js"),
-    (0, import_node_path28.join)(root, "agents", "cursor-runner.cjs"),
+    (0, import_node_path29.join)(root, "agents", "cursor-runner.js"),
+    (0, import_node_path29.join)(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    (0, import_node_path28.join)(root, "dist", "agents", "cursor-runner.js"),
-    (0, import_node_path28.join)(root, "dist", "agents", "cursor-runner.cjs"),
+    (0, import_node_path29.join)(root, "dist", "agents", "cursor-runner.js"),
+    (0, import_node_path29.join)(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    (0, import_node_path28.join)(root, "cursor-runner.ts"),
-    (0, import_node_path28.join)(root, "src", "agents", "cursor-runner.ts")
+    (0, import_node_path29.join)(root, "cursor-runner.ts"),
+    (0, import_node_path29.join)(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
     if ((0, import_node_fs28.existsSync)(candidate)) return candidate;
   }
   return candidates[0];
 }
-var import_node_fs28, import_node_module3, import_node_path28, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
+var import_node_fs28, import_node_module3, import_node_path29, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
 var init_cursor = __esm({
   "src/agents/cursor.ts"() {
     "use strict";
     import_node_fs28 = require("fs");
     import_node_module3 = require("module");
-    import_node_path28 = require("path");
+    import_node_path29 = require("path");
     import_node_url2 = require("url");
     import_sdk = require("@cursor/sdk");
     init_run();
@@ -9979,6 +10011,7 @@ var init_cursor = __esm({
         const req = {
           prompt,
           cwd: thread.worktreePath,
+          threadId: thread.id,
           agentId,
           model: thread.model,
           effort: thread.effort,
@@ -11863,12 +11896,12 @@ function readTextIfPresent(abs) {
   }
 }
 function readLocalGuidelines(worktreePath) {
-  const localAbs = (0, import_node_path29.join)(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = (0, import_node_path30.join)(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return { path: REVIEW_REQUEST_PATH, content: localContent };
   }
-  const legacyAbs = (0, import_node_path29.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = (0, import_node_path30.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return { path: LEGACY_REVIEW_REQUEST_PATH, content: legacyContent };
@@ -11884,20 +11917,20 @@ function skillGuidelines(content, source) {
   };
 }
 function ensureReviewSkillFile(worktreePath) {
-  const abs = (0, import_node_path29.join)(worktreePath, REVIEW_SKILL_PATH);
+  const abs = (0, import_node_path30.join)(worktreePath, REVIEW_SKILL_PATH);
   const existing = readTextIfPresent(abs);
   if (existing) {
     return { path: REVIEW_SKILL_PATH, content: existing, wrote: false };
   }
-  const fromRepo = readTextIfPresent((0, import_node_path29.join)(worktreePath, REPO_REVIEW_PATH));
+  const fromRepo = readTextIfPresent((0, import_node_path30.join)(worktreePath, REPO_REVIEW_PATH));
   const fromLocal = readLocalGuidelines(worktreePath)?.content ?? null;
   const content = wrapReviewSkillMarkdown(fromRepo ?? fromLocal ?? REVIEW_REQUEST_TEMPLATE);
-  (0, import_node_fs30.mkdirSync)((0, import_node_path29.dirname)(abs), { recursive: true });
+  (0, import_node_fs30.mkdirSync)((0, import_node_path30.dirname)(abs), { recursive: true });
   (0, import_node_fs30.writeFileSync)(abs, content, "utf8");
   return { path: REVIEW_SKILL_PATH, content, wrote: true };
 }
 function resolveReviewGuidelines(worktreePath) {
-  const skillContent = readTextIfPresent((0, import_node_path29.join)(worktreePath, REVIEW_SKILL_PATH));
+  const skillContent = readTextIfPresent((0, import_node_path30.join)(worktreePath, REVIEW_SKILL_PATH));
   if (skillContent) return skillGuidelines(skillContent, "skill");
   const local = readLocalGuidelines(worktreePath);
   if (local) {
@@ -11927,7 +11960,7 @@ function buildReviewRequestAttachment(content, opts) {
   };
 }
 function readExistingReviewRequestFile(worktreePath) {
-  return readTextIfPresent((0, import_node_path29.join)(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent((0, import_node_path29.join)(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path29.join)(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent((0, import_node_path29.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
+  return readTextIfPresent((0, import_node_path30.join)(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent((0, import_node_path30.join)(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path30.join)(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent((0, import_node_path30.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
 }
 async function requestReview(threadRef, send2) {
   const from = findThreadByRef(threadRef);
@@ -11954,13 +11987,13 @@ async function requestReview(threadRef, send2) {
   const started = await send2(tab.id, REVIEW_REQUEST_PREFILL);
   return { tab: started, from };
 }
-var import_node_crypto6, import_node_fs30, import_node_path29, REPO_REVIEW_PATH, REPO_REVIEW_NAME, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
+var import_node_crypto6, import_node_fs30, import_node_path30, REPO_REVIEW_PATH, REPO_REVIEW_NAME, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
 var init_request_review = __esm({
   "src/review/request-review.ts"() {
     "use strict";
     import_node_crypto6 = require("crypto");
     import_node_fs30 = require("fs");
-    import_node_path29 = require("path");
+    import_node_path30 = require("path");
     init_global_workspace();
     init_chat_tabs();
     init_thread_store();
@@ -11985,7 +12018,7 @@ function matchSimpleGlob(pattern, name) {
   return new RegExp(`^${escaped}$`).test(name);
 }
 function readWorktreeInclude(repoPath) {
-  const path2 = (0, import_node_path30.join)(repoPath, ".worktreeinclude");
+  const path2 = (0, import_node_path31.join)(repoPath, ".worktreeinclude");
   if (!(0, import_node_fs31.existsSync)(path2)) return [];
   return (0, import_node_fs31.readFileSync)(path2, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
@@ -12000,7 +12033,7 @@ function resolveFilesToCopy(repoPath) {
       for (const entry of (0, import_node_fs31.readdirSync)(repoPath, { withFileTypes: true })) {
         if (!entry.isFile()) continue;
         for (const glob of settings.fileIncludeGlobs) {
-          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path30.basename)(glob), entry.name)) {
+          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path31.basename)(glob), entry.name)) {
             matched.push(entry.name);
             break;
           }
@@ -12026,10 +12059,10 @@ function copyConfiguredFiles(repoPath, worktreePath) {
   const patterns = resolveFilesToCopy(repoPath);
   const copied = [];
   for (const rel of patterns) {
-    const src = (0, import_node_path30.join)(repoPath, rel);
+    const src = (0, import_node_path31.join)(repoPath, rel);
     if (!(0, import_node_fs31.existsSync)(src)) continue;
-    const dest = (0, import_node_path30.join)(worktreePath, rel);
-    (0, import_node_fs31.mkdirSync)((0, import_node_path30.dirname)(dest), { recursive: true });
+    const dest = (0, import_node_path31.join)(worktreePath, rel);
+    (0, import_node_fs31.mkdirSync)((0, import_node_path31.dirname)(dest), { recursive: true });
     (0, import_node_fs31.copyFileSync)(src, dest);
     copied.push(rel);
   }
@@ -12065,7 +12098,7 @@ function buildWorkspaceScriptEnv(opts, baseEnv) {
   const env = stripNestedElectronEnv({
     ...baseEnv ?? process.env
   });
-  const name = opts.workspaceName ?? (0, import_node_path30.basename)(opts.worktreePath);
+  const name = opts.workspaceName ?? (0, import_node_path31.basename)(opts.worktreePath);
   const ports = opts.ports ?? [];
   const primary = ports[0];
   env.SIDEBOARD_WORKSPACE_NAME = name;
@@ -12326,13 +12359,13 @@ async function startDevServer(repoPath, worktreePath, onLine, opts) {
     done: handle.done
   };
 }
-var import_node_fs31, import_node_net, import_node_path30, import_execa4, import_node_readline3, PORT_RANGE_SIZE, cachedLoginEnv;
+var import_node_fs31, import_node_net, import_node_path31, import_execa4, import_node_readline3, PORT_RANGE_SIZE, cachedLoginEnv;
 var init_conductor = __esm({
   "src/hook/conductor.ts"() {
     "use strict";
     import_node_fs31 = require("fs");
     import_node_net = require("net");
-    import_node_path30 = require("path");
+    import_node_path31 = require("path");
     import_execa4 = require("execa");
     import_node_readline3 = require("readline");
     init_settings();
@@ -12394,9 +12427,9 @@ async function findOrphanWorktrees(repoPaths) {
       if ((0, import_node_fs32.existsSync)(root)) {
         for (const entry of (0, import_node_fs32.readdirSync)(root, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
-          const path2 = (0, import_node_path31.join)(root, entry.name).replace(/\/$/, "");
+          const path2 = (0, import_node_path32.join)(root, entry.name).replace(/\/$/, "");
           if (known.has(path2) || seen.has(path2)) continue;
-          if (!(0, import_node_fs32.existsSync)((0, import_node_path31.join)(path2, ".git"))) continue;
+          if (!(0, import_node_fs32.existsSync)((0, import_node_path32.join)(path2, ".git"))) continue;
           seen.add(path2);
           let mtimeMs = 0;
           try {
@@ -12461,12 +12494,12 @@ function worktreeCleanupSettings() {
     autoCleanupOrphans: a.autoCleanupOrphans
   };
 }
-var import_node_fs32, import_node_path31;
+var import_node_fs32, import_node_path32;
 var init_orphan_cleanup = __esm({
   "src/git/orphan-cleanup.ts"() {
     "use strict";
     import_node_fs32 = require("fs");
-    import_node_path31 = require("path");
+    import_node_path32 = require("path");
     init_worktree();
     init_thread_store();
     init_paths();
@@ -12573,10 +12606,10 @@ __export(workspaces_exports, {
   syncWorkspacesFromThreads: () => syncWorkspacesFromThreads
 });
 function workspacesFile() {
-  return (0, import_node_path32.join)(appDataDir(), "workspaces.json");
+  return (0, import_node_path33.join)(appDataDir(), "workspaces.json");
 }
 function removedWorkspacesFile() {
-  return (0, import_node_path32.join)(appDataDir(), "removed-workspaces.json");
+  return (0, import_node_path33.join)(appDataDir(), "removed-workspaces.json");
 }
 function readAll2() {
   const path2 = workspacesFile();
@@ -12635,7 +12668,7 @@ async function addWorkspace(repoPath) {
   if (existing) return existing;
   const next = {
     path: root,
-    name: (0, import_node_path32.basename)(root),
+    name: (0, import_node_path33.basename)(root),
     addedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   writeAll2([...current, next]);
@@ -12660,7 +12693,7 @@ function syncWorkspacesFromThreads(repoPaths) {
     if (!(0, import_node_fs33.existsSync)(path2)) continue;
     const ws = {
       path: path2,
-      name: (0, import_node_path32.basename)(path2),
+      name: (0, import_node_path33.basename)(path2),
       addedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     byPath.set(path2, ws);
@@ -12670,12 +12703,12 @@ function syncWorkspacesFromThreads(repoPaths) {
   if (dirty) writeAll2(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
 }
-var import_node_fs33, import_node_path32;
+var import_node_fs33, import_node_path33;
 var init_workspaces2 = __esm({
   "src/store/workspaces.ts"() {
     "use strict";
     import_node_fs33 = require("fs");
-    import_node_path32 = require("path");
+    import_node_path33 = require("path");
     init_paths();
     init_global_workspace();
     init_worktree();
@@ -12688,11 +12721,11 @@ async function cloneRepoIntoSideboard(opts) {
   if (!url) throw new Error("Clone URL is required");
   let name = opts.name?.trim();
   if (!name) {
-    const leaf = (0, import_node_path33.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
+    const leaf = (0, import_node_path34.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
     name = leaf || "repo";
   }
   name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = (0, import_node_path33.join)(sideboardReposDir(), name);
+  const dest = (0, import_node_path34.join)(sideboardReposDir(), name);
   if ((0, import_node_fs34.existsSync)(dest)) {
     const repoPath2 = await resolveRepoRoot(dest);
     const workspace2 = await ensureWorkspace(repoPath2);
@@ -12708,12 +12741,12 @@ async function cloneRepoIntoSideboard(opts) {
   const workspace = await ensureWorkspace(repoPath);
   return { repoPath, workspace };
 }
-var import_node_fs34, import_node_path33, import_execa6;
+var import_node_fs34, import_node_path34, import_execa6;
 var init_clone_repo = __esm({
   "src/git/clone-repo.ts"() {
     "use strict";
     import_node_fs34 = require("fs");
-    import_node_path33 = require("path");
+    import_node_path34 = require("path");
     import_execa6 = require("execa");
     init_paths();
     init_workspaces2();
@@ -12991,7 +13024,7 @@ function noteTurnLiveEvent(threadId, event) {
     buffers.delete(threadId);
     return;
   }
-  const immediate = event.type === "tool_use" || event.type === "tool_result";
+  const immediate = event.type === "tool_use" || event.type === "tool_result" && !event.partial;
   if (immediate) flush(threadId);
   else scheduleFlush(threadId);
 }
@@ -13043,6 +13076,27 @@ var init_turn_live = __esm({
   }
 });
 
+// src/orchestrator/reconcile-heal.ts
+function shouldReadThreadToHealReconcile(eventType, lastCheckAt, now) {
+  if (SKIP.has(eventType)) return false;
+  if (lastCheckAt != null && now - lastCheckAt < RECONCILE_HEAL_MIN_MS) return false;
+  return true;
+}
+var RECONCILE_HEAL_MIN_MS, SKIP;
+var init_reconcile_heal = __esm({
+  "src/orchestrator/reconcile-heal.ts"() {
+    "use strict";
+    RECONCILE_HEAL_MIN_MS = 2e3;
+    SKIP = /* @__PURE__ */ new Set([
+      "stdout",
+      "thinking",
+      "usage",
+      "stderr",
+      "tool_result"
+    ]);
+  }
+});
+
 // src/threads/fork-worktree.ts
 function requireThread2(idOrRef) {
   const thread = findThreadByRef(idOrRef) ?? null;
@@ -13213,7 +13267,7 @@ var init_quota_failover = __esm({
 // src/threads/adopt.ts
 function thisModuleFile() {
   const cjsFile = typeof __filename !== "undefined" ? __filename : "";
-  return cjsFile || process.argv[1] || (0, import_node_path34.join)(process.cwd(), "package.json");
+  return cjsFile || process.argv[1] || (0, import_node_path35.join)(process.cwd(), "package.json");
 }
 function openReadonlySqlite(file) {
   const req = (0, import_node_module4.createRequire)(thisModuleFile());
@@ -13241,7 +13295,7 @@ function resolveConductorCursorAgentId(workspacePath) {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = (0, import_node_path34.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    const agentsFile = (0, import_node_path35.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
     if (!(0, import_node_fs37.existsSync)(agentsFile)) continue;
     let text4;
     try {
@@ -13299,8 +13353,8 @@ function listConductorWorkspaces() {
   if (!(0, import_node_fs37.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs37.mkdtempSync)((0, import_node_path34.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path34.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs37.mkdtempSync)((0, import_node_path35.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path35.join)(tmp, "conductor.db");
   try {
     (0, import_node_fs37.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
@@ -13390,8 +13444,8 @@ function importConductorWorkspace(workspaceId) {
   if (!(0, import_node_fs37.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs37.mkdtempSync)((0, import_node_path34.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path34.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs37.mkdtempSync)((0, import_node_path35.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path35.join)(tmp, "conductor.db");
   try {
     (0, import_node_fs37.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
@@ -13485,25 +13539,25 @@ function importConductorWorkspace(workspaceId) {
 async function importConductorWorkspaceAsync(workspaceId) {
   return importConductorWorkspace(workspaceId);
 }
-var import_node_child_process4, import_node_fs37, import_node_os10, import_node_path34, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
+var import_node_child_process4, import_node_fs37, import_node_os10, import_node_path35, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
 var init_adopt = __esm({
   "src/threads/adopt.ts"() {
     "use strict";
     import_node_child_process4 = require("child_process");
     import_node_fs37 = require("fs");
     import_node_os10 = require("os");
-    import_node_path34 = require("path");
+    import_node_path35 = require("path");
     import_node_module4 = require("module");
     init_worktree();
     init_thread_store();
-    CONDUCTOR_APP_SUPPORT = (0, import_node_path34.join)(
+    CONDUCTOR_APP_SUPPORT = (0, import_node_path35.join)(
       process.env.HOME ?? "",
       "Library",
       "Application Support",
       "com.conductor.app"
     );
-    CONDUCTOR_DB = (0, import_node_path34.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
-    CURSOR_SDK_STORE = (0, import_node_path34.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+    CONDUCTOR_DB = (0, import_node_path35.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
+    CURSOR_SDK_STORE = (0, import_node_path35.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
   }
 });
 
@@ -13958,7 +14012,7 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path2, maxHunk) {
-  const abs = (0, import_node_path35.join)(worktreePath, path2);
+  const abs = (0, import_node_path36.join)(worktreePath, path2);
   try {
     const st = (0, import_node_fs39.statSync)(abs);
     if (st.isFile() && st.size > maxHunk) {
@@ -14451,7 +14505,7 @@ function isImageRelativePath(relativePath) {
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = (0, import_node_path35.join)(worktreePath, relativePath);
+  const abs = (0, import_node_path36.join)(worktreePath, relativePath);
   const st = (0, import_node_fs39.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -14471,7 +14525,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = (0, import_node_path35.join)(worktreePath, relativePath);
+  const abs = (0, import_node_path36.join)(worktreePath, relativePath);
   const st = (0, import_node_fs39.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -14519,8 +14573,8 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = (0, import_node_path35.join)(worktreePath, relativePath);
-  (0, import_node_fs39.mkdirSync)((0, import_node_path35.dirname)(abs), { recursive: true });
+  const abs = (0, import_node_path36.join)(worktreePath, relativePath);
+  (0, import_node_fs39.mkdirSync)((0, import_node_path36.dirname)(abs), { recursive: true });
   (0, import_node_fs39.writeFileSync)(abs, content, "utf8");
   return { path: relativePath };
 }
@@ -14538,12 +14592,12 @@ async function getDiffSummary(worktreePath, repoPath, opts) {
     truncated: full.files.length > maxFiles
   };
 }
-var import_node_fs39, import_node_path35, mergeBaseCache, MERGE_BASE_TTL_MS, SHA_RE, IMAGE_EXTENSIONS, DEFAULT_UPLOAD_MAX_BYTES;
+var import_node_fs39, import_node_path36, mergeBaseCache, MERGE_BASE_TTL_MS, SHA_RE, IMAGE_EXTENSIONS, DEFAULT_UPLOAD_MAX_BYTES;
 var init_diff = __esm({
   "src/diff/diff.ts"() {
     "use strict";
     import_node_fs39 = require("fs");
-    import_node_path35 = require("path");
+    import_node_path36 = require("path");
     init_run();
     init_worktree();
     mergeBaseCache = /* @__PURE__ */ new Map();
@@ -14739,7 +14793,7 @@ function scanSkillsDir(dir, source, out) {
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = (0, import_node_path36.join)(dir, entry, "SKILL.md");
+    const skillMd = (0, import_node_path37.join)(dir, entry, "SKILL.md");
     if (!(0, import_node_fs40.existsSync)(skillMd)) continue;
     try {
       if (!(0, import_node_fs40.statSync)(skillMd).isFile()) continue;
@@ -14761,12 +14815,12 @@ function scanClaudePluginSkills(pluginsRoot, out) {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill((0, import_node_path36.join)(dir, "SKILL.md"), "cli");
+      const skill = readSkill((0, import_node_path37.join)(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = (0, import_node_path36.join)(dir, entry);
+      const full = (0, import_node_path37.join)(dir, entry);
       try {
         if (!(0, import_node_fs40.statSync)(full).isDirectory()) continue;
       } catch {
@@ -14786,17 +14840,17 @@ function discoverSkills(worktreePath) {
   const home = (0, import_node_os11.homedir)();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir((0, import_node_path36.join)(worktreePath, rel), "workspace", collected);
+    scanSkillsDir((0, import_node_path37.join)(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    (0, import_node_path36.join)(home, ".claude/skills"),
-    (0, import_node_path36.join)(home, ".cursor/skills"),
-    (0, import_node_path36.join)(home, ".sideboard/skills"),
-    (0, import_node_path36.join)(home, ".brightsy/skills")
+    (0, import_node_path37.join)(home, ".claude/skills"),
+    (0, import_node_path37.join)(home, ".cursor/skills"),
+    (0, import_node_path37.join)(home, ".sideboard/skills"),
+    (0, import_node_path37.join)(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills((0, import_node_path36.join)(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills((0, import_node_path37.join)(home, ".claude/plugins"), collected);
   const rank = { workspace: 0, user: 1, cli: 2 };
   const byCommand = /* @__PURE__ */ new Map();
   for (const skill of collected) {
@@ -14822,13 +14876,13 @@ function readSkillBody(skillPath, maxChars = 12e3) {
 
 \u2026(truncated)` : raw;
 }
-var import_node_fs40, import_node_os11, import_node_path36;
+var import_node_fs40, import_node_os11, import_node_path37;
 var init_discover = __esm({
   "src/skills/discover.ts"() {
     "use strict";
     import_node_fs40 = require("fs");
     import_node_os11 = require("os");
-    import_node_path36 = require("path");
+    import_node_path37 = require("path");
   }
 });
 
@@ -14919,7 +14973,7 @@ var init_expand = __esm({
 
 // src/composer/stage-files.ts
 function fileExtension(filePath) {
-  const base = (0, import_node_path37.basename)(filePath).toLowerCase();
+  const base = (0, import_node_path38.basename)(filePath).toLowerCase();
   return base.includes(".") ? base.split(".").pop() || "" : "";
 }
 function isImageFilePath(filePath) {
@@ -14929,9 +14983,9 @@ function imageMimeType(filePath) {
   return IMAGE_MIME_BY_EXT[fileExtension(filePath)] || "image/png";
 }
 function ensureAttachmentsDir(worktreePath) {
-  const dir = (0, import_node_path37.join)(worktreePath, ATTACHMENTS_DIR);
+  const dir = (0, import_node_path38.join)(worktreePath, ATTACHMENTS_DIR);
   (0, import_node_fs41.mkdirSync)(dir, { recursive: true });
-  const gi = (0, import_node_path37.join)(dir, ".gitignore");
+  const gi = (0, import_node_path38.join)(dir, ".gitignore");
   if (!(0, import_node_fs41.existsSync)(gi)) {
     (0, import_node_fs41.writeFileSync)(gi, attachmentsGitignoreBody(), "utf8");
   }
@@ -14939,12 +14993,12 @@ function ensureAttachmentsDir(worktreePath) {
 }
 function uniqueAttachmentName(dir, originalName) {
   const safe = originalName.replace(/[/\\]/g, "_") || "file";
-  if (!(0, import_node_fs41.existsSync)((0, import_node_path37.join)(dir, safe))) return safe;
-  const ext = (0, import_node_path37.extname)(safe);
+  if (!(0, import_node_fs41.existsSync)((0, import_node_path38.join)(dir, safe))) return safe;
+  const ext = (0, import_node_path38.extname)(safe);
   const stem = ext ? safe.slice(0, -ext.length) : safe;
   for (let i = 1; i < 1e4; i++) {
     const candidate = `${stem}-${i}${ext}`;
-    if (!(0, import_node_fs41.existsSync)((0, import_node_path37.join)(dir, candidate))) return candidate;
+    if (!(0, import_node_fs41.existsSync)((0, import_node_path38.join)(dir, candidate))) return candidate;
   }
   return `${stem}-${(0, import_node_crypto8.randomUUID)()}${ext}`;
 }
@@ -14996,7 +15050,7 @@ function attachmentFromBuffer(name, buf, opts) {
   };
 }
 function attachmentFromAbsolutePath(absolutePath) {
-  const name = (0, import_node_path37.basename)(absolutePath);
+  const name = (0, import_node_path38.basename)(absolutePath);
   try {
     const st = (0, import_node_fs41.statSync)(absolutePath);
     if (!st.isFile()) {
@@ -15023,12 +15077,12 @@ function stageAbsolutePathsAsAttachments(worktreePath, absolutePaths) {
   const dir = ensureAttachmentsDir(worktreePath);
   const out = [];
   for (const abs of absolutePaths) {
-    const originalName = (0, import_node_path37.basename)(abs);
+    const originalName = (0, import_node_path38.basename)(abs);
     try {
       const st = (0, import_node_fs41.statSync)(abs);
       if (!st.isFile()) continue;
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = (0, import_node_path37.join)(dir, name);
+      const destAbs = (0, import_node_path38.join)(dir, name);
       (0, import_node_fs41.copyFileSync)(abs, destAbs);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
       const buf = (0, import_node_fs41.readFileSync)(destAbs);
@@ -15053,7 +15107,7 @@ function stageBuffersAsAttachments(worktreePath, buffers2) {
     try {
       const buf = Buffer.from(item.dataBase64, "base64");
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = (0, import_node_path37.join)(dir, name);
+      const destAbs = (0, import_node_path38.join)(dir, name);
       (0, import_node_fs41.writeFileSync)(destAbs, buf);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
       out.push(attachmentFromBuffer(name, buf, { path: rel }));
@@ -15090,15 +15144,15 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
     if (!rel || rel.includes("..") || rel.startsWith("/")) {
       out.push({
         id: (0, import_node_crypto8.randomUUID)(),
-        name: (0, import_node_path37.basename)(rel) || "file",
+        name: (0, import_node_path38.basename)(rel) || "file",
         kind: "file",
         content: `(invalid path: ${rel})`
       });
       continue;
     }
-    const name = (0, import_node_path37.basename)(rel);
+    const name = (0, import_node_path38.basename)(rel);
     try {
-      const abs = (0, import_node_path37.join)(worktreePath, rel);
+      const abs = (0, import_node_path38.join)(worktreePath, rel);
       const st = (0, import_node_fs41.statSync)(abs);
       if (!st.isFile()) continue;
       const buf = (0, import_node_fs41.readFileSync)(abs);
@@ -15114,12 +15168,12 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
   }
   return out;
 }
-var import_node_fs41, import_node_path37, import_node_crypto8, IMAGE_EXTENSIONS2, IMAGE_MIME_BY_EXT, MAX_INLINE_BYTES, MAX_PREVIEW_BYTES;
+var import_node_fs41, import_node_path38, import_node_crypto8, IMAGE_EXTENSIONS2, IMAGE_MIME_BY_EXT, MAX_INLINE_BYTES, MAX_PREVIEW_BYTES;
 var init_stage_files = __esm({
   "src/composer/stage-files.ts"() {
     "use strict";
     import_node_fs41 = require("fs");
-    import_node_path37 = require("path");
+    import_node_path38 = require("path");
     import_node_crypto8 = require("crypto");
     init_workspace_scratch();
     IMAGE_EXTENSIONS2 = /* @__PURE__ */ new Set([
@@ -15296,7 +15350,7 @@ function loadAgentInstructions(worktreePath, agent) {
   const out = [];
   for (const rel of candidates) {
     if (seenPaths.has(rel)) continue;
-    const abs = (0, import_node_path38.join)(worktreePath, rel);
+    const abs = (0, import_node_path39.join)(worktreePath, rel);
     if (!(0, import_node_fs42.existsSync)(abs)) continue;
     try {
       if (!(0, import_node_fs42.statSync)(abs).isFile()) continue;
@@ -15340,12 +15394,12 @@ function withAgentInstructions(prompt, files) {
 
 ${prompt}`;
 }
-var import_node_fs42, import_node_path38, FILES_BY_AGENT, MAX_CHARS_PER_FILE;
+var import_node_fs42, import_node_path39, FILES_BY_AGENT, MAX_CHARS_PER_FILE;
 var init_instructions = __esm({
   "src/agents/instructions.ts"() {
     "use strict";
     import_node_fs42 = require("fs");
-    import_node_path38 = require("path");
+    import_node_path39 = require("path");
     init_git_auth_mode();
     init_worktree_labels();
     FILES_BY_AGENT = {
@@ -15435,13 +15489,13 @@ __export(plan_file_exports, {
   writePlanFile: () => writePlanFile
 });
 function ensureAttachmentsGitignore(worktreePath) {
-  const gitignoreAbs = (0, import_node_path39.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  const gitignoreAbs = (0, import_node_path40.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
   if ((0, import_node_fs43.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs43.mkdirSync)((0, import_node_path39.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs43.mkdirSync)((0, import_node_path40.dirname)(gitignoreAbs), { recursive: true });
   (0, import_node_fs43.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function planFileAbs(worktreePath) {
-  return (0, import_node_path39.join)(worktreePath, PLAN_FILE_REL);
+  return (0, import_node_path40.join)(worktreePath, PLAN_FILE_REL);
 }
 function readTextIfPresent2(abs) {
   if (!(0, import_node_fs43.existsSync)(abs)) return null;
@@ -15453,22 +15507,22 @@ function readTextIfPresent2(abs) {
   }
 }
 function readPlanFile(worktreePath) {
-  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path39.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path39.join)(worktreePath, LEGACY_PLAN_FILE_REL));
+  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path40.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path40.join)(worktreePath, LEGACY_PLAN_FILE_REL));
 }
 function writePlanFile(worktreePath, content) {
   ensureAttachmentsGitignore(worktreePath);
   const abs = planFileAbs(worktreePath);
-  (0, import_node_fs43.mkdirSync)((0, import_node_path39.dirname)(abs), { recursive: true });
+  (0, import_node_fs43.mkdirSync)((0, import_node_path40.dirname)(abs), { recursive: true });
   const body = content.trimEnd() + (content.endsWith("\n") ? "" : "\n");
   (0, import_node_fs43.writeFileSync)(abs, body, "utf8");
   return PLAN_FILE_REL;
 }
-var import_node_fs43, import_node_path39;
+var import_node_fs43, import_node_path40;
 var init_plan_file = __esm({
   "src/plan/plan-file.ts"() {
     "use strict";
     import_node_fs43 = require("fs");
-    import_node_path39 = require("path");
+    import_node_path40 = require("path");
     init_workspace_scratch();
     init_plan_present();
     init_plan_present();
@@ -15514,6 +15568,37 @@ var init_sync_branch = __esm({
   }
 });
 
+// src/agents/cursor-store.ts
+function cursorSdkStoreDir(threadId) {
+  const root = (0, import_node_path41.join)(appDataDir(), CURSOR_SDK_STORE_DIR);
+  const id = sanitizeCursorStoreSegment(threadId);
+  if (!id) return root;
+  return (0, import_node_path41.join)(root, "threads", id);
+}
+function cursorSdkRunsNdjsonPath(threadId) {
+  return (0, import_node_path41.join)(cursorSdkStoreDir(threadId), "runs.ndjson");
+}
+function cursorSdkRunsNdjsonSearchPaths(threadId) {
+  const scoped = cursorSdkRunsNdjsonPath(threadId);
+  const shared = cursorSdkRunsNdjsonPath(null);
+  if (!threadId || !sanitizeCursorStoreSegment(threadId) || scoped === shared) {
+    return [shared];
+  }
+  return [scoped, shared];
+}
+function sanitizeCursorStoreSegment(threadId) {
+  return (threadId ?? "").trim().replace(/[^a-zA-Z0-9._-]/g, "_");
+}
+var import_node_path41, CURSOR_SDK_STORE_DIR;
+var init_cursor_store = __esm({
+  "src/agents/cursor-store.ts"() {
+    "use strict";
+    import_node_path41 = require("path");
+    init_paths();
+    CURSOR_SDK_STORE_DIR = "cursor-sdk-store";
+  }
+});
+
 // src/agents/cursor-recover.ts
 var cursor_recover_exports = {};
 __export(cursor_recover_exports, {
@@ -15522,7 +15607,14 @@ __export(cursor_recover_exports, {
 function recoverFinishedCursorRun(opts) {
   const agentId = opts.agentId.trim();
   if (!agentId) return null;
-  const runsPath = (0, import_node_path40.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
+  let best = null;
+  for (const runsPath of cursorSdkRunsNdjsonSearchPaths(opts.threadId)) {
+    const hit = scanFinishedCursorRuns(runsPath, agentId, opts.startedAfterMs);
+    if (hit && (!best || hit.endedAt >= best.endedAt)) best = hit;
+  }
+  return best;
+}
+function scanFinishedCursorRuns(runsPath, agentId, startedAfterMs) {
   if (!(0, import_node_fs44.existsSync)(runsPath)) return null;
   try {
     const lines = (0, import_node_fs44.readFileSync)(runsPath, "utf8").split("\n");
@@ -15541,7 +15633,7 @@ function recoverFinishedCursorRun(opts) {
       if (typeof row.result !== "string" || !row.result.trim()) continue;
       const endedAt = typeof row.endedAt === "number" ? row.endedAt : 0;
       const createdAt = typeof row.createdAt === "number" ? row.createdAt : 0;
-      if (createdAt < opts.startedAfterMs && endedAt < opts.startedAfterMs) continue;
+      if (createdAt < startedAfterMs && endedAt < startedAfterMs) continue;
       if (!best || endedAt >= best.endedAt) {
         best = { runId: row.runId || "", result: row.result.trim(), endedAt };
       }
@@ -15551,13 +15643,12 @@ function recoverFinishedCursorRun(opts) {
     return null;
   }
 }
-var import_node_fs44, import_node_path40;
+var import_node_fs44;
 var init_cursor_recover = __esm({
   "src/agents/cursor-recover.ts"() {
     "use strict";
     import_node_fs44 = require("fs");
-    import_node_path40 = require("path");
-    init_paths();
+    init_cursor_store();
   }
 });
 
@@ -15718,6 +15809,7 @@ var init_orchestrator = __esm({
     init_run();
     init_repo_git_lock();
     init_turn_live();
+    init_reconcile_heal();
     init_request_review();
     init_fork_worktree();
     init_quota_failover();
@@ -15747,6 +15839,8 @@ var init_orchestrator = __esm({
       draining = /* @__PURE__ */ new Set();
       /** Threads past setStatus(running) but not yet in activeTurns (spawn in flight). */
       startingTurns = /* @__PURE__ */ new Set();
+      /** Last sync thread-file read for false-stop heal (throttled per thread). */
+      lastReconcileHealAt = /* @__PURE__ */ new Map();
       /**
        * Threads intentionally force-stopped. Prevents runTurn from re-asserting
        * `running` after spawn, and from overwriting `stopped` with idle/error when
@@ -16344,7 +16438,13 @@ var init_orchestrator = __esm({
               if (event.type === "stderr" && typeof event.data === "string") {
                 pushTurnStderr(stderrTail, event.data);
               }
-              if (event.type !== "stdout" && event.type !== "thinking") {
+              const now = Date.now();
+              if (shouldReadThreadToHealReconcile(
+                event.type,
+                this.lastReconcileHealAt.get(threadId),
+                now
+              )) {
+                this.lastReconcileHealAt.set(threadId, now);
                 const live = readThread(threadId);
                 if (live?.lastError?.includes("reconciled on startup") && (this.activeTurns.has(threadId) || this.startingTurns.has(threadId))) {
                   setStatus(threadId, "running");
@@ -16388,7 +16488,8 @@ var init_orchestrator = __esm({
               for (let i = 0; i < 8; i++) {
                 const recovered = recoverFinishedCursorRun2({
                   agentId: sessionId,
-                  startedAfterMs: turnStartedAt - 5e3
+                  startedAfterMs: turnStartedAt - 5e3,
+                  threadId
                 });
                 if (recovered?.result) {
                   assistantText = recovered.result;
@@ -17935,6 +18036,7 @@ __export(index_exports, {
   isThinkingEffort: () => isThinkingEffort,
   isThisProcessDesktopHost: () => isThisProcessDesktopHost,
   isThreadCaffeinated: () => isThreadCaffeinated,
+  isThreadRecordFile: () => isThreadRecordFile,
   isWorkspaceScratchPath: () => isWorkspaceScratchPath,
   lastRequestOccupancy: () => lastRequestOccupancy,
   linearAuthorizationHeader: () => linearAuthorizationHeader,
@@ -19154,7 +19256,7 @@ init_orphan_cleanup();
 var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_zod4 = require("zod");
-var import_node_path41 = require("path");
+var import_node_path42 = require("path");
 init_orchestrator();
 init_worktree();
 init_create();
@@ -20031,7 +20133,7 @@ async function startMcpServer() {
       async () => {
         const threads = orch.getThreads(true);
         const lines = threads.map((t) => {
-          const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path41.basename)(t.repoPath) || t.repoPath;
+          const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path42.basename)(t.repoPath) || t.repoPath;
           const live = t.status === "running" || t.status === "queued" ? readTurnLive(t.id) : null;
           const progress = live?.summary ? `  ${live.summary}` : "";
           return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}  sideboard://thread/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}${progress}`;
@@ -21373,14 +21475,14 @@ init_injected_mcp();
 // src/agents/user-mcp-config.ts
 var import_node_fs46 = require("fs");
 var import_node_os12 = require("os");
-var import_node_path42 = require("path");
+var import_node_path43 = require("path");
 init_paths();
 init_injected_mcp();
 function userCursorMcpConfigPath() {
-  return (0, import_node_path42.join)((0, import_node_os12.homedir)(), ".cursor", "mcp.json");
+  return (0, import_node_path43.join)((0, import_node_os12.homedir)(), ".cursor", "mcp.json");
 }
 function userClaudeMcpConfigPath() {
-  return (0, import_node_path42.join)((0, import_node_os12.homedir)(), ".claude.json");
+  return (0, import_node_path43.join)((0, import_node_os12.homedir)(), ".claude.json");
 }
 function asObject(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
@@ -21415,7 +21517,7 @@ function writeMergedMcpServersJson(configPath, sideboard) {
     }
   }
   const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
-  (0, import_node_fs46.mkdirSync)((0, import_node_path42.dirname)(configPath), { recursive: true });
+  (0, import_node_fs46.mkdirSync)((0, import_node_path43.dirname)(configPath), { recursive: true });
   (0, import_node_fs46.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
 `);
 }
@@ -23066,7 +23168,7 @@ var import_ws3 = require("ws");
 // src/slack/relay-static.ts
 var import_node_fs47 = require("fs");
 var import_promises = require("fs/promises");
-var import_node_path43 = __toESM(require("path"), 1);
+var import_node_path44 = __toESM(require("path"), 1);
 var TYPES = {
   ".css": "text/css; charset=utf-8",
   ".html": "text/html; charset=utf-8",
@@ -23097,9 +23199,9 @@ function resolveStaticPath(root, requestUrl) {
     return null;
   }
   if (!pathname.startsWith("/") || pathname.includes("\0")) return null;
-  const rootResolved = import_node_path43.default.resolve(root);
-  const candidate = import_node_path43.default.resolve(rootResolved, `.${pathname}`);
-  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + import_node_path43.default.sep)) {
+  const rootResolved = import_node_path44.default.resolve(root);
+  const candidate = import_node_path44.default.resolve(rootResolved, `.${pathname}`);
+  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + import_node_path44.default.sep)) {
     return null;
   }
   return candidate;
@@ -23113,7 +23215,7 @@ async function fileSize(file) {
   }
 }
 function sendFile(req, res, file, size) {
-  const ext = import_node_path43.default.extname(file).toLowerCase();
+  const ext = import_node_path44.default.extname(file).toLowerCase();
   res.writeHead(200, {
     "Content-Type": TYPES[ext] ?? "application/octet-stream",
     "Content-Length": size,
@@ -23132,7 +23234,7 @@ async function tryServeStatic(req, res, root) {
   if (!candidate) return false;
   const direct = await fileSize(candidate);
   if (direct != null) return sendFile(req, res, candidate, direct);
-  const asIndex = import_node_path43.default.join(candidate, "index.html");
+  const asIndex = import_node_path44.default.join(candidate, "index.html");
   const indexSize = await fileSize(asIndex);
   if (indexSize != null) return sendFile(req, res, asIndex, indexSize);
   return false;
@@ -23692,6 +23794,7 @@ init_outbound_watch();
   isThinkingEffort,
   isThisProcessDesktopHost,
   isThreadCaffeinated,
+  isThreadRecordFile,
   isWorkspaceScratchPath,
   lastRequestOccupancy,
   linearAuthorizationHeader,