@1mcp/agent 0.30.3 → 0.31.0-beta2

package/build/commands/shared/serveClient.js

@@ -0,0 +1,204 @@
+import { createHash } from 'node:crypto';
+import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { LATEST_PROTOCOL_VERSION, } from '@modelcontextprotocol/sdk/types.js';
+import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from '../../constants.js';
+import { createContextHash } from '../../utils/context/contextHash.js';
+export const SESSION_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
+export class StreamableServeClient {
+    transport;
+    pendingRequests = new Map();
+    nextId = 1;
+    constructor(serverUrl, sessionId, bearerToken) {
+        const headers = {
+            'User-Agent': `1MCP/${MCP_SERVER_VERSION}`,
+        };
+        if (bearerToken) {
+            headers.Authorization = `Bearer ${bearerToken}`;
+        }
+        this.transport = new StreamableHTTPClientTransport(serverUrl, {
+            sessionId,
+            requestInit: {
+                headers,
+            },
+        });
+        this.transport.onmessage = (message) => {
+            this.handleMessage(message);
+        };
+        this.transport.onerror = (error) => {
+            this.rejectAll(error instanceof Error ? error : new Error(String(error)));
+        };
+        this.transport.onclose = () => {
+            this.rejectAll(new Error('Connection closed.'));
+        };
+    }
+    async start() {
+        await this.transport.start();
+    }
+    async initialize(context) {
+        const response = await this.sendRequest('initialize', {
+            protocolVersion: LATEST_PROTOCOL_VERSION,
+            capabilities: {},
+            clientInfo: {
+                name: MCP_SERVER_NAME,
+                version: MCP_SERVER_VERSION,
+            },
+            ...(context
+                ? {
+                    _meta: {
+                        context,
+                    },
+                }
+                : {}),
+        });
+        if ('result' in response && response.result.protocolVersion) {
+            this.transport.setProtocolVersion(response.result.protocolVersion);
+        }
+        await this.transport.send({
+            jsonrpc: '2.0',
+            method: 'notifications/initialized',
+        });
+        return response;
+    }
+    async listTools() {
+        return this.sendRequest('tools/list', {});
+    }
+    async callTool(name, args) {
+        return this.sendRequest('tools/call', {
+            name,
+            arguments: args,
+        });
+    }
+    get sessionId() {
+        return this.transport.sessionId;
+    }
+    async close() {
+        await this.transport.close();
+    }
+    async sendRequest(method, params) {
+        const id = this.nextId++;
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                this.pendingRequests.delete(id);
+                reject(new Error(`Timed out waiting for ${method} response.`));
+            }, 30000);
+            this.pendingRequests.set(id, {
+                resolve: resolve,
+                reject,
+                timeout,
+            });
+            void this.transport
+                .send({
+                jsonrpc: '2.0',
+                id,
+                method,
+                params,
+            })
+                .catch((error) => {
+                clearTimeout(timeout);
+                this.pendingRequests.delete(id);
+                reject(error instanceof Error ? error : new Error(String(error)));
+            });
+        });
+    }
+    handleMessage(message) {
+        if (!('id' in message) || typeof message.id !== 'number') {
+            return;
+        }
+        const pending = this.pendingRequests.get(message.id);
+        if (!pending) {
+            return;
+        }
+        clearTimeout(pending.timeout);
+        this.pendingRequests.delete(message.id);
+        pending.resolve(message);
+    }
+    rejectAll(error) {
+        for (const [id, pending] of this.pendingRequests.entries()) {
+            clearTimeout(pending.timeout);
+            pending.reject(error);
+            this.pendingRequests.delete(id);
+        }
+    }
+}
+export function buildServerUrl(baseUrl, options) {
+    const serverUrl = new URL(baseUrl);
+    if (options.preset) {
+        serverUrl.searchParams.set('preset', options.preset);
+    }
+    else if (options['tag-filter']) {
+        serverUrl.searchParams.set('tag-filter', options['tag-filter']);
+    }
+    else if (options.filter) {
+        serverUrl.searchParams.set('filter', options.filter);
+    }
+    else if (options.tags && options.tags.length > 0) {
+        serverUrl.searchParams.set('tags', options.tags.join(','));
+    }
+    return serverUrl;
+}
+export function getDefaultCliSessionCachePathTemplate() {
+    return path.join(os.tmpdir(), '1mcp', '.cli-session.{pid}');
+}
+export function resolveCliSessionCachePathTemplate(cachePathTemplate) {
+    return cachePathTemplate || getDefaultCliSessionCachePathTemplate();
+}
+export function getCliSessionCachePath(options = {}) {
+    const resolvedTemplate = resolveCliSessionCachePathTemplate(options.cachePathTemplate);
+    const pidToken = options.serverPid !== undefined
+        ? String(options.serverPid)
+        : options.serverUrl
+            ? `server-${createHash('sha256').update(options.serverUrl).digest('hex').slice(0, 12)}`
+            : 'unknown';
+    return resolvedTemplate.replaceAll('{pid}', pidToken);
+}
+export function getCliSessionContextHash(context) {
+    return createContextHash(context, { omitWorkingDirectory: true });
+}
+export async function readCliSessionCache(cachePath, serverUrl, contextHash) {
+    try {
+        const raw = await readFile(cachePath, 'utf8');
+        const parsed = JSON.parse(raw);
+        if (!isCliSessionCache(parsed)) {
+            return null;
+        }
+        if (parsed.serverUrl !== serverUrl) {
+            return null;
+        }
+        if (parsed.contextHash !== contextHash) {
+            return null;
+        }
+        if (Date.now() - parsed.savedAt > SESSION_CACHE_TTL_MS) {
+            return null;
+        }
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+export async function writeCliSessionCache(cachePath, cache) {
+    await mkdir(path.dirname(cachePath), { recursive: true, mode: 0o700 });
+    const tempPath = `${cachePath}.tmp.${process.pid}`;
+    await writeFile(tempPath, JSON.stringify(cache), { encoding: 'utf8', mode: 0o600 });
+    await rename(tempPath, cachePath);
+}
+export async function deleteCliSessionCache(cachePath) {
+    await rm(cachePath, { force: true });
+}
+function isCliSessionCache(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        'sessionId' in value &&
+        typeof value.sessionId === 'string' &&
+        'serverUrl' in value &&
+        typeof value.serverUrl === 'string' &&
+        'contextHash' in value &&
+        typeof value.contextHash === 'string' &&
+        'savedAt' in value &&
+        typeof value.savedAt === 'number' &&
+        Number.isFinite(value.savedAt));
+}
+//# sourceMappingURL=serveClient.js.map

package/build/commands/shared/serveClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveClient.js","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"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"}

