@sideboard-ai/core 0.1.218 → 0.1.220

package/dist/index.cjs

@@ -9474,6 +9474,7 @@ __export(workspaces_exports, {
   addWorkspace: () => addWorkspace,
   ensureWorkspace: () => ensureWorkspace,
   listWorkspaces: () => listWorkspaces,
+  primaryCheckoutFromLinkedWorktree: () => primaryCheckoutFromLinkedWorktree,
   removeWorkspace: () => removeWorkspace,
   syncWorkspacesFromThreads: () => syncWorkspacesFromThreads
 });
@@ -9541,6 +9542,29 @@ function isLinkedWorktreeOf(path2, mainRepo) {
     return false;
   }
 }
+function primaryCheckoutFromLinkedWorktree(path2) {
+  if (!path2) return null;
+  const git2 = (0, import_node_path22.join)(path2, ".git");
+  try {
+    if (!(0, import_node_fs19.existsSync)(git2) || (0, import_node_fs19.statSync)(git2).isDirectory()) return null;
+    const text7 = (0, import_node_fs19.readFileSync)(git2, "utf8");
+    const match = /^\s*gitdir:\s*(.+)$/m.exec(text7);
+    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(path2) {
+  if (!path2 || path2 === "/") return null;
+  const primary = primaryCheckoutFromLinkedWorktree(path2);
+  if (primary) return primary;
+  return canonicalizeRepoPath(path2);
+}
 async function addWorkspace(repoPath) {
   const root = await resolveRepoRoot(repoPath);
   if (!root || root === "/") throw new Error(`Invalid repo path: ${repoPath}`);
@@ -9569,9 +9593,24 @@ async function ensureWorkspace(repoPath) {
 function syncWorkspacesFromThreads(repoPaths) {
   const current = readAll2();
   const removed = readRemoved();
-  const byPath = new Map(current.map((w) => [w.path, w]));
+  const byPath = /* @__PURE__ */ new Map();
   let dirty = false;
-  for (const path2 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: (0, import_node_path22.basename)(resolved) }
+      );
+    }
+  }
+  for (const raw of repoPaths) {
+    const path2 = resolveSyncWorkspacePath(raw);
     if (!path2 || path2 === "/" || isGlobalRepoPath(path2) || byPath.has(path2) || removed.has(path2)) {
       continue;
     }
@@ -9584,6 +9623,13 @@ function syncWorkspacesFromThreads(repoPaths) {
     byPath.set(path2, ws);
     dirty = true;
   }
+  for (const [path2] of byPath) {
+    const mains = [...byPath.keys()];
+    if (mains.some((main) => isLinkedWorktreeOf(path2, main))) {
+      byPath.delete(path2);
+      dirty = true;
+    }
+  }
   const next = [...byPath.values()];
   if (dirty) writeAll2(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
@@ -10782,10 +10828,21 @@ var init_fetch = __esm({
 // src/brightsy/oauth.ts
 var oauth_exports = {};
 __export(oauth_exports, {
+  BRIGHTSY_OAUTH_CLIENT_ID: () => BRIGHTSY_OAUTH_CLIENT_ID,
+  BRIGHTSY_OAUTH_REDIRECT: () => BRIGHTSY_OAUTH_REDIRECT,
   brightsyAccessTokenNeedsRefresh: () => brightsyAccessTokenNeedsRefresh,
   ensureBrightsyLocalConfigFresh: () => ensureBrightsyLocalConfigFresh,
-  refreshBrightsyAccessToken: () => refreshBrightsyAccessToken
+  ensureBrightsyOAuthClientId: () => ensureBrightsyOAuthClientId,
+  normalizeBrightsyEndpoint: () => normalizeBrightsyEndpoint,
+  refreshBrightsyAccessToken: () => refreshBrightsyAccessToken,
+  registerBrightsyOAuthClient: () => registerBrightsyOAuthClient
 });
+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;
@@ -10799,10 +10856,53 @@ function applyGrant(current, grant) {
     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 = (opts.endpoint || "https://brightsy.ai").replace(/\/$/, "");
+  const endpoint = normalizeBrightsyEndpoint(opts.endpoint);
   const url = `${endpoint}/oauth/token`;
-  const fetchImpl = opts.fetchImpl ?? globalThis.fetch.bind(globalThis);
+  const fetchImpl = defaultFetch(opts.fetchImpl);
+  const clientId = opts.clientId?.trim() || BRIGHTSY_OAUTH_CLIENT_ID;
   let res;
   try {
     res = await fetchImpl(url, {
@@ -10811,7 +10911,7 @@ async function refreshBrightsyAccessToken(opts) {
       body: new URLSearchParams({
         grant_type: "refresh_token",
         refresh_token: opts.refreshToken,
-        client_id: opts.clientId || "brightsy-cli"
+        client_id: clientId
       })
     });
   } catch (err) {
@@ -10826,34 +10926,55 @@ async function refreshBrightsyAccessToken(opts) {
     expires_at: data.expires_in ? Date.now() + data.expires_in * 1e3 : void 0
   };
 }
-async function ensureBrightsyLocalConfigFresh(opts) {
+async function ensureBrightsyLocalConfigFreshOnce(opts) {
   let cfg;
   try {
     cfg = loadBrightsyConfig();
   } catch {
     return null;
   }
-  if (!cfg.refresh_token || !brightsyAccessTokenNeedsRefresh(cfg.expires_at)) {
+  const refreshToken = cfg.refresh_token;
+  if (!refreshToken || !brightsyAccessTokenNeedsRefresh(cfg.expires_at)) {
     return cfg;
   }
-  const grant = await refreshBrightsyAccessToken({
-    endpoint: cfg.endpoint || "https://brightsy.ai",
-    refreshToken: cfg.refresh_token,
+  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) };
+  const next = { ...cfg, ...applyGrant(cfg, grant), oauth_client_id: clientId };
   saveBrightsyConfig(next);
   return next;
 }
-var REFRESH_SKEW_MS;
+async function ensureBrightsyLocalConfigFresh(opts) {
+  if (refreshInFlight) return refreshInFlight;
+  refreshInFlight = ensureBrightsyLocalConfigFreshOnce(opts).finally(() => {
+    refreshInFlight = null;
+  });
+  return refreshInFlight;
+}
+var REFRESH_SKEW_MS, BRIGHTSY_OAUTH_CLIENT_ID, BRIGHTSY_OAUTH_REDIRECT, refreshInFlight;
 var init_oauth = __esm({
   "src/brightsy/oauth.ts"() {
     "use strict";
     init_fetch();
     init_config();
     REFRESH_SKEW_MS = 6e4;
+    BRIGHTSY_OAUTH_CLIENT_ID = "sideboard";
+    BRIGHTSY_OAUTH_REDIRECT = "http://127.0.0.1:19850/callback";
+    refreshInFlight = null;
   }
 });
 
@@ -11006,10 +11127,10 @@ function applyConnectedTeamToCli(team) {
     account_id: team.id,
     account_slug: team.slug,
     endpoint: team.endpoint ?? base.endpoint ?? "https://brightsy.ai",
-    oauth_client_id: base.oauth_client_id
+    oauth_client_id: team.oauth_client_id ?? base.oauth_client_id
   });
 }
-async function refreshTeamToken(team) {
+async function refreshTeamToken(team, opts) {
   if (!team.refresh_token) return team;
   const cfg = (() => {
     try {
@@ -11018,21 +11139,31 @@ async function refreshTeamToken(team) {
       return null;
     }
   })();
+  const endpoint = team.endpoint || "https://brightsy.ai";
+  const clientId = await ensureBrightsyOAuthClientId({
+    endpoint,
+    clientId: team.oauth_client_id || cfg?.oauth_client_id,
+    fetchImpl: opts?.fetchImpl
+  });
   const grant = await refreshBrightsyAccessToken({
-    endpoint: team.endpoint || "https://brightsy.ai",
+    endpoint,
     refreshToken: team.refresh_token,
-    clientId: cfg?.oauth_client_id
+    clientId,
+    fetchImpl: opts?.fetchImpl
   });
-  if (!grant) return team;
+  if (!grant) return { ...team, oauth_client_id: clientId || team.oauth_client_id };
   return {
     ...team,
     access_token: grant.access_token,
     refresh_token: grant.refresh_token || team.refresh_token,
-    expires_at: grant.expires_at ?? team.expires_at
+    expires_at: grant.expires_at ?? team.expires_at,
+    oauth_client_id: clientId
   };
 }
-async function ensureConnectedBrightsyTeamTokens() {
-  await ensureBrightsyLocalConfigFresh().catch(() => null);
+async function ensureConnectedBrightsyTeamTokens(opts) {
+  await ensureBrightsyLocalConfigFresh({ fetchImpl: opts?.fetchImpl }).catch(
+    () => null
+  );
   const teams = readStore4();
   if (teams.length === 0) return [];
   const next = [];
@@ -11042,8 +11173,8 @@ async function ensureConnectedBrightsyTeamTokens() {
       next.push(team);
       continue;
     }
-    const refreshed = await refreshTeamToken(team);
-    if (refreshed.access_token !== team.access_token || refreshed.refresh_token !== team.refresh_token || refreshed.expires_at !== team.expires_at) {
+    const refreshed = await refreshTeamToken(team, opts);
+    if (refreshed.access_token !== team.access_token || refreshed.refresh_token !== team.refresh_token || refreshed.expires_at !== team.expires_at || refreshed.oauth_client_id !== team.oauth_client_id) {
       changed = true;
     }
     next.push(refreshed);
@@ -11073,7 +11204,8 @@ function ensureCliTeamTracked(meta) {
       access_token: cfg.access_token,
       refresh_token: cfg.refresh_token,
       expires_at: cfg.expires_at,
-      endpoint: cfg.endpoint
+      endpoint: cfg.endpoint,
+      oauth_client_id: cfg.oauth_client_id
     };
     writeStore3([...existing, team]);
   } catch {
@@ -11100,7 +11232,8 @@ async function connectBrightsyTeam(accountIdOrSlug) {
     access_token: minted.access_token,
     refresh_token: minted.refresh_token,
     expires_at: minted.expires_at,
-    endpoint: minted.endpoint
+    endpoint: minted.endpoint,
+    oauth_client_id: minted.oauth_client_id
   };
   writeStore3([...existing, team]);
   return listConnectedBrightsyTeams();
@@ -12160,6 +12293,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
   };
@@ -12343,8 +12477,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);
@@ -12354,6 +12496,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 = (0, import_node_fs30.mkdtempSync)((0, import_node_path33.join)((0, import_node_os9.tmpdir)(), "sideboard-mcp-"));
   const cfgPath = (0, import_node_path33.join)(dir, "mcp.json");
   (0, import_node_fs30.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
@@ -12561,10 +12711,20 @@ function listUserOpencodeMcpNames(home = (0, import_node_os11.homedir)()) {
   }
   return names;
 }
-function listUserClaudeMcpNames(home = (0, import_node_os11.homedir)()) {
+function userClaudeMcpConfigObject(home = (0, import_node_os11.homedir)()) {
   const claudePath = home === (0, import_node_os11.homedir)() ? userClaudeMcpConfigPath() : (0, import_node_path35.join)(home, ".claude.json");
-  if (!(0, import_node_fs32.existsSync)(claudePath)) return [];
-  return listMcpNamesFromJsonMap(readJsonObject(claudePath), "mcpServers");
+  if (!(0, import_node_fs32.existsSync)(claudePath)) return {};
+  return asObject2(asObject2(readJsonObject(claudePath)).mcpServers);
+}
+function listUserClaudeMcpServerEntries(home = (0, import_node_os11.homedir)()) {
+  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 = [];
@@ -13059,6 +13219,7 @@ var init_claude = __esm({
         });
         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 = [
@@ -13069,7 +13230,7 @@ var init_claude = __esm({
         } else {
           allowedTools = [
             ...BASE_ALLOWED_TOOLS,
-            ...mcpAllowToolsFromNames(userMcpNamesToDisable({ names: listUserClaudeMcpNames() })),
+            ...mcpAllowToolsFromNames(Object.keys(userMcpEntries)),
             ...sideboardWorktreeAllowedTools({
               github: true,
               linear: isLinearConnected(),
@@ -13094,7 +13255,7 @@ var init_claude = __esm({
         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");
@@ -18250,12 +18411,12 @@ async function ensureAbleTimeAccessToken() {
     return access;
   }
   if (refresh) {
-    if (!refreshInFlight) {
-      refreshInFlight = refreshAbleTimeAccessToken(refresh).finally(() => {
-        refreshInFlight = null;
+    if (!refreshInFlight2) {
+      refreshInFlight2 = refreshAbleTimeAccessToken(refresh).finally(() => {
+        refreshInFlight2 = null;
       });
     }
-    return refreshInFlight;
+    return refreshInFlight2;
   }
   return access || null;
 }
@@ -18378,7 +18539,7 @@ async function startAbleTimeOAuth(opts) {
     return loadAppSettings();
   }
 }
-var import_node_crypto10, import_node_http, ABLETIME_OAUTH_CALLBACK_PATH, ABLETIME_OAUTH_PORT, ABLETIME_OAUTH_LOCAL_CALLBACK, ABLETIME_OAUTH_REDIRECT, BOUNCE_QUERY_KEYS, BAKED_ABLETIME_OAUTH_CLIENT_ID, ABLETIME_OAUTH_RESOURCE, REFRESH_SKEW_MS2, refreshInFlight, ABLETIME_OAUTH_CANCELLED, AbleTimeOAuthCancelledError;
+var import_node_crypto10, import_node_http, ABLETIME_OAUTH_CALLBACK_PATH, ABLETIME_OAUTH_PORT, ABLETIME_OAUTH_LOCAL_CALLBACK, ABLETIME_OAUTH_REDIRECT, BOUNCE_QUERY_KEYS, BAKED_ABLETIME_OAUTH_CLIENT_ID, ABLETIME_OAUTH_RESOURCE, REFRESH_SKEW_MS2, refreshInFlight2, ABLETIME_OAUTH_CANCELLED, AbleTimeOAuthCancelledError;
 var init_abletime_oauth = __esm({
   "src/integrations/abletime-oauth.ts"() {
     "use strict";
@@ -18395,7 +18556,7 @@ var init_abletime_oauth = __esm({
     BAKED_ABLETIME_OAUTH_CLIENT_ID = "https://www.sideboard.cloud/oauth/abletime-client.json";
     ABLETIME_OAUTH_RESOURCE = `${DEFAULT_ABLETIME_HOST}/api/public/v2/mcp`;
     REFRESH_SKEW_MS2 = 5 * 6e4;
-    refreshInFlight = null;
+    refreshInFlight2 = null;
     ABLETIME_OAUTH_CANCELLED = "AbleTime sign-in cancelled";
     AbleTimeOAuthCancelledError = class extends Error {
       constructor(message = ABLETIME_OAUTH_CANCELLED) {
@@ -25611,6 +25772,8 @@ __export(index_exports, {
   BAKED_ABLETIME_OAUTH_CLIENT_ID: () => BAKED_ABLETIME_OAUTH_CLIENT_ID,
   BAKED_SLACK_RELAY_URL: () => BAKED_SLACK_RELAY_URL,
   BRIGHTSY_MCP_ALLOWED_TOOLS: () => BRIGHTSY_MCP_ALLOWED_TOOLS,
+  BRIGHTSY_OAUTH_CLIENT_ID: () => BRIGHTSY_OAUTH_CLIENT_ID,
+  BRIGHTSY_OAUTH_REDIRECT: () => BRIGHTSY_OAUTH_REDIRECT,
   BRIGHTSY_SUMMARIZE_CONTEXT_TOOL: () => BRIGHTSY_SUMMARIZE_CONTEXT_TOOL,
   BUNDLED_LONG_RUNNING_PATH: () => BUNDLED_LONG_RUNNING_PATH,
   BUNDLED_SKILL_PREFIX: () => BUNDLED_SKILL_PREFIX,
@@ -25879,6 +26042,7 @@ __export(index_exports, {
   ensureAbleTimeTask: () => ensureAbleTimeTask,
   ensureAgentPath: () => ensureAgentPath,
   ensureBrightsyLocalConfigFresh: () => ensureBrightsyLocalConfigFresh,
+  ensureBrightsyOAuthClientId: () => ensureBrightsyOAuthClientId,
   ensureCloudCoordinator: () => ensureCloudCoordinator,
   ensureConnectedBrightsyTeamTokens: () => ensureConnectedBrightsyTeamTokens,
   ensureGhPreferOrigin: () => ensureGhPreferOrigin,
@@ -26187,6 +26351,7 @@ __export(index_exports, {
   nonInteractiveGitProcessEnv: () => nonInteractiveGitProcessEnv,
   normalizeAbleTimeCredential: () => normalizeAbleTimeCredential,
   normalizeAbleTimeHost: () => normalizeAbleTimeHost,
+  normalizeBrightsyEndpoint: () => normalizeBrightsyEndpoint,
   normalizeCodeSelection: () => normalizeCodeSelection,
   normalizeLinearRelationType: () => normalizeLinearRelationType,
   normalizeParseResult: () => normalizeParseResult,
@@ -26238,6 +26403,7 @@ __export(index_exports, {
   prepareTerminalCommand: () => prepareTerminalCommand,
   prependQueuedItem: () => prependQueuedItem,
   previewLand: () => previewLand,
+  primaryCheckoutFromLinkedWorktree: () => primaryCheckoutFromLinkedWorktree,
   promptMentionsBrightsy: () => promptMentionsBrightsy,
   pushBranch: () => pushBranch,
   readExistingReviewRequestFile: () => readExistingReviewRequestFile,
@@ -26254,6 +26420,7 @@ __export(index_exports, {
   recordSlackOutboundWatch: () => recordSlackOutboundWatch,
   refreshBrightsyAccessToken: () => refreshBrightsyAccessToken,
   refreshGitHubAuth: () => refreshGitHubAuth,
+  registerBrightsyOAuthClient: () => registerBrightsyOAuthClient,
   registerPackagedUserMcpClients: () => registerPackagedUserMcpClients,
   releaseCaffeinateHoldForThread: () => releaseCaffeinateHoldForThread,
   releaseDesktopHost: () => releaseDesktopHost,
@@ -26785,7 +26952,7 @@ async function fetchLinearViewer(accessToken) {
     organizationName: viewer?.organization?.name?.trim() || void 0
   };
 }
-var refreshInFlight2 = null;
+var refreshInFlight3 = null;
 async function refreshLinearAccessToken(refreshToken) {
   const { clientId, clientSecret } = linearOAuthCredentials();
   const body = new URLSearchParams({
@@ -26816,12 +26983,12 @@ async function getLinearAuthToken(settings = loadAppSettings()) {
     return access;
   }
   if (refresh) {
-    if (!refreshInFlight2) {
-      refreshInFlight2 = refreshLinearAccessToken(refresh).finally(() => {
-        refreshInFlight2 = null;
+    if (!refreshInFlight3) {
+      refreshInFlight3 = refreshLinearAccessToken(refresh).finally(() => {
+        refreshInFlight3 = null;
       });
     }
-    return refreshInFlight2.catch((err) => {
+    return refreshInFlight3.catch((err) => {
       if (apiKey) return apiKey;
       throw err;
     });
@@ -34402,6 +34569,8 @@ init_outbound_watch();
   BAKED_ABLETIME_OAUTH_CLIENT_ID,
   BAKED_SLACK_RELAY_URL,
   BRIGHTSY_MCP_ALLOWED_TOOLS,
+  BRIGHTSY_OAUTH_CLIENT_ID,
+  BRIGHTSY_OAUTH_REDIRECT,
   BRIGHTSY_SUMMARIZE_CONTEXT_TOOL,
   BUNDLED_LONG_RUNNING_PATH,
   BUNDLED_SKILL_PREFIX,
@@ -34670,6 +34839,7 @@ init_outbound_watch();
   ensureAbleTimeTask,
   ensureAgentPath,
   ensureBrightsyLocalConfigFresh,
+  ensureBrightsyOAuthClientId,
   ensureCloudCoordinator,
   ensureConnectedBrightsyTeamTokens,
   ensureGhPreferOrigin,
@@ -34978,6 +35148,7 @@ init_outbound_watch();
   nonInteractiveGitProcessEnv,
   normalizeAbleTimeCredential,
   normalizeAbleTimeHost,
+  normalizeBrightsyEndpoint,
   normalizeCodeSelection,
   normalizeLinearRelationType,
   normalizeParseResult,
@@ -35029,6 +35200,7 @@ init_outbound_watch();
   prepareTerminalCommand,
   prependQueuedItem,
   previewLand,
+  primaryCheckoutFromLinkedWorktree,
   promptMentionsBrightsy,
   pushBranch,
   readExistingReviewRequestFile,
@@ -35045,6 +35217,7 @@ init_outbound_watch();
   recordSlackOutboundWatch,
   refreshBrightsyAccessToken,
   refreshGitHubAuth,
+  registerBrightsyOAuthClient,
   registerPackagedUserMcpClients,
   releaseCaffeinateHoldForThread,
   releaseDesktopHost,