@sideboard-ai/core 0.1.233 → 0.1.235

package/dist/agents/cursor-runner.cjs

@@ -125,13 +125,49 @@ function resolveCursorSdkRoot(opts) {
   const cwdPkg = (0, import_node_path2.join)(process.cwd(), "package.json");
   return resolvedPackageRoot(thisModuleFile()) ?? resolvedPackageRoot(cwdPkg);
 }
+function exportTarget(value) {
+  if (typeof value === "string") return value;
+  if (value && typeof value === "object") {
+    const v = value;
+    return exportTarget(v.import) ?? exportTarget(v.default);
+  }
+  return null;
+}
+function cursorSdkEsmEntry(root) {
+  try {
+    const pkg = JSON.parse((0, import_node_fs2.readFileSync)((0, import_node_path2.join)(root, "package.json"), "utf8"));
+    const exp = pkg.exports;
+    const dot = exp && typeof exp === "object" && !Array.isArray(exp) && "." in exp ? exp["."] : exp;
+    const rel = exportTarget(dot) ?? (typeof pkg.module === "string" ? pkg.module : null);
+    if (!rel) return null;
+    const entry = (0, import_node_path2.join)(root, rel);
+    return (0, import_node_fs2.existsSync)(entry) ? entry : null;
+  } catch {
+    return null;
+  }
+}
+function unwrapCursorSdkModule(mod) {
+  const m = mod;
+  if (m && !m.Agent && m.default?.Agent) return m.default;
+  return m;
+}
+function cursorSdkHasExpectedExports(mod) {
+  const m = mod;
+  return typeof m?.Agent === "function" && typeof m?.JsonlLocalAgentStore === "function";
+}
+function cursorSdkMissingExportsMessage(root) {
+  return `Cursor SDK at ${root ?? "(unknown)"} is missing expected exports (Agent, JsonlLocalAgentStore) \u2014 reinstall with \`npm i -g @cursor/sdk\`.`;
+}
 async function importCursorSdk(opts) {
   const root = resolveCursorSdkRoot(opts);
   if (!root) return null;
   try {
-    const req = (0, import_node_module.createRequire)((0, import_node_path2.join)(root, "package.json"));
-    const entry = req.resolve("@cursor/sdk");
-    return await import((0, import_node_url.pathToFileURL)(entry).href);
+    let entry = cursorSdkEsmEntry(root);
+    if (!entry) {
+      const req = (0, import_node_module.createRequire)((0, import_node_path2.join)(root, "package.json"));
+      entry = req.resolve("@cursor/sdk");
+    }
+    return unwrapCursorSdkModule(await import((0, import_node_url.pathToFileURL)(entry).href));
   } catch {
     return null;
   }
@@ -900,6 +936,10 @@ async function main() {
     emit({ type: "stderr", data: CURSOR_SDK_INSTALL_HINT });
     return 1;
   }
+  if (!cursorSdkHasExpectedExports(sdk)) {
+    emit({ type: "stderr", data: cursorSdkMissingExportsMessage(resolveCursorSdkRoot()) });
+    return 1;
+  }
   const { Agent, CursorAgentError, JsonlLocalAgentStore } = sdk;
   ensureCursorRipgrepPath();
   const apiKey = (req.apiKey || process.env.CURSOR_API_KEY || "").trim() || void 0;

package/dist/agents/cursor-runner.js

@@ -6,13 +6,16 @@ import {
   CURSOR_SDK_INSTALL_HINT,
   cursorCostOnlyUsageEvent,
   cursorDeltaToEvents,
+  cursorSdkHasExpectedExports,
   cursorSdkMessageToEvents,
+  cursorSdkMissingExportsMessage,
   ensureCursorRipgrepPath,
   fetchCursorTurnCostUsd,
   formatUnknownDetail,
   importCursorSdk,
-  looksLikeCursorHttp2StreamClose
-} from "../chunk-26T43LBM.js";
+  looksLikeCursorHttp2StreamClose,
+  resolveCursorSdkRoot
+} from "../chunk-WPD7BR6C.js";
 import {
   cursorSdkStoreDir
 } from "../chunk-7J72QJOM.js";
@@ -210,6 +213,10 @@ async function main() {
     emit({ type: "stderr", data: CURSOR_SDK_INSTALL_HINT });
     return 1;
   }
