@dexto/core 1.5.8 → 1.6.1

package/dist/mcp/manager.d.ts

@@ -1,14 +1,15 @@
-import { ValidatedServerConfigs, ValidatedMcpServerConfig } from './schemas.js';
-import type { IDextoLogger } from '../logger/v2/types.js';
-import { GetPromptResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
-import { IMCPClient, MCPResolvedResource, McpAuthProviderFactory } from './types.js';
-import { ToolSet } from '../tools/types.js';
+import type { ValidatedServersConfig, ValidatedMcpServerConfig } from './schemas.js';
+import type { Logger } from '../logger/v2/types.js';
+import type { GetPromptResult, ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
+import type { McpClient, MCPResolvedResource, McpAuthProviderFactory } from './types.js';
+import type { ToolSet } from '../tools/types.js';
+import { type AgentEventBus } from '../events/index.js';
 import type { PromptDefinition } from '../prompts/types.js';
 import type { JSONSchema7 } from 'json-schema';
 import type { ApprovalManager } from '../approval/manager.js';
 type ToolCacheEntry = {
     serverName: string;
-    client: IMCPClient;
+    client: McpClient;
     definition: {
         name?: string;
         description?: string;
@@ -27,8 +28,9 @@ export declare class MCPManager {
     private approvalManager;
     private authProviderFactory;
     private logger;
+    private eventBus;
     private static readonly SERVER_DELIMITER;
-    constructor(logger: IDextoLogger);
+    constructor(logger: Logger, eventBusOverride?: AgentEventBus);
     setAuthProviderFactory(factory: McpAuthProviderFactory | null): void;
     /**
      * Set the approval manager for handling elicitation requests from MCP servers
@@ -46,9 +48,9 @@ export declare class MCPManager {
     /**
      * Register a client that provides tools (and potentially more)
      * @param name Unique name for the client
-     * @param client The client instance, expected to be IMCPClient
+     * @param client The client instance, expected to be McpClient
      */
-    registerClient(name: string, client: IMCPClient): void;
+    registerClient(name: string, client: McpClient): void;
     /**
      * Clears all cached data for a disconnected MCP client
      *
@@ -122,7 +124,7 @@ export declare class MCPManager {
      * @param toolName Name of the tool (may include server prefix)
      * @returns The client that provides the tool, or undefined if not found
      */
-    getToolClient(toolName: string): IMCPClient | undefined;
+    getToolClient(toolName: string): McpClient | undefined;
     /**
      * Execute a specific MCP tool with the given arguments.
      * @param toolName Name of the MCP tool to execute (may include server prefix)
@@ -141,7 +143,7 @@ export declare class MCPManager {
      * @param promptName Name of the prompt.
      * @returns The client instance or undefined.
      */
-    getPromptClient(promptName: string): IMCPClient | undefined;
+    getPromptClient(promptName: string): McpClient | undefined;
     /**
      * Get a specific prompt definition by name.
      * @param name Name of the prompt.
@@ -187,7 +189,7 @@ export declare class MCPManager {
      * @param serverConfigs Server configurations with individual connection modes
      * @returns Promise resolving when initialization is complete
      */
-    initializeFromConfig(serverConfigs: ValidatedServerConfigs): Promise<void>;
+    initializeFromConfig(serverConfigs: ValidatedServersConfig): Promise<void>;
     /**
      * Dynamically connect to a new MCP server.
      * @param name The unique name for the new server connection.
@@ -200,7 +202,7 @@ export declare class MCPManager {
      * Get all registered clients
      * @returns Map of client names to client instances
      */
-    getClients(): Map<string, IMCPClient>;
+    getClients(): Map<string, McpClient>;
     /**
      * Get the errors from failed connections
      * @returns Map of server names to error messages
@@ -214,6 +216,7 @@ export declare class MCPManager {
     getFailedConnectionError(name: string): string | undefined;
     getFailedConnectionErrorCode(name: string): string | undefined;
     getAuthProvider(name: string): import("./types.js").McpAuthProvider | null | undefined;
+    getServerConfig(name: string): ValidatedMcpServerConfig | undefined;
     /**
      * Refresh all client caches by re-fetching capabilities from servers
      * Useful when you want to force a full refresh of tools, prompts, and resources

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

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

package/dist/mcp/manager.js

@@ -1,5 +1,5 @@
 import "../chunk-PTJYTZNU.js";
-import { MCPClient } from "./mcp-client.js";
+import { DextoMcpClient } from "./mcp-client.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { MCPError } from "./errors.js";
 import { eventBus } from "../events/index.js";
@@ -18,16 +18,18 @@ class MCPManager {
   // Will be set by service initializer
   authProviderFactory = null;
   logger;
+  eventBus;
   // Use a distinctive delimiter that won't appear in normal server/tool names
   // Using double hyphen as it's allowed in LLM tool name patterns (^[a-zA-Z0-9_-]+$)
   static SERVER_DELIMITER = "--";
-  constructor(logger) {
+  constructor(logger, eventBusOverride) {
     this.logger = logger.createChild(DextoLogComponent.MCP);
+    this.eventBus = eventBusOverride ?? eventBus;
   }
   setAuthProviderFactory(factory) {
     this.authProviderFactory = factory;
     for (const [_name, client] of this.clients.entries()) {
-      if (client instanceof MCPClient) {
+      if (client instanceof DextoMcpClient) {
         client.setAuthProviderFactory(factory);
       }
     }
@@ -43,7 +45,7 @@ class MCPManager {
   setApprovalManager(approvalManager) {
     this.approvalManager = approvalManager;
     for (const [_name, client] of this.clients.entries()) {
-      if (client instanceof MCPClient) {
+      if (client instanceof DextoMcpClient) {
         client.setApprovalManager(approvalManager);
       }
     }
@@ -83,7 +85,7 @@ class MCPManager {
   /**
    * Register a client that provides tools (and potentially more)
    * @param name Unique name for the client
-   * @param client The client instance, expected to be IMCPClient
+   * @param client The client instance, expected to be McpClient
    */
   registerClient(name, client) {
     if (this.clients.has(name)) {
@@ -544,7 +546,7 @@ class MCPManager {
       this.logger.warn(`Client '${name}' is already connected or registered.`);
       return;
     }
-    const client = new MCPClient(this.logger);
+    const client = new DextoMcpClient(this.logger);
     client.setAuthProviderFactory(this.authProviderFactory);
     try {
       this.logger.info(`Attempting to connect to new server '${name}'...`);
@@ -590,11 +592,14 @@ class MCPManager {
   }
   getAuthProvider(name) {
     const client = this.clients.get(name);
-    if (client instanceof MCPClient) {
+    if (client instanceof DextoMcpClient) {
       return client.getCurrentAuthProvider();
     }
     return null;
   }
+  getServerConfig(name) {
+    return this.configCache.get(name);
+  }
   /**
    * Refresh all client caches by re-fetching capabilities from servers
    * Useful when you want to force a full refresh of tools, prompts, and resources
@@ -669,7 +674,7 @@ class MCPManager {
     this.clients.delete(name);
     delete this.connectionErrors[name];
     try {
-      const newClient = new MCPClient(this.logger);
+      const newClient = new DextoMcpClient(this.logger);
       newClient.setAuthProviderFactory(this.authProviderFactory);
       await newClient.connect(config, name);
       if (this.approvalManager) {
@@ -678,7 +683,7 @@ class MCPManager {
       this.registerClient(name, newClient);
       await this.updateClientCache(name, newClient);
       this.logger.info(`Successfully restarted server '${name}'`);
-      eventBus.emit("mcp:server-restarted", { serverName: name });
+      this.eventBus.emit("mcp:server-restarted", { serverName: name });
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
       const errorCode = error && typeof error === "object" && "code" in error ? String(error.code) : void 0;
@@ -760,7 +765,7 @@ class MCPManager {
           this.logger.warn(`Failed to refresh resource ${params.uri}: ${error}`);
         }
       }
-      eventBus.emit("mcp:resource-updated", {
+      this.eventBus.emit("mcp:resource-updated", {
         serverName,
         resourceUri: params.uri
       });
@@ -796,7 +801,7 @@ class MCPManager {
         this.logger.debug(
           `Updated prompts cache for ${serverName}: [${promptNames.join(", ")}]`
         );
-        eventBus.emit("mcp:prompts-list-changed", {
+        this.eventBus.emit("mcp:prompts-list-changed", {
           serverName,
           prompts: promptNames
         });
@@ -895,7 +900,7 @@ class MCPManager {
         this.logger.debug(
           `Updated tools cache for ${serverName}: [${toolNames.join(", ")}]`
         );
-        eventBus.emit("mcp:tools-list-changed", {
+        this.eventBus.emit("mcp:tools-list-changed", {
           serverName,
           tools: toolNames
         });

package/dist/mcp/mcp-client.cjs

@@ -18,7 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mcp_client_exports = {};
 __export(mcp_client_exports, {
-  MCPClient: () => MCPClient
+  DextoMcpClient: () => DextoMcpClient
 });
 module.exports = __toCommonJS(mcp_client_exports);
 var import_client = require("@modelcontextprotocol/sdk/client/index.js");
@@ -31,11 +31,24 @@ var import_zod = require("zod");
 var import_types = require("../logger/v2/types.js");
 var import_types2 = require("../approval/types.js");
 var import_errors = require("./errors.js");
-var import_types5 = require("@modelcontextprotocol/sdk/types.js");
+var import_types3 = require("@modelcontextprotocol/sdk/types.js");
 var import_api = require("@opentelemetry/api");
 var import_utils = require("../telemetry/utils.js");
 var import_safe_stringify = require("../utils/safe-stringify.js");
-class MCPClient extends import_events.EventEmitter {
+const UI_EXTENSION_NAME = "io.modelcontextprotocol/ui";
+const UI_EXTENSION_MIME_TYPE = "text/html;profile=mcp-app";
+function buildClientCapabilities() {
+  return {
+    elicitation: {},
+    // Enable elicitation capability
+    extensions: {
+      [UI_EXTENSION_NAME]: {
+        mimeTypes: [UI_EXTENSION_MIME_TYPE]
+      }
+    }
+  };
+}
+class DextoMcpClient extends import_events.EventEmitter {
   client = null;
   transport = null;
   isConnected = false;
@@ -122,10 +135,7 @@ class MCPClient extends import_events.EventEmitter {
         version: "1.0.0"
       },
       {
-        capabilities: {
-          elicitation: {}
-          // Enable elicitation capability
-        }
+        capabilities: buildClientCapabilities()
       }
     );
     try {
@@ -174,10 +184,7 @@ class MCPClient extends import_events.EventEmitter {
         version: "1.0.0"
       },
       {
-        capabilities: {
-          elicitation: {}
-          // Enable elicitation capability
-        }
+        capabilities: buildClientCapabilities()
       }
     );
     try {
@@ -250,10 +257,7 @@ class MCPClient extends import_events.EventEmitter {
     this.client = new import_client.Client(
       { name: "Dexto-http-mcp-client", version: "1.0.0" },
       {
-        capabilities: {
-          elicitation: {}
-          // Enable elicitation capability
-        }
+        capabilities: buildClientCapabilities()
       }
     );
     try {
@@ -404,7 +408,8 @@ class MCPClient extends import_events.EventEmitter {
           }
           tools[tool.name] = {
             description: tool.description ?? "",
-            parameters: tool.inputSchema
+            parameters: tool.inputSchema,
+            _meta: tool._meta
           };
         });
       } else {
@@ -561,7 +566,7 @@ class MCPClient extends import_events.EventEmitter {
     if (!this.client) return;
     try {
       this.client.setNotificationHandler(
-        import_types5.ResourceUpdatedNotificationSchema,
+        import_types3.ResourceUpdatedNotificationSchema,
         (notification) => {
           this.handleResourceUpdated({
             uri: notification.params.uri
@@ -572,14 +577,14 @@ class MCPClient extends import_events.EventEmitter {
       this.logger.warn(`Could not set resources/updated notification handler: ${error}`);
     }
     try {
-      this.client.setNotificationHandler(import_types5.PromptListChangedNotificationSchema, () => {
+      this.client.setNotificationHandler(import_types3.PromptListChangedNotificationSchema, () => {
         this.handlePromptsListChanged();
       });
     } catch (error) {
       this.logger.warn(`Could not set prompts/list_changed notification handler: ${error}`);
     }
     try {
-      this.client.setNotificationHandler(import_types5.ToolListChangedNotificationSchema, () => {
+      this.client.setNotificationHandler(import_types3.ToolListChangedNotificationSchema, () => {
         this.handleToolsListChanged();
       });
     } catch (error) {
@@ -689,5 +694,5 @@ class MCPClient extends import_events.EventEmitter {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  MCPClient
+  DextoMcpClient
 });

package/dist/mcp/mcp-client.d.ts

@@ -1,15 +1,15 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { EventEmitter } from 'events';
-import type { IDextoLogger } from '../logger/v2/types.js';
+import type { Logger } from '../logger/v2/types.js';
 import type { ApprovalManager } from '../approval/manager.js';
 import type { ValidatedMcpServerConfig } from './schemas.js';
-import { ToolSet } from '../tools/types.js';
-import { IMCPClient, MCPResourceSummary, McpAuthProviderFactory } from './types.js';
+import type { ToolSet } from '../tools/types.js';
+import type { McpClient, MCPResourceSummary, McpAuthProviderFactory } from './types.js';
 import type { GetPromptResult, ReadResourceResult, Prompt } from '@modelcontextprotocol/sdk/types.js';
 /**
  * Wrapper on top of Client class provided in model context protocol SDK, to add additional metadata about the server
  */
-export declare class MCPClient extends EventEmitter implements IMCPClient {
+export declare class DextoMcpClient extends EventEmitter implements McpClient {
     private client;
     private transport;
     private isConnected;
@@ -25,7 +25,7 @@ export declare class MCPClient extends EventEmitter implements IMCPClient {
     private logger;
     private authProviderFactory;
     private currentAuthProvider;
-    constructor(logger: IDextoLogger);
+    constructor(logger: Logger);
     setAuthProviderFactory(factory: McpAuthProviderFactory | null): void;
     getCurrentAuthProvider(): ReturnType<McpAuthProviderFactory> | null;
     connect(config: ValidatedMcpServerConfig, serverName: string): Promise<Client>;

package/dist/mcp/mcp-client.d.ts.map

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

package/dist/mcp/mcp-client.js

@@ -17,7 +17,20 @@ import {
 import { trace, context, SpanStatusCode, SpanKind } from "@opentelemetry/api";
 import { hasActiveTelemetry, addBaggageAttributesToSpan } from "../telemetry/utils.js";
 import { safeStringify } from "../utils/safe-stringify.js";
-class MCPClient extends EventEmitter {
+const UI_EXTENSION_NAME = "io.modelcontextprotocol/ui";
+const UI_EXTENSION_MIME_TYPE = "text/html;profile=mcp-app";
+function buildClientCapabilities() {
+  return {
+    elicitation: {},
+    // Enable elicitation capability
+    extensions: {
+      [UI_EXTENSION_NAME]: {
+        mimeTypes: [UI_EXTENSION_MIME_TYPE]
+      }
+    }
+  };
+}
+class DextoMcpClient extends EventEmitter {
   client = null;
   transport = null;
   isConnected = false;
@@ -104,10 +117,7 @@ class MCPClient extends EventEmitter {
         version: "1.0.0"
       },
       {
-        capabilities: {
-          elicitation: {}
-          // Enable elicitation capability
-        }
+        capabilities: buildClientCapabilities()
       }
     );
     try {
@@ -156,10 +166,7 @@ class MCPClient extends EventEmitter {
         version: "1.0.0"
       },
       {
-        capabilities: {
-          elicitation: {}
-          // Enable elicitation capability
-        }
+        capabilities: buildClientCapabilities()
       }
     );
     try {
@@ -232,10 +239,7 @@ class MCPClient extends EventEmitter {
     this.client = new Client(
       { name: "Dexto-http-mcp-client", version: "1.0.0" },
       {
-        capabilities: {
-          elicitation: {}
-          // Enable elicitation capability
-        }
+        capabilities: buildClientCapabilities()
       }
     );
     try {
@@ -386,7 +390,8 @@ class MCPClient extends EventEmitter {
           }
           tools[tool.name] = {
             description: tool.description ?? "",
-            parameters: tool.inputSchema
+            parameters: tool.inputSchema,
+            _meta: tool._meta
           };
         });
       } else {
@@ -670,5 +675,5 @@ class MCPClient extends EventEmitter {
   }
 }
 export {
-  MCPClient
+  DextoMcpClient
 };

package/dist/mcp/resolver.cjs

@@ -22,7 +22,7 @@ __export(resolver_exports, {
 });
 module.exports = __toCommonJS(resolver_exports);
 var import_result = require("../utils/result.js");
-var import_types = require("../errors/types.cjs");
+var import_types = require("../errors/types.js");
 var import_error_codes = require("./error-codes.js");
 var import_schemas = require("./schemas.js");
 function resolveAndValidateMcpServerConfig(serverName, serverConfig, existingServerNames = []) {

package/dist/mcp/schemas.cjs

@@ -24,14 +24,14 @@ __export(schemas_exports, {
   MCP_CONNECTION_STATUSES: () => MCP_CONNECTION_STATUSES,
   MCP_SERVER_TYPES: () => MCP_SERVER_TYPES,
   McpServerConfigSchema: () => McpServerConfigSchema,
-  ServerConfigsSchema: () => ServerConfigsSchema,
+  ServersConfigSchema: () => ServersConfigSchema,
   SseServerConfigSchema: () => SseServerConfigSchema,
   StdioServerConfigSchema: () => StdioServerConfigSchema
 });
 module.exports = __toCommonJS(schemas_exports);
 var import_error_codes = require("./error-codes.js");
-var import_types = require("../errors/types.cjs");
-var import_result = require("../utils/result.cjs");
+var import_types = require("../errors/types.js");
+var import_result = require("../utils/result.js");
 var import_zod = require("zod");
 const MCP_SERVER_TYPES = ["stdio", "sse", "http"];
 const MCP_CONNECTION_MODES = ["strict", "lenient"];
@@ -86,7 +86,7 @@ const McpServerConfigSchema = import_zod.z.discriminatedUnion("type", [
   HttpServerConfigSchema
 ]).superRefine((_data, _ctx) => {
 }).brand();
-const ServerConfigsSchema = import_zod.z.record(McpServerConfigSchema).describe("A dictionary of server configurations, keyed by server name").brand();
+const ServersConfigSchema = import_zod.z.record(McpServerConfigSchema).describe("A dictionary of server configurations, keyed by server name").brand();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_MCP_CONNECTION_MODE,
@@ -95,7 +95,7 @@ const ServerConfigsSchema = import_zod.z.record(McpServerConfigSchema).describe(
   MCP_CONNECTION_STATUSES,
   MCP_SERVER_TYPES,
   McpServerConfigSchema,
-  ServerConfigsSchema,
+  ServersConfigSchema,
   SseServerConfigSchema,
   StdioServerConfigSchema
 });

package/dist/mcp/schemas.d.ts

@@ -28,17 +28,17 @@ export declare const StdioServerConfigSchema: z.ZodObject<{
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "stdio";
-    enabled: boolean;
-    command: string;
     args: string[];
+    command: string;
+    enabled: boolean;
     env: Record<string, string>;
     connectionMode: "strict" | "lenient";
 }, {
     type: "stdio";
     command: string;
     timeout?: number | undefined;
-    enabled?: boolean | undefined;
     args?: string[] | undefined;
+    enabled?: boolean | undefined;
     env?: Record<string, string> | undefined;
     connectionMode?: "strict" | "lenient" | undefined;
 }>;
@@ -103,17 +103,17 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "stdio";
-    enabled: boolean;
-    command: string;
     args: string[];
+    command: string;
+    enabled: boolean;
     env: Record<string, string>;
     connectionMode: "strict" | "lenient";
 }, {
     type: "stdio";
     command: string;
     timeout?: number | undefined;
-    enabled?: boolean | undefined;
     args?: string[] | undefined;
+    enabled?: boolean | undefined;
     env?: Record<string, string> | undefined;
     connectionMode?: "strict" | "lenient" | undefined;
 }>, z.ZodObject<{
@@ -161,9 +161,9 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
 }>]>, {
     timeout: number;
     type: "stdio";
-    enabled: boolean;
-    command: string;
     args: string[];
+    command: string;
+    enabled: boolean;
     env: Record<string, string>;
     connectionMode: "strict" | "lenient";
 } | {
@@ -184,8 +184,8 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
     type: "stdio";
     command: string;
     timeout?: number | undefined;
-    enabled?: boolean | undefined;
     args?: string[] | undefined;
+    enabled?: boolean | undefined;
     env?: Record<string, string> | undefined;
     connectionMode?: "strict" | "lenient" | undefined;
 } | {
@@ -205,7 +205,7 @@ export declare const McpServerConfigSchema: z.ZodBranded<z.ZodEffects<z.ZodDiscr
 }>, "ValidatedMcpServerConfig">;
 export type McpServerConfig = z.input<typeof McpServerConfigSchema>;
 export type ValidatedMcpServerConfig = z.output<typeof McpServerConfigSchema>;
-export declare const ServerConfigsSchema: z.ZodBranded<z.ZodRecord<z.ZodString, z.ZodBranded<z.ZodEffects<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+export declare const ServersConfigSchema: z.ZodBranded<z.ZodRecord<z.ZodString, z.ZodBranded<z.ZodEffects<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"stdio">;
     enabled: z.ZodDefault<z.ZodBoolean>;
     command: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
@@ -216,17 +216,17 @@ export declare const ServerConfigsSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
 }, "strict", z.ZodTypeAny, {
     timeout: number;
     type: "stdio";
-    enabled: boolean;
-    command: string;
     args: string[];
+    command: string;
+    enabled: boolean;
     env: Record<string, string>;
     connectionMode: "strict" | "lenient";
 }, {
     type: "stdio";
     command: string;
     timeout?: number | undefined;
-    enabled?: boolean | undefined;
     args?: string[] | undefined;
+    enabled?: boolean | undefined;
     env?: Record<string, string> | undefined;
     connectionMode?: "strict" | "lenient" | undefined;
 }>, z.ZodObject<{
@@ -274,9 +274,9 @@ export declare const ServerConfigsSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
 }>]>, {
     timeout: number;
     type: "stdio";
-    enabled: boolean;
-    command: string;
     args: string[];
+    command: string;
+    enabled: boolean;
     env: Record<string, string>;
     connectionMode: "strict" | "lenient";
 } | {
@@ -297,8 +297,8 @@ export declare const ServerConfigsSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
     type: "stdio";
     command: string;
     timeout?: number | undefined;
-    enabled?: boolean | undefined;
     args?: string[] | undefined;
+    enabled?: boolean | undefined;
     env?: Record<string, string> | undefined;
     connectionMode?: "strict" | "lenient" | undefined;
 } | {
@@ -315,7 +315,7 @@ export declare const ServerConfigsSchema: z.ZodBranded<z.ZodRecord<z.ZodString,
     enabled?: boolean | undefined;
     connectionMode?: "strict" | "lenient" | undefined;
     headers?: Record<string, string> | undefined;
-}>, "ValidatedMcpServerConfig">>, "ValidatedServerConfigs">;
-export type ServerConfigs = z.input<typeof ServerConfigsSchema>;
-export type ValidatedServerConfigs = z.output<typeof ServerConfigsSchema>;
+}>, "ValidatedMcpServerConfig">>, "ValidatedServersConfig">;
+export type ServersConfig = z.input<typeof ServersConfigSchema>;
+export type ValidatedServersConfig = z.output<typeof ServersConfigSchema>;
 //# sourceMappingURL=schemas.d.ts.map

package/dist/mcp/schemas.js

@@ -56,7 +56,7 @@ const McpServerConfigSchema = z.discriminatedUnion("type", [
   HttpServerConfigSchema
 ]).superRefine((_data, _ctx) => {
 }).brand();
-const ServerConfigsSchema = z.record(McpServerConfigSchema).describe("A dictionary of server configurations, keyed by server name").brand();
+const ServersConfigSchema = z.record(McpServerConfigSchema).describe("A dictionary of server configurations, keyed by server name").brand();
 export {
   DEFAULT_MCP_CONNECTION_MODE,
   HttpServerConfigSchema,
@@ -64,7 +64,7 @@ export {
   MCP_CONNECTION_STATUSES,
   MCP_SERVER_TYPES,
   McpServerConfigSchema,
-  ServerConfigsSchema,
+  ServersConfigSchema,
   SseServerConfigSchema,
   StdioServerConfigSchema
 };