@mastra/code-sdk 1.7.0-alpha.15 → 1.7.0-alpha.16

package/dist/mcp/manager.d.ts

@@ -46,26 +46,28 @@ export interface McpManager {
     /**
      * Disable or enable a single server by name. The change is persisted (in
      * mastracode's app data, not the user's config files) and survives restarts.
-     * With `global: true` the change applies to every project; otherwise it is
-     * scoped to this project. Enabling only removes the server from the given
-     * scope — a server disabled in the other scope stays disabled, and the
-     * returned status's `disabledScope` says which scope still applies.
+     * With `global: true`, this changes the default for every project. Otherwise
+     * it records an explicit project override, which can override a global
+     * per-server disable. The global all-MCP kill switch remains absolute.
      * Connections are rebuilt, so other servers reconnect — same behavior as
      * {@link reload}. Returns the server's resulting status.
      */
     setServerDisabled(name: string, disabled: boolean, options?: {
         global?: boolean;
     }): Promise<McpServerStatus>;
+    /** Clear a server's explicit project override so it inherits the global default. */
+    inheritServer(name: string): Promise<McpServerStatus>;
     /**
-     * Disable or enable all servers at once. Project scope records every
-     * currently-configured server name; enabling clears the project list.
-     * Global scope sets/clears a persisted all-MCP kill switch (and, when
-     * enabling, also clears globally disabled server names). Persisted like
-     * {@link setServerDisabled}.
+     * Disable or enable all servers at once. Project scope records an explicit
+     * override for every currently configured server. Global scope sets/clears a
+     * persisted all-MCP kill switch (and, when enabling, also clears globally
+     * disabled server names). Persisted like {@link setServerDisabled}.
      */
     setAllDisabled(disabled: boolean, options?: {
         global?: boolean;
     }): Promise<void>;
+    /** Clear every explicit project override so all servers inherit global defaults. */
+    inheritAllServers(): Promise<void>;
     /** Names of configured servers that are currently disabled (any scope). */
     getDisabledServers(): string[];
     /** Whether all MCP is disabled globally (across every project). */

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;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"}
+{"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;AAQ/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;;;;;;;;OAQG;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,oFAAoF;IACpF,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACtD;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjF,oFAAoF;IACpF,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,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,CA8uBZ"}

package/dist/mcp/manager.js

@@ -1,7 +1,7 @@
 import { DEFAULT_CONFIG_DIR } from "../constants.js";
 import { getAppDataDir } from "../utils/project.js";
 import { DEFAULT_OAUTH_REDIRECT_URL, getClaudeSettingsPath, getGlobalMcpPath, getProjectMcpPath, loadMcpConfig, resolveOAuthRedirectUrl } from "./config.js";
-import { loadDisabledServers, loadGlobalDisableState, saveDisabledServers, saveGlobalDisableState } from "./state.js";
+import { loadGlobalDisableState, loadProjectServerOverrides, saveGlobalDisableState, saveProjectServerOverrides } from "./state.js";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import { MCPClient, MCPOAuthClientProvider } from "@mastra/mcp";
@@ -95,15 +95,22 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 		};
 	};
 	let config = applyExtraServers(loadMcpConfig(projectDir, configDirName, externalDiscovery));
-	let disabledServers = new Set(loadDisabledServers(projectDir));
+	let projectServerOverrides = new Map(Object.entries(loadProjectServerOverrides(projectDir)));
 	let globalDisableState = loadGlobalDisableState();
 	let globallyDisabledServers = new Set(globalDisableState.disabledServers);
-	/** Whether a server is disabled in any scope (global kill switch, global list, or project list). */
-	const isDisabled = (name) => globalDisableState.allDisabled || globallyDisabledServers.has(name) || disabledServers.has(name);
-	/** Which scope disables a server. Global takes precedence — project-level enable can't undo it. */
+	/** Whether a server is disabled after applying the kill switch, project override, and global default. */
+	const isDisabled = (name) => {
+		if (globalDisableState.allDisabled) return true;
+		const projectOverride = projectServerOverrides.get(name);
+		if (projectOverride) return projectOverride === "disabled";
+		return globallyDisabledServers.has(name);
+	};
+	/** Which scope currently disables a server. The global kill switch remains absolute. */
 	const disabledScopeOf = (name) => {
-		if (globalDisableState.allDisabled || globallyDisabledServers.has(name)) return "global";
-		if (disabledServers.has(name)) return "project";
+		if (globalDisableState.allDisabled) return "global";
+		const projectOverride = projectServerOverrides.get(name);
+		if (projectOverride === "disabled") return "project";
+		if (!projectOverride && globallyDisabledServers.has(name)) return "global";
 	};
 	let client = null;
 	let serverDefs = {};
@@ -128,11 +135,14 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 	* selector being closed and reopened mid-flow.
 	*/
 	const cancelledAuthServers = /* @__PURE__ */ new Set();
