@probelabs/probe 0.6.0-rc296 → 0.6.0-rc298

package/src/agent/mcp/client.js

@@ -164,6 +164,8 @@ export class MCPClientManager {
     this.debug = options.debug || process.env.DEBUG_MCP === '1';
     this.config = null;
     this.tracer = options.tracer || null;
+    // Optional event emitter for broadcasting tool call lifecycle to the agent (#522)
+    this.agentEvents = options.agentEvents || null;
   }
 
   /**
@@ -452,6 +454,7 @@ export class MCPClientManager {
     }
 
     const startTime = Date.now();
+    const toolCallId = `mcp-${toolName}-${startTime}`;
 
     // Record tool call start
     this.recordMcpEvent('tool.call_started', {
@@ -460,6 +463,17 @@ export class MCPClientManager {
       originalToolName: tool.originalName
     });
 
+    // Emit toolCall event so the agent's activeTools map tracks MCP tool calls (#522)
+    if (this.agentEvents) {
+      this.agentEvents.emit('toolCall', {
+        toolCallId,
+        name: toolName,
+        args,
+        status: 'started',
+        timestamp: new Date().toISOString(),
+      });
+    }
+
     try {
       if (this.debug) {
         console.error(`[MCP DEBUG] Calling ${toolName} with args:`, JSON.stringify(args, null, 2));
@@ -502,6 +516,16 @@ export class MCPClientManager {
         durationMs
       });
 
+      // Emit toolCall completion so agent's activeTools removes this entry (#522)
+      if (this.agentEvents) {
+        this.agentEvents.emit('toolCall', {
+          toolCallId,
+          name: toolName,
+          status: 'completed',
+          timestamp: new Date().toISOString(),
+        });
+      }
+
       return result;
     } catch (error) {
       const durationMs = Date.now() - startTime;
@@ -521,6 +545,16 @@ export class MCPClientManager {
         isTimeout: error.message.includes('timeout')
       });
 
+      // Emit toolCall error so agent's activeTools removes this entry (#522)
+      if (this.agentEvents) {
+        this.agentEvents.emit('toolCall', {
+          toolCallId,
+          name: toolName,
+          status: 'error',
+          timestamp: new Date().toISOString(),
+        });
+      }
+
       throw error;
     }
   }

package/src/agent/mcp/xmlBridge.js

@@ -36,6 +36,7 @@ export class MCPXmlBridge {
   constructor(options = {}) {
     this.debug = options.debug || false;
     this.tracer = options.tracer || null;
+    this.agentEvents = options.agentEvents || null;
     this.mcpTools = {};
     this.mcpManager = null;
     this.toolDescriptions = {};
@@ -84,7 +85,7 @@ export class MCPXmlBridge {
         console.error('[MCP DEBUG] Initializing MCP client manager...');
       }
 
-      this.mcpManager = new MCPClientManager({ debug: this.debug, tracer: this.tracer });
+      this.mcpManager = new MCPClientManager({ debug: this.debug, tracer: this.tracer, agentEvents: this.agentEvents });
       const result = await this.mcpManager.initialize(mcpConfigs);
 
       // Get tools from the manager (already in Vercel format)