package/build/commands/shared/serveTargetResolver.d.ts

@@ -0,0 +1,21 @@
+import { type ServeUrlOptions } from '../../commands/shared/serveClient.js';
+import type { ProjectConfig } from '../../config/projectConfigTypes.js';
+import type { GlobalOptions } from '../../globalOptions.js';
+export interface ResolvableServeTargetOptions extends GlobalOptions, ServeUrlOptions {
+    url?: string;
+}
+export interface ResolvedServeTarget<TOptions extends ResolvableServeTargetOptions> {
+    cwd: string;
+    projectRoot: string;
+    projectName: string;
+    projectConfig: ProjectConfig | null;
+    mergedOptions: TOptions;
+    discoveredUrl: string;
+    serverUrl: URL;
+    serverPid?: number;
+    source: 'user' | 'pidfile' | 'portscan';
+    projectContextSource: 'project-config' | 'repo-root' | 'cwd';
+}
+export declare function mergeServeTargetOptions<TOptions extends ResolvableServeTargetOptions>(options: TOptions, projectConfig: ProjectConfig | null): TOptions;
+export declare function resolveServeTarget<TOptions extends ResolvableServeTargetOptions>(options: TOptions): Promise<ResolvedServeTarget<TOptions>>;
+//# sourceMappingURL=serveTargetResolver.d.ts.map

