@sideboard-ai/core 0.1.39 → 0.1.42

package/dist/mcp/run-stdio.cjs

@@ -443,6 +443,7 @@ function normalizeThread(raw) {
     planMode: Boolean(raw.planMode),
     autonomy: raw.autonomy ?? "default",
     lastError: raw.lastError ?? null,
+    agentPid: raw.agentPid ?? null,
     attachments: Array.isArray(raw.attachments) ? raw.attachments : [],
     prTitle: raw.prTitle ?? null,
     userSetTitle: Boolean(raw.userSetTitle),
@@ -478,7 +479,8 @@ function createEmptyThread(partial) {
     worktreePath: partial.worktreePath,
     repoPath: partial.repoPath,
     agent: partial.agent,
-    lastError: null
+    lastError: null,
+    agentPid: null
   };
 }
 async function withThreadLock(id, fn) {
@@ -5615,15 +5617,62 @@ var init_workspaces = __esm({
   }
 });
 
+// src/agents/cursor-recover.ts
+var cursor_recover_exports = {};
+__export(cursor_recover_exports, {
+  recoverFinishedCursorRun: () => recoverFinishedCursorRun
+});
+function recoverFinishedCursorRun(opts) {
+  const agentId = opts.agentId.trim();
+  if (!agentId) return null;
+  const runsPath = (0, import_node_path23.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
+  if (!(0, import_node_fs24.existsSync)(runsPath)) return null;
+  try {
+    const lines = (0, import_node_fs24.readFileSync)(runsPath, "utf8").split("\n");
+    let best = null;
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      let row;
+      try {
+        row = JSON.parse(trimmed);
+      } catch {
+        continue;
+      }
+      if (row.agentId !== agentId) continue;
+      if (row.status !== "finished") continue;
+      if (typeof row.result !== "string" || !row.result.trim()) continue;
+      const endedAt = typeof row.endedAt === "number" ? row.endedAt : 0;
+      const createdAt = typeof row.createdAt === "number" ? row.createdAt : 0;
+      if (createdAt < opts.startedAfterMs && endedAt < opts.startedAfterMs) continue;
+      if (!best || endedAt >= best.endedAt) {
+        best = { runId: row.runId || "", result: row.result.trim(), endedAt };
+      }
+    }
+    return best;
+  } catch {
+    return null;
+  }
+}
+var import_node_fs24, import_node_path23;
+var init_cursor_recover = __esm({
+  "src/agents/cursor-recover.ts"() {
+    "use strict";
+    import_node_fs24 = require("fs");
+    import_node_path23 = require("path");
+    init_paths();
+  }
+});
+
 // src/mcp/server.ts
 var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_zod = require("zod");
-var import_node_path23 = require("path");
+var import_node_path24 = require("path");
 
 // src/orchestrator/orchestrator.ts
 var import_node_events = require("events");
-var import_node_fs24 = require("fs");
+var import_node_fs25 = require("fs");
 init_error_detail();
 
 // src/agents/spawn.ts
@@ -8559,6 +8608,31 @@ function formatWorktreeDirective(thread, opts) {
       "- Prefer a draft PR first: `gh pr create --draft -R <origin-owner/name>` (or update via `gh pr edit -R \u2026`) once the change set is coherent. Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree \u2014 never from `upstream`. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name."
     );
   }
