@sideboard-ai/core 0.1.283 → 0.1.285

package/dist/index.cjs

@@ -4812,6 +4812,30 @@ var init_thread_store = __esm({
   }
 });
 
+// src/agents/cursor-stream-cutoff.ts
+function looksLikeCursorStreamCutOff(text7) {
+  return CURSOR_STREAM_CUTOFF.test(text7.trim());
+}
+function cursorStreamCutOffContinueLimit(detail) {
+  if (looksLikeCursorStreamCutOff(detail) || /connection stalled/i.test(detail)) {
+    return CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT;
+  }
+  return null;
+}
+function nextCrashContinueCount(detail, used) {
+  const limit = cursorStreamCutOffContinueLimit(detail) ?? 1;
+  if (used >= limit) return null;
+  return used + 1;
+}
+var CURSOR_STREAM_CUTOFF, CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT;
+var init_cursor_stream_cutoff = __esm({
+  "src/agents/cursor-stream-cutoff.ts"() {
+    "use strict";
+    CURSOR_STREAM_CUTOFF = /nghttp2|premature close|\[unavailable\]\s+error\b|http\/2 stream closed|\bcancel \(0x8\)|error code cancel\b/i;
+    CURSOR_STREAM_CUTOFF_CONTINUE_LIMIT = 3;
+  }
+});
+
 // src/agents/error-detail.ts
 function formatUnknownDetail(err) {
   if (err == null) return "";
@@ -5002,9 +5026,6 @@ function looksLikeInvalidAgentSession(text7) {
   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) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /\brun\b.{0,80}\bnot found for agent\b/.test(lower);
 }
-function looksLikeCursorStreamCutOff(text7) {
-  return /nghttp2|premature close|\[unavailable\]\s+error\b/i.test(text7.trim());
-}
 function looksLikeBrightsyEmptyCompletion(text7) {
   const core = text7.trim().replace(/^exit\s*\d+:\s*/i, "").replace(/^error:\s*/i, "").trim();
   return /^i did not receive a valid model response\. please try again\.$/i.test(core);
@@ -5178,6 +5199,8 @@ var NODE_VERSION_FOOTER, NESTED_ELECTRON_SUMMARY, HOMEBREW_LIBUV_SUMMARY, BUNDLE
 var init_error_detail = __esm({
   "src/agents/error-detail.ts"() {
     "use strict";
+    init_cursor_stream_cutoff();
+    init_cursor_stream_cutoff();
     NODE_VERSION_FOOTER = /^Node\.js v\d+/i;
     NESTED_ELECTRON_SUMMARY = "Cursor local agent crashed at Electron startup (nested Chromium / HasCustomHostObject)";
     HOMEBREW_LIBUV_SUMMARY = "Cursor runner crashed in Node (Homebrew Node + shared libuv). Install Node 24 LTS (`brew install node@24`) and retry.";
@@ -11976,30 +11999,49 @@ var init_config = __esm({
 function setHttpFetchImpl(fetchImpl) {
   injected = fetchImpl;
 }
-function tlsIssuerHint(code, message) {
-  const text7 = `${code ?? ""} ${message}`;
-  return TLS_ISSUER_RE.test(text7) ? TLS_ISSUER_HINT : "";
+function isTlsIssuerFailure(code, message) {
+  return TLS_ISSUER_RE.test(`${code ?? ""} ${message}`);
 }
-function formatFetchError(err, url) {
-  if (!(err instanceof Error)) return `${String(err)} (${url})`;
-  const cause = err.cause;
-  let detail = "";
-  let hint = tlsIssuerHint(void 0, err.message);
+function describeCause(cause, depth = 0) {
+  if (depth > 5 || cause == null) return null;
+  if (cause instanceof AggregateError) {
+    for (const item of cause.errors) {
+      const found = describeCause(item, depth + 1);
+      if (found && (found.code || found.message)) return found;
+    }
+    return cause.message ? { message: cause.message } : null;
+  }
   if (cause instanceof Error) {
     const code = typeof cause.code === "string" ? cause.code : void 0;
-    detail = code ? ` [${code}: ${cause.message}]` : ` [${cause.message}]`;
-    hint = tlsIssuerHint(code, `${err.message} ${cause.message}`) || hint;
-  } else if (cause != null) {
-    detail = ` [${String(cause)}]`;
-    hint = tlsIssuerHint(void 0, String(cause)) || hint;
-  }
-  return `${err.message}${detail} (${url})${hint}`;
+    const nested = describeCause(cause.cause, depth + 1);
+    if ((!cause.message || cause.message === "fetch failed") && nested) return nested;
+    if (cause.message || code) return { code, message: cause.message };
+    return nested;
+  }
+  return { message: String(cause) };
+}
+function causeSuffix(detail) {
+  if (!detail) return "";
+  if (detail.code && detail.message) return ` [${detail.code}: ${detail.message}]`;
+  if (detail.code) return ` [${detail.code}]`;
+  if (detail.message) return ` [${detail.message}]`;
+  return "";
+}
+function formatFetchError(err, url, opts) {
+  if (!(err instanceof Error)) return `${String(err)} (${url})`;
+  const detail = describeCause(err.cause);
+  const hintSource = `${err.message} ${detail?.code ?? ""} ${detail?.message ?? ""}`;
+  const tls2 = isTlsIssuerFailure(detail?.code, hintSource);
+  const hint = tls2 ? opts?.tlsHint ?? TLS_ISSUER_HINT : "";
+  return `${err.message}${causeSuffix(detail)} (${url})${hint}`;
+}
+function currentHttpFetch() {
+  return injected ?? globalThis.fetch.bind(globalThis);
 }
 async function httpFetch(input, init) {
   const url = typeof input === "string" ? input : input.href;
-  const fn = injected ?? globalThis.fetch.bind(globalThis);
   try {
-    return await fn(url, init);
+    return await currentHttpFetch()(url, init);
   } catch (err) {
     throw new Error(formatFetchError(err, url));
   }
@@ -14696,10 +14738,10 @@ function eventsFromClaudeSystem(obj) {
   if (subtype === "api_retry") {
     const attempt = obj.attempt;
     const max = obj.max_retries;
-    const delay2 = obj.retry_delay_ms;
+    const delay3 = obj.retry_delay_ms;
     return {
       type: "thinking",
-      data: `API retry ${attempt ?? "?"}/${max ?? "?"}${typeof delay2 === "number" ? ` (wait ${delay2}ms)` : ""}`
+      data: `API retry ${attempt ?? "?"}/${max ?? "?"}${typeof delay3 === "number" ? ` (wait ${delay3}ms)` : ""}`
     };
   }
   if (subtype === "status") {
@@ -27436,10 +27478,10 @@ var init_orchestrator = __esm({
       /** Timers for orchestration session-quota auto-resume. */
       quotaResumeTimers = /* @__PURE__ */ new Map();
       /**
-       * Threads that already got a crash-continue turn. Cleared on a successful
-       * finish or a user send so a later crash can recover again.
+       * Crash-continue count per thread. Cleared on a successful finish or a user
+       * send. Stream cutoffs may resume more than once; other crashes once.
        */
-      crashContinued = /* @__PURE__ */ new Set();
+      crashContinued = /* @__PURE__ */ new Map();
       /** Auto-continues after a worktree turn ended while a detached job still runs. */
       jobContinueCount = /* @__PURE__ */ new Map();
       jobContinueNudged = /* @__PURE__ */ new Set();
@@ -27721,8 +27763,8 @@ var init_orchestrator = __esm({
       scheduleQuotaResume(threadId, resumeAt) {
         this.clearQuotaResumeTimer(threadId);
         updateThread(threadId, { quotaResumeAt: resumeAt.toISOString() });
-        const delay2 = Math.max(5e3, resumeAt.getTime() - Date.now());
-        const capped = Math.min(delay2, 2147483647);
+        const delay3 = Math.max(5e3, resumeAt.getTime() - Date.now());
+        const capped = Math.min(delay3, 2147483647);
         const timer = setTimeout(() => {
           this.quotaResumeTimers.delete(threadId);
           void this.resumeAfterQuotaWait(threadId);
@@ -27878,7 +27920,6 @@ var init_orchestrator = __esm({
        * next prompt so the same agent can continue instead of sitting on lastError.
        */
       maybeEnqueueCrashContinue(threadId, opts) {
-        if (this.crashContinued.has(threadId)) return;
         if (this.haltDrain.has(threadId)) return;
         if (!shouldFeedErrorBackToAgent({
           detail: opts.detail,
@@ -27887,9 +27928,11 @@ var init_orchestrator = __esm({
         })) {
           return;
         }
+        const resumeCount = nextCrashContinueCount(opts.detail, this.crashContinued.get(threadId) ?? 0);
+        if (resumeCount == null) return;
         const thread = readThread(threadId);
         if (!thread || thread.status === "archived") return;
-        this.crashContinued.add(threadId);
+        this.crashContinued.set(threadId, resumeCount);
         const prompt = formatAgentErrorContinuePrompt(opts.detail);
         const next = prependQueuedItem(thread.queue, thread.queueAttachments, prompt);
         updateThread(threadId, next);
@@ -30162,14 +30205,14 @@ function armOne(schedule) {
   if (!schedule.enabled) return;
   const at = new Date(schedule.nextRunAt);
   if (Number.isNaN(at.getTime())) return;
-  const delay2 = Math.max(0, at.getTime() - Date.now());
-  if (delay2 <= 250) {
+  const delay3 = Math.max(0, at.getTime() - Date.now());
+  if (delay3 <= 250) {
     void fireSchedule(schedule.id).then(() => {
       if (isThisProcessDesktopHost()) armSchedules();
     });
     return;
   }
-  const capped = Math.min(delay2, SET_TIMEOUT_MAX);
+  const capped = Math.min(delay3, SET_TIMEOUT_MAX);
   const timer = setTimeout(() => {
     timers.delete(schedule.id);
     const live = getSchedule(schedule.id);
@@ -39714,10 +39757,7 @@ var import_ws5 = require("ws");
 init_orchestrator_capable();
 init_stage_files();
 init_orchestrator();
-init_ask_user();
 init_app_settings();
-init_global_workspace();
-init_thread_store();
 init_implied_first_prompt();
 
 // src/remote/phone-media.ts
@@ -40696,7 +40736,13 @@ function deliverPhoneTurn(opts, chatId) {
   });
 }
 
-// src/remote/listen.ts
+// src/remote/phone-turn.ts
+init_orchestrator_capable();
+init_orchestrator();
+init_ask_user();
+init_app_settings();
+init_global_workspace();
+init_thread_store();
 function formatRemotePrompt(text7) {
   return `Phone
 
@@ -40705,6 +40751,29 @@ ${text7.trim()}`;
 function isRemoteStopCommand(text7) {
   return text7.trim().toLowerCase() === "stop";
 }
+function phoneFollowUpQueues(status) {
+  return followUpBehavior() === "queue" && (status === "running" || status === "queued");
+}
+var PHONE_TURN_MS = 14 * 60 * 1e3;
+function delay2(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+async function waitForPhoneTurn(threadId, stillCurrent) {
+  const deadline = Date.now() + PHONE_TURN_MS;
+  while (stillCurrent() && Date.now() < deadline) {
+    const thread2 = readPhoneThread(threadId) ?? readThread(threadId);
+    if (!thread2) return;
+    if (thread2.status === "stopped" && thread2.queue.length > 0) {
+      await delay2(40);
+      continue;
+    }
+    break;
+  }
+  if (!stillCurrent()) return;
+  const thread = readPhoneThread(threadId) ?? readThread(threadId);
+  if (!thread || thread.status !== "running" && thread.status !== "queued") return;
+  await getOrchestrator().waitForTurn(threadId, Math.max(1, deadline - Date.now()));
+}
 var handleChain2 = Promise.resolve();
 var inboundGeneration = 0;
 function enqueue(fn) {
@@ -40728,6 +40797,77 @@ function interruptRemoteCoordinator(deviceId, log = () => void 0) {
     return false;
   }
 }
+function runCoordinatorPrompt(opts, body, generation) {
+  const current = () => generation === inboundGeneration;
+  return (async () => {
+    if (!current()) return;
+    const agent = coerceOrchestratorAgent(opts.agent ?? resolveOrchestratorDefaults().agent);
+    if (!body) return;
+    if (isRemoteStopCommand(body)) {
+      if (!current()) return;
+      opts.onOutbound({ type: "assistant", text: REMOTE_STOPPED_REPLY });
+      return;
+    }
+    let thread = ensureRemoteCoordinator(opts.deviceId, agent);
+    thread = readThread(thread.id) ?? thread;
+    const followUp = followUpBehavior();
+    const orch = getOrchestrator();
+    try {
+      await orch.send(thread.id, formatRemotePrompt(body), { followUp });
+      if (!current()) return;
+      await waitForPhoneTurn(thread.id, current);
+    } catch (err) {
+      if (!current()) return;
+      const message = err instanceof Error ? err.message : String(err);
+      opts.onOutbound({ type: "assistant", text: `Sideboard failed: ${message}` });
+      return;
+    }
+    if (!current()) return;
+    thread = readThread(thread.id) ?? thread;
+    if (thread.status === "stopped") return;
+    const result = orch.getTurnResult(thread.id);
+    const pending = extractPendingPlanQuestions(
+      [...thread.messages].reverse().find((m) => m.role === "agent")?.parts
+    );
+    if (result.taskState === "input-required" && pending) {
+      opts.onOutbound({
+        type: "ask_user",
+        text: result.text.trim(),
+        questions: pending.questions.map((q) => ({
+          question: q.question,
+          options: q.options.map(
+            (o) => o.description ? { label: o.label, description: o.description } : { label: o.label }
+          )
+        }))
+      });
+      return;
+    }
+    const reply = outboundReplyFromTurn(result, {
+      inputRequired: "Sideboard is waiting for an answer.",
+      canceled: REMOTE_STOPPED_REPLY,
+      completedEmpty: () => "",
+      failed: (detail) => detail ? `Sideboard failed: ${detail}` : "Sideboard failed before producing a result."
+    });
+    if (reply.trim()) opts.onOutbound({ type: "assistant", text: reply.trim() });
+  })();
+}
+function beginCoordinatorPrompt(body, opts) {
+  const live = body ? findRemoteCoordinator(opts.deviceId) : null;
+  const fresh = live ? readThread(live.id) ?? live : null;
+  if (body && !isRemoteStopCommand(body) && phoneFollowUpQueues(fresh?.status)) {
+    const generation2 = inboundGeneration;
+    enqueue(() => runCoordinatorPrompt(opts, body, generation2));
+    return;
+  }
+  const generation = ++inboundGeneration;
+  if (body && isRemoteStopCommand(body)) {
+    interruptRemoteCoordinator(opts.deviceId, opts.onLog ?? (() => void 0));
+  }
+  const task = runCoordinatorPrompt(opts, body, generation);
+  enqueue(() => task);
+}
+
+// src/remote/listen.ts
 function emitOpened(opts, opened) {
   setPhoneOpenChat(opened.chat.id);
   emitControl(opts, { op: "opened", ...opened });
@@ -40997,23 +41137,27 @@ function handlePhoneControl(cmd, opts) {
     return;
   }
   const chatId = cmd.chatId;
+  const existing = readPhoneThread(chatId);
+  if (phoneFollowUpQueues(existing?.status)) {
+    deliverPhoneTurn(opts, chatId);
+    const generation2 = chatGeneration.get(chatId) ?? bumpChat(chatId);
+    enqueueChat(chatId, () => runPhonePrompt(opts, cmd, chatId, generation2));
+    return;
+  }
   const generation = bumpChat(chatId);
   phoneTurnGen.set(chatId, generation);
-  interruptChat(chatId, log);
-  enqueueChat(chatId, async () => {
-    if (chatGeneration.get(chatId) !== generation) return;
+  const task = runPhonePrompt(opts, cmd, chatId, generation);
+  enqueueChat(chatId, () => task);
+}
+function runPhonePrompt(opts, cmd, chatId, generation) {
+  const current = () => chatGeneration.get(chatId) === generation;
+  return (async () => {
+    if (!current()) return;
     const thread = readPhoneThread(chatId);
     if (!thread) {
       emitControl(opts, { op: "error", chatId, message: "That agent is not on this Mac." });
       return;
     }
-    if (thread.status === "running" || thread.status === "queued") {
-      try {
-        getOrchestrator().stop(thread.id, { clearQueue: true });
-      } catch {
-      }
-    }
-    if (chatGeneration.get(chatId) !== generation) return;
     const stopStream = watchPhoneStream(opts, chatId, thread.id, generation);
     try {
       try {
@@ -41021,14 +41165,19 @@ function handlePhoneControl(cmd, opts) {
       } catch (err) {
         emitControl(opts, { op: "error", chatId, message: phoneError(err) });
       }
+      if (!current()) return;
       const live = readPhoneThread(thread.id) ?? thread;
+      const followUp = followUpBehavior();
       const staged = stagePhoneTurnFiles(live.worktreePath, cmd);
       const text7 = cmd.text.trim() || (staged.length ? "See the attached files." : "");
-      const formatted = formatRemotePrompt(text7);
-      await getOrchestrator().send(thread.id, formatted, { attachments: staged });
-      await getOrchestrator().waitForTurn(thread.id, 14 * 60 * 1e3);
+      await getOrchestrator().send(thread.id, formatRemotePrompt(text7), {
+        attachments: staged,
+        followUp
+      });
+      if (!current()) return;
+      await waitForPhoneTurn(thread.id, current);
     } catch (err) {
-      if (chatGeneration.get(chatId) !== generation) return;
+      if (!current()) return;
       const message = err instanceof Error ? err.message : String(err);
       emitControl(opts, { op: "error", chatId, message: `Sideboard failed: ${message}` });
       return;
@@ -41036,12 +41185,11 @@ function handlePhoneControl(cmd, opts) {
       stopStream();
       finishPhoneTurn(chatId, generation);
     }
-    if (chatGeneration.get(chatId) !== generation) return;
+    if (!current()) return;
     emitChatTurn(opts, chatId, thread.id);
-  });
+  })();
 }
 function handleRemoteInbound(text7, opts) {
-  const log = opts.onLog ?? (() => void 0);
   const body = text7.trim();
   const control = takePhoneControl(body);
   if (control) {
@@ -41052,64 +41200,7 @@ function handleRemoteInbound(text7, opts) {
     handlePhoneControl(control, opts);
     return;
   }
-  const generation = ++inboundGeneration;
-  if (body) interruptRemoteCoordinator(opts.deviceId, log);
-  enqueue(async () => {
-    if (generation !== inboundGeneration) return;
-    const agent = coerceOrchestratorAgent(opts.agent ?? resolveOrchestratorDefaults().agent);
-    if (!body) return;
-    if (isRemoteStopCommand(body)) {
-      if (generation !== inboundGeneration) return;
-      opts.onOutbound({ type: "assistant", text: REMOTE_STOPPED_REPLY });
-      return;
-    }
-    let thread = ensureRemoteCoordinator(opts.deviceId, agent);
-    const fresh = readThread(thread.id) ?? thread;
-    if (fresh.status === "running" || fresh.status === "queued") {
-      try {
-        getOrchestrator().stop(fresh.id, { clearQueue: true });
-      } catch {
-      }
-    }
-    if (generation !== inboundGeneration) return;
-    const orch = getOrchestrator();
-    try {
-      await orch.send(thread.id, formatRemotePrompt(body));
-      await orch.waitForTurn(thread.id, 14 * 60 * 1e3);
-    } catch (err) {
-      if (generation !== inboundGeneration) return;
-      const message = err instanceof Error ? err.message : String(err);
-      opts.onOutbound({ type: "assistant", text: `Sideboard failed: ${message}` });
-      return;
-    }
-    if (generation !== inboundGeneration) return;
-    thread = readThread(thread.id) ?? thread;
-    if (thread.status === "stopped") return;
-    const result = orch.getTurnResult(thread.id);
-    const pending = extractPendingPlanQuestions(
-      [...thread.messages].reverse().find((m) => m.role === "agent")?.parts
-    );
-    if (result.taskState === "input-required" && pending) {
-      opts.onOutbound({
-        type: "ask_user",
-        text: result.text.trim(),
-        questions: pending.questions.map((q) => ({
-          question: q.question,
-          options: q.options.map(
-            (o) => o.description ? { label: o.label, description: o.description } : { label: o.label }
-          )
-        }))
-      });
-      return;
-    }
-    const reply = outboundReplyFromTurn(result, {
-      inputRequired: "Sideboard is waiting for an answer.",
-      canceled: REMOTE_STOPPED_REPLY,
-      completedEmpty: () => "",
-      failed: (detail) => detail ? `Sideboard failed: ${detail}` : "Sideboard failed before producing a result."
-    });
-    if (reply.trim()) opts.onOutbound({ type: "assistant", text: reply.trim() });
-  });
+  beginCoordinatorPrompt(body, opts);
 }
 
 // src/remote/phone-board-sync.ts
@@ -41449,6 +41540,7 @@ function runRemoteHost(opts) {
 
 // src/relay/account-login.ts
 var import_node_crypto28 = require("crypto");
+init_fetch();
 
 // src/relay/accounts.ts
 var import_node_crypto27 = require("crypto");
@@ -42049,15 +42141,43 @@ function sleep2(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
+var RELAY_TLS_HINT = " \u2014 the TLS certificate was rejected. A work proxy often does this when Sideboard is not allowlisted, or when the app does not trust the corporate CA.";
+var RELAY_NETWORK_HINT = " Sideboard could not reach the relay. On a work computer this is often a VPN, a proxy, or an allowlist that does not include Sideboard.";
+var RELAY_NETWORK_RE = /fetch failed|Failed to fetch|ENOTFOUND|ECONNREFUSED|ECONNRESET|ETIMEDOUT|EHOSTUNREACH|ENETUNREACH|EAI_AGAIN|EPERM|UND_ERR_|ERR_CONNECTION|ERR_NETWORK|ERR_PROXY|ERR_TUNNEL|ERR_INTERNET|ERR_BLOCKED|ERR_NAME_NOT_RESOLVED|ERR_ADDRESS_UNREACHABLE|ERR_CERT|CERT_|UNABLE_TO_GET_ISSUER|SELF_SIGNED/i;
+function relayFetchError(err, url) {
+  const formatted = formatFetchError(err, url, { tlsHint: RELAY_TLS_HINT });
+  if (formatted.includes(RELAY_TLS_HINT) || !RELAY_NETWORK_RE.test(formatted)) {
+    return new Error(formatted);
+  }
+  return new Error(`${formatted}${RELAY_NETWORK_HINT}`);
+}
+async function relayFetch(fetchImpl, url, init) {
+  const fn = fetchImpl ?? currentHttpFetch();
+  try {
+    return await fn(url, init);
+  } catch (err) {
+    throw relayFetchError(err, url);
+  }
+}
+async function readJson3(res, url) {
+  try {
+    return await res.json();
+  } catch {
+    const kind = (res.headers.get("content-type") ?? "").includes("html") ? "an HTML page" : "a non-JSON body";
+    throw new Error(
+      `Relay sign-in returned HTTP ${res.status} with ${kind} (${url}). A work proxy or allowlist often answers with a block page instead of the relay.`
+    );
+  }
+}
 async function startRemoteAccountLogin(opts) {
   if (opts.signal?.aborted) throw new RemoteAccountLoginCancelled();
   const origin = (opts.origin ?? remoteAccountHttpOrigin()).replace(/\/+$/, "");
-  const fetchImpl = opts.fetchImpl ?? fetch;
   const state = (0, import_node_crypto28.randomBytes)(16).toString("hex");
   const timeoutMs = opts.timeoutMs ?? 5 * 6e4;
   const pollIntervalMs = opts.pollIntervalMs ?? 400;
   const linkToken = opts.linkToken?.trim() ?? "";
-  const started = await fetchImpl(`${origin}${REMOTE_LOGIN_PATH}`, {
+  const startUrl = `${origin}${REMOTE_LOGIN_PATH}`;
+  const started = await relayFetch(opts.fetchImpl, startUrl, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
@@ -42066,9 +42186,9 @@ async function startRemoteAccountLogin(opts) {
       ...linkToken ? { accountToken: linkToken } : {}
     })
   });
-  const startBody = await started.json();
+  const startBody = await readJson3(started, startUrl);
   if (!started.ok || !startBody.url) {
-    throw new Error(startBody.error || "Could not start sign-in.");
+    throw new Error(startBody.error || `Could not start sign-in (HTTP ${started.status}).`);
   }
   await Promise.resolve(opts.openUrl?.(startBody.url));
   const deadline = Date.now() + timeoutMs;
@@ -42077,9 +42197,11 @@ async function startRemoteAccountLogin(opts) {
     if (opts.signal?.aborted) throw new RemoteAccountLoginCancelled();
     let res;
     try {
-      res = await fetchImpl(resultUrl);
-    } catch {
-      if (opts.signal?.aborted) throw new RemoteAccountLoginCancelled();
+      res = await relayFetch(opts.fetchImpl, resultUrl);
+    } catch (err) {
+      if (opts.signal?.aborted || isRemoteAccountLoginCancelled(err)) {
+        throw new RemoteAccountLoginCancelled();
+      }
       await sleep2(pollIntervalMs, opts.signal);
       continue;
     }
@@ -42104,8 +42226,7 @@ async function startRemoteAccountLogin(opts) {
 }
 async function disconnectRemoteAccount(opts) {
   const origin = (opts.origin ?? remoteAccountHttpOrigin()).replace(/\/+$/, "");
-  const fetchImpl = opts.fetchImpl ?? fetch;
-  await fetchImpl(`${origin}${REMOTE_LOGOUT_PATH}`, {
+  await relayFetch(opts.fetchImpl, `${origin}${REMOTE_LOGOUT_PATH}`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ accountToken: opts.accountToken })

package/dist/index.d.cts

@@ -3443,8 +3443,14 @@ declare function installOptionalServiceCli(id: OptionalServiceId): Promise<Agent
  * an opaque `TypeError: fetch failed` or `UNABLE_TO_GET_ISSUER_CERT_LOCALLY`.
  */
 declare function setHttpFetchImpl(fetchImpl: typeof fetch | null): void;
-/** Expand undici/Electron `TypeError: fetch failed` with the underlying cause. */
-declare function formatFetchError(err: unknown, url: string): string;
+/**
+ * Expand undici/Electron `TypeError: fetch failed` with the underlying cause.
+ * `tlsHint` replaces the default Linear certificate note when the failure is a
+ * corporate CA rejection. Pass '' to omit that note.
+ */
+declare function formatFetchError(err: unknown, url: string, opts?: {
+    tlsHint?: string;
+}): string;
 declare function httpFetch(input: string | URL, init?: RequestInit): Promise<Response>;
 
 /**
@@ -5536,8 +5542,8 @@ declare class Orchestrator {
     /** Timers for orchestration session-quota auto-resume. */
     private readonly quotaResumeTimers;
     /**
-     * Threads that already got a crash-continue turn. Cleared on a successful
-     * finish or a user send so a later crash can recover again.
+     * Crash-continue count per thread. Cleared on a successful finish or a user
+     * send. Stream cutoffs may resume more than once; other crashes once.
      */
     private readonly crashContinued;
     /** Auto-continues after a worktree turn ended while a detached job still runs. */
@@ -8011,6 +8017,7 @@ type RemoteOutbound = {
 
 declare function formatRemotePrompt(text: string): string;
 declare function isRemoteStopCommand(text: string): boolean;
+
 declare function handleRemoteInbound(text: string, opts: {
     deviceId: string;
     agent?: AgentKind;

package/dist/index.d.ts

@@ -3443,8 +3443,14 @@ declare function installOptionalServiceCli(id: OptionalServiceId): Promise<Agent
  * an opaque `TypeError: fetch failed` or `UNABLE_TO_GET_ISSUER_CERT_LOCALLY`.
  */
 declare function setHttpFetchImpl(fetchImpl: typeof fetch | null): void;
-/** Expand undici/Electron `TypeError: fetch failed` with the underlying cause. */
-declare function formatFetchError(err: unknown, url: string): string;
+/**
+ * Expand undici/Electron `TypeError: fetch failed` with the underlying cause.
+ * `tlsHint` replaces the default Linear certificate note when the failure is a
+ * corporate CA rejection. Pass '' to omit that note.
+ */
+declare function formatFetchError(err: unknown, url: string, opts?: {
+    tlsHint?: string;
+}): string;
 declare function httpFetch(input: string | URL, init?: RequestInit): Promise<Response>;
 
 /**
@@ -5536,8 +5542,8 @@ declare class Orchestrator {
     /** Timers for orchestration session-quota auto-resume. */
     private readonly quotaResumeTimers;
     /**
-     * Threads that already got a crash-continue turn. Cleared on a successful
-     * finish or a user send so a later crash can recover again.
+     * Crash-continue count per thread. Cleared on a successful finish or a user
+     * send. Stream cutoffs may resume more than once; other crashes once.
      */
     private readonly crashContinued;
     /** Auto-continues after a worktree turn ended while a detached job still runs. */
@@ -8011,6 +8017,7 @@ type RemoteOutbound = {
 
 declare function formatRemotePrompt(text: string): string;
 declare function isRemoteStopCommand(text: string): boolean;
+
 declare function handleRemoteInbound(text: string, opts: {
     deviceId: string;
     agent?: AgentKind;