package/build/commands/shared/serveTargetResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveTargetResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D,MAAM,WAAW,4BAA6B,SAAQ,aAAa,EAAE,eAAe;IAClF,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,4BAA4B;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACxC,oBAAoB,EAAE,gBAAgB,GAAG,WAAW,GAAG,KAAK,CAAC;CAC9D;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,4BAA4B,EACnF,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,QAAQ,CAOV;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,4BAA4B,EACpF,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CA0BxC"}

package/build/commands/shared/serveTargetResolver.js

@@ -0,0 +1,33 @@
+import { buildServerUrl } from '../../commands/shared/serveClient.js';
+import { normalizeTags, resolveProjectContext } from '../../config/projectConfigLoader.js';
+import { discoverServerWithPidFile, validateServer1mcpUrl } from '../../utils/validation/urlDetection.js';
+export function mergeServeTargetOptions(options, projectConfig) {
+    return {
+        ...options,
+        preset: options.preset || projectConfig?.preset,
+        filter: options.filter || projectConfig?.filter,
+        tags: options.tags || normalizeTags(projectConfig?.tags),
+    };
+}
+export async function resolveServeTarget(options) {
+    const resolvedProjectContext = await resolveProjectContext();
+    const mergedOptions = mergeServeTargetOptions(options, resolvedProjectContext.projectConfig);
+    const { url: discoveredUrl, pid: serverPid, source, } = await discoverServerWithPidFile(mergedOptions['config-dir'], mergedOptions.url);
+    const validation = await validateServer1mcpUrl(discoveredUrl);
+    if (!validation.valid) {
+        throw new Error(validation.error || 'Cannot connect to the running 1MCP server.');
+    }
+    return {
+        cwd: resolvedProjectContext.cwd,
+        projectRoot: resolvedProjectContext.projectRoot,
+        projectName: resolvedProjectContext.projectName,
+        projectConfig: resolvedProjectContext.projectConfig,
+        mergedOptions,
+        discoveredUrl,
+        serverUrl: buildServerUrl(discoveredUrl, mergedOptions),
+        serverPid,
+        source,
+        projectContextSource: resolvedProjectContext.source,
+    };
+}
+//# sourceMappingURL=serveTargetResolver.js.map

package/build/commands/shared/serveTargetResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveTargetResolver.js","sourceRoot":"","sources":["../../../src/commands/shared/serveTargetResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAwB,MAAM,qCAAqC,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAG1F,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAmBzG,MAAM,UAAU,uBAAuB,CACrC,OAAiB,EACjB,aAAmC;IAEnC,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,aAAa,EAAE,MAAM;QAC/C,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,aAAa,EAAE,MAAM;QAC/C,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC;KACzD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAiB;IAEjB,MAAM,sBAAsB,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAC7D,MAAM,aAAa,GAAG,uBAAuB,CAAC,OAAO,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAC7F,MAAM,EACJ,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,SAAS,EACd,MAAM,GACP,GAAG,MAAM,yBAAyB,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAE9D,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,IAAI,4CAA4C,CAAC,CAAC;IACpF,CAAC;IAED,OAAO;QACL,GAAG,EAAE,sBAAsB,CAAC,GAAG;QAC/B,WAAW,EAAE,sBAAsB,CAAC,WAAW;QAC/C,WAAW,EAAE,sBAAsB,CAAC,WAAW;QAC/C,aAAa,EAAE,sBAAsB,CAAC,aAAa;QACnD,aAAa;QACb,aAAa;QACb,SAAS,EAAE,cAAc,CAAC,aAAa,EAAE,aAAa,CAAC;QACvD,SAAS;QACT,MAAM;QACN,oBAAoB,EAAE,sBAAsB,CAAC,MAAM;KACpD,CAAC;AACJ,CAAC"}

