@mastra/code-sdk 1.2.2-alpha.7 → 1.3.0-alpha.10

package/dist/mcp/config.js

@@ -2,14 +2,17 @@ import { DEFAULT_CONFIG_DIR } from "../constants.js";
 import * as fs$1 from "fs";
 import * as os$1 from "os";
 import * as path$1 from "path";
+import { parse } from "smol-toml";
 //#region src/mcp/config.ts
 /**
 * MCP server configuration loading from filesystem.
-* Loads from:
-*   1. .claude/settings.local.json  (Claude Code compat — lowest priority)
-*   2. ~/.mastracode/mcp.json       (global)
-*   3. .mcp.json                    (project root — Claude Code compatible)
-*   4. .mastracode/mcp.json         (project — highest priority)
+* Loads from, lowest to highest priority:
+*   1. ~/.claude.json               (Claude Code global — opt-in)
+*   2. $CODEX_HOME/config.toml      (Codex CLI global — opt-in)
+*   3. .claude/settings.local.json  (Claude Code project compatibility)
+*   4. ~/.mastracode/mcp.json       (Mastra Code global)
+*   5. .mcp.json                    (project root — Claude Code compatible)
+*   6. .mastracode/mcp.json         (Mastra Code project)
 *
 * Higher-priority configs override lower ones by server name. The project root
 * `.mcp.json` is read so a project that already keeps MCP servers there for
@@ -42,8 +45,8 @@ function resolveOAuthRedirectUrl(oauth) {
 	if (oauth?.callbackPort !== void 0) return `http://localhost:${oauth.callbackPort}/callback`;
 	return oauth?.redirectUrl ?? "http://127.0.0.1:1458/oauth/callback";
 }
-function loadMcpConfig(projectDir, configDirName = DEFAULT_CONFIG_DIR) {
-	return mergeConfigs(loadClaudeSettings(projectDir), loadSingleConfig(getGlobalMcpPath(configDirName)), loadSingleConfig(getRootMcpPath(projectDir)), loadSingleConfig(getProjectMcpPath(projectDir, configDirName)));
+function loadMcpConfig(projectDir, configDirName = DEFAULT_CONFIG_DIR, externalDiscovery = {}) {
+	return mergeConfigs(externalDiscovery.claudeCodeGlobal ? loadClaudeGlobalConfig() : {}, externalDiscovery.codexGlobal ? loadCodexGlobalConfig() : {}, loadClaudeSettings(projectDir), loadSingleConfig(getGlobalMcpPath(configDirName)), loadSingleConfig(getRootMcpPath(projectDir)), loadSingleConfig(getProjectMcpPath(projectDir, configDirName)));
 }
 function getProjectMcpPath(projectDir, configDirName = DEFAULT_CONFIG_DIR) {
 	return path$1.join(projectDir, configDirName, "mcp.json");
@@ -57,6 +60,64 @@ function getGlobalMcpPath(configDirName = DEFAULT_CONFIG_DIR) {
 function getClaudeSettingsPath(projectDir) {
 	return path$1.join(projectDir, ".claude", "settings.local.json");
 }
+function getClaudeGlobalMcpPath() {
+	return path$1.join(os$1.homedir(), ".claude.json");
+}
+function getCodexGlobalMcpPath() {
+	const codexHome = process.env.CODEX_HOME || path$1.join(os$1.homedir(), ".codex");
+	return path$1.join(codexHome, "config.toml");
+}
+function withoutSkippedServers(config) {
+	return config.mcpServers ? { mcpServers: config.mcpServers } : {};
+}
+function loadClaudeGlobalConfig() {
+	try {
+		const filePath = getClaudeGlobalMcpPath();
+		if (!fs$1.existsSync(filePath)) return {};
+		return withoutSkippedServers(validateConfig({ mcpServers: JSON.parse(fs$1.readFileSync(filePath, "utf-8"))?.mcpServers }));
+	} catch {
+		return {};
+	}
+}
+function stringRecord(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+	const entries = Object.entries(value).filter((entry) => typeof entry[1] === "string");
+	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+}
+function normalizeCodexServer(entry) {
+	if (!entry || typeof entry !== "object" || Array.isArray(entry)) return void 0;
+	const raw = entry;
+	if (raw.enabled === false) return void 0;
+	if (typeof raw.command === "string") return {
+		command: raw.command,
+		args: Array.isArray(raw.args) && raw.args.every((arg) => typeof arg === "string") ? raw.args : void 0,
+		env: stringRecord(raw.env)
+	};
+	if (typeof raw.url === "string") {
+		const headers = stringRecord(raw.http_headers) ?? {};
+		if (typeof raw.bearer_token_env_var === "string" && /^[A-Za-z_][A-Za-z0-9_]*$/.test(raw.bearer_token_env_var) && !Object.keys(headers).some((name) => name.toLowerCase() === "authorization")) headers.Authorization = `Bearer \${${raw.bearer_token_env_var}}`;
+		return {
+			url: raw.url,
+			headers: Object.keys(headers).length > 0 ? headers : void 0
+		};
+	}
+}
+function loadCodexGlobalConfig() {
+	try {
+		const filePath = getCodexGlobalMcpPath();
+		if (!fs$1.existsSync(filePath)) return {};
+		const rawServers = parse(fs$1.readFileSync(filePath, "utf-8")).mcp_servers;
+		if (!rawServers || typeof rawServers !== "object" || Array.isArray(rawServers)) return {};
+		const mcpServers = {};
+		for (const [name, entry] of Object.entries(rawServers)) {
+			const normalized = normalizeCodexServer(entry);
+			if (normalized) mcpServers[name] = normalized;
+		}
+		return withoutSkippedServers(validateConfig({ mcpServers }));
+	} catch {
+		return {};
+	}
+}
 function loadSingleConfig(filePath) {
 	try {
 		if (!fs$1.existsSync(filePath)) return {};
@@ -235,6 +296,6 @@ function mergeConfigs(...configs) {
 	return result;
 }
 //#endregion
-export { DEFAULT_OAUTH_REDIRECT_URL, classifyServerEntry, expandEnvVars, getClaudeSettingsPath, getGlobalMcpPath, getProjectMcpPath, getRootMcpPath, loadMcpConfig, resolveOAuthRedirectUrl, validateConfig };
+export { DEFAULT_OAUTH_REDIRECT_URL, classifyServerEntry, expandEnvVars, getClaudeGlobalMcpPath, getClaudeSettingsPath, getCodexGlobalMcpPath, getGlobalMcpPath, getProjectMcpPath, getRootMcpPath, loadMcpConfig, resolveOAuthRedirectUrl, validateConfig };
 
 //# sourceMappingURL=config.js.map

package/dist/mcp/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","names":["path","os","fs"],"sources":["../../src/mcp/config.ts"],"sourcesContent":["/**\n * MCP server configuration loading from filesystem.\n * Loads from:\n *   1. .claude/settings.local.json  (Claude Code compat — lowest priority)\n *   2. ~/.mastracode/mcp.json       (global)\n *   3. .mcp.json                    (project root — Claude Code compatible)\n *   4. .mastracode/mcp.json         (project — highest priority)\n *\n * Higher-priority configs override lower ones by server name. The project root\n * `.mcp.json` is read so a project that already keeps MCP servers there for\n * Claude Code does not need to duplicate them under `.mastracode/`.\n */\n\nimport * as fs from 'node:fs';\nimport * as os from 'node:os';\nimport * as path from 'node:path';\nimport { DEFAULT_CONFIG_DIR } from '../constants.js';\nimport type { McpConfig, McpHttpOAuthConfig, McpServerConfig, McpSkippedServer } from './types.js';\n\n/**\n * Default OAuth redirect URL for servers that do not configure one.\n * Port 1458 is stable across sessions so persisted tokens keep the same\n * storage fingerprint; it sits clear of the ports the Codex login flow\n * reserves (1455/1457). When 1458 is busy the callback server falls back\n * to the next sequential port, which stays covered by the client\n * registration (see `@mastra/mcp`'s `getCallbackUrlCandidates`).\n */\nexport const DEFAULT_OAUTH_REDIRECT_URL = 'http://127.0.0.1:1458/oauth/callback';\n\n// Matches the entire 127.0.0.0/8 range in dotted-quad form. `URL` normalizes\n// IPv4 hosts to four octets (so `127.1` becomes `127.0.0.1`), so anchoring the\n// pattern is enough — and it rejects lookalikes like `127.evil.com` that a\n// `startsWith('127.')` check would wrongly accept.\nconst LOOPBACK_IPV4 = /^127\\.(?:\\d{1,3})\\.(?:\\d{1,3})\\.(?:\\d{1,3})$/;\n\nfunction isLoopbackHostname(hostname: string): boolean {\n  return hostname === 'localhost' || hostname === '[::1]' || hostname === '::1' || LOOPBACK_IPV4.test(hostname);\n}\n\n/**\n * Resolve the effective OAuth redirect URL for a server config.\n *\n * `callbackPort` (the Claude Code / Codex convention) takes precedence and\n * synthesizes `http://localhost:<port>/callback`. Config-file entries are\n * normalized by `parseOAuthConfig` (which also enforces that `callbackPort`\n * and `redirectUrl` are mutually exclusive), but programmatically registered\n * servers bypass the parser, so every consumer of the redirect URL must\n * resolve it through this helper rather than reading `redirectUrl` directly.\n */\nexport function resolveOAuthRedirectUrl(oauth: McpHttpOAuthConfig | undefined): string {\n  if (oauth?.callbackPort !== undefined) {\n    return `http://localhost:${oauth.callbackPort}/callback`;\n  }\n  return oauth?.redirectUrl ?? DEFAULT_OAUTH_REDIRECT_URL;\n}\n\nexport function loadMcpConfig(projectDir: string, configDirName = DEFAULT_CONFIG_DIR): McpConfig {\n  const claudeConfig = loadClaudeSettings(projectDir);\n  const globalConfig = loadSingleConfig(getGlobalMcpPath(configDirName));\n  const rootConfig = loadSingleConfig(getRootMcpPath(projectDir));\n  const projectConfig = loadSingleConfig(getProjectMcpPath(projectDir, configDirName));\n\n  return mergeConfigs(claudeConfig, globalConfig, rootConfig, projectConfig);\n}\n\nexport function getProjectMcpPath(projectDir: string, configDirName = DEFAULT_CONFIG_DIR): string {\n  return path.join(projectDir, configDirName, 'mcp.json');\n}\n\nexport function getRootMcpPath(projectDir: string): string {\n  return path.join(projectDir, '.mcp.json');\n}\n\nexport function getGlobalMcpPath(configDirName = DEFAULT_CONFIG_DIR): string {\n  return path.join(os.homedir(), configDirName, 'mcp.json');\n}\n\nexport function getClaudeSettingsPath(projectDir: string): string {\n  return path.join(projectDir, '.claude', 'settings.local.json');\n}\n\nfunction loadSingleConfig(filePath: string): McpConfig {\n  try {\n    if (!fs.existsSync(filePath)) return {};\n    const raw = fs.readFileSync(filePath, 'utf-8');\n    return validateConfig(JSON.parse(raw));\n  } catch {\n    return {};\n  }\n}\n\nfunction loadClaudeSettings(projectDir: string): McpConfig {\n  try {\n    const filePath = getClaudeSettingsPath(projectDir);\n    if (!fs.existsSync(filePath)) return {};\n    const raw = fs.readFileSync(filePath, 'utf-8');\n    const parsed = JSON.parse(raw);\n    // Claude Code stores mcpServers at the top level of settings\n    if (parsed?.mcpServers && typeof parsed.mcpServers === 'object') {\n      return validateConfig({ mcpServers: parsed.mcpServers });\n    }\n    return {};\n  } catch {\n    return {};\n  }\n}\n\n/**\n * Expand `${VAR}` and `${VAR:-default}` references in a string from the\n * environment, matching how Claude Code resolves values in `.mcp.json`.\n * A referenced variable that is unset or empty falls back to its default,\n * or to an empty string when no default is given.\n */\nexport function expandEnvVars(value: string, env: NodeJS.ProcessEnv = process.env): string {\n  return value.replace(\n    /\\$\\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\\}|\\$([A-Za-z_][A-Za-z0-9_]*)/g,\n    (_match, bracedName, fallback, bareName) => {\n      const name = bracedName ?? bareName;\n      const resolved = env[name];\n      if (resolved !== undefined && resolved !== '') return resolved;\n      return fallback ?? '';\n    },\n  );\n}\n\n/**\n * Expand `${VAR}` and `$VAR` references in every string-valued HTTP header so that\n * secrets like API keys can be referenced from the environment instead of\n * being hardcoded in `mcp.json`.\n */\nfunction expandHeaderEnvVars(headers: Record<string, unknown>): Record<string, string> {\n  const expanded: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers)) {\n    if (typeof value === 'string') expanded[key] = expandEnvVars(value);\n  }\n  return expanded;\n}\n\n/**\n * Expand `${VAR}` and `$VAR` references in every string-valued environment\n * variable passed to a stdio server, so that secrets can be referenced from the\n * host environment instead of being hardcoded in `mcp.json`.\n */\nfunction expandEnvValues(env: Record<string, unknown>): Record<string, string> {\n  const expanded: Record<string, string> = {};\n  for (const [key, value] of Object.entries(env)) {\n    if (typeof value === 'string') expanded[key] = expandEnvVars(value);\n  }\n  return expanded;\n}\n\n/**\n * Classify a raw server entry as stdio, http, or skip (with reason).\n */\nexport function classifyServerEntry(raw: unknown): { kind: 'stdio' | 'http' | 'skip'; reason?: string } {\n  if (!raw || typeof raw !== 'object') {\n    return { kind: 'skip', reason: 'Invalid entry: expected an object' };\n  }\n\n  const obj = raw as Record<string, unknown>;\n  const hasCommand = typeof obj.command === 'string';\n  const hasUrl = typeof obj.url === 'string';\n\n  if (hasCommand && hasUrl) {\n    return { kind: 'skip', reason: 'Cannot specify both \"command\" and \"url\"' };\n  }\n\n  if (hasCommand) {\n    return { kind: 'stdio' };\n  }\n\n  if (hasUrl) {\n    try {\n      new URL(expandEnvVars(obj.url as string));\n    } catch {\n      return { kind: 'skip', reason: `Invalid URL: \"${obj.url}\"` };\n    }\n    return { kind: 'http' };\n  }\n\n  return { kind: 'skip', reason: 'Missing required field: \"command\" (stdio) or \"url\" (http)' };\n}\n\nexport function validateConfig(raw: unknown): McpConfig {\n  if (!raw || typeof raw !== 'object') return {};\n  const obj = raw as Record<string, unknown>;\n\n  if (!obj.mcpServers || typeof obj.mcpServers !== 'object') return {};\n\n  const servers: Record<string, McpServerConfig> = {};\n  const skippedServers: McpSkippedServer[] = [];\n  const rawServers = obj.mcpServers as Record<string, unknown>;\n\n  for (const [name, entry] of Object.entries(rawServers)) {\n    const classification = classifyServerEntry(entry);\n\n    if (classification.kind === 'stdio') {\n      const e = entry as Record<string, unknown>;\n      servers[name] = {\n        command: e.command as string,\n        args: Array.isArray(e.args) ? (e.args as string[]) : undefined,\n        env:\n          typeof e.env === 'object' && e.env !== null ? expandEnvValues(e.env as Record<string, unknown>) : undefined,\n      };\n    } else if (classification.kind === 'http') {\n      const e = entry as Record<string, unknown>;\n      const oauthResult = parseOAuthConfig(e.oauth);\n      if (oauthResult.reason) {\n        skippedServers.push({ name, reason: oauthResult.reason });\n        continue;\n      }\n      servers[name] = {\n        url: expandEnvVars(e.url as string),\n        headers:\n          typeof e.headers === 'object' && e.headers !== null\n            ? expandHeaderEnvVars(e.headers as Record<string, unknown>)\n            : undefined,\n        oauth: oauthResult.config,\n      };\n    } else {\n      skippedServers.push({ name, reason: classification.reason! });\n    }\n  }\n\n  const result: McpConfig = {};\n  if (Object.keys(servers).length > 0) {\n    result.mcpServers = servers;\n  }\n  if (skippedServers.length > 0) {\n    result.skippedServers = skippedServers;\n  }\n  return result;\n}\n\nfunction parseOAuthConfig(raw: unknown): { config?: McpHttpOAuthConfig; reason?: string } {\n  if (raw === undefined) return {};\n  if (!raw || typeof raw !== 'object') {\n    return { reason: 'Invalid OAuth config: expected an object' };\n  }\n\n  const obj = raw as Record<string, unknown>;\n  if (obj.redirectUrl !== undefined && typeof obj.redirectUrl !== 'string') {\n    return { reason: 'Invalid OAuth config: \"redirectUrl\" must be a string' };\n  }\n  // `callbackPort` is a shorthand for a loopback redirect URL. It synthesizes\n  // `http://localhost:<port>/callback` — the convention Claude Code and Codex\n  // emit — so those clients' config (e.g. Slack's official MCP plugin config)\n  // can be pasted verbatim. `redirectUrl` stays as the full-control escape\n  // hatch (any loopback host/path). The two are mutually exclusive to avoid\n  // an ambiguous redirect.\n  let callbackPortRedirectUrl: string | undefined;\n  if (obj.callbackPort !== undefined) {\n    if (obj.redirectUrl !== undefined) {\n      return { reason: 'Invalid OAuth config: set either \"redirectUrl\" or \"callbackPort\", not both' };\n    }\n    if (\n      typeof obj.callbackPort !== 'number' ||\n      !Number.isInteger(obj.callbackPort) ||\n      obj.callbackPort < 1 ||\n      obj.callbackPort > 65535\n    ) {\n      return { reason: 'Invalid OAuth config: \"callbackPort\" must be an integer between 1 and 65535' };\n    }\n    callbackPortRedirectUrl = resolveOAuthRedirectUrl({ callbackPort: obj.callbackPort });\n  }\n\n  const rawRedirectUrl = callbackPortRedirectUrl ?? obj.redirectUrl ?? DEFAULT_OAUTH_REDIRECT_URL;\n  try {\n    const redirectUrl = new URL(rawRedirectUrl);\n    const isLoopback = isLoopbackHostname(redirectUrl.hostname);\n    if (redirectUrl.protocol !== 'https:' && !(redirectUrl.protocol === 'http:' && isLoopback)) {\n      return { reason: 'Invalid OAuth redirectUrl: must use HTTPS unless it is a loopback HTTP URL' };\n    }\n  } catch {\n    return { reason: `Invalid OAuth redirectUrl: \"${rawRedirectUrl}\"` };\n  }\n\n  if (obj.scopes !== undefined && (!Array.isArray(obj.scopes) || obj.scopes.some(scope => typeof scope !== 'string'))) {\n    return { reason: 'Invalid OAuth config: \"scopes\" must be an array of strings' };\n  }\n\n  return {\n    config: {\n      redirectUrl: rawRedirectUrl,\n      clientName: typeof obj.clientName === 'string' ? obj.clientName : undefined,\n      scopes: obj.scopes as string[] | undefined,\n      clientId: typeof obj.clientId === 'string' ? obj.clientId : undefined,\n      clientSecret: typeof obj.clientSecret === 'string' ? obj.clientSecret : undefined,\n    },\n  };\n}\n\n/**\n * Merge configs: claude (lowest priority) < global < project (highest).\n * Later configs override earlier by server name.\n * Skipped entries are accumulated, but if a higher-priority config provides\n * a valid entry for a skipped name, the skip is removed.\n */\nfunction mergeConfigs(...configs: McpConfig[]): McpConfig {\n  const merged: Record<string, McpServerConfig> = {};\n  const allSkipped: McpSkippedServer[] = [];\n\n  for (const config of configs) {\n    if (config.mcpServers) {\n      for (const [name, server] of Object.entries(config.mcpServers)) {\n        merged[name] = server;\n      }\n    }\n    if (config.skippedServers) {\n      allSkipped.push(...config.skippedServers);\n    }\n  }\n\n  // Remove skipped entries that were resolved by a valid config at any priority\n  const validNames = new Set(Object.keys(merged));\n  const filteredSkipped = allSkipped.filter(s => !validNames.has(s.name));\n\n  // Deduplicate skipped entries by name (keep last occurrence — highest priority reason)\n  const skippedMap = new Map<string, McpSkippedServer>();\n  for (const s of filteredSkipped) {\n    skippedMap.set(s.name, s);\n  }\n\n  const result: McpConfig = {};\n  if (Object.keys(merged).length > 0) {\n    result.mcpServers = merged;\n  }\n  if (skippedMap.size > 0) {\n    result.skippedServers = Array.from(skippedMap.values());\n  }\n  return result;\n}\n"],"mappings":"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"}
+{"version":3,"file":"config.js","names":["path","os","fs","parseToml"],"sources":["../../src/mcp/config.ts"],"sourcesContent":["/**\n * MCP server configuration loading from filesystem.\n * Loads from, lowest to highest priority:\n *   1. ~/.claude.json               (Claude Code global — opt-in)\n *   2. $CODEX_HOME/config.toml      (Codex CLI global — opt-in)\n *   3. .claude/settings.local.json  (Claude Code project compatibility)\n *   4. ~/.mastracode/mcp.json       (Mastra Code global)\n *   5. .mcp.json                    (project root — Claude Code compatible)\n *   6. .mastracode/mcp.json         (Mastra Code project)\n *\n * Higher-priority configs override lower ones by server name. The project root\n * `.mcp.json` is read so a project that already keeps MCP servers there for\n * Claude Code does not need to duplicate them under `.mastracode/`.\n */\n\nimport * as fs from 'node:fs';\nimport * as os from 'node:os';\nimport * as path from 'node:path';\nimport { parse as parseToml } from 'smol-toml';\nimport { DEFAULT_CONFIG_DIR } from '../constants.js';\nimport type { McpConfig, McpHttpOAuthConfig, McpServerConfig, McpSkippedServer } from './types.js';\n\n/**\n * Default OAuth redirect URL for servers that do not configure one.\n * Port 1458 is stable across sessions so persisted tokens keep the same\n * storage fingerprint; it sits clear of the ports the Codex login flow\n * reserves (1455/1457). When 1458 is busy the callback server falls back\n * to the next sequential port, which stays covered by the client\n * registration (see `@mastra/mcp`'s `getCallbackUrlCandidates`).\n */\nexport const DEFAULT_OAUTH_REDIRECT_URL = 'http://127.0.0.1:1458/oauth/callback';\n\n// Matches the entire 127.0.0.0/8 range in dotted-quad form. `URL` normalizes\n// IPv4 hosts to four octets (so `127.1` becomes `127.0.0.1`), so anchoring the\n// pattern is enough — and it rejects lookalikes like `127.evil.com` that a\n// `startsWith('127.')` check would wrongly accept.\nconst LOOPBACK_IPV4 = /^127\\.(?:\\d{1,3})\\.(?:\\d{1,3})\\.(?:\\d{1,3})$/;\n\nfunction isLoopbackHostname(hostname: string): boolean {\n  return hostname === 'localhost' || hostname === '[::1]' || hostname === '::1' || LOOPBACK_IPV4.test(hostname);\n}\n\n/**\n * Resolve the effective OAuth redirect URL for a server config.\n *\n * `callbackPort` (the Claude Code / Codex convention) takes precedence and\n * synthesizes `http://localhost:<port>/callback`. Config-file entries are\n * normalized by `parseOAuthConfig` (which also enforces that `callbackPort`\n * and `redirectUrl` are mutually exclusive), but programmatically registered\n * servers bypass the parser, so every consumer of the redirect URL must\n * resolve it through this helper rather than reading `redirectUrl` directly.\n */\nexport function resolveOAuthRedirectUrl(oauth: McpHttpOAuthConfig | undefined): string {\n  if (oauth?.callbackPort !== undefined) {\n    return `http://localhost:${oauth.callbackPort}/callback`;\n  }\n  return oauth?.redirectUrl ?? DEFAULT_OAUTH_REDIRECT_URL;\n}\n\nexport interface ExternalMcpDiscoveryOptions {\n  claudeCodeGlobal?: boolean;\n  codexGlobal?: boolean;\n}\n\nexport function loadMcpConfig(\n  projectDir: string,\n  configDirName = DEFAULT_CONFIG_DIR,\n  externalDiscovery: ExternalMcpDiscoveryOptions = {},\n): McpConfig {\n  const claudeGlobalConfig = externalDiscovery.claudeCodeGlobal ? loadClaudeGlobalConfig() : {};\n  const codexGlobalConfig = externalDiscovery.codexGlobal ? loadCodexGlobalConfig() : {};\n  const claudeConfig = loadClaudeSettings(projectDir);\n  const globalConfig = loadSingleConfig(getGlobalMcpPath(configDirName));\n  const rootConfig = loadSingleConfig(getRootMcpPath(projectDir));\n  const projectConfig = loadSingleConfig(getProjectMcpPath(projectDir, configDirName));\n\n  return mergeConfigs(claudeGlobalConfig, codexGlobalConfig, claudeConfig, globalConfig, rootConfig, projectConfig);\n}\n\nexport function getProjectMcpPath(projectDir: string, configDirName = DEFAULT_CONFIG_DIR): string {\n  return path.join(projectDir, configDirName, 'mcp.json');\n}\n\nexport function getRootMcpPath(projectDir: string): string {\n  return path.join(projectDir, '.mcp.json');\n}\n\nexport function getGlobalMcpPath(configDirName = DEFAULT_CONFIG_DIR): string {\n  return path.join(os.homedir(), configDirName, 'mcp.json');\n}\n\nexport function getClaudeSettingsPath(projectDir: string): string {\n  return path.join(projectDir, '.claude', 'settings.local.json');\n}\n\nexport function getClaudeGlobalMcpPath(): string {\n  return path.join(os.homedir(), '.claude.json');\n}\n\nexport function getCodexGlobalMcpPath(): string {\n  const codexHome = process.env.CODEX_HOME || path.join(os.homedir(), '.codex');\n  return path.join(codexHome, 'config.toml');\n}\n\nfunction withoutSkippedServers(config: McpConfig): McpConfig {\n  return config.mcpServers ? { mcpServers: config.mcpServers } : {};\n}\n\nfunction loadClaudeGlobalConfig(): McpConfig {\n  try {\n    const filePath = getClaudeGlobalMcpPath();\n    if (!fs.existsSync(filePath)) return {};\n    const parsed = JSON.parse(fs.readFileSync(filePath, 'utf-8'));\n    return withoutSkippedServers(validateConfig({ mcpServers: parsed?.mcpServers }));\n  } catch {\n    return {};\n  }\n}\n\nfunction stringRecord(value: unknown): Record<string, string> | undefined {\n  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined;\n  const entries = Object.entries(value as Record<string, unknown>).filter(\n    (entry): entry is [string, string] => typeof entry[1] === 'string',\n  );\n  return entries.length > 0 ? Object.fromEntries(entries) : undefined;\n}\n\nfunction normalizeCodexServer(entry: unknown): Record<string, unknown> | undefined {\n  if (!entry || typeof entry !== 'object' || Array.isArray(entry)) return undefined;\n  const raw = entry as Record<string, unknown>;\n  if (raw.enabled === false) return undefined;\n\n  if (typeof raw.command === 'string') {\n    return {\n      command: raw.command,\n      args: Array.isArray(raw.args) && raw.args.every(arg => typeof arg === 'string') ? raw.args : undefined,\n      env: stringRecord(raw.env),\n    };\n  }\n\n  if (typeof raw.url === 'string') {\n    const headers = stringRecord(raw.http_headers) ?? {};\n    if (\n      typeof raw.bearer_token_env_var === 'string' &&\n      /^[A-Za-z_][A-Za-z0-9_]*$/.test(raw.bearer_token_env_var) &&\n      !Object.keys(headers).some(name => name.toLowerCase() === 'authorization')\n    ) {\n      headers.Authorization = `Bearer \\${${raw.bearer_token_env_var}}`;\n    }\n    return {\n      url: raw.url,\n      headers: Object.keys(headers).length > 0 ? headers : undefined,\n    };\n  }\n\n  return undefined;\n}\n\nfunction loadCodexGlobalConfig(): McpConfig {\n  try {\n    const filePath = getCodexGlobalMcpPath();\n    if (!fs.existsSync(filePath)) return {};\n    const parsed = parseToml(fs.readFileSync(filePath, 'utf-8')) as Record<string, unknown>;\n    const rawServers = parsed.mcp_servers;\n    if (!rawServers || typeof rawServers !== 'object' || Array.isArray(rawServers)) return {};\n\n    const mcpServers: Record<string, unknown> = {};\n    for (const [name, entry] of Object.entries(rawServers as Record<string, unknown>)) {\n      const normalized = normalizeCodexServer(entry);\n      if (normalized) mcpServers[name] = normalized;\n    }\n    return withoutSkippedServers(validateConfig({ mcpServers }));\n  } catch {\n    return {};\n  }\n}\n\nfunction loadSingleConfig(filePath: string): McpConfig {\n  try {\n    if (!fs.existsSync(filePath)) return {};\n    const raw = fs.readFileSync(filePath, 'utf-8');\n    return validateConfig(JSON.parse(raw));\n  } catch {\n    return {};\n  }\n}\n\nfunction loadClaudeSettings(projectDir: string): McpConfig {\n  try {\n    const filePath = getClaudeSettingsPath(projectDir);\n    if (!fs.existsSync(filePath)) return {};\n    const raw = fs.readFileSync(filePath, 'utf-8');\n    const parsed = JSON.parse(raw);\n    // Claude Code stores mcpServers at the top level of settings\n    if (parsed?.mcpServers && typeof parsed.mcpServers === 'object') {\n      return validateConfig({ mcpServers: parsed.mcpServers });\n    }\n    return {};\n  } catch {\n    return {};\n  }\n}\n\n/**\n * Expand `${VAR}` and `${VAR:-default}` references in a string from the\n * environment, matching how Claude Code resolves values in `.mcp.json`.\n * A referenced variable that is unset or empty falls back to its default,\n * or to an empty string when no default is given.\n */\nexport function expandEnvVars(value: string, env: NodeJS.ProcessEnv = process.env): string {\n  return value.replace(\n    /\\$\\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\\}|\\$([A-Za-z_][A-Za-z0-9_]*)/g,\n    (_match, bracedName, fallback, bareName) => {\n      const name = bracedName ?? bareName;\n      const resolved = env[name];\n      if (resolved !== undefined && resolved !== '') return resolved;\n      return fallback ?? '';\n    },\n  );\n}\n\n/**\n * Expand `${VAR}` and `$VAR` references in every string-valued HTTP header so that\n * secrets like API keys can be referenced from the environment instead of\n * being hardcoded in `mcp.json`.\n */\nfunction expandHeaderEnvVars(headers: Record<string, unknown>): Record<string, string> {\n  const expanded: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers)) {\n    if (typeof value === 'string') expanded[key] = expandEnvVars(value);\n  }\n  return expanded;\n}\n\n/**\n * Expand `${VAR}` and `$VAR` references in every string-valued environment\n * variable passed to a stdio server, so that secrets can be referenced from the\n * host environment instead of being hardcoded in `mcp.json`.\n */\nfunction expandEnvValues(env: Record<string, unknown>): Record<string, string> {\n  const expanded: Record<string, string> = {};\n  for (const [key, value] of Object.entries(env)) {\n    if (typeof value === 'string') expanded[key] = expandEnvVars(value);\n  }\n  return expanded;\n}\n\n/**\n * Classify a raw server entry as stdio, http, or skip (with reason).\n */\nexport function classifyServerEntry(raw: unknown): { kind: 'stdio' | 'http' | 'skip'; reason?: string } {\n  if (!raw || typeof raw !== 'object') {\n    return { kind: 'skip', reason: 'Invalid entry: expected an object' };\n  }\n\n  const obj = raw as Record<string, unknown>;\n  const hasCommand = typeof obj.command === 'string';\n  const hasUrl = typeof obj.url === 'string';\n\n  if (hasCommand && hasUrl) {\n    return { kind: 'skip', reason: 'Cannot specify both \"command\" and \"url\"' };\n  }\n\n  if (hasCommand) {\n    return { kind: 'stdio' };\n  }\n\n  if (hasUrl) {\n    try {\n      new URL(expandEnvVars(obj.url as string));\n    } catch {\n      return { kind: 'skip', reason: `Invalid URL: \"${obj.url}\"` };\n    }\n    return { kind: 'http' };\n  }\n\n  return { kind: 'skip', reason: 'Missing required field: \"command\" (stdio) or \"url\" (http)' };\n}\n\nexport function validateConfig(raw: unknown): McpConfig {\n  if (!raw || typeof raw !== 'object') return {};\n  const obj = raw as Record<string, unknown>;\n\n  if (!obj.mcpServers || typeof obj.mcpServers !== 'object') return {};\n\n  const servers: Record<string, McpServerConfig> = {};\n  const skippedServers: McpSkippedServer[] = [];\n  const rawServers = obj.mcpServers as Record<string, unknown>;\n\n  for (const [name, entry] of Object.entries(rawServers)) {\n    const classification = classifyServerEntry(entry);\n\n    if (classification.kind === 'stdio') {\n      const e = entry as Record<string, unknown>;\n      servers[name] = {\n        command: e.command as string,\n        args: Array.isArray(e.args) ? (e.args as string[]) : undefined,\n        env:\n          typeof e.env === 'object' && e.env !== null ? expandEnvValues(e.env as Record<string, unknown>) : undefined,\n      };\n    } else if (classification.kind === 'http') {\n      const e = entry as Record<string, unknown>;\n      const oauthResult = parseOAuthConfig(e.oauth);\n      if (oauthResult.reason) {\n        skippedServers.push({ name, reason: oauthResult.reason });\n        continue;\n      }\n      servers[name] = {\n        url: expandEnvVars(e.url as string),\n        headers:\n          typeof e.headers === 'object' && e.headers !== null\n            ? expandHeaderEnvVars(e.headers as Record<string, unknown>)\n            : undefined,\n        oauth: oauthResult.config,\n      };\n    } else {\n      skippedServers.push({ name, reason: classification.reason! });\n    }\n  }\n\n  const result: McpConfig = {};\n  if (Object.keys(servers).length > 0) {\n    result.mcpServers = servers;\n  }\n  if (skippedServers.length > 0) {\n    result.skippedServers = skippedServers;\n  }\n  return result;\n}\n\nfunction parseOAuthConfig(raw: unknown): { config?: McpHttpOAuthConfig; reason?: string } {\n  if (raw === undefined) return {};\n  if (!raw || typeof raw !== 'object') {\n    return { reason: 'Invalid OAuth config: expected an object' };\n  }\n\n  const obj = raw as Record<string, unknown>;\n  if (obj.redirectUrl !== undefined && typeof obj.redirectUrl !== 'string') {\n    return { reason: 'Invalid OAuth config: \"redirectUrl\" must be a string' };\n  }\n  // `callbackPort` is a shorthand for a loopback redirect URL. It synthesizes\n  // `http://localhost:<port>/callback` — the convention Claude Code and Codex\n  // emit — so those clients' config (e.g. Slack's official MCP plugin config)\n  // can be pasted verbatim. `redirectUrl` stays as the full-control escape\n  // hatch (any loopback host/path). The two are mutually exclusive to avoid\n  // an ambiguous redirect.\n  let callbackPortRedirectUrl: string | undefined;\n  if (obj.callbackPort !== undefined) {\n    if (obj.redirectUrl !== undefined) {\n      return { reason: 'Invalid OAuth config: set either \"redirectUrl\" or \"callbackPort\", not both' };\n    }\n    if (\n      typeof obj.callbackPort !== 'number' ||\n      !Number.isInteger(obj.callbackPort) ||\n      obj.callbackPort < 1 ||\n      obj.callbackPort > 65535\n    ) {\n      return { reason: 'Invalid OAuth config: \"callbackPort\" must be an integer between 1 and 65535' };\n    }\n    callbackPortRedirectUrl = resolveOAuthRedirectUrl({ callbackPort: obj.callbackPort });\n  }\n\n  const rawRedirectUrl = callbackPortRedirectUrl ?? obj.redirectUrl ?? DEFAULT_OAUTH_REDIRECT_URL;\n  try {\n    const redirectUrl = new URL(rawRedirectUrl);\n    const isLoopback = isLoopbackHostname(redirectUrl.hostname);\n    if (redirectUrl.protocol !== 'https:' && !(redirectUrl.protocol === 'http:' && isLoopback)) {\n      return { reason: 'Invalid OAuth redirectUrl: must use HTTPS unless it is a loopback HTTP URL' };\n    }\n  } catch {\n    return { reason: `Invalid OAuth redirectUrl: \"${rawRedirectUrl}\"` };\n  }\n\n  if (obj.scopes !== undefined && (!Array.isArray(obj.scopes) || obj.scopes.some(scope => typeof scope !== 'string'))) {\n    return { reason: 'Invalid OAuth config: \"scopes\" must be an array of strings' };\n  }\n\n  return {\n    config: {\n      redirectUrl: rawRedirectUrl,\n      clientName: typeof obj.clientName === 'string' ? obj.clientName : undefined,\n      scopes: obj.scopes as string[] | undefined,\n      clientId: typeof obj.clientId === 'string' ? obj.clientId : undefined,\n      clientSecret: typeof obj.clientSecret === 'string' ? obj.clientSecret : undefined,\n    },\n  };\n}\n\n/**\n * Merge configs: claude (lowest priority) < global < project (highest).\n * Later configs override earlier by server name.\n * Skipped entries are accumulated, but if a higher-priority config provides\n * a valid entry for a skipped name, the skip is removed.\n */\nfunction mergeConfigs(...configs: McpConfig[]): McpConfig {\n  const merged: Record<string, McpServerConfig> = {};\n  const allSkipped: McpSkippedServer[] = [];\n\n  for (const config of configs) {\n    if (config.mcpServers) {\n      for (const [name, server] of Object.entries(config.mcpServers)) {\n        merged[name] = server;\n      }\n    }\n    if (config.skippedServers) {\n      allSkipped.push(...config.skippedServers);\n    }\n  }\n\n  // Remove skipped entries that were resolved by a valid config at any priority\n  const validNames = new Set(Object.keys(merged));\n  const filteredSkipped = allSkipped.filter(s => !validNames.has(s.name));\n\n  // Deduplicate skipped entries by name (keep last occurrence — highest priority reason)\n  const skippedMap = new Map<string, McpSkippedServer>();\n  for (const s of filteredSkipped) {\n    skippedMap.set(s.name, s);\n  }\n\n  const result: McpConfig = {};\n  if (Object.keys(merged).length > 0) {\n    result.mcpServers = merged;\n  }\n  if (skippedMap.size > 0) {\n    result.skippedServers = Array.from(skippedMap.values());\n  }\n  return result;\n}\n"],"mappings":"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"}

package/dist/mcp/index.d.ts

@@ -1,5 +1,6 @@
 export { createMcpManager } from './manager.js';
 export type { McpManager, McpInitResult } from './manager.js';
-export { loadMcpConfig, getProjectMcpPath, getGlobalMcpPath, getClaudeSettingsPath } from './config.js';
+export { loadMcpConfig, getProjectMcpPath, getGlobalMcpPath, getClaudeSettingsPath, getClaudeGlobalMcpPath, getCodexGlobalMcpPath, } from './config.js';
+export type { ExternalMcpDiscoveryOptions } from './config.js';
 export type { McpConfig, McpServerConfig, McpStdioServerConfig, McpHttpServerConfig, McpSkippedServer, McpServerStatus, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACxG,YAAY,EACV,SAAS,EACT,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,GAChB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAC/D,YAAY,EACV,SAAS,EACT,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,GAChB,MAAM,YAAY,CAAC"}

package/dist/mcp/index.js

@@ -1,3 +1,3 @@
-import { getClaudeSettingsPath, getGlobalMcpPath, getProjectMcpPath, loadMcpConfig } from "./config.js";
+import { getClaudeGlobalMcpPath, getClaudeSettingsPath, getCodexGlobalMcpPath, getGlobalMcpPath, getProjectMcpPath, loadMcpConfig } from "./config.js";
 import { createMcpManager } from "./manager.js";
-export { createMcpManager, getClaudeSettingsPath, getGlobalMcpPath, getProjectMcpPath, loadMcpConfig };
+export { createMcpManager, getClaudeGlobalMcpPath, getClaudeSettingsPath, getCodexGlobalMcpPath, getGlobalMcpPath, getProjectMcpPath, loadMcpConfig };

package/dist/mcp/manager.d.ts

@@ -2,6 +2,7 @@
  * MCP manager — orchestrates MCP server connections using MCPClient directly.
  * Created once at startup, provides tools from connected MCP servers.
  */
+import type { ExternalMcpDiscoveryOptions } from './config.js';
 import type { McpConfig, McpServerConfig, McpServerStatus, McpSkippedServer } from './types.js';
 /** Summary of MCP initialization result. */
 export interface McpInitResult {
@@ -94,5 +95,5 @@ export interface McpManager {
  * Create an MCP manager that wraps MCPClient with config-file discovery
  * and per-server status tracking.
  */
-export declare function createMcpManager(projectDir: string, configDirName?: string, extraServers?: Record<string, McpServerConfig>): McpManager;
+export declare function createMcpManager(projectDir: string, configDirName?: string, extraServers?: Record<string, McpServerConfig>, externalDiscovery?: ExternalMcpDiscoveryOptions): McpManager;
 //# sourceMappingURL=manager.d.ts.map

package/dist/mcp/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAiBH,OAAO,KAAK,EACV,SAAS,EAGT,eAAe,EACf,eAAe,EACf,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAIpB,4CAA4C;AAC5C,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,2EAA2E;AAC3E,MAAM,WAAW,UAAU;IACzB,qEAAqE;IACrE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,2FAA2F;IAC3F,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,kEAAkE;IAClE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,iEAAiE;IACjE,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACxD;;;;;;;;;;OAUG;IACH,kBAAkB,CAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3E,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D;;;;;;;;;OASG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAC7G;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjF,2EAA2E;IAC3E,kBAAkB,IAAI,MAAM,EAAE,CAAC;IAC/B,mEAAmE;IACnE,qBAAqB,IAAI,OAAO,CAAC;IACjC,oDAAoD;IACpD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,oFAAoF;IACpF,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,4DAA4D;IAC5D,UAAU,IAAI,OAAO,CAAC;IACtB,iCAAiC;IACjC,iBAAiB,IAAI,eAAe,EAAE,CAAC;IACvC,2DAA2D;IAC3D,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;IACxC,yCAAyC;IACzC,cAAc,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,6BAA6B;IAC7B,SAAS,IAAI,SAAS,CAAC;IACvB,6CAA6C;IAC7C,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACvC;AA0ED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,aAAa,SAAqB,EAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAC7C,UAAU,CA0sBZ"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgBH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EACV,SAAS,EAGT,eAAe,EACf,eAAe,EACf,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAIpB,4CAA4C;AAC5C,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,2EAA2E;AAC3E,MAAM,WAAW,UAAU;IACzB,qEAAqE;IACrE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,2FAA2F;IAC3F,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,kEAAkE;IAClE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,iEAAiE;IACjE,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACxD;;;;;;;;;;OAUG;IACH,kBAAkB,CAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3E,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D;;;;;;;;;OASG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAC7G;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjF,2EAA2E;IAC3E,kBAAkB,IAAI,MAAM,EAAE,CAAC;IAC/B,mEAAmE;IACnE,qBAAqB,IAAI,OAAO,CAAC;IACjC,oDAAoD;IACpD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,oFAAoF;IACpF,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,4DAA4D;IAC5D,UAAU,IAAI,OAAO,CAAC;IACtB,iCAAiC;IACjC,iBAAiB,IAAI,eAAe,EAAE,CAAC;IACvC,2DAA2D;IAC3D,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;IACxC,yCAAyC;IACzC,cAAc,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,6BAA6B;IAC7B,SAAS,IAAI,SAAS,CAAC;IACvB,6CAA6C;IAC7C,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACvC;AA0ED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,aAAa,SAAqB,EAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC9C,iBAAiB,CAAC,EAAE,2BAA2B,GAC9C,UAAU,CA0sBZ"}

package/dist/mcp/manager.js

@@ -82,7 +82,7 @@ function getStorageKeyFingerprint(value) {
 * Create an MCP manager that wraps MCPClient with config-file discovery
 * and per-server status tracking.
 */
-function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraServers) {
+function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraServers, externalDiscovery) {
 	/** Merge programmatic servers into a base config (highest priority). */
 	const applyExtraServers = (base) => {
 		if (!extraServers || Object.keys(extraServers).length === 0) return base;
@@ -94,7 +94,7 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 			}
 		};
 	};
-	let config = applyExtraServers(loadMcpConfig(projectDir, configDirName));
+	let config = applyExtraServers(loadMcpConfig(projectDir, configDirName, externalDiscovery));
 	let disabledServers = new Set(loadDisabledServers(projectDir));
 	let globalDisableState = loadGlobalDisableState();
 	let globallyDisabledServers = new Set(globalDisableState.disabledServers);
@@ -431,7 +431,7 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 			};
 		},
 		async reload() {
-			config = applyExtraServers(loadMcpConfig(projectDir, configDirName));
+			config = applyExtraServers(loadMcpConfig(projectDir, configDirName, externalDiscovery));
 			disabledServers = new Set(loadDisabledServers(projectDir));
 			globalDisableState = loadGlobalDisableState();
 			globallyDisabledServers = new Set(globalDisableState.disabledServers);

package/dist/mcp/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","names":[],"sources":["../../src/mcp/manager.ts"],"sourcesContent":["/**\n * MCP manager — orchestrates MCP server connections using MCPClient directly.\n * Created once at startup, provides tools from connected MCP servers.\n */\n\nimport { existsSync, mkdirSync, readFileSync, writeFileSync, renameSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { MCPClient, MCPOAuthClientProvider } from '@mastra/mcp';\nimport type { MastraMCPServerDefinition, OAuthClientInformation, OAuthStorage } from '@mastra/mcp';\nimport { DEFAULT_CONFIG_DIR } from '../constants.js';\nimport { getAppDataDir } from '../utils/project.js';\nimport {\n  DEFAULT_OAUTH_REDIRECT_URL,\n  loadMcpConfig,\n  getProjectMcpPath,\n  getGlobalMcpPath,\n  getClaudeSettingsPath,\n  resolveOAuthRedirectUrl,\n} from './config.js';\nimport { loadDisabledServers, loadGlobalDisableState, saveDisabledServers, saveGlobalDisableState } from './state.js';\nimport type {\n  McpConfig,\n  McpHttpOAuthConfig,\n  McpHttpServerConfig,\n  McpServerConfig,\n  McpServerStatus,\n  McpSkippedServer,\n} from './types.js';\n\nconst MASTRACODE_MCP_TIMEOUT_MS = 7 * 24 * 60 * 60 * 1000; // 7 days\n\n/** Summary of MCP initialization result. */\nexport interface McpInitResult {\n  connected: McpServerStatus[];\n  failed: McpServerStatus[];\n  skipped: McpSkippedServer[];\n  totalTools: number;\n}\n\n/** Public interface for the MCP manager returned by createMcpManager(). */\nexport interface McpManager {\n  /** Connect to all configured MCP servers and collect their tools. */\n  init(): Promise<void>;\n  /** Start init in the background. Returns a promise that resolves with status when done. */\n  initInBackground(): Promise<McpInitResult>;\n  /** Disconnect all servers, reload config from disk, reconnect. */\n  reload(): Promise<void>;\n  /** Reconnect a single server by name. Returns updated status. */\n  reconnectServer(name: string): Promise<McpServerStatus>;\n  /**\n   * Run the OAuth authorization-code flow for an HTTP server, then reconnect it.\n   * Servers without an `oauth` config are provisioned with a zero-config default\n   * (dynamic client registration). The authorization URL is surfaced through\n   * `onAuthorizationUrl` for the caller to open in a browser.\n   *\n   * Resolves with the resulting {@link McpServerStatus}: a connected status on\n   * success, or a status carrying an `error` message on failure (including\n   * cancellation) — it does not reject. Inspect the returned status rather than\n   * relying on a thrown error.\n   */\n  authenticateServer(\n    name: string,\n    options?: { onAuthorizationUrl?: (url: string) => void; timeoutMs?: number },\n  ): Promise<McpServerStatus>;\n  /**\n   * Cancel a pending {@link authenticateServer} flow for a server (e.g. the\n   * user closed the browser without completing consent). The pending\n   * authenticate call rejects and the server returns to the `needsAuth` state\n   * so it can be retried. Returns `true` if a flow was cancelled.\n   */\n  cancelServerAuthentication(name: string): Promise<boolean>;\n  /**\n   * Disable or enable a single server by name. The change is persisted (in\n   * mastracode's app data, not the user's config files) and survives restarts.\n   * With `global: true` the change applies to every project; otherwise it is\n   * scoped to this project. Enabling only removes the server from the given\n   * scope — a server disabled in the other scope stays disabled, and the\n   * returned status's `disabledScope` says which scope still applies.\n   * Connections are rebuilt, so other servers reconnect — same behavior as\n   * {@link reload}. Returns the server's resulting status.\n   */\n  setServerDisabled(name: string, disabled: boolean, options?: { global?: boolean }): Promise<McpServerStatus>;\n  /**\n   * Disable or enable all servers at once. Project scope records every\n   * currently-configured server name; enabling clears the project list.\n   * Global scope sets/clears a persisted all-MCP kill switch (and, when\n   * enabling, also clears globally disabled server names). Persisted like\n   * {@link setServerDisabled}.\n   */\n  setAllDisabled(disabled: boolean, options?: { global?: boolean }): Promise<void>;\n  /** Names of configured servers that are currently disabled (any scope). */\n  getDisabledServers(): string[];\n  /** Whether all MCP is disabled globally (across every project). */\n  isAllDisabledGlobally(): boolean;\n  /** Disconnect from all MCP servers and clean up. */\n  disconnect(): Promise<void>;\n  /** Get all tools from connected MCP servers (namespaced as serverName_toolName). */\n  getTools(): Record<string, any>;\n  /** Check if any MCP servers are configured (or skipped). */\n  hasServers(): boolean;\n  /** Get status of all servers. */\n  getServerStatuses(): McpServerStatus[];\n  /** Get servers that were skipped during config loading. */\n  getSkippedServers(): McpSkippedServer[];\n  /** Get config file paths for display. */\n  getConfigPaths(): { project: string; global: string; claude: string };\n  /** Get the merged config. */\n  getConfig(): McpConfig;\n  /** Get captured stderr logs for a server. */\n  getServerLogs(name: string): string[];\n}\n\nfunction getTransport(cfg: McpServerConfig): 'stdio' | 'http' {\n  return 'url' in cfg ? 'http' : 'stdio';\n}\n\nclass FileOAuthStorage implements OAuthStorage {\n  constructor(private filePath: string) {}\n\n  get(key: string): string | undefined {\n    return this.read()[key];\n  }\n\n  set(key: string, value: string): void {\n    const data = this.read();\n    data[key] = value;\n    this.write(data);\n  }\n\n  delete(key: string): void {\n    const data = this.read();\n    delete data[key];\n    this.write(data);\n  }\n\n  private read(): Record<string, string> {\n    if (!existsSync(this.filePath)) return {};\n    try {\n      return JSON.parse(readFileSync(this.filePath, 'utf-8')) as Record<string, string>;\n    } catch {\n      return {};\n    }\n  }\n\n  private write(data: Record<string, string>): void {\n    const dir = dirname(this.filePath);\n    if (!existsSync(dir)) {\n      mkdirSync(dir, { recursive: true, mode: 0o700 });\n    }\n    const tmpPath = `${this.filePath}.tmp`;\n    writeFileSync(tmpPath, JSON.stringify(data, null, 2), { encoding: 'utf-8', mode: 0o600 });\n    renameSync(tmpPath, this.filePath);\n  }\n}\n\n/**\n * Zero-config OAuth defaults for servers with a bare `url` entry. Dynamic\n * client registration provisions the client, so no `clientId` is needed.\n */\nconst DEFAULT_OAUTH_CONFIG: McpHttpOAuthConfig = { redirectUrl: DEFAULT_OAUTH_REDIRECT_URL };\n\nfunction getOAuthStoragePath(projectDir: string, name: string, cfg: McpHttpServerConfig): string {\n  // The fingerprint always uses the resolved redirect URL so a bare `url`\n  // entry keeps the same token file before and after zero-config provisioning.\n  const key = JSON.stringify({\n    projectDir,\n    name,\n    url: cfg.url,\n    redirectUrl: resolveOAuthRedirectUrl(cfg.oauth),\n    clientId: cfg.oauth?.clientId,\n    scopes: cfg.oauth?.scopes ?? [],\n  });\n  return join(getAppDataDir(), 'mcp-oauth', `${getStorageKeyFingerprint(key)}.json`);\n}\n\nfunction getStorageKeyFingerprint(value: string): string {\n  let fingerprint = 0xcbf29ce484222325n;\n  for (let i = 0; i < value.length; i += 1) {\n    fingerprint ^= BigInt(value.charCodeAt(i));\n    fingerprint = BigInt.asUintN(64, fingerprint * 0x100000001b3n);\n  }\n  return fingerprint.toString(16).padStart(16, '0');\n}\n\n/**\n * Create an MCP manager that wraps MCPClient with config-file discovery\n * and per-server status tracking.\n */\nexport function createMcpManager(\n  projectDir: string,\n  configDirName = DEFAULT_CONFIG_DIR,\n  extraServers?: Record<string, McpServerConfig>,\n): McpManager {\n  /** Merge programmatic servers into a base config (highest priority). */\n  const applyExtraServers = (base: McpConfig): McpConfig => {\n    if (!extraServers || Object.keys(extraServers).length === 0) return base;\n    return { ...base, mcpServers: { ...base.mcpServers, ...extraServers } };\n  };\n\n  let config = applyExtraServers(loadMcpConfig(projectDir, configDirName));\n  let disabledServers = new Set(loadDisabledServers(projectDir));\n  let globalDisableState = loadGlobalDisableState();\n  let globallyDisabledServers = new Set(globalDisableState.disabledServers);\n\n  /** Whether a server is disabled in any scope (global kill switch, global list, or project list). */\n  const isDisabled = (name: string): boolean =>\n    globalDisableState.allDisabled || globallyDisabledServers.has(name) || disabledServers.has(name);\n\n  /** Which scope disables a server. Global takes precedence — project-level enable can't undo it. */\n  const disabledScopeOf = (name: string): 'project' | 'global' | undefined => {\n    if (globalDisableState.allDisabled || globallyDisabledServers.has(name)) return 'global';\n    if (disabledServers.has(name)) return 'project';\n    return undefined;\n  };\n  let client: MCPClient | null = null;\n  let serverDefs: Record<string, MastraMCPServerDefinition> = {};\n  let tools: Record<string, any> = {};\n  let serverStatuses = new Map<string, McpServerStatus>();\n  let stderrLogs = new Map<string, string[]>();\n  let initialized = false;\n\n  /** Per-server handlers that receive the OAuth authorization URL during authenticateServer(). */\n  const authUrlHandlers = new Map<string, (url: string) => void>();\n\n  /**\n   * Servers with an OAuth authorization flow currently in flight. Owned by the\n   * manager (not the TUI) so the state survives a `/mcp` selector being closed\n   * and reopened — the reopened selector reads it back off the server status and\n   * can still offer \"Cancel authentication\".\n   */\n  const authenticatingServers = new Set<string>();\n\n  /**\n   * Servers whose in-flight authentication was cancelled by the caller. Set by\n   * cancelServerAuthentication() so the resolving authenticateServer() call can\n   * mark its failed status as a deliberate cancel rather than a genuine failure.\n   * This lives on the manager (not the TUI selector) so the signal survives the\n   * selector being closed and reopened mid-flow.\n   */\n  const cancelledAuthServers = new Set<string>();\n\n  /** Overlay the manager-owned `authenticating` flag onto a status snapshot. */\n  const withAuthenticating = (status: McpServerStatus): McpServerStatus =>\n    authenticatingServers.has(status.name) ? { ...status, authenticating: true } : status;\n\n  const MAX_STDERR_LINES = 200;\n\n  /** Hook into a server's stderr stream and buffer its output. */\n  function captureStderr(serverName: string): void {\n    if (!client || typeof client.getServerStderr !== 'function') return;\n    const stream = client.getServerStderr(serverName);\n    if (!stream) return;\n\n    let buffer = '';\n    const lines = stderrLogs.get(serverName) ?? [];\n    stderrLogs.set(serverName, lines);\n\n    stream.on('data', (chunk: Buffer) => {\n      buffer += chunk.toString();\n      const parts = buffer.split('\\n');\n      // Last element is incomplete line (or empty if ended with \\n)\n      buffer = parts.pop()!;\n      for (const line of parts) {\n        if (line.trim()) {\n          lines.push(line);\n          if (lines.length > MAX_STDERR_LINES) {\n            lines.shift();\n          }\n        }\n      }\n    });\n\n    stream.on('end', () => {\n      if (buffer.trim()) {\n        lines.push(buffer);\n        if (lines.length > MAX_STDERR_LINES) {\n          lines.shift();\n        }\n      }\n    });\n  }\n\n  function createOAuthProvider(name: string, cfg: McpHttpServerConfig) {\n    // Bare `url` entries get no eager provider — auth is provisioned lazily\n    // when the user authenticates — unless a previous session already stored\n    // OAuth state for this server, in which case the provider is needed to\n    // attach the persisted tokens on connect.\n    const oauth =\n      cfg.oauth ?? (existsSync(getOAuthStoragePath(projectDir, name, cfg)) ? DEFAULT_OAUTH_CONFIG : undefined);\n    if (!oauth) return undefined;\n\n    // redirectUrl is optional in the user-supplied config; resolve the stable\n    // default (or the `callbackPort` shorthand, for programmatically registered\n    // servers that bypass config parsing) so provider metadata always carries\n    // a concrete URL.\n    const redirectUrl = resolveOAuthRedirectUrl(oauth);\n\n    return new MCPOAuthClientProvider({\n      redirectUrl,\n      clientMetadata: {\n        redirect_uris: [redirectUrl],\n        client_name: oauth.clientName ?? `Mastra Code MCP ${name}`,\n        grant_types: ['authorization_code', 'refresh_token'],\n        response_types: ['code'],\n        ...(oauth.scopes?.length ? { scope: oauth.scopes.join(' ') } : {}),\n      },\n      clientInformation: oauth.clientId\n        ? ({\n            client_id: oauth.clientId,\n            ...(oauth.clientSecret ? { client_secret: oauth.clientSecret } : {}),\n          } satisfies OAuthClientInformation)\n        : undefined,\n      storage: new FileOAuthStorage(getOAuthStoragePath(projectDir, name, cfg)),\n      onRedirectToAuthorization: url => {\n        authUrlHandlers.get(name)?.(url.toString());\n      },\n    });\n  }\n\n  function buildServerDefs(servers: Record<string, McpServerConfig>): Record<string, MastraMCPServerDefinition> {\n    const defs: Record<string, MastraMCPServerDefinition> = {};\n    for (const [name, cfg] of Object.entries(servers)) {\n      if ('url' in cfg) {\n        const httpCfg = cfg as McpHttpServerConfig;\n        defs[name] = {\n          url: new URL(httpCfg.url),\n          requestInit: httpCfg.headers ? { headers: httpCfg.headers } : undefined,\n          authProvider: createOAuthProvider(name, httpCfg),\n        };\n      } else {\n        defs[name] = { command: cfg.command, args: cfg.args, env: cfg.env, stderr: 'pipe' };\n      }\n    }\n    return defs;\n  }\n\n  /** Seed a `disabled` status for every disabled server so it stays visible. */\n  function setDisabledStatuses(): void {\n    for (const [name, cfg] of Object.entries(config.mcpServers ?? {})) {\n      const scope = disabledScopeOf(name);\n      if (!scope) continue;\n      serverStatuses.set(name, {\n        name,\n        connected: false,\n        toolCount: 0,\n        toolNames: [],\n        transport: getTransport(cfg),\n        disabled: true,\n        disabledScope: scope,\n      });\n    }\n  }\n\n  async function connectAndCollectTools(): Promise<void> {\n    setDisabledStatuses();\n\n    const servers = Object.fromEntries(Object.entries(config.mcpServers ?? {}).filter(([name]) => !isDisabled(name)));\n    if (Object.keys(servers).length === 0) {\n      return;\n    }\n\n    // Pre-populate statuses as \"connecting\" so callers can see in-progress state\n    const serverNames = Object.keys(servers);\n    for (const name of serverNames) {\n      serverStatuses.set(name, {\n        name,\n        connected: false,\n        connecting: true,\n        toolCount: 0,\n        toolNames: [],\n        transport: getTransport(servers[name]!),\n      });\n    }\n\n    serverDefs = buildServerDefs(servers);\n    client = new MCPClient({\n      id: 'mastra-code-mcp',\n      servers: serverDefs,\n      timeout: MASTRACODE_MCP_TIMEOUT_MS,\n    });\n\n    // Use listToolsetsWithErrors() to get tools grouped by server name,\n    // plus per-server error messages for servers that failed to connect.\n\n    try {\n      const { toolsets, errors } = await client.listToolsetsWithErrors();\n      const typedToolsets = toolsets as Record<string, Record<string, any>>;\n\n      // Flatten toolsets into the namespaced tools map (serverName_toolName)\n      for (const [serverName, serverTools] of Object.entries(typedToolsets)) {\n        for (const [toolName, toolConfig] of Object.entries(serverTools)) {\n          tools[`${serverName}_${toolName}`] = toolConfig;\n        }\n      }\n\n      for (const name of serverNames) {\n        const serverTools = typedToolsets[name];\n        if (serverTools && Object.keys(serverTools).length > 0) {\n          const toolNames = Object.keys(serverTools).map(t => `${name}_${t}`);\n          serverStatuses.set(name, {\n            name,\n            connected: true,\n            toolCount: toolNames.length,\n            toolNames,\n            transport: getTransport(servers[name]!),\n          });\n        } else {\n          // Server failed — use the real error from listToolsetsWithErrors()\n          const error = errors[name] ?? 'Failed to connect';\n          serverStatuses.set(name, {\n            name,\n            connected: false,\n            toolCount: 0,\n            toolNames: [],\n            transport: getTransport(servers[name]!),\n            error,\n            ...(serverNeedsAuth(name, servers[name]!, error) ? { needsAuth: true } : {}),\n          });\n        }\n      }\n\n      // Capture stderr from all stdio servers (connected or failed)\n      for (const name of serverNames) {\n        captureStderr(name);\n      }\n    } catch (error) {\n      const errMsg = error instanceof Error ? error.message : String(error);\n\n      for (const name of serverNames) {\n        serverStatuses.set(name, {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: getTransport(servers[name]!),\n          error: errMsg,\n          ...(serverNeedsAuth(name, servers[name]!, errMsg) ? { needsAuth: true } : {}),\n        });\n      }\n    }\n  }\n\n  /**\n   * Whether a failed HTTP server is blocked on OAuth authorization.\n   *\n   * Provider-backed servers report the exact state tracked by `@mastra/mcp`.\n   * Bare `url` entries carry no provider until the user authenticates, so the\n   * signal is a 401 in the connect error — surfaced either as the status text\n   * or as the RFC 6750 `invalid_token` bearer error code in the response body.\n   */\n  function serverNeedsAuth(name: string, cfg: McpServerConfig, error?: string): boolean {\n    if (getTransport(cfg) !== 'http') return false;\n    if (client?.getServerAuthState?.(name) === 'needs-auth') return true;\n    if (serverDefs[name]?.authProvider) return false;\n    return error !== undefined && /\\b401\\b|unauthorized|invalid_token/i.test(error);\n  }\n\n  /**\n   * Runs a single-server connect action (reconnect or authenticate), then\n   * refreshes that server's tools and status from the client.\n   */\n  async function connectSingleServer(\n    name: string,\n    cfg: McpServerConfig,\n    connect: () => Promise<unknown>,\n  ): Promise<McpServerStatus> {\n    const transport = getTransport(cfg);\n\n    // Remove old tools for this server\n    const prefix = `${name}_`;\n    for (const key of Object.keys(tools)) {\n      if (key.startsWith(prefix)) {\n        delete tools[key];\n      }\n    }\n\n    // Clear old logs and mark as connecting\n    stderrLogs.delete(name);\n    serverStatuses.set(name, {\n      name,\n      connected: false,\n      connecting: true,\n      toolCount: 0,\n      toolNames: [],\n      transport,\n    });\n\n    try {\n      await connect();\n\n      // Recapture stderr for the reconnected server\n      captureStderr(name);\n\n      // Fetch updated toolsets to get this server's tools\n      const { toolsets, errors } = await client!.listToolsetsWithErrors();\n      const serverTools = toolsets[name];\n      const serverError = errors[name];\n\n      if (serverError) {\n        const status: McpServerStatus = {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport,\n          error: serverError,\n          ...(serverNeedsAuth(name, cfg, serverError) ? { needsAuth: true } : {}),\n        };\n        serverStatuses.set(name, status);\n        return status;\n      } else if (serverTools && Object.keys(serverTools).length > 0) {\n        const toolNames = Object.keys(serverTools).map(t => `${name}_${t}`);\n        for (const [toolName, toolConfig] of Object.entries(serverTools)) {\n          tools[`${name}_${toolName}`] = toolConfig;\n        }\n        const status: McpServerStatus = {\n          name,\n          connected: true,\n          toolCount: toolNames.length,\n          toolNames,\n          transport,\n        };\n        serverStatuses.set(name, status);\n        return status;\n      } else {\n        const status: McpServerStatus = {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport,\n          error: 'Failed to connect',\n        };\n        serverStatuses.set(name, status);\n        return status;\n      }\n    } catch (error) {\n      const errMsg = error instanceof Error ? error.message : String(error);\n      const status: McpServerStatus = {\n        name,\n        connected: false,\n        toolCount: 0,\n        toolNames: [],\n        transport,\n        error: errMsg,\n        ...(serverNeedsAuth(name, cfg, errMsg) ? { needsAuth: true } : {}),\n      };\n      serverStatuses.set(name, status);\n      return status;\n    }\n  }\n\n  async function disconnect(): Promise<void> {\n    if (client) {\n      try {\n        await client.disconnect();\n      } catch {\n        // Ignore disconnect errors\n      }\n      client = null;\n    }\n  }\n\n  /** Tear down all connections and reconnect every enabled server. */\n  async function rebuildConnections(): Promise<void> {\n    await disconnect();\n    tools = {};\n    serverStatuses = new Map();\n    stderrLogs = new Map();\n    initialized = false;\n    await connectAndCollectTools();\n    initialized = true;\n  }\n\n  function disabledStatus(name: string): McpServerStatus {\n    const cfg = config.mcpServers?.[name];\n    return {\n      name,\n      connected: false,\n      toolCount: 0,\n      toolNames: [],\n      transport: cfg ? getTransport(cfg) : 'stdio',\n      disabled: true,\n      disabledScope: disabledScopeOf(name),\n    };\n  }\n\n  // Read-merge-write persistence: re-read the persisted state and apply this\n  // operation's delta on top, then adopt the merged result in memory. This\n  // way a concurrent mastracode process's changes (e.g. another window\n  // flipping the global kill switch) are never clobbered by this manager's\n  // construction-time snapshot.\n  function persistProjectDelta(mutate: (names: Set<string>) => void): void {\n    const fresh = new Set(loadDisabledServers(projectDir));\n    mutate(fresh);\n    disabledServers = fresh;\n    saveDisabledServers(projectDir, Array.from(fresh));\n  }\n\n  function persistGlobalDelta(mutate: (state: { allDisabled: boolean; disabledServers: Set<string> }) => void): void {\n    const onDisk = loadGlobalDisableState();\n    const fresh = { allDisabled: onDisk.allDisabled, disabledServers: new Set(onDisk.disabledServers) };\n    mutate(fresh);\n    globallyDisabledServers = fresh.disabledServers;\n    globalDisableState = { allDisabled: fresh.allDisabled, disabledServers: Array.from(fresh.disabledServers) };\n    saveGlobalDisableState(globalDisableState);\n  }\n\n  return {\n    async init() {\n      if (initialized) return;\n      await connectAndCollectTools();\n      initialized = true;\n    },\n\n    async initInBackground(): Promise<McpInitResult> {\n      await this.init();\n      const statuses = Array.from(serverStatuses.values());\n      const connected = statuses.filter(s => s.connected);\n      const failed = statuses.filter(s => !s.connected && !s.disabled);\n      return {\n        connected,\n        failed,\n        skipped: [...(config.skippedServers ?? [])],\n        totalTools: connected.reduce((sum, s) => sum + s.toolCount, 0),\n      };\n    },\n\n    async reload() {\n      config = applyExtraServers(loadMcpConfig(projectDir, configDirName));\n      disabledServers = new Set(loadDisabledServers(projectDir));\n      globalDisableState = loadGlobalDisableState();\n      globallyDisabledServers = new Set(globalDisableState.disabledServers);\n      await rebuildConnections();\n    },\n\n    async setServerDisabled(name: string, disabled: boolean, options?: { global?: boolean }): Promise<McpServerStatus> {\n      if (!config.mcpServers?.[name]) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" not found in config`,\n        };\n      }\n\n      const wasEffectivelyDisabled = isDisabled(name);\n\n      if (options?.global) {\n        persistGlobalDelta(state => {\n          if (disabled) {\n            state.disabledServers.add(name);\n          } else {\n            state.disabledServers.delete(name);\n          }\n        });\n      } else {\n        persistProjectDelta(names => {\n          if (disabled) {\n            names.add(name);\n          } else {\n            names.delete(name);\n          }\n        });\n      }\n\n      // Only rebuild connections when the server's effective state actually\n      // flipped — e.g. removing it from one scope while the other scope (or\n      // the global kill switch) still disables it leaves connections alone.\n      if (isDisabled(name) !== wasEffectivelyDisabled) {\n        await rebuildConnections();\n        return withAuthenticating(serverStatuses.get(name) ?? disabledStatus(name));\n      }\n      // Effective state unchanged. If still disabled, report a fresh status so\n      // `disabledScope` reflects the scope that (still) applies.\n      return withAuthenticating(\n        isDisabled(name) ? disabledStatus(name) : (serverStatuses.get(name) ?? disabledStatus(name)),\n      );\n    },\n\n    async setAllDisabled(disabled: boolean, options?: { global?: boolean }): Promise<void> {\n      const configuredNames = Object.keys(config.mcpServers ?? {});\n      const effectiveBefore = configuredNames.filter(name => isDisabled(name)).join(',');\n      if (options?.global) {\n        persistGlobalDelta(state => {\n          state.allDisabled = disabled;\n          if (!disabled) {\n            // Enabling globally also clears globally disabled server names so\n            // \"/mcp enable all --global\" fully restores global state.\n            state.disabledServers.clear();\n          }\n        });\n      } else {\n        persistProjectDelta(names => {\n          if (disabled) {\n            for (const name of configuredNames) {\n              names.add(name);\n            }\n          } else {\n            names.clear();\n          }\n        });\n      }\n      // Skip the disconnect/reconnect cycle when the effective disabled set is\n      // unchanged — e.g. repeating \"/mcp disable all\", or a project-scope\n      // \"enable all\" while the global kill switch still disables everything.\n      const effectiveAfter = configuredNames.filter(name => isDisabled(name)).join(',');\n      if (effectiveAfter !== effectiveBefore) {\n        await rebuildConnections();\n      }\n    },\n\n    getDisabledServers() {\n      return Object.keys(config.mcpServers ?? {})\n        .filter(name => isDisabled(name))\n        .sort();\n    },\n\n    isAllDisabledGlobally() {\n      return globalDisableState.allDisabled;\n    },\n\n    async reconnectServer(name: string): Promise<McpServerStatus> {\n      if (isDisabled(name)) {\n        return { ...disabledStatus(name), error: `Server \"${name}\" is disabled — enable it first` };\n      }\n      const cfg = config.mcpServers?.[name];\n      if (!cfg) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" not found in config`,\n        };\n      }\n\n      if (!client) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: getTransport(cfg),\n          error: 'MCP client not initialized',\n        };\n      }\n\n      // Use MCPClient's per-server reconnect\n      return connectSingleServer(name, cfg, () => client!.reconnectServer(name));\n    },\n\n    async authenticateServer(\n      name: string,\n      options?: { onAuthorizationUrl?: (url: string) => void; timeoutMs?: number },\n    ): Promise<McpServerStatus> {\n      const cfg = config.mcpServers?.[name];\n      if (!cfg) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" not found in config`,\n        };\n      }\n\n      if (isDisabled(name)) {\n        return { ...disabledStatus(name), error: `Server \"${name}\" is disabled — enable it first` };\n      }\n\n      if (!client) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: getTransport(cfg),\n          error: 'MCP client not initialized',\n        };\n      }\n\n      if (getTransport(cfg) !== 'http') {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" uses stdio transport, which does not support OAuth`,\n        };\n      }\n\n      // Zero-config provisioning: a bare `url` entry gets a provider with the\n      // default redirect URL the first time the user authenticates. Dynamic\n      // client registration takes care of the client credentials.\n      //\n      // NOTE: `serverDefs[name]` is the same object reference the MCPClient was\n      // constructed with, and connectHttp reads `authProvider` live off it at\n      // connect time, so mutating it here reaches the already-created client.\n      // If MCPClient ever defensively copies its server config, zero-config auth\n      // would need an explicit \"set this server's provider\" API instead.\n      const def = serverDefs[name];\n      if (def?.url && !def.authProvider) {\n        def.authProvider = createOAuthProvider(name, { ...(cfg as McpHttpServerConfig), oauth: DEFAULT_OAUTH_CONFIG });\n      }\n\n      // Reject a concurrent second attempt for the same server. authUrlHandlers\n      // has a single slot per server, so a second call with an onAuthorizationUrl\n      // would overwrite the first caller's handler (which then never sees the\n      // URL) and its finally would delete the handler out from under the other\n      // in-flight call. Gate on authenticatingServers rather than authUrlHandlers\n      // so callers without a URL handler are caught too. The underlying\n      // client.authenticate already coalesces same-server calls into one flow.\n      if (authenticatingServers.has(name)) {\n        const current = serverStatuses.get(name);\n        return {\n          name,\n          connected: current?.connected ?? false,\n          connecting: current?.connecting,\n          needsAuth: current?.needsAuth,\n          toolCount: current?.toolCount ?? 0,\n          toolNames: current?.toolNames ?? [],\n          transport: current?.transport ?? getTransport(cfg),\n          error: `Authentication for \"${name}\" is already in progress`,\n        };\n      }\n\n      if (options?.onAuthorizationUrl) {\n        authUrlHandlers.set(name, options.onAuthorizationUrl);\n      }\n      authenticatingServers.add(name);\n      cancelledAuthServers.delete(name);\n      try {\n        const result = await connectSingleServer(name, cfg, () =>\n          client!.authenticate(name, options?.timeoutMs === undefined ? undefined : { timeoutMs: options.timeoutMs }),\n        );\n        // A cancelled flow resolves with a failed status; mark it so callers can\n        // distinguish a deliberate cancel from a genuine authentication failure.\n        // Write the marker back to the durable status map (not just the returned\n        // value) so a selector reopened after cancellation still sees it.\n        const finalStatus =\n          cancelledAuthServers.has(name) && !result.connected ? { ...result, cancelled: true } : result;\n        serverStatuses.set(name, finalStatus);\n        return finalStatus;\n      } finally {\n        authUrlHandlers.delete(name);\n        authenticatingServers.delete(name);\n        cancelledAuthServers.delete(name);\n      }\n    },\n\n    async cancelServerAuthentication(name: string): Promise<boolean> {\n      if (!client) {\n        return false;\n      }\n      // Record the intent before aborting so the resolving authenticateServer()\n      // call can tag its failed status as cancelled rather than failed.\n      cancelledAuthServers.add(name);\n      const cancelled = await client.cancelAuthentication(name);\n      if (!cancelled) {\n        cancelledAuthServers.delete(name);\n      }\n      return cancelled;\n    },\n\n    disconnect,\n\n    getTools() {\n      return { ...tools };\n    },\n\n    hasServers() {\n      const hasConfigured = config.mcpServers !== undefined && Object.keys(config.mcpServers).length > 0;\n      const hasSkipped = config.skippedServers !== undefined && config.skippedServers.length > 0;\n      return hasConfigured || hasSkipped;\n    },\n\n    getServerStatuses() {\n      return Array.from(serverStatuses.values(), withAuthenticating);\n    },\n\n    getSkippedServers() {\n      return [...(config.skippedServers ?? [])];\n    },\n\n    getConfigPaths() {\n      return {\n        project: getProjectMcpPath(projectDir, configDirName),\n        global: getGlobalMcpPath(configDirName),\n        claude: getClaudeSettingsPath(projectDir),\n      };\n    },\n\n    getConfig() {\n      return config;\n    },\n\n    getServerLogs(name: string) {\n      return [...(stderrLogs.get(name) ?? [])];\n    },\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"manager.js","names":[],"sources":["../../src/mcp/manager.ts"],"sourcesContent":["/**\n * MCP manager — orchestrates MCP server connections using MCPClient directly.\n * Created once at startup, provides tools from connected MCP servers.\n */\n\nimport { existsSync, mkdirSync, readFileSync, writeFileSync, renameSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { MCPClient, MCPOAuthClientProvider } from '@mastra/mcp';\nimport type { MastraMCPServerDefinition, OAuthClientInformation, OAuthStorage } from '@mastra/mcp';\nimport { DEFAULT_CONFIG_DIR } from '../constants.js';\nimport { getAppDataDir } from '../utils/project.js';\nimport {\n  DEFAULT_OAUTH_REDIRECT_URL,\n  loadMcpConfig,\n  getProjectMcpPath,\n  getGlobalMcpPath,\n  getClaudeSettingsPath,\n  resolveOAuthRedirectUrl,\n} from './config.js';\nimport type { ExternalMcpDiscoveryOptions } from './config.js';\nimport { loadDisabledServers, loadGlobalDisableState, saveDisabledServers, saveGlobalDisableState } from './state.js';\nimport type {\n  McpConfig,\n  McpHttpOAuthConfig,\n  McpHttpServerConfig,\n  McpServerConfig,\n  McpServerStatus,\n  McpSkippedServer,\n} from './types.js';\n\nconst MASTRACODE_MCP_TIMEOUT_MS = 7 * 24 * 60 * 60 * 1000; // 7 days\n\n/** Summary of MCP initialization result. */\nexport interface McpInitResult {\n  connected: McpServerStatus[];\n  failed: McpServerStatus[];\n  skipped: McpSkippedServer[];\n  totalTools: number;\n}\n\n/** Public interface for the MCP manager returned by createMcpManager(). */\nexport interface McpManager {\n  /** Connect to all configured MCP servers and collect their tools. */\n  init(): Promise<void>;\n  /** Start init in the background. Returns a promise that resolves with status when done. */\n  initInBackground(): Promise<McpInitResult>;\n  /** Disconnect all servers, reload config from disk, reconnect. */\n  reload(): Promise<void>;\n  /** Reconnect a single server by name. Returns updated status. */\n  reconnectServer(name: string): Promise<McpServerStatus>;\n  /**\n   * Run the OAuth authorization-code flow for an HTTP server, then reconnect it.\n   * Servers without an `oauth` config are provisioned with a zero-config default\n   * (dynamic client registration). The authorization URL is surfaced through\n   * `onAuthorizationUrl` for the caller to open in a browser.\n   *\n   * Resolves with the resulting {@link McpServerStatus}: a connected status on\n   * success, or a status carrying an `error` message on failure (including\n   * cancellation) — it does not reject. Inspect the returned status rather than\n   * relying on a thrown error.\n   */\n  authenticateServer(\n    name: string,\n    options?: { onAuthorizationUrl?: (url: string) => void; timeoutMs?: number },\n  ): Promise<McpServerStatus>;\n  /**\n   * Cancel a pending {@link authenticateServer} flow for a server (e.g. the\n   * user closed the browser without completing consent). The pending\n   * authenticate call rejects and the server returns to the `needsAuth` state\n   * so it can be retried. Returns `true` if a flow was cancelled.\n   */\n  cancelServerAuthentication(name: string): Promise<boolean>;\n  /**\n   * Disable or enable a single server by name. The change is persisted (in\n   * mastracode's app data, not the user's config files) and survives restarts.\n   * With `global: true` the change applies to every project; otherwise it is\n   * scoped to this project. Enabling only removes the server from the given\n   * scope — a server disabled in the other scope stays disabled, and the\n   * returned status's `disabledScope` says which scope still applies.\n   * Connections are rebuilt, so other servers reconnect — same behavior as\n   * {@link reload}. Returns the server's resulting status.\n   */\n  setServerDisabled(name: string, disabled: boolean, options?: { global?: boolean }): Promise<McpServerStatus>;\n  /**\n   * Disable or enable all servers at once. Project scope records every\n   * currently-configured server name; enabling clears the project list.\n   * Global scope sets/clears a persisted all-MCP kill switch (and, when\n   * enabling, also clears globally disabled server names). Persisted like\n   * {@link setServerDisabled}.\n   */\n  setAllDisabled(disabled: boolean, options?: { global?: boolean }): Promise<void>;\n  /** Names of configured servers that are currently disabled (any scope). */\n  getDisabledServers(): string[];\n  /** Whether all MCP is disabled globally (across every project). */\n  isAllDisabledGlobally(): boolean;\n  /** Disconnect from all MCP servers and clean up. */\n  disconnect(): Promise<void>;\n  /** Get all tools from connected MCP servers (namespaced as serverName_toolName). */\n  getTools(): Record<string, any>;\n  /** Check if any MCP servers are configured (or skipped). */\n  hasServers(): boolean;\n  /** Get status of all servers. */\n  getServerStatuses(): McpServerStatus[];\n  /** Get servers that were skipped during config loading. */\n  getSkippedServers(): McpSkippedServer[];\n  /** Get config file paths for display. */\n  getConfigPaths(): { project: string; global: string; claude: string };\n  /** Get the merged config. */\n  getConfig(): McpConfig;\n  /** Get captured stderr logs for a server. */\n  getServerLogs(name: string): string[];\n}\n\nfunction getTransport(cfg: McpServerConfig): 'stdio' | 'http' {\n  return 'url' in cfg ? 'http' : 'stdio';\n}\n\nclass FileOAuthStorage implements OAuthStorage {\n  constructor(private filePath: string) {}\n\n  get(key: string): string | undefined {\n    return this.read()[key];\n  }\n\n  set(key: string, value: string): void {\n    const data = this.read();\n    data[key] = value;\n    this.write(data);\n  }\n\n  delete(key: string): void {\n    const data = this.read();\n    delete data[key];\n    this.write(data);\n  }\n\n  private read(): Record<string, string> {\n    if (!existsSync(this.filePath)) return {};\n    try {\n      return JSON.parse(readFileSync(this.filePath, 'utf-8')) as Record<string, string>;\n    } catch {\n      return {};\n    }\n  }\n\n  private write(data: Record<string, string>): void {\n    const dir = dirname(this.filePath);\n    if (!existsSync(dir)) {\n      mkdirSync(dir, { recursive: true, mode: 0o700 });\n    }\n    const tmpPath = `${this.filePath}.tmp`;\n    writeFileSync(tmpPath, JSON.stringify(data, null, 2), { encoding: 'utf-8', mode: 0o600 });\n    renameSync(tmpPath, this.filePath);\n  }\n}\n\n/**\n * Zero-config OAuth defaults for servers with a bare `url` entry. Dynamic\n * client registration provisions the client, so no `clientId` is needed.\n */\nconst DEFAULT_OAUTH_CONFIG: McpHttpOAuthConfig = { redirectUrl: DEFAULT_OAUTH_REDIRECT_URL };\n\nfunction getOAuthStoragePath(projectDir: string, name: string, cfg: McpHttpServerConfig): string {\n  // The fingerprint always uses the resolved redirect URL so a bare `url`\n  // entry keeps the same token file before and after zero-config provisioning.\n  const key = JSON.stringify({\n    projectDir,\n    name,\n    url: cfg.url,\n    redirectUrl: resolveOAuthRedirectUrl(cfg.oauth),\n    clientId: cfg.oauth?.clientId,\n    scopes: cfg.oauth?.scopes ?? [],\n  });\n  return join(getAppDataDir(), 'mcp-oauth', `${getStorageKeyFingerprint(key)}.json`);\n}\n\nfunction getStorageKeyFingerprint(value: string): string {\n  let fingerprint = 0xcbf29ce484222325n;\n  for (let i = 0; i < value.length; i += 1) {\n    fingerprint ^= BigInt(value.charCodeAt(i));\n    fingerprint = BigInt.asUintN(64, fingerprint * 0x100000001b3n);\n  }\n  return fingerprint.toString(16).padStart(16, '0');\n}\n\n/**\n * Create an MCP manager that wraps MCPClient with config-file discovery\n * and per-server status tracking.\n */\nexport function createMcpManager(\n  projectDir: string,\n  configDirName = DEFAULT_CONFIG_DIR,\n  extraServers?: Record<string, McpServerConfig>,\n  externalDiscovery?: ExternalMcpDiscoveryOptions,\n): McpManager {\n  /** Merge programmatic servers into a base config (highest priority). */\n  const applyExtraServers = (base: McpConfig): McpConfig => {\n    if (!extraServers || Object.keys(extraServers).length === 0) return base;\n    return { ...base, mcpServers: { ...base.mcpServers, ...extraServers } };\n  };\n\n  let config = applyExtraServers(loadMcpConfig(projectDir, configDirName, externalDiscovery));\n  let disabledServers = new Set(loadDisabledServers(projectDir));\n  let globalDisableState = loadGlobalDisableState();\n  let globallyDisabledServers = new Set(globalDisableState.disabledServers);\n\n  /** Whether a server is disabled in any scope (global kill switch, global list, or project list). */\n  const isDisabled = (name: string): boolean =>\n    globalDisableState.allDisabled || globallyDisabledServers.has(name) || disabledServers.has(name);\n\n  /** Which scope disables a server. Global takes precedence — project-level enable can't undo it. */\n  const disabledScopeOf = (name: string): 'project' | 'global' | undefined => {\n    if (globalDisableState.allDisabled || globallyDisabledServers.has(name)) return 'global';\n    if (disabledServers.has(name)) return 'project';\n    return undefined;\n  };\n  let client: MCPClient | null = null;\n  let serverDefs: Record<string, MastraMCPServerDefinition> = {};\n  let tools: Record<string, any> = {};\n  let serverStatuses = new Map<string, McpServerStatus>();\n  let stderrLogs = new Map<string, string[]>();\n  let initialized = false;\n\n  /** Per-server handlers that receive the OAuth authorization URL during authenticateServer(). */\n  const authUrlHandlers = new Map<string, (url: string) => void>();\n\n  /**\n   * Servers with an OAuth authorization flow currently in flight. Owned by the\n   * manager (not the TUI) so the state survives a `/mcp` selector being closed\n   * and reopened — the reopened selector reads it back off the server status and\n   * can still offer \"Cancel authentication\".\n   */\n  const authenticatingServers = new Set<string>();\n\n  /**\n   * Servers whose in-flight authentication was cancelled by the caller. Set by\n   * cancelServerAuthentication() so the resolving authenticateServer() call can\n   * mark its failed status as a deliberate cancel rather than a genuine failure.\n   * This lives on the manager (not the TUI selector) so the signal survives the\n   * selector being closed and reopened mid-flow.\n   */\n  const cancelledAuthServers = new Set<string>();\n\n  /** Overlay the manager-owned `authenticating` flag onto a status snapshot. */\n  const withAuthenticating = (status: McpServerStatus): McpServerStatus =>\n    authenticatingServers.has(status.name) ? { ...status, authenticating: true } : status;\n\n  const MAX_STDERR_LINES = 200;\n\n  /** Hook into a server's stderr stream and buffer its output. */\n  function captureStderr(serverName: string): void {\n    if (!client || typeof client.getServerStderr !== 'function') return;\n    const stream = client.getServerStderr(serverName);\n    if (!stream) return;\n\n    let buffer = '';\n    const lines = stderrLogs.get(serverName) ?? [];\n    stderrLogs.set(serverName, lines);\n\n    stream.on('data', (chunk: Buffer) => {\n      buffer += chunk.toString();\n      const parts = buffer.split('\\n');\n      // Last element is incomplete line (or empty if ended with \\n)\n      buffer = parts.pop()!;\n      for (const line of parts) {\n        if (line.trim()) {\n          lines.push(line);\n          if (lines.length > MAX_STDERR_LINES) {\n            lines.shift();\n          }\n        }\n      }\n    });\n\n    stream.on('end', () => {\n      if (buffer.trim()) {\n        lines.push(buffer);\n        if (lines.length > MAX_STDERR_LINES) {\n          lines.shift();\n        }\n      }\n    });\n  }\n\n  function createOAuthProvider(name: string, cfg: McpHttpServerConfig) {\n    // Bare `url` entries get no eager provider — auth is provisioned lazily\n    // when the user authenticates — unless a previous session already stored\n    // OAuth state for this server, in which case the provider is needed to\n    // attach the persisted tokens on connect.\n    const oauth =\n      cfg.oauth ?? (existsSync(getOAuthStoragePath(projectDir, name, cfg)) ? DEFAULT_OAUTH_CONFIG : undefined);\n    if (!oauth) return undefined;\n\n    // redirectUrl is optional in the user-supplied config; resolve the stable\n    // default (or the `callbackPort` shorthand, for programmatically registered\n    // servers that bypass config parsing) so provider metadata always carries\n    // a concrete URL.\n    const redirectUrl = resolveOAuthRedirectUrl(oauth);\n\n    return new MCPOAuthClientProvider({\n      redirectUrl,\n      clientMetadata: {\n        redirect_uris: [redirectUrl],\n        client_name: oauth.clientName ?? `Mastra Code MCP ${name}`,\n        grant_types: ['authorization_code', 'refresh_token'],\n        response_types: ['code'],\n        ...(oauth.scopes?.length ? { scope: oauth.scopes.join(' ') } : {}),\n      },\n      clientInformation: oauth.clientId\n        ? ({\n            client_id: oauth.clientId,\n            ...(oauth.clientSecret ? { client_secret: oauth.clientSecret } : {}),\n          } satisfies OAuthClientInformation)\n        : undefined,\n      storage: new FileOAuthStorage(getOAuthStoragePath(projectDir, name, cfg)),\n      onRedirectToAuthorization: url => {\n        authUrlHandlers.get(name)?.(url.toString());\n      },\n    });\n  }\n\n  function buildServerDefs(servers: Record<string, McpServerConfig>): Record<string, MastraMCPServerDefinition> {\n    const defs: Record<string, MastraMCPServerDefinition> = {};\n    for (const [name, cfg] of Object.entries(servers)) {\n      if ('url' in cfg) {\n        const httpCfg = cfg as McpHttpServerConfig;\n        defs[name] = {\n          url: new URL(httpCfg.url),\n          requestInit: httpCfg.headers ? { headers: httpCfg.headers } : undefined,\n          authProvider: createOAuthProvider(name, httpCfg),\n        };\n      } else {\n        defs[name] = { command: cfg.command, args: cfg.args, env: cfg.env, stderr: 'pipe' };\n      }\n    }\n    return defs;\n  }\n\n  /** Seed a `disabled` status for every disabled server so it stays visible. */\n  function setDisabledStatuses(): void {\n    for (const [name, cfg] of Object.entries(config.mcpServers ?? {})) {\n      const scope = disabledScopeOf(name);\n      if (!scope) continue;\n      serverStatuses.set(name, {\n        name,\n        connected: false,\n        toolCount: 0,\n        toolNames: [],\n        transport: getTransport(cfg),\n        disabled: true,\n        disabledScope: scope,\n      });\n    }\n  }\n\n  async function connectAndCollectTools(): Promise<void> {\n    setDisabledStatuses();\n\n    const servers = Object.fromEntries(Object.entries(config.mcpServers ?? {}).filter(([name]) => !isDisabled(name)));\n    if (Object.keys(servers).length === 0) {\n      return;\n    }\n\n    // Pre-populate statuses as \"connecting\" so callers can see in-progress state\n    const serverNames = Object.keys(servers);\n    for (const name of serverNames) {\n      serverStatuses.set(name, {\n        name,\n        connected: false,\n        connecting: true,\n        toolCount: 0,\n        toolNames: [],\n        transport: getTransport(servers[name]!),\n      });\n    }\n\n    serverDefs = buildServerDefs(servers);\n    client = new MCPClient({\n      id: 'mastra-code-mcp',\n      servers: serverDefs,\n      timeout: MASTRACODE_MCP_TIMEOUT_MS,\n    });\n\n    // Use listToolsetsWithErrors() to get tools grouped by server name,\n    // plus per-server error messages for servers that failed to connect.\n\n    try {\n      const { toolsets, errors } = await client.listToolsetsWithErrors();\n      const typedToolsets = toolsets as Record<string, Record<string, any>>;\n\n      // Flatten toolsets into the namespaced tools map (serverName_toolName)\n      for (const [serverName, serverTools] of Object.entries(typedToolsets)) {\n        for (const [toolName, toolConfig] of Object.entries(serverTools)) {\n          tools[`${serverName}_${toolName}`] = toolConfig;\n        }\n      }\n\n      for (const name of serverNames) {\n        const serverTools = typedToolsets[name];\n        if (serverTools && Object.keys(serverTools).length > 0) {\n          const toolNames = Object.keys(serverTools).map(t => `${name}_${t}`);\n          serverStatuses.set(name, {\n            name,\n            connected: true,\n            toolCount: toolNames.length,\n            toolNames,\n            transport: getTransport(servers[name]!),\n          });\n        } else {\n          // Server failed — use the real error from listToolsetsWithErrors()\n          const error = errors[name] ?? 'Failed to connect';\n          serverStatuses.set(name, {\n            name,\n            connected: false,\n            toolCount: 0,\n            toolNames: [],\n            transport: getTransport(servers[name]!),\n            error,\n            ...(serverNeedsAuth(name, servers[name]!, error) ? { needsAuth: true } : {}),\n          });\n        }\n      }\n\n      // Capture stderr from all stdio servers (connected or failed)\n      for (const name of serverNames) {\n        captureStderr(name);\n      }\n    } catch (error) {\n      const errMsg = error instanceof Error ? error.message : String(error);\n\n      for (const name of serverNames) {\n        serverStatuses.set(name, {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: getTransport(servers[name]!),\n          error: errMsg,\n          ...(serverNeedsAuth(name, servers[name]!, errMsg) ? { needsAuth: true } : {}),\n        });\n      }\n    }\n  }\n\n  /**\n   * Whether a failed HTTP server is blocked on OAuth authorization.\n   *\n   * Provider-backed servers report the exact state tracked by `@mastra/mcp`.\n   * Bare `url` entries carry no provider until the user authenticates, so the\n   * signal is a 401 in the connect error — surfaced either as the status text\n   * or as the RFC 6750 `invalid_token` bearer error code in the response body.\n   */\n  function serverNeedsAuth(name: string, cfg: McpServerConfig, error?: string): boolean {\n    if (getTransport(cfg) !== 'http') return false;\n    if (client?.getServerAuthState?.(name) === 'needs-auth') return true;\n    if (serverDefs[name]?.authProvider) return false;\n    return error !== undefined && /\\b401\\b|unauthorized|invalid_token/i.test(error);\n  }\n\n  /**\n   * Runs a single-server connect action (reconnect or authenticate), then\n   * refreshes that server's tools and status from the client.\n   */\n  async function connectSingleServer(\n    name: string,\n    cfg: McpServerConfig,\n    connect: () => Promise<unknown>,\n  ): Promise<McpServerStatus> {\n    const transport = getTransport(cfg);\n\n    // Remove old tools for this server\n    const prefix = `${name}_`;\n    for (const key of Object.keys(tools)) {\n      if (key.startsWith(prefix)) {\n        delete tools[key];\n      }\n    }\n\n    // Clear old logs and mark as connecting\n    stderrLogs.delete(name);\n    serverStatuses.set(name, {\n      name,\n      connected: false,\n      connecting: true,\n      toolCount: 0,\n      toolNames: [],\n      transport,\n    });\n\n    try {\n      await connect();\n\n      // Recapture stderr for the reconnected server\n      captureStderr(name);\n\n      // Fetch updated toolsets to get this server's tools\n      const { toolsets, errors } = await client!.listToolsetsWithErrors();\n      const serverTools = toolsets[name];\n      const serverError = errors[name];\n\n      if (serverError) {\n        const status: McpServerStatus = {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport,\n          error: serverError,\n          ...(serverNeedsAuth(name, cfg, serverError) ? { needsAuth: true } : {}),\n        };\n        serverStatuses.set(name, status);\n        return status;\n      } else if (serverTools && Object.keys(serverTools).length > 0) {\n        const toolNames = Object.keys(serverTools).map(t => `${name}_${t}`);\n        for (const [toolName, toolConfig] of Object.entries(serverTools)) {\n          tools[`${name}_${toolName}`] = toolConfig;\n        }\n        const status: McpServerStatus = {\n          name,\n          connected: true,\n          toolCount: toolNames.length,\n          toolNames,\n          transport,\n        };\n        serverStatuses.set(name, status);\n        return status;\n      } else {\n        const status: McpServerStatus = {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport,\n          error: 'Failed to connect',\n        };\n        serverStatuses.set(name, status);\n        return status;\n      }\n    } catch (error) {\n      const errMsg = error instanceof Error ? error.message : String(error);\n      const status: McpServerStatus = {\n        name,\n        connected: false,\n        toolCount: 0,\n        toolNames: [],\n        transport,\n        error: errMsg,\n        ...(serverNeedsAuth(name, cfg, errMsg) ? { needsAuth: true } : {}),\n      };\n      serverStatuses.set(name, status);\n      return status;\n    }\n  }\n\n  async function disconnect(): Promise<void> {\n    if (client) {\n      try {\n        await client.disconnect();\n      } catch {\n        // Ignore disconnect errors\n      }\n      client = null;\n    }\n  }\n\n  /** Tear down all connections and reconnect every enabled server. */\n  async function rebuildConnections(): Promise<void> {\n    await disconnect();\n    tools = {};\n    serverStatuses = new Map();\n    stderrLogs = new Map();\n    initialized = false;\n    await connectAndCollectTools();\n    initialized = true;\n  }\n\n  function disabledStatus(name: string): McpServerStatus {\n    const cfg = config.mcpServers?.[name];\n    return {\n      name,\n      connected: false,\n      toolCount: 0,\n      toolNames: [],\n      transport: cfg ? getTransport(cfg) : 'stdio',\n      disabled: true,\n      disabledScope: disabledScopeOf(name),\n    };\n  }\n\n  // Read-merge-write persistence: re-read the persisted state and apply this\n  // operation's delta on top, then adopt the merged result in memory. This\n  // way a concurrent mastracode process's changes (e.g. another window\n  // flipping the global kill switch) are never clobbered by this manager's\n  // construction-time snapshot.\n  function persistProjectDelta(mutate: (names: Set<string>) => void): void {\n    const fresh = new Set(loadDisabledServers(projectDir));\n    mutate(fresh);\n    disabledServers = fresh;\n    saveDisabledServers(projectDir, Array.from(fresh));\n  }\n\n  function persistGlobalDelta(mutate: (state: { allDisabled: boolean; disabledServers: Set<string> }) => void): void {\n    const onDisk = loadGlobalDisableState();\n    const fresh = { allDisabled: onDisk.allDisabled, disabledServers: new Set(onDisk.disabledServers) };\n    mutate(fresh);\n    globallyDisabledServers = fresh.disabledServers;\n    globalDisableState = { allDisabled: fresh.allDisabled, disabledServers: Array.from(fresh.disabledServers) };\n    saveGlobalDisableState(globalDisableState);\n  }\n\n  return {\n    async init() {\n      if (initialized) return;\n      await connectAndCollectTools();\n      initialized = true;\n    },\n\n    async initInBackground(): Promise<McpInitResult> {\n      await this.init();\n      const statuses = Array.from(serverStatuses.values());\n      const connected = statuses.filter(s => s.connected);\n      const failed = statuses.filter(s => !s.connected && !s.disabled);\n      return {\n        connected,\n        failed,\n        skipped: [...(config.skippedServers ?? [])],\n        totalTools: connected.reduce((sum, s) => sum + s.toolCount, 0),\n      };\n    },\n\n    async reload() {\n      config = applyExtraServers(loadMcpConfig(projectDir, configDirName, externalDiscovery));\n      disabledServers = new Set(loadDisabledServers(projectDir));\n      globalDisableState = loadGlobalDisableState();\n      globallyDisabledServers = new Set(globalDisableState.disabledServers);\n      await rebuildConnections();\n    },\n\n    async setServerDisabled(name: string, disabled: boolean, options?: { global?: boolean }): Promise<McpServerStatus> {\n      if (!config.mcpServers?.[name]) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" not found in config`,\n        };\n      }\n\n      const wasEffectivelyDisabled = isDisabled(name);\n\n      if (options?.global) {\n        persistGlobalDelta(state => {\n          if (disabled) {\n            state.disabledServers.add(name);\n          } else {\n            state.disabledServers.delete(name);\n          }\n        });\n      } else {\n        persistProjectDelta(names => {\n          if (disabled) {\n            names.add(name);\n          } else {\n            names.delete(name);\n          }\n        });\n      }\n\n      // Only rebuild connections when the server's effective state actually\n      // flipped — e.g. removing it from one scope while the other scope (or\n      // the global kill switch) still disables it leaves connections alone.\n      if (isDisabled(name) !== wasEffectivelyDisabled) {\n        await rebuildConnections();\n        return withAuthenticating(serverStatuses.get(name) ?? disabledStatus(name));\n      }\n      // Effective state unchanged. If still disabled, report a fresh status so\n      // `disabledScope` reflects the scope that (still) applies.\n      return withAuthenticating(\n        isDisabled(name) ? disabledStatus(name) : (serverStatuses.get(name) ?? disabledStatus(name)),\n      );\n    },\n\n    async setAllDisabled(disabled: boolean, options?: { global?: boolean }): Promise<void> {\n      const configuredNames = Object.keys(config.mcpServers ?? {});\n      const effectiveBefore = configuredNames.filter(name => isDisabled(name)).join(',');\n      if (options?.global) {\n        persistGlobalDelta(state => {\n          state.allDisabled = disabled;\n          if (!disabled) {\n            // Enabling globally also clears globally disabled server names so\n            // \"/mcp enable all --global\" fully restores global state.\n            state.disabledServers.clear();\n          }\n        });\n      } else {\n        persistProjectDelta(names => {\n          if (disabled) {\n            for (const name of configuredNames) {\n              names.add(name);\n            }\n          } else {\n            names.clear();\n          }\n        });\n      }\n      // Skip the disconnect/reconnect cycle when the effective disabled set is\n      // unchanged — e.g. repeating \"/mcp disable all\", or a project-scope\n      // \"enable all\" while the global kill switch still disables everything.\n      const effectiveAfter = configuredNames.filter(name => isDisabled(name)).join(',');\n      if (effectiveAfter !== effectiveBefore) {\n        await rebuildConnections();\n      }\n    },\n\n    getDisabledServers() {\n      return Object.keys(config.mcpServers ?? {})\n        .filter(name => isDisabled(name))\n        .sort();\n    },\n\n    isAllDisabledGlobally() {\n      return globalDisableState.allDisabled;\n    },\n\n    async reconnectServer(name: string): Promise<McpServerStatus> {\n      if (isDisabled(name)) {\n        return { ...disabledStatus(name), error: `Server \"${name}\" is disabled — enable it first` };\n      }\n      const cfg = config.mcpServers?.[name];\n      if (!cfg) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" not found in config`,\n        };\n      }\n\n      if (!client) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: getTransport(cfg),\n          error: 'MCP client not initialized',\n        };\n      }\n\n      // Use MCPClient's per-server reconnect\n      return connectSingleServer(name, cfg, () => client!.reconnectServer(name));\n    },\n\n    async authenticateServer(\n      name: string,\n      options?: { onAuthorizationUrl?: (url: string) => void; timeoutMs?: number },\n    ): Promise<McpServerStatus> {\n      const cfg = config.mcpServers?.[name];\n      if (!cfg) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" not found in config`,\n        };\n      }\n\n      if (isDisabled(name)) {\n        return { ...disabledStatus(name), error: `Server \"${name}\" is disabled — enable it first` };\n      }\n\n      if (!client) {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: getTransport(cfg),\n          error: 'MCP client not initialized',\n        };\n      }\n\n      if (getTransport(cfg) !== 'http') {\n        return {\n          name,\n          connected: false,\n          toolCount: 0,\n          toolNames: [],\n          transport: 'stdio',\n          error: `Server \"${name}\" uses stdio transport, which does not support OAuth`,\n        };\n      }\n\n      // Zero-config provisioning: a bare `url` entry gets a provider with the\n      // default redirect URL the first time the user authenticates. Dynamic\n      // client registration takes care of the client credentials.\n      //\n      // NOTE: `serverDefs[name]` is the same object reference the MCPClient was\n      // constructed with, and connectHttp reads `authProvider` live off it at\n      // connect time, so mutating it here reaches the already-created client.\n      // If MCPClient ever defensively copies its server config, zero-config auth\n      // would need an explicit \"set this server's provider\" API instead.\n      const def = serverDefs[name];\n      if (def?.url && !def.authProvider) {\n        def.authProvider = createOAuthProvider(name, { ...(cfg as McpHttpServerConfig), oauth: DEFAULT_OAUTH_CONFIG });\n      }\n\n      // Reject a concurrent second attempt for the same server. authUrlHandlers\n      // has a single slot per server, so a second call with an onAuthorizationUrl\n      // would overwrite the first caller's handler (which then never sees the\n      // URL) and its finally would delete the handler out from under the other\n      // in-flight call. Gate on authenticatingServers rather than authUrlHandlers\n      // so callers without a URL handler are caught too. The underlying\n      // client.authenticate already coalesces same-server calls into one flow.\n      if (authenticatingServers.has(name)) {\n        const current = serverStatuses.get(name);\n        return {\n          name,\n          connected: current?.connected ?? false,\n          connecting: current?.connecting,\n          needsAuth: current?.needsAuth,\n          toolCount: current?.toolCount ?? 0,\n          toolNames: current?.toolNames ?? [],\n          transport: current?.transport ?? getTransport(cfg),\n          error: `Authentication for \"${name}\" is already in progress`,\n        };\n      }\n\n      if (options?.onAuthorizationUrl) {\n        authUrlHandlers.set(name, options.onAuthorizationUrl);\n      }\n      authenticatingServers.add(name);\n      cancelledAuthServers.delete(name);\n      try {\n        const result = await connectSingleServer(name, cfg, () =>\n          client!.authenticate(name, options?.timeoutMs === undefined ? undefined : { timeoutMs: options.timeoutMs }),\n        );\n        // A cancelled flow resolves with a failed status; mark it so callers can\n        // distinguish a deliberate cancel from a genuine authentication failure.\n        // Write the marker back to the durable status map (not just the returned\n        // value) so a selector reopened after cancellation still sees it.\n        const finalStatus =\n          cancelledAuthServers.has(name) && !result.connected ? { ...result, cancelled: true } : result;\n        serverStatuses.set(name, finalStatus);\n        return finalStatus;\n      } finally {\n        authUrlHandlers.delete(name);\n        authenticatingServers.delete(name);\n        cancelledAuthServers.delete(name);\n      }\n    },\n\n    async cancelServerAuthentication(name: string): Promise<boolean> {\n      if (!client) {\n        return false;\n      }\n      // Record the intent before aborting so the resolving authenticateServer()\n      // call can tag its failed status as cancelled rather than failed.\n      cancelledAuthServers.add(name);\n      const cancelled = await client.cancelAuthentication(name);\n      if (!cancelled) {\n        cancelledAuthServers.delete(name);\n      }\n      return cancelled;\n    },\n\n    disconnect,\n\n    getTools() {\n      return { ...tools };\n    },\n\n    hasServers() {\n      const hasConfigured = config.mcpServers !== undefined && Object.keys(config.mcpServers).length > 0;\n      const hasSkipped = config.skippedServers !== undefined && config.skippedServers.length > 0;\n      return hasConfigured || hasSkipped;\n    },\n\n    getServerStatuses() {\n      return Array.from(serverStatuses.values(), withAuthenticating);\n    },\n\n    getSkippedServers() {\n      return [...(config.skippedServers ?? [])];\n    },\n\n    getConfigPaths() {\n      return {\n        project: getProjectMcpPath(projectDir, configDirName),\n        global: getGlobalMcpPath(configDirName),\n        claude: getClaudeSettingsPath(projectDir),\n      };\n    },\n\n    getConfig() {\n      return config;\n    },\n\n    getServerLogs(name: string) {\n      return [...(stderrLogs.get(name) ?? [])];\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;;AA8BA,MAAM,4BAA4B,QAAc,KAAK;AAmFrD,SAAS,aAAa,KAAwC;CAC5D,OAAO,SAAS,MAAM,SAAS;AACjC;AAEA,IAAM,mBAAN,MAA+C;CACzB;CAApB,YAAY,UAA0B;EAAlB,KAAA,WAAA;CAAmB;CAEvC,IAAI,KAAiC;EACnC,OAAO,KAAK,KAAK,CAAC,CAAC;CACrB;CAEA,IAAI,KAAa,OAAqB;EACpC,MAAM,OAAO,KAAK,KAAK;EACvB,KAAK,OAAO;EACZ,KAAK,MAAM,IAAI;CACjB;CAEA,OAAO,KAAmB;EACxB,MAAM,OAAO,KAAK,KAAK;EACvB,OAAO,KAAK;EACZ,KAAK,MAAM,IAAI;CACjB;CAEA,OAAuC;EACrC,IAAI,CAAC,WAAW,KAAK,QAAQ,GAAG,OAAO,CAAC;EACxC,IAAI;GACF,OAAO,KAAK,MAAM,aAAa,KAAK,UAAU,OAAO,CAAC;EACxD,QAAQ;GACN,OAAO,CAAC;EACV;CACF;CAEA,MAAc,MAAoC;EAChD,MAAM,MAAM,QAAQ,KAAK,QAAQ;EACjC,IAAI,CAAC,WAAW,GAAG,GACjB,UAAU,KAAK;GAAE,WAAW;GAAM,MAAM;EAAM,CAAC;EAEjD,MAAM,UAAU,GAAG,KAAK,SAAS;EACjC,cAAc,SAAS,KAAK,UAAU,MAAM,MAAM,CAAC,GAAG;GAAE,UAAU;GAAS,MAAM;EAAM,CAAC;EACxF,WAAW,SAAS,KAAK,QAAQ;CACnC;AACF;;;;;AAMA,MAAM,uBAA2C,EAAE,aAAa,2BAA2B;AAE3F,SAAS,oBAAoB,YAAoB,MAAc,KAAkC;CAG/F,MAAM,MAAM,KAAK,UAAU;EACzB;EACA;EACA,KAAK,IAAI;EACT,aAAa,wBAAwB,IAAI,KAAK;EAC9C,UAAU,IAAI,OAAO;EACrB,QAAQ,IAAI,OAAO,UAAU,CAAC;CAChC,CAAC;CACD,OAAO,KAAK,cAAc,GAAG,aAAa,GAAG,yBAAyB,GAAG,EAAE,MAAM;AACnF;AAEA,SAAS,yBAAyB,OAAuB;CACvD,IAAI,cAAc;CAClB,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK,GAAG;EACxC,eAAe,OAAO,MAAM,WAAW,CAAC,CAAC;EACzC,cAAc,OAAO,QAAQ,IAAI,cAAc,cAAc;CAC/D;CACA,OAAO,YAAY,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,GAAG;AAClD;;;;;AAMA,SAAgB,iBACd,YACA,gBAAgB,oBAChB,cACA,mBACY;;CAEZ,MAAM,qBAAqB,SAA+B;EACxD,IAAI,CAAC,gBAAgB,OAAO,KAAK,YAAY,CAAC,CAAC,WAAW,GAAG,OAAO;EACpE,OAAO;GAAE,GAAG;GAAM,YAAY;IAAE,GAAG,KAAK;IAAY,GAAG;GAAa;EAAE;CACxE;CAEA,IAAI,SAAS,kBAAkB,cAAc,YAAY,eAAe,iBAAiB,CAAC;CAC1F,IAAI,kBAAkB,IAAI,IAAI,oBAAoB,UAAU,CAAC;CAC7D,IAAI,qBAAqB,uBAAuB;CAChD,IAAI,0BAA0B,IAAI,IAAI,mBAAmB,eAAe;;CAGxE,MAAM,cAAc,SAClB,mBAAmB,eAAe,wBAAwB,IAAI,IAAI,KAAK,gBAAgB,IAAI,IAAI;;CAGjG,MAAM,mBAAmB,SAAmD;EAC1E,IAAI,mBAAmB,eAAe,wBAAwB,IAAI,IAAI,GAAG,OAAO;EAChF,IAAI,gBAAgB,IAAI,IAAI,GAAG,OAAO;CAExC;CACA,IAAI,SAA2B;CAC/B,IAAI,aAAwD,CAAC;CAC7D,IAAI,QAA6B,CAAC;CAClC,IAAI,iCAAiB,IAAI,IAA6B;CACtD,IAAI,6BAAa,IAAI,IAAsB;CAC3C,IAAI,cAAc;;CAGlB,MAAM,kCAAkB,IAAI,IAAmC;;;;;;;CAQ/D,MAAM,wCAAwB,IAAI,IAAY;;;;;;;;CAS9C,MAAM,uCAAuB,IAAI,IAAY;;CAG7C,MAAM,sBAAsB,WAC1B,sBAAsB,IAAI,OAAO,IAAI,IAAI;EAAE,GAAG;EAAQ,gBAAgB;CAAK,IAAI;CAEjF,MAAM,mBAAmB;;CAGzB,SAAS,cAAc,YAA0B;EAC/C,IAAI,CAAC,UAAU,OAAO,OAAO,oBAAoB,YAAY;EAC7D,MAAM,SAAS,OAAO,gBAAgB,UAAU;EAChD,IAAI,CAAC,QAAQ;EAEb,IAAI,SAAS;EACb,MAAM,QAAQ,WAAW,IAAI,UAAU,KAAK,CAAC;EAC7C,WAAW,IAAI,YAAY,KAAK;EAEhC,OAAO,GAAG,SAAS,UAAkB;GACnC,UAAU,MAAM,SAAS;GACzB,MAAM,QAAQ,OAAO,MAAM,IAAI;GAE/B,SAAS,MAAM,IAAI;GACnB,KAAK,MAAM,QAAQ,OACjB,IAAI,KAAK,KAAK,GAAG;IACf,MAAM,KAAK,IAAI;IACf,IAAI,MAAM,SAAS,kBACjB,MAAM,MAAM;GAEhB;EAEJ,CAAC;EAED,OAAO,GAAG,aAAa;GACrB,IAAI,OAAO,KAAK,GAAG;IACjB,MAAM,KAAK,MAAM;IACjB,IAAI,MAAM,SAAS,kBACjB,MAAM,MAAM;GAEhB;EACF,CAAC;CACH;CAEA,SAAS,oBAAoB,MAAc,KAA0B;EAKnE,MAAM,QACJ,IAAI,UAAU,WAAW,oBAAoB,YAAY,MAAM,GAAG,CAAC,IAAI,uBAAuB,KAAA;EAChG,IAAI,CAAC,OAAO,OAAO,KAAA;EAMnB,MAAM,cAAc,wBAAwB,KAAK;EAEjD,OAAO,IAAI,uBAAuB;GAChC;GACA,gBAAgB;IACd,eAAe,CAAC,WAAW;IAC3B,aAAa,MAAM,cAAc,mBAAmB;IACpD,aAAa,CAAC,sBAAsB,eAAe;IACnD,gBAAgB,CAAC,MAAM;IACvB,GAAI,MAAM,QAAQ,SAAS,EAAE,OAAO,MAAM,OAAO,KAAK,GAAG,EAAE,IAAI,CAAC;GAClE;GACA,mBAAmB,MAAM,WACpB;IACC,WAAW,MAAM;IACjB,GAAI,MAAM,eAAe,EAAE,eAAe,MAAM,aAAa,IAAI,CAAC;GACpE,IACA,KAAA;GACJ,SAAS,IAAI,iBAAiB,oBAAoB,YAAY,MAAM,GAAG,CAAC;GACxE,4BAA2B,QAAO;IAChC,gBAAgB,IAAI,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC;GAC5C;EACF,CAAC;CACH;CAEA,SAAS,gBAAgB,SAAqF;EAC5G,MAAM,OAAkD,CAAC;EACzD,KAAK,MAAM,CAAC,MAAM,QAAQ,OAAO,QAAQ,OAAO,GAC9C,IAAI,SAAS,KAAK;GAChB,MAAM,UAAU;GAChB,KAAK,QAAQ;IACX,KAAK,IAAI,IAAI,QAAQ,GAAG;IACxB,aAAa,QAAQ,UAAU,EAAE,SAAS,QAAQ,QAAQ,IAAI,KAAA;IAC9D,cAAc,oBAAoB,MAAM,OAAO;GACjD;EACF,OACE,KAAK,QAAQ;GAAE,SAAS,IAAI;GAAS,MAAM,IAAI;GAAM,KAAK,IAAI;GAAK,QAAQ;EAAO;EAGtF,OAAO;CACT;;CAGA,SAAS,sBAA4B;EACnC,KAAK,MAAM,CAAC,MAAM,QAAQ,OAAO,QAAQ,OAAO,cAAc,CAAC,CAAC,GAAG;GACjE,MAAM,QAAQ,gBAAgB,IAAI;GAClC,IAAI,CAAC,OAAO;GACZ,eAAe,IAAI,MAAM;IACvB;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW,aAAa,GAAG;IAC3B,UAAU;IACV,eAAe;GACjB,CAAC;EACH;CACF;CAEA,eAAe,yBAAwC;EACrD,oBAAoB;EAEpB,MAAM,UAAU,OAAO,YAAY,OAAO,QAAQ,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,IAAI,CAAC,CAAC;EAChH,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC,WAAW,GAClC;EAIF,MAAM,cAAc,OAAO,KAAK,OAAO;EACvC,KAAK,MAAM,QAAQ,aACjB,eAAe,IAAI,MAAM;GACvB;GACA,WAAW;GACX,YAAY;GACZ,WAAW;GACX,WAAW,CAAC;GACZ,WAAW,aAAa,QAAQ,KAAM;EACxC,CAAC;EAGH,aAAa,gBAAgB,OAAO;EACpC,SAAS,IAAI,UAAU;GACrB,IAAI;GACJ,SAAS;GACT,SAAS;EACX,CAAC;EAKD,IAAI;GACF,MAAM,EAAE,UAAU,WAAW,MAAM,OAAO,uBAAuB;GACjE,MAAM,gBAAgB;GAGtB,KAAK,MAAM,CAAC,YAAY,gBAAgB,OAAO,QAAQ,aAAa,GAClE,KAAK,MAAM,CAAC,UAAU,eAAe,OAAO,QAAQ,WAAW,GAC7D,MAAM,GAAG,WAAW,GAAG,cAAc;GAIzC,KAAK,MAAM,QAAQ,aAAa;IAC9B,MAAM,cAAc,cAAc;IAClC,IAAI,eAAe,OAAO,KAAK,WAAW,CAAC,CAAC,SAAS,GAAG;KACtD,MAAM,YAAY,OAAO,KAAK,WAAW,CAAC,CAAC,KAAI,MAAK,GAAG,KAAK,GAAG,GAAG;KAClE,eAAe,IAAI,MAAM;MACvB;MACA,WAAW;MACX,WAAW,UAAU;MACrB;MACA,WAAW,aAAa,QAAQ,KAAM;KACxC,CAAC;IACH,OAAO;KAEL,MAAM,QAAQ,OAAO,SAAS;KAC9B,eAAe,IAAI,MAAM;MACvB;MACA,WAAW;MACX,WAAW;MACX,WAAW,CAAC;MACZ,WAAW,aAAa,QAAQ,KAAM;MACtC;MACA,GAAI,gBAAgB,MAAM,QAAQ,OAAQ,KAAK,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;KAC5E,CAAC;IACH;GACF;GAGA,KAAK,MAAM,QAAQ,aACjB,cAAc,IAAI;EAEtB,SAAS,OAAO;GACd,MAAM,SAAS,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;GAEpE,KAAK,MAAM,QAAQ,aACjB,eAAe,IAAI,MAAM;IACvB;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW,aAAa,QAAQ,KAAM;IACtC,OAAO;IACP,GAAI,gBAAgB,MAAM,QAAQ,OAAQ,MAAM,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;GAC7E,CAAC;EAEL;CACF;;;;;;;;;CAUA,SAAS,gBAAgB,MAAc,KAAsB,OAAyB;EACpF,IAAI,aAAa,GAAG,MAAM,QAAQ,OAAO;EACzC,IAAI,QAAQ,qBAAqB,IAAI,MAAM,cAAc,OAAO;EAChE,IAAI,WAAW,KAAK,EAAE,cAAc,OAAO;EAC3C,OAAO,UAAU,KAAA,KAAa,sCAAsC,KAAK,KAAK;CAChF;;;;;CAMA,eAAe,oBACb,MACA,KACA,SAC0B;EAC1B,MAAM,YAAY,aAAa,GAAG;EAGlC,MAAM,SAAS,GAAG,KAAK;EACvB,KAAK,MAAM,OAAO,OAAO,KAAK,KAAK,GACjC,IAAI,IAAI,WAAW,MAAM,GACvB,OAAO,MAAM;EAKjB,WAAW,OAAO,IAAI;EACtB,eAAe,IAAI,MAAM;GACvB;GACA,WAAW;GACX,YAAY;GACZ,WAAW;GACX,WAAW,CAAC;GACZ;EACF,CAAC;EAED,IAAI;GACF,MAAM,QAAQ;GAGd,cAAc,IAAI;GAGlB,MAAM,EAAE,UAAU,WAAW,MAAM,OAAQ,uBAAuB;GAClE,MAAM,cAAc,SAAS;GAC7B,MAAM,cAAc,OAAO;GAE3B,IAAI,aAAa;IACf,MAAM,SAA0B;KAC9B;KACA,WAAW;KACX,WAAW;KACX,WAAW,CAAC;KACZ;KACA,OAAO;KACP,GAAI,gBAAgB,MAAM,KAAK,WAAW,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACvE;IACA,eAAe,IAAI,MAAM,MAAM;IAC/B,OAAO;GACT,OAAO,IAAI,eAAe,OAAO,KAAK,WAAW,CAAC,CAAC,SAAS,GAAG;IAC7D,MAAM,YAAY,OAAO,KAAK,WAAW,CAAC,CAAC,KAAI,MAAK,GAAG,KAAK,GAAG,GAAG;IAClE,KAAK,MAAM,CAAC,UAAU,eAAe,OAAO,QAAQ,WAAW,GAC7D,MAAM,GAAG,KAAK,GAAG,cAAc;IAEjC,MAAM,SAA0B;KAC9B;KACA,WAAW;KACX,WAAW,UAAU;KACrB;KACA;IACF;IACA,eAAe,IAAI,MAAM,MAAM;IAC/B,OAAO;GACT,OAAO;IACL,MAAM,SAA0B;KAC9B;KACA,WAAW;KACX,WAAW;KACX,WAAW,CAAC;KACZ;KACA,OAAO;IACT;IACA,eAAe,IAAI,MAAM,MAAM;IAC/B,OAAO;GACT;EACF,SAAS,OAAO;GACd,MAAM,SAAS,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;GACpE,MAAM,SAA0B;IAC9B;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ;IACA,OAAO;IACP,GAAI,gBAAgB,MAAM,KAAK,MAAM,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;GAClE;GACA,eAAe,IAAI,MAAM,MAAM;GAC/B,OAAO;EACT;CACF;CAEA,eAAe,aAA4B;EACzC,IAAI,QAAQ;GACV,IAAI;IACF,MAAM,OAAO,WAAW;GAC1B,QAAQ,CAER;GACA,SAAS;EACX;CACF;;CAGA,eAAe,qBAAoC;EACjD,MAAM,WAAW;EACjB,QAAQ,CAAC;EACT,iCAAiB,IAAI,IAAI;EACzB,6BAAa,IAAI,IAAI;EACrB,cAAc;EACd,MAAM,uBAAuB;EAC7B,cAAc;CAChB;CAEA,SAAS,eAAe,MAA+B;EACrD,MAAM,MAAM,OAAO,aAAa;EAChC,OAAO;GACL;GACA,WAAW;GACX,WAAW;GACX,WAAW,CAAC;GACZ,WAAW,MAAM,aAAa,GAAG,IAAI;GACrC,UAAU;GACV,eAAe,gBAAgB,IAAI;EACrC;CACF;CAOA,SAAS,oBAAoB,QAA4C;EACvE,MAAM,QAAQ,IAAI,IAAI,oBAAoB,UAAU,CAAC;EACrD,OAAO,KAAK;EACZ,kBAAkB;EAClB,oBAAoB,YAAY,MAAM,KAAK,KAAK,CAAC;CACnD;CAEA,SAAS,mBAAmB,QAAuF;EACjH,MAAM,SAAS,uBAAuB;EACtC,MAAM,QAAQ;GAAE,aAAa,OAAO;GAAa,iBAAiB,IAAI,IAAI,OAAO,eAAe;EAAE;EAClG,OAAO,KAAK;EACZ,0BAA0B,MAAM;EAChC,qBAAqB;GAAE,aAAa,MAAM;GAAa,iBAAiB,MAAM,KAAK,MAAM,eAAe;EAAE;EAC1G,uBAAuB,kBAAkB;CAC3C;CAEA,OAAO;EACL,MAAM,OAAO;GACX,IAAI,aAAa;GACjB,MAAM,uBAAuB;GAC7B,cAAc;EAChB;EAEA,MAAM,mBAA2C;GAC/C,MAAM,KAAK,KAAK;GAChB,MAAM,WAAW,MAAM,KAAK,eAAe,OAAO,CAAC;GACnD,MAAM,YAAY,SAAS,QAAO,MAAK,EAAE,SAAS;GAElD,OAAO;IACL;IACA,QAHa,SAAS,QAAO,MAAK,CAAC,EAAE,aAAa,CAAC,EAAE,QAGhD;IACL,SAAS,CAAC,GAAI,OAAO,kBAAkB,CAAC,CAAE;IAC1C,YAAY,UAAU,QAAQ,KAAK,MAAM,MAAM,EAAE,WAAW,CAAC;GAC/D;EACF;EAEA,MAAM,SAAS;GACb,SAAS,kBAAkB,cAAc,YAAY,eAAe,iBAAiB,CAAC;GACtF,kBAAkB,IAAI,IAAI,oBAAoB,UAAU,CAAC;GACzD,qBAAqB,uBAAuB;GAC5C,0BAA0B,IAAI,IAAI,mBAAmB,eAAe;GACpE,MAAM,mBAAmB;EAC3B;EAEA,MAAM,kBAAkB,MAAc,UAAmB,SAA0D;GACjH,IAAI,CAAC,OAAO,aAAa,OACvB,OAAO;IACL;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW;IACX,OAAO,WAAW,KAAK;GACzB;GAGF,MAAM,yBAAyB,WAAW,IAAI;GAE9C,IAAI,SAAS,QACX,oBAAmB,UAAS;IAC1B,IAAI,UACF,MAAM,gBAAgB,IAAI,IAAI;SAE9B,MAAM,gBAAgB,OAAO,IAAI;GAErC,CAAC;QAED,qBAAoB,UAAS;IAC3B,IAAI,UACF,MAAM,IAAI,IAAI;SAEd,MAAM,OAAO,IAAI;GAErB,CAAC;GAMH,IAAI,WAAW,IAAI,MAAM,wBAAwB;IAC/C,MAAM,mBAAmB;IACzB,OAAO,mBAAmB,eAAe,IAAI,IAAI,KAAK,eAAe,IAAI,CAAC;GAC5E;GAGA,OAAO,mBACL,WAAW,IAAI,IAAI,eAAe,IAAI,IAAK,eAAe,IAAI,IAAI,KAAK,eAAe,IAAI,CAC5F;EACF;EAEA,MAAM,eAAe,UAAmB,SAA+C;GACrF,MAAM,kBAAkB,OAAO,KAAK,OAAO,cAAc,CAAC,CAAC;GAC3D,MAAM,kBAAkB,gBAAgB,QAAO,SAAQ,WAAW,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;GACjF,IAAI,SAAS,QACX,oBAAmB,UAAS;IAC1B,MAAM,cAAc;IACpB,IAAI,CAAC,UAGH,MAAM,gBAAgB,MAAM;GAEhC,CAAC;QAED,qBAAoB,UAAS;IAC3B,IAAI,UACF,KAAK,MAAM,QAAQ,iBACjB,MAAM,IAAI,IAAI;SAGhB,MAAM,MAAM;GAEhB,CAAC;GAMH,IADuB,gBAAgB,QAAO,SAAQ,WAAW,IAAI,CAAC,CAAC,CAAC,KAAK,GAC5D,MAAM,iBACrB,MAAM,mBAAmB;EAE7B;EAEA,qBAAqB;GACnB,OAAO,OAAO,KAAK,OAAO,cAAc,CAAC,CAAC,CAAC,CACxC,QAAO,SAAQ,WAAW,IAAI,CAAC,CAAC,CAChC,KAAK;EACV;EAEA,wBAAwB;GACtB,OAAO,mBAAmB;EAC5B;EAEA,MAAM,gBAAgB,MAAwC;GAC5D,IAAI,WAAW,IAAI,GACjB,OAAO;IAAE,GAAG,eAAe,IAAI;IAAG,OAAO,WAAW,KAAK;GAAiC;GAE5F,MAAM,MAAM,OAAO,aAAa;GAChC,IAAI,CAAC,KACH,OAAO;IACL;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW;IACX,OAAO,WAAW,KAAK;GACzB;GAGF,IAAI,CAAC,QACH,OAAO;IACL;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW,aAAa,GAAG;IAC3B,OAAO;GACT;GAIF,OAAO,oBAAoB,MAAM,WAAW,OAAQ,gBAAgB,IAAI,CAAC;EAC3E;EAEA,MAAM,mBACJ,MACA,SAC0B;GAC1B,MAAM,MAAM,OAAO,aAAa;GAChC,IAAI,CAAC,KACH,OAAO;IACL;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW;IACX,OAAO,WAAW,KAAK;GACzB;GAGF,IAAI,WAAW,IAAI,GACjB,OAAO;IAAE,GAAG,eAAe,IAAI;IAAG,OAAO,WAAW,KAAK;GAAiC;GAG5F,IAAI,CAAC,QACH,OAAO;IACL;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW,aAAa,GAAG;IAC3B,OAAO;GACT;GAGF,IAAI,aAAa,GAAG,MAAM,QACxB,OAAO;IACL;IACA,WAAW;IACX,WAAW;IACX,WAAW,CAAC;IACZ,WAAW;IACX,OAAO,WAAW,KAAK;GACzB;GAYF,MAAM,MAAM,WAAW;GACvB,IAAI,KAAK,OAAO,CAAC,IAAI,cACnB,IAAI,eAAe,oBAAoB,MAAM;IAAE,GAAI;IAA6B,OAAO;GAAqB,CAAC;GAU/G,IAAI,sBAAsB,IAAI,IAAI,GAAG;IACnC,MAAM,UAAU,eAAe,IAAI,IAAI;IACvC,OAAO;KACL;KACA,WAAW,SAAS,aAAa;KACjC,YAAY,SAAS;KACrB,WAAW,SAAS;KACpB,WAAW,SAAS,aAAa;KACjC,WAAW,SAAS,aAAa,CAAC;KAClC,WAAW,SAAS,aAAa,aAAa,GAAG;KACjD,OAAO,uBAAuB,KAAK;IACrC;GACF;GAEA,IAAI,SAAS,oBACX,gBAAgB,IAAI,MAAM,QAAQ,kBAAkB;GAEtD,sBAAsB,IAAI,IAAI;GAC9B,qBAAqB,OAAO,IAAI;GAChC,IAAI;IACF,MAAM,SAAS,MAAM,oBAAoB,MAAM,WAC7C,OAAQ,aAAa,MAAM,SAAS,cAAc,KAAA,IAAY,KAAA,IAAY,EAAE,WAAW,QAAQ,UAAU,CAAC,CAC5G;IAKA,MAAM,cACJ,qBAAqB,IAAI,IAAI,KAAK,CAAC,OAAO,YAAY;KAAE,GAAG;KAAQ,WAAW;IAAK,IAAI;IACzF,eAAe,IAAI,MAAM,WAAW;IACpC,OAAO;GACT,UAAU;IACR,gBAAgB,OAAO,IAAI;IAC3B,sBAAsB,OAAO,IAAI;IACjC,qBAAqB,OAAO,IAAI;GAClC;EACF;EAEA,MAAM,2BAA2B,MAAgC;GAC/D,IAAI,CAAC,QACH,OAAO;GAIT,qBAAqB,IAAI,IAAI;GAC7B,MAAM,YAAY,MAAM,OAAO,qBAAqB,IAAI;GACxD,IAAI,CAAC,WACH,qBAAqB,OAAO,IAAI;GAElC,OAAO;EACT;EAEA;EAEA,WAAW;GACT,OAAO,EAAE,GAAG,MAAM;EACpB;EAEA,aAAa;GACX,MAAM,gBAAgB,OAAO,eAAe,KAAA,KAAa,OAAO,KAAK,OAAO,UAAU,CAAC,CAAC,SAAS;GACjG,MAAM,aAAa,OAAO,mBAAmB,KAAA,KAAa,OAAO,eAAe,SAAS;GACzF,OAAO,iBAAiB;EAC1B;EAEA,oBAAoB;GAClB,OAAO,MAAM,KAAK,eAAe,OAAO,GAAG,kBAAkB;EAC/D;EAEA,oBAAoB;GAClB,OAAO,CAAC,GAAI,OAAO,kBAAkB,CAAC,CAAE;EAC1C;EAEA,iBAAiB;GACf,OAAO;IACL,SAAS,kBAAkB,YAAY,aAAa;IACpD,QAAQ,iBAAiB,aAAa;IACtC,QAAQ,sBAAsB,UAAU;GAC1C;EACF;EAEA,YAAY;GACV,OAAO;EACT;EAEA,cAAc,MAAc;GAC1B,OAAO,CAAC,GAAI,WAAW,IAAI,IAAI,KAAK,CAAC,CAAE;EACzC;CACF;AACF"}

package/dist/onboarding/settings.d.ts

@@ -263,8 +263,15 @@ export interface GlobalSettings {
     shellPassthrough: ShellPassthroughSettings;
     voice: VoiceSettings;
     signals: SignalSettings;
+    mcp: McpDiscoverySettings;
     observability: ObservabilitySettings;
 }
+export interface McpDiscoverySettings {
+    /** Reuse top-level MCP servers from ~/.claude.json. */
+    claudeCodeGlobal: boolean;
+    /** Reuse MCP servers from $CODEX_HOME/config.toml or ~/.codex/config.toml. */
+    codexGlobal: boolean;
+}
 export interface SignalSettings {
     /** Opt into local Unix socket PubSub for cross-process signal routing. */
     unixSocketPubSub: boolean;

package/dist/onboarding/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/onboarding/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/onboarding/settings.ts"],"names":[],"mappings":"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"}

package/dist/onboarding/settings.js

@@ -135,6 +135,10 @@ const DEFAULTS = {
 		unixSocketPubSub: false,
 		experimentalGithubSignals: false
 	},
+	mcp: {
+		claudeCodeGlobal: false,
+		codexGlobal: false
+	},
 	observability: {
 		resources: {},
 		localTracing: false
@@ -192,6 +196,13 @@ function parseSignalSettings(rawSignals) {
 		experimentalGithubSignals: typeof raw.experimentalGithubSignals === "boolean" ? raw.experimentalGithubSignals : DEFAULTS.signals.experimentalGithubSignals
 	};
 }
+function parseMcpDiscoverySettings(rawMcp) {
+	const raw = rawMcp && typeof rawMcp === "object" ? rawMcp : {};
+	return {
+		claudeCodeGlobal: typeof raw.claudeCodeGlobal === "boolean" ? raw.claudeCodeGlobal : DEFAULTS.mcp.claudeCodeGlobal,
+		codexGlobal: typeof raw.codexGlobal === "boolean" ? raw.codexGlobal : DEFAULTS.mcp.codexGlobal
+	};
+}
 function hasQuietModePreferenceSelected(rawOnboarding) {
 	return Boolean(rawOnboarding && typeof rawOnboarding === "object" && Object.prototype.hasOwnProperty.call(rawOnboarding, "quietModePreferenceSelected"));
 }
@@ -428,6 +439,7 @@ function migrateFromAuth(settingsPath) {
 			shellPassthrough: parseShellPassthroughSettings(raw.shellPassthrough),
 			voice: parseVoiceSettings(raw.voice),
 			signals: parseSignalSettings(raw.signals),
+			mcp: parseMcpDiscoverySettings(raw.mcp),
 			observability: parseObservabilitySettings(raw.observability)
 		};
 		applyQuietModePreferenceRollout(settings, raw.onboarding);
@@ -519,6 +531,7 @@ function loadSettings(filePath = getSettingsPath()) {
 			shellPassthrough: parseShellPassthroughSettings(raw.shellPassthrough),
 			voice: parseVoiceSettings(raw.voice),
 			signals: parseSignalSettings(raw.signals),
+			mcp: parseMcpDiscoverySettings(raw.mcp),
 			observability: parseObservabilitySettings(raw.observability)
 		};
 		let settingsChanged = false;