@sideboard-ai/core 0.1.116 → 0.1.117

package/dist/agents/cursor-runner.cjs

@@ -4,7 +4,6 @@
 // src/agents/cursor-runner.ts
 var import_sdk = require("@cursor/sdk");
 var import_node_fs10 = require("fs");
-var import_node_path11 = require("path");
 var import_node_readline2 = require("readline");
 
 // src/hook/nested-electron-env.ts
@@ -24,62 +23,32 @@ var STRIP_NESTED_ELECTRON_THEN_EXEC = [
   'exec "$@"'
 ].join("; ");
 
-// src/store/paths.ts
-var import_node_path4 = require("path");
-var import_node_os2 = require("os");
-var import_node_path5 = require("path");
-var import_node_fs4 = require("fs");
-
-// src/hook/settings.ts
-var import_node_fs3 = require("fs");
-var import_node_os = require("os");
-var import_node_path3 = require("path");
-var import_smol_toml = require("smol-toml");
-
-// src/hook/convention-setup.ts
-var import_node_fs = require("fs");
-var import_node_path = require("path");
-
-// src/hook/cursor-worktrees.ts
-var import_node_fs2 = require("fs");
-var import_node_path2 = require("path");
-var import_execa = require("execa");
-var import_node_readline = require("readline");
-
-// src/store/paths.ts
-function appDataDir() {
-  const override = process.env.SIDEBOARD_APP_DATA?.trim();
-  const base = override ? override : process.platform === "darwin" ? (0, import_node_path5.join)((0, import_node_os2.homedir)(), "Library", "Application Support", "sideboard") : process.platform === "win32" ? (0, import_node_path5.join)(process.env.APPDATA ?? (0, import_node_path5.join)((0, import_node_os2.homedir)(), "AppData", "Roaming"), "sideboard") : (0, import_node_path5.join)((0, import_node_os2.homedir)(), ".local", "share", "sideboard");
-  (0, import_node_fs4.mkdirSync)(base, { recursive: true });
-  return base;
-}
-
 // src/agents/cursor-ripgrep.ts
-var import_node_fs9 = require("fs");
+var import_node_fs5 = require("fs");
 var import_node_module = require("module");
-var import_node_path10 = require("path");
+var import_node_path5 = require("path");
 
 // src/agents/node-launch.ts
-var import_node_fs8 = require("fs");
-var import_node_os4 = require("os");
-var import_node_path9 = require("path");
+var import_node_fs4 = require("fs");
+var import_node_os2 = require("os");
+var import_node_path4 = require("path");
 
 // src/git/run.ts
-var import_execa2 = require("execa");
+var import_execa = require("execa");
 
 // src/agents/path.ts
-var import_node_fs5 = require("fs");
+var import_node_fs = require("fs");
 var import_node_child_process = require("child_process");
-var import_node_os3 = require("os");
-var import_node_path6 = require("path");
+var import_node_os = require("os");
+var import_node_path = require("path");
 
 // src/git/stale-lock.ts
-var import_node_fs6 = require("fs");
-var import_node_path7 = require("path");
+var import_node_fs2 = require("fs");
+var import_node_path2 = require("path");
 
 // src/agents/packaged-runtime.ts
