@sideboard-ai/core 0.1.312 → 0.1.313

package/dist/{agents-XDI6QHBA.js → agents-OHIE3Z7L.js}

@@ -46,7 +46,7 @@ import {
   resolveCursorSdkRoot,
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage
-} from "./chunk-2P2HYXA2.js";
+} from "./chunk-2JOBQUUS.js";
 import {
   getAgentSetupInfo,
   installAgent,
@@ -59,8 +59,8 @@ import {
   resolveLoginCommand,
   whichOnPath
 } from "./chunk-EGTCXNQM.js";
-import "./chunk-42JGPPVS.js";
-import "./chunk-PXMLMBMI.js";
+import "./chunk-V5BTGQ6M.js";
+import "./chunk-E63AM3PW.js";
 import "./chunk-2GPQZZLY.js";
 import "./chunk-I5TESHDN.js";
 import "./chunk-X3FSWWW2.js";

package/dist/{agents-IOJRGGK3.js → agents-PSNWJMEC.js}

@@ -37,8 +37,8 @@ import {
   planModeTurnInstruction,
   resolveCursorModelId,
   resolveQuotaFallbackAgent
-} from "./chunk-4FZUUH6W.js";
-import "./chunk-VEVFHO6K.js";
+} from "./chunk-TDXORDN6.js";
+import "./chunk-HH3VVTEC.js";
 import "./chunk-7Q327QF2.js";
 import {
   getAgentSetupInfo,
@@ -56,7 +56,7 @@ import "./chunk-5QX2NYXL.js";
 import "./chunk-BIPXOHZI.js";
 import "./chunk-HG25AYBV.js";
 import "./chunk-2P4XKWV2.js";
-import "./chunk-33KDPEK4.js";
+import "./chunk-RSA47QYR.js";
 import "./chunk-JAT3JFOS.js";
 import "./chunk-F2PVRF3B.js";
 import {

package/dist/{chunk-2P2HYXA2.js → chunk-2JOBQUUS.js}

@@ -5,10 +5,10 @@ import {
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-42JGPPVS.js";
+} from "./chunk-V5BTGQ6M.js";
 import {
   loadBrightsyConfig
-} from "./chunk-PXMLMBMI.js";
+} from "./chunk-E63AM3PW.js";
 import {
   httpFetch
 } from "./chunk-2GPQZZLY.js";

package/dist/{chunk-LLTWP4PK.js → chunk-E2NJ6RH7.js}

@@ -27,7 +27,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-2P2HYXA2.js";
+} from "./chunk-2JOBQUUS.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -6438,7 +6438,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-S44BMNN7.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-RRHB7RNN.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),

package/dist/{chunk-PXMLMBMI.js → chunk-E63AM3PW.js}

@@ -5,27 +5,50 @@ import {
 } from "./chunk-2GPQZZLY.js";
 
 // src/brightsy/config.ts