-	/** Overlay the manager-owned `authenticating` flag onto a status snapshot. */
-	const withAuthenticating = (status) => authenticatingServers.has(status.name) ? {
+	/** Overlay manager-owned state onto a status snapshot. */
+	const withManagerState = (status) => ({
 		...status,
-		authenticating: true
-	} : status;
+		...authenticatingServers.has(status.name) ? { authenticating: true } : {},
+		...projectServerOverrides.has(status.name) ? { projectOverride: projectServerOverrides.get(status.name) } : {},
+		globalDefault: globallyDisabledServers.has(status.name) ? "disabled" : "enabled",
+		globalKillSwitch: globalDisableState.allDisabled
+	});
 	const MAX_STDERR_LINES = 200;
 	/** Hook into a server's stderr stream and buffer its output. */
 	function captureStderr(serverName) {
@@ -394,10 +404,10 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 		};
 	}
 	function persistProjectDelta(mutate) {
-		const fresh = new Set(loadDisabledServers(projectDir));
+		const fresh = new Map(Object.entries(loadProjectServerOverrides(projectDir)));
 		mutate(fresh);
-		disabledServers = fresh;
-		saveDisabledServers(projectDir, Array.from(fresh));
+		projectServerOverrides = fresh;
+		saveProjectServerOverrides(projectDir, Object.fromEntries(fresh));
 	}
 	function persistGlobalDelta(mutate) {
 		const onDisk = loadGlobalDisableState();
@@ -421,7 +431,7 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 		},
 		async initInBackground() {
 			await this.init();
-			const statuses = Array.from(serverStatuses.values());
+			const statuses = Array.from(serverStatuses.values(), withManagerState);
 			const connected = statuses.filter((s) => s.connected);
 			return {
 				connected,
@@ -432,7 +442,7 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 		},
 		async reload() {
 			config = applyExtraServers(loadMcpConfig(projectDir, configDirName, externalDiscovery));
-			disabledServers = new Set(loadDisabledServers(projectDir));
+			projectServerOverrides = new Map(Object.entries(loadProjectServerOverrides(projectDir)));
 			globalDisableState = loadGlobalDisableState();
 			globallyDisabledServers = new Set(globalDisableState.disabledServers);
 			await rebuildConnections();
@@ -451,15 +461,30 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 				if (disabled) state.disabledServers.add(name);
 				else state.disabledServers.delete(name);
 			});
-			else persistProjectDelta((names) => {
-				if (disabled) names.add(name);
-				else names.delete(name);
+			else persistProjectDelta((overrides) => {
+				overrides.set(name, disabled ? "disabled" : "enabled");
 			});
 			if (isDisabled(name) !== wasEffectivelyDisabled) {
 				await rebuildConnections();
-				return withAuthenticating(serverStatuses.get(name) ?? disabledStatus(name));
+				return withManagerState(serverStatuses.get(name) ?? disabledStatus(name));
 			}
-			return withAuthenticating(isDisabled(name) ? disabledStatus(name) : serverStatuses.get(name) ?? disabledStatus(name));
+			return withManagerState(isDisabled(name) ? disabledStatus(name) : serverStatuses.get(name) ?? disabledStatus(name));
+		},
+		async inheritServer(name) {
+			if (!config.mcpServers?.[name]) return {
+				name,
+				connected: false,
+				toolCount: 0,
+				toolNames: [],
+				transport: "stdio",
+				error: `Server "${name}" not found in config`
+			};
+			const wasEffectivelyDisabled = isDisabled(name);
+			persistProjectDelta((overrides) => {
+				overrides.delete(name);
+			});
+			if (isDisabled(name) !== wasEffectivelyDisabled) await rebuildConnections();
+			return withManagerState(isDisabled(name) ? disabledStatus(name) : serverStatuses.get(name) ?? disabledStatus(name));
 		},
 		async setAllDisabled(disabled, options) {
 			const configuredNames = Object.keys(config.mcpServers ?? {});
@@ -468,9 +493,16 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 				state.allDisabled = disabled;
 				if (!disabled) state.disabledServers.clear();
 			});