-var import_node_fs7 = require("fs");
-var import_node_path8 = require("path");
+var import_node_fs3 = require("fs");
+var import_node_path3 = require("path");
 function electronResourcesPath() {
   const resources = process.resourcesPath;
   if (typeof resources !== "string" || !resources) return null;
@@ -88,14 +57,14 @@ function electronResourcesPath() {
 function packagedCursorRuntimeDir() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const dir = (0, import_node_path8.join)(resources, "cursor-runtime");
-  if (!(0, import_node_fs7.existsSync)((0, import_node_path8.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
+  const dir = (0, import_node_path3.join)(resources, "cursor-runtime");
+  if (!(0, import_node_fs3.existsSync)((0, import_node_path3.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
   return dir;
 }
 function packagedCursorRipgrepCandidate(platformPkg, binName) {
   const dir = packagedCursorRuntimeDir();
   if (!dir) return null;
-  return (0, import_node_path8.join)(dir, "node_modules", platformPkg, "bin", binName);
+  return (0, import_node_path3.join)(dir, "node_modules", platformPkg, "bin", binName);
 }
 
 // src/agents/node-launch.ts
@@ -107,7 +76,7 @@ function unpackedAsarPath(filePath) {
   if (!isAsarPath(filePath)) return null;
   const unpacked = filePath.replace(/\.asar(?=[/\\])/, ".asar.unpacked");
   if (unpacked === filePath) return null;
-  return (0, import_node_fs8.existsSync)(unpacked) ? unpacked : null;
+  return (0, import_node_fs4.existsSync)(unpacked) ? unpacked : null;
 }
 function nodeReadableScriptPath(scriptPath) {
   return unpackedAsarPath(scriptPath) ?? scriptPath;
@@ -123,21 +92,21 @@ function platformRipgrepPackage() {
 }
 function usableRipgrepPath(candidate) {
   const raw = candidate?.trim();
-  if (!raw || !(0, import_node_path10.isAbsolute)(raw)) return null;
+  if (!raw || !(0, import_node_path5.isAbsolute)(raw)) return null;
   const readable = nodeReadableScriptPath(raw);
-  if (!(0, import_node_fs9.existsSync)(readable) || isAsarPath(readable)) return null;
+  if (!(0, import_node_fs5.existsSync)(readable) || isAsarPath(readable)) return null;
   return readable;
 }
 function walkForBundledRipgrep(startFile) {
   if (!startFile) return null;
   const pkg = platformRipgrepPackage();
   const name = rgBinaryName();
-  let dir = (0, import_node_path10.dirname)((0, import_node_path10.resolve)(startFile));
-  const root = (0, import_node_path10.parse)(dir).root;
+  let dir = (0, import_node_path5.dirname)((0, import_node_path5.resolve)(startFile));
+  const root = (0, import_node_path5.parse)(dir).root;
   while (dir !== root) {
-    const hit = usableRipgrepPath((0, import_node_path10.join)(dir, "node_modules", pkg, "bin", name));
+    const hit = usableRipgrepPath((0, import_node_path5.join)(dir, "node_modules", pkg, "bin", name));
     if (hit) return hit;
-    const next = (0, import_node_path10.dirname)(dir);
+    const next = (0, import_node_path5.dirname)(dir);
     if (next === dir) break;
     dir = next;
   }
@@ -147,7 +116,7 @@ function requireResolveBundledRipgrep(fromFile) {
   try {
     const req = (0, import_node_module.createRequire)(fromFile);
     const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
-    return usableRipgrepPath((0, import_node_path10.join)((0, import_node_path10.dirname)(pkgJson), "bin", rgBinaryName()));
+    return usableRipgrepPath((0, import_node_path5.join)((0, import_node_path5.dirname)(pkgJson), "bin", rgBinaryName()));
   } catch {
     return null;
   }
@@ -172,6 +141,51 @@ function ensureCursorRipgrepPath(opts) {
   return path;
 }
 
+// src/agents/cursor-store.ts
+var import_node_path11 = require("path");
+
+// src/store/paths.ts
+var import_node_path9 = require("path");
+var import_node_os4 = require("os");
+var import_node_path10 = require("path");
+var import_node_fs9 = require("fs");
+
+// src/hook/settings.ts
+var import_node_fs8 = require("fs");
+var import_node_os3 = require("os");
+var import_node_path8 = require("path");
+var import_smol_toml = require("smol-toml");
+
+// src/hook/convention-setup.ts
+var import_node_fs6 = require("fs");
+var import_node_path6 = require("path");
+
+// src/hook/cursor-worktrees.ts
+var import_node_fs7 = require("fs");
+var import_node_path7 = require("path");
+var import_execa2 = require("execa");
+var import_node_readline = require("readline");
+
+// src/store/paths.ts
+function appDataDir() {
+  const override = process.env.SIDEBOARD_APP_DATA?.trim();
+  const base = override ? override : process.platform === "darwin" ? (0, import_node_path10.join)((0, import_node_os4.homedir)(), "Library", "Application Support", "sideboard") : process.platform === "win32" ? (0, import_node_path10.join)(process.env.APPDATA ?? (0, import_node_path10.join)((0, import_node_os4.homedir)(), "AppData", "Roaming"), "sideboard") : (0, import_node_path10.join)((0, import_node_os4.homedir)(), ".local", "share", "sideboard");
+  (0, import_node_fs9.mkdirSync)(base, { recursive: true });
+  return base;
+}
+
+// src/agents/cursor-store.ts
+var CURSOR_SDK_STORE_DIR = "cursor-sdk-store";
+function cursorSdkStoreDir(threadId) {
+  const root = (0, import_node_path11.join)(appDataDir(), CURSOR_SDK_STORE_DIR);
+  const id = sanitizeCursorStoreSegment(threadId);
+  if (!id) return root;
+  return (0, import_node_path11.join)(root, "threads", id);
+}
+function sanitizeCursorStoreSegment(threadId) {
+  return (threadId ?? "").trim().replace(/[^a-zA-Z0-9._-]/g, "_");
+}
+
 // src/agents/cursor-session.ts
 function cursorErrorMessage(err) {
   if (err instanceof Error) return err.message.trim();
@@ -187,7 +201,8 @@ function isUnresumableCursorSession(err) {
   if (name === "AgentNotFoundError") return true;
   const lower = cursorErrorMessage(err).toLowerCase();
   if (!lower) return false;
-  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /cannot resume/.test(lower);
+  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || // Shared JSONL last-write-wins: `Run run-… not found for agent agent-…`
+  /\brun\b.{0,80}\bnot found for agent\b/.test(lower) || /cannot resume/.test(lower);
 }
 function cursorSessionRecoveryMessage(err, agentId) {
   const detail = cursorErrorMessage(err) || "unresumable session";
@@ -581,8 +596,8 @@ function modelSelection(model, opts) {
   }
   return params.length > 0 ? { id, params } : { id };
 }
-function localAgentStore() {
-  const root = (0, import_node_path11.join)(appDataDir(), "cursor-sdk-store");
+function localAgentStore(threadId) {
+  const root = cursorSdkStoreDir(threadId);
   (0, import_node_fs10.mkdirSync)(root, { recursive: true });
   return new import_sdk.JsonlLocalAgentStore(root);
 }
@@ -641,7 +656,7 @@ async function main() {
     fast: Boolean(req.fast)
   });
   const mode = req.planMode ? "plan" : "agent";
-  const store = localAgentStore();
+  const store = localAgentStore(req.threadId);
   const local = withCursorLocalHangGuards({ cwd: req.cwd, store });
   const mcpServers = req.mcpServers && Object.keys(req.mcpServers).length > 0 ? req.mcpServers : void 0;
   const createOpts = {

package/dist/agents/cursor-runner.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  cursorSdkStoreDir
+} from "../chunk-VHX673DI.js";
 import {
   createAgentStreamCoalescer
 } from "../chunk-AXQ4ZWHK.js";
@@ -7,19 +10,16 @@ import {
   cursorSdkMessageToEvents,
   ensureCursorRipgrepPath,
   formatUnknownDetail
-} from "../chunk-GBY7OOMB.js";
+} from "../chunk-NZBDVBCP.js";
 import {
   dropNestedElectronEnvFromProcess
 } from "../chunk-4TR3HZFT.js";
-import {
-  appDataDir
-} from "../chunk-QZQEXME2.js";
+import "../chunk-QZQEXME2.js";
 import "../chunk-DVM4ID64.js";
 
 // src/agents/cursor-runner.ts
 import { Agent, CursorAgentError, JsonlLocalAgentStore } from "@cursor/sdk";
 import { mkdirSync } from "fs";
-import { join } from "path";
 import { createInterface } from "readline";
 
 // src/agents/cursor-session.ts
@@ -37,7 +37,8 @@ function isUnresumableCursorSession(err) {
   if (name === "AgentNotFoundError") return true;
   const lower = cursorErrorMessage(err).toLowerCase();
   if (!lower) return false;
-  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /cannot resume/.test(lower);
+  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || // Shared JSONL last-write-wins: `Run run-… not found for agent agent-…`
+  /\brun\b.{0,80}\bnot found for agent\b/.test(lower) || /cannot resume/.test(lower);
 }
 function cursorSessionRecoveryMessage(err, agentId) {
   const detail = cursorErrorMessage(err) || "unresumable session";
@@ -116,8 +117,8 @@ function modelSelection(model, opts) {
   }
   return params.length > 0 ? { id, params } : { id };
 }
-function localAgentStore() {
-  const root = join(appDataDir(), "cursor-sdk-store");
+function localAgentStore(threadId) {
+  const root = cursorSdkStoreDir(threadId);
   mkdirSync(root, { recursive: true });
   return new JsonlLocalAgentStore(root);
 }
@@ -176,7 +177,7 @@ async function main() {
     fast: Boolean(req.fast)
   });
   const mode = req.planMode ? "plan" : "agent";
-  const store = localAgentStore();
+  const store = localAgentStore(req.threadId);
   const local = withCursorLocalHangGuards({ cwd: req.cwd, store });
   const mcpServers = req.mcpServers && Object.keys(req.mcpServers).length > 0 ? req.mcpServers : void 0;
   const createOpts = {

package/dist/{agents-7NIX44RB.js → agents-GUEKGV7V.js}

@@ -28,25 +28,25 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-5KSLD4MU.js";
+} from "./chunk-YJ2WV5TZ.js";
 import "./chunk-EKIDHL2T.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-4OJMZ6P2.js";
-import "./chunk-7WC5UWEB.js";
+} from "./chunk-4WV7C7WP.js";
+import "./chunk-X3NIPGQT.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-GBY7OOMB.js";
-import "./chunk-FZCIQYNQ.js";
+} from "./chunk-NZBDVBCP.js";
+import "./chunk-VGPLXQIH.js";
 import "./chunk-FKOIHGKV.js";
 import "./chunk-4NR5FL46.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-JT7R45JB.js";
-import "./chunk-A4VZXJEJ.js";
+import "./chunk-HPAWHIZ3.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-QZQEXME2.js";
 import {

package/dist/{agents-DU7DHY7A.js → agents-OCGAZCKT.js}

@@ -32,18 +32,18 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-OFF5AFCR.js";
+} from "./chunk-4CDCTYTM.js";
 import "./chunk-YMRT2DU6.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-XOYQ7LNQ.js";
-import "./chunk-ZYEFCSZJ.js";
-import "./chunk-ZMROW673.js";
+} from "./chunk-4NAW5BAQ.js";
+import "./chunk-XTZQL7OU.js";
+import "./chunk-WCU3FHEI.js";
 import "./chunk-B3SJXYIJ.js";
-import "./chunk-KYOTBZ6S.js";
+import "./chunk-RG737OWT.js";
 import {
   conductorBundledBinDir,
   enrichPathWithNpmGlobalBin,

package/dist/{chunk-OFF5AFCR.js → chunk-4CDCTYTM.js}

@@ -9,13 +9,13 @@ import {
 } from "./chunk-YMRT2DU6.js";
 import {
   isOrchestratorThread
-} from "./chunk-XOYQ7LNQ.js";
+} from "./chunk-4NAW5BAQ.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-ZMROW673.js";
+} from "./chunk-WCU3FHEI.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -237,7 +237,7 @@ function summarizeTurnStderr(tail, maxChars = 500) {
 function looksLikeInvalidAgentSession(text) {
   const lower = text.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(text) {
   if (looksLikeAgentFailureMessage(text)) return false;
@@ -1913,7 +1913,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-H4YNASM6.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-Z37MNYU6.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -2854,6 +2854,7 @@ var cursorAdapter = {
     const req = {
       prompt,
       cwd: thread.worktreePath,
+      threadId: thread.id,
       agentId,
       model: thread.model,
       effort: thread.effort,

package/dist/{chunk-XOYQ7LNQ.js → chunk-4NAW5BAQ.js}

@@ -2,18 +2,18 @@
 
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-ZYEFCSZJ.js";
+} from "./chunk-XTZQL7OU.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-ZMROW673.js";
+} from "./chunk-WCU3FHEI.js";
 import {
   createEmptyThread,
   listThreads,
   updateThread,
   writeThread
-} from "./chunk-KYOTBZ6S.js";
+} from "./chunk-RG737OWT.js";
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults

package/dist/{chunk-4OJMZ6P2.js → chunk-4WV7C7WP.js}

@@ -1,11 +1,11 @@
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-7WC5UWEB.js";
+} from "./chunk-X3NIPGQT.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-FZCIQYNQ.js";
+} from "./chunk-VGPLXQIH.js";
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults
@@ -15,7 +15,7 @@ import {
   listThreads,
   updateThread,
   writeThread
-} from "./chunk-A4VZXJEJ.js";
+} from "./chunk-HPAWHIZ3.js";
 import {
   globalAgentCwd
 } from "./chunk-QZQEXME2.js";

package/dist/{chunk-DWP25N32.js → chunk-5X7GRP5W.js}

@@ -17,13 +17,13 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-5KSLD4MU.js";
+} from "./chunk-YJ2WV5TZ.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-K3TIQXOH.js";
+} from "./chunk-U3IVCVLH.js";
 import {
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
@@ -36,14 +36,14 @@ import {
   isOrchestratorThread,
   isSlackCoordinatorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "./chunk-4OJMZ6P2.js";
+} from "./chunk-4WV7C7WP.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "./chunk-7WC5UWEB.js";
+} from "./chunk-X3NIPGQT.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -63,7 +63,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-GBY7OOMB.js";
+} from "./chunk-NZBDVBCP.js";
 import {
   releaseCaffeinateHoldForThread
 } from "./chunk-DCOZABNT.js";
@@ -109,7 +109,7 @@ import {
   threadDisplayLabel,
   withRepoGitLock,
   worktreeNameFromPath
-} from "./chunk-FZCIQYNQ.js";
+} from "./chunk-VGPLXQIH.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -145,7 +145,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-A4VZXJEJ.js";
+} from "./chunk-HPAWHIZ3.js";
 import {
   appDataDir,
   findConventionSetup,
@@ -755,9 +755,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-CSWABOG5.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-SBKXKQFS.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-4KCALEKD.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-QMV6YEP5.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -2455,7 +2455,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-7NIX44RB.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-GUEKGV7V.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2551,7 +2551,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);
 }
@@ -2591,6 +2591,21 @@ function clearTurnLive(threadId) {
   }
 }
 
+// src/orchestrator/reconcile-heal.ts
+var RECONCILE_HEAL_MIN_MS = 2e3;
+var SKIP = /* @__PURE__ */ new Set([
+  "stdout",
+  "thinking",
+  "usage",
+  "stderr",
+  "tool_result"
+]);
+function shouldReadThreadToHealReconcile(eventType, lastCheckAt, now) {
+  if (SKIP.has(eventType)) return false;
+  if (lastCheckAt != null && now - lastCheckAt < RECONCILE_HEAL_MIN_MS) return false;
+  return true;
+}
+
 // src/threads/fork-worktree.ts
 function requireThread2(idOrRef) {
   const thread = findThreadByRef(idOrRef) ?? null;
@@ -2836,7 +2851,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QG6PGFQR.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-M4OICPWF.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -5109,7 +5124,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-ZY4RUJKT.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-MKTZYWTI.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -5243,6 +5258,8 @@ var Orchestrator = class {
   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
@@ -5840,7 +5857,13 @@ var Orchestrator = class {
           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");
@@ -5880,11 +5903,12 @@ var Orchestrator = class {
       if (this.requireThread(threadId).agent === "cursor" && exitCode !== 0 && !assistantText && parts.length === 0) {
         const sessionId = result.sessionId || this.requireThread(threadId).sessionId || "";
         if (sessionId) {
-          const { recoverFinishedCursorRun } = await import("./cursor-recover-ZUJG6XRQ.js");
+          const { recoverFinishedCursorRun } = await import("./cursor-recover-QSLWEZNA.js");
           for (let i = 0; i < 8; i++) {
             const recovered = recoverFinishedCursorRun({
               agentId: sessionId,
-              startedAfterMs: turnStartedAt - 5e3
+              startedAfterMs: turnStartedAt - 5e3,
+              threadId
             });
             if (recovered?.result) {
               assistantText = recovered.result;
@@ -6857,7 +6881,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QG6PGFQR.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-M4OICPWF.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -6911,7 +6935,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-IW3BX26B.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-7AEKZSEX.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -7019,7 +7043,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-IW3BX26B.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-7AEKZSEX.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -7029,7 +7053,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-OEALWU7Y.js");
+  const { updateThread: upd } = await import("./thread-store-JR235AWK.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal