@probelabs/probe 0.6.0-rc168 → 0.6.0-rc170

package/src/agent/ProbeAgent.js

@@ -13,11 +13,11 @@ import { randomUUID } from 'crypto';
 import { EventEmitter } from 'events';
 import { existsSync } from 'fs';
 import { readFile, stat } from 'fs/promises';
-import { resolve, isAbsolute, dirname } from 'path';
+import { resolve, isAbsolute, dirname, basename, normalize, sep } from 'path';
 import { TokenCounter } from './tokenCounter.js';
 import { InMemoryStorageAdapter } from './storage/InMemoryStorageAdapter.js';
 import { HookManager, HOOK_TYPES } from './hooks/HookManager.js';
-import { SUPPORTED_IMAGE_EXTENSIONS, IMAGE_MIME_TYPES } from './imageConfig.js';
+import { SUPPORTED_IMAGE_EXTENSIONS, IMAGE_MIME_TYPES, isFormatSupportedByProvider } from './imageConfig.js';
 import {
   createTools,
   searchToolDefinition,
@@ -420,14 +420,20 @@ export class ProbeAgent {
    * Initialize tools with configuration
    */
   initializeTools() {
+    const isToolAllowed = (toolName) => this.allowedTools.isEnabled(toolName);
+
     const configOptions = {
       sessionId: this.sessionId,
       debug: this.debug,
       defaultPath: this.allowedFolders.length > 0 ? this.allowedFolders[0] : process.cwd(),
       allowedFolders: this.allowedFolders,
       outline: this.outline,
+      allowEdit: this.allowEdit,
+      enableDelegate: this.enableDelegate,
       enableBash: this.enableBash,
-      bashConfig: this.bashConfig
+      bashConfig: this.bashConfig,
+      allowedTools: this.allowedTools,
+      isToolAllowed
     };
 
     // Create base tools
@@ -436,21 +442,54 @@ export class ProbeAgent {
     // Create wrapped tools with event emission
     const wrappedTools = createWrappedTools(baseTools);
 
-    // Store tool instances for execution
-    this.toolImplementations = {
-      search: wrappedTools.searchToolInstance,
-      query: wrappedTools.queryToolInstance,
-      extract: wrappedTools.extractToolInstance,
-      delegate: wrappedTools.delegateToolInstance,
-      listFiles: listFilesToolInstance,
-      searchFiles: searchFilesToolInstance,
-      readImage: {
+    // Store tool instances for execution (respect allowedTools + feature flags)
+    this.toolImplementations = {};
+
+    if (wrappedTools.searchToolInstance && isToolAllowed('search')) {
+      this.toolImplementations.search = wrappedTools.searchToolInstance;
+    }
+    if (wrappedTools.queryToolInstance && isToolAllowed('query')) {
+      this.toolImplementations.query = wrappedTools.queryToolInstance;
+    }
+    if (wrappedTools.extractToolInstance && isToolAllowed('extract')) {
+      this.toolImplementations.extract = wrappedTools.extractToolInstance;
+    }
+    if (this.enableDelegate && wrappedTools.delegateToolInstance && isToolAllowed('delegate')) {
+      this.toolImplementations.delegate = wrappedTools.delegateToolInstance;
+    }
+
+    // File browsing tools
+    if (isToolAllowed('listFiles')) {
+      this.toolImplementations.listFiles = listFilesToolInstance;
+    }
+    if (isToolAllowed('searchFiles')) {
+      this.toolImplementations.searchFiles = searchFilesToolInstance;
+    }
+
+    // Image loading tool
+    if (isToolAllowed('readImage')) {
+      this.toolImplementations.readImage = {
         execute: async (params) => {
           const imagePath = params.path;
           if (!imagePath) {
             throw new Error('Image path is required');
           }
 
+          // Validate extension before attempting to load
+          // Use basename to prevent path traversal attacks (e.g., 'malicious.jpg/../../../etc/passwd')
+          const filename = basename(imagePath);
+          const extension = filename.toLowerCase().split('.').pop();
+
+          // Always validate extension is in allowed list (defense-in-depth)
+          if (!extension || !SUPPORTED_IMAGE_EXTENSIONS.includes(extension)) {
+            throw new Error(`Invalid or unsupported image extension: ${extension}. Supported formats: ${SUPPORTED_IMAGE_EXTENSIONS.join(', ')}`);
+          }
+
+          // Check provider-specific format restrictions (e.g., SVG not supported by Google Gemini)
+          if (this.apiType && !isFormatSupportedByProvider(extension, this.apiType)) {
+            throw new Error(`Image format '${extension}' is not supported by the current AI provider (${this.apiType}). Try using a different image format like PNG or JPEG.`);
+          }
+
           // Load the image using the existing loadImageIfValid method
           const loaded = await this.loadImageIfValid(imagePath);
 
@@ -460,20 +499,20 @@ export class ProbeAgent {
 
           return `Image loaded successfully: ${imagePath}. The image is now available for analysis in the conversation.`;
         }
-      }
-    };
+      };
+    }
 
-    // Add bash tool if enabled
-    if (this.enableBash && wrappedTools.bashToolInstance) {
+    // Add bash tool if enabled and allowed
+    if (this.enableBash && wrappedTools.bashToolInstance && isToolAllowed('bash')) {
       this.toolImplementations.bash = wrappedTools.bashToolInstance;
     }
 
-    // Add edit and create tools if enabled
+    // Add edit and create tools if enabled and allowed
     if (this.allowEdit) {
-      if (wrappedTools.editToolInstance) {
+      if (wrappedTools.editToolInstance && isToolAllowed('edit')) {
         this.toolImplementations.edit = wrappedTools.editToolInstance;
       }
-      if (wrappedTools.createToolInstance) {
+      if (wrappedTools.createToolInstance && isToolAllowed('create')) {
         this.toolImplementations.create = wrappedTools.createToolInstance;
       }
     }
@@ -1238,20 +1277,28 @@ export class ProbeAgent {
       }
 
       // Security validation: check if path is within any allowed directory
+      // Use normalize() after resolve() to handle path traversal attempts (e.g., '/allowed/../etc/passwd')
       const allowedDirs = this.allowedFolders && this.allowedFolders.length > 0 ? this.allowedFolders : [process.cwd()];
-      
+
       let absolutePath;
       let isPathAllowed = false;
-      
+
       // If absolute path, check if it's within any allowed directory
       if (isAbsolute(imagePath)) {
-        absolutePath = imagePath;
-        isPathAllowed = allowedDirs.some(dir => absolutePath.startsWith(resolve(dir)));
+        // Normalize to resolve any '..' sequences
+        absolutePath = normalize(resolve(imagePath));
+        isPathAllowed = allowedDirs.some(dir => {
+          const normalizedDir = normalize(resolve(dir));
+          // Ensure the path is within the allowed directory (add separator to prevent prefix attacks)
+          return absolutePath === normalizedDir || absolutePath.startsWith(normalizedDir + sep);
+        });
       } else {
         // For relative paths, try resolving against each allowed directory
         for (const dir of allowedDirs) {
-          const resolvedPath = resolve(dir, imagePath);
-          if (resolvedPath.startsWith(resolve(dir))) {
+          const normalizedDir = normalize(resolve(dir));
+          const resolvedPath = normalize(resolve(dir, imagePath));
+          // Ensure the resolved path is within the allowed directory
+          if (resolvedPath === normalizedDir || resolvedPath.startsWith(normalizedDir + sep)) {
             absolutePath = resolvedPath;
             isPathAllowed = true;
             break;
@@ -1295,6 +1342,10 @@ export class ProbeAgent {
         return false;
       }
 
+      // Note: Provider-specific format validation (e.g., SVG not supported by Google Gemini)
+      // is handled by the readImage tool which provides explicit error messages.
+      // loadImageIfValid is a lower-level method that only checks general format support.
+
       // Determine MIME type (from shared config)
       const mimeType = IMAGE_MIME_TYPES[extension];
 
@@ -2480,7 +2531,7 @@ When troubleshooting:
                       maxIterations,
                       parentSessionId: this.sessionId,  // Pass parent session ID for tracking
                       path: this.searchPath,            // Inherit search path
-                      provider: this.provider,          // Inherit AI provider
+                      provider: this.apiType,           // Inherit AI provider (string identifier)
                       model: this.model,                // Inherit model
                       debug: this.debug,
                       tracer: this.tracer
@@ -2489,7 +2540,7 @@ When troubleshooting:
                     if (this.debug) {
                       console.log(`[DEBUG] Executing delegate tool at iteration ${currentIteration}/${maxIterations}`);
                       console.log(`[DEBUG] Parent session: ${this.sessionId}`);
-                      console.log(`[DEBUG] Inherited config: path=${this.searchPath}, provider=${this.provider}, model=${this.model}`);
+                      console.log(`[DEBUG] Inherited config: path=${this.searchPath}, provider=${this.apiType}, model=${this.model}`);
                       console.log(`[DEBUG] Delegate task: ${toolParams.task?.substring(0, 100)}...`);
                     }
                     
@@ -2573,10 +2624,10 @@ When troubleshooting:
                   content: toolResultMessage
                 });
 
-                // Process tool result for image references
-                if (toolResultContent) {
-                  await this.processImageReferences(toolResultContent);
-                }
+                // NOTE: Automatic image processing removed (GitHub issue #305)
+                // Images are now only loaded when the AI explicitly calls the readImage tool
+                // This prevents: 1) implicit behavior that users don't expect
+                //                2) crashes with unsupported MIME types (e.g., SVG on Gemini)
 
                 if (this.debug) {
                   console.log(`[DEBUG] Tool ${toolName} executed successfully. Result length: ${typeof toolResult === 'string' ? toolResult.length : JSON.stringify(toolResult).length}`);

package/src/agent/imageConfig.js

@@ -21,6 +21,12 @@ export const IMAGE_MIME_TYPES = {
   'svg': 'image/svg+xml'
 };
 
+// Provider-specific unsupported image formats
+// These providers do not support certain MIME types and will crash if they receive them
+export const PROVIDER_UNSUPPORTED_FORMATS = {
+  'google': ['svg'],  // Google Gemini doesn't support image/svg+xml
+};
+
 /**
  * Generate a regex pattern string for matching image file extensions
  * @param {string[]} extensions - Array of extensions (without dots)
@@ -38,3 +44,54 @@ export function getExtensionPattern(extensions = SUPPORTED_IMAGE_EXTENSIONS) {
 export function getMimeType(extension) {
   return IMAGE_MIME_TYPES[extension.toLowerCase()];
 }
+
+/**
+ * Check if an image extension is supported by a specific provider
+ * @param {string} extension - File extension (without dot)
+ * @param {string} provider - Provider name (e.g., 'google', 'anthropic', 'openai')
+ * @returns {boolean} True if the format is supported by the provider
+ */
+export function isFormatSupportedByProvider(extension, provider) {
+  // Validate extension parameter - must be a non-empty string without path separators
+  if (!extension || typeof extension !== 'string') {
+    return false;
+  }
+  // Sanitize: reject extensions containing path traversal characters
+  if (extension.includes('/') || extension.includes('\\') || extension.includes('..')) {
+    return false;
+  }
+
+  const ext = extension.toLowerCase();
+
+  // First check if it's a generally supported format
+  if (!SUPPORTED_IMAGE_EXTENSIONS.includes(ext)) {
+    return false;
+  }
+
+  // Handle null/undefined provider gracefully (treat as no restrictions)
+  if (!provider || typeof provider !== 'string') {
+    return true;
+  }
+
+  // Check provider-specific restrictions
+  const unsupportedFormats = PROVIDER_UNSUPPORTED_FORMATS[provider];
+  if (unsupportedFormats && unsupportedFormats.includes(ext)) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Get supported image extensions for a specific provider
+ * @param {string} provider - Provider name (e.g., 'google', 'anthropic', 'openai')
+ * @returns {string[]} Array of supported extensions for this provider
+ */
+export function getSupportedExtensionsForProvider(provider) {
+  // Handle null/undefined/non-string provider gracefully (return all extensions)
+  if (!provider || typeof provider !== 'string') {
+    return [...SUPPORTED_IMAGE_EXTENSIONS];
+  }
+  const unsupportedFormats = PROVIDER_UNSUPPORTED_FORMATS[provider] || [];
+  return SUPPORTED_IMAGE_EXTENSIONS.filter(ext => !unsupportedFormats.includes(ext));
+}

package/src/agent/tools.js

@@ -31,21 +31,39 @@ import { processXmlWithThinkingAndRecovery } from './xmlParsingUtils.js';
 
 // Create configured tool instances
 export function createTools(configOptions) {
-  const tools = {
-    searchTool: searchTool(configOptions),
-    queryTool: queryTool(configOptions),
-    extractTool: extractTool(configOptions),
-    delegateTool: delegateTool(configOptions)
-  };
+  const tools = {};
+
+  const isToolAllowed =
+    configOptions.isToolAllowed ||
+    ((toolName) => {
+      if (!configOptions.allowedTools) return true;
+      return configOptions.allowedTools.isEnabled(toolName);
+    });
+
+  // Core tools
+  if (isToolAllowed('search')) {
+    tools.searchTool = searchTool(configOptions);
+  }
+  if (isToolAllowed('query')) {
+    tools.queryTool = queryTool(configOptions);
+  }
+  if (isToolAllowed('extract')) {
+    tools.extractTool = extractTool(configOptions);
+  }
+  if (configOptions.enableDelegate && isToolAllowed('delegate')) {
+    tools.delegateTool = delegateTool(configOptions);
+  }
 
   // Add bash tool if enabled
-  if (configOptions.enableBash) {
+  if (configOptions.enableBash && isToolAllowed('bash')) {
     tools.bashTool = bashTool(configOptions);
   }
 
   // Add edit and create tools if enabled
-  if (configOptions.allowEdit) {
+  if (configOptions.allowEdit && isToolAllowed('edit')) {
     tools.editTool = editTool(configOptions);
+  }
+  if (configOptions.allowEdit && isToolAllowed('create')) {
     tools.createTool = createTool(configOptions);
   }
 
@@ -199,4 +217,3 @@ export function parseXmlToolCallWithThinking(xmlString, validTools) {
   // Otherwise, use the original parseXmlToolCall function to parse the cleaned XML string
   return parseXmlToolCall(cleanedXmlString, validTools);
 }
-