package/build/config/configLoader.d.ts

@@ -1,16 +1,42 @@
-import { MCPServerParams } from '../core/types/transport.js';
+import { ApplicationConfig, GlobalTransportConfig, MCPServerParams } from '../core/types/transport.js';
+export interface LoadedMcpConfig {
+    rawConfig: Record<string, unknown>;
+    processedConfig: Record<string, unknown>;
+    globalConfig: GlobalTransportConfig;
+    appConfig: ApplicationConfig;
+    rawServers: Record<string, MCPServerParams>;
+    validatedServers: Record<string, MCPServerParams>;
+    lastModified: number;
+    schemaInjected: boolean;
+}
+interface ConfigLoaderOptions {
+    ensureConfigExists?: boolean;
+}
+interface LoadParsedConfigOptions {
+    substituteEnv?: boolean;
+    includeAppConfig?: boolean;
+}
+export declare function loadAppConfigFromTomlPath(tomlPath: string): ApplicationConfig;
 export declare class ConfigLoader {
     private configFilePath;
     private lastModified;
-    constructor(configFilePath?: string);
+    constructor(configFilePath?: string, options?: ConfigLoaderOptions);
     private ensureConfigExists;
     getConfigFilePath(): string;
     checkFileModified(): boolean;
+    private loadRawConfigResult;
     loadRawConfig(): unknown;
     validateServerConfig(serverName: string, config: unknown): MCPServerParams;
+    validateGlobalConfig(config: unknown): GlobalTransportConfig;
+    validateAppConfig(config: unknown): ApplicationConfig;
+    loadAppConfig(): ApplicationConfig;
+    loadAppConfigFromToml(): ApplicationConfig;
+    loadParsedConfig(options?: LoadParsedConfigOptions): LoadedMcpConfig;
+    loadParsedConfigWithEnvSubstitution(): LoadedMcpConfig;
     loadConfigWithEnvSubstitution(): Record<string, MCPServerParams>;
     getTransportConfig(transportConfig: Record<string, MCPServerParams>): Record<string, MCPServerParams>;
     getAvailableTags(transportConfig: Record<string, MCPServerParams>): string[];
     isReloadEnabled(): boolean;
 }
+export {};
 //# sourceMappingURL=configLoader.d.ts.map