+  if (!cursorSdkHasExpectedExports(sdk)) {
+    emit({ type: "stderr", data: cursorSdkMissingExportsMessage(resolveCursorSdkRoot()) });
+    return 1;
+  }
   const { Agent, CursorAgentError, JsonlLocalAgentStore } = sdk;
   ensureCursorRipgrepPath();
   const apiKey = (req.apiKey || process.env.CURSOR_API_KEY || "").trim() || void 0;

package/dist/{agents-LDYMFW6N.js → agents-37JCAVSC.js}

@@ -44,7 +44,7 @@ import {
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
   whichOnPath
-} from "./chunk-PZQNE5X4.js";
+} from "./chunk-D4VKJO5C.js";
 import "./chunk-S2OEFXST.js";
 import "./chunk-7H2CVVLF.js";
 import "./chunk-6K64FJDD.js";
@@ -60,7 +60,7 @@ import {
   preferredCursorCostCents,
   resolveCursorSdkRoot,
   turnCostUsdFromCursorUsage
-} from "./chunk-26T43LBM.js";
+} from "./chunk-WPD7BR6C.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,

package/dist/{agents-J2CUJHPC.js → agents-MOMMKSYV.js}

@@ -53,7 +53,7 @@ import {
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage,
   whichOnPath
-} from "./chunk-TXMFBL3X.js";
+} from "./chunk-EAYXD2IC.js";
 import "./chunk-TWXSZYR2.js";
 import "./chunk-SPAMHHJH.js";
 import "./chunk-P2BSMNHB.js";

package/dist/{chunk-BGHDWCAV.js → chunk-7366AB7E.js}

@@ -24,7 +24,7 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-PZQNE5X4.js";
+} from "./chunk-D4VKJO5C.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -128,7 +128,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-26T43LBM.js";
+} from "./chunk-WPD7BR6C.js";
 import {
   HISTORY_CLEANUP_INTERVAL_HOURS_DEFAULT,
   applyTurnUsage,
@@ -482,7 +482,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BXALNM4M.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-RKWRI3PJ.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -4266,7 +4266,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-LDYMFW6N.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-37JCAVSC.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -7421,7 +7421,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-BXALNM4M.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-RKWRI3PJ.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9039,7 +9039,8 @@ var Orchestrator = class {
     }
     return this.waitForDesktopRunScript(thread.id, request, op, scriptName);
   }
