@sideboard-ai/core 0.1.92 → 0.1.96

package/dist/mcp/run-stdio.cjs

@@ -6361,6 +6361,7 @@ function toCursorMcpServers(servers) {
     const env = mcpSpawnEnv(s.env);
     const launch = cursorSafeMcpLaunch(s.command, s.args);
     out[s.name] = {
+      type: "stdio",
       command: launch.command,
       ...launch.args && launch.args.length > 0 ? { args: launch.args } : {},
       ...env ? { env } : {}
@@ -12123,23 +12124,24 @@ async function countUnpushedCommits(worktreePath) {
     reject: false
   });
   const branch = head.stdout.trim();
+  if (branch && branch !== "HEAD") {
+    const remote = await git(
+      ["rev-list", "--count", `origin/${branch}..HEAD`],
+      worktreePath,
+      { reject: false }
+    );
+    if (remote.exitCode === 0) {
+      const n2 = Number(remote.stdout.trim());
+      return Number.isFinite(n2) ? n2 : 0;
+    }
+  }
   const upstream = await git(
     ["rev-list", "--count", "@{upstream}..HEAD"],
     worktreePath,
     { reject: false }
   );
-  if (upstream.exitCode === 0) {
-    const n2 = Number(upstream.stdout.trim());
-    return Number.isFinite(n2) ? n2 : 0;
-  }
-  if (!branch || branch === "HEAD") return 0;
-  const remote = await git(
-    ["rev-list", "--count", `origin/${branch}..HEAD`],
-    worktreePath,
-    { reject: false }
-  );
-  if (remote.exitCode !== 0) return 0;
-  const n = Number(remote.stdout.trim());
+  if (upstream.exitCode !== 0) return 0;
+  const n = Number(upstream.stdout.trim());
   return Number.isFinite(n) ? n : 0;
 }
 function splitCombinedDiff(stdout) {
@@ -13465,6 +13467,11 @@ function isPidAlive(pid) {
     return false;
   }
 }
+function writeLiveStatus(threadId, status, lastError) {
+  const latest = readThread(threadId);
+  if (!latest || latest.status === "archived") return latest;
+  return setStatus(threadId, status, lastError);
+}
 var Orchestrator = class {
   events = new import_node_events.EventEmitter();
   processes = /* @__PURE__ */ new Map();
@@ -13770,6 +13777,9 @@ var Orchestrator = class {
   }
   async send(threadRef, prompt) {
     const thread = this.requireThread(threadRef);
+    if (thread.status === "archived") {
+      throw new Error(`Thread is archived: ${thread.id}`);
+    }
     return withThreadLock(thread.id, async () => {
       const current = this.requireThread(thread.id);
       const queue = [...current.queue, prompt];
@@ -13863,7 +13873,7 @@ var Orchestrator = class {
           break;
         }
         const thread = readThread(threadId);
-        if (!thread || thread.queue.length === 0) {
+        if (!thread || thread.status === "archived" || thread.queue.length === 0) {
           if (thread && thread.status === "queued") {
             setStatus(threadId, "idle");
             this.emit({ type: "status_changed", threadId, status: "idle" });
@@ -13894,14 +13904,17 @@ var Orchestrator = class {
     }
   }
   async runTurn(threadId, prompt) {
-    let thread = this.requireThread(threadId);
+    const existing = readThread(threadId);
+    if (!existing || existing.status === "archived") return;
+    let thread = existing;
     if (isGlobalThread(thread) && thread.sessionId && orchestratorSessionPoisonedByBuiltins(thread)) {
       thread = updateThread(threadId, { sessionId: null });
     }
+    const running = writeLiveStatus(threadId, "running");
+    if (!running || running.status !== "running") return;
     this.runningCount += 1;
     const turnStartedAt = Date.now();
     this.startingTurns.add(threadId);
-    setStatus(threadId, "running");
     this.emit({ type: "status_changed", threadId, status: "running" });
     this.emit({ type: "turn_started", threadId, prompt });
     try {
@@ -14172,8 +14185,8 @@ var Orchestrator = class {
           ts: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
-      const afterTurn = this.requireThread(threadId);
-      if (afterTurn.planMode && afterTurn.worktreePath?.trim()) {
+      const afterTurn = readThread(threadId);
+      if (afterTurn && afterTurn.status !== "archived" && afterTurn.planMode && afterTurn.worktreePath?.trim()) {
         const presented = extractPresentedPlan(parts);
         const exited = parts.some(
           (p) => p.type === "tool" && /exitplanmode/i.test(p.name)
@@ -14186,29 +14199,34 @@ var Orchestrator = class {
           }
         }
       }
-      if (afterTurn.planMode && afterTurn.agent === "claude" && parts.some(
+      if (afterTurn && afterTurn.status !== "archived" && afterTurn.planMode && afterTurn.agent === "claude" && parts.some(
         (p) => p.type === "tool" && /exitplanmode/i.test(p.name)
       )) {
         updateThread(threadId, { sessionId: null });
       }
       await syncThreadBranchFromGit(threadId);
       if (this.stoppedTurns.has(threadId)) {
-        setStatus(threadId, "stopped");
-        this.emit({ type: "status_changed", threadId, status: "stopped" });
+        const stopped = writeLiveStatus(threadId, "stopped");
+        if (stopped?.status === "stopped") {
+          this.emit({ type: "status_changed", threadId, status: "stopped" });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode });
       } else {
         const failDetail = formatTurnExitError(exitCode, detail);
         const explainedInChat = exitCode !== 0 && Boolean(chatText) && (looksLikeAgentFailureMessage(chatText) || failDetail && chatText.includes(failDetail.replace(/^exit\s*\d+:\s*/i, "").trim()));
-        setStatus(
+        const nextStatus = exitCode === 0 ? "idle" : "error";
+        const written = writeLiveStatus(
           threadId,
-          exitCode === 0 ? "idle" : "error",
+          nextStatus,
           exitCode === 0 || explainedInChat ? null : failDetail
         );
-        this.emit({
-          type: "status_changed",
-          threadId,
-          status: exitCode === 0 ? "idle" : "error"
-        });
+        if (written && written.status !== "archived") {
+          this.emit({
+            type: "status_changed",
+            threadId,
+            status: written.status
+          });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode });
         if (exitCode !== 0) {
           const blob = [chatText, detail].filter(Boolean).join("\n");
@@ -14219,13 +14237,17 @@ var Orchestrator = class {
       const message = err instanceof Error ? err.message : String(err);
       await syncThreadBranchFromGit(threadId).catch(() => void 0);
       if (this.stoppedTurns.has(threadId)) {
-        setStatus(threadId, "stopped");
-        this.emit({ type: "status_changed", threadId, status: "stopped" });
+        const stopped = writeLiveStatus(threadId, "stopped");
+        if (stopped?.status === "stopped") {
+          this.emit({ type: "status_changed", threadId, status: "stopped" });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode: 1 });
       } else {
-        setStatus(threadId, "error", message);
-        this.emit({ type: "error", threadId, message });
-        this.emit({ type: "status_changed", threadId, status: "error" });
+        const written = writeLiveStatus(threadId, "error", message);
+        if (written?.status === "error") {
+          this.emit({ type: "error", threadId, message });
+          this.emit({ type: "status_changed", threadId, status: "error" });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode: 1 });
         void this.maybeHandleOrchestrationQuotaFailover(threadId, message);
       }
@@ -14272,9 +14294,11 @@ var Orchestrator = class {
     if (handle) handle.kill();
     const proc = this.processes.get(`${thread.id}:agent`);
     if (proc) proc.kill();
-    setStatus(thread.id, "stopped");
-    this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
-    return this.requireThread(thread.id);
+    const stopped = writeLiveStatus(thread.id, "stopped") ?? readThread(thread.id) ?? thread;
+    if (stopped.status === "stopped") {
+      this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
+    }
+    return stopped;
   }
   async startDev(threadRef, scriptName) {
     const thread = this.requireThread(threadRef);
@@ -14510,11 +14534,21 @@ var Orchestrator = class {
       const off = this.on((event) => {
         if (event.type === "turn_finished" && event.threadId === thread.id) {
           off();
-          resolve(this.requireThread(thread.id));
+          const latest = readThread(thread.id);
+          if (!latest) {
+            reject(new Error(`Thread not found: ${thread.id}`));
+            return;
+          }
+          resolve(latest);
         }
         if (event.type === "error" && event.threadId === thread.id) {
           off();
-          resolve(this.requireThread(thread.id));
+          const latest = readThread(thread.id);
+          if (!latest) {
+            reject(new Error(`Thread not found: ${thread.id}`));
+            return;
+          }
+          resolve(latest);
         }
       });
       const timer = setInterval(() => {
@@ -14524,7 +14558,13 @@ var Orchestrator = class {
           reject(new Error("wait_for_turn timed out"));
         }
         const current = readThread(thread.id);
-        if (current && !["running", "queued"].includes(current.status)) {
+        if (!current) {
+          clearInterval(timer);
+          off();
+          reject(new Error(`Thread not found: ${thread.id}`));
+          return;
+        }
+        if (!["running", "queued"].includes(current.status)) {
           clearInterval(timer);
           off();
           resolve(current);

package/dist/mcp/run-stdio.js

@@ -17,7 +17,7 @@ import {
   resolveQuotaFallbackAgent,
   sideboardMcpProfile,
   summarizeTurnStderr
-} from "../chunk-GJ2HJQIU.js";
+} from "../chunk-WBX46OPD.js";
 import "../chunk-DKHGWYWR.js";
 import {
   addWorkspace,
@@ -1851,7 +1851,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-JXQ5QHDU.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-HBLA6FEV.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3300,23 +3300,24 @@ async function countUnpushedCommits(worktreePath) {
     reject: false
   });
   const branch = head.stdout.trim();
+  if (branch && branch !== "HEAD") {
+    const remote = await git(
+      ["rev-list", "--count", `origin/${branch}..HEAD`],
+      worktreePath,
+      { reject: false }
+    );
+    if (remote.exitCode === 0) {
+      const n2 = Number(remote.stdout.trim());
+      return Number.isFinite(n2) ? n2 : 0;
+    }
+  }
   const upstream = await git(
     ["rev-list", "--count", "@{upstream}..HEAD"],
     worktreePath,
     { reject: false }
   );
-  if (upstream.exitCode === 0) {
-    const n2 = Number(upstream.stdout.trim());
-    return Number.isFinite(n2) ? n2 : 0;
-  }
-  if (!branch || branch === "HEAD") return 0;
-  const remote = await git(
-    ["rev-list", "--count", `origin/${branch}..HEAD`],
-    worktreePath,
-    { reject: false }
-  );
-  if (remote.exitCode !== 0) return 0;
-  const n = Number(remote.stdout.trim());
+  if (upstream.exitCode !== 0) return 0;
+  const n = Number(upstream.stdout.trim());
   return Number.isFinite(n) ? n : 0;
 }
 function splitCombinedDiff(stdout) {
@@ -4626,6 +4627,11 @@ function isPidAlive(pid) {
     return false;
   }
 }
+function writeLiveStatus(threadId, status, lastError) {
+  const latest = readThread(threadId);
+  if (!latest || latest.status === "archived") return latest;
+  return setStatus(threadId, status, lastError);
+}
 var Orchestrator = class {
   events = new EventEmitter();
   processes = /* @__PURE__ */ new Map();
@@ -4931,6 +4937,9 @@ var Orchestrator = class {
   }
   async send(threadRef, prompt) {
     const thread = this.requireThread(threadRef);
+    if (thread.status === "archived") {
+      throw new Error(`Thread is archived: ${thread.id}`);
+    }
     return withThreadLock(thread.id, async () => {
       const current = this.requireThread(thread.id);
       const queue = [...current.queue, prompt];
@@ -5024,7 +5033,7 @@ var Orchestrator = class {
           break;
         }
         const thread = readThread(threadId);
-        if (!thread || thread.queue.length === 0) {
+        if (!thread || thread.status === "archived" || thread.queue.length === 0) {
           if (thread && thread.status === "queued") {
             setStatus(threadId, "idle");
             this.emit({ type: "status_changed", threadId, status: "idle" });
@@ -5055,14 +5064,17 @@ var Orchestrator = class {
     }
   }
   async runTurn(threadId, prompt) {
-    let thread = this.requireThread(threadId);
+    const existing = readThread(threadId);
+    if (!existing || existing.status === "archived") return;
+    let thread = existing;
     if (isGlobalThread(thread) && thread.sessionId && orchestratorSessionPoisonedByBuiltins(thread)) {
       thread = updateThread(threadId, { sessionId: null });
     }
+    const running = writeLiveStatus(threadId, "running");
+    if (!running || running.status !== "running") return;
     this.runningCount += 1;
     const turnStartedAt = Date.now();
     this.startingTurns.add(threadId);
-    setStatus(threadId, "running");
     this.emit({ type: "status_changed", threadId, status: "running" });
     this.emit({ type: "turn_started", threadId, prompt });
     try {
@@ -5333,8 +5345,8 @@ var Orchestrator = class {
           ts: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
-      const afterTurn = this.requireThread(threadId);
-      if (afterTurn.planMode && afterTurn.worktreePath?.trim()) {
+      const afterTurn = readThread(threadId);
+      if (afterTurn && afterTurn.status !== "archived" && afterTurn.planMode && afterTurn.worktreePath?.trim()) {
         const presented = extractPresentedPlan(parts);
         const exited = parts.some(
           (p) => p.type === "tool" && /exitplanmode/i.test(p.name)
@@ -5347,29 +5359,34 @@ var Orchestrator = class {
           }
         }
       }
-      if (afterTurn.planMode && afterTurn.agent === "claude" && parts.some(
+      if (afterTurn && afterTurn.status !== "archived" && afterTurn.planMode && afterTurn.agent === "claude" && parts.some(
         (p) => p.type === "tool" && /exitplanmode/i.test(p.name)
       )) {
         updateThread(threadId, { sessionId: null });
       }
       await syncThreadBranchFromGit(threadId);
       if (this.stoppedTurns.has(threadId)) {
-        setStatus(threadId, "stopped");
-        this.emit({ type: "status_changed", threadId, status: "stopped" });
+        const stopped = writeLiveStatus(threadId, "stopped");
+        if (stopped?.status === "stopped") {
+          this.emit({ type: "status_changed", threadId, status: "stopped" });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode });
       } else {
         const failDetail = formatTurnExitError(exitCode, detail);
         const explainedInChat = exitCode !== 0 && Boolean(chatText) && (looksLikeAgentFailureMessage(chatText) || failDetail && chatText.includes(failDetail.replace(/^exit\s*\d+:\s*/i, "").trim()));
-        setStatus(
+        const nextStatus = exitCode === 0 ? "idle" : "error";
+        const written = writeLiveStatus(
           threadId,
-          exitCode === 0 ? "idle" : "error",
+          nextStatus,
           exitCode === 0 || explainedInChat ? null : failDetail
         );
-        this.emit({
-          type: "status_changed",
-          threadId,
-          status: exitCode === 0 ? "idle" : "error"
-        });
+        if (written && written.status !== "archived") {
+          this.emit({
+            type: "status_changed",
+            threadId,
+            status: written.status
+          });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode });
         if (exitCode !== 0) {
           const blob = [chatText, detail].filter(Boolean).join("\n");
@@ -5380,13 +5397,17 @@ var Orchestrator = class {
       const message = err instanceof Error ? err.message : String(err);
       await syncThreadBranchFromGit(threadId).catch(() => void 0);
       if (this.stoppedTurns.has(threadId)) {
-        setStatus(threadId, "stopped");
-        this.emit({ type: "status_changed", threadId, status: "stopped" });
+        const stopped = writeLiveStatus(threadId, "stopped");
+        if (stopped?.status === "stopped") {
+          this.emit({ type: "status_changed", threadId, status: "stopped" });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode: 1 });
       } else {
-        setStatus(threadId, "error", message);
-        this.emit({ type: "error", threadId, message });
-        this.emit({ type: "status_changed", threadId, status: "error" });
+        const written = writeLiveStatus(threadId, "error", message);
+        if (written?.status === "error") {
+          this.emit({ type: "error", threadId, message });
+          this.emit({ type: "status_changed", threadId, status: "error" });
+        }
         this.emit({ type: "turn_finished", threadId, exitCode: 1 });
         void this.maybeHandleOrchestrationQuotaFailover(threadId, message);
       }
@@ -5433,9 +5454,11 @@ var Orchestrator = class {
     if (handle) handle.kill();
     const proc = this.processes.get(`${thread.id}:agent`);
     if (proc) proc.kill();
-    setStatus(thread.id, "stopped");
-    this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
-    return this.requireThread(thread.id);
+    const stopped = writeLiveStatus(thread.id, "stopped") ?? readThread(thread.id) ?? thread;
+    if (stopped.status === "stopped") {
+      this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
+    }
+    return stopped;
   }
   async startDev(threadRef, scriptName) {
     const thread = this.requireThread(threadRef);
@@ -5671,11 +5694,21 @@ var Orchestrator = class {
       const off = this.on((event) => {
         if (event.type === "turn_finished" && event.threadId === thread.id) {
           off();
-          resolve(this.requireThread(thread.id));
+          const latest = readThread(thread.id);
+          if (!latest) {
+            reject(new Error(`Thread not found: ${thread.id}`));
+            return;
+          }
+          resolve(latest);
         }
         if (event.type === "error" && event.threadId === thread.id) {
           off();
-          resolve(this.requireThread(thread.id));
+          const latest = readThread(thread.id);
+          if (!latest) {
+            reject(new Error(`Thread not found: ${thread.id}`));
+            return;
+          }
+          resolve(latest);
         }
       });
       const timer = setInterval(() => {
@@ -5685,7 +5718,13 @@ var Orchestrator = class {
           reject(new Error("wait_for_turn timed out"));
         }
         const current = readThread(thread.id);
-        if (current && !["running", "queued"].includes(current.status)) {
+        if (!current) {
+          clearInterval(timer);
+          off();
+          reject(new Error(`Thread not found: ${thread.id}`));
+          return;
+        }
+        if (!["running", "queued"].includes(current.status)) {
           clearInterval(timer);
           off();
           resolve(current);

package/package.json

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