@sideboard-ai/core 0.1.52 → 0.1.56

package/dist/agents/cursor-runner.cjs

@@ -84,6 +84,75 @@ function usageFromCursor(usage) {
     cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
   };
 }
+function asRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function normalizeCursorToolCall(name, args) {
+  const raw = asRecord(args);
+  const toolName = typeof raw?.toolName === "string" && raw.toolName.trim() ? raw.toolName.trim() : null;
+  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord(raw?.args) != null);
+  if (looksLikeMcp && toolName) {
+    const providerRaw = typeof raw.providerIdentifier === "string" && raw.providerIdentifier.trim() ? raw.providerIdentifier.trim() : "sideboard";
+    const provider = providerRaw.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const nested = asRecord(raw.args);
+    return {
+      name: `mcp__${provider}__${toolName}`,
+      input: nested ?? { toolName }
+    };
+  }
+  return { name, input: raw };
+}
+function unwrapCursorToolResult(result) {
+  if (result == null) return void 0;
+  if (typeof result === "string") return result;
+  const rec = asRecord(result);
+  if (!rec) {
+    try {
+      return JSON.stringify(result);
+    } catch {
+      return String(result);
+    }
+  }
+  const collectTexts = (items) => {
+    const texts = [];
+    for (const item of items) {
+      const row = asRecord(item);
+      if (!row) continue;
+      if (typeof row.text === "string") {
+        texts.push(row.text);
+        continue;
+      }
+      const nested = asRecord(row.text);
+      if (typeof nested?.text === "string") texts.push(nested.text);
+    }
+    return texts;
+  };
+  const value = asRecord(rec.value);
+  if (value && Array.isArray(value.content)) {
+    const texts = collectTexts(value.content);
+    if (texts.length) return texts.join("\n");
+  }
+  if (Array.isArray(rec.content)) {
+    const texts = collectTexts(rec.content);
+    if (texts.length) return texts.join("\n");
+  }
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function cursorToolResultIsError(status, result) {
+  if (status === "error") return true;
+  const rec = asRecord(result);
+  if (!rec) return false;
+  if (rec.status === "error") return true;
+  const value = asRecord(rec.value);
+  return value?.isError === true;
+}
 function cursorSdkMessageToEvents(msg) {
   if (!msg?.type) return [];
   if (msg.type === "system" && msg.agent_id) {
@@ -98,35 +167,42 @@ function cursorSdkMessageToEvents(msg) {
       if (block?.type === "text" && block.text) {
         out.push({ type: "stdout", data: block.text });
       } else if (block?.type === "tool_use" && block.id && block.name) {
+        const normalized = normalizeCursorToolCall(block.name, block.input);
         out.push({
           type: "tool_use",
           id: block.id,
-          name: block.name,
-          input: block.input && typeof block.input === "object" ? block.input : void 0
+          name: normalized.name,
+          input: normalized.input
         });
       }
     }
     return out;
   }
   if (msg.type === "tool_call" && msg.call_id && msg.name) {
+    const normalized = normalizeCursorToolCall(msg.name, msg.args);
     if (msg.status === "running") {
       return [
         {
           type: "tool_use",
           id: msg.call_id,
-          name: msg.name,
-          input: msg.args && typeof msg.args === "object" ? msg.args : void 0
+          name: normalized.name,
+          input: normalized.input
         }
       ];
     }
     if (msg.status === "completed" || msg.status === "error") {
-      const content = typeof msg.result === "string" ? msg.result : msg.result != null ? JSON.stringify(msg.result) : void 0;
       return [
+        {
+          type: "tool_use",
+          id: msg.call_id,
+          name: normalized.name,
+          input: normalized.input
+        },
         {
           type: "tool_result",
           id: msg.call_id,
-          content,
-          isError: msg.status === "error"
+          content: unwrapCursorToolResult(msg.result),
+          isError: cursorToolResultIsError(msg.status, msg.result)
         }
       ];
     }
@@ -171,6 +247,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 +345,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-3WJAUKIL.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-YKSS6VBO.js → agents-2YYWW723.js}

@@ -26,7 +26,7 @@ import {
   permissionMode,
   resolveCursorModelId,
   resolveQuotaFallbackAgent
-} from "./chunk-D3METLRW.js";
+} from "./chunk-7F454EE2.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
@@ -37,8 +37,8 @@ import "./chunk-BXJ76RHF.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-J5JTEJ5O.js";
-import "./chunk-T5QQVXK3.js";
+} from "./chunk-3WJAUKIL.js";
+import "./chunk-DIOF73S2.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";
 import {

package/dist/{agents-ON6RKKND.js → agents-AQFEFKBL.js}

@@ -30,9 +30,8 @@ import {
   permissionMode,
   resolveCursorModelId,
   resolveQuotaFallbackAgent
-} from "./chunk-6QTZVJ7A.js";
+} from "./chunk-C3J4GDW4.js";
 import "./chunk-H6GGDLYS.js";
