@sideboard-ai/core 0.1.284 → 0.1.286

package/dist/index.js

@@ -198,7 +198,7 @@ import {
   worktreeBoardStatus,
   worktreeCleanupSettings,
   writeWorktreeFile
-} from "./chunk-WQ4M2L44.js";
+} from "./chunk-HJNFK5SP.js";
 import {
   BASE_ALLOWED_TOOLS,
   BRIGHTSY_MCP_ALLOWED_TOOLS,
@@ -288,7 +288,7 @@ import {
   whichOnPath,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-COQLZNKQ.js";
+} from "./chunk-PCNH74SF.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -298,7 +298,7 @@ import {
   listBrightsyAccounts,
   listConnectedBrightsyTeams,
   switchBrightsyAccount
-} from "./chunk-GWFVCCJZ.js";
+} from "./chunk-VGNLMGBK.js";
 import {
   BRIGHTSY_SUMMARIZE_CONTEXT_TOOL,
   CHARS_PER_CONTEXT_TOKEN,
@@ -415,7 +415,7 @@ import {
   workspaceAgentChatSummaries,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-BMUVNTT4.js";
+} from "./chunk-ABOH7GBG.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -481,7 +481,7 @@ import {
   parseAbleTimeOAuthCallbackUrl,
   resolveAbleTimeOAuthHost,
   startAbleTimeOAuth
-} from "./chunk-XTPQEZZA.js";
+} from "./chunk-IJMUYHPT.js";
 import {
   ableTimeDependencyTarget,
   commentAbleTimeTask,
@@ -506,8 +506,8 @@ import {
   toAbleTimeIssueInfo,
   updateAbleTimeTask,
   verifyAbleTimeConnection
-} from "./chunk-DGPROCE5.js";
-import "./chunk-U7HAVAGJ.js";
+} from "./chunk-LS4FFCPL.js";
+import "./chunk-6CVVNAIU.js";
 import {
   ABLETIME_MCP_PATH,
   ABLETIME_MCP_PM_PATH,
@@ -528,7 +528,7 @@ import {
   normalizeAbleTimeCredential,
   normalizeAbleTimeHost,
   rewriteAbleTimeError
-} from "./chunk-VA55JG2I.js";
+} from "./chunk-DEJALWKM.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -556,6 +556,8 @@ import {
   SIDEBOARD_FORCE_STOP,
   SLACK_REPLY_FORMATTING,
   addWorkspace,
+  archiveRemovedWorkspaceChats,
+  archivesWithRemovedWorkspace,
   attachmentFromAbsolutePath,
   attachmentsFromBuffers,
   attachmentsFromWorktreePaths,
@@ -594,7 +596,7 @@ import {
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads,
   takenTeamSlugsForOrchestration
-} from "./chunk-WY2IAB7J.js";
+} from "./chunk-MGJ7R7UX.js";
 import {
   GITHUB_PR_BODY_MAX_CHARS,
   GITHUB_PR_BODY_SAFE_CHARS,
@@ -728,12 +730,13 @@ import {
   refreshBrightsyAccessToken,
   registerBrightsyOAuthClient,
   saveBrightsyConfig
-} from "./chunk-ROPGQRPU.js";
+} from "./chunk-33KDPEK4.js";
 import {
+  currentHttpFetch,
   formatFetchError,
   httpFetch,
   setHttpFetchImpl
-} from "./chunk-N7WZ6NIN.js";
+} from "./chunk-JAT3JFOS.js";
 import {
   clipMcpToolResult
 } from "./chunk-S2OOM7AU.js";
@@ -5015,7 +5018,7 @@ async function handleJobStop(params, _ctx) {
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6YVY6T5I.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-65QGA6BB.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -10113,7 +10116,7 @@ function deliverPhoneTurn(opts, chatId) {
   });
 }
 
-// src/remote/listen.ts
+// src/remote/phone-turn.ts
 function formatRemotePrompt(text5) {
   return `Phone
 
@@ -10122,6 +10125,29 @@ ${text5.trim()}`;
 function isRemoteStopCommand(text5) {
   return text5.trim().toLowerCase() === "stop";
 }
+function phoneFollowUpQueues(status) {
+  return followUpBehavior() === "queue" && (status === "running" || status === "queued");
+}
+var PHONE_TURN_MS = 14 * 60 * 1e3;
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, 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 delay(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) {
@@ -10145,6 +10171,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 });
@@ -10414,23 +10511,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 {
@@ -10438,14 +10539,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 text5 = cmd.text.trim() || (staged.length ? "See the attached files." : "");
-      const formatted = formatRemotePrompt(text5);
-      await getOrchestrator().send(thread.id, formatted, { attachments: staged });
-      await getOrchestrator().waitForTurn(thread.id, 14 * 60 * 1e3);
+      await getOrchestrator().send(thread.id, formatRemotePrompt(text5), {
+        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;
@@ -10453,12 +10559,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(text5, opts) {
-  const log = opts.onLog ?? (() => void 0);
   const body = text5.trim();
   const control = takePhoneControl(body);
   if (control) {
@@ -10469,64 +10574,7 @@ function handleRemoteInbound(text5, 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
@@ -11463,15 +11511,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 readJson2(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 = randomBytes7(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({
@@ -11480,9 +11556,9 @@ async function startRemoteAccountLogin(opts) {
       ...linkToken ? { accountToken: linkToken } : {}
     })
   });
-  const startBody = await started.json();
+  const startBody = await readJson2(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;
@@ -11491,9 +11567,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;
     }
@@ -11518,8 +11596,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 })
@@ -12411,7 +12488,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6YVY6T5I.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-65QGA6BB.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -12870,6 +12947,8 @@ export {
   applyThreadIntoMain,
   applyTurnUsage,
   applyWorkspaceTags,
+  archiveRemovedWorkspaceChats,
+  archivesWithRemovedWorkspace,
   armSchedules,
   assertAbleTimeCredential,
   assertAbleTimeMcpCredential,