-import { existsSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { dirname, join } from "path";
+function resolveBrightsyConfigFile(path) {
+  try {
+    if (existsSync(path) && statSync(path).isDirectory()) {
+      return join(path, "config.json");
+    }
+  } catch {
+  }
+  return path;
+}
 function brightsyConfigPath() {
   const override = process.env.BRIGHTSY_CONFIG?.trim();
-  if (override) return override;
-  return join(homedir(), ".brightsy", "config.json");
+  const raw = override || join(homedir(), ".brightsy", "config.json");
+  return resolveBrightsyConfigFile(raw);
 }
 function loadBrightsyConfig() {
   const path = brightsyConfigPath();
   if (!existsSync(path)) {
     throw new Error("Brightsy not logged in \u2014 run `brightsy login` first");
   }
-  const raw = JSON.parse(readFileSync(path, "utf8"));
+  let text;
+  try {
+    text = readFileSync(path, "utf8");
+  } catch (err) {
+    const code = err && typeof err === "object" && "code" in err ? String(err.code) : "";
+    if (code === "EISDIR") {
+      throw new Error(
+        `Brightsy config is a directory (${path}) \u2014 expected ~/.brightsy/config.json`
+      );
+    }
+    throw err;
+  }
+  const raw = JSON.parse(text);
   if (!raw.access_token || !raw.account_id) {
     throw new Error("Brightsy config incomplete \u2014 run `brightsy login`");
   }
   return raw;
 }
 function saveBrightsyConfig(cfg) {
-  writeFileSync(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
+  const path = brightsyConfigPath();
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(cfg, null, 2)}
 `, {
     mode: 384
   });

package/dist/{chunk-VEVFHO6K.js → chunk-HH3VVTEC.js}

@@ -5,7 +5,7 @@ import {
   loadBrightsyConfig,
   refreshBrightsyAccessToken,
   saveBrightsyConfig
-} from "./chunk-33KDPEK4.js";
+} from "./chunk-RSA47QYR.js";
 import {
   run
 } from "./chunk-QVN2WOKJ.js";
@@ -19,7 +19,7 @@ import { join } from "path";
 
 // src/brightsy/accounts.ts
 async function loadConnectedTeams() {
-  const { listConnectedBrightsyTeams: listConnectedBrightsyTeams2 } = await import("./connected-teams-BBNYTR3I.js");
+  const { listConnectedBrightsyTeams: listConnectedBrightsyTeams2 } = await import("./connected-teams-IHK2WXUI.js");
   return listConnectedBrightsyTeams2();
 }
 async function runBrightsyTeamsJson(args) {
@@ -47,15 +47,15 @@ async function listBrightsyAccounts() {
 }
 async function getBrightsySession() {
   try {
-    const { ensureBrightsyLocalConfigFresh: ensureBrightsyLocalConfigFresh2 } = await import("./oauth-DP4ZV2M2.js");
-    const { ensureConnectedBrightsyTeamTokens: ensureConnectedBrightsyTeamTokens2 } = await import("./connected-teams-BBNYTR3I.js");
+    const { ensureBrightsyLocalConfigFresh: ensureBrightsyLocalConfigFresh2 } = await import("./oauth-CR5FY4CJ.js");
+    const { ensureConnectedBrightsyTeamTokens: ensureConnectedBrightsyTeamTokens2 } = await import("./connected-teams-IHK2WXUI.js");
     await ensureBrightsyLocalConfigFresh2();
     await ensureConnectedBrightsyTeamTokens2();
     loadBrightsyConfig();
     const data = await runBrightsyTeamsJson([]);
     const accounts = Array.isArray(data.teams) ? data.teams : [];
     const active = data.active ?? accounts.find((a) => a.active) ?? null;
-    const { ensureCliTeamTracked: ensureCliTeamTracked2 } = await import("./connected-teams-BBNYTR3I.js");
+    const { ensureCliTeamTracked: ensureCliTeamTracked2 } = await import("./connected-teams-IHK2WXUI.js");
     const connectedTeams = ensureCliTeamTracked2(
       active ? { id: active.id, slug: active.slug, name: active.name } : void 0
     );
@@ -95,7 +95,7 @@ async function performBrightsyAccountSwitch(accountIdOrSlug) {
   return { cfg, target: data.active };
 }
 async function switchBrightsyAccount(accountIdOrSlug) {
-  const { connectBrightsyTeam: connectBrightsyTeam2 } = await import("./connected-teams-BBNYTR3I.js");
+  const { connectBrightsyTeam: connectBrightsyTeam2 } = await import("./connected-teams-IHK2WXUI.js");
   await connectBrightsyTeam2(accountIdOrSlug);
   return getBrightsySession();
 }
@@ -134,6 +134,25 @@ function listConnectedBrightsyTeams() {
 function getConnectedBrightsyTeamsRaw() {
   return readStore();
 }
+function teamFromCliSession(cfg, current) {
+  return {
+    ...current,
+    access_token: cfg.access_token,
+    refresh_token: cfg.refresh_token ?? current.refresh_token,
+    expires_at: cfg.expires_at ?? current.expires_at,
+    endpoint: cfg.endpoint ?? current.endpoint,
+    oauth_client_id: cfg.oauth_client_id ?? current.oauth_client_id,
+    slug: cfg.account_slug || current.slug
+  };
+}
+function brightsySessionShouldReplace(a, b) {
+  if (!a.access_token) return false;
+  const aStale = brightsyAccessTokenNeedsRefresh(a.expires_at);
+  const bStale = !b.access_token || brightsyAccessTokenNeedsRefresh(b.expires_at);
+  if (!aStale && bStale) return true;
+  if (aStale) return false;
+  return (a.expires_at ?? 0) > (b.expires_at ?? 0);
+}
 function applyConnectedTeamToCli(team) {
   let base = {};
   try {
@@ -220,22 +239,34 @@ async function ensureConnectedBrightsyTeamTokens(opts) {
     }
     next.push(refreshed);
   }
-  if (changed) writeStore(next);
   try {
     const cfg2 = loadBrightsyConfig();
-    const active = next.find((t) => t.id === cfg2.account_id);
-    if (active && active.access_token !== cfg2.access_token) {
-      applyConnectedTeamToCli(active);
+    const idx = next.findIndex((t) => t.id === cfg2.account_id);
+    if (idx >= 0) {
+      const active = next[idx];
+      if (brightsySessionShouldReplace(cfg2, active)) {
+        next[idx] = teamFromCliSession(cfg2, active);
+        changed = true;
+      } else if (active.access_token !== cfg2.access_token) {
+        applyConnectedTeamToCli(active);
+      }
     }
   } catch {
   }
+  if (changed) writeStore(next);
   return next;
 }
 function ensureCliTeamTracked(meta) {
   try {
     const cfg = loadBrightsyConfig();
     const existing = readStore();
-    if (existing.some((t) => t.id === cfg.account_id)) {
+    const idx = existing.findIndex((t) => t.id === cfg.account_id);
+    if (idx >= 0) {
+      const current = existing[idx];
+      if (brightsySessionShouldReplace(cfg, current)) {
+        existing[idx] = teamFromCliSession(cfg, current);
+        writeStore(existing);
+      }
       return listConnectedBrightsyTeams();
     }
     const team = {
@@ -312,6 +343,7 @@ export {
   switchBrightsyAccount,
   listConnectedBrightsyTeams,
   getConnectedBrightsyTeamsRaw,
+  brightsySessionShouldReplace,
   applyConnectedTeamToCli,
   ensureConnectedBrightsyTeamTokens,
   ensureCliTeamTracked,

package/dist/{chunk-33KDPEK4.js → chunk-RSA47QYR.js}

@@ -3,27 +3,50 @@ import {
 } from "./chunk-JAT3JFOS.js";
 
 // src/brightsy/config.ts
-import { existsSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { dirname, join } from "path";
+function resolveBrightsyConfigFile(path) {
+  try {
+    if (existsSync(path) && statSync(path).isDirectory()) {
+      return join(path, "config.json");
+    }
+  } catch {
+  }
+  return path;
+}
 function brightsyConfigPath() {
   const override = process.env.BRIGHTSY_CONFIG?.trim();
-  if (override) return override;
-  return join(homedir(), ".brightsy", "config.json");
+  const raw = override || join(homedir(), ".brightsy", "config.json");
+  return resolveBrightsyConfigFile(raw);
 }
 function loadBrightsyConfig() {
   const path = brightsyConfigPath();
   if (!existsSync(path)) {
     throw new Error("Brightsy not logged in \u2014 run `brightsy login` first");
   }
-  const raw = JSON.parse(readFileSync(path, "utf8"));
+  let text;
+  try {
+    text = readFileSync(path, "utf8");
+  } catch (err) {
+    const code = err && typeof err === "object" && "code" in err ? String(err.code) : "";
+    if (code === "EISDIR") {
+      throw new Error(
+        `Brightsy config is a directory (${path}) \u2014 expected ~/.brightsy/config.json`
+      );
+    }
+    throw err;
+  }
+  const raw = JSON.parse(text);
   if (!raw.access_token || !raw.account_id) {
     throw new Error("Brightsy config incomplete \u2014 run `brightsy login`");
   }
   return raw;
 }
 function saveBrightsyConfig(cfg) {
-  writeFileSync(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
+  const path = brightsyConfigPath();
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(cfg, null, 2)}
 `, {
     mode: 384
   });

package/dist/{chunk-4FZUUH6W.js → chunk-TDXORDN6.js}

@@ -3,7 +3,7 @@ import {
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-VEVFHO6K.js";
+} from "./chunk-HH3VVTEC.js";
 import {
   looksLikeConversationSummary,
   looksLikeSkillBody,
@@ -21,7 +21,7 @@ import {
 } from "./chunk-BIPXOHZI.js";
 import {
   loadBrightsyConfig
-} from "./chunk-33KDPEK4.js";
+} from "./chunk-RSA47QYR.js";
 import {
   httpFetch
 } from "./chunk-JAT3JFOS.js";

package/dist/{chunk-VIVXKN5N.js → chunk-U3J2YY4T.js}

@@ -14,7 +14,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-4FZUUH6W.js";
+} from "./chunk-TDXORDN6.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -3080,7 +3080,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-IOJRGGK3.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-PSNWJMEC.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -6795,7 +6795,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-BYTSILLH.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-BF7TKSA2.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),

