@juspay/neurolink 7.13.0 → 7.14.1

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [7.14.1](https://github.com/juspay/neurolink/compare/v7.14.0...v7.14.1) (2025-08-15)
+
+### Bug Fixes
+
+- **(mcp):** implement external MCP server integration with real tool execution ([9427a95](https://github.com/juspay/neurolink/commit/9427a95599a829f82e697eaf30388a8f3c899d4f))
+
+## [7.14.0](https://github.com/juspay/neurolink/compare/v7.13.0...v7.14.0) (2025-08-14)
+
+### Features
+
+- **(external-mcp):** add external MCP server integration support ([c03dee8](https://github.com/juspay/neurolink/commit/c03dee8dd7a2e06e78bc743d7b3a5cff858395de))
+
 ## [7.13.0](https://github.com/juspay/neurolink/compare/v7.12.0...v7.13.0) (2025-08-14)
 
 ### Features

package/README.md

@@ -69,7 +69,7 @@ npx @juspay/neurolink sagemaker benchmark my-endpoint  # Performance testing
 - **🛡️ Error Recovery** - Graceful failures with provider fallback and retry logic
 - **📊 Analytics & Evaluation** - Built-in usage tracking and AI-powered quality assessment
 - **🎯 Real-time Event Monitoring** - EventEmitter integration for progress tracking and debugging
-- **🔧 MCP Integration** - Model Context Protocol with 6 built-in tools and 58+ discoverable servers
+- **🔧 External MCP Integration** - Model Context Protocol with 6 built-in tools + full external MCP server support
 - **🚀 Lighthouse Integration** - Unified tool registration API supporting both object and array formats for seamless Lighthouse tool import
 
 ---
@@ -118,6 +118,28 @@ npx @juspay/neurolink status                # Check all providers
 ```bash
 # SDK Installation for using in your typescript projects
 npm install @juspay/neurolink
+
+# 🆕 NEW: External MCP Server Integration Quick Test
+node -e "
+const { NeuroLink } = require('@juspay/neurolink');
+(async () => {
+  const neurolink = new NeuroLink();
+
+  // Add external filesystem MCP server
+  await neurolink.addExternalMCPServer('filesystem', {
+    command: 'npx',
+    args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+    transport: 'stdio'
+  });
+
+  // External tools automatically available in generate()
+  const result = await neurolink.generate({
+    input: { text: 'List files in the current directory' }
+  });
+  console.log('🎉 External MCP integration working!');
+  console.log(result.content);
+})();
+"
 ```
 
 ### Basic Usage
@@ -327,41 +349,56 @@ console.log(productData.name, productData.price, productData.features);
 - ⚡ **Automatic Fallback** - Never fail when providers are down, intelligent provider switching
 - 🖥️ **CLI + SDK** - Use from command line or integrate programmatically with TypeScript support
 - 🛡️ **Production Ready** - Enterprise-grade error handling, performance optimization, extracted from production
-- ✅ **MCP Integration** - Model Context Protocol with working built-in tools and 58+ discoverable external servers
+- ✅ **External MCP Integration** - Model Context Protocol with built-in tools + full external MCP server support
 - 🔍 **Smart Model Resolution** - Fuzzy matching, aliases, and capability-based search across all providers
 - 🏠 **Local AI Support** - Run completely offline with Ollama or through LiteLLM proxy
 - 🌍 **Universal Model Access** - Direct providers + 100,000+ models via Hugging Face + 100+ models via LiteLLM
 - 🧠 **Automatic Context Summarization** - Stateful, long-running conversations with automatic history summarization.
 - 📊 **Analytics & Evaluation** - Built-in usage tracking and AI-powered quality assessment
 
-## 🛠️ MCP Integration Status ✅ **BUILT-IN TOOLS WORKING**
+## 🛠️ External MCP Integration Status ✅ **PRODUCTION READY**
 
-| Component           | Status             | Description                                              |
-| ------------------- | ------------------ | -------------------------------------------------------- |
-| Built-in Tools      | ✅ **Working**     | 6 core tools fully functional across all providers       |
-| SDK Custom Tools    | ✅ **Working**     | Register custom tools programmatically                   |
-| External Discovery  | 🔍 **Discovery**   | 58+ MCP servers discovered from AI tools ecosystem       |
-| Tool Execution      | ✅ **Working**     | Real-time AI tool calling with built-in tools            |
-| **External Tools**  | 🚧 **Development** | Manual config needs one-line fix, activation in progress |
-| **CLI Integration** | ✅ **READY**       | **Production-ready with built-in tools**                 |
-| External Activation | 🔧 **Development** | Discovery complete, activation protocol in progress      |
+| Component              | Status         | Description                                                      |
+| ---------------------- | -------------- | ---------------------------------------------------------------- |
+| Built-in Tools         | ✅ **Working** | 6 core tools fully functional across all providers               |
+| SDK Custom Tools       | ✅ **Working** | Register custom tools programmatically                           |
+| **External MCP Tools** | ✅ **Working** | **Full external MCP server support with dynamic tool discovery** |
+| Tool Execution         | ✅ **Working** | Real-time AI tool calling with all tool types                    |
+| **Streaming Support**  | ✅ **Working** | **External MCP tools work with streaming generation**            |
+| **Multi-Provider**     | ✅ **Working** | **External tools work across all AI providers**                  |
+| **CLI Integration**    | ✅ **READY**   | **Production-ready with external MCP support**                   |
 
-### ✅ Quick MCP Test (v1.7.1)
+### ✅ External MCP Integration Demo
 
 ```bash
 # Test built-in tools (works immediately)
 npx @juspay/neurolink generate "What time is it?" --debug
 
-# Disable tools for pure text generation
-npx @juspay/neurolink generate "Write a poem" --disable-tools
+# 🆕 NEW: External MCP server integration (SDK)
+import { NeuroLink } from '@juspay/neurolink';
+
+const neurolink = new NeuroLink();
+
+// Add external MCP server (e.g., Bitbucket)
+await neurolink.addExternalMCPServer('bitbucket', {
+  command: 'npx',
+  args: ['-y', '@nexus2520/bitbucket-mcp-server'],
+  transport: 'stdio',
+  env: {
+    BITBUCKET_USERNAME: process.env.BITBUCKET_USERNAME,
+    BITBUCKET_TOKEN: process.env.BITBUCKET_TOKEN,
+    BITBUCKET_BASE_URL: 'https://bitbucket.example.com'
+  }
+});
+
+// Use external MCP tools in generation
+const result = await neurolink.generate({
+  input: { text: 'Get pull request #123 details from the main repository' },
+  disableTools: false // External MCP tools automatically available
+});
 
 # Discover available MCP servers
 npx @juspay/neurolink mcp discover --format table
-
-# Install popular MCP servers (NEW: Bitbucket support added!)
-npx @juspay/neurolink mcp install filesystem
-npx @juspay/neurolink mcp install github
-npx @juspay/neurolink mcp install bitbucket  # 🆕 NEW
 ```
 
 ### 🔧 SDK Custom Tool Registration (NEW!)
@@ -663,16 +700,43 @@ npx @juspay/neurolink generate "Hello!" --provider openai-compatible
 - **Extensibility**: Connect external tools and services via MCP protocol
 - **🆕 Dynamic Server Management**: Programmatically add MCP servers at runtime
 
-### 🔧 Programmatic MCP Server Management [Coming Soon]
+### 🔧 External MCP Server Management ✅ **AVAILABLE NOW**
 
-**Note**: External MCP server activation is in development. Currently available:
+**External MCP integration is now production-ready:**
 
 - ✅ 6 built-in tools working across all providers
 - ✅ SDK custom tool registration
-- 🔍 MCP server discovery (58+ servers found)
-- 🚧 External server activation (one-line fix pending)
+- ✅ **External MCP server management** (add, remove, list, test servers)
+- ✅ **Dynamic tool discovery** (automatic tool registration from external servers)
+- ✅ **Multi-provider support** (external tools work with all AI providers)
+- ✅ **Streaming integration** (external tools work with real-time streaming)
+- ✅ **Enhanced tool tracking** (proper parameter extraction and execution logging)
 
-Manual MCP configuration (`.mcp-config.json`) support coming soon.
+```typescript
+// Complete external MCP server API
+const neurolink = new NeuroLink();
+
+// Server management
+await neurolink.addExternalMCPServer(serverId, config);
+await neurolink.removeExternalMCPServer(serverId);
+const servers = neurolink.listExternalMCPServers();
+const server = neurolink.getExternalMCPServer(serverId);
+
+// Tool management
+const tools = neurolink.getExternalMCPTools();
+const serverTools = neurolink.getExternalMCPServerTools(serverId);
+
+// Direct tool execution
+const result = await neurolink.executeExternalMCPTool(
+  serverId,
+  toolName,
+  params,
+);
+
+// Statistics and monitoring
+const stats = neurolink.getExternalMCPStatistics();
+await neurolink.shutdownExternalMCPServers();
+```
 
 ## 🤝 Contributing
 

package/dist/agent/directTools.d.ts

@@ -219,12 +219,12 @@ export declare const directAgentTools: {
         content: z.ZodString;
         mode: z.ZodDefault<z.ZodEnum<["create", "overwrite", "append"]>>;
     }, "strip", z.ZodTypeAny, {
-        path: string;
         content: string;
+        path: string;
         mode: "create" | "overwrite" | "append";
     }, {
-        path: string;
         content: string;
+        path: string;
         mode?: "create" | "overwrite" | "append" | undefined;
     }>, {
         success: boolean;
@@ -249,8 +249,8 @@ export declare const directAgentTools: {
         written?: undefined;
     }> & {
         execute: (args: {
-            path: string;
             content: string;
+            path: string;
             mode: "create" | "overwrite" | "append";
         }, options: import("ai").ToolExecutionOptions) => PromiseLike<{
             success: boolean;

package/dist/agent/directTools.js

@@ -163,7 +163,7 @@ export const directAgentTools = {
                     for (const func of allowedMathFunctions) {
                         safeExpression = safeExpression.replace(new RegExp(func, "g"), func);
                     }
-                    // Remove any remaining non-safe characters except Math functions
+                    // Remove remaining non-safe characters except Math functions
                     const mathSafe = /^[0-9+\-*/().\s]|Math\.(abs|ceil|floor|round|sqrt|pow|sin|cos|tan|log|exp|PI|E)/g;
                     if (!safeExpression
                         .split("")

package/dist/cli/commands/mcp.js

@@ -3,6 +3,7 @@
  * Implements comprehensive MCP server management commands
  * Part of Phase 4.2 - MCP CLI Commands
  */
+import { createExternalServerInfo } from "../../lib/utils/mcpDefaults.js";
 import { NeuroLink } from "../../lib/neurolink.js";
 import { logger } from "../../lib/utils/logger.js";
 import chalk from "chalk";
@@ -80,91 +81,6 @@ const POPULAR_MCP_SERVERS = {
         description: "Bitbucket repository management and development workflows",
     },
 };
-/**
- * Type guard to check if an object conforms to MCPStatusResponse interface
- */
-function isMCPStatusResponse(obj) {
-    if (!obj || typeof obj !== "object") {
-        return false;
-    }
-    const record = obj;
-    // Check if autoDiscoveredServers is either undefined or an array
-    if (record.autoDiscoveredServers !== undefined) {
-        if (!Array.isArray(record.autoDiscoveredServers)) {
-            return false;
-        }
-        // Check each server object in the array
-        for (const server of record.autoDiscoveredServers) {
-            if (!server || typeof server !== "object") {
-                return false;
-            }
-            const serverRecord = server;
-            // Optional properties should be correct type if present
-            if (serverRecord.name !== undefined &&
-                typeof serverRecord.name !== "string") {
-                return false;
-            }
-            if (serverRecord.id !== undefined &&
-                typeof serverRecord.id !== "string") {
-                return false;
-            }
-            if (serverRecord.status !== undefined &&
-                typeof serverRecord.status !== "string") {
-                return false;
-            }
-            if (serverRecord.source !== undefined &&
-                typeof serverRecord.source !== "string") {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-/**
- * Convert SDK MCPStatus to CLI format with server list
- */
-function convertMCPStatusForCLI(status, // Use flexible object type
-sdk) {
-    // Create server list from in-memory servers and discovered servers
-    const servers = [];
-    // Add in-memory servers
-    const inMemoryServers = sdk.getInMemoryServers();
-    inMemoryServers.forEach((config, name) => {
-        servers.push({
-            name,
-            connected: true, // In-memory servers are always "connected"
-            description: config.server?.title || "In-memory MCP server",
-            tools: [], // Could extract from config.server.tools if needed
-        });
-    });
-    // Add auto-discovered servers
-    // Cache the type guard result to avoid repeated validation
-    const isValidStatusResponse = isMCPStatusResponse(status);
-    if (isValidStatusResponse && status.autoDiscoveredServers) {
-        status.autoDiscoveredServers.forEach((server) => {
-            servers.push({
-                name: server.name || server.id || "Unknown",
-                connected: server.status === "connected",
-                description: server.source
-                    ? `Auto-discovered from ${server.source}`
-                    : `Auto-discovered server`,
-                tools: [],
-                error: server.status === "failed" ? "Connection failed" : undefined,
-            });
-        });
-    }
-    return {
-        mcpInitialized: status.mcpInitialized,
-        totalServers: status.totalServers,
-        availableServers: status.availableServers,
-        autoDiscoveredCount: status.autoDiscoveredCount,
-        totalTools: status.totalTools,
-        customToolsCount: status.customToolsCount,
-        inMemoryServersCount: status.inMemoryServersCount,
-        error: status.error,
-        servers,
-    };
-}
 /**
  * MCP CLI command factory
  */
@@ -280,7 +196,7 @@ export class MCPCommandFactory {
             demandOption: true,
         })
             .option("transport", {
-            choices: ["stdio", "sse", "ws"],
+            choices: ["stdio", "sse", "websocket"],
             default: "stdio",
             description: "Transport type for MCP communication",
         })
@@ -312,7 +228,7 @@ export class MCPCommandFactory {
             demandOption: true,
         })
             .option("transport", {
-            choices: ["stdio", "sse", "ws"],
+            choices: ["stdio", "sse", "websocket"],
             default: "stdio",
             description: "Transport type for MCP communication",
         })
@@ -393,12 +309,12 @@ export class MCPCommandFactory {
             const spinner = argv.quiet ? null : ora("Loading MCP servers...").start();
             // Get configured servers from NeuroLink
             const sdk = new NeuroLink();
-            const rawMcpStatus = await sdk.getMCPStatus();
-            const mcpStatus = convertMCPStatusForCLI(rawMcpStatus, sdk);
+            const mcpStatus = await sdk.getMCPStatus();
+            const allServers = await sdk.listMCPServers();
             if (spinner) {
-                spinner.succeed(`Found ${mcpStatus.servers.length} MCP servers`);
+                spinner.succeed(`Found ${allServers.length} MCP servers`);
             }
-            if (mcpStatus.servers.length === 0) {
+            if (allServers.length === 0) {
                 logger.always(chalk.yellow("No MCP servers configured."));
                 logger.always(chalk.blue("💡 Use 'neurolink mcp install <server>' to install popular servers"));
                 logger.always(chalk.blue("💡 Use 'neurolink discover' to find existing servers"));
@@ -408,17 +324,19 @@ export class MCPCommandFactory {
             if (argv.format === "json") {
                 logger.always(JSON.stringify(mcpStatus, null, 2));
             }
-            else if (argv.format && argv.format === "compact") {
-                mcpStatus.servers.forEach((server) => {
-                    const status = server.connected ? chalk.green("✓") : chalk.red("✗");
+            else if (argv.format === "compact") {
+                const allServers = await sdk.listMCPServers();
+                allServers.forEach((server) => {
+                    const status = server.status === "connected" ? chalk.green("✓") : chalk.red("✗");
                     logger.always(`${status} ${server.name} - ${server.description || "No description"}`);
                 });
             }
             else {
                 // Table format
                 logger.always(chalk.bold("\n🔧 MCP Servers:\n"));
-                for (const server of mcpStatus.servers) {
-                    const status = server.connected
+                const allServers = await sdk.listMCPServers();
+                for (const server of allServers) {
+                    const status = server.status === "connected"
                         ? chalk.green("CONNECTED")
                         : chalk.red("DISCONNECTED");
                     logger.always(`${chalk.cyan(server.name)} ${status}`);
@@ -474,58 +392,36 @@ export class MCPCommandFactory {
                     process.exit(1);
                 }
             }
-            // Create server configuration
-            const config = {
+            const serverInfo = createExternalServerInfo({
+                ...serverConfig,
+                id: serverName,
                 name: serverName,
-                command: serverConfig.command,
-                args: argv.args || serverConfig.args,
-                env,
-                transport: (argv.transport &&
-                    (argv.transport === "websocket"
-                        ? "ws"
-                        : argv.transport)) ||
-                    serverConfig.transport,
-                description: serverConfig.description,
-                installed: true,
-                status: "unknown",
-            };
-            // Add server to NeuroLink (using in-memory MCP server for now)
-            const sdk = new NeuroLink();
-            await sdk.addInMemoryMCPServer(serverName, {
-                server: {
-                    title: serverConfig.description,
-                    tools: {}, // Empty tools for external servers
-                    description: serverConfig.description,
-                },
-                metadata: {
-                    command: config.command,
-                    args: config.args,
-                    env: config.env,
-                    transport: config.transport,
-                },
             });
+            // Add server to NeuroLink - direct usage, zero transformations!
+            const sdk = new NeuroLink();
+            await sdk.addInMemoryMCPServer(serverName, serverInfo);
             if (spinner) {
                 spinner.succeed(chalk.green(`✅ Successfully installed ${serverName} MCP server`));
             }
             // Display configuration info
             logger.always(chalk.bold("\n📋 Server Configuration:"));
-            logger.always(`Name: ${config.name}`);
-            logger.always(`Command: ${config.command}`);
-            if (config.args?.length) {
-                logger.always(`Args: ${config.args.join(" ")}`);
+            logger.always(`Name: ${serverInfo.name}`);
+            logger.always(`Command: ${serverInfo.command}`);
+            if (serverInfo.args?.length) {
+                logger.always(`Args: ${serverInfo.args.join(" ")}`);
             }
-            if (config.env) {
-                logger.always(`Environment: ${Object.keys(config.env).length} variables`);
+            if (serverInfo.env) {
+                logger.always(`Environment: ${Object.keys(serverInfo.env).length} variables`);
             }
-            logger.always(`Transport: ${config.transport}`);
-            logger.always(`Description: ${config.description}`);
+            logger.always(`Transport: ${serverInfo.transport}`);
+            logger.always(`Description: ${serverInfo.description}`);
             // Test connection
             logger.always(chalk.blue("\n🔍 Testing connection..."));
             try {
                 const rawStatus = await sdk.getMCPStatus();
-                const status = convertMCPStatusForCLI(rawStatus, sdk);
-                const installedServer = status.servers.find((s) => s.name === serverName);
-                if (installedServer?.connected) {
+                const status = rawStatus;
+                const installedServer = status.externalMCPServers?.find((s) => s.name === serverName);
+                if (installedServer?.status === "connected") {
                     logger.always(chalk.green("✅ Server connected successfully"));
                     if (installedServer.tools?.length) {
                         logger.always(`🛠️  Available tools: ${installedServer.tools.length}`);
@@ -571,47 +467,32 @@ export class MCPCommandFactory {
                     process.exit(1);
                 }
             }
-            // Create server configuration
-            const config = {
+            const serverInfo = createExternalServerInfo({
+                id: name,
                 name,
                 command,
                 args: argv.args,
                 env,
-                transport: (argv.transport === "websocket"
-                    ? "ws"
-                    : argv.transport) || "stdio",
-                installed: true,
-                status: "unknown",
-            };
-            // Add server to NeuroLink
-            const sdk = new NeuroLink();
-            await sdk.addInMemoryMCPServer(name, {
-                server: {
-                    title: name,
-                    tools: {}, // Empty tools for external servers
-                    description: `Custom MCP server: ${command}`,
-                },
-                metadata: {
-                    command: config.command,
-                    args: config.args,
-                    env: config.env,
-                    transport: config.transport,
-                },
+                transport: argv.transport || "stdio",
+                description: command,
             });
+            // Add server to NeuroLink using MCPServerInfo directly
+            const sdk = new NeuroLink();
+            await sdk.addInMemoryMCPServer(name, serverInfo);
             if (spinner) {
                 spinner.succeed(chalk.green(`✅ Successfully added ${name} MCP server`));
             }
             // Display configuration
             logger.always(chalk.bold("\n📋 Server Configuration:"));
-            logger.always(`Name: ${config.name}`);
-            logger.always(`Command: ${config.command}`);
-            if (config.args?.length) {
-                logger.always(`Args: ${config.args.join(" ")}`);
+            logger.always(`Name: ${serverInfo.name}`);
+            logger.always(`Command: ${serverInfo.command}`);
+            if (serverInfo.args?.length) {
+                logger.always(`Args: ${serverInfo.args.join(" ")}`);
             }
-            if (config.env) {
-                logger.always(`Environment: ${Object.keys(config.env).length} variables`);
+            if (serverInfo.env) {
+                logger.always(`Environment: ${Object.keys(serverInfo.env).length} variables`);
             }
-            logger.always(`Transport: ${config.transport}`);
+            logger.always(`Transport: ${serverInfo.transport}`);
         }
         catch (_error) {
             logger.error(chalk.red(`❌ Add command failed: ${_error.message}`));
@@ -629,10 +510,9 @@ export class MCPCommandFactory {
                 : ora("Testing MCP server connections...").start();
             const sdk = new NeuroLink();
             const rawMcpStatus = await sdk.getMCPStatus();
-            const mcpStatus = convertMCPStatusForCLI(rawMcpStatus, sdk);
-            let serversToTest = mcpStatus.servers;
+            let serversToTest = await sdk.listMCPServers();
             if (targetServer) {
-                serversToTest = mcpStatus.servers.filter((s) => s.name === targetServer);
+                serversToTest = serversToTest.filter((s) => s.name === targetServer);
                 if (serversToTest.length === 0) {
                     if (spinner) {
                         spinner.fail();
@@ -647,11 +527,11 @@ export class MCPCommandFactory {
             // Display test results
             logger.always(chalk.bold("\n🧪 MCP Server Test Results:\n"));
             for (const server of serversToTest) {
-                const status = server.connected
+                const status = server.status === "connected"
                     ? chalk.green("✅ CONNECTED")
                     : chalk.red("❌ DISCONNECTED");
                 logger.always(`${server.name}: ${status}`);
-                if (server.connected) {
+                if (server.status === "connected") {
                     logger.always(`  Tools: ${server.tools?.length || 0} available`);
                     if (server.tools?.length) {
                         server.tools.slice(0, 3).forEach((tool) => {
@@ -671,7 +551,7 @@ export class MCPCommandFactory {
                 logger.always();
             }
             // Summary
-            const connected = serversToTest.filter((s) => s.connected).length;
+            const connected = serversToTest.filter((s) => s.status === "connected").length;
             const total = serversToTest.length;
             if (connected === total) {
                 logger.always(chalk.green(`🎉 All ${total} servers connected successfully`));
@@ -711,9 +591,8 @@ export class MCPCommandFactory {
             }
             const sdk = new NeuroLink();
             // Check if server exists and is connected
-            const rawMcpStatus = await sdk.getMCPStatus();
-            const mcpStatus = convertMCPStatusForCLI(rawMcpStatus, sdk);
-            const server = mcpStatus.servers.find((s) => s.name === serverName);
+            const allServers = await sdk.listMCPServers();
+            const server = allServers.find((s) => s.name === serverName);
             if (!server) {
                 if (spinner) {
                     spinner.fail();
@@ -721,7 +600,7 @@ export class MCPCommandFactory {
                 logger.error(chalk.red(`❌ Server not found: ${serverName}`));
                 process.exit(1);
             }
-            if (!server.connected) {
+            if (server.status !== "connected") {
                 if (spinner) {
                     spinner.fail();
                 }
@@ -815,9 +694,8 @@ export class MCPCommandFactory {
         try {
             const serverName = argv.server;
             const sdk = new NeuroLink();
-            const rawMcpStatus = await sdk.getMCPStatus();
-            const mcpStatus = convertMCPStatusForCLI(rawMcpStatus, sdk);
-            const server = mcpStatus.servers.find((s) => s.name === serverName);
+            const allServers = await sdk.listMCPServers();
+            const server = allServers.find((s) => s.name === serverName);
             if (!server) {
                 logger.error(chalk.red(`❌ Server not found: ${serverName}`));
                 process.exit(1);
@@ -907,19 +785,8 @@ export class MCPCommandFactory {
                 const sdk = new NeuroLink();
                 for (const server of discovered) {
                     try {
-                        await sdk.addInMemoryMCPServer(server.name, {
-                            server: {
-                                title: server.name,
-                                tools: {},
-                                description: server.description,
-                            },
-                            metadata: {
-                                command: server.command,
-                                args: server.args,
-                                env: server.env,
-                                transport: server.transport,
-                            },
-                        });
+                        // Use discovered MCPServerInfo directly - zero conversions!
+                        await sdk.addInMemoryMCPServer(server.name, server);
                         logger.always(chalk.green(`✅ Installed ${server.name}`));
                     }
                     catch (_error) {
@@ -950,17 +817,14 @@ export class MCPCommandFactory {
                     const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
                     if (config.mcpServers) {
                         Object.entries(config.mcpServers).forEach(([name, serverConfig]) => {
-                            const config = serverConfig;
-                            servers.push({
+                            const typedConfig = serverConfig;
+                            // SMART DEFAULTS: Use utility to eliminate manual MCPServerInfo creation
+                            servers.push(createExternalServerInfo({
+                                ...typedConfig,
+                                id: name,
                                 name,
-                                command: config.command,
-                                args: config.args,
-                                env: config.env,
-                                transport: "stdio",
                                 description: "Discovered from Claude Desktop",
-                                installed: false,
-                                status: "unknown",
-                            });
+                            }));
                         });
                     }
                     break; // Found config file, stop searching
@@ -991,16 +855,12 @@ export class MCPCommandFactory {
                     if (settings["mcp.servers"]) {
                         Object.entries(settings["mcp.servers"]).forEach(([name, serverConfig]) => {
                             const config = serverConfig;
-                            servers.push({
+                            servers.push(createExternalServerInfo({
+                                ...config,
+                                id: name,
                                 name,
-                                command: config.command || "unknown",
-                                args: config.args,
-                                env: config.env,
-                                transport: "stdio",
                                 description: "Discovered from VS Code",
-                                installed: false,
-                                status: "unknown",
-                            });
+                            }));
                         });
                     }
                     break;