@probelabs/probe 0.6.0-rc120 → 0.6.0-rc122

package/build/agent/index.js

@@ -21345,8 +21345,8 @@ var require_dist_cjs59 = __commonJS({
     module2.exports = __toCommonJS2(index_exports);
     var import_property_provider2 = require_dist_cjs24();
     var import_shared_ini_file_loader = require_dist_cjs42();
-    var import_child_process9 = __require("child_process");
-    var import_util9 = __require("util");
+    var import_child_process10 = __require("child_process");
+    var import_util10 = __require("util");
     var import_client7 = (init_client(), __toCommonJS(client_exports));
     var getValidatedProcessCredentials = /* @__PURE__ */ __name((profileName, data2, profiles) => {
       if (data2.Version !== 1) {
@@ -21382,7 +21382,7 @@ var require_dist_cjs59 = __commonJS({
       if (profiles[profileName]) {
         const credentialProcess = profile["credential_process"];
         if (credentialProcess !== void 0) {
-          const execPromise = (0, import_util9.promisify)(import_shared_ini_file_loader.externalDataInterceptor?.getTokenRecord?.().exec ?? import_child_process9.exec);
+          const execPromise = (0, import_util10.promisify)(import_shared_ini_file_loader.externalDataInterceptor?.getTokenRecord?.().exec ?? import_child_process10.exec);
           try {
             const { stdout } = await execPromise(credentialProcess);
             let data2;
@@ -28654,6 +28654,18 @@ var init_extract = __esm({
   }
 });
 
+// src/grep.js
+import { execFile } from "child_process";
+import { promisify as promisify5 } from "util";
+var execFileAsync;
+var init_grep = __esm({
+  "src/grep.js"() {
+    "use strict";
+    init_utils2();
+    execFileAsync = promisify5(execFile);
+  }
+});
+
 // src/tools/common.js
 import { z as z2 } from "zod";
 function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
@@ -30809,7 +30821,7 @@ var init_tools = __esm({
 // src/utils/file-lister.js
 import fs4 from "fs";
 import path4 from "path";
-import { promisify as promisify5 } from "util";
+import { promisify as promisify6 } from "util";
 import { exec as exec5 } from "child_process";
 async function listFilesByLevel(options) {
   const {
@@ -30902,7 +30914,7 @@ var execAsync4;
 var init_file_lister = __esm({
   "src/utils/file-lister.js"() {
     "use strict";
-    execAsync4 = promisify5(exec5);
+    execAsync4 = promisify6(exec5);
   }
 });
 
@@ -31133,7 +31145,7 @@ var init_simpleTelemetry = __esm({
 
 // src/agent/probeTool.js
 import { exec as exec6 } from "child_process";
-import { promisify as promisify6 } from "util";
+import { promisify as promisify7 } from "util";
 import { randomUUID as randomUUID2 } from "crypto";
 import { EventEmitter } from "events";
 import fs5 from "fs";
@@ -31416,6 +31428,7 @@ var init_index = __esm({
     init_search();
     init_query();
     init_extract();
+    init_grep();
     init_delegate();
     init_utils2();
     init_tools();
@@ -60568,6 +60581,14 @@ function cleanSchemaResponse(response) {
     return response;
   }
   const trimmed = response.trim();
+  const jsonBlockMatch = trimmed.match(/```json\s*\n([\s\S]*?)\n```/);
+  if (jsonBlockMatch) {
+    return jsonBlockMatch[1].trim();
+  }
+  const anyBlockMatch = trimmed.match(/```\s*\n([{\[][\s\S]*?[}\]])\s*```/);
+  if (anyBlockMatch) {
+    return anyBlockMatch[1].trim();
+  }
   const codeBlockPatterns = [
     /```json\s*\n?([{\[][\s\S]*?[}\]])\s*\n?```/,
     /```\s*\n?([{\[][\s\S]*?[}\]])\s*\n?```/,
@@ -61443,8 +61464,8 @@ function loadMCPConfigurationFromPath(configPath) {
   try {
     const content = readFileSync(configPath, "utf8");
     const config = JSON.parse(content);
-    if (process.env.DEBUG === "1") {
-      console.error(`[MCP] Loaded configuration from: ${configPath}`);
+    if (process.env.DEBUG === "1" || process.env.DEBUG_MCP === "1") {
+      console.error(`[MCP DEBUG] Loaded configuration from: ${configPath}`);
     }
     return mergeWithEnvironment(config);
   } catch (error2) {
@@ -61470,12 +61491,12 @@ function loadMCPConfiguration() {
       try {
         const content = readFileSync(configPath, "utf8");
         config = JSON.parse(content);
-        if (process.env.DEBUG === "1") {
-          console.error(`[MCP] Loaded configuration from: ${configPath}`);
+        if (process.env.DEBUG === "1" || process.env.DEBUG_MCP === "1") {
+          console.error(`[MCP DEBUG] Loaded configuration from: ${configPath}`);
         }
         break;
       } catch (error2) {
-        console.error(`[MCP] Failed to parse config from ${configPath}:`, error2.message);
+        console.error(`[MCP ERROR] Failed to parse config from ${configPath}:`, error2.message);
       }
     }
   }
@@ -61551,12 +61572,12 @@ function parseEnabledServers(config) {
     }
     if (server.transport === "stdio") {
       if (!server.command) {
-        console.error(`[MCP] Server ${name14} missing required 'command' for stdio transport`);
+        console.error(`[MCP ERROR] Server ${name14} missing required 'command' for stdio transport`);
         continue;
       }
     } else if (["websocket", "sse", "http"].includes(server.transport)) {
       if (!server.url) {
-        console.error(`[MCP] Server ${name14} missing required 'url' for ${server.transport} transport`);
+        console.error(`[MCP ERROR] Server ${name14} missing required 'url' for ${server.transport} transport`);
         continue;
       }
     }
@@ -61683,20 +61704,45 @@ var init_client2 = __esm({
       async initialize(config = null) {
         this.config = config || loadMCPConfiguration();
         const servers = parseEnabledServers(this.config);
+        console.error(`[MCP INFO] Found ${servers.length} enabled MCP server${servers.length !== 1 ? "s" : ""}`);
+        if (servers.length === 0) {
+          console.error("[MCP INFO] No MCP servers configured or enabled");
+          console.error("[MCP INFO] 0 MCP tools available");
+          return {
+            connected: 0,
+            total: 0,
+            tools: []
+          };
+        }
         if (this.debug) {
-          console.error(`[MCP] Found ${servers.length} enabled servers`);
+          console.error("[MCP DEBUG] Server details:");
+          servers.forEach((server) => {
+            console.error(`[MCP DEBUG]   - ${server.name} (${server.transport})`);
+          });
         }
         const connectionPromises = servers.map(
           (server) => this.connectToServer(server).catch((error2) => {
-            console.error(`[MCP] Failed to connect to ${server.name}:`, error2.message);
+            console.error(`[MCP ERROR] Failed to connect to ${server.name}:`, error2.message);
             return null;
           })
         );
         const results = await Promise.all(connectionPromises);
         const connectedCount = results.filter(Boolean).length;
-        if (this.debug) {
-          console.error(`[MCP] Successfully connected to ${connectedCount}/${servers.length} servers`);
-          console.error(`[MCP] Total tools available: ${this.tools.size}`);
+        if (connectedCount === 0) {
+          console.error(`[MCP ERROR] Failed to connect to all ${servers.length} server${servers.length !== 1 ? "s" : ""}`);
+          console.error("[MCP INFO] 0 MCP tools available");
+        } else if (connectedCount < servers.length) {
+          console.error(`[MCP INFO] Successfully connected to ${connectedCount}/${servers.length} servers`);
+          console.error(`[MCP INFO] ${this.tools.size} MCP tool${this.tools.size !== 1 ? "s" : ""} available`);
+        } else {
+          console.error(`[MCP INFO] Successfully connected to all ${connectedCount} server${connectedCount !== 1 ? "s" : ""}`);
+          console.error(`[MCP INFO] ${this.tools.size} MCP tool${this.tools.size !== 1 ? "s" : ""} available`);
+        }
+        if (this.debug && this.tools.size > 0) {
+          console.error("[MCP DEBUG] Available tools:");
+          Array.from(this.tools.keys()).forEach((toolName) => {
+            console.error(`[MCP DEBUG]   - ${toolName}`);
+          });
         }
         return {
           connected: connectedCount,
@@ -61712,7 +61758,7 @@ var init_client2 = __esm({
         const { name: name14 } = serverConfig;
         try {
           if (this.debug) {
-            console.error(`[MCP] Connecting to ${name14} via ${serverConfig.transport}...`);
+            console.error(`[MCP DEBUG] Connecting to ${name14} via ${serverConfig.transport}...`);
           }
           const transport = createTransport(serverConfig);
           const client = new Client(
@@ -61731,6 +61777,7 @@ var init_client2 = __esm({
             config: serverConfig
           });
           const toolsResponse = await client.listTools();
+          const toolCount = toolsResponse?.tools?.length || 0;
           if (toolsResponse && toolsResponse.tools) {
             for (const tool3 of toolsResponse.tools) {
               const qualifiedName = `${name14}_${tool3.name}`;
@@ -61740,16 +61787,17 @@ var init_client2 = __esm({
                 originalName: tool3.name
               });
               if (this.debug) {
-                console.error(`[MCP]   Registered tool: ${qualifiedName}`);
+                console.error(`[MCP DEBUG]     Registered tool: ${qualifiedName}`);
               }
             }
           }
-          if (this.debug) {
-            console.error(`[MCP] Connected to ${name14} with ${toolsResponse?.tools?.length || 0} tools`);
-          }
+          console.error(`[MCP INFO] Connected to ${name14}: ${toolCount} tool${toolCount !== 1 ? "s" : ""} loaded`);
           return true;
         } catch (error2) {
-          console.error(`[MCP] Error connecting to ${name14}:`, error2.message);
+          console.error(`[MCP ERROR] Error connecting to ${name14}:`, error2.message);
+          if (this.debug) {
+            console.error(`[MCP DEBUG] Full error details:`, error2);
+          }
           return false;
         }
       }
@@ -61769,7 +61817,7 @@ var init_client2 = __esm({
         }
         try {
           if (this.debug) {
-            console.error(`[MCP] Calling ${toolName} with args:`, args);
+            console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
           }
           const timeout = this.config?.settings?.timeout || 3e4;
           const timeoutPromise = new Promise((_2, reject2) => {
@@ -61784,9 +61832,15 @@ var init_client2 = __esm({
             }),
             timeoutPromise
           ]);
+          if (this.debug) {
+            console.error(`[MCP DEBUG] Tool ${toolName} executed successfully`);
+          }
           return result;
         } catch (error2) {
-          console.error(`[MCP] Error calling tool ${toolName}:`, error2);
+          console.error(`[MCP ERROR] Error calling tool ${toolName}:`, error2.message);
+          if (this.debug) {
+            console.error(`[MCP DEBUG] Full error details:`, error2);
+          }
           throw error2;
         }
       }
@@ -61831,20 +61885,32 @@ var init_client2 = __esm({
        */
       async disconnect() {
         const disconnectPromises = [];
+        if (this.clients.size === 0) {
+          if (this.debug) {
+            console.error("[MCP DEBUG] No MCP clients to disconnect");
+          }
+          return;
+        }
+        if (this.debug) {
+          console.error(`[MCP DEBUG] Disconnecting from ${this.clients.size} MCP server${this.clients.size !== 1 ? "s" : ""}...`);
+        }
         for (const [name14, clientInfo] of this.clients.entries()) {
           disconnectPromises.push(
             clientInfo.client.close().then(() => {
               if (this.debug) {
-                console.error(`[MCP] Disconnected from ${name14}`);
+                console.error(`[MCP DEBUG] Disconnected from ${name14}`);
               }
             }).catch((error2) => {
-              console.error(`[MCP] Error disconnecting from ${name14}:`, error2);
+              console.error(`[MCP ERROR] Error disconnecting from ${name14}:`, error2.message);
             })
           );
         }
         await Promise.all(disconnectPromises);
         this.clients.clear();
         this.tools.clear();
+        if (this.debug) {
+          console.error("[MCP DEBUG] All MCP connections closed");
+        }
       }
     };
   }
@@ -61996,31 +62062,58 @@ var init_xmlBridge = __esm({
       async initialize(config = null) {
         let mcpConfigs = null;
         if (!config) {
+          if (this.debug) {
+            console.error("[MCP DEBUG] No config provided, attempting auto-discovery...");
+          }
           mcpConfigs = loadMCPConfiguration();
+          if (!mcpConfigs || !mcpConfigs.mcpServers || Object.keys(mcpConfigs.mcpServers).length === 0) {
+            console.error("[MCP WARNING] MCP enabled but no configuration found");
+            console.error("[MCP INFO] To use MCP, provide configuration via:");
+            console.error("[MCP INFO]   - mcpConfig option when creating ProbeAgent");
+            console.error("[MCP INFO]   - mcpConfigPath option pointing to a config file");
+            console.error("[MCP INFO]   - Config file in standard locations (~/.mcp/config.json, etc.)");
+            console.error("[MCP INFO]   - Environment variable MCP_CONFIG_PATH");
+          }
         } else if (Array.isArray(config)) {
+          if (this.debug) {
+            console.error("[MCP DEBUG] Using deprecated array config format (consider using mcpConfig object)");
+          }
           mcpConfigs = { mcpServers: config };
         } else {
+          if (this.debug) {
+            console.error("[MCP DEBUG] Using provided MCP config object");
+          }
           mcpConfigs = config;
         }
         if (!mcpConfigs || !mcpConfigs.mcpServers || Object.keys(mcpConfigs.mcpServers).length === 0) {
-          if (this.debug) {
-            console.error("[MCP] No MCP servers configured");
-          }
+          console.error("[MCP INFO] 0 MCP tools available");
           return;
         }
         try {
+          if (this.debug) {
+            console.error("[MCP DEBUG] Initializing MCP client manager...");
+          }
           this.mcpManager = new MCPClientManager({ debug: this.debug });
           const result = await this.mcpManager.initialize(mcpConfigs);
           const vercelTools = this.mcpManager.getVercelTools();
           this.mcpTools = vercelTools;
+          const toolCount = Object.keys(vercelTools).length;
           for (const [name14, tool3] of Object.entries(vercelTools)) {
             this.xmlDefinitions[name14] = mcpToolToXmlDefinition(name14, tool3);
           }
-          if (this.debug) {
-            console.error(`[MCP] Loaded ${Object.keys(vercelTools).length} MCP tools from ${result.connected} server(s)`);
+          if (toolCount === 0) {
+            console.error("[MCP INFO] MCP initialization complete: 0 tools loaded");
+          } else {
+            console.error(`[MCP INFO] MCP initialization complete: ${toolCount} tool${toolCount !== 1 ? "s" : ""} loaded from ${result.connected} server${result.connected !== 1 ? "s" : ""}`);
+            if (this.debug) {
+              console.error("[MCP DEBUG] Tool definitions generated for XML bridge");
+            }
           }
         } catch (error2) {
-          console.error("[MCP] Failed to initialize MCP connections:", error2);
+          console.error("[MCP ERROR] Failed to initialize MCP connections:", error2.message);
+          if (this.debug) {
+            console.error("[MCP DEBUG] Full error details:", error2);
+          }
         }
       }
       /**
@@ -62045,24 +62138,35 @@ var init_xmlBridge = __esm({
       async executeFromXml(xmlString) {
         const parsed = parseXmlMcpToolCall(xmlString, this.getToolNames());
         if (!parsed) {
+          console.error("[MCP ERROR] No valid MCP tool call found in XML");
           throw new Error("No valid MCP tool call found in XML");
         }
         const { toolName, params } = parsed;
         if (this.debug) {
-          console.error(`[MCP] Executing MCP tool: ${toolName} with params:`, params);
+          console.error(`[MCP DEBUG] Executing MCP tool: ${toolName}`);
+          console.error(`[MCP DEBUG] Parameters:`, JSON.stringify(params, null, 2));
         }
         const tool3 = this.mcpTools[toolName];
         if (!tool3) {
+          console.error(`[MCP ERROR] Unknown MCP tool: ${toolName}`);
+          console.error(`[MCP ERROR] Available tools: ${this.getToolNames().join(", ")}`);
           throw new Error(`Unknown MCP tool: ${toolName}`);
         }
         try {
           const result = await tool3.execute(params);
+          if (this.debug) {
+            console.error(`[MCP DEBUG] Tool ${toolName} executed successfully`);
+          }
           return {
             success: true,
             toolName,
             result
           };
         } catch (error2) {
+          console.error(`[MCP ERROR] Tool ${toolName} execution failed:`, error2.message);
+          if (this.debug) {
+            console.error(`[MCP DEBUG] Full error details:`, error2);
+          }
           return {
             success: false,
             toolName,
@@ -62196,6 +62300,7 @@ var init_ProbeAgent = __esm({
         this.mcpConfig = options.mcpConfig || null;
         this.mcpServers = options.mcpServers || null;
         this.mcpBridge = null;
+        this._mcpInitialized = false;
         this.initializeModel();
       }
       /**
@@ -62203,7 +62308,8 @@ var init_ProbeAgent = __esm({
        * This method initializes MCP and merges MCP tools into the tool list
        */
       async initialize() {
-        if (this.enableMcp) {
+        if (this.enableMcp && !this._mcpInitialized) {
+          this._mcpInitialized = true;
           try {
             await this.initializeMCP();
             if (this.mcpBridge) {
@@ -62227,7 +62333,10 @@ var init_ProbeAgent = __esm({
               console.error("[DEBUG] ========================================\n");
             }
           } catch (error2) {
-            console.error("[MCP] Failed to initialize MCP:", error2);
+            console.error("[MCP ERROR] Failed to initialize MCP:", error2.message);
+            if (this.debug) {
+              console.error("[MCP DEBUG] Full error details:", error2);
+            }
             this.mcpBridge = null;
           }
         }
@@ -62651,13 +62760,13 @@ var init_ProbeAgent = __esm({
           if (this.mcpConfig) {
             mcpConfig = this.mcpConfig;
             if (this.debug) {
-              console.log("[DEBUG] Using provided MCP config object");
+              console.error("[MCP DEBUG] Using provided MCP config object");
             }
           } else if (this.mcpConfigPath) {
             try {
               mcpConfig = loadMCPConfigurationFromPath(this.mcpConfigPath);
               if (this.debug) {
-                console.log(`[DEBUG] Loaded MCP config from: ${this.mcpConfigPath}`);
+                console.error(`[MCP DEBUG] Loaded MCP config from: ${this.mcpConfigPath}`);
               }
             } catch (error2) {
               throw new Error(`Failed to load MCP config from ${this.mcpConfigPath}: ${error2.message}`);
@@ -62665,8 +62774,13 @@ var init_ProbeAgent = __esm({
           } else if (this.mcpServers) {
             mcpConfig = { mcpServers: this.mcpServers };
             if (this.debug) {
-              console.warn("[DEBUG] Using deprecated mcpServers option. Consider using mcpConfig instead.");
+              console.error("[MCP DEBUG] Using deprecated mcpServers option. Consider using mcpConfig instead.");
             }
+          } else {
+            if (this.debug) {
+              console.error("[MCP DEBUG] No explicit MCP config provided, will attempt auto-discovery");
+            }
+            mcpConfig = null;
           }
           this.mcpBridge = new MCPXmlBridge({ debug: this.debug });
           await this.mcpBridge.initialize(mcpConfig);
@@ -62674,22 +62788,25 @@ var init_ProbeAgent = __esm({
           const mcpToolCount = mcpToolNames.length;
           if (mcpToolCount > 0) {
             if (this.debug) {
-              console.error("\n[DEBUG] ========================================");
-              console.error(`[DEBUG] MCP Tools Initialized (${mcpToolCount} tools)`);
-              console.error("[DEBUG] Available MCP tools:");
+              console.error("\n[MCP DEBUG] ========================================");
+              console.error(`[MCP DEBUG] MCP Tools Initialized (${mcpToolCount} tools)`);
+              console.error("[MCP DEBUG] Available MCP tools:");
               for (const toolName of mcpToolNames) {
-                console.error(`[DEBUG]   - ${toolName}`);
+                console.error(`[MCP DEBUG]   - ${toolName}`);
               }
-              console.error("[DEBUG] ========================================\n");
+              console.error("[MCP DEBUG] ========================================\n");
             }
           } else {
             if (this.debug) {
-              console.error("[DEBUG] No MCP tools loaded, setting bridge to null");
+              console.error("[MCP DEBUG] No MCP tools loaded, setting bridge to null");
             }
             this.mcpBridge = null;
           }
         } catch (error2) {
-          console.error("[MCP] Error initializing MCP:", error2);
+          console.error("[MCP ERROR] Error initializing MCP:", error2.message);
+          if (this.debug) {
+            console.error("[MCP DEBUG] Full error details:", error2);
+          }
           this.mcpBridge = null;
         }
       }
@@ -62697,6 +62814,23 @@ var init_ProbeAgent = __esm({
        * Get the system message with instructions for the AI (XML Tool Format)
        */
       async getSystemMessage() {
+        if (this.enableMcp && !this.mcpBridge && !this._mcpInitialized) {
+          this._mcpInitialized = true;
+          try {
+            await this.initializeMCP();
+            if (this.mcpBridge) {
+              const mcpTools = this.mcpBridge.mcpTools || {};
+              for (const [toolName, toolImpl] of Object.entries(mcpTools)) {
+                this.toolImplementations[toolName] = toolImpl;
+              }
+            }
+          } catch (error2) {
+            console.error("[MCP ERROR] Failed to lazy-initialize MCP:", error2.message);
+            if (this.debug) {
+              console.error("[MCP DEBUG] Full error details:", error2);
+            }
+          }
+        }
         let toolDefinitions = `
 ${searchToolDefinition}
 ${queryToolDefinition}
@@ -64675,7 +64809,7 @@ var ProbeAgentMcpServer = class {
     );
     this.agent = null;
     this.setupToolHandlers();
-    this.server.onerror = (error2) => console.error("[MCP Error]", error2);
+    this.server.onerror = (error2) => console.error("[MCP ERROR]", error2);
     process.on("SIGINT", async () => {
       await this.server.close();
       process.exit(0);

package/build/agent/mcp/client.js

@@ -128,14 +128,30 @@ export class MCPClientManager {
     this.config = config || loadMCPConfiguration();
     const servers = parseEnabledServers(this.config);
 
+    // Always log the number of servers found
+    console.error(`[MCP INFO] Found ${servers.length} enabled MCP server${servers.length !== 1 ? 's' : ''}`);
+
+    if (servers.length === 0) {
+      console.error('[MCP INFO] No MCP servers configured or enabled');
+      console.error('[MCP INFO] 0 MCP tools available');
+      return {
+        connected: 0,
+        total: 0,
+        tools: []
+      };
+    }
+
     if (this.debug) {
-      console.error(`[MCP] Found ${servers.length} enabled servers`);
+      console.error('[MCP DEBUG] Server details:');
+      servers.forEach(server => {
+        console.error(`[MCP DEBUG]   - ${server.name} (${server.transport})`);
+      });
     }
 
     // Connect to each enabled server
     const connectionPromises = servers.map(server =>
       this.connectToServer(server).catch(error => {
-        console.error(`[MCP] Failed to connect to ${server.name}:`, error.message);
+        console.error(`[MCP ERROR] Failed to connect to ${server.name}:`, error.message);
         return null;
       })
     );
@@ -143,9 +159,23 @@ export class MCPClientManager {
     const results = await Promise.all(connectionPromises);
     const connectedCount = results.filter(Boolean).length;
 
-    if (this.debug) {
-      console.error(`[MCP] Successfully connected to ${connectedCount}/${servers.length} servers`);
-      console.error(`[MCP] Total tools available: ${this.tools.size}`);
+    // Always log connection results
+    if (connectedCount === 0) {
+      console.error(`[MCP ERROR] Failed to connect to all ${servers.length} server${servers.length !== 1 ? 's' : ''}`);
+      console.error('[MCP INFO] 0 MCP tools available');
+    } else if (connectedCount < servers.length) {
+      console.error(`[MCP INFO] Successfully connected to ${connectedCount}/${servers.length} servers`);
+      console.error(`[MCP INFO] ${this.tools.size} MCP tool${this.tools.size !== 1 ? 's' : ''} available`);
+    } else {
+      console.error(`[MCP INFO] Successfully connected to all ${connectedCount} server${connectedCount !== 1 ? 's' : ''}`);
+      console.error(`[MCP INFO] ${this.tools.size} MCP tool${this.tools.size !== 1 ? 's' : ''} available`);
+    }
+
+    if (this.debug && this.tools.size > 0) {
+      console.error('[MCP DEBUG] Available tools:');
+      Array.from(this.tools.keys()).forEach(toolName => {
+        console.error(`[MCP DEBUG]   - ${toolName}`);
+      });
     }
 
     return {
@@ -164,7 +194,7 @@ export class MCPClientManager {
 
     try {
       if (this.debug) {
-        console.error(`[MCP] Connecting to ${name} via ${serverConfig.transport}...`);
+        console.error(`[MCP DEBUG] Connecting to ${name} via ${serverConfig.transport}...`);
       }
 
       // Create transport
@@ -193,6 +223,7 @@ export class MCPClientManager {
 
       // Fetch and register tools
       const toolsResponse = await client.listTools();
+      const toolCount = toolsResponse?.tools?.length || 0;
 
       if (toolsResponse && toolsResponse.tools) {
         for (const tool of toolsResponse.tools) {
@@ -205,18 +236,19 @@ export class MCPClientManager {
           });
 
           if (this.debug) {
-            console.error(`[MCP]   Registered tool: ${qualifiedName}`);
+            console.error(`[MCP DEBUG]     Registered tool: ${qualifiedName}`);
           }
         }
       }
 
-      if (this.debug) {
-        console.error(`[MCP] Connected to ${name} with ${toolsResponse?.tools?.length || 0} tools`);
-      }
+      console.error(`[MCP INFO] Connected to ${name}: ${toolCount} tool${toolCount !== 1 ? 's' : ''} loaded`);
 
       return true;
     } catch (error) {
-      console.error(`[MCP] Error connecting to ${name}:`, error.message);
+      console.error(`[MCP ERROR] Error connecting to ${name}:`, error.message);
+      if (this.debug) {
+        console.error(`[MCP DEBUG] Full error details:`, error);
+      }
       return false;
     }
   }
@@ -239,7 +271,7 @@ export class MCPClientManager {
 
     try {
       if (this.debug) {
-        console.error(`[MCP] Calling ${toolName} with args:`, args);
+        console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
       }
 
       // Get timeout from config (default 30 seconds)
@@ -261,9 +293,16 @@ export class MCPClientManager {
         timeoutPromise
       ]);
 
+      if (this.debug) {
+        console.error(`[MCP DEBUG] Tool ${toolName} executed successfully`);
+      }
+
       return result;
     } catch (error) {
-      console.error(`[MCP] Error calling tool ${toolName}:`, error);
+      console.error(`[MCP ERROR] Error calling tool ${toolName}:`, error.message);
+      if (this.debug) {
+        console.error(`[MCP DEBUG] Full error details:`, error);
+      }
       throw error;
     }
   }
@@ -316,16 +355,27 @@ export class MCPClientManager {
   async disconnect() {
     const disconnectPromises = [];
 
+    if (this.clients.size === 0) {
+      if (this.debug) {
+        console.error('[MCP DEBUG] No MCP clients to disconnect');
+      }
+      return;
+    }
+
+    if (this.debug) {
+      console.error(`[MCP DEBUG] Disconnecting from ${this.clients.size} MCP server${this.clients.size !== 1 ? 's' : ''}...`);
+    }
+
     for (const [name, clientInfo] of this.clients.entries()) {
       disconnectPromises.push(
         clientInfo.client.close()
           .then(() => {
             if (this.debug) {
-              console.error(`[MCP] Disconnected from ${name}`);
+              console.error(`[MCP DEBUG] Disconnected from ${name}`);
             }
           })
           .catch(error => {
-            console.error(`[MCP] Error disconnecting from ${name}:`, error);
+            console.error(`[MCP ERROR] Error disconnecting from ${name}:`, error.message);
           })
       );
     }
@@ -333,6 +383,10 @@ export class MCPClientManager {
     await Promise.all(disconnectPromises);
     this.clients.clear();
     this.tools.clear();
+
+    if (this.debug) {
+      console.error('[MCP DEBUG] All MCP connections closed');
+    }
   }
 }