@sideboard-ai/core 0.1.98 → 0.1.100

package/dist/mcp/run-stdio.js

@@ -6,7 +6,6 @@ import {
   fallbackTurnFailDetail,
   formatTurnExitError,
   getAdapter,
-  humanizeAgentFailDetail,
   isSessionQuotaLimit,
   listModelsForAgent,
   looksLikeAgentFailureMessage,
@@ -15,16 +14,18 @@ import {
   parseSessionQuotaResetAt,
   pushTurnStderr,
   resolveQuotaFallbackAgent,
+  shouldRetryFailedAgentTurn,
   sideboardMcpProfile,
-  summarizeTurnStderr
-} from "../chunk-FYS2BULQ.js";
+  summarizeTurnStderr,
+  turnFailChatText
+} from "../chunk-EQPQTLW6.js";
 import "../chunk-DKHGWYWR.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-OANJQTVG.js";
+} from "../chunk-MRBKGFTL.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -43,14 +44,14 @@ import {
   isOrchestratorThread,
   isSlackCoordinatorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-HI2OTFFR.js";
+} from "../chunk-WQTTUC4N.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-XH2GS2LO.js";
+} from "../chunk-IFHKPZHA.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -944,9 +945,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-WMF3BJP5.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-YZWYHLQY.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-OQOOD5ET.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-OOBSQCWQ.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1745,6 +1746,41 @@ async function cloneRepoIntoSideboard(opts) {
   return { repoPath, workspace };
 }
 
