@sideboard-ai/core 0.1.51 → 0.1.53

package/dist/agents/cursor-runner.cjs

@@ -171,6 +171,33 @@ function localAgentStore() {
   (0, import_node_fs3.mkdirSync)(root, { recursive: true });
   return new import_sdk.JsonlLocalAgentStore(root);
 }
+function isAgentBusyError(err) {
+  if (err instanceof import_sdk.AgentBusyError) return true;
+  const message = err instanceof Error ? err.message : String(err);
+  return /already has active run/i.test(message);
+}
+async function cancelStaleLocalRuns(agentId, opts) {
+  const listed = await import_sdk.Agent.listRuns(agentId, {
+    runtime: "local",
+    cwd: opts.cwd,
+    store: opts.store,
+    limit: 20
+  });
+  let cancelled = 0;
+  for (const run of listed.items) {
+    if (run.status !== "running") continue;
+    try {
+      await import_sdk.Agent.cancelRun(run.id, {
+        runtime: "local",
+        cwd: opts.cwd,
+        store: opts.store
+      });
+      cancelled += 1;
+    } catch {
+    }
+  }
+  return cancelled;
+}
 async function readStdinJson() {
   const rl = (0, import_node_readline.createInterface)({ input: process.stdin, crlfDelay: Infinity });
   const chunks = [];
@@ -242,10 +269,22 @@ async function main() {
     }
     try {
       emit({ type: "session_id", data: agent.agentId });
-      const run = await agent.send(
-        req.prompt,
-        mcpServers ? { mcpServers } : void 0
-      );
+      const sendOpts = mcpServers ? { mcpServers } : void 0;
+      let run;
+      try {
+        run = await agent.send(req.prompt, sendOpts);
+      } catch (err) {
+        if (!isAgentBusyError(err)) throw err;
+        const n = await cancelStaleLocalRuns(agent.agentId, {
+          cwd: req.cwd,
+          store
+        });
+        emit({
+          type: "stderr",
+          data: n > 0 ? `Cursor agent had ${n} stale active run(s) \u2014 cancelled and retrying` : "Cursor agent busy \u2014 retrying send"
+        });
+        run = await agent.send(req.prompt, sendOpts);
+      }
       for await (const msg of run.stream()) {
         for (const event of cursorSdkMessageToEvents(msg)) {
           emit(event);

package/dist/agents/cursor-runner.js

@@ -2,13 +2,13 @@
 import {
   cursorSdkMessageToEvents,
   formatUnknownDetail
-} from "../chunk-J5JTEJ5O.js";
+} from "../chunk-VG22SETP.js";
 import {
   appDataDir
 } from "../chunk-M37RITA6.js";
 
 // src/agents/cursor-runner.ts
-import { Agent, CursorAgentError, JsonlLocalAgentStore } from "@cursor/sdk";
+import { Agent, AgentBusyError, CursorAgentError, JsonlLocalAgentStore } from "@cursor/sdk";
 import { mkdirSync } from "fs";
 import { join } from "path";
 import { createInterface } from "readline";
@@ -35,6 +35,33 @@ function localAgentStore() {
   mkdirSync(root, { recursive: true });
   return new JsonlLocalAgentStore(root);
 }
+function isAgentBusyError(err) {
+  if (err instanceof AgentBusyError) return true;
+  const message = err instanceof Error ? err.message : String(err);
+  return /already has active run/i.test(message);
+}
+async function cancelStaleLocalRuns(agentId, opts) {
+  const listed = await Agent.listRuns(agentId, {
+    runtime: "local",
+    cwd: opts.cwd,
+    store: opts.store,
+    limit: 20
+  });
+  let cancelled = 0;
+  for (const run of listed.items) {
+    if (run.status !== "running") continue;
+    try {
+      await Agent.cancelRun(run.id, {
+        runtime: "local",
+        cwd: opts.cwd,
+        store: opts.store
+      });
+      cancelled += 1;
+    } catch {
+    }
+  }
+  return cancelled;
+}
 async function readStdinJson() {
   const rl = createInterface({ input: process.stdin, crlfDelay: Infinity });
   const chunks = [];
@@ -106,10 +133,22 @@ async function main() {
     }
     try {
       emit({ type: "session_id", data: agent.agentId });
-      const run = await agent.send(
-        req.prompt,
-        mcpServers ? { mcpServers } : void 0
-      );
+      const sendOpts = mcpServers ? { mcpServers } : void 0;
+      let run;
+      try {
+        run = await agent.send(req.prompt, sendOpts);
+      } catch (err) {
+        if (!isAgentBusyError(err)) throw err;
+        const n = await cancelStaleLocalRuns(agent.agentId, {
+          cwd: req.cwd,
+          store
+        });
+        emit({
+          type: "stderr",
+          data: n > 0 ? `Cursor agent had ${n} stale active run(s) \u2014 cancelled and retrying` : "Cursor agent busy \u2014 retrying send"
+        });
+        run = await agent.send(req.prompt, sendOpts);
+      }
       for await (const msg of run.stream()) {
         for (const event of cursorSdkMessageToEvents(msg)) {
           emit(event);

package/dist/{agents-HIEJL3UV.js → agents-KP7UJEHJ.js}

@@ -30,7 +30,7 @@ import {
   permissionMode,
   resolveCursorModelId,
   resolveQuotaFallbackAgent
-} from "./chunk-7EUWSBWR.js";
+} from "./chunk-BZST4HMJ.js";
 import "./chunk-H6GGDLYS.js";
 import "./chunk-HBJSHRY2.js";
 import {

package/dist/{agents-5ROTZNCX.js → agents-KYACODJ3.js}

@@ -26,7 +26,7 @@ import {
   permissionMode,
   resolveCursorModelId,
   resolveQuotaFallbackAgent
-} from "./chunk-5ZPSH7VI.js";
+} from "./chunk-A6HVEMIB.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
@@ -37,7 +37,7 @@ import "./chunk-BXJ76RHF.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-J5JTEJ5O.js";
+} from "./chunk-VG22SETP.js";
 import "./chunk-T5QQVXK3.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";

package/dist/{chunk-5ZPSH7VI.js → chunk-A6HVEMIB.js}

@@ -10,7 +10,7 @@ import {
   formatUnknownDetail,
   looksLikeAgentFailureMessage,
   parseCursorRunnerLine
-} from "./chunk-J5JTEJ5O.js";
+} from "./chunk-VG22SETP.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
@@ -465,7 +465,9 @@ var SIDEBOARD_MCP_ALLOWED_TOOLS = [
 var SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS = [
   "mcp__sideboard__present_artifact",
   "mcp__sideboard__present_schema",
-  "mcp__sideboard__present_files"
+  "mcp__sideboard__present_files",
+  "mcp__sideboard__ask_user",
+  "mcp__sideboard__present_plan"
 ];
 var BRIGHTSY_MCP_ALLOWED_TOOLS = [
   "mcp__brightsy",
@@ -656,7 +658,7 @@ async function writeInjectedMcpConfig(opts) {
 }
 
 // src/agents/types.ts
-var PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or explicitly asks you to implement). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any files. Do not exit plan mode on your own.";
+var PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope): (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
 function permissionMode(thread) {
   if (thread.planMode) {
     return {
@@ -837,7 +839,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread } = await import("./global-workspace-ECYN2MKL.js");
+    const { isOrchestratorThread } = await import("./global-workspace-MSX2K27Y.js");
     const isOrchestrator = isOrchestratorThread(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1607,6 +1609,7 @@ var opencodeAdapter = {
     }
   },
   async resolveSessionId(worktreePath, cached) {
+    const cachedId = cached?.trim() || null;
     const listed = await run(
       "opencode",
       ["session", "list", "--format", "json"],
@@ -1618,15 +1621,21 @@ var opencodeAdapter = {
         if (Array.isArray(sessions) && sessions.length > 0) {
           const norm = (p) => p.replace(/\/+$/, "");
           const wt = norm(worktreePath);
-          const match = sessions.find(
+          const forWorktree = sessions.filter(
             (s) => s.directory && norm(s.directory) === wt || s.path && norm(s.path) === wt
           );
-          if (match?.id) return match.id;
+          if (cachedId && forWorktree.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          if (cachedId && sessions.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          return null;
         }
       } catch {
       }
     }
-    return cached;
+    return cachedId;
   },
   async buildAttach(thread) {
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);

package/dist/chunk-B3SJXYIJ.js

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+
+
+// src/paths/workspace-scratch.ts
+var ATTACHMENTS_DIR = ".context/attachments";
+var LEGACY_ATTACHMENTS_DIR = ".sideboard/attachments";
+var ATTACHMENTS_GITIGNORE = `# Sideboard / workspace attachments (local only)
+*
+!.gitignore
+`;
+function attachmentsGitignoreBody() {
+  return ATTACHMENTS_GITIGNORE;
+}
+function isWorkspaceScratchPath(relativePath) {
+  const p = relativePath.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "");
+  return p === ATTACHMENTS_DIR || p.startsWith(`${ATTACHMENTS_DIR}/`) || p === LEGACY_ATTACHMENTS_DIR || p.startsWith(`${LEGACY_ATTACHMENTS_DIR}/`) || p === ".context" || p.startsWith(".context/");
+}
+
+export {
+  ATTACHMENTS_DIR,
+  LEGACY_ATTACHMENTS_DIR,
+  attachmentsGitignoreBody,
+  isWorkspaceScratchPath
+};

package/dist/{chunk-7EUWSBWR.js → chunk-BZST4HMJ.js}

@@ -109,6 +109,11 @@ function summarizeTurnStderr(tail, maxChars = 500) {
   if (joined.length <= maxChars) return joined;
   return joined.slice(joined.length - maxChars);
 }
+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);
+}
 function looksLikeAgentFailureMessage(text) {
   const lower = text.trim().toLowerCase();
   if (!lower) return false;
@@ -534,7 +539,9 @@ var SIDEBOARD_MCP_ALLOWED_TOOLS = [
 var SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS = [
   "mcp__sideboard__present_artifact",
   "mcp__sideboard__present_schema",
-  "mcp__sideboard__present_files"
+  "mcp__sideboard__present_files",
+  "mcp__sideboard__ask_user",
+  "mcp__sideboard__present_plan"
 ];
 var brightsyMcpCommandCache = null;
 async function resolveBrightsyMcpCommand() {
@@ -718,7 +725,7 @@ function writeMcpServersConfig(servers) {
 }
 
 // src/agents/types.ts
-var PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or explicitly asks you to implement). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any files. Do not exit plan mode on your own.";
+var PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope): (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
 function permissionMode(thread) {
   if (thread.planMode) {
     return {
@@ -899,7 +906,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread } = await import("./global-workspace-OJEPGDXA.js");
+    const { isOrchestratorThread } = await import("./global-workspace-EV4G2WMQ.js");
     const isOrchestrator = isOrchestratorThread(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1764,6 +1771,7 @@ var opencodeAdapter = {
     }
   },
   async resolveSessionId(worktreePath, cached) {
+    const cachedId = cached?.trim() || null;
     const listed = await run(
       "opencode",
       ["session", "list", "--format", "json"],
@@ -1775,15 +1783,21 @@ var opencodeAdapter = {
         if (Array.isArray(sessions) && sessions.length > 0) {
           const norm = (p) => p.replace(/\/+$/, "");
           const wt = norm(worktreePath);
-          const match = sessions.find(
+          const forWorktree = sessions.filter(
             (s) => s.directory && norm(s.directory) === wt || s.path && norm(s.path) === wt
           );
-          if (match?.id) return match.id;
+          if (cachedId && forWorktree.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          if (cachedId && sessions.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          return null;
         }
       } catch {
       }
     }
-    return cached;
+    return cachedId;
   },
   async buildAttach(thread) {
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
@@ -2195,6 +2209,7 @@ function allAdapters() {
 export {
   pushTurnStderr,
   summarizeTurnStderr,
+  looksLikeInvalidAgentSession,
   looksLikeAgentFailureMessage,
   fallbackTurnFailDetail,
   humanizeAgentFailDetail,