@probelabs/probe 0.6.0-rc164 → 0.6.0-rc166

package/build/agent/ProbeAgent.js

@@ -27,6 +27,7 @@ import {
   bashToolDefinition,
   listFilesToolDefinition,
   searchFilesToolDefinition,
+  readImageToolDefinition,
   attemptCompletionToolDefinition,
   implementToolDefinition,
   editToolDefinition,
@@ -399,6 +400,23 @@ export class ProbeAgent {
       delegate: wrappedTools.delegateToolInstance,
       listFiles: listFilesToolInstance,
       searchFiles: searchFilesToolInstance,
+      readImage: {
+        execute: async (params) => {
+          const imagePath = params.path;
+          if (!imagePath) {
+            throw new Error('Image path is required');
+          }
+
+          // Load the image using the existing loadImageIfValid method
+          const loaded = await this.loadImageIfValid(imagePath);
+
+          if (!loaded) {
+            throw new Error(`Failed to load image: ${imagePath}. The file may not exist, be too large, have an unsupported format, or be outside allowed directories.`);
+          }
+
+          return `Image loaded successfully: ${imagePath}. The image is now available for analysis in the conversation.`;
+        }
+      }
     };
 
     // Add bash tool if enabled
@@ -1172,6 +1190,9 @@ export class ProbeAgent {
     if (isToolAllowed('searchFiles')) {
       toolDefinitions += `${searchFilesToolDefinition}\n`;
     }
+    if (isToolAllowed('readImage')) {
+      toolDefinitions += `${readImageToolDefinition}\n`;
+    }
 
     // Edit tools (require both allowEdit flag AND allowedTools permission)
     if (this.allowEdit && isToolAllowed('implement')) {
@@ -1262,6 +1283,7 @@ Available Tools:
 - extract: Extract specific code blocks or lines from files.
 - listFiles: List files and directories in a specified location.
 - searchFiles: Find files matching a glob pattern with recursive search capability.
+- readImage: Read and load an image file for AI analysis.
 ${this.allowEdit ? '- implement: Implement a feature or fix a bug using aider.\n- edit: Edit files using exact string replacement.\n- create: Create new files with specified content.\n' : ''}${this.enableDelegate ? '- delegate: Delegate big distinct tasks to specialized probe subagents.\n' : ''}${this.enableBash ? '- bash: Execute bash commands for system operations.\n' : ''}
 - attempt_completion: Finalize the task and provide the result to the user.
 - attempt_complete: Quick completion using previous response (shorthand).
@@ -1700,22 +1722,30 @@ When troubleshooting:
           console.log(`[DEBUG] Assistant response (${assistantResponseContent.length} chars): ${assistantPreview}`);
         }
 
-        // Process image references in assistant response for next iteration
-        if (assistantResponseContent) {
-          await this.processImageReferences(assistantResponseContent);
-        }
+        // Images in assistant responses are not automatically processed
+        // AI can use the readImage tool to explicitly request reading an image
 
         // Parse tool call from response with valid tools list
-        const validTools = [
-          'search', 'query', 'extract', 'listFiles', 'searchFiles', 'attempt_completion'
-        ];
-        if (this.allowEdit) {
+        // Build validTools based on allowedTools configuration (same pattern as getSystemMessage)
+        const validTools = [];
+        if (this.allowedTools.isEnabled('search')) validTools.push('search');
+        if (this.allowedTools.isEnabled('query')) validTools.push('query');
+        if (this.allowedTools.isEnabled('extract')) validTools.push('extract');
+        if (this.allowedTools.isEnabled('listFiles')) validTools.push('listFiles');
+        if (this.allowedTools.isEnabled('searchFiles')) validTools.push('searchFiles');
+        if (this.allowedTools.isEnabled('readImage')) validTools.push('readImage');
+        if (this.allowedTools.isEnabled('attempt_completion')) validTools.push('attempt_completion');
+
+        // Edit tools (require both allowEdit flag AND allowedTools permission)
+        if (this.allowEdit && this.allowedTools.isEnabled('implement')) {
           validTools.push('implement', 'edit', 'create');
         }
-        if (this.enableBash) {
+        // Bash tool (require both enableBash flag AND allowedTools permission)
+        if (this.enableBash && this.allowedTools.isEnabled('bash')) {
           validTools.push('bash');
         }
-        if (this.enableDelegate) {
+        // Delegate tool (require both enableDelegate flag AND allowedTools permission)
+        if (this.enableDelegate && this.allowedTools.isEnabled('delegate')) {
           validTools.push('delegate');
         }
         

package/build/agent/index.js

@@ -17572,7 +17572,7 @@ function parseXmlToolCallWithThinking(xmlString, validTools) {
   }
   return parseXmlToolCall(cleanedXmlString, validTools);
 }
-var implementToolDefinition, listFilesToolDefinition, searchFilesToolDefinition;
+var implementToolDefinition, listFilesToolDefinition, searchFilesToolDefinition, readImageToolDefinition;
 var init_tools2 = __esm({
   "src/agent/tools.js"() {
     "use strict";
@@ -17650,6 +17650,29 @@ User: Find all markdown files in the docs directory, but only at the top level.
 <recursive>false</recursive>
 </searchFiles>
 
+</examples>
+`;
+    readImageToolDefinition = `
+## readImage
+Description: Read and load an image file so it can be viewed by the AI. Use this when you need to analyze, describe, or work with image content. Images from user messages are automatically loaded, but use this tool to explicitly read images mentioned in tool outputs or when you need to examine specific image files.
+
+Parameters:
+- path: (required) The path to the image file to read. Supports png, jpg, jpeg, webp, bmp, and svg formats.
+
+Usage Example:
+
+<examples>
+
+User: Can you describe what's in screenshot.png?
+<readImage>
+<path>screenshot.png</path>
+</readImage>
+
+User: Analyze the diagram in docs/architecture.svg
+<readImage>
+<path>docs/architecture.svg</path>
+</readImage>
+
 </examples>
 `;
   }
@@ -54263,6 +54286,7 @@ __export(schemaUtils_exports, {
   createMermaidCorrectionPrompt: () => createMermaidCorrectionPrompt,
   createSchemaDefinitionCorrectionPrompt: () => createSchemaDefinitionCorrectionPrompt,
   decodeHtmlEntities: () => decodeHtmlEntities,
+  extractMermaidFromJson: () => extractMermaidFromJson,
   extractMermaidFromMarkdown: () => extractMermaidFromMarkdown,
   generateExampleFromSchema: () => generateExampleFromSchema,
   generateSchemaInstructions: () => generateSchemaInstructions,
@@ -54270,6 +54294,7 @@ __export(schemaUtils_exports, {
   isJsonSchemaDefinition: () => isJsonSchemaDefinition,
   isMermaidSchema: () => isMermaidSchema,
   processSchemaResponse: () => processSchemaResponse,
+  replaceMermaidDiagramsInJson: () => replaceMermaidDiagramsInJson,
   replaceMermaidDiagramsInMarkdown: () => replaceMermaidDiagramsInMarkdown,
   tryMaidAutoFix: () => tryMaidAutoFix,
   validateAndFixMermaidResponse: () => validateAndFixMermaidResponse,
@@ -54373,6 +54398,49 @@ function decodeHtmlEntities(text) {
   }
   return decoded;
 }
+function normalizeJsonQuotes(str) {
+  if (!str || typeof str !== "string") {
+    return str;
+  }
+  if (!str.includes("'")) {
+    return str;
+  }
+  let result = "";
+  let inDoubleQuote = false;
+  let inSingleQuote = false;
+  let escaped = false;
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    const prevChar = i > 0 ? str[i - 1] : "";
+    if (escaped) {
+      result += char;
+      escaped = false;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      result += char;
+      continue;
+    }
+    if (char === '"' && !inSingleQuote) {
+      inDoubleQuote = !inDoubleQuote;
+      result += char;
+      continue;
+    }
+    if (char === "'" && !inDoubleQuote) {
+      if (inSingleQuote) {
+        result += '"';
+        inSingleQuote = false;
+      } else {
+        result += '"';
+        inSingleQuote = true;
+      }
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
 function cleanSchemaResponse(response) {
   if (!response || typeof response !== "string") {
     return response;
@@ -54380,23 +54448,27 @@ function cleanSchemaResponse(response) {
   const trimmed = response.trim();
   const jsonBlockMatch = trimmed.match(/```json\s*\n([\s\S]*?)\n```/);
   if (jsonBlockMatch) {
-    return jsonBlockMatch[1].trim();
+    return normalizeJsonQuotes(jsonBlockMatch[1].trim());
   }
   const anyBlockMatch = trimmed.match(/```\s*\n([{\[][\s\S]*?[}\]])\s*```/);
   if (anyBlockMatch) {
-    return anyBlockMatch[1].trim();
+    return normalizeJsonQuotes(anyBlockMatch[1].trim());
   }
   const codeBlockPatterns = [
     /```json\s*\n?([{\[][\s\S]*?[}\]])\s*\n?```/,
-    /```\s*\n?([{\[][\s\S]*?[}\]])\s*\n?```/,
-    /`([{\[][\s\S]*?[}\]])`/
+    /```\s*\n?([{\[][\s\S]*?[}\]])\s*\n?```/
   ];
   for (const pattern of codeBlockPatterns) {
     const match2 = trimmed.match(pattern);
     if (match2) {
-      return match2[1].trim();
+      return normalizeJsonQuotes(match2[1].trim());
     }
   }
+  const singleBacktickPattern = /^`([{\[][\s\S]*?[}\]])`$/;
+  const singleBacktickMatch = trimmed.match(singleBacktickPattern);
+  if (singleBacktickMatch) {
+    return normalizeJsonQuotes(singleBacktickMatch[1].trim());
+  }
   const codeBlockStartPattern = /```(?:json)?\s*\n?\s*([{\[])/;
   const codeBlockMatch = trimmed.match(codeBlockStartPattern);
   if (codeBlockMatch) {
@@ -54415,7 +54487,7 @@ function cleanSchemaResponse(response) {
       endIndex++;
     }
     if (bracketCount === 0) {
-      return trimmed.substring(startIndex, endIndex);
+      return normalizeJsonQuotes(trimmed.substring(startIndex, endIndex));
     }
   }
   let cleaned = trimmed;
@@ -54427,7 +54499,7 @@ function cleanSchemaResponse(response) {
   const isJsonObject = firstChar === "{" && lastChar === "}";
   const isJsonArray = firstChar === "[" && lastChar === "]";
   if (isJsonObject || isJsonArray) {
-    return cleaned;
+    return normalizeJsonQuotes(cleaned);
   }
   return response;
 }
@@ -54837,10 +54909,66 @@ function isMermaidSchema(schema) {
   ];
   return mermaidIndicators.some((indicator) => indicator);
 }
+function extractMermaidFromJson(response) {
+  if (!response || typeof response !== "string") {
+    return { diagrams: [], jsonPaths: [], parsedJson: null };
+  }
+  let jsonContent = response.trim();
+  const jsonBlockMatch = jsonContent.match(/```json\s*\n([\s\S]*?)\n```/);
+  if (jsonBlockMatch) {
+    jsonContent = jsonBlockMatch[1].trim();
+  } else {
+    const anyBlockMatch = jsonContent.match(/```\s*\n([{\[][\s\S]*?[}\]])\s*```/);
+    if (anyBlockMatch) {
+      jsonContent = anyBlockMatch[1].trim();
+    }
+  }
+  let parsedJson;
+  try {
+    parsedJson = JSON.parse(jsonContent);
+  } catch (e) {
+    return { diagrams: [], jsonPaths: [], parsedJson: null };
+  }
+  const diagrams = [];
+  const jsonPaths = [];
+  function searchObject(obj, path7 = []) {
+    if (typeof obj === "string") {
+      const mermaidPattern = /```mermaid([^\n`]*?)(?:\n|\\n)([\s\S]*?)```/gi;
+      let match2;
+      while ((match2 = mermaidPattern.exec(obj)) !== null) {
+        const attributes = match2[1] ? match2[1].trim() : "";
+        const content = match2[2].replace(/\\n/g, "\n");
+        diagrams.push({
+          content,
+          fullMatch: match2[0],
+          startIndex: match2.index,
+          endIndex: match2.index + match2[0].length,
+          attributes,
+          isInJson: true,
+          jsonPath: path7.join(".")
+        });
+        jsonPaths.push(path7.join("."));
+      }
+    } else if (Array.isArray(obj)) {
+      obj.forEach((item, index) => searchObject(item, [...path7, `[${index}]`]));
+    } else if (obj && typeof obj === "object") {
+      Object.entries(obj).forEach(([key, value]) => searchObject(value, [...path7, key]));
+    }
+  }
+  searchObject(parsedJson);
+  return { diagrams, jsonPaths, parsedJson };
+}
 function extractMermaidFromMarkdown(response) {
   if (!response || typeof response !== "string") {
     return { diagrams: [], cleanedResponse: response };
   }
+  const trimmed = response.trim();
+  if (trimmed.startsWith("{") || trimmed.startsWith("[") || trimmed.includes("```json")) {
+    const jsonResult = extractMermaidFromJson(response);
+    if (jsonResult.diagrams.length > 0) {
+      return { diagrams: jsonResult.diagrams, cleanedResponse: response };
+    }
+  }
   const mermaidBlockRegex = /```mermaid([^\n]*)\n([\s\S]*?)```/gi;
   const diagrams = [];
   let match2;
@@ -54852,11 +54980,66 @@ function extractMermaidFromMarkdown(response) {
       fullMatch: match2[0],
       startIndex: match2.index,
       endIndex: match2.index + match2[0].length,
-      attributes
+      attributes,
+      isInJson: false
     });
   }
   return { diagrams, cleanedResponse: response };
 }
+function replaceMermaidDiagramsInJson(originalResponse, correctedDiagrams) {
+  if (!originalResponse || typeof originalResponse !== "string") {
+    return originalResponse;
+  }
+  if (!correctedDiagrams || correctedDiagrams.length === 0) {
+    return originalResponse;
+  }
+  const jsonResult = extractMermaidFromJson(originalResponse);
+  if (!jsonResult.parsedJson) {
+    return originalResponse;
+  }
+  let modifiedJson = jsonResult.parsedJson;
+  for (const diagram of correctedDiagrams) {
+    if (!diagram.jsonPath || !diagram.isInJson) {
+      continue;
+    }
+    const pathParts = diagram.jsonPath.split(".").filter((p) => p);
+    let current = modifiedJson;
+    for (let i = 0; i < pathParts.length - 1; i++) {
+      const part = pathParts[i];
+      if (part.startsWith("[") && part.endsWith("]")) {
+        const index = parseInt(part.slice(1, -1), 10);
+        current = current[index];
+      } else {
+        current = current[part];
+      }
+    }
+    const lastPart = pathParts[pathParts.length - 1];
+    const attributesStr = diagram.attributes ? ` ${diagram.attributes}` : "";
+    const newCodeBlock = `\`\`\`mermaid${attributesStr}
+${diagram.content}
+\`\`\``;
+    if (lastPart.startsWith("[") && lastPart.endsWith("]")) {
+      const index = parseInt(lastPart.slice(1, -1), 10);
+      const originalString = current[index];
+      current[index] = originalString.replace(diagram.fullMatch, newCodeBlock);
+    } else {
+      const originalString = current[lastPart];
+      current[lastPart] = originalString.replace(diagram.fullMatch, newCodeBlock);
+    }
+  }
+  const modifiedJsonString = JSON.stringify(modifiedJson, null, 2);
+  const trimmed = originalResponse.trim();
+  if (trimmed.match(/```json\s*\n([\s\S]*?)\n```/)) {
+    return originalResponse.replace(/```json\s*\n([\s\S]*?)\n```/, `\`\`\`json
+${modifiedJsonString}
+\`\`\``);
+  } else if (trimmed.match(/```\s*\n([{\[][\s\S]*?[}\]])\s*```/)) {
+    return originalResponse.replace(/```\s*\n([{\[][\s\S]*?[}\]])\s*```/, `\`\`\`
+${modifiedJsonString}
+\`\`\``);
+  }
+  return modifiedJsonString;
+}
 function replaceMermaidDiagramsInMarkdown(originalResponse, correctedDiagrams) {
   if (!originalResponse || typeof originalResponse !== "string") {
     return originalResponse;
@@ -54864,6 +55047,10 @@ function replaceMermaidDiagramsInMarkdown(originalResponse, correctedDiagrams) {
   if (!correctedDiagrams || correctedDiagrams.length === 0) {
     return originalResponse;
   }
+  const hasJsonDiagrams = correctedDiagrams.some((d) => d.isInJson);
+  if (hasJsonDiagrams) {
+    return replaceMermaidDiagramsInJson(originalResponse, correctedDiagrams);
+  }
   let modifiedResponse = originalResponse;
   const sortedDiagrams = [...correctedDiagrams].sort((a, b) => b.startIndex - a.startIndex);
   for (const diagram of sortedDiagrams) {
@@ -57479,7 +57666,20 @@ var init_ProbeAgent = __esm({
           extract: wrappedTools.extractToolInstance,
           delegate: wrappedTools.delegateToolInstance,
           listFiles: listFilesToolInstance,
-          searchFiles: searchFilesToolInstance
+          searchFiles: searchFilesToolInstance,
+          readImage: {
+            execute: async (params) => {
+              const imagePath = params.path;
+              if (!imagePath) {
+                throw new Error("Image path is required");
+              }
+              const loaded = await this.loadImageIfValid(imagePath);
+              if (!loaded) {
+                throw new Error(`Failed to load image: ${imagePath}. The file may not exist, be too large, have an unsupported format, or be outside allowed directories.`);
+              }
+              return `Image loaded successfully: ${imagePath}. The image is now available for analysis in the conversation.`;
+            }
+          }
         };
         if (this.enableBash && wrappedTools.bashToolInstance) {
           this.toolImplementations.bash = wrappedTools.bashToolInstance;
@@ -58082,6 +58282,10 @@ var init_ProbeAgent = __esm({
         }
         if (isToolAllowed("searchFiles")) {
           toolDefinitions += `${searchFilesToolDefinition}
+`;
+        }
+        if (isToolAllowed("readImage")) {
+          toolDefinitions += `${readImageToolDefinition}
 `;
         }
         if (this.allowEdit && isToolAllowed("implement")) {
@@ -58169,6 +58373,7 @@ Available Tools:
 - extract: Extract specific code blocks or lines from files.
 - listFiles: List files and directories in a specified location.
 - searchFiles: Find files matching a glob pattern with recursive search capability.
+- readImage: Read and load an image file for AI analysis.
 ${this.allowEdit ? "- implement: Implement a feature or fix a bug using aider.\n- edit: Edit files using exact string replacement.\n- create: Create new files with specified content.\n" : ""}${this.enableDelegate ? "- delegate: Delegate big distinct tasks to specialized probe subagents.\n" : ""}${this.enableBash ? "- bash: Execute bash commands for system operations.\n" : ""}
 - attempt_completion: Finalize the task and provide the result to the user.
 - attempt_complete: Quick completion using previous response (shorthand).
@@ -58526,24 +58731,21 @@ You are working with a repository located at: ${searchDirectory}
               const assistantPreview = createMessagePreview(assistantResponseContent);
               console.log(`[DEBUG] Assistant response (${assistantResponseContent.length} chars): ${assistantPreview}`);
             }
-            if (assistantResponseContent) {
-              await this.processImageReferences(assistantResponseContent);
-            }
-            const validTools = [
-              "search",
-              "query",
-              "extract",
-              "listFiles",
-              "searchFiles",
-              "attempt_completion"
-            ];
-            if (this.allowEdit) {
+            const validTools = [];
+            if (this.allowedTools.isEnabled("search")) validTools.push("search");
+            if (this.allowedTools.isEnabled("query")) validTools.push("query");
+            if (this.allowedTools.isEnabled("extract")) validTools.push("extract");
+            if (this.allowedTools.isEnabled("listFiles")) validTools.push("listFiles");
+            if (this.allowedTools.isEnabled("searchFiles")) validTools.push("searchFiles");
+            if (this.allowedTools.isEnabled("readImage")) validTools.push("readImage");
+            if (this.allowedTools.isEnabled("attempt_completion")) validTools.push("attempt_completion");
+            if (this.allowEdit && this.allowedTools.isEnabled("implement")) {
               validTools.push("implement", "edit", "create");
             }
-            if (this.enableBash) {
+            if (this.enableBash && this.allowedTools.isEnabled("bash")) {
               validTools.push("bash");
             }
-            if (this.enableDelegate) {
+            if (this.enableDelegate && this.allowedTools.isEnabled("delegate")) {
               validTools.push("delegate");
             }
             const nativeTools = validTools;