rename and fix imports

Author: pietrozullo

examples/add_server_tool.ts

@@ -8,7 +8,9 @@
 import { ChatOpenAI } from '@langchain/openai'
 import { config } from 'dotenv'
 import { MCPAgent, MCPClient } from '../index.js'
-
+import { LangChainAdapter } from '../src/adapters/langchain_adapter.js'
+import { ServerManager } from '../src/managers/server_manager.js'
+import { AddMCPServerFromConfigTool } from '../src/managers/tools/add_server_from_config.js'
 // Load environment variables from .env file
 config()
 
@@ -19,13 +21,17 @@ async function main() {
   // The LLM to power the agent
   const llm = new ChatOpenAI({ model: 'gpt-4o', temperature: 0 })
 
+  const serverManager = new ServerManager(client, new LangChainAdapter())
+  serverManager.setManagementTools([new AddMCPServerFromConfigTool(serverManager)])
+
   // Create the agent, enabling the ServerManager
   const agent = new MCPAgent({
     llm,
     client,
     maxSteps: 30,
-    useServerManager: true,
     autoInitialize: true,
+    useServerManager: true,
+    serverManagerFactory: () => serverManager,
   })
 
   // Define the server configuration that the agent will be asked to add.

index.ts

@@ -11,5 +11,6 @@ import { MCPSession } from './src/session.js'
 
 export { BaseAdapter, LangChainAdapter } from './src/adapters/index.js'
 export { ServerManager } from './src/managers/server_manager.js'
+export * from './src/managers/tools/index.js'
 
 export { BaseConnector, HttpConnector, loadConfigFile, Logger, logger, MCPAgent, MCPClient, MCPSession, StdioConnector, WebSocketConnector }

src/agents/mcp_agent.ts

@@ -66,6 +66,7 @@ export class MCPAgent {
     useServerManager?: boolean
     verbose?: boolean
     adapter?: LangChainAdapter
+    serverManagerFactory?: (client: MCPClient) => ServerManager
   }) {
     this.llm = options.llm
 
@@ -91,7 +92,7 @@ export class MCPAgent {
         throw new Error('\'client\' must be provided when \'useServerManager\' is true.')
       }
       this.adapter = options.adapter ?? new LangChainAdapter(this.disallowedTools)
-      this.serverManager = new ServerManager(this.client, this.adapter)
+      this.serverManager = options.serverManagerFactory?.(this.client) ?? new ServerManager(this.client, this.adapter)
     }
     // Let consumers swap allowed tools dynamically
     else {

src/managers/server_manager.ts

@@ -6,7 +6,7 @@ import type { MCPSession } from '../session.js'
 import { isEqual } from 'lodash-es'
 import { logger } from '../logging.js'
 import { AcquireActiveMCPServerTool } from './tools/acquire_active_mcp_server.js'
-import { AddMCPServerTool } from './tools/add_server.js'
+import { AddMCPServerFromConfigTool } from './tools/add_server_from_config.js'
 import { ConnectMCPServerTool } from './tools/connect_mcp_server.js'
 import { ListMCPServersTool } from './tools/list_mcp_servers.js'
 import { ReleaseMCPServerConnectionTool } from './tools/release_mcp_server_connection.js'
@@ -18,10 +18,23 @@ export class ServerManager {
   public readonly client: MCPClient
   public readonly adapter: LangChainAdapter
   public activeServer: string | null = null
+  private overrideManagementTools?: StructuredToolInterface[]
 
-  constructor(client: MCPClient, adapter: LangChainAdapter) {
+  constructor(
+    client: MCPClient,
+    adapter: LangChainAdapter,
+    managementTools?: StructuredToolInterface[],
+  ) {
     this.client = client
     this.adapter = adapter
+    this.overrideManagementTools = managementTools
+  }
+
+  public setManagementTools(tools: StructuredToolInterface[]): void {
+    this.overrideManagementTools = tools
+    logger.info(
+      `Overriding default management tools with a new set of ${tools.length} tools.`,
+    )
   }
 
   public logState(context: string): void {
@@ -109,8 +122,8 @@ export class ServerManager {
       this.logState('Providing tools to agent')
     }
 
-    const managementTools = [
-      new AddMCPServerTool(this),
+    const managementTools = this.overrideManagementTools ?? [
+      new AddMCPServerFromConfigTool(this),
       new ListMCPServersTool(this),
       new ConnectMCPServerTool(this),
       new AcquireActiveMCPServerTool(this),

src/managers/tools/add_server.ts renamed to src/managers/tools/add_server_from_config.ts

@@ -4,10 +4,10 @@ import { StructuredTool } from 'langchain/tools'
 import { z } from 'zod'
 import { logger } from '../../logging.js'
 
-export class AddMCPServerTool extends StructuredTool {
-  name = 'add_mcp_server'
+export class AddMCPServerFromConfigTool extends StructuredTool {
+  name = 'add_mcp_server_from_config'
   description
-    = 'Adds a new MCP server to the client and connects to it, making its tools available.'
+    = 'Adds a new MCP server to the client from a configuration object and connects to it, making its tools available.'
 
   schema = z.object({
     serverName: z.string().describe('The name for the new MCP server.'),

src/managers/tools/index.ts

@@ -1,4 +1,5 @@
 export * from './acquire_active_mcp_server.js'
+export * from './add_server_from_config.js'
 export * from './connect_mcp_server.js'
 export * from './list_mcp_servers.js'
 export * from './release_mcp_server_connection.js'