package/build/config/configLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configLoader.d.ts","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AAStF,qBAAa,YAAY;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAK;gBAEb,cAAc,CAAC,EAAE,MAAM;IAKnC,OAAO,CAAC,kBAAkB;IAkBnB,iBAAiB,IAAI,MAAM;IAI3B,iBAAiB,IAAI,OAAO;IAuB5B,aAAa,IAAI,OAAO;IAgCxB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,eAAe;IAc1E,6BAA6B,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAyDhE,kBAAkB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAUrG,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,EAAE;IAa5E,eAAe,IAAI,OAAO;CAIlC"}
+{"version":3,"file":"configLoader.d.ts","sourceRoot":"","sources":["../../src/config/configLoader.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,EAErB,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAgBtC,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,mBAAmB;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,UAAU,uBAAuB;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAwDD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAkB7E;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAK;gBAEb,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAOlE,OAAO,CAAC,kBAAkB;IAkBnB,iBAAiB,IAAI,MAAM;IAI3B,iBAAiB,IAAI,OAAO;IAuBnC,OAAO,CAAC,mBAAmB;IAmCpB,aAAa,IAAI,OAAO;IAIxB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,eAAe;IAQ1E,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,qBAAqB;IAQ5D,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,iBAAiB;IAQrD,aAAa,IAAI,iBAAiB;IAWlC,qBAAqB,IAAI,iBAAiB;IAK1C,gBAAgB,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,eAAe;IAoFpE,mCAAmC,IAAI,eAAe;IAItD,6BAA6B,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAIhE,kBAAkB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAUrG,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,EAAE;IAa5E,eAAe,IAAI,OAAO;CAIlC"}

package/build/config/configLoader.js

@@ -1,21 +1,85 @@
 import fs from 'fs';
+import path from 'path';
 import { substituteEnvVarsInConfig } from '../config/envProcessor.js';
-import { DEFAULT_CONFIG, getGlobalConfigDir, getGlobalConfigPath } from '../constants.js';
+import { getUnknownGlobalConfigKeys, mergeGlobalAndServerConfig } from '../config/mcpConfigMerge.js';
+import { DEFAULT_CONFIG, getGlobalConfigPath } from '../constants.js';
 import { MCP_CONFIG_SCHEMA_URL } from '../constants/schema.js';
 import { AgentConfigManager } from '../core/server/agentConfig.js';
-import { transportConfigSchema } from '../core/types/transport.js';
+import { applicationConfigSchema, globalTransportConfigSchema, transportConfigSchema, } from '../core/types/transport.js';
 import logger, { debugIf } from '../logger/logger.js';
+import { parse as parseToml } from 'smol-toml';
 import { ZodError } from 'zod';
+function formatZodIssues(error) {
+    return error.issues.map((issue) => `${issue.path.join('.')}: ${issue.message}`).join(', ');
+}
+function getValidationErrorMessage(context, error) {
+    if (error instanceof ZodError) {
+        return `${context}: ${formatZodIssues(error)}`;
+    }
+    return `${context}: ${error instanceof Error ? error.message : String(error)}`;
+}
+function warnIfLegacyAppConfig(rawConfig, configFilePath) {
+    if (!rawConfig || typeof rawConfig !== 'object') {
+        return;
+    }
+    const configObj = rawConfig;
+    if (configObj.app === undefined) {
+        return;
+    }
+    const tomlPath = path.join(path.dirname(configFilePath), 'config.toml');
+    logger.warn(`The "app" key in mcp.json is deprecated. Please move your app settings to ${tomlPath}. ` +
+        `The "app" key in mcp.json will be ignored.`);
+}
+function warnForUnknownGlobalConfigKeys(rawGlobal) {
+    const unknownGlobalKeys = getUnknownGlobalConfigKeys(rawGlobal);
+    if (unknownGlobalKeys.length === 0) {
+        return;
+    }
+    logger.warn(`Unknown properties in global MCP configuration were ignored: ${unknownGlobalKeys.join(', ')}`);
+}
+function normalizeRawServerConfigs(rawServers) {
+    if (!rawServers || typeof rawServers !== 'object') {
+        return {};
+    }
+    const normalizedServers = {};
+    for (const [serverName, serverConfig] of Object.entries(rawServers)) {
+        if (serverConfig && typeof serverConfig === 'object') {
+            normalizedServers[serverName] = serverConfig;
+        }
+    }
+    return normalizedServers;
+}
+export function loadAppConfigFromTomlPath(tomlPath) {
+    try {
+        if (!fs.existsSync(tomlPath)) {
+            return {};
+        }
+        const raw = fs.readFileSync(tomlPath, 'utf8');
+        const parsed = parseToml(raw);
+        return applicationConfigSchema.parse(parsed);
+    }
+    catch (error) {
+        if (error instanceof ZodError) {
+            logger.error(`Invalid app configuration in config.toml (ignored): ${formatZodIssues(error)}`);
+        }
+        else {
+            logger.error(`Failed to load app configuration from ${tomlPath}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return {};
+    }
+}
 export class ConfigLoader {
     configFilePath;
     lastModified = 0;
-    constructor(configFilePath) {
+    constructor(configFilePath, options) {
         this.configFilePath = configFilePath || getGlobalConfigPath();
-        this.ensureConfigExists();
+        if (options?.ensureConfigExists !== false) {
+            this.ensureConfigExists();
+        }
     }
     ensureConfigExists() {
         try {
-            const configDir = getGlobalConfigDir();
+            const configDir = path.dirname(this.configFilePath);
             if (!fs.existsSync(configDir)) {
                 fs.mkdirSync(configDir, { recursive: true });
                 logger.info(`Created config directory: ${configDir}`);
@@ -55,15 +119,18 @@ export class ConfigLoader {
             return false;
         }
     }
-    loadRawConfig() {
+    loadRawConfigResult() {
         try {
             const stats = fs.statSync(this.configFilePath);
-            this.lastModified = stats.mtime.getTime();
+            const lastModified = stats.mtime.getTime();
+            this.lastModified = lastModified;
             const rawConfigData = fs.readFileSync(this.configFilePath, 'utf8');
             const config = JSON.parse(rawConfigData);
+            let schemaInjected = false;
             // Ensure $schema field is present for IDE autocompletion
             if (config && typeof config === 'object' && !('$schema' in config)) {
                 config.$schema = MCP_CONFIG_SCHEMA_URL;
+                schemaInjected = true;
                 // Log the enhancement for debugging and transparency
                 debugIf(() => ({
                     message: `Added $schema property to config for IDE autocompletion`,
@@ -73,7 +140,7 @@ export class ConfigLoader {
                     },
                 }));
             }
-            return config;
+            return { config, lastModified, schemaInjected };
         }
         catch (error) {
             const message = `Failed to load configuration from '${this.configFilePath}': ${error instanceof Error ? error.message : String(error)}`;
@@ -84,44 +151,90 @@ export class ConfigLoader {
             throw error;
         }
     }
+    loadRawConfig() {
+        return this.loadRawConfigResult().config;
+    }
     validateServerConfig(serverName, config) {
         try {
             return transportConfigSchema.parse(config);
         }
         catch (error) {
-            if (error instanceof ZodError) {
-                const fieldErrors = error.issues.map((e) => `${e.path.join('.')}: ${e.message}`).join(', ');
-                throw new Error(`Invalid configuration for server '${serverName}': ${fieldErrors}`);
-            }
-            throw new Error(`Invalid configuration for server '${serverName}': ${error instanceof Error ? error.message : String(error)}`);
+            throw new Error(getValidationErrorMessage(`Invalid configuration for server '${serverName}'`, error));
         }
     }
-    loadConfigWithEnvSubstitution() {
-        let rawConfig;
+    validateGlobalConfig(config) {
+        try {
+            return globalTransportConfigSchema.parse(config);
+        }
+        catch (error) {
+            throw new Error(getValidationErrorMessage('Invalid global configuration', error));
+        }
+    }
+    validateAppConfig(config) {
         try {
-            rawConfig = this.loadRawConfig();
+            return applicationConfigSchema.parse(config);
+        }
+        catch (error) {
+            throw new Error(getValidationErrorMessage('Invalid app configuration', error));
+        }
+    }
+    loadAppConfig() {
+        // Check for legacy app key in mcp.json and warn
+        try {
+            warnIfLegacyAppConfig(this.loadRawConfig(), this.configFilePath);
+        }
+        catch (error) {
+            logger.debug(`Could not check for legacy "app" key: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return this.loadAppConfigFromToml();
+    }
+    loadAppConfigFromToml() {
+        const tomlPath = path.join(path.dirname(this.configFilePath), 'config.toml');
+        return loadAppConfigFromTomlPath(tomlPath);
+    }
+    loadParsedConfig(options) {
+        let rawResult;
+        try {
+            rawResult = this.loadRawConfigResult();
         }
         catch (error) {
             const errorMsg = `Failed to load raw configuration: ${error instanceof Error ? error.message : String(error)}`;
             logger.error(errorMsg);
-            throw new Error(errorMsg);
+            throw new Error(errorMsg, { cause: error });
         }
         const agentConfig = AgentConfigManager.getInstance();
         const features = agentConfig.get('features');
-        const processedConfig = features.envSubstitution ? substituteEnvVarsInConfig(rawConfig) : rawConfig;
+        const substituteEnv = options?.substituteEnv ?? features.envSubstitution;
+        const processedConfig = substituteEnv ? substituteEnvVarsInConfig(rawResult.config) : rawResult.config;
         if (!processedConfig || typeof processedConfig !== 'object') {
             const errorMsg = 'Invalid configuration format';
             logger.error(errorMsg);
             throw new Error(errorMsg);
         }
         const configObj = processedConfig;
-        const mcpServersConfig = configObj.mcpServers || {};
-        const mcpTemplatesConfig = configObj.mcpTemplates || {};
-        const templateServerNames = new Set(Object.keys(mcpTemplatesConfig));
-        const validatedConfig = {};
-        for (const [serverName, serverConfig] of Object.entries(mcpServersConfig)) {
+        const rawGlobal = configObj.serverDefaults;
+        warnForUnknownGlobalConfigKeys(rawGlobal);
+        let globalConfig = {};
+        if (rawGlobal !== undefined) {
+            try {
+                globalConfig = this.validateGlobalConfig(rawGlobal);
+            }
+            catch (error) {
+                logger.warn(`Ignoring invalid serverDefaults configuration: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        warnIfLegacyAppConfig(configObj, this.configFilePath);
+        const appConfig = options?.includeAppConfig === false ? {} : this.loadAppConfigFromToml();
+        const rawServers = normalizeRawServerConfigs(configObj.mcpServers);
+        const templateServerNames = new Set(Object.keys(normalizeRawServerConfigs(configObj.mcpTemplates)));
+        const validatedServers = {};
+        for (const [serverName, serverConfig] of Object.entries(rawServers)) {
             try {
-                validatedConfig[serverName] = this.validateServerConfig(serverName, serverConfig);
+                // Validate the raw server first, then re-validate after applying serverDefaults
+                // so merged config errors are surfaced instead of silently accepted.
+                const validatedServerConfig = this.validateServerConfig(serverName, serverConfig);
+                const mergedConfig = mergeGlobalAndServerConfig(globalConfig, validatedServerConfig);
+                validatedServers[serverName] = this.validateServerConfig(serverName, mergedConfig);
                 debugIf(() => ({
                     message: `Validated configuration for server: ${serverName}`,
                     meta: { serverName },
@@ -129,20 +242,34 @@ export class ConfigLoader {
             }
             catch (error) {
                 logger.error(`Configuration validation failed: ${error instanceof Error ? error.message : String(error)}`);
-                continue;
             }
         }
         const conflictingServers = [];
-        for (const serverName of Object.keys(validatedConfig)) {
+        for (const serverName of Object.keys(validatedServers)) {
             if (templateServerNames.has(serverName)) {
                 conflictingServers.push(serverName);
-                delete validatedConfig[serverName];
+                delete validatedServers[serverName];
             }
         }
         if (conflictingServers.length > 0) {
             logger.warn(`Ignoring ${conflictingServers.length} static server(s) that conflict with template servers: ${conflictingServers.join(', ')}`);
         }
-        return validatedConfig;
+        return {
+            rawConfig: rawResult.config,
+            processedConfig: configObj,
+            globalConfig,
+            appConfig,
+            rawServers,
+            validatedServers,
+            lastModified: rawResult.lastModified,
+            schemaInjected: rawResult.schemaInjected,
+        };
+    }
+    loadParsedConfigWithEnvSubstitution() {
+        return this.loadParsedConfig();
+    }
+    loadConfigWithEnvSubstitution() {
+        return this.loadParsedConfigWithEnvSubstitution().validatedServers;
     }
     getTransportConfig(transportConfig) {
         const filtered = {};

package/build/config/configLoader.js.map

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