-import "./chunk-HBJSHRY2.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
@@ -42,6 +41,7 @@ import {
 import {
   ensureAgentPath
 } from "./chunk-ZNM4MAN4.js";
+import "./chunk-C4BCC5X5.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";
 export {

package/dist/{app-settings-LZP632KI.js → app-settings-2LQNRTBE.js}

@@ -27,6 +27,7 @@ import {
   orchestrationQuotaOnLimit,
   resolveClaudeExecutable,
   resolveEffectiveIssueSource,
+  resolveNewThreadOptions,
   resolveThreadDefaults,
   saveAppSettings,
   updateAdvancedSettings,
@@ -35,7 +36,7 @@ import {
   updateClaudeSettings,
   updateDefaultsSettings,
   updateIntegrationsSettings
-} from "./chunk-T5QQVXK3.js";
+} from "./chunk-DIOF73S2.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";
 export {
@@ -67,6 +68,7 @@ export {
   orchestrationQuotaOnLimit,
   resolveClaudeExecutable,
   resolveEffectiveIssueSource,
+  resolveNewThreadOptions,
   resolveThreadDefaults,
   saveAppSettings,
   updateAdvancedSettings,

package/dist/{app-settings-7XVDQJ7F.js → app-settings-73DI4B6T.js}

@@ -29,6 +29,7 @@ import {
   orchestrationQuotaOnLimit,
   resolveClaudeExecutable,
   resolveEffectiveIssueSource,
+  resolveNewThreadOptions,
   resolveThreadDefaults,
   saveAppSettings,
   updateAdvancedSettings,
@@ -37,7 +38,7 @@ import {
   updateClaudeSettings,
   updateDefaultsSettings,
   updateIntegrationsSettings
-} from "./chunk-HBJSHRY2.js";
+} from "./chunk-C4BCC5X5.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";
 export {
@@ -69,6 +70,7 @@ export {
   orchestrationQuotaOnLimit,
   resolveClaudeExecutable,
   resolveEffectiveIssueSource,
+  resolveNewThreadOptions,
   resolveThreadDefaults,
   saveAppSettings,
   updateAdvancedSettings,

package/dist/{chunk-J5JTEJ5O.js → chunk-3WJAUKIL.js}

@@ -60,6 +60,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;
@@ -127,6 +132,75 @@ function usageFromCursor(usage) {
     cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
   };
 }
+function asRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function normalizeCursorToolCall(name, args) {
+  const raw = asRecord(args);
+  const toolName = typeof raw?.toolName === "string" && raw.toolName.trim() ? raw.toolName.trim() : null;
+  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord(raw?.args) != null);
+  if (looksLikeMcp && toolName) {
+    const providerRaw = typeof raw.providerIdentifier === "string" && raw.providerIdentifier.trim() ? raw.providerIdentifier.trim() : "sideboard";
+    const provider = providerRaw.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const nested = asRecord(raw.args);
+    return {
+      name: `mcp__${provider}__${toolName}`,
+      input: nested ?? { toolName }
+    };
+  }
+  return { name, input: raw };
+}
+function unwrapCursorToolResult(result) {
+  if (result == null) return void 0;
+  if (typeof result === "string") return result;
+  const rec = asRecord(result);
+  if (!rec) {
+    try {
+      return JSON.stringify(result);
+    } catch {
+      return String(result);
+    }
+  }
+  const collectTexts = (items) => {
+    const texts = [];
+    for (const item of items) {
+      const row = asRecord(item);
+      if (!row) continue;
+      if (typeof row.text === "string") {
+        texts.push(row.text);
+        continue;
+      }
+      const nested = asRecord(row.text);
+      if (typeof nested?.text === "string") texts.push(nested.text);
+    }
+    return texts;
+  };
+  const value = asRecord(rec.value);
+  if (value && Array.isArray(value.content)) {
+    const texts = collectTexts(value.content);
+    if (texts.length) return texts.join("\n");
+  }
+  if (Array.isArray(rec.content)) {
+    const texts = collectTexts(rec.content);
+    if (texts.length) return texts.join("\n");
+  }
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function cursorToolResultIsError(status, result) {
+  if (status === "error") return true;
+  const rec = asRecord(result);
+  if (!rec) return false;
+  if (rec.status === "error") return true;
+  const value = asRecord(rec.value);
+  return value?.isError === true;
+}
 function cursorSdkMessageToEvents(msg) {
   if (!msg?.type) return [];
   if (msg.type === "system" && msg.agent_id) {
@@ -141,35 +215,42 @@ function cursorSdkMessageToEvents(msg) {
       if (block?.type === "text" && block.text) {
         out.push({ type: "stdout", data: block.text });
       } else if (block?.type === "tool_use" && block.id && block.name) {
+        const normalized = normalizeCursorToolCall(block.name, block.input);
         out.push({
           type: "tool_use",
           id: block.id,
-          name: block.name,
-          input: block.input && typeof block.input === "object" ? block.input : void 0
+          name: normalized.name,
+          input: normalized.input
         });
       }
     }
     return out;
   }
   if (msg.type === "tool_call" && msg.call_id && msg.name) {
+    const normalized = normalizeCursorToolCall(msg.name, msg.args);
     if (msg.status === "running") {
       return [
         {
           type: "tool_use",
           id: msg.call_id,
-          name: msg.name,
-          input: msg.args && typeof msg.args === "object" ? msg.args : void 0
+          name: normalized.name,
+          input: normalized.input
         }
       ];
     }
     if (msg.status === "completed" || msg.status === "error") {
-      const content = typeof msg.result === "string" ? msg.result : msg.result != null ? JSON.stringify(msg.result) : void 0;
       return [
+        {
+          type: "tool_use",
+          id: msg.call_id,
+          name: normalized.name,
+          input: normalized.input
+        },
         {
           type: "tool_result",
           id: msg.call_id,
-          content,
-          isError: msg.status === "error"
+          content: unwrapCursorToolResult(msg.result),
+          isError: cursorToolResultIsError(msg.status, msg.result)
         }
       ];
     }
@@ -212,6 +293,7 @@ export {
   extractJsonErrorMessage,
   pushTurnStderr,
   summarizeTurnStderr,
+  looksLikeInvalidAgentSession,
   looksLikeAgentFailureMessage,
   fallbackTurnFailDetail,
   humanizeAgentFailDetail,

package/dist/{chunk-GNML24AW.js → chunk-5DMYULLC.js}

@@ -1,6 +1,6 @@
 import {
   isGlobalRepoPath
-} from "./chunk-XX5BB7NV.js";
+} from "./chunk-S42XDFKF.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot