@sideboard-ai/core 0.1.324 → 0.1.325

package/dist/{abletime-5ZY3ZUUO.js → abletime-M7STTMZT.js}

@@ -19,12 +19,13 @@ import {
   toAbleTimeIssueInfo,
   updateAbleTimeTask,
   verifyAbleTimeConnection
-} from "./chunk-Y3WREIPQ.js";
-import "./chunk-NXUN4U5P.js";
-import "./chunk-FR3SAYUL.js";
-import "./chunk-2GPQZZLY.js";
+} from "./chunk-A76MKMSF.js";
+import "./chunk-VAFQS4D2.js";
+import "./chunk-AQEKPJWU.js";
+import "./chunk-F6GE7V3Q.js";
 import "./chunk-N2WW62LF.js";
-import "./chunk-OIHRC2ZJ.js";
+import "./chunk-2GPQZZLY.js";
+import "./chunk-CI4M54LS.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-WWUABK6B.js";
 import "./chunk-FJZWM2ON.js";

package/dist/{abletime-CU2UPMJF.js → abletime-VL234MCP.js}

@@ -17,12 +17,13 @@ import {
   toAbleTimeIssueInfo,
   updateAbleTimeTask,
   verifyAbleTimeConnection
-} from "./chunk-7PVT73H6.js";
-import "./chunk-EKU7FQVG.js";
-import "./chunk-ODH3XHMI.js";
+} from "./chunk-NWGINMEA.js";
+import "./chunk-DBKHL7NC.js";
+import "./chunk-H36GKGU2.js";
+import "./chunk-ZEUMWHOH.js";
 import "./chunk-JAT3JFOS.js";
 import "./chunk-6K64FJDD.js";
-import "./chunk-EJ66LEKH.js";
+import "./chunk-RZJTGBXY.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";

package/dist/{abletime-oauth-7EOSBEFM.js → abletime-oauth-LMMGMAPA.js}

@@ -20,10 +20,10 @@ import {
   parseAbleTimeOAuthCallbackUrl,
   resolveAbleTimeOAuthHost,
   startAbleTimeOAuth
-} from "./chunk-Q3YJZPQI.js";
-import "./chunk-ODH3XHMI.js";
+} from "./chunk-SS6CYGLF.js";
+import "./chunk-ZEUMWHOH.js";
 import "./chunk-JAT3JFOS.js";
-import "./chunk-EJ66LEKH.js";
+import "./chunk-RZJTGBXY.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";

package/dist/{abletime-oauth-4TTCR3CT.js → abletime-oauth-P4ZFBEAL.js}

@@ -3,7 +3,7 @@
 import {
   DEFAULT_ABLETIME_HOST,
   normalizeAbleTimeHost
-} from "./chunk-FR3SAYUL.js";
+} from "./chunk-AQEKPJWU.js";
 import {
   httpFetch
 } from "./chunk-2GPQZZLY.js";
@@ -12,7 +12,7 @@ import {
   getAbleTimeHost,
   loadAppSettings,
   saveAbleTimeConnection
-} from "./chunk-OIHRC2ZJ.js";
+} from "./chunk-CI4M54LS.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-WWUABK6B.js";
 import "./chunk-FJZWM2ON.js";
