@sideboard-ai/core 0.1.218 → 0.1.220

package/dist/{agents-YABJUV3V.js → agents-6UOWJLXX.js}

@@ -44,13 +44,13 @@ import {
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
   whichOnPath
-} from "./chunk-XRHTRXZN.js";
-import "./chunk-OPYBLX4V.js";
+} from "./chunk-YG2X34EF.js";
+import "./chunk-N2VST3NL.js";
 import "./chunk-KTZESHYH.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-PO4M4JAJ.js";
-import "./chunk-IILG7DPX.js";
-import "./chunk-AN3THU7F.js";
+import "./chunk-QILV2BRW.js";
+import "./chunk-ROPGQRPU.js";
 import "./chunk-N7WZ6NIN.js";
 import {
   cursorSdkMessageToEvents,

package/dist/{agents-NWJ7DFJD.js → agents-DYSZ2JFY.js}

@@ -50,10 +50,10 @@ import {
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage,
   whichOnPath
-} from "./chunk-FSIJGLSV.js";
-import "./chunk-MW57SKKR.js";
-import "./chunk-SVXIJ2IC.js";
-import "./chunk-Y4MIXGPA.js";
+} from "./chunk-3Y4FIARC.js";
+import "./chunk-P2EAAM3H.js";
+import "./chunk-UNMMKZ4Q.js";
+import "./chunk-P2BSMNHB.js";
 import "./chunk-VKQGAWHY.js";
 import "./chunk-NFWPDEN4.js";
 import "./chunk-D6JWYJ4P.js";

package/dist/{chunk-FSIJGLSV.js → chunk-3Y4FIARC.js}

@@ -2,16 +2,16 @@
 
 import {
   isOrchestratorThread
-} from "./chunk-MW57SKKR.js";
+} from "./chunk-P2EAAM3H.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-SVXIJ2IC.js";
+} from "./chunk-UNMMKZ4Q.js";
 import {
   loadBrightsyConfig
-} from "./chunk-Y4MIXGPA.js";
+} from "./chunk-P2BSMNHB.js";
 import {
   httpFetch
 } from "./chunk-VKQGAWHY.js";
@@ -1313,6 +1313,7 @@ function teamEnv(team) {
   return {
     BRIGHTSY_API_TOKEN: team.access_token,
     ...team.refresh_token ? { BRIGHTSY_REFRESH_TOKEN: team.refresh_token } : {},
+    ...team.oauth_client_id ? { BRIGHTSY_OAUTH_CLIENT_ID: team.oauth_client_id } : {},
     BRIGHTSY_ACCOUNT_ID: team.id,
     BRIGHTSY_API_URL: endpoint
   };
@@ -1496,8 +1497,16 @@ function toOpencodeMcpConfigContent(servers, opts) {
   }
   return JSON.stringify({ mcp });
 }