-  async waitForDesktopRunScript(threadId, request, op, scriptName) {
+  async waitForDesktopRunScript(threadId, initialRequest, op, scriptName) {
+    let request = initialRequest;
     const deadline = Date.now() + this.runScriptAdoptTimeoutMs;
     while (Date.now() < deadline) {
       const latest = readThread(threadId);
@@ -9063,6 +9064,15 @@ var Orchestrator = class {
         }
       } else if (fulfilled) {
         return null;
+      } else if (requestGone) {
+        const coversThisStop = req?.op === "stop" && (req.scriptName == null || req.scriptName === (scriptName ?? null));
+        if (req && coversThisStop) {
+          request = req;
+          continue;
+        }
+        throw new Error(
+          req?.op === "start" ? "Stop was replaced by a newer start request before desktop applied it." : "Stop was replaced by another run-script request before desktop applied it."
+        );
       }
       await new Promise((r) => setTimeout(r, 40));
     }

package/dist/{chunk-PZQNE5X4.js → chunk-D4VKJO5C.js}

@@ -36,7 +36,7 @@ import {
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-26T43LBM.js";
+} from "./chunk-WPD7BR6C.js";
 import {
   claudeChromeEnabled,
   fromInclusiveInputUsage,
@@ -3998,7 +3998,8 @@ async function installNpmGlobalPackage(opts) {
     exitCode: 0,
     stdout: result.stdout,
     stderr: result.stderr,
-    message: binPath ? `Installed ${opts.npmPackage} \u2192 ${binPath}` : `Installed ${opts.npmPackage} (CLI not yet on PATH)`
+    // Library-only packages (`@cursor/sdk`) have no CLI to look for.
+    message: !opts.cliBin ? `Installed ${opts.npmPackage}` : binPath ? `Installed ${opts.npmPackage} \u2192 ${binPath}` : `Installed ${opts.npmPackage} (CLI not yet on PATH)`
   };
 }
 async function resolveExistingCli(agent) {

package/dist/{chunk-TXMFBL3X.js → chunk-EAYXD2IC.js}

@@ -3218,13 +3218,42 @@ function resolveCursorSdkRoot(opts) {
 function isCursorSdkInstalled(opts) {
   return Boolean(resolveCursorSdkRoot(opts));
 }
+function exportTarget(value) {
+  if (typeof value === "string") return value;
+  if (value && typeof value === "object") {
+    const v = value;
+    return exportTarget(v.import) ?? exportTarget(v.default);
+  }
+  return null;
+}
+function cursorSdkEsmEntry(root) {
+  try {
+    const pkg = JSON.parse(readFileSync5(join8(root, "package.json"), "utf8"));
+    const exp = pkg.exports;
+    const dot = exp && typeof exp === "object" && !Array.isArray(exp) && "." in exp ? exp["."] : exp;
+    const rel = exportTarget(dot) ?? (typeof pkg.module === "string" ? pkg.module : null);
+    if (!rel) return null;
+    const entry = join8(root, rel);
+    return existsSync10(entry) ? entry : null;
+  } catch {
+    return null;
+  }
+}
+function unwrapCursorSdkModule(mod) {
+  const m = mod;
+  if (m && !m.Agent && m.default?.Agent) return m.default;
+  return m;
+}
 async function importCursorSdk(opts) {
   const root = resolveCursorSdkRoot(opts);
   if (!root) return null;
   try {
-    const req = createRequire2(join8(root, "package.json"));
-    const entry = req.resolve("@cursor/sdk");
-    return await import(pathToFileURL(entry).href);
+    let entry = cursorSdkEsmEntry(root);
+    if (!entry) {
+      const req = createRequire2(join8(root, "package.json"));
+      entry = req.resolve("@cursor/sdk");
+    }
+    return unwrapCursorSdkModule(await import(pathToFileURL(entry).href));
   } catch {
     return null;
   }
@@ -4781,7 +4810,8 @@ async function installNpmGlobalPackage(opts) {
     exitCode: 0,
     stdout: result.stdout,
     stderr: result.stderr,
-    message: binPath ? `Installed ${opts.npmPackage} \u2192 ${binPath}` : `Installed ${opts.npmPackage} (CLI not yet on PATH)`
+    // Library-only packages (`@cursor/sdk`) have no CLI to look for.
+    message: !opts.cliBin ? `Installed ${opts.npmPackage}` : binPath ? `Installed ${opts.npmPackage} \u2192 ${binPath}` : `Installed ${opts.npmPackage} (CLI not yet on PATH)`
   };
 }
 async function resolveExistingCli(agent) {

package/dist/{chunk-NLETJP7Z.js → chunk-LJWF3VA3.js}

@@ -42,7 +42,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-TXMFBL3X.js";
+} from "./chunk-EAYXD2IC.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -418,7 +418,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-NLZMHTLX.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6NPBOBNA.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -7032,7 +7032,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-NLZMHTLX.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-6NPBOBNA.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -8650,7 +8650,8 @@ var Orchestrator = class {
     }
     return this.waitForDesktopRunScript(thread.id, request, op, scriptName);
   }
-  async waitForDesktopRunScript(threadId, request, op, scriptName) {
+  async waitForDesktopRunScript(threadId, initialRequest, op, scriptName) {
+    let request = initialRequest;
     const deadline = Date.now() + this.runScriptAdoptTimeoutMs;
     while (Date.now() < deadline) {
       const latest = readThread(threadId);
@@ -8674,6 +8675,15 @@ var Orchestrator = class {
         }
       } else if (fulfilled) {
         return null;
+      } else if (requestGone) {
+        const coversThisStop = req?.op === "stop" && (req.scriptName == null || req.scriptName === (scriptName ?? null));
+        if (req && coversThisStop) {
+          request = req;
+          continue;
+        }
+        throw new Error(
+          req?.op === "start" ? "Stop was replaced by a newer start request before desktop applied it." : "Stop was replaced by another run-script request before desktop applied it."
+        );
       }
       await new Promise((r) => setTimeout(r, 40));
     }

package/dist/{chunk-26T43LBM.js → chunk-WPD7BR6C.js}

@@ -802,13 +802,49 @@ function resolveCursorSdkRoot(opts) {
 function isCursorSdkInstalled(opts) {
   return Boolean(resolveCursorSdkRoot(opts));
 }
+function exportTarget(value) {
+  if (typeof value === "string") return value;
+  if (value && typeof value === "object") {
+    const v = value;
+    return exportTarget(v.import) ?? exportTarget(v.default);
+  }
+  return null;
+}
+function cursorSdkEsmEntry(root) {
+  try {
+    const pkg = JSON.parse(readFileSync2(join4(root, "package.json"), "utf8"));
+    const exp = pkg.exports;
+    const dot = exp && typeof exp === "object" && !Array.isArray(exp) && "." in exp ? exp["."] : exp;
+    const rel = exportTarget(dot) ?? (typeof pkg.module === "string" ? pkg.module : null);
+    if (!rel) return null;
+    const entry = join4(root, rel);
+    return existsSync4(entry) ? entry : null;
+  } catch {
+    return null;
+  }
+}
+function unwrapCursorSdkModule(mod) {
+  const m = mod;
+  if (m && !m.Agent && m.default?.Agent) return m.default;
+  return m;
+}
+function cursorSdkHasExpectedExports(mod) {
+  const m = mod;
+  return typeof m?.Agent === "function" && typeof m?.JsonlLocalAgentStore === "function";
+}
+function cursorSdkMissingExportsMessage(root) {
+  return `Cursor SDK at ${root ?? "(unknown)"} is missing expected exports (Agent, JsonlLocalAgentStore) \u2014 reinstall with \`npm i -g @cursor/sdk\`.`;
+}
 async function importCursorSdk(opts) {
   const root = resolveCursorSdkRoot(opts);
   if (!root) return null;
   try {
-    const req = createRequire(join4(root, "package.json"));
-    const entry = req.resolve("@cursor/sdk");
-    return await import(pathToFileURL(entry).href);
+    let entry = cursorSdkEsmEntry(root);
+    if (!entry) {
+      const req = createRequire(join4(root, "package.json"));
+      entry = req.resolve("@cursor/sdk");
+    }
+    return unwrapCursorSdkModule(await import(pathToFileURL(entry).href));
   } catch {
     return null;
   }
@@ -1239,6 +1275,8 @@ export {
   CURSOR_SDK_INSTALL_HINT,
   resolveCursorSdkRoot,
   isCursorSdkInstalled,
+  cursorSdkHasExpectedExports,
+  cursorSdkMissingExportsMessage,
   importCursorSdk,
   preferredCursorCostCents,
   turnCostUsdFromCursorUsage,

package/dist/index.cjs

@@ -13971,13 +13971,42 @@ function resolveCursorSdkRoot(opts) {
 function isCursorSdkInstalled(opts) {
   return Boolean(resolveCursorSdkRoot(opts));
 }
+function exportTarget(value) {
+  if (typeof value === "string") return value;
+  if (value && typeof value === "object") {
+    const v = value;
+    return exportTarget(v.import) ?? exportTarget(v.default);
+  }
+  return null;
+}
+function cursorSdkEsmEntry(root) {
+  try {
+    const pkg = JSON.parse((0, import_node_fs36.readFileSync)((0, import_node_path38.join)(root, "package.json"), "utf8"));
+    const exp = pkg.exports;
+    const dot = exp && typeof exp === "object" && !Array.isArray(exp) && "." in exp ? exp["."] : exp;
+    const rel = exportTarget(dot) ?? (typeof pkg.module === "string" ? pkg.module : null);
+    if (!rel) return null;
+    const entry = (0, import_node_path38.join)(root, rel);
+    return (0, import_node_fs36.existsSync)(entry) ? entry : null;
+  } catch {
+    return null;
+  }
+}
+function unwrapCursorSdkModule(mod) {
+  const m = mod;
+  if (m && !m.Agent && m.default?.Agent) return m.default;
+  return m;
+}
 async function importCursorSdk(opts) {
   const root = resolveCursorSdkRoot(opts);
   if (!root) return null;
   try {
-    const req = (0, import_node_module2.createRequire)((0, import_node_path38.join)(root, "package.json"));
-    const entry = req.resolve("@cursor/sdk");
-    return await import((0, import_node_url2.pathToFileURL)(entry).href);
+    let entry = cursorSdkEsmEntry(root);
+    if (!entry) {
+      const req = (0, import_node_module2.createRequire)((0, import_node_path38.join)(root, "package.json"));
+      entry = req.resolve("@cursor/sdk");
+    }
+    return unwrapCursorSdkModule(await import((0, import_node_url2.pathToFileURL)(entry).href));
   } catch {
     return null;
   }
@@ -15568,7 +15597,8 @@ async function installNpmGlobalPackage(opts) {
     exitCode: 0,
     stdout: result.stdout,
     stderr: result.stderr,
-    message: binPath ? `Installed ${opts.npmPackage} \u2192 ${binPath}` : `Installed ${opts.npmPackage} (CLI not yet on PATH)`
+    // Library-only packages (`@cursor/sdk`) have no CLI to look for.
+    message: !opts.cliBin ? `Installed ${opts.npmPackage}` : binPath ? `Installed ${opts.npmPackage} \u2192 ${binPath}` : `Installed ${opts.npmPackage} (CLI not yet on PATH)`
   };
 }
 async function resolveExistingCli(agent) {
@@ -25175,7 +25205,8 @@ var init_orchestrator = __esm({
         }
         return this.waitForDesktopRunScript(thread.id, request, op, scriptName);
       }
-      async waitForDesktopRunScript(threadId, request, op, scriptName) {
+      async waitForDesktopRunScript(threadId, initialRequest, op, scriptName) {
+        let request = initialRequest;
         const deadline = Date.now() + this.runScriptAdoptTimeoutMs;
         while (Date.now() < deadline) {
           const latest = readThread(threadId);
@@ -25199,6 +25230,15 @@ var init_orchestrator = __esm({
             }
           } else if (fulfilled) {
             return null;
+          } else if (requestGone) {
+            const coversThisStop = req?.op === "stop" && (req.scriptName == null || req.scriptName === (scriptName ?? null));
+            if (req && coversThisStop) {
+              request = req;
+              continue;
+            }
+            throw new Error(
+              req?.op === "start" ? "Stop was replaced by a newer start request before desktop applied it." : "Stop was replaced by another run-script request before desktop applied it."
+            );
           }
           await new Promise((r) => setTimeout(r, 40));
         }

package/dist/index.js

@@ -325,7 +325,7 @@ import {
   worktreeCleanupSettings,
   wrapReviewSkillMarkdown,
   writeWorktreeFile
-} from "./chunk-BGHDWCAV.js";
+} from "./chunk-7366AB7E.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -442,7 +442,7 @@ import {
   withEventParentId,
   withEventsParentId,
   writeInjectedMcpConfig
-} from "./chunk-PZQNE5X4.js";
+} from "./chunk-D4VKJO5C.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -638,7 +638,7 @@ import {
   trustSystemCertificates,
   turnCostUsdFromCursorUsage,
   withMaxOldSpaceSize
-} from "./chunk-26T43LBM.js";
+} from "./chunk-WPD7BR6C.js";
 import {
   AGENT_DONE_SOUNDS,
   FOLLOW_UP_BEHAVIORS,

package/dist/mcp/run-stdio.cjs

@@ -12062,13 +12062,42 @@ function resolveCursorSdkRoot(opts) {
 function isCursorSdkInstalled(opts) {
   return Boolean(resolveCursorSdkRoot(opts));
 }
+function exportTarget(value) {
+  if (typeof value === "string") return value;
+  if (value && typeof value === "object") {
+    const v = value;
+    return exportTarget(v.import) ?? exportTarget(v.default);
+  }
+  return null;
+}
+function cursorSdkEsmEntry(root) {
+  try {
+    const pkg = JSON.parse((0, import_node_fs31.readFileSync)((0, import_node_path33.join)(root, "package.json"), "utf8"));
+    const exp = pkg.exports;
+    const dot = exp && typeof exp === "object" && !Array.isArray(exp) && "." in exp ? exp["."] : exp;
+    const rel = exportTarget(dot) ?? (typeof pkg.module === "string" ? pkg.module : null);
+    if (!rel) return null;
+    const entry = (0, import_node_path33.join)(root, rel);
+    return (0, import_node_fs31.existsSync)(entry) ? entry : null;
+  } catch {
+    return null;
+  }
+}
+function unwrapCursorSdkModule(mod) {
+  const m = mod;
+  if (m && !m.Agent && m.default?.Agent) return m.default;
+  return m;
+}
 async function importCursorSdk(opts) {
   const root = resolveCursorSdkRoot(opts);
   if (!root) return null;
   try {
-    const req = (0, import_node_module2.createRequire)((0, import_node_path33.join)(root, "package.json"));
-    const entry = req.resolve("@cursor/sdk");
-    return await import((0, import_node_url2.pathToFileURL)(entry).href);
+    let entry = cursorSdkEsmEntry(root);
+    if (!entry) {
+      const req = (0, import_node_module2.createRequire)((0, import_node_path33.join)(root, "package.json"));
+      entry = req.resolve("@cursor/sdk");
+    }
+    return unwrapCursorSdkModule(await import((0, import_node_url2.pathToFileURL)(entry).href));
   } catch {
     return null;
   }
@@ -23336,7 +23365,8 @@ var init_orchestrator = __esm({
         }
         return this.waitForDesktopRunScript(thread.id, request, op, scriptName);
       }
-      async waitForDesktopRunScript(threadId, request, op, scriptName) {
+      async waitForDesktopRunScript(threadId, initialRequest, op, scriptName) {
+        let request = initialRequest;
         const deadline = Date.now() + this.runScriptAdoptTimeoutMs;
         while (Date.now() < deadline) {
           const latest = readThread(threadId);
@@ -23360,6 +23390,15 @@ var init_orchestrator = __esm({
             }
           } else if (fulfilled) {
             return null;
+          } else if (requestGone) {
+            const coversThisStop = req?.op === "stop" && (req.scriptName == null || req.scriptName === (scriptName ?? null));
+            if (req && coversThisStop) {
+              request = req;
+              continue;
+            }
+            throw new Error(
+              req?.op === "start" ? "Stop was replaced by a newer start request before desktop applied it." : "Stop was replaced by another run-script request before desktop applied it."
+            );
           }
           await new Promise((r) => setTimeout(r, 40));
         }

package/dist/mcp/run-stdio.js

@@ -51,7 +51,7 @@ import {
   threadsSharingWorktree,
   updateSchedule,
   waitForDetachedJob
-} from "../chunk-NLETJP7Z.js";
+} from "../chunk-LJWF3VA3.js";
 import "../chunk-JFOPOMK7.js";
 import "../chunk-YWI3IBP2.js";
 import {
@@ -62,7 +62,7 @@ import {
   materializeSystemCaBundle,
   sideboardMcpProfile,
   trustSystemCertificates
-} from "../chunk-TXMFBL3X.js";
+} from "../chunk-EAYXD2IC.js";
 import {
   GLOBAL_WORKSPACE_ID,
   isCloudCoordinatorThread,

package/dist/{orchestrator-NLZMHTLX.js → orchestrator-6NPBOBNA.js}

@@ -11,10 +11,10 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-NLETJP7Z.js";
+} from "./chunk-LJWF3VA3.js";
 import "./chunk-JFOPOMK7.js";
 import "./chunk-YWI3IBP2.js";
-import "./chunk-TXMFBL3X.js";
+import "./chunk-EAYXD2IC.js";
 import "./chunk-TWXSZYR2.js";
 import "./chunk-SPAMHHJH.js";
 import "./chunk-P2BSMNHB.js";

package/dist/{orchestrator-BXALNM4M.js → orchestrator-RKWRI3PJ.js}

@@ -9,9 +9,9 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-BGHDWCAV.js";
+} from "./chunk-7366AB7E.js";
 import "./chunk-DJU54RYW.js";
-import "./chunk-PZQNE5X4.js";
+import "./chunk-D4VKJO5C.js";
 import "./chunk-S2OEFXST.js";
 import "./chunk-7H2CVVLF.js";
 import "./chunk-6K64FJDD.js";
@@ -20,7 +20,7 @@ import "./chunk-TNVJPFHM.js";
 import "./chunk-ROPGQRPU.js";
 import "./chunk-N7WZ6NIN.js";
 import "./chunk-AXQ4ZWHK.js";
-import "./chunk-26T43LBM.js";
+import "./chunk-WPD7BR6C.js";
 import "./chunk-I5NC7DWO.js";
 import "./chunk-WDRMZKVB.js";
 import "./chunk-4TYXWPAJ.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.233",
+  "version": "0.1.235",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",