@sideboard-ai/core 0.1.130 → 0.1.132

package/dist/index.cjs

@@ -6780,11 +6780,40 @@ function humanizeAgentFailDetail(detail) {
 }
 function turnFailChatText(opts) {
   const chat = opts.assistantText.trim();
-  if (chat) return chat;
-  if (opts.exitCode === 0) return "";
+  if (opts.exitCode === 0) return chat;
   const detail = opts.detail.trim();
-  if (detail) return humanizeAgentFailDetail(detail);
-  return formatTurnExitError(opts.exitCode ?? 1, "");
+  const fail4 = detail ? humanizeAgentFailDetail(detail) : formatTurnExitError(opts.exitCode ?? 1, "");
+  if (!chat) return fail4;
+  const failCore = fail4.replace(/^exit\s*\d+:\s*/i, "").trim();
+  if (looksLikeAgentFailureMessage(chat) || failCore && chat.includes(failCore) || chat.includes(fail4)) {
+    return chat;
+  }
+  return `${chat}
+
+${fail4}`;
+}
+function shouldFeedErrorBackToAgent(opts) {
+  const detail = opts.detail.trim();
+  const chat = (opts.assistantText ?? "").trim();
+  if (looksLikeAgentFailureMessage(detail) || looksLikeAgentFailureMessage(chat)) {
+    return false;
+  }
+  if (looksLikeInvalidAgentSession(detail) || looksLikeV8Oom(detail) || looksLikeRetryableRunnerCrash(detail)) {
+    return true;
+  }
+  if (/without details|segfault|sig(?:segv|abrt|ill)|fatal error/i.test(detail)) {
+    return true;
+  }
+  return !chat && (opts.partsCount ?? 0) === 0;
+}
+function formatAgentErrorContinuePrompt(detail) {
+  const fail4 = humanizeAgentFailDetail(detail.trim()) || "the agent process exited without details";
+  return [
+    "The previous agent process ended before it finished. Error:",
+    fail4,
+    "",
+    "Continue from where you left off. Use the error to recover \u2014 do not restart the whole task unless the error requires it. If you cannot continue, say why."
+  ].join("\n");
 }
 function formatTurnExitError(exitCode, stderrSummary) {
   const code = exitCode ?? 1;
@@ -6814,6 +6843,8 @@ var init_error_detail = __esm({
 
 // src/brightsy/config.ts
 function brightsyConfigPath() {
+  const override = process.env.BRIGHTSY_CONFIG?.trim();
+  if (override) return override;
   return (0, import_node_path22.join)((0, import_node_os6.homedir)(), ".brightsy", "config.json");
 }
 function loadBrightsyConfig() {
@@ -6843,6 +6874,117 @@ var init_config = __esm({
   }
 });
 
+// src/http/fetch.ts
+function setHttpFetchImpl(fetchImpl) {
+  injected = fetchImpl;
+}
+function formatFetchError(err, url) {
+  if (!(err instanceof Error)) return `${String(err)} (${url})`;
+  const cause = err.cause;
+  let detail = "";
+  if (cause instanceof Error) {
+    const code = typeof cause.code === "string" ? cause.code : void 0;
+    detail = code ? ` [${code}: ${cause.message}]` : ` [${cause.message}]`;
+  } else if (cause != null) {
+    detail = ` [${String(cause)}]`;
+  }
+  return `${err.message}${detail} (${url})`;
+}
+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);
+  } catch (err) {
+    throw new Error(formatFetchError(err, url));
+  }
+}
+var injected;
+var init_fetch = __esm({
+  "src/http/fetch.ts"() {
+    "use strict";
+    injected = null;
+  }
+});
+
+// src/brightsy/oauth.ts
+var oauth_exports = {};
+__export(oauth_exports, {
+  brightsyAccessTokenNeedsRefresh: () => brightsyAccessTokenNeedsRefresh,
+  ensureBrightsyLocalConfigFresh: () => ensureBrightsyLocalConfigFresh,
+  refreshBrightsyAccessToken: () => refreshBrightsyAccessToken
+});
+function brightsyAccessTokenNeedsRefresh(expiresAt, now = Date.now()) {
+  if (typeof expiresAt !== "number" || !Number.isFinite(expiresAt) || expiresAt <= 0) {
+    return true;
+  }
+  return now >= expiresAt - REFRESH_SKEW_MS;
+}
+function applyGrant(current, grant) {
+  return {
+    access_token: grant.access_token,
+    refresh_token: grant.refresh_token || current.refresh_token,
+    expires_at: grant.expires_at ?? current.expires_at
+  };
+}
+async function refreshBrightsyAccessToken(opts) {
+  const endpoint = (opts.endpoint || "https://brightsy.ai").replace(/\/$/, "");
+  const url = `${endpoint}/oauth/token`;
+  const fetchImpl = opts.fetchImpl ?? globalThis.fetch.bind(globalThis);
+  let res;
+  try {
+    res = await fetchImpl(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        refresh_token: opts.refreshToken,
+        client_id: opts.clientId || "brightsy-cli"
+      })
+    });
+  } catch (err) {
+    throw new Error(formatFetchError(err, url));
+  }
+  if (!res.ok) return null;
+  const data = await res.json();
+  if (!data.access_token) return null;
+  return {
+    access_token: data.access_token,
+    refresh_token: data.refresh_token,
+    expires_at: data.expires_in ? Date.now() + data.expires_in * 1e3 : void 0
+  };
+}
+async function ensureBrightsyLocalConfigFresh(opts) {
+  let cfg;
+  try {
+    cfg = loadBrightsyConfig();
+  } catch {
+    return null;
+  }
+  if (!cfg.refresh_token || !brightsyAccessTokenNeedsRefresh(cfg.expires_at)) {
+    return cfg;
+  }
+  const grant = await refreshBrightsyAccessToken({
+    endpoint: cfg.endpoint || "https://brightsy.ai",
+    refreshToken: cfg.refresh_token,
+    clientId: cfg.oauth_client_id,
+    fetchImpl: opts?.fetchImpl
+  });
+  if (!grant) return cfg;
+  const next = { ...cfg, ...applyGrant(cfg, grant) };
+  saveBrightsyConfig(next);
+  return next;
+}
+var REFRESH_SKEW_MS;
+var init_oauth = __esm({
+  "src/brightsy/oauth.ts"() {
+    "use strict";
+    init_fetch();
+    init_config();
+    REFRESH_SKEW_MS = 6e4;
+  }
+});
+
 // src/brightsy/accounts.ts
 async function loadConnectedTeams() {
   const { listConnectedBrightsyTeams: listConnectedBrightsyTeams2 } = await Promise.resolve().then(() => (init_connected_teams(), connected_teams_exports));
@@ -6873,6 +7015,10 @@ async function listBrightsyAccounts() {
 }
 async function getBrightsySession() {
   try {
+    const { ensureBrightsyLocalConfigFresh: ensureBrightsyLocalConfigFresh2 } = await Promise.resolve().then(() => (init_oauth(), oauth_exports));
+    const { ensureConnectedBrightsyTeamTokens: ensureConnectedBrightsyTeamTokens2 } = await Promise.resolve().then(() => (init_connected_teams(), connected_teams_exports));
+    await ensureBrightsyLocalConfigFresh2();
+    await ensureConnectedBrightsyTeamTokens2();
     loadBrightsyConfig();
     const data = await runBrightsyTeamsJson([]);
     const accounts = Array.isArray(data.teams) ? data.teams : [];
@@ -6993,7 +7139,6 @@ function applyConnectedTeamToCli(team) {
 }
 async function refreshTeamToken(team) {
   if (!team.refresh_token) return team;
-  const endpoint = (team.endpoint || "https://brightsy.ai").replace(/\/$/, "");
   const cfg = (() => {
     try {
       return loadBrightsyConfig();
@@ -7001,39 +7146,34 @@ async function refreshTeamToken(team) {
       return null;
     }
   })();
-  const clientId = cfg?.oauth_client_id || "brightsy-cli";
-  const res = await fetch(`${endpoint}/oauth/token`, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      grant_type: "refresh_token",
-      refresh_token: team.refresh_token,
-      client_id: clientId
-    })
+  const grant = await refreshBrightsyAccessToken({
+    endpoint: team.endpoint || "https://brightsy.ai",
+    refreshToken: team.refresh_token,
+    clientId: cfg?.oauth_client_id
   });
-  if (!res.ok) return team;
-  const data = await res.json();
-  if (!data.access_token) return team;
+  if (!grant) return team;
   return {
     ...team,
-    access_token: data.access_token,
-    refresh_token: data.refresh_token || team.refresh_token,
-    expires_at: data.expires_in ? Date.now() + data.expires_in * 1e3 : team.expires_at
+    access_token: grant.access_token,
+    refresh_token: grant.refresh_token || team.refresh_token,
+    expires_at: grant.expires_at ?? team.expires_at
   };
 }
 async function ensureConnectedBrightsyTeamTokens() {
+  await ensureBrightsyLocalConfigFresh().catch(() => null);
   const teams = readStore4();
   if (teams.length === 0) return [];
   const next = [];
   let changed = false;
   for (const team of teams) {
-    const expired = typeof team.expires_at === "number" && Date.now() >= team.expires_at - 6e4;
-    if (!expired) {
+    if (!team.refresh_token || !brightsyAccessTokenNeedsRefresh(team.expires_at)) {
       next.push(team);
       continue;
     }
     const refreshed = await refreshTeamToken(team);
-    if (refreshed.access_token !== team.access_token) changed = true;
+    if (refreshed.access_token !== team.access_token || refreshed.refresh_token !== team.refresh_token || refreshed.expires_at !== team.expires_at) {
+      changed = true;
+    }
     next.push(refreshed);
   }
   if (changed) writeStore3(next);
@@ -7128,6 +7268,7 @@ var init_connected_teams = __esm({
     init_paths();
     init_accounts();
     init_config();
+    init_oauth();
   }
 });
 
@@ -8532,6 +8673,7 @@ function teamEnv(team) {
   const endpoint = (team.endpoint || "https://brightsy.ai").replace(/\/$/, "");
   return {
     BRIGHTSY_API_TOKEN: team.access_token,
+    ...team.refresh_token ? { BRIGHTSY_REFRESH_TOKEN: team.refresh_token } : {},
     BRIGHTSY_ACCOUNT_ID: team.id,
     BRIGHTSY_API_URL: endpoint
   };
@@ -8818,10 +8960,15 @@ var init_types = __esm({
 
 // src/agents/claude.ts
 async function loadMcpServers() {
+  if (mcpListCache && Date.now() - mcpListCache.at < 3e4) {
+    return mcpListCache.servers;
+  }
   const claude = resolveClaudeExecutable();
   const mcpText = await run(claude, ["mcp", "list"], { reject: false });
-  return parseMcpList(`${mcpText.stdout}
+  const servers = parseMcpList(`${mcpText.stdout}
 ${mcpText.stderr}`);
+  mcpListCache = { at: Date.now(), servers };
+  return servers;
 }
 function usageFromClaude(usage) {
   if (!usage) return null;
@@ -9035,7 +9182,7 @@ function parseIssuesJson(raw) {
   }
   return [];
 }
-var import_node_fs25, BASE_ALLOWED_TOOLS, CLAUDE_PRINT_BG_WAIT_CEILING_MS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_PROMPT_ARG_MAX, claudeAdapter;
+var import_node_fs25, BASE_ALLOWED_TOOLS, CLAUDE_PRINT_BG_WAIT_CEILING_MS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_PROMPT_ARG_MAX, mcpListCache, claudeAdapter;
 var init_claude = __esm({
   "src/agents/claude.ts"() {
     "use strict";
@@ -9073,6 +9220,7 @@ var init_claude = __esm({
       "Skill(claude-in-chrome)"
     ];
     CLAUDE_PROMPT_ARG_MAX = 2e5;
+    mcpListCache = null;
     claudeAdapter = {
       kind: "claude",
       async detect() {
@@ -10451,10 +10599,13 @@ var init_opencode = __esm({
             const part = obj.part;
             const id = part?.tool_use_id ?? part?.id ?? obj.tool_use_id ?? obj.id;
             if (!id) return null;
+            const flagged = obj.isError === true || obj.is_error === true;
+            const errText2 = formatUnknownDetail(obj.error);
             return {
               type: "tool_result",
               id,
-              content: part?.output ?? part?.content ?? obj.output ?? obj.content
+              content: part?.output ?? part?.content ?? obj.output ?? obj.content ?? (errText2 || void 0),
+              isError: flagged || Boolean(errText2)
             };
           }
           if (obj.type === "step_finish" || obj.type === "step-finish") {
@@ -12929,7 +13080,48 @@ function isMergedPrState(prUrl, prState) {
   if (!prUrl?.trim()) return false;
   return (prState ?? "").trim().toUpperCase() === "MERGED";
 }
-function groupHomeBoardWorktrees(threads) {
+function groupCreatedAt(group) {
+  let min = group[0]?.createdAt ?? "";
+  for (const t of group) {
+    if (t.createdAt && t.createdAt < min) min = t.createdAt;
+  }
+  return min;
+}
+function groupUpdatedAt(group) {
+  let max = group[0]?.updatedAt ?? "";
+  for (const t of group) {
+    if (t.updatedAt && t.updatedAt > max) max = t.updatedAt;
+  }
+  return max;
+}
+function sortThreadsInWorktree(list) {
+  return [...list].sort((a, b) => {
+    const created = a.createdAt.localeCompare(b.createdAt);
+    if (created !== 0) return created;
+    return a.id.localeCompare(b.id);
+  });
+}
+function compareWorktreeGroups(a, b, mode, labelOf) {
+  if (mode === "name") {
+    const named = (labelOf?.(a) ?? a[0]?.id ?? "").localeCompare(
+      labelOf?.(b) ?? b[0]?.id ?? "",
+      void 0,
+      { sensitivity: "base" }
+    );
+    if (named !== 0) return named;
+  } else if (mode === "activity") {
+    const activity = groupUpdatedAt(b).localeCompare(groupUpdatedAt(a));
+    if (activity !== 0) return activity;
+  } else {
+    const created = groupCreatedAt(b).localeCompare(groupCreatedAt(a));
+    if (created !== 0) return created;
+  }
+  return (a[0]?.id ?? "").localeCompare(b[0]?.id ?? "");
+}
+function defaultWorktreeGroupLabel(group) {
+  return worktreeDisplayLabelForGroup(group);
+}
+function groupHomeBoardWorktrees(threads, sort = DEFAULT_WORKTREE_SORT, labelOf = defaultWorktreeGroupLabel) {
   const map = /* @__PURE__ */ new Map();
   for (const t of threads) {
     const key = normalizeWorktreePath(t.worktreePath);
@@ -12937,7 +13129,7 @@ function groupHomeBoardWorktrees(threads) {
     list.push(t);
     map.set(key, list);
   }
-  return [...map.values()].map((list) => list.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt))).sort((a, b) => (b[0]?.updatedAt ?? "").localeCompare(a[0]?.updatedAt ?? ""));
+  return [...map.values()].map((list) => sortThreadsInWorktree(list)).sort((a, b) => compareWorktreeGroups(a, b, sort, labelOf));
 }
 function classifyWorktreeColumn(group) {
   if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) return "done";
@@ -13243,8 +13435,7 @@ function assembleHomeBoard(input) {
   const kind = input.kind ?? "all";
   const limit = Math.max(1, input.limit ?? BOARD_PAGE_SIZE);
   const wsName = input.workspaceName ?? (() => "");
-  const byUpdated = (a, b) => b.updatedAt.localeCompare(a.updatedAt);
-  const live = input.threads.filter((t) => t.status !== "archived" && isHomeBoardThread(t)).sort(byUpdated);
+  const live = input.threads.filter((t) => t.status !== "archived" && isHomeBoardThread(t));
   const columns = emptyColumns();
   const hidden = emptyHidden();
   const totals = {
@@ -13299,7 +13490,7 @@ function assembleHomeBoard(input) {
   }
   return { columns, hidden, totals };
 }
-var GLOBAL_WORKSPACE_ID2, BOARD_COLUMN_DEFS, HOME_BOARD_CACHE_TTL_MS, DEFAULTISH_BRANCH, BOARD_PAGE_SIZE, HOME_BOARD_AGENT_HINT;
+var GLOBAL_WORKSPACE_ID2, BOARD_COLUMN_DEFS, HOME_BOARD_CACHE_TTL_MS, DEFAULT_WORKTREE_SORT, DEFAULTISH_BRANCH, BOARD_PAGE_SIZE, HOME_BOARD_AGENT_HINT;
 var init_home_board = __esm({
   "src/board/home-board.ts"() {
     "use strict";
@@ -13312,6 +13503,7 @@ var init_home_board = __esm({
       { id: "done", title: "Merged" }
     ];
     HOME_BOARD_CACHE_TTL_MS = 15 * 60 * 1e3;
+    DEFAULT_WORKTREE_SORT = "created";
     DEFAULTISH_BRANCH = /^(main|master|develop|development|trunk|default|head)$/;
     BOARD_PAGE_SIZE = 40;
     HOME_BOARD_AGENT_HINT = "Home is a Kanban of worktrees (one card per checkout; sibling chat tabs nest as inner cards). create_thread reuses a live worktree for the same ticket, PR, or named branch \u2014 do not recreate it. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Merged. Archive removes the card to Settings \u2192 History. Queued/running are activity on the card, not columns. Orchestration chats stay in the sidebar. Do not invent status.";
@@ -16400,6 +16592,11 @@ var init_orchestrator = __esm({
       turnBaselines = /* @__PURE__ */ new Map();
       /** 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.
+       */
+      crashContinued = /* @__PURE__ */ new Set();
       maxConcurrent;
       runningCount = 0;
       constructor(opts) {
@@ -16613,6 +16810,29 @@ var init_orchestrator = __esm({
           );
         }
       }
+      /**
+       * Cursor-style recovery: after a runner crash, feed the error back as the
+       * 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,
+          assistantText: opts.assistantText,
+          partsCount: opts.partsCount
+        })) {
+          return;
+        }
+        const thread = readThread(threadId);
+        if (!thread || thread.status === "archived") return;
+        this.crashContinued.add(threadId);
+        const prompt = formatAgentErrorContinuePrompt(opts.detail);
+        const queue = [prompt, ...thread.queue];
+        updateThread(threadId, { queue });
+        this.emit({ type: "queue_changed", threadId, queue });
+        this.haltDrain.delete(threadId);
+      }
       getThreads(includeArchived = false) {
         return listThreads({ includeArchived });
       }
@@ -16712,15 +16932,20 @@ var init_orchestrator = __esm({
             throw new Error(`Thread is archived: ${thread.id}`);
           }
           const queue = [...current.queue, prompt];
+          this.crashContinued.delete(thread.id);
           this.haltDrain.delete(thread.id);
-          const patch = { queue, status: "queued" };
+          const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id) || current.status === "running";
+          const patch = { queue };
+          if (!inFlight) patch.status = "queued";
           const pid = current.agentPid;
           if (typeof pid === "number" && pid > 0 && !isPidAlive(pid)) {
             patch.agentPid = null;
           }
           updateThread(thread.id, patch);
           this.emit({ type: "queue_changed", threadId: thread.id, queue });
-          this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
+          if (!inFlight) {
+            this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
+          }
           if (thisProcessShouldDrainAgentQueues()) {
             void this.drainQueue(thread.id);
           }
@@ -17041,7 +17266,7 @@ var init_orchestrator = __esm({
           let parts = result.parts;
           let usage = result.usage ?? void 0;
           let exitCode = result.exitCode;
-          if (this.requireThread(threadId).agent === "cursor" && exitCode !== 0 && !assistantText && parts.length === 0) {
+          if (!this.stoppedTurns.has(threadId) && this.requireThread(threadId).agent === "cursor" && exitCode !== 0 && !assistantText && parts.length === 0) {
             const sessionId = result.sessionId || this.requireThread(threadId).sessionId || "";
             if (sessionId) {
               const { recoverFinishedCursorRun: recoverFinishedCursorRun2 } = await Promise.resolve().then(() => (init_cursor_recover(), cursor_recover_exports));
@@ -17062,7 +17287,7 @@ var init_orchestrator = __esm({
           }
           let lastStderr = summarizeTurnStderr(stderrTail);
           let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-          if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && this.requireThread(threadId).agent !== "brightsy" && shouldRetryFailedAgentTurn(detail, {
+          if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && shouldRetryFailedAgentTurn(detail, {
             hasSession: Boolean(this.requireThread(threadId).sessionId)
           })) {
             updateThread(threadId, { sessionId: null });
@@ -17158,7 +17383,11 @@ var init_orchestrator = __esm({
           )) {
             updateThread(threadId, { sessionId: null });
           }
-          await syncThreadBranchFromGit(threadId);
+          if (this.stoppedTurns.has(threadId)) {
+            void syncThreadBranchFromGit(threadId).catch(() => void 0);
+          } else {
+            await syncThreadBranchFromGit(threadId);
+          }
           if (this.stoppedTurns.has(threadId)) {
             const stopped = writeLiveStatus(threadId, "stopped");
             if (stopped?.status === "stopped") {
@@ -17182,9 +17411,16 @@ var init_orchestrator = __esm({
               });
             }
             this.emit({ type: "turn_finished", threadId, exitCode });
-            if (exitCode !== 0) {
+            if (exitCode === 0) {
+              this.crashContinued.delete(threadId);
+            } else {
               const blob = [chatText, detail].filter(Boolean).join("\n");
               void this.maybeHandleOrchestrationQuotaFailover(threadId, blob);
+              this.maybeEnqueueCrashContinue(threadId, {
+                detail: detail || failDetail,
+                assistantText: chatText,
+                partsCount: parts.length
+              });
             }
           }
         } catch (err) {
@@ -17204,6 +17440,11 @@ var init_orchestrator = __esm({
             }
             this.emit({ type: "turn_finished", threadId, exitCode: 1 });
             void this.maybeHandleOrchestrationQuotaFailover(threadId, message);
+            this.maybeEnqueueCrashContinue(threadId, {
+              detail: message,
+              assistantText: "",
+              partsCount: 0
+            });
           }
         } finally {
           this.startingTurns.delete(threadId);
@@ -18305,6 +18546,7 @@ __export(index_exports, {
   CONTEXT_MIN_MESSAGES: () => CONTEXT_MIN_MESSAGES,
   CONVENTION_SETUP_RELPATHS: () => CONVENTION_SETUP_RELPATHS,
   COORDINATOR_TOOL_PLAYBOOK: () => COORDINATOR_TOOL_PLAYBOOK,
+  DEFAULT_WORKTREE_SORT: () => DEFAULT_WORKTREE_SORT,
   FAMOUS_SOCCER_TEAMS: () => FAMOUS_SOCCER_TEAMS,
   GITHUB_GIT_AUTH_MODES: () => GITHUB_GIT_AUTH_MODES,
   GLOBAL_WORKSPACE_ID: () => GLOBAL_WORKSPACE_ID,
@@ -18386,6 +18628,7 @@ __export(index_exports, {
   autoRenameBranchEnabled: () => autoRenameBranchEnabled,
   autoRunAfterSetupEnabled: () => autoRunAfterSetupEnabled,
   branchDisplayLabel: () => branchDisplayLabel,
+  brightsyAccessTokenNeedsRefresh: () => brightsyAccessTokenNeedsRefresh,
   brightsyAdapter: () => brightsyAdapter,
   brightsyCloudConnectAgent: () => brightsyCloudConnectAgent,
   brightsyCloudConnectEnabled: () => brightsyCloudConnectEnabled,
@@ -18472,7 +18715,9 @@ __export(index_exports, {
   enrichPathWithNpmGlobalBin: () => enrichPathWithNpmGlobalBin,
   enrichWorkspacesWithGithub: () => enrichWorkspacesWithGithub,
   ensureAgentPath: () => ensureAgentPath,
+  ensureBrightsyLocalConfigFresh: () => ensureBrightsyLocalConfigFresh,
   ensureCloudCoordinator: () => ensureCloudCoordinator,
+  ensureConnectedBrightsyTeamTokens: () => ensureConnectedBrightsyTeamTokens,
   ensureGhPreferOrigin: () => ensureGhPreferOrigin,
   ensureGlobalCoordinatorCwd: () => ensureGlobalCoordinatorCwd,
   ensureReviewRequestFile: () => ensureReviewRequestFile,
@@ -18735,6 +18980,7 @@ __export(index_exports, {
   readWorktreeInclude: () => readWorktreeInclude,
   recordScheduleRun: () => recordScheduleRun,
   recordSlackOutboundWatch: () => recordSlackOutboundWatch,
+  refreshBrightsyAccessToken: () => refreshBrightsyAccessToken,
   refreshGitHubAuth: () => refreshGitHubAuth,
   registerPackagedUserMcpClients: () => registerPackagedUserMcpClients,
   releaseCaffeinateHoldForThread: () => releaseCaffeinateHoldForThread,
@@ -18965,37 +19211,14 @@ async function refreshGitHubAuth() {
   return getGitHubStatus();
 }
 
-// src/http/fetch.ts
-var injected = null;
-function setHttpFetchImpl(fetchImpl) {
-  injected = fetchImpl;
-}
-function formatFetchError(err, url) {
-  if (!(err instanceof Error)) return `${String(err)} (${url})`;
-  const cause = err.cause;
-  let detail = "";
-  if (cause instanceof Error) {
-    const code = typeof cause.code === "string" ? cause.code : void 0;
-    detail = code ? ` [${code}: ${cause.message}]` : ` [${cause.message}]`;
-  } else if (cause != null) {
-    detail = ` [${String(cause)}]`;
-  }
-  return `${err.message}${detail} (${url})`;
-}
-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);
-  } catch (err) {
-    throw new Error(formatFetchError(err, url));
-  }
-}
+// src/integrations/linear.ts
+init_fetch();
 
 // src/integrations/linear-oauth.ts
 var import_node_crypto9 = require("crypto");
 var import_node_http = require("http");
 init_app_settings();
+init_fetch();
 
 // src/integrations/linear-app.ts
 var BAKED_LINEAR_CLIENT_ID = "39a15abc7ea5bea17c47f47f85ff5fd0";
@@ -19011,7 +19234,7 @@ var LINEAR_TOKEN = "https://api.linear.app/oauth/token";
 var LINEAR_REVOKE = "https://api.linear.app/oauth/revoke";
 var LINEAR_GRAPHQL = "https://api.linear.app/graphql";
 var LINEAR_OAUTH_SCOPES = "read,write";
-var REFRESH_SKEW_MS = 5 * 6e4;
+var REFRESH_SKEW_MS2 = 5 * 6e4;
 function linearOAuthCredentials() {
   const settings = loadAppSettings();
   const clientId = process.env.SIDEBOARD_LINEAR_CLIENT_ID?.trim() || settings.integrations.linearClientId?.trim() || BAKED_LINEAR_CLIENT_ID.trim();
@@ -19122,7 +19345,7 @@ async function getLinearAuthToken(settings = loadAppSettings()) {
   const refresh = settings.integrations.linearRefreshToken?.trim() || "";
   const expiresAt = settings.integrations.linearTokenExpiresAt ?? 0;
   const apiKey = settings.integrations.linearApiKey?.trim() || "";
-  if (access && (!refresh || Date.now() < expiresAt - REFRESH_SKEW_MS)) {
+  if (access && (!refresh || Date.now() < expiresAt - REFRESH_SKEW_MS2)) {
     return access;
   }
   if (refresh) {
@@ -19705,6 +19928,7 @@ async function listIssues(repoPath) {
 }
 
 // src/index.ts
+init_fetch();
 init_agents();
 init_spawn();
 init_message_parts();
@@ -22278,7 +22502,9 @@ init_home_board();
 init_config();
 
 // src/brightsy/api.ts
+init_fetch();
 init_config();
+init_oauth();
 var formatBrightsyFetchError = formatFetchError;
 var BrightsySideboardApi = class {
   cfg;
@@ -22301,7 +22527,7 @@ var BrightsySideboardApi = class {
     return (this.cfg.endpoint || "https://brightsy.ai").replace(/\/$/, "");
   }
   async request(path2, init = {}) {
-    await this.refreshIfNeeded();
+    await this.ensureFreshAccessToken();
     const url = `${this.endpoint}${path2}`;
     const headers = {
       Authorization: `Bearer ${this.cfg.access_token}`,
@@ -22324,33 +22550,21 @@ var BrightsySideboardApi = class {
     }
     return await res.json();
   }
-  async refreshIfNeeded() {
-    const expiresAt = this.cfg.expires_at ?? 0;
-    if (!this.cfg.refresh_token || Date.now() < expiresAt - 6e4) return;
-    const clientId = this.cfg.oauth_client_id || "brightsy-cli";
-    const url = `${this.endpoint}/oauth/token`;
-    let res;
-    try {
-      res = await this.fetchImpl(url, {
-        method: "POST",
-        headers: { "Content-Type": "application/x-www-form-urlencoded" },
-        body: new URLSearchParams({
-          grant_type: "refresh_token",
-          refresh_token: this.cfg.refresh_token,
-          client_id: clientId
-        })
-      });
-    } catch (err) {
-      throw new Error(formatBrightsyFetchError(err, url));
-    }
-    if (!res.ok) return;
-    const data = await res.json();
-    if (!data.access_token) return;
-    this.cfg.access_token = data.access_token;
-    if (data.refresh_token) this.cfg.refresh_token = data.refresh_token;
-    if (data.expires_in) {
-      this.cfg.expires_at = Date.now() + data.expires_in * 1e3;
+  /** Refresh ~/.brightsy when the access token is stale or has no expiry. */
+  async ensureFreshAccessToken() {
+    if (!this.cfg.refresh_token || !brightsyAccessTokenNeedsRefresh(this.cfg.expires_at)) {
+      return;
     }
+    const grant = await refreshBrightsyAccessToken({
+      endpoint: this.endpoint,
+      refreshToken: this.cfg.refresh_token,
+      clientId: this.cfg.oauth_client_id,
+      fetchImpl: this.fetchImpl
+    });
+    if (!grant) return;
+    this.cfg.access_token = grant.access_token;
+    if (grant.refresh_token) this.cfg.refresh_token = grant.refresh_token;
+    if (grant.expires_at) this.cfg.expires_at = grant.expires_at;
     saveBrightsyConfig(this.cfg);
   }
   async getAccess() {
@@ -22604,6 +22818,7 @@ async function runCloudConnect(opts) {
 // src/index.ts
 init_accounts();
 init_connected_teams();
+init_oauth();
 init_injected_mcp();
 
 // src/agents/user-mcp-config.ts
@@ -24620,6 +24835,7 @@ init_outbound_watch();
   CONTEXT_MIN_MESSAGES,
   CONVENTION_SETUP_RELPATHS,
   COORDINATOR_TOOL_PLAYBOOK,
+  DEFAULT_WORKTREE_SORT,
   FAMOUS_SOCCER_TEAMS,
   GITHUB_GIT_AUTH_MODES,
   GLOBAL_WORKSPACE_ID,
@@ -24701,6 +24917,7 @@ init_outbound_watch();
   autoRenameBranchEnabled,
   autoRunAfterSetupEnabled,
   branchDisplayLabel,
+  brightsyAccessTokenNeedsRefresh,
   brightsyAdapter,
   brightsyCloudConnectAgent,
   brightsyCloudConnectEnabled,
@@ -24787,7 +25004,9 @@ init_outbound_watch();
   enrichPathWithNpmGlobalBin,
   enrichWorkspacesWithGithub,
   ensureAgentPath,
+  ensureBrightsyLocalConfigFresh,
   ensureCloudCoordinator,
+  ensureConnectedBrightsyTeamTokens,
   ensureGhPreferOrigin,
   ensureGlobalCoordinatorCwd,
   ensureReviewRequestFile,
@@ -25050,6 +25269,7 @@ init_outbound_watch();
   readWorktreeInclude,
   recordScheduleRun,
   recordSlackOutboundWatch,
+  refreshBrightsyAccessToken,
   refreshGitHubAuth,
   registerPackagedUserMcpClients,
   releaseCaffeinateHoldForThread,