-function writeMcpServersConfig(servers) {
-  if (servers.length === 0) return null;
+function stripElectronFromUserMcpEntry(entry) {
+  const next = { ...entry };
+  const env = next.env;
+  if (!env || typeof env !== "object" || Array.isArray(env)) return next;
+  const cleaned = { ...env };
+  delete cleaned.ELECTRON_RUN_AS_NODE;
+  next.env = cleaned;
+  return next;
+}
+function writeMcpServersConfig(servers, extraServers) {
   const mcpServers = {};
   for (const s of servers) {
     const env = mcpSpawnEnv(s.env);
@@ -1507,6 +1516,14 @@ function writeMcpServersConfig(servers) {
       ...env ? { env } : {}
     };
   }
+  if (extraServers) {
+    for (const [rawName, entry] of Object.entries(extraServers)) {
+      const name = rawName.trim();
+      if (!name || mcpServers[name] || !entry) continue;
+      mcpServers[name] = stripElectronFromUserMcpEntry(entry);
+    }
+  }
+  if (Object.keys(mcpServers).length === 0) return null;
   const dir = mkdtempSync(join4(tmpdir(), "sideboard-mcp-"));
   const cfgPath = join4(dir, "mcp.json");
   writeFileSync2(cfgPath, JSON.stringify({ mcpServers }, null, 2));
@@ -1593,10 +1610,20 @@ function listUserOpencodeMcpNames(home = homedir3()) {
   }
   return names;
 }
-function listUserClaudeMcpNames(home = homedir3()) {
+function userClaudeMcpConfigObject(home = homedir3()) {
   const claudePath = home === homedir3() ? userClaudeMcpConfigPath() : join6(home, ".claude.json");
-  if (!existsSync7(claudePath)) return [];
-  return listMcpNamesFromJsonMap(readJsonObject(claudePath), "mcpServers");
+  if (!existsSync7(claudePath)) return {};
+  return asObject(asObject(readJsonObject(claudePath)).mcpServers);
+}
+function listUserClaudeMcpServerEntries(home = homedir3()) {
+  const out = {};
+  for (const [rawName, value] of Object.entries(userClaudeMcpConfigObject(home))) {
+    const name = rawName.trim();
+    if (!name || isInjectedOrchMcpName(name)) continue;
+    if (!value || typeof value !== "object" || Array.isArray(value)) continue;
+    out[name] = value;
+  }
+  return out;
 }
 function toCodexDisableUserMcpArgs(names) {
   const args = [];
@@ -2511,7 +2538,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-XPTFHMKL.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-QPSJEXGR.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -2522,6 +2549,7 @@ var claudeAdapter = {
     });
     const injectedBrightsyNames = injectedServers.filter((s) => s.name === "brightsy" || s.name.startsWith("brightsy_")).map((s) => s.name);
     const chromeOn = claudeChromeEnabled();
+    const userMcpEntries = isOrchestrator ? {} : listUserClaudeMcpServerEntries();
     let allowedTools;
     if (isOrchestrator) {
       allowedTools = [
@@ -2532,7 +2560,7 @@ var claudeAdapter = {
     } else {
       allowedTools = [
         ...BASE_ALLOWED_TOOLS,
-        ...mcpAllowToolsFromNames(userMcpNamesToDisable({ names: listUserClaudeMcpNames() })),
+        ...mcpAllowToolsFromNames(Object.keys(userMcpEntries)),
         ...sideboardWorktreeAllowedTools({
           github: true,
           linear: isLinearConnected(),
@@ -2557,7 +2585,7 @@ var claudeAdapter = {
     if (systemPrompt) {
       args.push("--append-system-prompt", systemPrompt);
     }
-    const mcpConfigPath = writeMcpServersConfig(injectedServers);
+    const mcpConfigPath = writeMcpServersConfig(injectedServers, userMcpEntries);
     if (mcpConfigPath) {
       args.push("--mcp-config", mcpConfigPath);
       args.push("--strict-mcp-config");

package/dist/{chunk-JWBPSD7Q.js → chunk-ALDVGAIO.js}

@@ -42,7 +42,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-FSIJGLSV.js";
+} from "./chunk-3Y4FIARC.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -65,7 +65,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-MW57SKKR.js";
+} from "./chunk-P2EAAM3H.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -418,7 +418,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-SWRTYFHX.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-P4KNHFHG.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -895,9 +895,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-XPTFHMKL.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-QPSJEXGR.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-J4QSNTKE.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-VZ7OSRLD.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -4482,7 +4482,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-2HQP654Q.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-TDBA64II.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-K7QK4RI5.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -6957,7 +6957,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-SWRTYFHX.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-P4KNHFHG.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9231,7 +9231,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-2HQP654Q.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-TDBA64II.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }

package/dist/{chunk-SRFFIFW6.js → chunk-B73KKJQB.js}

@@ -24,7 +24,7 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-XRHTRXZN.js";
+} from "./chunk-YG2X34EF.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -47,7 +47,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-OPYBLX4V.js";
+} from "./chunk-N2VST3NL.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -482,7 +482,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-HKW3VLGX.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-Y5IDLJ7D.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -900,9 +900,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-4TEMLESD.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-3FDAUNN2.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-5V7GEPBG.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-JLMQVORO.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -4178,7 +4178,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-YABJUV3V.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-6UOWJLXX.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4651,7 +4651,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-BCBBMMXB.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-76W7IEKR.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-L32WEBX6.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -7332,7 +7332,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-HKW3VLGX.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-Y5IDLJ7D.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9606,7 +9606,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-BCBBMMXB.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-76W7IEKR.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }

package/dist/{chunk-OPYBLX4V.js → chunk-N2VST3NL.js}

@@ -1,5 +1,6 @@
 import {
   allocateTeamName,
+  canonicalizeRepoPath,
   ensureGhPreferOrigin,
   resolveGithubRepoSlug,
   resolveRepoRoot,
@@ -853,6 +854,29 @@ function isLinkedWorktreeOf(path, mainRepo) {
     return false;
   }
 }
+function primaryCheckoutFromLinkedWorktree(path) {
+  if (!path) return null;
+  const git = join3(path, ".git");
+  try {
+    if (!existsSync2(git) || statSync2(git).isDirectory()) return null;
+    const text = readFileSync3(git, "utf8");
+    const match = /^\s*gitdir:\s*(.+)$/m.exec(text);
+    if (!match) return null;
+    const gitdir = match[1].trim().replace(/\/+$/, "");
+    const worktrees = gitdir.lastIndexOf("/.git/worktrees/");
+    const root = worktrees > 0 ? gitdir.slice(0, worktrees) : gitdir.endsWith("/.git") ? gitdir.slice(0, -5) : null;
+    if (!root) return null;
+    return canonicalizeRepoPath(root);
+  } catch {
+    return null;
+  }
+}
+function resolveSyncWorkspacePath(path) {
+  if (!path || path === "/") return null;
+  const primary = primaryCheckoutFromLinkedWorktree(path);
+  if (primary) return primary;
+  return canonicalizeRepoPath(path);
+}
 async function addWorkspace(repoPath) {
   const root = await resolveRepoRoot(repoPath);
   if (!root || root === "/") throw new Error(`Invalid repo path: ${repoPath}`);
@@ -881,9 +905,24 @@ async function ensureWorkspace(repoPath) {
 function syncWorkspacesFromThreads(repoPaths) {
   const current = readAll();
   const removed = readRemoved();
-  const byPath = new Map(current.map((w) => [w.path, w]));
+  const byPath = /* @__PURE__ */ new Map();
   let dirty = false;
-  for (const path of repoPaths) {
+  for (const w of current) {
+    const resolved = resolveSyncWorkspacePath(w.path) ?? w.path;
+    if (resolved !== w.path) dirty = true;
+    if (!resolved || resolved === "/" || isGlobalRepoPath(resolved) || removed.has(resolved)) {
+      dirty = true;
+      continue;
+    }
+    if (!byPath.has(resolved)) {
+      byPath.set(
+        resolved,
+        resolved === w.path ? w : { ...w, path: resolved, name: basename2(resolved) }
+      );
+    }
+  }
+  for (const raw of repoPaths) {
+    const path = resolveSyncWorkspacePath(raw);
     if (!path || path === "/" || isGlobalRepoPath(path) || byPath.has(path) || removed.has(path)) {
       continue;
     }
@@ -896,6 +935,13 @@ function syncWorkspacesFromThreads(repoPaths) {
     byPath.set(path, ws);
     dirty = true;
   }
+  for (const [path] of byPath) {
+    const mains = [...byPath.keys()];
+    if (mains.some((main) => isLinkedWorktreeOf(path, main))) {
+      byPath.delete(path);
+      dirty = true;
+    }
+  }
   const next = [...byPath.values()];
   if (dirty) writeAll(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
@@ -916,6 +962,7 @@ export {
   persistPendingFileAttachments,
   attachmentsFromWorktreePaths,
   listWorkspaces,
+  primaryCheckoutFromLinkedWorktree,
   addWorkspace,
   removeWorkspace,
   ensureWorkspace,

package/dist/chunk-P2BSMNHB.js

@@ -0,0 +1,179 @@
+#!/usr/bin/env node
+
+import {
+  formatFetchError
+} from "./chunk-VKQGAWHY.js";
+
+// src/brightsy/config.ts
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+function brightsyConfigPath() {
+  const override = process.env.BRIGHTSY_CONFIG?.trim();
+  if (override) return override;
+  return join(homedir(), ".brightsy", "config.json");
+}
+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"));
+  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)}
+`, {
+    mode: 384
+  });
+}
+
+// src/brightsy/oauth.ts
+var REFRESH_SKEW_MS = 6e4;
+var BRIGHTSY_OAUTH_CLIENT_ID = "sideboard";
+var BRIGHTSY_OAUTH_REDIRECT = "http://127.0.0.1:19850/callback";
+function defaultFetch(fetchImpl) {
+  return fetchImpl ?? globalThis.fetch.bind(globalThis);
+}
+function normalizeBrightsyEndpoint(endpoint) {
+  return (endpoint || "https://brightsy.ai").replace(/\/$/, "");
+}
+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 registerBrightsyOAuthClient(opts) {
+  const endpoint = normalizeBrightsyEndpoint(opts.endpoint);
+  const url = `${endpoint}/oauth/register`;
+  const clientId = (opts.clientId || BRIGHTSY_OAUTH_CLIENT_ID).trim();
+  const redirectUri = opts.redirectUri || BRIGHTSY_OAUTH_REDIRECT;
+  const fetchImpl = defaultFetch(opts.fetchImpl);
+  let res;
+  try {
+    res = await fetchImpl(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        client_id: clientId,
+        client_name: "Sideboard",
+        description: "Sideboard desktop Brightsy MCP client",
+        redirect_uris: [redirectUri],
+        scope: "brightsy:api",
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none"
+      })
+    });
+  } catch (err) {
+    throw new Error(formatFetchError(err, url));
+  }
+  if (!res.ok) return null;
+  const data = await res.json();
+  if (!data.client_id?.trim()) return null;
+  return {
+    client_id: data.client_id.trim(),
+    client_secret: data.client_secret?.trim() || void 0
+  };
+}
+async function ensureBrightsyOAuthClientId(opts) {
+  const existing = opts.clientId?.trim();
+  if (existing) return existing;
+  const registered = await registerBrightsyOAuthClient({
+    endpoint: opts.endpoint,
+    fetchImpl: opts.fetchImpl
+  });
+  return registered?.client_id || BRIGHTSY_OAUTH_CLIENT_ID;
+}
+async function refreshBrightsyAccessToken(opts) {
+  const endpoint = normalizeBrightsyEndpoint(opts.endpoint);
+  const url = `${endpoint}/oauth/token`;
+  const fetchImpl = defaultFetch(opts.fetchImpl);
+  const clientId = opts.clientId?.trim() || BRIGHTSY_OAUTH_CLIENT_ID;
+  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: clientId
+      })
+    });
+  } 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
+  };
+}
+var refreshInFlight = null;
+async function ensureBrightsyLocalConfigFreshOnce(opts) {
+  let cfg;
+  try {
+    cfg = loadBrightsyConfig();
+  } catch {
+    return null;
+  }
+  const refreshToken = cfg.refresh_token;
+  if (!refreshToken || !brightsyAccessTokenNeedsRefresh(cfg.expires_at)) {
+    return cfg;
+  }
+  const endpoint = normalizeBrightsyEndpoint(cfg.endpoint);
+  const clientId = await ensureBrightsyOAuthClientId({
+    endpoint,
+    clientId: cfg.oauth_client_id,
+    fetchImpl: opts?.fetchImpl
+  });
+  if (clientId !== cfg.oauth_client_id) {
+    cfg = { ...cfg, oauth_client_id: clientId };
+    saveBrightsyConfig(cfg);
+  }
+  const grant = await refreshBrightsyAccessToken({
+    endpoint,
+    refreshToken,
+    clientId,
+    fetchImpl: opts?.fetchImpl
+  });
+  if (!grant) return cfg;
+  const next = { ...cfg, ...applyGrant(cfg, grant), oauth_client_id: clientId };
+  saveBrightsyConfig(next);
+  return next;
+}
+async function ensureBrightsyLocalConfigFresh(opts) {
+  if (refreshInFlight) return refreshInFlight;
+  refreshInFlight = ensureBrightsyLocalConfigFreshOnce(opts).finally(() => {
+    refreshInFlight = null;
+  });
+  return refreshInFlight;
+}
+
+export {
+  loadBrightsyConfig,
+  saveBrightsyConfig,
+  BRIGHTSY_OAUTH_CLIENT_ID,
+  BRIGHTSY_OAUTH_REDIRECT,
+  normalizeBrightsyEndpoint,
+  brightsyAccessTokenNeedsRefresh,
+  registerBrightsyOAuthClient,
+  ensureBrightsyOAuthClientId,
+  refreshBrightsyAccessToken,
+  ensureBrightsyLocalConfigFresh
+};

package/dist/{chunk-MW57SKKR.js → chunk-P2EAAM3H.js}

@@ -2,6 +2,7 @@
 
 import {
   allocateTeamName,
+  canonicalizeRepoPath,
   ensureGhPreferOrigin,
   resolveGithubRepoSlug,
   resolveRepoRoot,
@@ -808,6 +809,29 @@ function isLinkedWorktreeOf(path, mainRepo) {
     return false;
   }
 }
+function primaryCheckoutFromLinkedWorktree(path) {
+  if (!path) return null;
+  const git = join3(path, ".git");
+  try {
+    if (!existsSync2(git) || statSync2(git).isDirectory()) return null;
+    const text = readFileSync3(git, "utf8");
+    const match = /^\s*gitdir:\s*(.+)$/m.exec(text);
+    if (!match) return null;
+    const gitdir = match[1].trim().replace(/\/+$/, "");
+    const worktrees = gitdir.lastIndexOf("/.git/worktrees/");
+    const root = worktrees > 0 ? gitdir.slice(0, worktrees) : gitdir.endsWith("/.git") ? gitdir.slice(0, -5) : null;
+    if (!root) return null;
+    return canonicalizeRepoPath(root);
+  } catch {
+    return null;
+  }
+}
+function resolveSyncWorkspacePath(path) {
+  if (!path || path === "/") return null;
+  const primary = primaryCheckoutFromLinkedWorktree(path);
+  if (primary) return primary;
+  return canonicalizeRepoPath(path);
+}
 async function addWorkspace(repoPath) {
   const root = await resolveRepoRoot(repoPath);
   if (!root || root === "/") throw new Error(`Invalid repo path: ${repoPath}`);
@@ -836,9 +860,24 @@ async function ensureWorkspace(repoPath) {
 function syncWorkspacesFromThreads(repoPaths) {
   const current = readAll();
   const removed = readRemoved();
-  const byPath = new Map(current.map((w) => [w.path, w]));
+  const byPath = /* @__PURE__ */ new Map();
   let dirty = false;
-  for (const path of repoPaths) {
+  for (const w of current) {
+    const resolved = resolveSyncWorkspacePath(w.path) ?? w.path;
+    if (resolved !== w.path) dirty = true;
+    if (!resolved || resolved === "/" || isGlobalRepoPath(resolved) || removed.has(resolved)) {
+      dirty = true;
+      continue;
+    }
+    if (!byPath.has(resolved)) {
+      byPath.set(
+        resolved,
+        resolved === w.path ? w : { ...w, path: resolved, name: basename2(resolved) }
+      );
+    }
+  }
+  for (const raw of repoPaths) {
+    const path = resolveSyncWorkspacePath(raw);
     if (!path || path === "/" || isGlobalRepoPath(path) || byPath.has(path) || removed.has(path)) {
       continue;
     }
@@ -851,6 +890,13 @@ function syncWorkspacesFromThreads(repoPaths) {
     byPath.set(path, ws);
     dirty = true;
   }
+  for (const [path] of byPath) {
+    const mains = [...byPath.keys()];
+    if (mains.some((main) => isLinkedWorktreeOf(path, main))) {
+      byPath.delete(path);
+      dirty = true;
+    }
+  }
   const next = [...byPath.values()];
   if (dirty) writeAll(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
@@ -862,6 +908,7 @@ export {
   persistPendingFileAttachments,
   attachmentsFromWorktreePaths,
   listWorkspaces,
+  primaryCheckoutFromLinkedWorktree,
   addWorkspace,
   removeWorkspace,
   ensureWorkspace,