@cabane/companion 0.6.117 → 0.6.119

package/dist/cli.js

@@ -3200,9 +3200,9 @@ var CabaneApi = class {
   // Commit one outgoing act (ask, withdraw_ask, wake_me, cancel_wake) at
   // invocation. The server records the effect and receipt in one transaction;
   // an ok:false response is a recorded refusal for the tool to report.
-  // Retries retain the caller's callId and recover the same receipt while the
-  // HTTP route admits the request. Currently that route rejects ended spans
-  // before receipt lookup: a 409 cannot prove an earlier attempt had no effect.
+  // Retries retain the caller's callId and recover the same receipt, even
+  // when the turn settled between attempts (CT1447): the route consults the
+  // receipt before it refuses an ended turn, so a 4xx proves no attempt wrote.
   // The caller's signal bounds how long the model waits for the tool result.
   turnAct(workspaceId, turnId, act, signal) {
     return this.request(
@@ -4368,11 +4368,14 @@ var TurnPump = class {
       },
       onToolActivity: async (evt) => {
         if (opts.signal.aborted) return;
-        const existing = this.toolSeqByUseId.get(evt.toolUseId);
-        const seq = existing ?? opts.nextSeq();
-        if (existing === void 0) this.toolSeqByUseId.set(evt.toolUseId, seq);
+        let call = this.toolCallByProviderId.get(evt.toolUseId);
+        if (evt.phase === "start" || call === void 0) {
+          call = { persistedId: crypto.randomUUID(), seq: opts.nextSeq() };
+          this.toolCallByProviderId.set(evt.toolUseId, call);
+        }
+        const { persistedId, seq } = call;
         await opts.commit.reportTool({
-          toolUseId: evt.toolUseId,
+          toolUseId: persistedId,
           toolName: evt.toolName,
           summary: evt.summary,
           input: evt.input,
@@ -4409,9 +4412,19 @@ var TurnPump = class {
   // The turn's final reply text, captured for the dashboard feed / logging.
   finalReplyBody = null;
   emittedFinalSource = "none";
-  // CT11: each tool's persisted seq so the `done`/`error` frame republishes the
-  // same seq the `start` row got (the host's upsert keeps the original seq).
-  toolSeqByUseId = /* @__PURE__ */ new Map();
+  // CT1383: provider tool id → the persisted identity of its CURRENT call. The
+  // provider's id is only a lookup key: it is unique within one adapter
+  // invocation at best (Codex restarts at `item_0` on every invocation, and a
+  // resumed turn keeps its turn id), so the row and the outbox entry are keyed
+  // on what the pump mints — a host id for the host's `(turn_id, tool_use_id)`
+  // upsert, and a seq for the outbox's `(turnId, seq)` file. Both are minted
+  // together; minting only the id would let two calls overwrite each other's
+  // queued body.
+  //
+  // In memory on purpose: it dies with the process, and so does the runtime.
+  // After a crash no in-flight `done` awaits a pre-crash `start` — the resumed
+  // invocation starts its calls afresh — so there is nothing to recover.
+  toolCallByProviderId = /* @__PURE__ */ new Map();
   // The callback consumer the classification (via `sinkEmitter`) — and the
   // frozen committer test — drive. Each callback applies the choreography and
   // commits through the injected sink.
@@ -4806,11 +4819,7 @@ async function* decodeSdkStream(iter, ctx) {
   let usage;
   let lastRequestContextTokens;
   let resolvedModel;
-  let sawRejectedLimit = false;
-  let rateLimitResetIso;
-  let rateLimitType;
-  let authError;
-  let lastAssistantError;
+  const signals = { sawRejectedLimit: false };
   try {
     for await (const msg of iter) {
       if (ctx.signal.aborted) return;
@@ -4833,12 +4842,14 @@ async function* decodeSdkStream(iter, ctx) {
           };
         }
       } else if (!workspaceProven && (msg.type === "assistant" || msg.type === "user" || msg.type === "result")) {
-        resultReason = "session_start_failed";
+        if (preInitToolActivity(msg) && ctx.startEvidence) ctx.startEvidence.toolActivity = true;
+        const failure = classifyPreInitFrame(msg, signals);
+        resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
         break;
       } else if (msg.type === "assistant") {
         const assistantErr = msg.error;
         if (typeof assistantErr === "string" && assistantErr.length > 0) {
-          lastAssistantError = assistantErr;
+          signals.lastAssistantError = assistantErr;
         }
         const reqContext = readRequestContextTokens(msg);
         if (reqContext !== void 0) lastRequestContextTokens = reqContext;
@@ -4850,13 +4861,13 @@ async function* decodeSdkStream(iter, ctx) {
       } else if (msg.type === "rate_limit_event") {
         const info = msg.rate_limit_info;
         if (info?.status === "rejected") {
-          sawRejectedLimit = true;
-          rateLimitResetIso = resetsAtToIso(info.resetsAt) ?? rateLimitResetIso;
-          if (typeof info.rateLimitType === "string") rateLimitType = info.rateLimitType;
+          signals.sawRejectedLimit = true;
+          signals.rateLimitResetIso = resetsAtToIso(info.resetsAt) ?? signals.rateLimitResetIso;
+          if (typeof info.rateLimitType === "string") signals.rateLimitType = info.rateLimitType;
         }
       } else if (msg.type === "auth_status") {
         const err = msg.error;
-        if (typeof err === "string" && err.length > 0) authError = err;
+        if (typeof err === "string" && err.length > 0) signals.authError = err;
       } else if (msg.type === "result") {
         const origin = msg.origin;
         if (origin?.kind === "task-notification") continue;
@@ -4873,16 +4884,7 @@ async function* decodeSdkStream(iter, ctx) {
           ok = true;
         } else {
           const resultText = msg.result ?? "";
-          const terminalReason = msg.terminal_reason;
-          const errors = msg.errors;
-          const errorText = [resultText, ...Array.isArray(errors) ? errors.map(String) : []].join(
-            " "
-          );
-          const rejectedIsCap = sawRejectedLimit && (rateLimitResetIso !== void 0 || isSubscriptionWindow(rateLimitType));
-          const failure = rejectedIsCap || terminalReason === "blocking_limit" ? {
-            kind: "usage_capped",
-            ...rateLimitResetIso ? { resetsAt: rateLimitResetIso } : {}
-          } : classifyAssistantError(lastAssistantError) ?? classifyErrorText([authError, errorText].filter(Boolean).join(" "));
+          const failure = classifyResultFailure(msg, signals);
           resultReason = failure ? encodeFailureReason(failure) : isError ? `error:${resultText.slice(0, 200) || "unknown"}` : `result_error:${msg.subtype}`;
           ok = false;
         }
@@ -4891,16 +4893,25 @@ async function* decodeSdkStream(iter, ctx) {
     }
   } catch (err) {
     if (ctx.signal.aborted) throw err;
-    const failure = classifyErrorText(err instanceof Error ? err.message : String(err));
-    if (!failure) throw err;
+    const message = err instanceof Error ? err.message : String(err);
+    const failure = mcpInventory.initReceived ? classifyErrorText(message) : classifyFailure(signals, { text: message });
+    if (!failure && (mcpInventory.initReceived || ctx.resumedSessionId === null)) throw err;
     ok = false;
-    resultReason = encodeFailureReason(failure);
+    if (failure) {
+      resultReason = encodeFailureReason(failure);
+    } else {
+      resultReason = "session_start_failed";
+      if (ctx.startEvidence) ctx.startEvidence.thrown = message.slice(0, 200);
+    }
     sawResult = true;
   }
   if (ctx.signal.aborted) return;
   if (!workspaceProven) {
     ok = false;
-    resultReason ??= "session_start_failed";
+    if (resultReason === void 0) {
+      const failure = classifyFailure(signals, { text: "" });
+      resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
+    }
   }
   const heldFailure = !ok ? classifyRuntimeNoticeText(buffer.held) : null;
   const terminalFailure = !ok ? decodeFailureReason(resultReason) : null;
@@ -4935,6 +4946,42 @@ function provesWorkspaceTools(msg) {
   const tools = msg.tools;
   return Array.isArray(tools) && tools.includes("mcp__cabane__query");
 }
+function classifyFailure(s, frame) {
+  const rejectedIsCap = s.sawRejectedLimit && (s.rateLimitResetIso !== void 0 || isSubscriptionWindow(s.rateLimitType));
+  if (rejectedIsCap || frame.terminalReason === "blocking_limit")
+    return {
+      kind: "usage_capped",
+      ...s.rateLimitResetIso ? { resetsAt: s.rateLimitResetIso } : {}
+    };
+  return classifyAssistantError(s.lastAssistantError) ?? classifyErrorText([s.authError, frame.text].filter(Boolean).join(" "));
+}
+function classifyResultFailure(msg, s) {
+  const resultText = msg.result ?? "";
+  const terminalReason = msg.terminal_reason;
+  const errors = msg.errors;
+  const text = [resultText, ...Array.isArray(errors) ? errors.map(String) : []].join(" ");
+  return classifyFailure(s, { terminalReason, text });
+}
+function classifyPreInitFrame(msg, s) {
+  if (msg.type === "result") {
+    const isError = msg.is_error === true;
+    if (msg.subtype === "success" && !isError) return classifyFailure(s, { text: "" });
+    return classifyResultFailure(msg, s);
+  }
+  if (msg.type !== "assistant") return classifyFailure(s, { text: "" });
+  const error = msg.error;
+  const signals = typeof error === "string" && error.length > 0 ? { ...s, lastAssistantError: error } : s;
+  const text = contentBlocks(msg).flatMap((b) => b.type === "text" && typeof b.text === "string" ? [b.text] : []).join(" ");
+  return classifyFailure(signals, { text });
+}
+function preInitToolActivity(msg) {
+  const kind = msg.type === "assistant" ? "tool_use" : msg.type === "user" ? "tool_result" : null;
+  return kind !== null && contentBlocks(msg).some((b) => b.type === kind);
+}
+function contentBlocks(msg) {
+  const content = msg.message?.content;
+  return Array.isArray(content) ? content : [];
+}
 function isSubscriptionWindow(value) {
   return value === "five_hour" || value === "seven_day" || value === "seven_day_opus" || value === "seven_day_sonnet" || value === "overage";
 }
@@ -4994,15 +5041,18 @@ function attachAbortController(options, signal) {
   else signal.addEventListener("abort", () => sdkAbort.abort(), { once: true });
   options.abortController = sdkAbort;
 }
-function sdkEvents(queryFn, req, signal, built, degraded) {
+function sdkEvents(queryFn, req, signal, built, degraded, startEvidence) {
   attachAbortController(built.options, signal);
   const prompt = buildQueryPrompt(req);
-  const iter = queryFn({ prompt, options: built.options });
+  const iter = {
+    [Symbol.asyncIterator]: () => queryFn({ prompt, options: built.options })[Symbol.asyncIterator]()
+  };
   return decodeSdkStream(iter, {
     signal,
     cwd: req.local.cwd,
     resumedSessionId: built.resume,
-    degraded
+    degraded,
+    ...startEvidence ? { startEvidence } : {}
   });
 }
 async function freshRequest(req, reason, hooks) {
@@ -5011,8 +5061,9 @@ async function freshRequest(req, reason, hooks) {
 }
 async function* runWithResumeRecovery(queryFn, req, signal, initial, augmentOptions, onWarn, degraded, hooks) {
   let emitted = false;
-  for await (const event of sdkEvents(queryFn, req, signal, initial, degraded)) {
-    const recoverResume = initial.resume !== null && !emitted && event.type === "result" && !event.ok && event.reason === "session_start_failed" && event.mcpInventory?.initReceived === false;
+  const evidence = { toolActivity: false };
+  for await (const event of sdkEvents(queryFn, req, signal, initial, degraded, evidence)) {
+    const recoverResume = initial.resume !== null && !emitted && !evidence.toolActivity && event.type === "result" && !event.ok && event.reason === "session_start_failed" && event.mcpInventory?.initReceived === false;
     if (recoverResume) {
       if (signal.aborted) return;
       onWarn?.(
@@ -5020,7 +5071,8 @@ async function* runWithResumeRecovery(queryFn, req, signal, initial, augmentOpti
         {
           cwd: req.local.cwd,
           reason: "session_start_failed",
-          discardedSessionId: initial.resume
+          discardedSessionId: initial.resume,
+          ...evidence.thrown ? { thrown: evidence.thrown } : {}
         }
       );
       const fresh = await freshRequest(req, "session_start_failed", hooks);
@@ -8488,6 +8540,9 @@ async function performAct(acts, act) {
       AbortSignal.timeout(TURN_ACT_TIMEOUT_MS)
     );
   } catch (err) {
+    if (err instanceof ApiError && err.status >= 500) {
+      return uncertainOutcome(`${err.status}: ${apiErrorMessage(err)}`);
+    }
     if (err instanceof ApiError) {
       if (err.status === 409 && apiErrorCode(err) === "no_active_turn") {
         return toolError(
@@ -8496,14 +8551,16 @@ async function performAct(acts, act) {
       }
       return toolError(`The act was refused (${err.status}): ${apiErrorMessage(err)}`);
     }
-    const message = err instanceof Error ? err.message : String(err);
-    return toolError(
-      `Cabane could not be reached (${message}), so it is UNKNOWN whether this act was recorded \u2014 it may have committed with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
-    );
+    return uncertainOutcome(err instanceof Error ? err.message : String(err));
   }
   if (!result.ok) return toolError(JSON.stringify(result));
   return { content: [{ type: "text", text: JSON.stringify(result) }] };
 }
+function uncertainOutcome(cause) {
+  return toolError(
+    `The outcome of this act could not be confirmed (${cause}). It may already have been performed, with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
+  );
+}
 function createTurnControlMcpServer(acts, skipState) {
   const ACT_TOOL = { readOnlyHint: false, destructiveHint: false, openWorldHint: false };
   const CANCEL_TOOL = { ...ACT_TOOL, idempotentHint: true };
@@ -9920,13 +9977,13 @@ var TurnExecution = class {
       } else {
         const delayMs = this.opts.preparingRowDelayMs ?? DEFAULT_PREPARING_ROW_DELAY_MS;
         let preparingStarted = false;
-        let preparingSeq = null;
+        let preparing = null;
         const reportPreparing = (phase) => {
-          if (preparingSeq === null) preparingSeq = this.nextSeq();
-          const seq = preparingSeq;
+          preparing ??= { id: `prepare:${randomUUID3()}`, seq: this.nextSeq() };
+          const { id, seq } = preparing;
           void this.opts.api.reportActivity(workspaceId, payload.conversationId, payload.agentId, {
             turnId,
-            toolUseId: `prepare:${turnId}`,
+            toolUseId: id,
             toolName: PREPARING_TOOL_NAME,
             summary: "",
             phase,

package/dist/runtime.js

@@ -2534,9 +2534,9 @@ var CabaneApi = class {
   // Commit one outgoing act (ask, withdraw_ask, wake_me, cancel_wake) at
   // invocation. The server records the effect and receipt in one transaction;
   // an ok:false response is a recorded refusal for the tool to report.
-  // Retries retain the caller's callId and recover the same receipt while the
-  // HTTP route admits the request. Currently that route rejects ended spans
-  // before receipt lookup: a 409 cannot prove an earlier attempt had no effect.
+  // Retries retain the caller's callId and recover the same receipt, even
+  // when the turn settled between attempts (CT1447): the route consults the
+  // receipt before it refuses an ended turn, so a 4xx proves no attempt wrote.
   // The caller's signal bounds how long the model waits for the tool result.
   turnAct(workspaceId, turnId, act, signal) {
     return this.request(
@@ -3781,11 +3781,14 @@ var TurnPump = class {
       },
       onToolActivity: async (evt) => {
         if (opts.signal.aborted) return;
-        const existing = this.toolSeqByUseId.get(evt.toolUseId);
-        const seq = existing ?? opts.nextSeq();
-        if (existing === void 0) this.toolSeqByUseId.set(evt.toolUseId, seq);
+        let call = this.toolCallByProviderId.get(evt.toolUseId);
+        if (evt.phase === "start" || call === void 0) {
+          call = { persistedId: crypto.randomUUID(), seq: opts.nextSeq() };
+          this.toolCallByProviderId.set(evt.toolUseId, call);
+        }
+        const { persistedId, seq } = call;
         await opts.commit.reportTool({
-          toolUseId: evt.toolUseId,
+          toolUseId: persistedId,
           toolName: evt.toolName,
           summary: evt.summary,
           input: evt.input,
@@ -3822,9 +3825,19 @@ var TurnPump = class {
   // The turn's final reply text, captured for the dashboard feed / logging.
   finalReplyBody = null;
   emittedFinalSource = "none";
-  // CT11: each tool's persisted seq so the `done`/`error` frame republishes the
-  // same seq the `start` row got (the host's upsert keeps the original seq).
-  toolSeqByUseId = /* @__PURE__ */ new Map();
+  // CT1383: provider tool id → the persisted identity of its CURRENT call. The
+  // provider's id is only a lookup key: it is unique within one adapter
+  // invocation at best (Codex restarts at `item_0` on every invocation, and a
+  // resumed turn keeps its turn id), so the row and the outbox entry are keyed
+  // on what the pump mints — a host id for the host's `(turn_id, tool_use_id)`
+  // upsert, and a seq for the outbox's `(turnId, seq)` file. Both are minted
+  // together; minting only the id would let two calls overwrite each other's
+  // queued body.
+  //
+  // In memory on purpose: it dies with the process, and so does the runtime.
+  // After a crash no in-flight `done` awaits a pre-crash `start` — the resumed
+  // invocation starts its calls afresh — so there is nothing to recover.
+  toolCallByProviderId = /* @__PURE__ */ new Map();
   // The callback consumer the classification (via `sinkEmitter`) — and the
   // frozen committer test — drive. Each callback applies the choreography and
   // commits through the injected sink.
@@ -4219,11 +4232,7 @@ async function* decodeSdkStream(iter, ctx) {
   let usage;
   let lastRequestContextTokens;
   let resolvedModel;
-  let sawRejectedLimit = false;
-  let rateLimitResetIso;
-  let rateLimitType;
-  let authError;
-  let lastAssistantError;
+  const signals = { sawRejectedLimit: false };
   try {
     for await (const msg of iter) {
       if (ctx.signal.aborted) return;
@@ -4246,12 +4255,14 @@ async function* decodeSdkStream(iter, ctx) {
           };
         }
       } else if (!workspaceProven && (msg.type === "assistant" || msg.type === "user" || msg.type === "result")) {
-        resultReason = "session_start_failed";
+        if (preInitToolActivity(msg) && ctx.startEvidence) ctx.startEvidence.toolActivity = true;
+        const failure = classifyPreInitFrame(msg, signals);
+        resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
         break;
       } else if (msg.type === "assistant") {
         const assistantErr = msg.error;
         if (typeof assistantErr === "string" && assistantErr.length > 0) {
-          lastAssistantError = assistantErr;
+          signals.lastAssistantError = assistantErr;
         }
         const reqContext = readRequestContextTokens(msg);
         if (reqContext !== void 0) lastRequestContextTokens = reqContext;
@@ -4263,13 +4274,13 @@ async function* decodeSdkStream(iter, ctx) {
       } else if (msg.type === "rate_limit_event") {
         const info = msg.rate_limit_info;
         if (info?.status === "rejected") {
-          sawRejectedLimit = true;
-          rateLimitResetIso = resetsAtToIso(info.resetsAt) ?? rateLimitResetIso;
-          if (typeof info.rateLimitType === "string") rateLimitType = info.rateLimitType;
+          signals.sawRejectedLimit = true;
+          signals.rateLimitResetIso = resetsAtToIso(info.resetsAt) ?? signals.rateLimitResetIso;
+          if (typeof info.rateLimitType === "string") signals.rateLimitType = info.rateLimitType;
         }
       } else if (msg.type === "auth_status") {
         const err = msg.error;
-        if (typeof err === "string" && err.length > 0) authError = err;
+        if (typeof err === "string" && err.length > 0) signals.authError = err;
       } else if (msg.type === "result") {
         const origin = msg.origin;
         if (origin?.kind === "task-notification") continue;
@@ -4286,16 +4297,7 @@ async function* decodeSdkStream(iter, ctx) {
           ok = true;
         } else {
           const resultText = msg.result ?? "";
-          const terminalReason = msg.terminal_reason;
-          const errors = msg.errors;
-          const errorText = [resultText, ...Array.isArray(errors) ? errors.map(String) : []].join(
-            " "
-          );
-          const rejectedIsCap = sawRejectedLimit && (rateLimitResetIso !== void 0 || isSubscriptionWindow(rateLimitType));
-          const failure = rejectedIsCap || terminalReason === "blocking_limit" ? {
-            kind: "usage_capped",
-            ...rateLimitResetIso ? { resetsAt: rateLimitResetIso } : {}
-          } : classifyAssistantError(lastAssistantError) ?? classifyErrorText([authError, errorText].filter(Boolean).join(" "));
+          const failure = classifyResultFailure(msg, signals);
           resultReason = failure ? encodeFailureReason(failure) : isError ? `error:${resultText.slice(0, 200) || "unknown"}` : `result_error:${msg.subtype}`;
           ok = false;
         }
@@ -4304,16 +4306,25 @@ async function* decodeSdkStream(iter, ctx) {
     }
   } catch (err) {
     if (ctx.signal.aborted) throw err;
-    const failure = classifyErrorText(err instanceof Error ? err.message : String(err));
-    if (!failure) throw err;
+    const message = err instanceof Error ? err.message : String(err);
+    const failure = mcpInventory.initReceived ? classifyErrorText(message) : classifyFailure(signals, { text: message });
+    if (!failure && (mcpInventory.initReceived || ctx.resumedSessionId === null)) throw err;
     ok = false;
-    resultReason = encodeFailureReason(failure);
+    if (failure) {
+      resultReason = encodeFailureReason(failure);
+    } else {
+      resultReason = "session_start_failed";
+      if (ctx.startEvidence) ctx.startEvidence.thrown = message.slice(0, 200);
+    }
     sawResult = true;
   }
   if (ctx.signal.aborted) return;
   if (!workspaceProven) {
     ok = false;
-    resultReason ??= "session_start_failed";
+    if (resultReason === void 0) {
+      const failure = classifyFailure(signals, { text: "" });
+      resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
+    }
   }
   const heldFailure = !ok ? classifyRuntimeNoticeText(buffer.held) : null;
   const terminalFailure = !ok ? decodeFailureReason(resultReason) : null;
@@ -4348,6 +4359,42 @@ function provesWorkspaceTools(msg) {
   const tools = msg.tools;
   return Array.isArray(tools) && tools.includes("mcp__cabane__query");
 }
+function classifyFailure(s, frame) {
+  const rejectedIsCap = s.sawRejectedLimit && (s.rateLimitResetIso !== void 0 || isSubscriptionWindow(s.rateLimitType));
+  if (rejectedIsCap || frame.terminalReason === "blocking_limit")
+    return {
+      kind: "usage_capped",
+      ...s.rateLimitResetIso ? { resetsAt: s.rateLimitResetIso } : {}
+    };
+  return classifyAssistantError(s.lastAssistantError) ?? classifyErrorText([s.authError, frame.text].filter(Boolean).join(" "));
+}
+function classifyResultFailure(msg, s) {
+  const resultText = msg.result ?? "";
+  const terminalReason = msg.terminal_reason;
+  const errors = msg.errors;
+  const text = [resultText, ...Array.isArray(errors) ? errors.map(String) : []].join(" ");
+  return classifyFailure(s, { terminalReason, text });
+}
+function classifyPreInitFrame(msg, s) {
+  if (msg.type === "result") {
+    const isError = msg.is_error === true;
+    if (msg.subtype === "success" && !isError) return classifyFailure(s, { text: "" });
+    return classifyResultFailure(msg, s);
+  }
+  if (msg.type !== "assistant") return classifyFailure(s, { text: "" });
+  const error = msg.error;
+  const signals = typeof error === "string" && error.length > 0 ? { ...s, lastAssistantError: error } : s;
+  const text = contentBlocks(msg).flatMap((b) => b.type === "text" && typeof b.text === "string" ? [b.text] : []).join(" ");
+  return classifyFailure(signals, { text });
+}
+function preInitToolActivity(msg) {
+  const kind = msg.type === "assistant" ? "tool_use" : msg.type === "user" ? "tool_result" : null;
+  return kind !== null && contentBlocks(msg).some((b) => b.type === kind);
+}
+function contentBlocks(msg) {
+  const content = msg.message?.content;
+  return Array.isArray(content) ? content : [];
+}
 function isSubscriptionWindow(value) {
   return value === "five_hour" || value === "seven_day" || value === "seven_day_opus" || value === "seven_day_sonnet" || value === "overage";
 }
@@ -4407,15 +4454,18 @@ function attachAbortController(options, signal) {
   else signal.addEventListener("abort", () => sdkAbort.abort(), { once: true });
   options.abortController = sdkAbort;
 }
-function sdkEvents(queryFn, req, signal, built, degraded) {
+function sdkEvents(queryFn, req, signal, built, degraded, startEvidence) {
   attachAbortController(built.options, signal);
   const prompt = buildQueryPrompt(req);
-  const iter = queryFn({ prompt, options: built.options });
+  const iter = {
+    [Symbol.asyncIterator]: () => queryFn({ prompt, options: built.options })[Symbol.asyncIterator]()
+  };
   return decodeSdkStream(iter, {
     signal,
     cwd: req.local.cwd,
     resumedSessionId: built.resume,
-    degraded
+    degraded,
+    ...startEvidence ? { startEvidence } : {}
   });
 }
 async function freshRequest(req, reason, hooks) {
@@ -4424,8 +4474,9 @@ async function freshRequest(req, reason, hooks) {
 }
 async function* runWithResumeRecovery(queryFn, req, signal, initial, augmentOptions, onWarn, degraded, hooks) {
   let emitted = false;
-  for await (const event of sdkEvents(queryFn, req, signal, initial, degraded)) {
-    const recoverResume = initial.resume !== null && !emitted && event.type === "result" && !event.ok && event.reason === "session_start_failed" && event.mcpInventory?.initReceived === false;
+  const evidence = { toolActivity: false };
+  for await (const event of sdkEvents(queryFn, req, signal, initial, degraded, evidence)) {
+    const recoverResume = initial.resume !== null && !emitted && !evidence.toolActivity && event.type === "result" && !event.ok && event.reason === "session_start_failed" && event.mcpInventory?.initReceived === false;
     if (recoverResume) {
       if (signal.aborted) return;
       onWarn?.(
@@ -4433,7 +4484,8 @@ async function* runWithResumeRecovery(queryFn, req, signal, initial, augmentOpti
         {
           cwd: req.local.cwd,
           reason: "session_start_failed",
-          discardedSessionId: initial.resume
+          discardedSessionId: initial.resume,
+          ...evidence.thrown ? { thrown: evidence.thrown } : {}
         }
       );
       const fresh = await freshRequest(req, "session_start_failed", hooks);
@@ -7911,6 +7963,9 @@ async function performAct(acts, act) {
       AbortSignal.timeout(TURN_ACT_TIMEOUT_MS)
     );
   } catch (err) {
+    if (err instanceof ApiError && err.status >= 500) {
+      return uncertainOutcome(`${err.status}: ${apiErrorMessage(err)}`);
+    }
     if (err instanceof ApiError) {
       if (err.status === 409 && apiErrorCode(err) === "no_active_turn") {
         return toolError(
@@ -7919,14 +7974,16 @@ async function performAct(acts, act) {
       }
       return toolError(`The act was refused (${err.status}): ${apiErrorMessage(err)}`);
     }
-    const message = err instanceof Error ? err.message : String(err);
-    return toolError(
-      `Cabane could not be reached (${message}), so it is UNKNOWN whether this act was recorded \u2014 it may have committed with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
-    );
+    return uncertainOutcome(err instanceof Error ? err.message : String(err));
   }
   if (!result.ok) return toolError(JSON.stringify(result));
   return { content: [{ type: "text", text: JSON.stringify(result) }] };
 }
+function uncertainOutcome(cause) {
+  return toolError(
+    `The outcome of this act could not be confirmed (${cause}). It may already have been performed, with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
+  );
+}
 function createTurnControlMcpServer(acts, skipState) {
   const ACT_TOOL = { readOnlyHint: false, destructiveHint: false, openWorldHint: false };
   const CANCEL_TOOL = { ...ACT_TOOL, idempotentHint: true };
@@ -9343,13 +9400,13 @@ var TurnExecution = class {
       } else {
         const delayMs = this.opts.preparingRowDelayMs ?? DEFAULT_PREPARING_ROW_DELAY_MS;
         let preparingStarted = false;
-        let preparingSeq = null;
+        let preparing = null;
         const reportPreparing = (phase) => {
-          if (preparingSeq === null) preparingSeq = this.nextSeq();
-          const seq = preparingSeq;
+          preparing ??= { id: `prepare:${randomUUID3()}`, seq: this.nextSeq() };
+          const { id, seq } = preparing;
           void this.opts.api.reportActivity(workspaceId, payload.conversationId, payload.agentId, {
             turnId,
-            toolUseId: `prepare:${turnId}`,
+            toolUseId: id,
             toolName: PREPARING_TOOL_NAME,
             summary: "",
             phase,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.117",
+  "version": "0.6.119",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",