@@ -288,7 +288,7 @@ async function startAbleTimeOAuth(opts) {
   persistAbleTimeTokens(data, { host });
   const token = data.access_token.trim();
   try {
-    const { getAbleTimeOrientation } = await import("./abletime-5ZY3ZUUO.js");
+    const { getAbleTimeOrientation } = await import("./abletime-M7STTMZT.js");
     const orientation = await getAbleTimeOrientation({ token, host });
     return saveAbleTimeConnection({
       accessToken: token,

package/dist/{abletime-rest-3TG4G7LW.js → abletime-rest-DLV7EIWS.js}

@@ -7,10 +7,10 @@ import {
   callAbleTimeRestTool,
   looksLikeAbleTimeUlid,
   textFromAbleTimeDoc
-} from "./chunk-NXUN4U5P.js";
-import "./chunk-FR3SAYUL.js";
+} from "./chunk-VAFQS4D2.js";
+import "./chunk-AQEKPJWU.js";
 import "./chunk-2GPQZZLY.js";
-import "./chunk-OIHRC2ZJ.js";
+import "./chunk-CI4M54LS.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-WWUABK6B.js";
 import "./chunk-FJZWM2ON.js";

package/dist/{abletime-rest-KOKE7V4B.js → abletime-rest-GOI7HELR.js}

@@ -5,10 +5,10 @@ import {
   callAbleTimeRestTool,
   looksLikeAbleTimeUlid,
   textFromAbleTimeDoc
-} from "./chunk-EKU7FQVG.js";
-import "./chunk-ODH3XHMI.js";
+} from "./chunk-H36GKGU2.js";
+import "./chunk-ZEUMWHOH.js";
 import "./chunk-JAT3JFOS.js";
-import "./chunk-EJ66LEKH.js";
+import "./chunk-RZJTGBXY.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";

package/dist/agents/claude-runner.cjs

@@ -166,6 +166,8 @@ function agentRuntimeLooksLive(meta = readAgentRuntimeMetadata()) {
 // src/agent-rpc/client.ts
 var AgentRpcClient = class {
   ws = null;
+  /** In-flight connect. Concurrent call()s must share it or each opens a socket. */
+  connecting = null;
   pending = /* @__PURE__ */ new Map();
   nextId = 1;
   url;
@@ -208,10 +210,10 @@ var AgentRpcClient = class {
     url.searchParams.set(AGENT_RPC_TOKEN_QUERY, this.authToken);
     return url.toString();
   }
-  async ensureSocket() {
-    if (this.ws && this.ws.readyState === import_ws.WebSocket.OPEN) return this.ws;
+  ensureSocket() {
+    if (this.ws && this.ws.readyState === import_ws.WebSocket.OPEN) return Promise.resolve(this.ws);
+    if (this.connecting) return this.connecting;
     const ws = new import_ws.WebSocket(this.socketUrl());
-    this.ws = ws;
     ws.on("message", (data) => this.onFrame(data.toString()));
     ws.on("error", (err) => this.drop(ws, err));
     ws.on("close", () => this.drop(ws, new Error("Agent RPC socket closed")));
@@ -224,11 +226,16 @@ var AgentRpcClient = class {
         )
       );
     });
-    await new Promise((resolve, reject) => {
+    let settled = false;
+    const pending = new Promise((resolve, reject) => {
       const fail = (err) => {
+        if (settled) return;
+        settled = true;
+        if (this.connecting === pending) this.connecting = null;
         const message = err.message.includes("401") ? "Unauthorized" : err.message;
         reject(message === err.message ? err : new Error(message));
       };
+      const failClose = () => fail(new Error("Agent RPC socket closed"));
       ws.once("unexpected-response", (_req, res) => {
         fail(
           new Error(
@@ -237,15 +244,22 @@ var AgentRpcClient = class {
         );
       });
       ws.once("error", fail);
+      ws.once("close", failClose);
       ws.once("open", () => {
         ws.off("error", fail);
-        resolve();
+        ws.off("close", failClose);
+        settled = true;
+        this.ws = ws;
+        this.connecting = null;
+        resolve(ws);
       });
     });
-    return ws;
+    this.connecting = pending;
+    return pending;
   }
   drop(ws, err) {
-    if (this.ws === ws) this.ws = null;
+    if (this.ws !== ws) return;
+    this.ws = null;
     if (this.pending.size === 0) return;
     this.failAll(err);
   }
@@ -485,6 +499,31 @@ async function claudePermissionResult(input) {
   }
 }
 
+// src/agents/claude-query-options.ts
+function buildClaudeSdkQueryOptions(req, mcpServers, abortController) {
+  const options = {
+    cwd: req.cwd,
+    pathToClaudeCodeExecutable: req.claudePath,
+    permissionMode: req.permissionMode,
+    ...req.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {},
+    allowedTools: req.allowedTools,
+    mcpServers,
+    includePartialMessages: true,
+    strictMcpConfig: true,
+    systemPrompt: {
+      type: "preset",
+      preset: "claude_code",
+      ...req.systemPrompt ? { append: req.systemPrompt } : {}
+    },
+    abortController
+  };
+  if (req.sessionId) options.resume = req.sessionId;
+  if (req.model) options.model = req.model;
+  if (req.effort) options.effort = req.effort;
+  if (req.chrome) options.extraArgs = { chrome: null };
+  return options;
+}
+
 // src/agents/claude-runner.ts
 dropNestedElectronEnvFromProcess();
 function emit(value) {
@@ -533,21 +572,17 @@ async function main() {
   for (const [name, spec] of Object.entries(req.mcpServers ?? {})) {
     mcpServers[name] = spec;
   }
+  const abortController = new AbortController();
+  let stopped = false;
+  const onStop = () => {
+    stopped = true;
+    abortController.abort();
+    setTimeout(() => process.exit(130), 3e3).unref();
+  };
+  process.once("SIGTERM", onStop);
+  process.once("SIGINT", onStop);
   try {
-    const options = {
-      cwd: req.cwd,
-      pathToClaudeCodeExecutable: req.claudePath,
-      permissionMode: req.permissionMode,
-      ...req.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {},
-      allowedTools: req.allowedTools,
-      mcpServers,
-      includePartialMessages: true
-    };
-    if (req.sessionId) options.resume = req.sessionId;
-    if (req.model) options.model = req.model;
-    if (req.systemPrompt) options.appendSystemPrompt = req.systemPrompt;
-    if (req.effort) options.effort = req.effort;
-    if (req.chrome) options.chrome = true;
+    const options = buildClaudeSdkQueryOptions(req, mcpServers, abortController);
     options.canUseTool = (toolName, toolInput, toolOpts) => claudePermissionResult({
       permissionMode: req.permissionMode,
       threadId: process.env.SIDEBOARD_THREAD_ID?.trim() || "",
@@ -558,11 +593,13 @@ async function main() {
       options: toolOpts,
       rpc: req.agentRpc
     });
-    options.settingSources = [];
     for await (const message of sdk.query({ prompt: req.prompt, options })) {
       emit(message);
     }
+    if (stopped) process.exitCode = 130;
   } finally {
+    process.off("SIGTERM", onStop);
+    process.off("SIGINT", onStop);
     exec.close();
   }
 }

package/dist/agents/claude-runner.js

@@ -9,7 +9,7 @@ import {
   AgentRpcClient,
   PILOT_TOOL_DESCRIPTIONS,
   createPilotRpcExecutors
-} from "../chunk-YDUHLWI5.js";
+} from "../chunk-SUZOPJZC.js";
 import {
   dropNestedElectronEnvFromProcess
 } from "../chunk-4TR3HZFT.js";
@@ -131,6 +131,31 @@ async function claudePermissionResult(input) {
   }
 }
 
+// src/agents/claude-query-options.ts
+function buildClaudeSdkQueryOptions(req, mcpServers, abortController) {
+  const options = {
+    cwd: req.cwd,
+    pathToClaudeCodeExecutable: req.claudePath,
+    permissionMode: req.permissionMode,
+    ...req.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {},
+    allowedTools: req.allowedTools,
+    mcpServers,
+    includePartialMessages: true,
+    strictMcpConfig: true,
+    systemPrompt: {
+      type: "preset",
+      preset: "claude_code",
+      ...req.systemPrompt ? { append: req.systemPrompt } : {}
+    },
+    abortController
+  };
+  if (req.sessionId) options.resume = req.sessionId;
+  if (req.model) options.model = req.model;
+  if (req.effort) options.effort = req.effort;
+  if (req.chrome) options.extraArgs = { chrome: null };
+  return options;
+}
+
 // src/agents/claude-runner.ts
 dropNestedElectronEnvFromProcess();
 function emit(value) {
@@ -179,21 +204,17 @@ async function main() {
   for (const [name, spec] of Object.entries(req.mcpServers ?? {})) {
     mcpServers[name] = spec;
   }
+  const abortController = new AbortController();
+  let stopped = false;
+  const onStop = () => {
+    stopped = true;
+    abortController.abort();
+    setTimeout(() => process.exit(130), 3e3).unref();
+  };
+  process.once("SIGTERM", onStop);
+  process.once("SIGINT", onStop);
   try {
-    const options = {
-      cwd: req.cwd,
-      pathToClaudeCodeExecutable: req.claudePath,
-      permissionMode: req.permissionMode,
-      ...req.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {},
-      allowedTools: req.allowedTools,
-      mcpServers,
-      includePartialMessages: true
-    };
-    if (req.sessionId) options.resume = req.sessionId;
-    if (req.model) options.model = req.model;
-    if (req.systemPrompt) options.appendSystemPrompt = req.systemPrompt;
-    if (req.effort) options.effort = req.effort;
-    if (req.chrome) options.chrome = true;
+    const options = buildClaudeSdkQueryOptions(req, mcpServers, abortController);
     options.canUseTool = (toolName, toolInput, toolOpts) => claudePermissionResult({
       permissionMode: req.permissionMode,
       threadId: process.env.SIDEBOARD_THREAD_ID?.trim() || "",
@@ -204,11 +225,13 @@ async function main() {
       options: toolOpts,
       rpc: req.agentRpc
     });
-    options.settingSources = [];
     for await (const message of sdk.query({ prompt: req.prompt, options })) {
       emit(message);
     }
+    if (stopped) process.exitCode = 130;
   } finally {
+    process.off("SIGTERM", onStop);
+    process.off("SIGINT", onStop);
     exec.close();
   }
 }

package/dist/agents/cursor-runner.cjs

@@ -359,10 +359,20 @@ async function acquireCursorCatalogLock(storeDir) {
   try {
     return await import_proper_lockfile.default.lock(lockPath, {
       retries: { retries: 40, minTimeout: 50, maxTimeout: 500 },
-      stale: 5e3,
-      update: 2e3
+      // Repair rewrites run_events.ndjson synchronously while holding the lock.
+      // A 5s stale window treats that stall as a dead owner and throws from a
+      // timer, which kills the runner mid-turn.
+      stale: 3e4,
+      update: 1e4,
+      onCompromised: (err) => {
+        console.error(`[sideboard] cursor catalog lock compromised: ${err.message}`);
+      }
     });
-  } catch {
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(
+      `[sideboard] cursor catalog lock not acquired (${message}); continuing without the lock`
+    );
     return async () => {
     };
   }
@@ -695,7 +705,7 @@ function extractJsonErrorMessage(obj) {
   const candidates = [
     typeof obj.message === "string" ? obj.message : null,
     typeof obj.error === "string" ? obj.error : null,
-    nested && typeof nested.message === "string" ? nested.message : null,
+    nested && typeof nested.message === "string" ? nested.message : typeof nested?.data?.message === "string" ? nested.data.message : null,
     typeof obj.result === "string" ? obj.result : null,
     typeof obj.detail === "string" ? obj.detail : null
   ];
@@ -800,8 +810,8 @@ function isUnresumableCursorSession(err) {
   if (name === "AgentNotFoundError") return true;
   const lower = cursorErrorMessage(err).toLowerCase();
   if (!lower) return false;
-  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || // Shared JSONL last-write-wins: `Run run-… not found for agent agent-…`
-  /\brun\b.{0,80}\bnot found for agent\b/.test(lower) || /cannot resume/.test(lower);
+  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\s+agent-[\w-]+\s+not found\b/.test(lower) || // Shared JSONL last-write-wins: `Run run-… not found for agent agent-…`
+  /\brun\s+run-[\w-]+\s+not found for agent\b/.test(lower) || /cannot resume/.test(lower);
 }
 function cursorSessionRecoveryMessage(err, agentId) {
   const detail = cursorErrorMessage(err) || "unresumable session";
@@ -842,13 +852,20 @@ async function retryOnceOnRetryableCursorError(fn, onRetry, delayMs = CURSOR_RET
     return fn();
   }
 }
-function cursorSendOptions(mcpServers) {
-  const opts = { local: { force: true } };
+function cursorSendOptions(mcpServers, mode) {
+  const opts = {
+    local: { force: true }
+  };
+  if (mode) opts.mode = mode;
   if (mcpServers && typeof mcpServers === "object" && Object.keys(mcpServers).length > 0) {
     opts.mcpServers = mcpServers;
   }
   return opts;
 }
+function cursorDisallowedTools(planMode) {
+  if (planMode) return ["read", "shell", "edit", "write", "delete", "task"];
+  return ["read"];
+}
 function withCursorLocalHangGuards(local) {
   return { ...local, enableAgentRetries: false };
 }
@@ -889,6 +906,30 @@ async function* iterateUntilIdle(iterable, idleMs, onIdle, activity) {
     throw err;
   }
 }
+function exitWhenFlushed(code) {
+  let pending = 2;
+  let exited = false;
+  const finish = () => {
+    pending -= 1;
+    if (pending > 0 || exited) return;
+    exited = true;
+    process.exit(code);
+  };
+  const flush = (stream) => {
+    if (stream.writableEnded) {
+      finish();
+      return;
+    }
+    stream.write("", finish);
+  };
+  flush(process.stdout);
+  flush(process.stderr);
+  setTimeout(() => {
+    if (exited) return;
+    exited = true;
+    process.exit(code);
+  }, 1e3).unref();
+}
 
 // src/agents/sliced-file-read.ts
 var import_node_fs15 = require("fs");
@@ -1105,6 +1146,8 @@ function agentRuntimeLooksLive(meta = readAgentRuntimeMetadata()) {
 // src/agent-rpc/client.ts
 var AgentRpcClient = class {
   ws = null;
+  /** In-flight connect. Concurrent call()s must share it or each opens a socket. */
+  connecting = null;
   pending = /* @__PURE__ */ new Map();
   nextId = 1;
   url;
@@ -1147,10 +1190,10 @@ var AgentRpcClient = class {
     url.searchParams.set(AGENT_RPC_TOKEN_QUERY, this.authToken);
     return url.toString();
   }
-  async ensureSocket() {
-    if (this.ws && this.ws.readyState === import_ws.WebSocket.OPEN) return this.ws;
+  ensureSocket() {
+    if (this.ws && this.ws.readyState === import_ws.WebSocket.OPEN) return Promise.resolve(this.ws);
+    if (this.connecting) return this.connecting;
     const ws = new import_ws.WebSocket(this.socketUrl());
-    this.ws = ws;
     ws.on("message", (data) => this.onFrame(data.toString()));
     ws.on("error", (err) => this.drop(ws, err));
     ws.on("close", () => this.drop(ws, new Error("Agent RPC socket closed")));
@@ -1163,11 +1206,16 @@ var AgentRpcClient = class {
         )
       );
     });
-    await new Promise((resolve2, reject) => {
+    let settled = false;
+    const pending = new Promise((resolve2, reject) => {
       const fail = (err) => {
+        if (settled) return;
+        settled = true;
+        if (this.connecting === pending) this.connecting = null;
         const message = err.message.includes("401") ? "Unauthorized" : err.message;
         reject(message === err.message ? err : new Error(message));
       };
+      const failClose = () => fail(new Error("Agent RPC socket closed"));
       ws.once("unexpected-response", (_req, res) => {
         fail(
           new Error(
@@ -1176,15 +1224,22 @@ var AgentRpcClient = class {
         );
       });
       ws.once("error", fail);
+      ws.once("close", failClose);
       ws.once("open", () => {
         ws.off("error", fail);
-        resolve2();
+        ws.off("close", failClose);
+        settled = true;
+        this.ws = ws;
+        this.connecting = null;
+        resolve2(ws);
       });
     });
-    return ws;
+    this.connecting = pending;
+    return pending;
   }
   drop(ws, err) {
-    if (this.ws === ws) this.ws = null;
+    if (this.ws !== ws) return;
+    this.ws = null;
     if (this.pending.size === 0) return;
     this.failAll(err);
   }
@@ -1474,13 +1529,14 @@ function guardCursorCustomTool(tool, opts) {
   };
 }
 var NON_RECOVERABLE_RUN_ERROR = /invalid (?:user )?api key|not logged in|not authenticated|unauthorized|credit balance|out of credits|insufficient.?quota|usage limit|you've hit your|too many requests|rate.?limit/;
+var RECOVERABLE_RUN_ERROR = /premature close|tool execution failed|stream (?:idle|cut ?off|closed)|custom tool|result too (?:large|long)|max(?:imum)? (?:tool )?result/;
 function shouldReturnRunErrorToAgent(detail) {
   const text = detail.trim();
   if (!text) return false;
   if (looksLikeHugeToolResultDump(text) || looksLikeCursorStreamCutOff(text)) return true;
   const head = text.slice(0, 2e3).toLowerCase();
   if (NON_RECOVERABLE_RUN_ERROR.test(head)) return false;
-  return true;
+  return RECOVERABLE_RUN_ERROR.test(head);
 }
 function cursorRunErrorRecoveryPrompt(detail) {
   const summary = looksLikeHugeToolResultDump(detail) ? HUGE_TOOL_RESULT_SUMMARY : detail.replace(/\s+/g, " ").trim().slice(0, 400);
@@ -1561,7 +1617,8 @@ function preferredCursorCostCents(cost) {
 }
 function turnCostUsdFromCursorUsage(before, after) {
   if (!after) return void 0;
-  const beforeIds = new Set((before?.runs ?? []).map((r) => r.runId));
+  if (before == null) return void 0;
+  const beforeIds = new Set((before.runs ?? []).map((r) => r.runId));
   const newRuns = (after.runs ?? []).filter((r) => !beforeIds.has(r.runId));
   let sum = 0;
   let any = false;
@@ -1573,7 +1630,6 @@ function turnCostUsdFromCursorUsage(before, after) {
     }
   }
   if (any) return sum / 100;
-  if (before == null) return void 0;
   const afterCents = preferredCursorCostCents(after.cost);
   if (afterCents == null) return void 0;
   const beforeCents = preferredCursorCostCents(before.cost) ?? 0;
@@ -2010,7 +2066,7 @@ async function main() {
     mode,
     local,
     name: "Sideboard",
-    disallowedTools: ["read"],
+    disallowedTools: cursorDisallowedTools(req.planMode),
     ...mcpServers ? { mcpServers } : {}
   };
   const retryTransport = (fn) => retryOnceOnRetryableCursorError(fn, (err) => {
@@ -2023,14 +2079,18 @@ async function main() {
     const { name: _name, ...opts } = createOpts;
     return retryTransport(() => Agent.resume(agentId, opts));
   }
+  function promptForNewSession() {
+    return req.freshPrompt?.trim() || req.prompt;
+  }
   async function openAgent() {
     try {
-      return req.agentId ? await resumeAgent(req.agentId) : await createAgent();
+      if (!req.agentId) return { agent: await createAgent(), fresh: true };
+      return { agent: await resumeAgent(req.agentId), fresh: false };
     } catch (err) {
       if (!isUnresumableCursorSession(err)) throw err;
       if (repairCursorCatalogForResume(storeRoot, note) && req.agentId) {
         try {
-          return await resumeAgent(req.agentId);
+          return { agent: await resumeAgent(req.agentId), fresh: false };
         } catch (err2) {
           if (!isUnresumableCursorSession(err2)) throw err2;
         }
@@ -2039,7 +2099,7 @@ async function main() {
         type: "stderr",
         data: cursorSessionRecoveryMessage(err, req.agentId)
       });
-      return createAgent();
+      return { agent: await createAgent(), fresh: true };
     }
   }
   async function retryAfterBusy(agent) {
@@ -2058,7 +2118,7 @@ async function main() {
   }
   async function sendPrompt(agent, prompt, extra) {
     const sendOpts = {
-      ...cursorSendOptions(mcpServers),
+      ...cursorSendOptions(mcpServers, mode),
       ...extra
     };
     try {
@@ -2089,7 +2149,7 @@ async function main() {
         setTimeout(resolve2, 2e3);
       })
     ]).finally(() => {
-      void closeCursorCatalogTurn().finally(() => process.exit(1));
+      void closeCursorCatalogTurn().finally(() => exitWhenFlushed(1));
     });
   };
   process.once("SIGTERM", onSignal);
@@ -2175,7 +2235,10 @@ async function main() {
         });
         return 2;
       }
-      if (result.status === "cancelled") return 0;
+      if (result.status === "cancelled") {
+        if (streamIdle) return 1;
+        return 0;
+      }
       try {
         const costUsd = await fetchCursorTurnCostUsd(
           (opts) => agent.getUsage(opts),
@@ -2194,14 +2257,16 @@ async function main() {
     }
   }
   try {
-    let agent = await openAgent();
+    const opened = await openAgent();
+    let agent = opened.agent;
+    const prompt = opened.fresh ? promptForNewSession() : req.prompt;
     try {
       try {
-        return await runTurn(agent);
+        return await runTurn(agent, prompt);
       } catch (err) {
         if (isAgentBusyError(err)) {
           await retryAfterBusy(agent);
-          return await runTurn(agent);
+          return await runTurn(agent, prompt);
         }
         if (!isUnresumableCursorSession(err)) throw err;
         const agentId = agent.agentId;
@@ -2220,7 +2285,7 @@ async function main() {
           data: cursorSessionRecoveryMessage(err, agentId)
         });
         agent = await createAgent();
-        return await runTurn(agent);
+        return await runTurn(agent, promptForNewSession());
       }
     } finally {
       await agent[Symbol.asyncDispose]().catch(() => void 0);
@@ -2241,9 +2306,9 @@ async function main() {
   }
 }
 main().then(
-  (code) => process.exit(code),
+  (code) => exitWhenFlushed(code),
   (err) => {
     emit({ type: "stderr", data: err instanceof Error ? err.message : String(err) });
-    process.exit(1);
+    exitWhenFlushed(1);
   }
 );