+  lines.push("");
+  lines.push(
+    "Short git requests from the Sideboard UI are complete instructions \u2014 expand them using the rules above without asking for clarification:"
+  );
+  lines.push(
+    '- "Commit and push." \u2192 commit any uncommitted work with a purpose-stating message, then push to origin (updates an existing PR if one is linked).'
+  );
+  lines.push(
+    '- "Commit, push, and open a draft PR." \u2192 commit, push, then create a draft PR with `gh pr create --draft -R \u2026` (title/body from the change purpose).'
+  );
+  lines.push(
+    '- "Commit, push, and open a PR in the browser." \u2192 commit, push, then `gh pr create --web -R \u2026`.'
+  );
+  lines.push(
+    '- "Fix CI: <name>." \u2192 investigate that failing check, fix it, commit, and push.'
+  );
+  lines.push(
+    '- "Update the branch." / "Fix merge conflicts." \u2192 sync with the PR base (merge or rebase), resolve conflicts carefully, commit, and push until the PR is mergeable.'
+  );
+  lines.push(
+    '- "Address review comments." \u2192 read PR review feedback, make the requested changes, commit, and push.'
+  );
+  lines.push(
+    '- "Merge PR." \u2192 merge this thread\'s open pull request with `gh pr merge` (respect repo defaults / squash vs merge); do not force-push main/master.'
+  );
   return lines.join("\n");
 }
 function formatArtifactDirective() {
@@ -8677,6 +8751,15 @@ async function syncThreadBranchFromGit(threadId) {
 init_workspaces();
 init_global_workspace();
 init_coordinator_prompt();
+function isPidAlive(pid) {
+  if (!Number.isFinite(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
 var Orchestrator = class {
   events = new import_node_events.EventEmitter();
   processes = /* @__PURE__ */ new Map();
@@ -8713,8 +8796,18 @@ var Orchestrator = class {
   isStaleRunningThread(threadId, status) {
     return status === "running" && !this.activeTurns.has(threadId) && !this.startingTurns.has(threadId);
   }
+  /**
+   * Cross-process guard: another Sideboard process (MCP stdio) may call reconcile
+   * while the desktop still owns a live agent child. Never reclaim those.
+   */
+  shouldReclaimRunningThread(thread) {
+    if (!this.isStaleRunningThread(thread.id, thread.status)) return false;
+    const pid = thread.agentPid;
+    if (typeof pid === "number" && pid > 0 && isPidAlive(pid)) return false;
+    return true;
+  }
   async reconcile(repoPath, opts) {
-    const reclaimStaleTurns = opts?.reclaimStaleTurns !== false;
+    const reclaimStaleTurns = opts?.reclaimStaleTurns === true;
     healOrchestrationSoccerTitles();
     for (const thread of listThreads({ includeArchived: true })) {
       if (thread.status === "archived") continue;
@@ -8730,18 +8823,18 @@ var Orchestrator = class {
         if (Object.keys(heal).length) {
           updateThread(thread.id, heal);
         }
-        if (reclaimStaleTurns && this.isStaleRunningThread(thread.id, thread.status)) {
+        if (reclaimStaleTurns && this.shouldReclaimRunningThread(thread)) {
           setStatus(thread.id, "stopped", "Process died (reconciled on startup)");
           this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
         }
         continue;
       }
-      if (!(0, import_node_fs24.existsSync)(thread.worktreePath)) {
+      if (!(0, import_node_fs25.existsSync)(thread.worktreePath)) {
         setStatus(thread.id, "broken", "Worktree missing on disk");
         this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
         continue;
       }
-      if (reclaimStaleTurns && this.isStaleRunningThread(thread.id, thread.status)) {
+      if (reclaimStaleTurns && this.shouldReclaimRunningThread(thread)) {
         setStatus(thread.id, "stopped", "Process died (reconciled on startup)");
         this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
       }
@@ -8923,6 +9016,11 @@ var Orchestrator = class {
           await new Promise((r) => setTimeout(r, 100));
           continue;
         }
+        const livePid = thread.agentPid;
+        if (typeof livePid === "number" && livePid > 0 && isPidAlive(livePid)) {
+          await new Promise((r) => setTimeout(r, 200));
+          continue;
+        }
         const prompt = thread.queue[0];
         const remaining = thread.queue.slice(1);
         updateThread(threadId, { queue: remaining });
@@ -9066,10 +9164,18 @@ var Orchestrator = class {
           if (event.type === "stderr" && typeof event.data === "string") {
             pushTurnStderr(stderrTail, event.data);
           }
+          const live = readThread(threadId);
+          if (live?.lastError?.includes("reconciled on startup") && (this.activeTurns.has(threadId) || this.startingTurns.has(threadId))) {
+            setStatus(threadId, "running");
+            this.emit({ type: "status_changed", threadId, status: "running" });
+          }
         }
       );
       this.activeTurns.set(threadId, handle);
       this.startingTurns.delete(threadId);
+      if (typeof handle.pid === "number" && handle.pid > 0) {
+        updateThread(threadId, { agentPid: handle.pid });
+      }
       if (this.stoppedTurns.has(threadId)) {
         handle.kill();
       } else {
@@ -9089,20 +9195,41 @@ var Orchestrator = class {
       if (result.sessionId) {
         updateThread(threadId, { sessionId: result.sessionId });
       }
-      const assistantText = result.assistantText.trim();
-      const failureOnlyMessage = result.exitCode !== 0 && looksLikeAgentFailureMessage(assistantText) && !result.parts.some((p) => p.type === "tool" || p.type === "thinking");
-      if (!failureOnlyMessage && (assistantText || result.parts.length > 0)) {
+      let assistantText = result.assistantText.trim();
+      let parts = result.parts;
+      let usage = result.usage ?? void 0;
+      let exitCode = result.exitCode;
+      if (this.requireThread(threadId).agent === "cursor" && exitCode !== 0 && !assistantText && parts.length === 0) {
+        const sessionId = result.sessionId || this.requireThread(threadId).sessionId || "";
+        if (sessionId) {
+          const { recoverFinishedCursorRun: recoverFinishedCursorRun2 } = await Promise.resolve().then(() => (init_cursor_recover(), cursor_recover_exports));
+          for (let i = 0; i < 8; i++) {
+            const recovered = recoverFinishedCursorRun2({
+              agentId: sessionId,
+              startedAfterMs: turnStartedAt - 5e3
+            });
+            if (recovered?.result) {
+              assistantText = recovered.result;
+              exitCode = 0;
+              break;
+            }
+            await new Promise((r) => setTimeout(r, 500));
+          }
+        }
+      }
+      const failureOnlyMessage = exitCode !== 0 && looksLikeAgentFailureMessage(assistantText) && !parts.some((p) => p.type === "tool" || p.type === "thinking");
+      if (!failureOnlyMessage && (assistantText || parts.length > 0)) {
         appendMessage(threadId, {
           role: "agent",
           text: assistantText,
-          parts: result.parts.length > 0 ? result.parts : void 0,
+          parts: parts.length > 0 ? parts : void 0,
           durationMs: Math.max(0, Date.now() - turnStartedAt),
-          usage: result.usage ?? void 0,
+          usage,
           ts: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
       const afterTurn = this.requireThread(threadId);
-      if (afterTurn.planMode && afterTurn.agent === "claude" && result.parts.some(
+      if (afterTurn.planMode && afterTurn.agent === "claude" && parts.some(
         (p) => p.type === "tool" && /exitplanmode/i.test(p.name)
       )) {
         updateThread(threadId, { sessionId: null });
@@ -9111,22 +9238,22 @@ var Orchestrator = class {
       if (this.stoppedTurns.has(threadId)) {
         setStatus(threadId, "stopped");
         this.emit({ type: "status_changed", threadId, status: "stopped" });
-        this.emit({ type: "turn_finished", threadId, exitCode: result.exitCode });
+        this.emit({ type: "turn_finished", threadId, exitCode });
       } else {
         const lastStderr = summarizeTurnStderr(stderrTail);
-        const detail = lastStderr || (result.exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-        const failDetail = formatTurnExitError(result.exitCode, detail);
+        const detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
+        const failDetail = formatTurnExitError(exitCode, detail);
         setStatus(
           threadId,
-          result.exitCode === 0 ? "idle" : "error",
-          result.exitCode === 0 ? null : failDetail
+          exitCode === 0 ? "idle" : "error",
+          exitCode === 0 ? null : failDetail
         );
         this.emit({
           type: "status_changed",
           threadId,
-          status: result.exitCode === 0 ? "idle" : "error"
+          status: exitCode === 0 ? "idle" : "error"
         });
-        this.emit({ type: "turn_finished", threadId, exitCode: result.exitCode });
+        this.emit({ type: "turn_finished", threadId, exitCode });
       }
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -9147,6 +9274,10 @@ var Orchestrator = class {
       this.processes.delete(`${threadId}:agent`);
       this.stoppedTurns.delete(threadId);
       this.runningCount = Math.max(0, this.runningCount - 1);
+      try {
+        updateThread(threadId, { agentPid: null });
+      } catch {
+      }
     }
   }
   /**
@@ -9719,7 +9850,7 @@ var Orchestrator = class {
       updateThread(thread.id, { worktreePath: globalAgentCwd2() });
       return setStatus(thread.id, "idle");
     }
-    if (!(0, import_node_fs24.existsSync)(thread.worktreePath)) {
+    if (!(0, import_node_fs25.existsSync)(thread.worktreePath)) {
       const { createThreadWorktree: createThreadWorktree2 } = await Promise.resolve().then(() => (init_worktree(), worktree_exports));
       const { execa: execa7 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
@@ -9937,7 +10068,7 @@ async function startMcpServer() {
     async () => {
       const threads = orch.getThreads(true);
       const lines = threads.map((t) => {
-        const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path23.basename)(t.repoPath) || t.repoPath;
+        const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path24.basename)(t.repoPath) || t.repoPath;
         return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}  sideboard://thread/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}`;
       });
       return {

package/dist/mcp/run-stdio.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   startMcpServer
-} from "../chunk-2YFQNL3O.js";
-import "../chunk-FVGRUZHI.js";
-import "../chunk-IS3AGU33.js";
-import "../chunk-PTASB7SJ.js";
-import "../chunk-BEXVE7LX.js";
+} from "../chunk-FZH2SL5I.js";
+import "../chunk-44LYDJFB.js";
+import "../chunk-6TZSJMXF.js";
+import "../chunk-UPMGXM4X.js";
+import "../chunk-SX2R2PCE.js";
 import "../chunk-ILQK4P5R.js";
 import "../chunk-PU27NUO4.js";
 import "../chunk-YZ23S32T.js";
-import "../chunk-XBEQI5H4.js";
-import "../chunk-HYRHI3QU.js";
+import "../chunk-VA2U5EQH.js";
+import "../chunk-5UIKSPDD.js";
 import "../chunk-M37RITA6.js";
 import "../chunk-AJ6ROGD7.js";
 

package/dist/{thread-store-UNPZNIFW.js → thread-store-WPLT3IXM.js}

@@ -10,7 +10,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-HYRHI3QU.js";
+} from "./chunk-5UIKSPDD.js";
 import "./chunk-M37RITA6.js";
 export {
   appendMessage,

package/dist/{workspaces-DMYWHVJC.js → workspaces-Z7CSL4O6.js}

@@ -4,11 +4,11 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-FVGRUZHI.js";
-import "./chunk-IS3AGU33.js";
-import "./chunk-PTASB7SJ.js";
-import "./chunk-XBEQI5H4.js";
-import "./chunk-HYRHI3QU.js";
+} from "./chunk-44LYDJFB.js";
+import "./chunk-6TZSJMXF.js";
+import "./chunk-UPMGXM4X.js";
+import "./chunk-VA2U5EQH.js";
+import "./chunk-5UIKSPDD.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-AJ6ROGD7.js";
 export {

package/dist/{worktree-37FBII5A.js → worktree-M3DTPYBW.js}

@@ -41,8 +41,8 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-XBEQI5H4.js";
-import "./chunk-HYRHI3QU.js";
+} from "./chunk-VA2U5EQH.js";
+import "./chunk-5UIKSPDD.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-AJ6ROGD7.js";
 export {

package/package.json

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