@probelabs/probe 0.6.0-rc116 → 0.6.0-rc118

package/build/agent/ProbeAgent.js

@@ -188,9 +188,23 @@ export class ProbeAgent {
     if (this.enableBash && wrappedTools.bashToolInstance) {
       this.toolImplementations.bash = wrappedTools.bashToolInstance;
     }
-    
+
     // Store wrapped tools for ACP system
     this.wrappedTools = wrappedTools;
+
+    // Log available tools in debug mode
+    if (this.debug) {
+      console.error('\n[DEBUG] ========================================');
+      console.error('[DEBUG] ProbeAgent Tools Initialized');
+      console.error('[DEBUG] Session ID:', this.sessionId);
+      console.error('[DEBUG] Available tools:');
+      for (const toolName of Object.keys(this.toolImplementations)) {
+        console.error(`[DEBUG]   - ${toolName}`);
+      }
+      console.error('[DEBUG] Allowed folders:', this.allowedFolders);
+      console.error('[DEBUG] Outline mode:', this.outline);
+      console.error('[DEBUG] ========================================\n');
+    }
   }
 
   /**
@@ -366,6 +380,9 @@ export class ProbeAgent {
   async processImageReferences(content) {
     if (!content) return;
 
+    // First, try to parse listFiles output format to extract directory context
+    const listFilesDirectories = this.extractListFilesDirectories(content);
+
     // Enhanced pattern to detect image file mentions in various contexts
     // Looks for: "image", "file", "screenshot", etc. followed by path-like strings with image extensions
     const extensionsPattern = `(?:${SUPPORTED_IMAGE_EXTENSIONS.join('|')})`;
@@ -400,10 +417,55 @@ export class ProbeAgent {
 
     // Process each found path
     for (const imagePath of foundPaths) {
-      await this.loadImageIfValid(imagePath);
+      // Try to resolve the path with directory context from listFiles output
+      let resolvedPath = imagePath;
+
+      // If the path is just a filename (no directory separator), try to find it in listFiles directories
+      if (!imagePath.includes('/') && !imagePath.includes('\\')) {
+        for (const dir of listFilesDirectories) {
+          const potentialPath = resolve(dir, imagePath);
+          // Check if this file exists by attempting to load it
+          const loaded = await this.loadImageIfValid(potentialPath);
+          if (loaded) {
+            // Successfully loaded with this directory context
+            if (this.debug) {
+              console.log(`[DEBUG] Resolved ${imagePath} to ${potentialPath} using listFiles context`);
+            }
+            break; // Found it, no need to try other directories
+          }
+        }
+      } else {
+        // Path already has directory info, load as-is
+        await this.loadImageIfValid(resolvedPath);
+      }
     }
   }
 
+  /**
+   * Extract directory paths from listFiles tool output
+   * @param {string} content - Tool output content
+   * @returns {string[]} - Array of directory paths
+   */
+  extractListFilesDirectories(content) {
+    const directories = [];
+
+    // Pattern to match listFiles output format: "/path/to/directory:" at the start of a line
+    const dirPattern = /^([^\n:]+):\s*$/gm;
+
+    let match;
+    while ((match = dirPattern.exec(content)) !== null) {
+      const dirPath = match[1].trim();
+      if (dirPath && dirPath.length > 0) {
+        directories.push(dirPath);
+        if (this.debug) {
+          console.log(`[DEBUG] Extracted directory context from listFiles: ${dirPath}`);
+        }
+      }
+    }
+
+    return directories;
+  }
+
   /**
    * Load and cache an image if it's valid and accessible
    * @param {string} imagePath - Path to the image file
@@ -630,16 +692,23 @@ export class ProbeAgent {
       this.mcpBridge = new MCPXmlBridge({ debug: this.debug });
       await this.mcpBridge.initialize(mcpConfig);
 
-      const mcpToolCount = this.mcpBridge.getToolNames().length;
+      const mcpToolNames = this.mcpBridge.getToolNames();
+      const mcpToolCount = mcpToolNames.length;
       if (mcpToolCount > 0) {
         if (this.debug) {
-          console.log(`[DEBUG] Loaded ${mcpToolCount} MCP tools`);
+          console.error('\n[DEBUG] ========================================');
+          console.error(`[DEBUG] MCP Tools Initialized (${mcpToolCount} tools)`);
+          console.error('[DEBUG] Available MCP tools:');
+          for (const toolName of mcpToolNames) {
+            console.error(`[DEBUG]   - ${toolName}`);
+          }
+          console.error('[DEBUG] ========================================\n');
         }
       } else {
         // For backward compatibility: if no tools were loaded, set bridge to null
         // This maintains the behavior expected by existing tests
         if (this.debug) {
-          console.log('[DEBUG] No MCP tools loaded, setting bridge to null');
+          console.error('[DEBUG] No MCP tools loaded, setting bridge to null');
         }
         this.mcpBridge = null;
       }
@@ -1117,34 +1186,74 @@ When troubleshooting:
             if (type === 'mcp' && this.mcpBridge && this.mcpBridge.isMcpTool(toolName)) {
               // Execute MCP tool
               try {
-                if (this.debug) console.log(`[DEBUG] Executing MCP tool '${toolName}' with params:`, params);
+                // Log MCP tool execution in debug mode
+                if (this.debug) {
+                  console.error(`\n[DEBUG] ========================================`);
+                  console.error(`[DEBUG] Executing MCP tool: ${toolName}`);
+                  console.error(`[DEBUG] Arguments:`);
+                  for (const [key, value] of Object.entries(params)) {
+                    const displayValue = typeof value === 'string' && value.length > 100
+                      ? value.substring(0, 100) + '...'
+                      : value;
+                    console.error(`[DEBUG]   ${key}: ${JSON.stringify(displayValue)}`);
+                  }
+                  console.error(`[DEBUG] ========================================\n`);
+                }
 
                 // Execute MCP tool through the bridge
                 const executionResult = await this.mcpBridge.mcpTools[toolName].execute(params);
 
                 const toolResultContent = typeof executionResult === 'string' ? executionResult : JSON.stringify(executionResult, null, 2);
-                const preview = createMessagePreview(toolResultContent);
+
+                // Log MCP tool result in debug mode
                 if (this.debug) {
-                  console.log(`[DEBUG] MCP tool '${toolName}' executed successfully. Result preview: ${preview}`);
+                  const preview = toolResultContent.length > 500 ? toolResultContent.substring(0, 500) + '...' : toolResultContent;
+                  console.error(`[DEBUG] ========================================`);
+                  console.error(`[DEBUG] MCP tool '${toolName}' completed successfully`);
+                  console.error(`[DEBUG] Result preview:`);
+                  console.error(preview);
+                  console.error(`[DEBUG] ========================================\n`);
                 }
 
                 currentMessages.push({ role: 'user', content: `<tool_result>\n${toolResultContent}\n</tool_result>` });
               } catch (error) {
                 console.error(`Error executing MCP tool ${toolName}:`, error);
                 const toolResultContent = `Error executing MCP tool ${toolName}: ${error.message}`;
-                if (this.debug) console.log(`[DEBUG] MCP tool '${toolName}' execution FAILED.`);
+
+                // Log MCP tool error in debug mode
+                if (this.debug) {
+                  console.error(`[DEBUG] ========================================`);
+                  console.error(`[DEBUG] MCP tool '${toolName}' failed with error:`);
+                  console.error(`[DEBUG] ${error.message}`);
+                  console.error(`[DEBUG] ========================================\n`);
+                }
+
                 currentMessages.push({ role: 'user', content: `<tool_result>\n${toolResultContent}\n</tool_result>` });
               }
             } else if (this.toolImplementations[toolName]) {
               // Execute native tool
               try {
                 // Add sessionId and workingDirectory to params for tool execution
-                const toolParams = { 
-                  ...params, 
+                const toolParams = {
+                  ...params,
                   sessionId: this.sessionId,
                   workingDirectory: (this.allowedFolders && this.allowedFolders[0]) || process.cwd()
                 };
-                
+
+                // Log tool execution in debug mode
+                if (this.debug) {
+                  console.error(`\n[DEBUG] ========================================`);
+                  console.error(`[DEBUG] Executing tool: ${toolName}`);
+                  console.error(`[DEBUG] Arguments:`);
+                  for (const [key, value] of Object.entries(params)) {
+                    const displayValue = typeof value === 'string' && value.length > 100
+                      ? value.substring(0, 100) + '...'
+                      : value;
+                    console.error(`[DEBUG]   ${key}: ${JSON.stringify(displayValue)}`);
+                  }
+                  console.error(`[DEBUG] ========================================\n`);
+                }
+
                 // Emit tool start event
                 this.events.emit('toolCall', {
                   timestamp: new Date().toISOString(),
@@ -1196,6 +1305,18 @@ When troubleshooting:
                     toolResult = await executeToolCall();
                   }
                   
+                  // Log tool result in debug mode
+                  if (this.debug) {
+                    const resultPreview = typeof toolResult === 'string'
+                      ? (toolResult.length > 500 ? toolResult.substring(0, 500) + '...' : toolResult)
+                      : (toolResult ? JSON.stringify(toolResult, null, 2).substring(0, 500) + '...' : 'No Result');
+                    console.error(`[DEBUG] ========================================`);
+                    console.error(`[DEBUG] Tool '${toolName}' completed successfully`);
+                    console.error(`[DEBUG] Result preview:`);
+                    console.error(resultPreview);
+                    console.error(`[DEBUG] ========================================\n`);
+                  }
+
                   // Emit tool success event
                   this.events.emit('toolCall', {
                     timestamp: new Date().toISOString(),
@@ -1206,8 +1327,16 @@ When troubleshooting:
                       : (toolResult ? JSON.stringify(toolResult).substring(0, 200) + '...' : 'No Result'),
                     status: 'completed'
                   });
-                  
+
                 } catch (toolError) {
+                  // Log tool error in debug mode
+                  if (this.debug) {
+                    console.error(`[DEBUG] ========================================`);
+                    console.error(`[DEBUG] Tool '${toolName}' failed with error:`);
+                    console.error(`[DEBUG] ${toolError.message}`);
+                    console.error(`[DEBUG] ========================================\n`);
+                  }
+
                   // Emit tool error event
                   this.events.emit('toolCall', {
                     timestamp: new Date().toISOString(),
@@ -1262,7 +1391,23 @@ When troubleshooting:
             }
           }
         } else {
-          // No tool call found, add assistant response and ask for tool usage
+          // No tool call found
+          // Special case: If response contains a mermaid code block and no schema was provided,
+          // treat it as a valid completion (for mermaid diagram fixing workflow)
+          const hasMermaidCodeBlock = /```mermaid\s*\n[\s\S]*?\n```/.test(assistantResponseContent);
+          const hasNoSchemaOrTools = !options.schema && validTools.length === 0;
+
+          if (hasMermaidCodeBlock && hasNoSchemaOrTools) {
+            // Accept mermaid code block as final answer for diagram fixing
+            finalResult = assistantResponseContent;
+            completionAttempted = true;
+            if (this.debug) {
+              console.error(`[DEBUG] Accepting mermaid code block as valid completion (no schema, no tools)`);
+            }
+            break;
+          }
+
+          // Add assistant response and ask for tool usage
           currentMessages.push({ role: 'assistant', content: assistantResponseContent });
 
           // Build appropriate reminder message based on whether schema is provided