@sideboard-ai/core 0.1.284 → 0.1.286

package/dist/index.cjs

@@ -11171,6 +11171,8 @@ var init_stage_files = __esm({
 var workspaces_exports = {};
 __export(workspaces_exports, {
   addWorkspace: () => addWorkspace,
+  archiveRemovedWorkspaceChats: () => archiveRemovedWorkspaceChats,
+  archivesWithRemovedWorkspace: () => archivesWithRemovedWorkspace,
   ensureWorkspace: () => ensureWorkspace,
   isRemovedWorkspace: () => isRemovedWorkspace,
   listWorkspaces: () => listWorkspaces,
@@ -11227,10 +11229,33 @@ function sameWorkspacePath(a, b) {
   if (primaryB && primaryB === left) return true;
   return false;
 }
+function pathIsInside(parent, child) {
+  const root = parent.replace(/\/+$/, "");
+  const path2 = child.replace(/\/+$/, "");
+  if (!root || !path2) return false;
+  return path2 === root || path2.startsWith(`${root}/`);
+}
+function defaultWorktreesRoot(repoPath) {
+  const slug = (0, import_node_path27.basename)(repoPath.replace(/\/+$/, "")) || "repo";
+  return (0, import_node_path27.join)((0, import_node_os9.homedir)(), "sideboard", "workspaces", slug);
+}
+function removedWorktreeCoversRepo(saved, repoPath) {
+  if (!saved || !repoPath) return false;
+  if (pathIsInside(defaultWorktreesRoot(repoPath), saved)) return true;
+  try {
+    const custom = loadRepoSettings(repoPath)?.worktreesRoot;
+    if (custom && pathIsInside(custom, saved)) return true;
+  } catch {
+  }
+  return false;
+}
 function removedMatches(saved, repoPath) {
   if (saved === repoPath || sameWorkspacePath(saved, repoPath)) return true;
   const primary = primaryCheckoutFromLinkedWorktree(repoPath);
-  return Boolean(primary && sameWorkspacePath(saved, primary));
+  if (primary && (sameWorkspacePath(saved, primary) || removedWorktreeCoversRepo(saved, primary))) {
+    return true;
+  }
+  return removedWorktreeCoversRepo(saved, repoPath);
 }
 function isRemovedWorkspace(repoPath) {
   if (!repoPath) return false;
@@ -11239,6 +11264,10 @@ function isRemovedWorkspace(repoPath) {
   }
   return false;
 }
+function archivesWithRemovedWorkspace(threadRepoPath, removedPath) {
+  if (!threadRepoPath || isGlobalRepoPath(threadRepoPath)) return false;
+  return isRemovedWorkspace(threadRepoPath) || sameWorkspacePath(threadRepoPath, removedPath);
+}
 function rememberRemoved(repoPath) {
   const next = readRemoved();
   const before = next.size;
@@ -11246,6 +11275,8 @@ function rememberRemoved(repoPath) {
   next.add(canon);
   const raw = repoPath.replace(/\/+$/, "");
   if (raw && raw !== canon) next.add(raw);
+  const primary = primaryCheckoutFromLinkedWorktree(repoPath) ?? (canon !== repoPath ? primaryCheckoutFromLinkedWorktree(canon) : null);
+  if (primary) next.add(primary);
   if (next.size !== before) writeRemoved(next);
 }
 function forgetRemoved(repoPath) {
@@ -11378,12 +11409,25 @@ function syncWorkspacesFromThreads(repoPaths) {
   if (dirty) writeAll2(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
 }
-var import_node_fs24, import_node_path27;
+async function archiveRemovedWorkspaceChats(threads, archive) {
+  const failures = [];
+  for (const thread of threads) {
+    try {
+      await archive(thread.id);
+    } catch (err) {
+      failures.push(err instanceof Error ? err.message : String(err));
+    }
+  }
+  if (failures.length > 0) throw new Error(failures.join("\n"));
+}
+var import_node_fs24, import_node_os9, import_node_path27;
 var init_workspaces = __esm({
   "src/store/workspaces.ts"() {
     "use strict";
     import_node_fs24 = require("fs");
+    import_node_os9 = require("os");
     import_node_path27 = require("path");
+    init_settings();
     init_paths();
     init_global_workspace();
     init_worktree();
@@ -11966,7 +12010,7 @@ var init_turn_trace = __esm({
 function brightsyConfigPath() {
   const override = process.env.BRIGHTSY_CONFIG?.trim();
   if (override) return override;
-  return (0, import_node_path30.join)((0, import_node_os9.homedir)(), ".brightsy", "config.json");
+  return (0, import_node_path30.join)((0, import_node_os10.homedir)(), ".brightsy", "config.json");
 }
 function loadBrightsyConfig() {
   const path2 = brightsyConfigPath();
@@ -11985,12 +12029,12 @@ function saveBrightsyConfig(cfg) {
     mode: 384
   });
 }
-var import_node_fs27, import_node_os9, import_node_path30;
+var import_node_fs27, import_node_os10, import_node_path30;
 var init_config = __esm({
   "src/brightsy/config.ts"() {
     "use strict";
     import_node_fs27 = require("fs");
-    import_node_os9 = require("os");
+    import_node_os10 = require("os");
     import_node_path30 = require("path");
   }
 });
@@ -11999,30 +12043,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));
   }
@@ -13445,7 +13508,7 @@ function versionDirNodeBins(root, toBin) {
     return [];
   }
 }
-function defaultNodeBinCandidates(home = (0, import_node_os10.homedir)()) {
+function defaultNodeBinCandidates(home = (0, import_node_os11.homedir)()) {
   const kegs = ["/opt/homebrew", "/usr/local"].flatMap(
     (prefix) => PREFERRED_LTS_MAJORS.map((major) => (0, import_node_path34.join)(prefix, "opt", `node@${major}`, "bin", "node"))
   );
@@ -13560,12 +13623,12 @@ async function resolveNodeLaunch(scriptPath) {
     env: { ELECTRON_RUN_AS_NODE: "1" }
   };
 }
-var import_node_fs32, import_node_os10, import_node_path34, AGENT_RUNNER_MAX_OLD_SPACE_MB, MAX_OLD_SPACE_FLAG, PREFERRED_LTS_MAJORS;
+var import_node_fs32, import_node_os11, import_node_path34, AGENT_RUNNER_MAX_OLD_SPACE_MB, MAX_OLD_SPACE_FLAG, PREFERRED_LTS_MAJORS;
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
     import_node_fs32 = require("fs");
-    import_node_os10 = require("os");
+    import_node_os11 = require("os");
     import_node_path34 = require("path");
     init_nested_electron_env();
     init_system_ca();
@@ -13864,7 +13927,7 @@ function mcpServersRecord(servers, extraServers) {
 function writeMcpServersConfig(servers, extraServers) {
   const mcpServers = mcpServersRecord(servers, extraServers);
   if (Object.keys(mcpServers).length === 0) return null;
-  const dir = (0, import_node_fs33.mkdtempSync)((0, import_node_path35.join)((0, import_node_os11.tmpdir)(), "sideboard-mcp-"));
+  const dir = (0, import_node_fs33.mkdtempSync)((0, import_node_path35.join)((0, import_node_os12.tmpdir)(), "sideboard-mcp-"));
   const cfgPath = (0, import_node_path35.join)(dir, "mcp.json");
   (0, import_node_fs33.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
   return cfgPath;
@@ -13872,13 +13935,13 @@ function writeMcpServersConfig(servers, extraServers) {
 async function writeInjectedMcpConfig(opts) {
   return writeMcpServersConfig(await buildInjectedMcpServers(opts));
 }
-var import_node_fs33, import_node_module, import_node_os11, import_node_path35, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS, SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS, SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS, BRIGHTSY_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
+var import_node_fs33, import_node_module, import_node_os12, import_node_path35, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS, SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS, SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS, BRIGHTSY_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
 var init_injected_mcp = __esm({
   "src/agents/injected-mcp.ts"() {
     "use strict";
     import_node_fs33 = require("fs");
     import_node_module = require("module");
-    import_node_os11 = require("os");
+    import_node_os12 = require("os");
     import_node_path35 = require("path");
     import_node_url = require("url");
     init_run();
@@ -13935,10 +13998,10 @@ var init_injected_mcp = __esm({
 
 // src/agents/user-mcp-config.ts
 function userCursorMcpConfigPath() {
-  return (0, import_node_path36.join)((0, import_node_os12.homedir)(), ".cursor", "mcp.json");
+  return (0, import_node_path36.join)((0, import_node_os13.homedir)(), ".cursor", "mcp.json");
 }
 function userClaudeMcpConfigPath() {
-  return (0, import_node_path36.join)((0, import_node_os12.homedir)(), ".claude.json");
+  return (0, import_node_path36.join)((0, import_node_os13.homedir)(), ".claude.json");
 }
 function asObject(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
@@ -13998,12 +14061,12 @@ async function registerPackagedUserMcpClients() {
   }
   return { cursor };
 }
-var import_node_fs34, import_node_os12, import_node_path36;
+var import_node_fs34, import_node_os13, import_node_path36;
 var init_user_mcp_config = __esm({
   "src/agents/user-mcp-config.ts"() {
     "use strict";
     import_node_fs34 = require("fs");
-    import_node_os12 = require("os");
+    import_node_os13 = require("os");
     import_node_path36 = require("path");
     init_paths();
     init_injected_mcp();
@@ -14044,10 +14107,10 @@ function readText(path2) {
     return "";
   }
 }
-function userCodexConfigPaths(home = (0, import_node_os13.homedir)()) {
+function userCodexConfigPaths(home = (0, import_node_os14.homedir)()) {
   return [(0, import_node_path37.join)(home, ".codex", "config.toml"), (0, import_node_path37.join)(home, ".config", "codex", "config.toml")];
 }
-function userOpencodeConfigPaths(home = (0, import_node_os13.homedir)()) {
+function userOpencodeConfigPaths(home = (0, import_node_os14.homedir)()) {
   return [
     (0, import_node_path37.join)(home, ".config", "opencode", "opencode.json"),
     (0, import_node_path37.join)(home, ".config", "opencode", "opencode.jsonc")
@@ -14069,7 +14132,7 @@ function userMcpNamesToDisable(opts) {
   }
   return out;
 }
-function listUserCodexMcpNames(home = (0, import_node_os13.homedir)()) {
+function listUserCodexMcpNames(home = (0, import_node_os14.homedir)()) {
   const names = [];
   for (const path2 of userCodexConfigPaths(home)) {
     if (!(0, import_node_fs35.existsSync)(path2)) continue;
@@ -14077,7 +14140,7 @@ function listUserCodexMcpNames(home = (0, import_node_os13.homedir)()) {
   }
   return names;
 }
-function listUserOpencodeMcpNames(home = (0, import_node_os13.homedir)()) {
+function listUserOpencodeMcpNames(home = (0, import_node_os14.homedir)()) {
   const names = [];
   for (const path2 of userOpencodeConfigPaths(home)) {
     if (!(0, import_node_fs35.existsSync)(path2)) continue;
@@ -14085,12 +14148,12 @@ function listUserOpencodeMcpNames(home = (0, import_node_os13.homedir)()) {
   }
   return names;
 }
-function userClaudeMcpConfigObject(home = (0, import_node_os13.homedir)()) {
-  const claudePath = home === (0, import_node_os13.homedir)() ? userClaudeMcpConfigPath() : (0, import_node_path37.join)(home, ".claude.json");
+function userClaudeMcpConfigObject(home = (0, import_node_os14.homedir)()) {
+  const claudePath = home === (0, import_node_os14.homedir)() ? userClaudeMcpConfigPath() : (0, import_node_path37.join)(home, ".claude.json");
   if (!(0, import_node_fs35.existsSync)(claudePath)) return {};
   return asObject2(asObject2(readJsonObject2(claudePath)).mcpServers);
 }
-function listUserClaudeMcpServerEntries(home = (0, import_node_os13.homedir)()) {
+function listUserClaudeMcpServerEntries(home = (0, import_node_os14.homedir)()) {
   const out = {};
   for (const [rawName, value] of Object.entries(userClaudeMcpConfigObject(home))) {
     const name = rawName.trim();
@@ -14120,12 +14183,12 @@ function toCodexUnattendedAppsArgs() {
     "features.plugins=false"
   ];
 }
-var import_node_fs35, import_node_os13, import_node_path37, import_smol_toml2;
+var import_node_fs35, import_node_os14, import_node_path37, import_smol_toml2;
 var init_orch_mcp_isolation = __esm({
   "src/agents/orch-mcp-isolation.ts"() {
     "use strict";
     import_node_fs35 = require("fs");
-    import_node_os13 = require("os");
+    import_node_os14 = require("os");
     import_node_path37 = require("path");
     import_smol_toml2 = require("smol-toml");
     init_user_mcp_config();
@@ -14719,10 +14782,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") {
@@ -15145,8 +15208,8 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    (0, import_node_path40.join)((0, import_node_os14.homedir)(), ".codex", "config.toml"),
-    (0, import_node_path40.join)((0, import_node_os14.homedir)(), ".config", "codex", "config.toml")
+    (0, import_node_path40.join)((0, import_node_os15.homedir)(), ".codex", "config.toml"),
+    (0, import_node_path40.join)((0, import_node_os15.homedir)(), ".config", "codex", "config.toml")
   ];
   for (const path2 of candidates) {
     if (!(0, import_node_fs39.existsSync)(path2)) continue;
@@ -15182,7 +15245,7 @@ function asRecord3(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = (0, import_node_path40.join)((0, import_node_os14.homedir)(), ".codex", "auth.json");
+  const authPath = (0, import_node_path40.join)((0, import_node_os15.homedir)(), ".codex", "auth.json");
   if (!(0, import_node_fs39.existsSync)(authPath)) return false;
   try {
     return (0, import_node_fs39.statSync)(authPath).size > 2;
@@ -15190,12 +15253,12 @@ function codexLooksAuthenticated() {
     return false;
   }
 }
-var import_node_fs39, import_node_os14, import_node_path40, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
+var import_node_fs39, import_node_os15, import_node_path40, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
 var init_codex = __esm({
   "src/agents/codex.ts"() {
     "use strict";
     import_node_fs39 = require("fs");
-    import_node_os14 = require("os");
+    import_node_os15 = require("os");
     import_node_path40 = require("path");
     init_run();
     init_app_settings();
@@ -17091,7 +17154,7 @@ function accessTokenFromCredentialsJson(raw) {
   }
 }
 function claudeCredentialsPath(configDir) {
-  const root = configDir?.trim() || process.env.CLAUDE_CONFIG_DIR?.trim() || (0, import_node_path45.join)((0, import_node_os15.homedir)(), ".claude");
+  const root = configDir?.trim() || process.env.CLAUDE_CONFIG_DIR?.trim() || (0, import_node_path45.join)((0, import_node_os16.homedir)(), ".claude");
   return (0, import_node_path45.join)(root, ".credentials.json");
 }
 async function readFileAccessToken(configDir) {
@@ -17209,12 +17272,12 @@ async function getClaudePlanUsage(opts = {}) {
   })();
   return inflight;
 }
-var import_node_fs45, import_node_os15, import_node_path45, CLAUDE_OAUTH_USAGE_URL, CLAUDE_USAGE_TTL_MS, CLAUDE_USAGE_ERROR_TTL_MS, CLAUDE_USAGE_STALE_OK_MS, KEYCHAIN_SERVICES, cache, errorUntil, inflight, lastGood, claudeVersion, cacheDirKey;
+var import_node_fs45, import_node_os16, import_node_path45, CLAUDE_OAUTH_USAGE_URL, CLAUDE_USAGE_TTL_MS, CLAUDE_USAGE_ERROR_TTL_MS, CLAUDE_USAGE_STALE_OK_MS, KEYCHAIN_SERVICES, cache, errorUntil, inflight, lastGood, claudeVersion, cacheDirKey;
 var init_claude_usage_client = __esm({
   "src/agents/claude-usage-client.ts"() {
     "use strict";
     import_node_fs45 = require("fs");
-    import_node_os15 = require("os");
+    import_node_os16 = require("os");
     import_node_path45 = require("path");
     init_run();
     init_fetch();
@@ -24049,7 +24112,7 @@ function listConductorWorkspaces() {
   if (!(0, import_node_fs57.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs57.mkdtempSync)((0, import_node_path55.join)((0, import_node_os16.tmpdir)(), "sideboard-conductor-"));
+  const tmp = (0, import_node_fs57.mkdtempSync)((0, import_node_path55.join)((0, import_node_os17.tmpdir)(), "sideboard-conductor-"));
   const snapshot = (0, import_node_path55.join)(tmp, "conductor.db");
   try {
     (0, import_node_fs57.copyFileSync)(CONDUCTOR_DB, snapshot);
@@ -24140,7 +24203,7 @@ function importConductorWorkspace(workspaceId) {
   if (!(0, import_node_fs57.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs57.mkdtempSync)((0, import_node_path55.join)((0, import_node_os16.tmpdir)(), "sideboard-conductor-"));
+  const tmp = (0, import_node_fs57.mkdtempSync)((0, import_node_path55.join)((0, import_node_os17.tmpdir)(), "sideboard-conductor-"));
   const snapshot = (0, import_node_path55.join)(tmp, "conductor.db");
   try {
     (0, import_node_fs57.copyFileSync)(CONDUCTOR_DB, snapshot);
@@ -24235,13 +24298,13 @@ function importConductorWorkspace(workspaceId) {
 async function importConductorWorkspaceAsync(workspaceId) {
   return importConductorWorkspace(workspaceId);
 }
-var import_node_child_process6, import_node_fs57, import_node_os16, import_node_path55, import_node_module6, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
+var import_node_child_process6, import_node_fs57, import_node_os17, import_node_path55, import_node_module6, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
 var init_adopt = __esm({
   "src/threads/adopt.ts"() {
     "use strict";
     import_node_child_process6 = require("child_process");
     import_node_fs57 = require("fs");
-    import_node_os16 = require("os");
+    import_node_os17 = require("os");
     import_node_path55 = require("path");
     import_node_module6 = require("module");
     init_worktree();
@@ -25803,7 +25866,7 @@ function scanClaudePluginSkills(pluginsRoot, out) {
   walk(pluginsRoot, 0, false);
 }
 function discoverSkills(worktreePath) {
-  const home = (0, import_node_os17.homedir)();
+  const home = (0, import_node_os18.homedir)();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
     scanSkillsDir((0, import_node_path58.join)(worktreePath, rel), "workspace", collected);
@@ -25856,12 +25919,12 @@ function readSkillBody(skillPath, maxChars = 12e3) {
 
 \u2026(truncated)` : raw;
 }
-var import_node_fs61, import_node_os17, import_node_path58, BUNDLED_SKILL_PREFIX;
+var import_node_fs61, import_node_os18, import_node_path58, BUNDLED_SKILL_PREFIX;
 var init_discover = __esm({
   "src/skills/discover.ts"() {
     "use strict";
     import_node_fs61 = require("fs");
-    import_node_os17 = require("os");
+    import_node_os18 = require("os");
     import_node_path58 = require("path");
     init_long_running();
     BUNDLED_SKILL_PREFIX = "bundled:";
@@ -27744,8 +27807,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);
@@ -28030,10 +28093,10 @@ var init_orchestrator = __esm({
       }
       async removeWorkspace(repoPath) {
         removeWorkspace(repoPath);
-        for (const thread of listThreads()) {
-          if (!sameWorkspacePath(thread.repoPath, repoPath)) continue;
-          await this.archive(thread.id).catch(() => void 0);
-        }
+        await archiveRemovedWorkspaceChats(
+          listThreads().filter((thread) => archivesWithRemovedWorkspace(thread.repoPath, repoPath)),
+          (id) => this.archive(id)
+        );
       }
       async adopt(input) {
         const thread = await adoptThread(input);
@@ -30186,14 +30249,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);
@@ -30442,6 +30505,8 @@ __export(index_exports, {
   applyThreadIntoMain: () => applyThreadIntoMain,
   applyTurnUsage: () => applyTurnUsage,
   applyWorkspaceTags: () => applyWorkspaceTags,
+  archiveRemovedWorkspaceChats: () => archiveRemovedWorkspaceChats,
+  archivesWithRemovedWorkspace: () => archivesWithRemovedWorkspace,
   armSchedules: () => armSchedules,
   assertAbleTimeCredential: () => assertAbleTimeCredential,
   assertAbleTimeMcpCredential: () => assertAbleTimeMcpCredential,
@@ -39738,10 +39803,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
@@ -40720,7 +40782,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
 
@@ -40729,6 +40797,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) {
@@ -40752,6 +40843,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 });
@@ -41021,23 +41183,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 {
@@ -41045,14 +41211,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;
@@ -41060,12 +41231,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) {
@@ -41076,64 +41246,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
@@ -41473,6 +41586,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");
@@ -42073,15 +42187,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({
@@ -42090,9 +42232,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;
@@ -42101,9 +42243,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;
     }
@@ -42128,8 +42272,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 })
@@ -43487,6 +43630,8 @@ async function pollSlackOutboundWatches(opts) {
   applyThreadIntoMain,
   applyTurnUsage,
   applyWorkspaceTags,
+  archiveRemovedWorkspaceChats,
+  archivesWithRemovedWorkspace,
   armSchedules,
   assertAbleTimeCredential,
   assertAbleTimeMcpCredential,