+// src/store/desktop-host.ts
+import { readFileSync as readFileSync4, unlinkSync, writeFileSync } from "fs";
+import { join as join7 } from "path";
+function desktopHostPidPath() {
+  return join7(appDataDir(), "desktop-host.pid");
+}
+function readDesktopHostPid() {
+  try {
+    const pid = Number.parseInt(readFileSync4(desktopHostPidPath(), "utf8").trim(), 10);
+    if (!Number.isFinite(pid) || pid <= 0) return null;
+    return pid;
+  } catch {
+    return null;
+  }
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isDesktopHostAlive() {
+  const pid = readDesktopHostPid();
+  return pid != null && pidAlive(pid);
+}
+function isThisProcessDesktopHost() {
+  return readDesktopHostPid() === process.pid && pidAlive(process.pid);
+}
+function thisProcessShouldDrainAgentQueues() {
+  if (isThisProcessDesktopHost()) return true;
+  return !isDesktopHostAlive();
+}
+
 // src/threads/create.ts
 import { existsSync as existsSync6 } from "fs";
 
@@ -1852,7 +1888,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-ESJKIQQA.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-CLP5BG4O.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2251,8 +2287,8 @@ function forkChatTab(input) {
 
 // src/review/request-review.ts
 import { randomUUID as randomUUID2 } from "crypto";
-import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync } from "fs";
-import { dirname as dirname2, join as join7 } from "path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname2, join as join8 } from "path";
 
 // src/review/review-request-template.ts
 var REVIEW_REQUEST_TEMPLATE = `# Review guidelines:
@@ -2399,20 +2435,20 @@ function shouldRefreshReviewRequestTemplate(content) {
 function readTextIfPresent(abs) {
   if (!existsSync7(abs)) return null;
   try {
-    const content = readFileSync4(abs, "utf8");
+    const content = readFileSync5(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function ensureAttachmentsGitignore(worktreePath) {
-  const gitignoreAbs = join7(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  const gitignoreAbs = join8(worktreePath, ATTACHMENTS_DIR, ".gitignore");
   if (existsSync7(gitignoreAbs)) return;
   mkdirSync2(dirname2(gitignoreAbs), { recursive: true });
-  writeFileSync(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  writeFileSync2(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function resolveReviewGuidelines(worktreePath) {
-  const repoAbs = join7(worktreePath, REPO_REVIEW_PATH);
+  const repoAbs = join8(worktreePath, REPO_REVIEW_PATH);
   const repoContent = readTextIfPresent(repoAbs);
   if (repoContent) {
     return {
@@ -2422,7 +2458,7 @@ function resolveReviewGuidelines(worktreePath) {
       source: "repo"
     };
   }
-  const localAbs = join7(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = join8(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return {
@@ -2432,7 +2468,7 @@ function resolveReviewGuidelines(worktreePath) {
       source: "local"
     };
   }
-  const legacyAbs = join7(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = join8(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return {
@@ -2444,7 +2480,7 @@ function resolveReviewGuidelines(worktreePath) {
   }
   ensureAttachmentsGitignore(worktreePath);
   mkdirSync2(dirname2(localAbs), { recursive: true });
-  writeFileSync(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
+  writeFileSync2(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
   return {
     path: REVIEW_REQUEST_PATH,
     name: REVIEW_REQUEST_NAME,
@@ -2643,20 +2679,20 @@ import {
   existsSync as existsSync8,
   mkdtempSync,
   readdirSync as readdirSync3,
-  readFileSync as readFileSync5,
+  readFileSync as readFileSync6,
   rmSync
 } from "fs";
 import { tmpdir } from "os";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import { createRequire } from "module";
-var CONDUCTOR_APP_SUPPORT = join8(
+var CONDUCTOR_APP_SUPPORT = join9(
   process.env.HOME ?? "",
   "Library",
   "Application Support",
   "com.conductor.app"
 );
-var CONDUCTOR_DB = join8(CONDUCTOR_APP_SUPPORT, "conductor.db");
-var CURSOR_SDK_STORE = join8(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+var CONDUCTOR_DB = join9(CONDUCTOR_APP_SUPPORT, "conductor.db");
+var CURSOR_SDK_STORE = join9(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
 function openReadonlySqlite(file) {
   const req = createRequire(import.meta.url);
   const Database = req("better-sqlite3");
@@ -2683,11 +2719,11 @@ function resolveConductorCursorAgentId(workspacePath) {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = join8(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    const agentsFile = join9(CURSOR_SDK_STORE, hash, "agents.ndjson");
     if (!existsSync8(agentsFile)) continue;
     let text3;
     try {
-      text3 = readFileSync5(agentsFile, "utf8");
+      text3 = readFileSync6(agentsFile, "utf8");
     } catch {
       continue;
     }
@@ -2730,7 +2766,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-MZVQHRSJ.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-ENVUDK6C.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -2738,8 +2774,8 @@ function listConductorWorkspaces() {
   if (!existsSync8(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = mkdtempSync(join8(tmpdir(), "sideboard-conductor-"));
-  const snapshot = join8(tmp, "conductor.db");
+  const tmp = mkdtempSync(join9(tmpdir(), "sideboard-conductor-"));
+  const snapshot = join9(tmp, "conductor.db");
   try {
     copyFileSync2(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
@@ -2829,8 +2865,8 @@ function importConductorWorkspace(workspaceId) {
   if (!existsSync8(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = mkdtempSync(join8(tmpdir(), "sideboard-conductor-"));
-  const snapshot = join8(tmp, "conductor.db");
+  const tmp = mkdtempSync(join9(tmpdir(), "sideboard-conductor-"));
+  const snapshot = join9(tmp, "conductor.db");
   try {
     copyFileSync2(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
@@ -3210,8 +3246,8 @@ async function createPrStack(input, onSetupLine) {
 }
 
 // src/diff/diff.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync6, statSync as statSync2, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname3, join as join9 } from "path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync7, statSync as statSync2, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname3, join as join10 } from "path";
 async function inspectGitWorktree(worktreePath) {
   if (!worktreePath || !existsSync10(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
@@ -3357,11 +3393,11 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path, maxHunk) {
-  const abs = join9(worktreePath, path);
+  const abs = join10(worktreePath, path);
   try {
     const st = statSync2(abs);
     if (st.isFile() && st.size > maxHunk) {
-      const buf = readFileSync6(abs).subarray(0, maxHunk);
+      const buf = readFileSync7(abs).subarray(0, maxHunk);
       return syntheticAddPatch(path, buf.toString("utf8"), maxHunk);
     }
   } catch {
@@ -3862,7 +3898,7 @@ var DEFAULT_UPLOAD_MAX_BYTES = 5e7;
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = join9(worktreePath, relativePath);
+  const abs = join10(worktreePath, relativePath);
   const st = statSync2(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -3872,7 +3908,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
       `File too large to upload (${st.size} bytes; max ${maxBytes})`
     );
   }
-  const buf = readFileSync6(abs);
+  const buf = readFileSync7(abs);
   return {
     path: relativePath,
     contentBase64: buf.toString("base64"),
@@ -3882,12 +3918,12 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = join9(worktreePath, relativePath);
+  const abs = join10(worktreePath, relativePath);
   const st = statSync2(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
-  const buf = readFileSync6(abs);
+  const buf = readFileSync7(abs);
   if (isImageRelativePath(relativePath)) {
     const maxImageBytes = Math.max(maxBytes, 15e6);
     const truncated2 = buf.length > maxImageBytes;
@@ -3930,9 +3966,9 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = join9(worktreePath, relativePath);
+  const abs = join10(worktreePath, relativePath);
   mkdirSync3(dirname3(abs), { recursive: true });
-  writeFileSync2(abs, content, "utf8");
+  writeFileSync3(abs, content, "utf8");
   return { path: relativePath };
 }
 async function getDiffSummary(worktreePath, repoPath, opts) {
@@ -4035,9 +4071,9 @@ async function confirmLand(thread, opts) {
 }
 
 // src/skills/discover.ts
-import { existsSync as existsSync11, readdirSync as readdirSync4, readFileSync as readFileSync7, statSync as statSync3 } from "fs";
+import { existsSync as existsSync11, readdirSync as readdirSync4, readFileSync as readFileSync8, statSync as statSync3 } from "fs";
 import { homedir } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 function toCommand(name) {
   return name.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
@@ -4069,7 +4105,7 @@ function parseFrontmatter(content) {
 }
 function readSkill(skillMd, source) {
   try {
-    const content = readFileSync7(skillMd, "utf8");
+    const content = readFileSync8(skillMd, "utf8");
     const { name: fmName, description } = parseFrontmatter(content);
     const dirName = skillMd.split("/").slice(-2, -1)[0] || "skill";
     const name = fmName || dirName;
@@ -4097,7 +4133,7 @@ function scanSkillsDir(dir, source, out) {
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = join10(dir, entry, "SKILL.md");
+    const skillMd = join11(dir, entry, "SKILL.md");
     if (!existsSync11(skillMd)) continue;
     try {
       if (!statSync3(skillMd).isFile()) continue;
@@ -4119,12 +4155,12 @@ function scanClaudePluginSkills(pluginsRoot, out) {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill(join10(dir, "SKILL.md"), "cli");
+      const skill = readSkill(join11(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = join10(dir, entry);
+      const full = join11(dir, entry);
       try {
         if (!statSync3(full).isDirectory()) continue;
       } catch {
@@ -4144,17 +4180,17 @@ function discoverSkills(worktreePath) {
   const home = homedir();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir(join10(worktreePath, rel), "workspace", collected);
+    scanSkillsDir(join11(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    join10(home, ".claude/skills"),
-    join10(home, ".cursor/skills"),
-    join10(home, ".sideboard/skills"),
-    join10(home, ".brightsy/skills")
+    join11(home, ".claude/skills"),
+    join11(home, ".cursor/skills"),
+    join11(home, ".sideboard/skills"),
+    join11(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills(join10(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills(join11(home, ".claude/plugins"), collected);
   const rank = { workspace: 0, user: 1, cli: 2 };
   const byCommand = /* @__PURE__ */ new Map();
   for (const skill of collected) {
@@ -4166,7 +4202,7 @@ function discoverSkills(worktreePath) {
   return [...byCommand.values()].sort((a, b) => a.command.localeCompare(b.command));
 }
 function readSkillBody(skillPath, maxChars = 12e3) {
-  const raw = readFileSync7(skillPath, "utf8");
+  const raw = readFileSync8(skillPath, "utf8");
   if (raw.startsWith("---")) {
     const end = raw.indexOf("\n---", 3);
     if (end >= 0) {
@@ -4259,8 +4295,8 @@ function expandComposerPrompt(worktreePath, prompt, opts) {
 }
 
 // src/composer/stage-files.ts
-import { copyFileSync as copyFileSync3, existsSync as existsSync12, mkdirSync as mkdirSync4, readFileSync as readFileSync8, statSync as statSync4, writeFileSync as writeFileSync3 } from "fs";
-import { basename as basename3, extname, join as join11 } from "path";
+import { copyFileSync as copyFileSync3, existsSync as existsSync12, mkdirSync as mkdirSync4, readFileSync as readFileSync9, statSync as statSync4, writeFileSync as writeFileSync4 } from "fs";
+import { basename as basename3, extname, join as join12 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
 var IMAGE_EXTENSIONS2 = /* @__PURE__ */ new Set([
   "png",
@@ -4295,22 +4331,22 @@ function imageMimeType(filePath) {
   return IMAGE_MIME_BY_EXT[fileExtension(filePath)] || "image/png";
 }
 function ensureAttachmentsDir(worktreePath) {
-  const dir = join11(worktreePath, ATTACHMENTS_DIR);
+  const dir = join12(worktreePath, ATTACHMENTS_DIR);
   mkdirSync4(dir, { recursive: true });
-  const gi = join11(dir, ".gitignore");
+  const gi = join12(dir, ".gitignore");
   if (!existsSync12(gi)) {
-    writeFileSync3(gi, attachmentsGitignoreBody(), "utf8");
+    writeFileSync4(gi, attachmentsGitignoreBody(), "utf8");
   }
   return dir;
 }
 function uniqueAttachmentName(dir, originalName) {
   const safe = originalName.replace(/[/\\]/g, "_") || "file";
-  if (!existsSync12(join11(dir, safe))) return safe;
+  if (!existsSync12(join12(dir, safe))) return safe;
   const ext = extname(safe);
   const stem = ext ? safe.slice(0, -ext.length) : safe;
   for (let i = 1; i < 1e4; i++) {
     const candidate = `${stem}-${i}${ext}`;
-    if (!existsSync12(join11(dir, candidate))) return candidate;
+    if (!existsSync12(join12(dir, candidate))) return candidate;
   }
   return `${stem}-${randomUUID4()}${ext}`;
 }
@@ -4371,10 +4407,10 @@ function stageAbsolutePathsAsAttachments(worktreePath, absolutePaths) {
       const st = statSync4(abs);
       if (!st.isFile()) continue;
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = join11(dir, name);
+      const destAbs = join12(dir, name);
       copyFileSync3(abs, destAbs);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
-      const buf = readFileSync8(destAbs);
+      const buf = readFileSync9(destAbs);
       out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
     } catch (err) {
       out.push({
@@ -4396,8 +4432,8 @@ function stageBuffersAsAttachments(worktreePath, buffers) {
     try {
       const buf = Buffer.from(item.dataBase64, "base64");
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = join11(dir, name);
-      writeFileSync3(destAbs, buf);
+      const destAbs = join12(dir, name);
+      writeFileSync4(destAbs, buf);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
       out.push(attachmentFromBuffer(name, buf, { path: rel }));
     } catch (err) {
@@ -4425,10 +4461,10 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
     }
     const name = basename3(rel);
     try {
-      const abs = join11(worktreePath, rel);
+      const abs = join12(worktreePath, rel);
       const st = statSync4(abs);
       if (!st.isFile()) continue;
-      const buf = readFileSync8(abs);
+      const buf = readFileSync9(abs);
       out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
     } catch (err) {
       out.push({
@@ -4443,8 +4479,8 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
 }
 
 // src/agents/instructions.ts
-import { existsSync as existsSync13, readFileSync as readFileSync9, statSync as statSync5 } from "fs";
-import { join as join12 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync10, statSync as statSync5 } from "fs";
+import { join as join13 } from "path";
 function normPath(p) {
   return p.replace(/\/+$/, "");
 }
@@ -4961,7 +4997,9 @@ var Orchestrator = class {
       updateThread(thread.id, patch);
       this.emit({ type: "queue_changed", threadId: thread.id, queue });
       this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
-      void this.drainQueue(thread.id);
+      if (thisProcessShouldDrainAgentQueues()) {
+        void this.drainQueue(thread.id);
+      }
       return this.requireThread(thread.id);
     });
   }
@@ -5014,10 +5052,10 @@ var Orchestrator = class {
   async sendQueuedMessageNow(threadRef, index) {
     const thread = this.requireThread(threadRef);
     const promoted = await withThreadLock(thread.id, async () => {
-      const current = this.requireThread(thread.id);
-      if (index < 0 || index >= current.queue.length) return false;
-      const item = current.queue[index];
-      const rest = current.queue.filter((_, i) => i !== index);
+      const current2 = this.requireThread(thread.id);
+      if (index < 0 || index >= current2.queue.length) return false;
+      const item = current2.queue[index];
+      const rest = current2.queue.filter((_, i) => i !== index);
       const queue = [item, ...rest];
       this.haltDrain.delete(thread.id);
       updateThread(thread.id, { queue });
@@ -5025,10 +5063,16 @@ var Orchestrator = class {
       return true;
     });
     if (!promoted) return this.requireThread(thread.id);
+    const current = this.requireThread(thread.id);
     const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id);
+    const livePid = current.agentPid;
+    const foreignLive = !inFlight && typeof livePid === "number" && livePid > 0 && isPidAlive(livePid);
     if (inFlight) {
       this.stop(thread.id, { clearQueue: false, continueQueue: true });
     } else {
+      if (foreignLive) {
+        this.stop(thread.id, { clearQueue: false, continueQueue: true });
+      }
       void this.drainQueue(thread.id);
     }
     return this.requireThread(thread.id);
@@ -5279,19 +5323,16 @@ var Orchestrator = class {
       }
       let lastStderr = summarizeTurnStderr(stderrTail);
       let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && looksLikeInvalidAgentSession(detail) && this.requireThread(threadId).sessionId && this.requireThread(threadId).agent !== "brightsy") {
+      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && this.requireThread(threadId).agent !== "brightsy" && shouldRetryFailedAgentTurn(detail, {
+        hasSession: Boolean(this.requireThread(threadId).sessionId)
+      })) {
         updateThread(threadId, { sessionId: null });
-        pushTurnStderr(
-          stderrTail,
-          "Agent session missing \u2014 starting a fresh session"
-        );
+        const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
+        pushTurnStderr(stderrTail, retryNote);
         this.emit({
           type: "turn_output",
           threadId,
-          event: {
-            type: "stderr",
-            data: "Agent session missing \u2014 starting a fresh session"
-          }
+          event: { type: "stderr", data: retryNote }
         });
         const retryThread = this.requireThread(threadId);
         const prior = retryThread.messages.slice(0, -1);
@@ -5340,10 +5381,7 @@ var Orchestrator = class {
         lastStderr = summarizeTurnStderr(stderrTail);
         detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
       }
-      let chatText = assistantText;
-      if (exitCode !== 0 && !chatText && looksLikeAgentFailureMessage(detail)) {
-        chatText = humanizeAgentFailDetail(detail);
-      }
+      let chatText = this.stoppedTurns.has(threadId) ? assistantText : turnFailChatText({ exitCode, assistantText, detail });
       if (chatText || parts.length > 0) {
         appendMessage(threadId, {
           role: "agent",
@@ -5463,6 +5501,13 @@ var Orchestrator = class {
     if (handle) handle.kill();
     const proc = this.processes.get(`${thread.id}:agent`);
     if (proc) proc.kill();
+    const pid = thread.agentPid;
+    if (typeof pid === "number" && pid > 0 && isPidAlive(pid)) {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {
+      }
+    }
     const stopped = writeLiveStatus(thread.id, "stopped") ?? readThread(thread.id) ?? thread;
     if (stopped.status === "stopped") {
       this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
@@ -5744,10 +5789,13 @@ var Orchestrator = class {
   getTurnResult(threadRef) {
     const thread = this.requireThread(threadRef);
     const lastAgent = [...thread.messages].reverse().find((m) => m.role === "agent");
+    const lastError = thread.lastError ?? null;
+    const text3 = (lastAgent?.text ?? "").trim() || (thread.status === "error" ? lastError ?? "" : "");
     return {
-      text: lastAgent?.text ?? "",
+      text: text3,
       status: thread.status,
-      sessionId: thread.sessionId
+      sessionId: thread.sessionId,
+      lastError
     };
   }
   assertNotGlobal(thread, action) {
@@ -6201,7 +6249,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-MZVQHRSJ.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-ENVUDK6C.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7822,7 +7870,7 @@ async function startMcpServer() {
     );
     server.tool(
       "wait_for_turn",
-      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread or ask_git to read the agent reply.",
+      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread or ask_git. Returns status, text, and lastError. If status is error, lastError/text is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
       {
         ref: z3.string(),
         timeoutMs: z3.number().optional()
@@ -7837,7 +7885,8 @@ async function startMcpServer() {
               text: JSON.stringify({
                 id: thread.id,
                 status: result.status,
-                text: result.text
+                text: result.text,
+                lastError: result.lastError
               })
             }
           ]
@@ -7846,7 +7895,7 @@ async function startMcpServer() {
     );
     server.tool(
       "get_turn_result",
-      "Final assistant message only (not full transcript)",
+      "Final assistant message (and lastError when the turn failed). Not the full transcript.",
       { ref: z3.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);

package/dist/{workspaces-MZVQHRSJ.js → workspaces-ENVUDK6C.js}

@@ -6,9 +6,9 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-OANJQTVG.js";
-import "./chunk-HI2OTFFR.js";
-import "./chunk-XH2GS2LO.js";
+} from "./chunk-MRBKGFTL.js";
+import "./chunk-WQTTUC4N.js";
+import "./chunk-IFHKPZHA.js";
 import "./chunk-R7BQBSDT.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-JOF3XIEM.js";

package/dist/{workspaces-4ZY4QPWQ.js → workspaces-NNPD7QVV.js}

@@ -4,9 +4,9 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-UYQYK2RY.js";
-import "./chunk-FO67IJTY.js";
-import "./chunk-XUWDLRAE.js";
+} from "./chunk-MHJV4WS3.js";
+import "./chunk-GR4JKWR4.js";
+import "./chunk-HYKZEP5A.js";
 import "./chunk-CIRXAYWS.js";
 import "./chunk-FKOIHGKV.js";
 import "./chunk-FT2SQOL4.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.98",
+  "version": "0.1.100",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",
@@ -37,7 +37,7 @@
     "worktree"
   ],
   "dependencies": {
-    "@cursor/sdk": "^1.0.26",
+    "@cursor/sdk": "^1.0.28",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "better-sqlite3": "^11.9.1",
     "chokidar": "^4.0.3",