-			else persistProjectDelta((names) => {
-				if (disabled) for (const name of configuredNames) names.add(name);
-				else names.clear();
+			else persistProjectDelta((overrides) => {
+				for (const name of configuredNames) overrides.set(name, disabled ? "disabled" : "enabled");
+			});
+			if (configuredNames.filter((name) => isDisabled(name)).join(",") !== effectiveBefore) await rebuildConnections();
+		},
+		async inheritAllServers() {
+			const configuredNames = Object.keys(config.mcpServers ?? {});
+			const effectiveBefore = configuredNames.filter((name) => isDisabled(name)).join(",");
+			persistProjectDelta((overrides) => {
+				overrides.clear();
 			});
 			if (configuredNames.filter((name) => isDisabled(name)).join(",") !== effectiveBefore) await rebuildConnections();
 		},
@@ -586,7 +618,7 @@ function createMcpManager(projectDir, configDirName = DEFAULT_CONFIG_DIR, extraS
 			return hasConfigured || hasSkipped;
 		},
 		getServerStatuses() {
-			return Array.from(serverStatuses.values(), withAuthenticating);
+			return Array.from(serverStatuses.values(), withManagerState);
 		},
 		getSkippedServers() {
 			return [...config.skippedServers ?? []];

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 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":"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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 {\n  loadGlobalDisableState,\n  loadProjectServerOverrides,\n  saveGlobalDisableState,\n  saveProjectServerOverrides,\n} from './state.js';\nimport type { McpProjectServerOverride } 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`, this changes the default for every project. Otherwise\n   * it records an explicit project override, which can override a global\n   * per-server disable. The global all-MCP kill switch remains absolute.\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  /** Clear a server's explicit project override so it inherits the global default. */\n  inheritServer(name: string): Promise<McpServerStatus>;\n  /**\n   * Disable or enable all servers at once. Project scope records an explicit\n   * override for every currently configured server. Global scope sets/clears a\n   * persisted all-MCP kill switch (and, when enabling, also clears globally\n   * disabled server names). Persisted like {@link setServerDisabled}.\n   */\n  setAllDisabled(disabled: boolean, options?: { global?: boolean }): Promise<void>;\n  /** Clear every explicit project override so all servers inherit global defaults. */\n  inheritAllServers(): 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 projectServerOverrides = new Map<string, McpProjectServerOverride>(\n    Object.entries(loadProjectServerOverrides(projectDir)),\n  );\n  let globalDisableState = loadGlobalDisableState();\n  let globallyDisabledServers = new Set(globalDisableState.disabledServers);\n\n  /** Whether a server is disabled after applying the kill switch, project override, and global default. */\n  const isDisabled = (name: string): boolean => {\n    if (globalDisableState.allDisabled) return true;\n    const projectOverride = projectServerOverrides.get(name);\n    if (projectOverride) return projectOverride === 'disabled';\n    return globallyDisabledServers.has(name);\n  };\n\n  /** Which scope currently disables a server. The global kill switch remains absolute. */\n  const disabledScopeOf = (name: string): 'project' | 'global' | undefined => {\n    if (globalDisableState.allDisabled) return 'global';\n    const projectOverride = projectServerOverrides.get(name);\n    if (projectOverride === 'disabled') return 'project';\n    if (!projectOverride && globallyDisabledServers.has(name)) return 'global';\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 manager-owned state onto a status snapshot. */\n  const withManagerState = (status: McpServerStatus): McpServerStatus => ({\n    ...status,\n    ...(authenticatingServers.has(status.name) ? { authenticating: true } : {}),\n    ...(projectServerOverrides.has(status.name) ? { projectOverride: projectServerOverrides.get(status.name) } : {}),\n    globalDefault: globallyDisabledServers.has(status.name) ? 'disabled' : 'enabled',\n    globalKillSwitch: globalDisableState.allDisabled,\n  });\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: (overrides: Map<string, McpProjectServerOverride>) => void): void {\n    const fresh = new Map<string, McpProjectServerOverride>(Object.entries(loadProjectServerOverrides(projectDir)));\n    mutate(fresh);\n    projectServerOverrides = fresh;\n    saveProjectServerOverrides(projectDir, Object.fromEntries(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(), withManagerState);\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      projectServerOverrides = new Map(Object.entries(loadProjectServerOverrides(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(overrides => {\n          overrides.set(name, disabled ? 'disabled' : 'enabled');\n        });\n      }\n\n      // Only rebuild connections when the server's effective state actually\n      // flipped. State changes that only alter an inherited default or an\n      // override beneath the global kill switch leave connections alone.\n      if (isDisabled(name) !== wasEffectivelyDisabled) {\n        await rebuildConnections();\n        return withManagerState(serverStatuses.get(name) ?? disabledStatus(name));\n      }\n      return withManagerState(\n        isDisabled(name) ? disabledStatus(name) : (serverStatuses.get(name) ?? disabledStatus(name)),\n      );\n    },\n\n    async inheritServer(name: string): 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      persistProjectDelta(overrides => {\n        overrides.delete(name);\n      });\n      if (isDisabled(name) !== wasEffectivelyDisabled) {\n        await rebuildConnections();\n      }\n      return withManagerState(\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 defaults.\n            state.disabledServers.clear();\n          }\n        });\n      } else {\n        persistProjectDelta(overrides => {\n          for (const name of configuredNames) {\n            overrides.set(name, disabled ? 'disabled' : 'enabled');\n          }\n        });\n      }\n      const effectiveAfter = configuredNames.filter(name => isDisabled(name)).join(',');\n      if (effectiveAfter !== effectiveBefore) {\n        await rebuildConnections();\n      }\n    },\n\n    async inheritAllServers(): Promise<void> {\n      const configuredNames = Object.keys(config.mcpServers ?? {});\n      const effectiveBefore = configuredNames.filter(name => isDisabled(name)).join(',');\n      persistProjectDelta(overrides => {\n        overrides.clear();\n      });\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(), withManagerState);\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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"}

package/dist/mcp/state.d.ts

@@ -7,13 +7,15 @@
  *
  *   {
  *     "global": { "allDisabled": true, "disabledServers": ["name"] },
- *     "projects": { "/path/to/project": { "disabledServers": ["name"] } }
+ *     "projects": {
+ *       "/path/to/project": { "serverOverrides": { "name": "enabled" } }
+ *     }
  *   }
  *
- * Disabled names are kept even if the server disappears from config, so a
- * server that is removed and later re-added stays disabled until the user
- * re-enables it.
+ * Project overrides are kept even if the server disappears from config, so a
+ * server that is removed and later re-added keeps its explicit project state.
  */
+export type McpProjectServerOverride = 'enabled' | 'disabled';
 /** Global (all-projects) MCP disable state. */
 export interface McpGlobalDisableState {
     /** When true, every MCP server is disabled regardless of per-server state. */
@@ -22,10 +24,10 @@ export interface McpGlobalDisableState {
     disabledServers: string[];
 }
 export declare function getMcpStatePath(): string;
-/** Load the persisted disabled server names for a project. */
-export declare function loadDisabledServers(projectDir: string): string[];
-/** Persist the disabled server names for a project. */
-export declare function saveDisabledServers(projectDir: string, disabledServers: string[]): void;
+/** Load project-specific server overrides, migrating legacy disabled names in memory. */
+export declare function loadProjectServerOverrides(projectDir: string): Record<string, McpProjectServerOverride>;
+/** Persist project-specific server overrides. */
+export declare function saveProjectServerOverrides(projectDir: string, serverOverrides: Record<string, McpProjectServerOverride>): void;
 /** Load the persisted global disable state (applies to all projects). */
 export declare function loadGlobalDisableState(): McpGlobalDisableState;
 /** Persist the global disable state. Prunes the section when empty. */

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

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/mcp/state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAWH,+CAA+C;AAC/C,MAAM,WAAW,qBAAqB;IACpC,8EAA8E;IAC9E,WAAW,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAgCD,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAEhE;AAED,uDAAuD;AACvD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CASvF;AAED,yEAAyE;AACzE,wBAAgB,sBAAsB,IAAI,qBAAqB,CAM9D;AAED,uEAAuE;AACvE,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,qBAAqB,GAAG,IAAI,CAc/E"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/mcp/state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,UAAU,CAAC;AAO9D,+CAA+C;AAC/C,MAAM,WAAW,qBAAqB;IACpC,8EAA8E;IAC9E,WAAW,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAyCD,yFAAyF;AACzF,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAOvG;AAED,iDAAiD;AACjD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACxD,IAAI,CAUN;AAED,yEAAyE;AACzE,wBAAgB,sBAAsB,IAAI,qBAAqB,CAM9D;AAED,uEAAuE;AACvE,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,qBAAqB,GAAG,IAAI,CAc/E"}

package/dist/mcp/state.js

@@ -11,12 +11,13 @@ import { dirname, join } from "path";
 *
 *   {
 *     "global": { "allDisabled": true, "disabledServers": ["name"] },
-*     "projects": { "/path/to/project": { "disabledServers": ["name"] } }
+*     "projects": {
+*       "/path/to/project": { "serverOverrides": { "name": "enabled" } }
+*     }
 *   }
 *
-* Disabled names are kept even if the server disappears from config, so a
-* server that is removed and later re-added stays disabled until the user
-* re-enables it.
+* Project overrides are kept even if the server disappears from config, so a
+* server that is removed and later re-added keeps its explicit project state.
 */
 function getMcpStatePath() {
 	return join(getAppDataDir(), "mcp-state.json");
@@ -43,15 +44,23 @@ function cleanNames(names) {
 	if (!Array.isArray(names)) return [];
 	return names.filter((name) => typeof name === "string");
 }
-/** Load the persisted disabled server names for a project. */
-function loadDisabledServers(projectDir) {
-	return cleanNames(readStateFile().projects?.[projectDir]?.disabledServers);
+function cleanProjectOverrides(overrides) {
+	if (!overrides || typeof overrides !== "object" || Array.isArray(overrides)) return {};
+	return Object.fromEntries(Object.entries(overrides).filter((entry) => entry[1] === "enabled" || entry[1] === "disabled"));
 }
-/** Persist the disabled server names for a project. */
-function saveDisabledServers(projectDir, disabledServers) {
+/** Load project-specific server overrides, migrating legacy disabled names in memory. */
+function loadProjectServerOverrides(projectDir) {
+	const project = readStateFile().projects?.[projectDir];
+	const overrides = cleanProjectOverrides(project?.serverOverrides);
+	for (const name of cleanNames(project?.disabledServers)) overrides[name] ??= "disabled";
+	return overrides;
+}
+/** Persist project-specific server overrides. */
+function saveProjectServerOverrides(projectDir, serverOverrides) {
 	const state = readStateFile();
 	const projects = state.projects ?? {};
-	if (disabledServers.length > 0) projects[projectDir] = { disabledServers: [...disabledServers].sort() };
+	const sortedOverrides = Object.fromEntries(Object.entries(serverOverrides).sort(([a], [b]) => a.localeCompare(b)));
+	if (Object.keys(sortedOverrides).length > 0) projects[projectDir] = { serverOverrides: sortedOverrides };
 	else delete projects[projectDir];
 	writeStateFile({
 		...state,
@@ -83,6 +92,6 @@ function saveGlobalDisableState(globalState) {
 	});
 }
 //#endregion
-export { getMcpStatePath, loadDisabledServers, loadGlobalDisableState, saveDisabledServers, saveGlobalDisableState };
+export { getMcpStatePath, loadGlobalDisableState, loadProjectServerOverrides, saveGlobalDisableState, saveProjectServerOverrides };
 
 //# sourceMappingURL=state.js.map

package/dist/mcp/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","names":[],"sources":["../../src/mcp/state.ts"],"sourcesContent":["/**\n * Persisted MCP disable state — mastracode-owned so user config files\n * (mcp.json, .mcp.json, .claude/settings.local.json) are never mutated.\n *\n * Stored as a single JSON file in the app data dir, with a global section\n * (applies to every project) and per-project entries:\n *\n *   {\n *     \"global\": { \"allDisabled\": true, \"disabledServers\": [\"name\"] },\n *     \"projects\": { \"/path/to/project\": { \"disabledServers\": [\"name\"] } }\n *   }\n *\n * Disabled names are kept even if the server disappears from config, so a\n * server that is removed and later re-added stays disabled until the user\n * re-enables it.\n */\n\nimport { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { getAppDataDir } from '../utils/project.js';\n\ninterface McpStateFile {\n  global?: { allDisabled?: boolean; disabledServers?: string[] };\n  projects?: Record<string, { disabledServers?: string[] }>;\n}\n\n/** Global (all-projects) MCP disable state. */\nexport interface McpGlobalDisableState {\n  /** When true, every MCP server is disabled regardless of per-server state. */\n  allDisabled: boolean;\n  /** Server names disabled across all projects. */\n  disabledServers: string[];\n}\n\nexport function getMcpStatePath(): string {\n  return join(getAppDataDir(), 'mcp-state.json');\n}\n\nfunction readStateFile(): McpStateFile {\n  const filePath = getMcpStatePath();\n  if (!existsSync(filePath)) return {};\n  try {\n    const parsed = JSON.parse(readFileSync(filePath, 'utf-8'));\n    return parsed && typeof parsed === 'object' ? (parsed as McpStateFile) : {};\n  } catch {\n    return {};\n  }\n}\n\nfunction writeStateFile(state: McpStateFile): void {\n  const filePath = getMcpStatePath();\n  const dir = dirname(filePath);\n  if (!existsSync(dir)) {\n    mkdirSync(dir, { recursive: true });\n  }\n  // Atomic write (same pattern as FileOAuthStorage) so a crash mid-write\n  // never leaves a truncated state file. The temp name is process-unique so\n  // two concurrent mastracode processes never share a partially written file.\n  const tmpPath = `${filePath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;\n  writeFileSync(tmpPath, JSON.stringify(state, null, 2), 'utf-8');\n  renameSync(tmpPath, filePath);\n}\n\nfunction cleanNames(names: unknown): string[] {\n  if (!Array.isArray(names)) return [];\n  return names.filter((name): name is string => typeof name === 'string');\n}\n\n/** Load the persisted disabled server names for a project. */\nexport function loadDisabledServers(projectDir: string): string[] {\n  return cleanNames(readStateFile().projects?.[projectDir]?.disabledServers);\n}\n\n/** Persist the disabled server names for a project. */\nexport function saveDisabledServers(projectDir: string, disabledServers: string[]): void {\n  const state = readStateFile();\n  const projects = state.projects ?? {};\n  if (disabledServers.length > 0) {\n    projects[projectDir] = { disabledServers: [...disabledServers].sort() };\n  } else {\n    delete projects[projectDir];\n  }\n  writeStateFile({ ...state, projects });\n}\n\n/** Load the persisted global disable state (applies to all projects). */\nexport function loadGlobalDisableState(): McpGlobalDisableState {\n  const global = readStateFile().global;\n  return {\n    allDisabled: global?.allDisabled === true,\n    disabledServers: cleanNames(global?.disabledServers),\n  };\n}\n\n/** Persist the global disable state. Prunes the section when empty. */\nexport function saveGlobalDisableState(globalState: McpGlobalDisableState): void {\n  const state = readStateFile();\n  if (!globalState.allDisabled && globalState.disabledServers.length === 0) {\n    delete state.global;\n    writeStateFile(state);\n    return;\n  }\n  writeStateFile({\n    ...state,\n    global: {\n      ...(globalState.allDisabled ? { allDisabled: true } : {}),\n      ...(globalState.disabledServers.length > 0 ? { disabledServers: [...globalState.disabledServers].sort() } : {}),\n    },\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAkCA,SAAgB,kBAA0B;CACxC,OAAO,KAAK,cAAc,GAAG,gBAAgB;AAC/C;AAEA,SAAS,gBAA8B;CACrC,MAAM,WAAW,gBAAgB;CACjC,IAAI,CAAC,WAAW,QAAQ,GAAG,OAAO,CAAC;CACnC,IAAI;EACF,MAAM,SAAS,KAAK,MAAM,aAAa,UAAU,OAAO,CAAC;EACzD,OAAO,UAAU,OAAO,WAAW,WAAY,SAA0B,CAAC;CAC5E,QAAQ;EACN,OAAO,CAAC;CACV;AACF;AAEA,SAAS,eAAe,OAA2B;CACjD,MAAM,WAAW,gBAAgB;CACjC,MAAM,MAAM,QAAQ,QAAQ;CAC5B,IAAI,CAAC,WAAW,GAAG,GACjB,UAAU,KAAK,EAAE,WAAW,KAAK,CAAC;CAKpC,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,IAAI,GAAG,KAAK,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE;CAClF,cAAc,SAAS,KAAK,UAAU,OAAO,MAAM,CAAC,GAAG,OAAO;CAC9D,WAAW,SAAS,QAAQ;AAC9B;AAEA,SAAS,WAAW,OAA0B;CAC5C,IAAI,CAAC,MAAM,QAAQ,KAAK,GAAG,OAAO,CAAC;CACnC,OAAO,MAAM,QAAQ,SAAyB,OAAO,SAAS,QAAQ;AACxE;;AAGA,SAAgB,oBAAoB,YAA8B;CAChE,OAAO,WAAW,cAAc,CAAC,CAAC,WAAW,WAAW,EAAE,eAAe;AAC3E;;AAGA,SAAgB,oBAAoB,YAAoB,iBAAiC;CACvF,MAAM,QAAQ,cAAc;CAC5B,MAAM,WAAW,MAAM,YAAY,CAAC;CACpC,IAAI,gBAAgB,SAAS,GAC3B,SAAS,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE;MAEtE,OAAO,SAAS;CAElB,eAAe;EAAE,GAAG;EAAO;CAAS,CAAC;AACvC;;AAGA,SAAgB,yBAAgD;CAC9D,MAAM,SAAS,cAAc,CAAC,CAAC;CAC/B,OAAO;EACL,aAAa,QAAQ,gBAAgB;EACrC,iBAAiB,WAAW,QAAQ,eAAe;CACrD;AACF;;AAGA,SAAgB,uBAAuB,aAA0C;CAC/E,MAAM,QAAQ,cAAc;CAC5B,IAAI,CAAC,YAAY,eAAe,YAAY,gBAAgB,WAAW,GAAG;EACxE,OAAO,MAAM;EACb,eAAe,KAAK;EACpB;CACF;CACA,eAAe;EACb,GAAG;EACH,QAAQ;GACN,GAAI,YAAY,cAAc,EAAE,aAAa,KAAK,IAAI,CAAC;GACvD,GAAI,YAAY,gBAAgB,SAAS,IAAI,EAAE,iBAAiB,CAAC,GAAG,YAAY,eAAe,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC;EAC/G;CACF,CAAC;AACH"}
+{"version":3,"file":"state.js","names":[],"sources":["../../src/mcp/state.ts"],"sourcesContent":["/**\n * Persisted MCP disable state — mastracode-owned so user config files\n * (mcp.json, .mcp.json, .claude/settings.local.json) are never mutated.\n *\n * Stored as a single JSON file in the app data dir, with a global section\n * (applies to every project) and per-project entries:\n *\n *   {\n *     \"global\": { \"allDisabled\": true, \"disabledServers\": [\"name\"] },\n *     \"projects\": {\n *       \"/path/to/project\": { \"serverOverrides\": { \"name\": \"enabled\" } }\n *     }\n *   }\n *\n * Project overrides are kept even if the server disappears from config, so a\n * server that is removed and later re-added keeps its explicit project state.\n */\n\nimport { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { getAppDataDir } from '../utils/project.js';\n\nexport type McpProjectServerOverride = 'enabled' | 'disabled';\n\ninterface McpStateFile {\n  global?: { allDisabled?: boolean; disabledServers?: string[] };\n  projects?: Record<string, { serverOverrides?: Record<string, McpProjectServerOverride>; disabledServers?: string[] }>;\n}\n\n/** Global (all-projects) MCP disable state. */\nexport interface McpGlobalDisableState {\n  /** When true, every MCP server is disabled regardless of per-server state. */\n  allDisabled: boolean;\n  /** Server names disabled across all projects. */\n  disabledServers: string[];\n}\n\nexport function getMcpStatePath(): string {\n  return join(getAppDataDir(), 'mcp-state.json');\n}\n\nfunction readStateFile(): McpStateFile {\n  const filePath = getMcpStatePath();\n  if (!existsSync(filePath)) return {};\n  try {\n    const parsed = JSON.parse(readFileSync(filePath, 'utf-8'));\n    return parsed && typeof parsed === 'object' ? (parsed as McpStateFile) : {};\n  } catch {\n    return {};\n  }\n}\n\nfunction writeStateFile(state: McpStateFile): void {\n  const filePath = getMcpStatePath();\n  const dir = dirname(filePath);\n  if (!existsSync(dir)) {\n    mkdirSync(dir, { recursive: true });\n  }\n  // Atomic write (same pattern as FileOAuthStorage) so a crash mid-write\n  // never leaves a truncated state file. The temp name is process-unique so\n  // two concurrent mastracode processes never share a partially written file.\n  const tmpPath = `${filePath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;\n  writeFileSync(tmpPath, JSON.stringify(state, null, 2), 'utf-8');\n  renameSync(tmpPath, filePath);\n}\n\nfunction cleanNames(names: unknown): string[] {\n  if (!Array.isArray(names)) return [];\n  return names.filter((name): name is string => typeof name === 'string');\n}\n\nfunction cleanProjectOverrides(overrides: unknown): Record<string, McpProjectServerOverride> {\n  if (!overrides || typeof overrides !== 'object' || Array.isArray(overrides)) return {};\n  return Object.fromEntries(\n    Object.entries(overrides).filter(\n      (entry): entry is [string, McpProjectServerOverride] => entry[1] === 'enabled' || entry[1] === 'disabled',\n    ),\n  );\n}\n\n/** Load project-specific server overrides, migrating legacy disabled names in memory. */\nexport function loadProjectServerOverrides(projectDir: string): Record<string, McpProjectServerOverride> {\n  const project = readStateFile().projects?.[projectDir];\n  const overrides = cleanProjectOverrides(project?.serverOverrides);\n  for (const name of cleanNames(project?.disabledServers)) {\n    overrides[name] ??= 'disabled';\n  }\n  return overrides;\n}\n\n/** Persist project-specific server overrides. */\nexport function saveProjectServerOverrides(\n  projectDir: string,\n  serverOverrides: Record<string, McpProjectServerOverride>,\n): void {\n  const state = readStateFile();\n  const projects = state.projects ?? {};\n  const sortedOverrides = Object.fromEntries(Object.entries(serverOverrides).sort(([a], [b]) => a.localeCompare(b)));\n  if (Object.keys(sortedOverrides).length > 0) {\n    projects[projectDir] = { serverOverrides: sortedOverrides };\n  } else {\n    delete projects[projectDir];\n  }\n  writeStateFile({ ...state, projects });\n}\n\n/** Load the persisted global disable state (applies to all projects). */\nexport function loadGlobalDisableState(): McpGlobalDisableState {\n  const global = readStateFile().global;\n  return {\n    allDisabled: global?.allDisabled === true,\n    disabledServers: cleanNames(global?.disabledServers),\n  };\n}\n\n/** Persist the global disable state. Prunes the section when empty. */\nexport function saveGlobalDisableState(globalState: McpGlobalDisableState): void {\n  const state = readStateFile();\n  if (!globalState.allDisabled && globalState.disabledServers.length === 0) {\n    delete state.global;\n    writeStateFile(state);\n    return;\n  }\n  writeStateFile({\n    ...state,\n    global: {\n      ...(globalState.allDisabled ? { allDisabled: true } : {}),\n      ...(globalState.disabledServers.length > 0 ? { disabledServers: [...globalState.disabledServers].sort() } : {}),\n    },\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAqCA,SAAgB,kBAA0B;CACxC,OAAO,KAAK,cAAc,GAAG,gBAAgB;AAC/C;AAEA,SAAS,gBAA8B;CACrC,MAAM,WAAW,gBAAgB;CACjC,IAAI,CAAC,WAAW,QAAQ,GAAG,OAAO,CAAC;CACnC,IAAI;EACF,MAAM,SAAS,KAAK,MAAM,aAAa,UAAU,OAAO,CAAC;EACzD,OAAO,UAAU,OAAO,WAAW,WAAY,SAA0B,CAAC;CAC5E,QAAQ;EACN,OAAO,CAAC;CACV;AACF;AAEA,SAAS,eAAe,OAA2B;CACjD,MAAM,WAAW,gBAAgB;CACjC,MAAM,MAAM,QAAQ,QAAQ;CAC5B,IAAI,CAAC,WAAW,GAAG,GACjB,UAAU,KAAK,EAAE,WAAW,KAAK,CAAC;CAKpC,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,IAAI,GAAG,KAAK,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE;CAClF,cAAc,SAAS,KAAK,UAAU,OAAO,MAAM,CAAC,GAAG,OAAO;CAC9D,WAAW,SAAS,QAAQ;AAC9B;AAEA,SAAS,WAAW,OAA0B;CAC5C,IAAI,CAAC,MAAM,QAAQ,KAAK,GAAG,OAAO,CAAC;CACnC,OAAO,MAAM,QAAQ,SAAyB,OAAO,SAAS,QAAQ;AACxE;AAEA,SAAS,sBAAsB,WAA8D;CAC3F,IAAI,CAAC,aAAa,OAAO,cAAc,YAAY,MAAM,QAAQ,SAAS,GAAG,OAAO,CAAC;CACrF,OAAO,OAAO,YACZ,OAAO,QAAQ,SAAS,CAAC,CAAC,QACvB,UAAuD,MAAM,OAAO,aAAa,MAAM,OAAO,UACjG,CACF;AACF;;AAGA,SAAgB,2BAA2B,YAA8D;CACvG,MAAM,UAAU,cAAc,CAAC,CAAC,WAAW;CAC3C,MAAM,YAAY,sBAAsB,SAAS,eAAe;CAChE,KAAK,MAAM,QAAQ,WAAW,SAAS,eAAe,GACpD,UAAU,UAAU;CAEtB,OAAO;AACT;;AAGA,SAAgB,2BACd,YACA,iBACM;CACN,MAAM,QAAQ,cAAc;CAC5B,MAAM,WAAW,MAAM,YAAY,CAAC;CACpC,MAAM,kBAAkB,OAAO,YAAY,OAAO,QAAQ,eAAe,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;CACjH,IAAI,OAAO,KAAK,eAAe,CAAC,CAAC,SAAS,GACxC,SAAS,cAAc,EAAE,iBAAiB,gBAAgB;MAE1D,OAAO,SAAS;CAElB,eAAe;EAAE,GAAG;EAAO;CAAS,CAAC;AACvC;;AAGA,SAAgB,yBAAgD;CAC9D,MAAM,SAAS,cAAc,CAAC,CAAC;CAC/B,OAAO;EACL,aAAa,QAAQ,gBAAgB;EACrC,iBAAiB,WAAW,QAAQ,eAAe;CACrD;AACF;;AAGA,SAAgB,uBAAuB,aAA0C;CAC/E,MAAM,QAAQ,cAAc;CAC5B,IAAI,CAAC,YAAY,eAAe,YAAY,gBAAgB,WAAW,GAAG;EACxE,OAAO,MAAM;EACb,eAAe,KAAK;EACpB;CACF;CACA,eAAe;EACb,GAAG;EACH,QAAQ;GACN,GAAI,YAAY,cAAc,EAAE,aAAa,KAAK,IAAI,CAAC;GACvD,GAAI,YAAY,gBAAgB,SAAS,IAAI,EAAE,iBAAiB,CAAC,GAAG,YAAY,eAAe,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC;EAC/G;CACF,CAAC;AACH"}

package/dist/mcp/types.d.ts

@@ -110,11 +110,16 @@ export interface McpServerStatus {
      */
     disabled?: boolean;
     /**
-     * Where the disable state comes from when `disabled` is true. `global`
-     * means the server (or all of MCP) is disabled across every project and
-     * must be re-enabled globally; `project` means only this project disabled
-     * it. Global takes precedence when both apply.
+     * Where the effective disable state comes from when `disabled` is true.
+     * `global` means the global all-MCP kill switch or inherited global default
+     * applies; `project` means this project explicitly disabled the server.
      */
     disabledScope?: 'project' | 'global';
+    /** This project's explicit server override, or undefined when inheriting the global default. */
+    projectOverride?: 'enabled' | 'disabled';
+    /** The per-server global default before applying a project override or the global kill switch. */
+    globalDefault?: 'enabled' | 'disabled';
+    /** Whether the global all-MCP kill switch currently overrides every server and project setting. */
+    globalKillSwitch?: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/mcp/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,gDAAgD;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,kEAAkE;IAClE,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,6FAA6F;IAC7F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC7C,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;IACnB,iDAAiD;IACjD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,kCAAkC;IAClC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wCAAwC;IACxC,SAAS,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;CACtC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/mcp/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,gDAAgD;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,kEAAkE;IAClE,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,6FAA6F;IAC7F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC7C,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;IACnB,iDAAiD;IACjD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,kCAAkC;IAClC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,wCAAwC;IACxC,SAAS,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IACrC,gGAAgG;IAChG,eAAe,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;IACzC,kGAAkG;IAClG,aAAa,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;IACvC,mGAAmG;IACnG,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/code-sdk",
-  "version": "1.7.0-alpha.15",
+  "version": "1.7.0-alpha.16",
   "description": "Mastra Code SDK: the agent core behind Mastra Code (everything except the TUI) — build your own UIs and surfaces on top of it",
   "type": "module",
   "publishConfig": {
@@ -61,15 +61,15 @@
     "@mastra/duckdb": "1.7.0-alpha.1",
     "@mastra/fastembed": "1.3.1",
     "@mastra/libsql": "1.22.4-alpha.1",
-    "@mastra/mcp": "1.17.3",
     "@mastra/github-signals": "0.4.0",
     "@mastra/memory": "1.28.3-alpha.4",
     "@mastra/observability": "1.17.6-alpha.2",
-    "@mastra/parallel": "0.1.1",
     "@mastra/pg": "1.23.0-alpha.7",
-    "@mastra/tavily": "1.1.2",
+    "@mastra/mcp": "1.17.3",
+    "@mastra/parallel": "0.1.1",
+    "@mastra/schema-compat": "1.3.9-alpha.0",
     "@mastra/stagehand": "0.3.4",
-    "@mastra/schema-compat": "1.3.9-alpha.0"
+    "@mastra/tavily": "1.1.2"
   },
   "devDependencies": {
     "@libsql/client": "^0.17.4",