package/dist/{chunk-42JGPPVS.js → chunk-V5BTGQ6M.js}

@@ -7,7 +7,7 @@ import {
   loadBrightsyConfig,
   refreshBrightsyAccessToken,
   saveBrightsyConfig
-} from "./chunk-PXMLMBMI.js";
+} from "./chunk-E63AM3PW.js";
 import {
   run
 } from "./chunk-2UG25RMK.js";
@@ -93,6 +93,25 @@ function listConnectedBrightsyTeams() {
 function getConnectedBrightsyTeamsRaw() {
   return readStore();
 }
+function teamFromCliSession(cfg, current) {
+  return {
+    ...current,
+    access_token: cfg.access_token,
+    refresh_token: cfg.refresh_token ?? current.refresh_token,
+    expires_at: cfg.expires_at ?? current.expires_at,
+    endpoint: cfg.endpoint ?? current.endpoint,
+    oauth_client_id: cfg.oauth_client_id ?? current.oauth_client_id,
+    slug: cfg.account_slug || current.slug
+  };
+}
+function brightsySessionShouldReplace(a, b) {
+  if (!a.access_token) return false;
+  const aStale = brightsyAccessTokenNeedsRefresh(a.expires_at);
+  const bStale = !b.access_token || brightsyAccessTokenNeedsRefresh(b.expires_at);
+  if (!aStale && bStale) return true;
+  if (aStale) return false;
+  return (a.expires_at ?? 0) > (b.expires_at ?? 0);
+}
 function applyConnectedTeamToCli(team) {
   let base = {};
   try {
@@ -179,22 +198,34 @@ async function ensureConnectedBrightsyTeamTokens(opts) {
     }
     next.push(refreshed);
   }
-  if (changed) writeStore(next);
   try {
     const cfg2 = loadBrightsyConfig();
-    const active = next.find((t) => t.id === cfg2.account_id);
-    if (active && active.access_token !== cfg2.access_token) {
-      applyConnectedTeamToCli(active);
+    const idx = next.findIndex((t) => t.id === cfg2.account_id);
+    if (idx >= 0) {
+      const active = next[idx];
+      if (brightsySessionShouldReplace(cfg2, active)) {
+        next[idx] = teamFromCliSession(cfg2, active);
+        changed = true;
+      } else if (active.access_token !== cfg2.access_token) {
+        applyConnectedTeamToCli(active);
+      }
     }
   } catch {
   }
+  if (changed) writeStore(next);
   return next;
 }
 function ensureCliTeamTracked(meta) {
   try {
     const cfg = loadBrightsyConfig();
     const existing = readStore();
-    if (existing.some((t) => t.id === cfg.account_id)) {
+    const idx = existing.findIndex((t) => t.id === cfg.account_id);
+    if (idx >= 0) {
+      const current = existing[idx];
+      if (brightsySessionShouldReplace(cfg, current)) {
+        existing[idx] = teamFromCliSession(cfg, current);
+        writeStore(existing);
+      }
       return listConnectedBrightsyTeams();
     }
     const team = {
@@ -268,6 +299,7 @@ function brightsyMcpServerName(slug) {
 export {
   listConnectedBrightsyTeams,
   getConnectedBrightsyTeamsRaw,
+  brightsySessionShouldReplace,
   applyConnectedTeamToCli,
   ensureConnectedBrightsyTeamTokens,
   ensureCliTeamTracked,

package/dist/{connected-teams-WLWIVYGD.js → connected-teams-IFW3NQ6G.js}

@@ -3,14 +3,15 @@
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
+  brightsySessionShouldReplace,
   connectBrightsyTeam,
   disconnectBrightsyTeam,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens,
   getConnectedBrightsyTeamsRaw,
   listConnectedBrightsyTeams
-} from "./chunk-42JGPPVS.js";
-import "./chunk-PXMLMBMI.js";
+} from "./chunk-V5BTGQ6M.js";
+import "./chunk-E63AM3PW.js";
 import "./chunk-2GPQZZLY.js";
 import "./chunk-2UG25RMK.js";
 import "./chunk-WWUABK6B.js";
@@ -18,6 +19,7 @@ import "./chunk-WOU343SI.js";
 export {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
+  brightsySessionShouldReplace,
   connectBrightsyTeam,
   disconnectBrightsyTeam,
   ensureCliTeamTracked,

package/dist/{connected-teams-BBNYTR3I.js → connected-teams-IHK2WXUI.js}

@@ -1,14 +1,15 @@
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
+  brightsySessionShouldReplace,
   connectBrightsyTeam,
   disconnectBrightsyTeam,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens,
   getConnectedBrightsyTeamsRaw,
   listConnectedBrightsyTeams
-} from "./chunk-VEVFHO6K.js";
-import "./chunk-33KDPEK4.js";
+} from "./chunk-HH3VVTEC.js";
+import "./chunk-RSA47QYR.js";
 import "./chunk-JAT3JFOS.js";
 import "./chunk-QVN2WOKJ.js";
 import "./chunk-4TR3HZFT.js";
@@ -16,6 +17,7 @@ import "./chunk-H4UEFJRI.js";
 export {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
+  brightsySessionShouldReplace,
   connectBrightsyTeam,
   disconnectBrightsyTeam,
   ensureCliTeamTracked,

package/dist/index.cjs

@@ -12769,24 +12769,47 @@ var init_turn_trace = __esm({
 });
 
 // src/brightsy/config.ts
+function resolveBrightsyConfigFile(path2) {
+  try {
+    if ((0, import_node_fs27.existsSync)(path2) && (0, import_node_fs27.statSync)(path2).isDirectory()) {
+      return (0, import_node_path31.join)(path2, "config.json");
+    }
+  } catch {
+  }
+  return path2;
+}
 function brightsyConfigPath() {
   const override = process.env.BRIGHTSY_CONFIG?.trim();
-  if (override) return override;
-  return (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".brightsy", "config.json");
+  const raw = override || (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".brightsy", "config.json");
+  return resolveBrightsyConfigFile(raw);
 }
 function loadBrightsyConfig() {
   const path2 = brightsyConfigPath();
   if (!(0, import_node_fs27.existsSync)(path2)) {
     throw new Error("Brightsy not logged in \u2014 run `brightsy login` first");
   }
-  const raw = JSON.parse((0, import_node_fs27.readFileSync)(path2, "utf8"));
+  let text7;
+  try {
+    text7 = (0, import_node_fs27.readFileSync)(path2, "utf8");
+  } catch (err) {
+    const code = err && typeof err === "object" && "code" in err ? String(err.code) : "";
+    if (code === "EISDIR") {
+      throw new Error(
+        `Brightsy config is a directory (${path2}) \u2014 expected ~/.brightsy/config.json`
+      );
+    }
+    throw err;
+  }
+  const raw = JSON.parse(text7);
   if (!raw.access_token || !raw.account_id) {
     throw new Error("Brightsy config incomplete \u2014 run `brightsy login`");
   }
   return raw;
 }
 function saveBrightsyConfig(cfg) {
-  (0, import_node_fs27.writeFileSync)(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
+  const path2 = brightsyConfigPath();
+  (0, import_node_fs27.mkdirSync)((0, import_node_path31.dirname)(path2), { recursive: true });
+  (0, import_node_fs27.writeFileSync)(path2, `${JSON.stringify(cfg, null, 2)}
 `, {
     mode: 384
   });
@@ -13110,6 +13133,7 @@ var connected_teams_exports = {};
 __export(connected_teams_exports, {
   applyConnectedTeamToCli: () => applyConnectedTeamToCli,
   brightsyMcpServerName: () => brightsyMcpServerName,
+  brightsySessionShouldReplace: () => brightsySessionShouldReplace,
   connectBrightsyTeam: () => connectBrightsyTeam,
   disconnectBrightsyTeam: () => disconnectBrightsyTeam,
   ensureCliTeamTracked: () => ensureCliTeamTracked,
@@ -13150,6 +13174,25 @@ function listConnectedBrightsyTeams() {
 function getConnectedBrightsyTeamsRaw() {
   return readStore();
 }
+function teamFromCliSession(cfg, current) {
+  return {
+    ...current,
+    access_token: cfg.access_token,
+    refresh_token: cfg.refresh_token ?? current.refresh_token,
+    expires_at: cfg.expires_at ?? current.expires_at,
+    endpoint: cfg.endpoint ?? current.endpoint,
+    oauth_client_id: cfg.oauth_client_id ?? current.oauth_client_id,
+    slug: cfg.account_slug || current.slug
+  };
+}
+function brightsySessionShouldReplace(a, b) {
+  if (!a.access_token) return false;
+  const aStale = brightsyAccessTokenNeedsRefresh(a.expires_at);
+  const bStale = !b.access_token || brightsyAccessTokenNeedsRefresh(b.expires_at);
+  if (!aStale && bStale) return true;
+  if (aStale) return false;
+  return (a.expires_at ?? 0) > (b.expires_at ?? 0);
+}
 function applyConnectedTeamToCli(team) {
   let base = {};
   try {
@@ -13236,22 +13279,34 @@ async function ensureConnectedBrightsyTeamTokens(opts) {
     }
     next.push(refreshed);
   }
-  if (changed) writeStore(next);
   try {
     const cfg2 = loadBrightsyConfig();
-    const active = next.find((t) => t.id === cfg2.account_id);
-    if (active && active.access_token !== cfg2.access_token) {
-      applyConnectedTeamToCli(active);
+    const idx = next.findIndex((t) => t.id === cfg2.account_id);
+    if (idx >= 0) {
+      const active = next[idx];
+      if (brightsySessionShouldReplace(cfg2, active)) {
+        next[idx] = teamFromCliSession(cfg2, active);
+        changed = true;
+      } else if (active.access_token !== cfg2.access_token) {
+        applyConnectedTeamToCli(active);
+      }
     }
   } catch {
   }
+  if (changed) writeStore(next);
   return next;
 }
 function ensureCliTeamTracked(meta) {
   try {
     const cfg = loadBrightsyConfig();
     const existing = readStore();
-    if (existing.some((t) => t.id === cfg.account_id)) {
+    const idx = existing.findIndex((t) => t.id === cfg.account_id);
+    if (idx >= 0) {
+      const current = existing[idx];
+      if (brightsySessionShouldReplace(cfg, current)) {
+        existing[idx] = teamFromCliSession(cfg, current);
+        writeStore(existing);
+      }
       return listConnectedBrightsyTeams();
     }
     const team = {

package/dist/index.js

@@ -202,7 +202,7 @@ import {
   worktreeCleanupSettings,
   writeAgentBlock,
   writeWorktreeFile
-} from "./chunk-VIVXKN5N.js";
+} from "./chunk-U3J2YY4T.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -292,7 +292,7 @@ import {
   userMcpNamesToDisable,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-4FZUUH6W.js";
+} from "./chunk-TDXORDN6.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -302,7 +302,7 @@ import {
   listBrightsyAccounts,
   listConnectedBrightsyTeams,
   switchBrightsyAccount
-} from "./chunk-VEVFHO6K.js";
+} from "./chunk-HH3VVTEC.js";
 import {
   BRIGHTSY_SUMMARIZE_CONTEXT_TOOL,
   CHARS_PER_CONTEXT_TOKEN,
@@ -758,7 +758,7 @@ import {
   refreshBrightsyAccessToken,
   registerBrightsyOAuthClient,
   saveBrightsyConfig
-} from "./chunk-33KDPEK4.js";
+} from "./chunk-RSA47QYR.js";
 import {
   currentHttpFetch,
   formatFetchError,
@@ -8727,7 +8727,7 @@ async function startHeadlessHost(opts) {
   };
   const refreshRunning = async () => {
     try {
-      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BYTSILLH.js");
+      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BF7TKSA2.js");
       agentsRunning = getOrchestrator2().getRuntime().running;
     } catch {
       agentsRunning = 0;
@@ -10659,7 +10659,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-BYTSILLH.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BF7TKSA2.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -14035,7 +14035,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BYTSILLH.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-BF7TKSA2.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }

package/dist/mcp/run-stdio.cjs

@@ -10516,24 +10516,47 @@ var init_turn_trace = __esm({
 });
 
 // src/brightsy/config.ts
+function resolveBrightsyConfigFile(path) {
+  try {
+    if ((0, import_node_fs23.existsSync)(path) && (0, import_node_fs23.statSync)(path).isDirectory()) {
+      return (0, import_node_path26.join)(path, "config.json");
+    }
+  } catch {
+  }
+  return path;
+}
 function brightsyConfigPath() {
   const override = process.env.BRIGHTSY_CONFIG?.trim();
-  if (override) return override;
-  return (0, import_node_path26.join)((0, import_node_os9.homedir)(), ".brightsy", "config.json");
+  const raw = override || (0, import_node_path26.join)((0, import_node_os9.homedir)(), ".brightsy", "config.json");
+  return resolveBrightsyConfigFile(raw);
 }
 function loadBrightsyConfig() {
   const path = brightsyConfigPath();
   if (!(0, import_node_fs23.existsSync)(path)) {
     throw new Error("Brightsy not logged in \u2014 run `brightsy login` first");
   }
-  const raw = JSON.parse((0, import_node_fs23.readFileSync)(path, "utf8"));
+  let text7;
+  try {
+    text7 = (0, import_node_fs23.readFileSync)(path, "utf8");
+  } catch (err) {
+    const code = err && typeof err === "object" && "code" in err ? String(err.code) : "";
+    if (code === "EISDIR") {
+      throw new Error(
+        `Brightsy config is a directory (${path}) \u2014 expected ~/.brightsy/config.json`
+      );
+    }
+    throw err;
+  }
+  const raw = JSON.parse(text7);
   if (!raw.access_token || !raw.account_id) {
     throw new Error("Brightsy config incomplete \u2014 run `brightsy login`");
   }
   return raw;
 }
 function saveBrightsyConfig(cfg) {
-  (0, import_node_fs23.writeFileSync)(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
+  const path = brightsyConfigPath();
+  (0, import_node_fs23.mkdirSync)((0, import_node_path26.dirname)(path), { recursive: true });
+  (0, import_node_fs23.writeFileSync)(path, `${JSON.stringify(cfg, null, 2)}
 `, {
     mode: 384
   });
@@ -10788,6 +10811,25 @@ function listConnectedBrightsyTeams() {
     expires_at
   }));
 }
+function teamFromCliSession(cfg, current) {
+  return {
+    ...current,
+    access_token: cfg.access_token,
+    refresh_token: cfg.refresh_token ?? current.refresh_token,
+    expires_at: cfg.expires_at ?? current.expires_at,
+    endpoint: cfg.endpoint ?? current.endpoint,
+    oauth_client_id: cfg.oauth_client_id ?? current.oauth_client_id,
+    slug: cfg.account_slug || current.slug
+  };
+}
+function brightsySessionShouldReplace(a, b) {
+  if (!a.access_token) return false;
+  const aStale = brightsyAccessTokenNeedsRefresh(a.expires_at);
+  const bStale = !b.access_token || brightsyAccessTokenNeedsRefresh(b.expires_at);
+  if (!aStale && bStale) return true;
+  if (aStale) return false;
+  return (a.expires_at ?? 0) > (b.expires_at ?? 0);
+}
 function applyConnectedTeamToCli(team) {
   let base = {};
   try {
@@ -10874,22 +10916,34 @@ async function ensureConnectedBrightsyTeamTokens(opts) {
     }
     next.push(refreshed);
   }
-  if (changed) writeStore(next);
   try {
     const cfg2 = loadBrightsyConfig();
-    const active = next.find((t) => t.id === cfg2.account_id);
-    if (active && active.access_token !== cfg2.access_token) {
-      applyConnectedTeamToCli(active);
+    const idx = next.findIndex((t) => t.id === cfg2.account_id);
+    if (idx >= 0) {
+      const active = next[idx];
+      if (brightsySessionShouldReplace(cfg2, active)) {
+        next[idx] = teamFromCliSession(cfg2, active);
+        changed = true;
+      } else if (active.access_token !== cfg2.access_token) {
+        applyConnectedTeamToCli(active);
+      }
     }
   } catch {
   }
+  if (changed) writeStore(next);
   return next;
 }
 function ensureCliTeamTracked(meta) {
   try {
     const cfg = loadBrightsyConfig();
     const existing = readStore();
-    if (existing.some((t) => t.id === cfg.account_id)) {
+    const idx = existing.findIndex((t) => t.id === cfg.account_id);
+    if (idx >= 0) {
+      const current = existing[idx];
+      if (brightsySessionShouldReplace(cfg, current)) {
+        existing[idx] = teamFromCliSession(cfg, current);
+        writeStore(existing);
+      }
       return listConnectedBrightsyTeams();
     }
     const team = {

package/dist/mcp/run-stdio.js

@@ -56,7 +56,7 @@ import {
   updateSchedule,
   workspaceTagTargetRef,
   writeAgentBlock
-} from "../chunk-LLTWP4PK.js";
+} from "../chunk-E2NJ6RH7.js";
 import "../chunk-LX5R5JOR.js";
 import {
   commentAbleTimeTask,
@@ -97,10 +97,10 @@ import {
   shouldRegisterMcpWaitForTurn,
   sideboardMcpProfile,
   worktreeMcpToolNames
-} from "../chunk-2P2HYXA2.js";
+} from "../chunk-2JOBQUUS.js";
 import "../chunk-EGTCXNQM.js";
-import "../chunk-42JGPPVS.js";
-import "../chunk-PXMLMBMI.js";
+import "../chunk-V5BTGQ6M.js";
+import "../chunk-E63AM3PW.js";
 import {
   httpFetch
 } from "../chunk-2GPQZZLY.js";

package/dist/{oauth-WCUZ6Z5G.js → oauth-CI3U5ZAA.js}

@@ -9,7 +9,7 @@ import {
   normalizeBrightsyEndpoint,
   refreshBrightsyAccessToken,
   registerBrightsyOAuthClient
-} from "./chunk-PXMLMBMI.js";
+} from "./chunk-E63AM3PW.js";
 import "./chunk-2GPQZZLY.js";
 export {
   BRIGHTSY_OAUTH_CLIENT_ID,

package/dist/{oauth-DP4ZV2M2.js → oauth-CR5FY4CJ.js}

@@ -7,7 +7,7 @@ import {
   normalizeBrightsyEndpoint,
   refreshBrightsyAccessToken,
   registerBrightsyOAuthClient
-} from "./chunk-33KDPEK4.js";
+} from "./chunk-RSA47QYR.js";
 import "./chunk-JAT3JFOS.js";
 export {
   BRIGHTSY_OAUTH_CLIENT_ID,

package/dist/{orchestrator-BYTSILLH.js → orchestrator-BF7TKSA2.js}

@@ -9,10 +9,10 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-VIVXKN5N.js";
+} from "./chunk-U3J2YY4T.js";
 import "./chunk-PGPSIEMW.js";
-import "./chunk-4FZUUH6W.js";
-import "./chunk-VEVFHO6K.js";
+import "./chunk-TDXORDN6.js";
+import "./chunk-HH3VVTEC.js";
 import "./chunk-QC2TQMPJ.js";
 import "./chunk-7Q327QF2.js";
 import "./chunk-7H655NEW.js";
@@ -22,7 +22,7 @@ import "./chunk-5QX2NYXL.js";
 import "./chunk-BIPXOHZI.js";
 import "./chunk-HG25AYBV.js";
 import "./chunk-2P4XKWV2.js";
-import "./chunk-33KDPEK4.js";
+import "./chunk-RSA47QYR.js";
 import "./chunk-JAT3JFOS.js";
 import "./chunk-F2PVRF3B.js";
 import "./chunk-AXQ4ZWHK.js";

package/dist/{orchestrator-S44BMNN7.js → orchestrator-RRHB7RNN.js}

@@ -11,15 +11,15 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-LLTWP4PK.js";
+} from "./chunk-E2NJ6RH7.js";
 import "./chunk-LX5R5JOR.js";
 import "./chunk-62ESCTJ4.js";
 import "./chunk-4GK32AYX.js";
 import "./chunk-DC3VZXMA.js";
-import "./chunk-2P2HYXA2.js";
+import "./chunk-2JOBQUUS.js";
 import "./chunk-EGTCXNQM.js";
-import "./chunk-42JGPPVS.js";
-import "./chunk-PXMLMBMI.js";
+import "./chunk-V5BTGQ6M.js";
+import "./chunk-E63AM3PW.js";
 import "./chunk-2GPQZZLY.js";
 import "./chunk-ZW7RSQHY.js";
 import "./chunk-I5TESHDN.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.312",
+  "version": "0.1.313",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",