@probelabs/probe 0.6.0-rc198 → 0.6.0-rc199

package/build/agent/index.js

@@ -7871,6 +7871,14 @@ var init_zod = __esm({
 
 // src/tools/common.js
 import { resolve, isAbsolute } from "path";
+function buildToolTagPattern(tools2 = DEFAULT_VALID_TOOLS) {
+  const allTools = [...tools2];
+  if (allTools.includes("attempt_completion") && !allTools.includes("attempt_complete")) {
+    allTools.push("attempt_complete");
+  }
+  const escaped = allTools.map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+  return new RegExp(`<(${escaped.join("|")})>`);
+}
 function getValidParamsForTool(toolName) {
   const schemaMap = {
     search: searchSchema,
@@ -8320,6 +8328,7 @@ User: Check system info
       "listFiles",
       "searchFiles",
       "implement",
+      "bash",
       "attempt_completion"
     ];
   }
@@ -17708,7 +17717,7 @@ function removeThinkingTags(xmlString) {
   const thinkingIndex = result.indexOf("<thinking>");
   if (thinkingIndex !== -1) {
     const afterThinking = result.substring(thinkingIndex + "<thinking>".length);
-    const toolPattern = /<(search|query|extract|listFiles|searchFiles|implement|attempt_completion|attempt_complete)>/;
+    const toolPattern = buildToolTagPattern(DEFAULT_VALID_TOOLS);
     const toolMatch = afterThinking.match(toolPattern);
     if (toolMatch) {
       const toolStart = thinkingIndex + "<thinking>".length + toolMatch.index;
@@ -17783,8 +17792,7 @@ function checkAttemptCompleteRecovery(cleanedXmlString, validTools = []) {
   return null;
 }
 function hasOtherToolTags(xmlString, validTools = []) {
-  const defaultTools = ["search", "query", "extract", "listFiles", "searchFiles", "implement", "attempt_completion"];
-  const toolsToCheck = validTools.length > 0 ? validTools : defaultTools;
+  const toolsToCheck = validTools.length > 0 ? validTools : DEFAULT_VALID_TOOLS;
   for (const tool4 of toolsToCheck) {
     if (tool4 !== "attempt_completion" && xmlString.includes(`<${tool4}`)) {
       return true;
@@ -17809,6 +17817,7 @@ ${thinkingContent}`);
 var init_xmlParsingUtils = __esm({
   "src/agent/xmlParsingUtils.js"() {
     "use strict";
+    init_common();
   }
 });
 

package/build/agent/xmlParsingUtils.js

@@ -3,6 +3,8 @@
  * This module contains the core logic for thinking tag removal and attempt_complete recovery
  */
 
+import { DEFAULT_VALID_TOOLS, buildToolTagPattern } from '../tools/common.js';
+
 /**
  * Remove thinking tags and their content from XML string
  * Handles both closed and unclosed thinking tags
@@ -24,7 +26,8 @@ export function removeThinkingTags(xmlString) {
     const afterThinking = result.substring(thinkingIndex + '<thinking>'.length);
 
     // Look for any tool tags in the remaining content
-    const toolPattern = /<(search|query|extract|listFiles|searchFiles|implement|attempt_completion|attempt_complete)>/;
+    // Use the shared tool list to build the pattern dynamically
+    const toolPattern = buildToolTagPattern(DEFAULT_VALID_TOOLS);
     const toolMatch = afterThinking.match(toolPattern);
 
     if (toolMatch) {
@@ -148,8 +151,8 @@ export function checkAttemptCompleteRecovery(cleanedXmlString, validTools = [])
  * @returns {boolean} - True if other tool tags are found
  */
 function hasOtherToolTags(xmlString, validTools = []) {
-  const defaultTools = ['search', 'query', 'extract', 'listFiles', 'searchFiles', 'implement', 'attempt_completion'];
-  const toolsToCheck = validTools.length > 0 ? validTools : defaultTools;
+  // Use the shared canonical tool list as default
+  const toolsToCheck = validTools.length > 0 ? validTools : DEFAULT_VALID_TOOLS;
   
   // Check for any tool tags other than attempt_complete variants
   for (const tool of toolsToCheck) {

package/build/tools/common.js

@@ -325,7 +325,8 @@ export const delegateDescription = 'Automatically delegate big distinct tasks to
 export const bashDescription = 'Execute bash commands for system exploration and development tasks. Secure by default with built-in allow/deny lists.';
 
 // Valid tool names that should be parsed as tool calls
-const DEFAULT_VALID_TOOLS = [
+// This is the canonical list - all other tool lists should reference this
+export const DEFAULT_VALID_TOOLS = [
 	'search',
 	'query',
 	'extract',
@@ -333,9 +334,25 @@ const DEFAULT_VALID_TOOLS = [
 	'listFiles',
 	'searchFiles',
 	'implement',
+	'bash',
 	'attempt_completion'
 ];
 
+/**
+ * Build a regex pattern to match any tool tag from the valid tools list
+ * @param {string[]} tools - List of tool names (defaults to DEFAULT_VALID_TOOLS)
+ * @returns {RegExp} - Regex pattern to match tool opening tags
+ */
+export function buildToolTagPattern(tools = DEFAULT_VALID_TOOLS) {
+	// Also include attempt_complete as an alias for attempt_completion
+	const allTools = [...tools];
+	if (allTools.includes('attempt_completion') && !allTools.includes('attempt_complete')) {
+		allTools.push('attempt_complete');
+	}
+	const escaped = allTools.map(t => t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+	return new RegExp(`<(${escaped.join('|')})>`);
+}
+
 /**
  * Get valid parameter names for a specific tool from its schema
  * @param {string} toolName - Name of the tool

package/build/tools/index.js

@@ -25,7 +25,9 @@ export {
 	attemptCompletionSchema,
 	attemptCompletionToolDefinition,
 	parseAndResolvePaths,
-	resolveTargetPath
+	resolveTargetPath,
+	DEFAULT_VALID_TOOLS,
+	buildToolTagPattern
 } from './common.js';
 
 // Export edit and create schemas

package/cjs/agent/ProbeAgent.cjs

@@ -34822,6 +34822,14 @@ var init_zod = __esm({
 });
 
 // src/tools/common.js
+function buildToolTagPattern(tools2 = DEFAULT_VALID_TOOLS) {
+  const allTools = [...tools2];
+  if (allTools.includes("attempt_completion") && !allTools.includes("attempt_complete")) {
+    allTools.push("attempt_complete");
+  }
+  const escaped = allTools.map((t4) => t4.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+  return new RegExp(`<(${escaped.join("|")})>`);
+}
 function getValidParamsForTool(toolName) {
   const schemaMap = {
     search: searchSchema,
@@ -35272,6 +35280,7 @@ User: Check system info
       "listFiles",
       "searchFiles",
       "implement",
+      "bash",
       "attempt_completion"
     ];
   }
@@ -44436,7 +44445,7 @@ function removeThinkingTags(xmlString) {
   const thinkingIndex = result.indexOf("<thinking>");
   if (thinkingIndex !== -1) {
     const afterThinking = result.substring(thinkingIndex + "<thinking>".length);
-    const toolPattern = /<(search|query|extract|listFiles|searchFiles|implement|attempt_completion|attempt_complete)>/;
+    const toolPattern = buildToolTagPattern(DEFAULT_VALID_TOOLS);
     const toolMatch = afterThinking.match(toolPattern);
     if (toolMatch) {
       const toolStart = thinkingIndex + "<thinking>".length + toolMatch.index;
@@ -44511,8 +44520,7 @@ function checkAttemptCompleteRecovery(cleanedXmlString, validTools = []) {
   return null;
 }
 function hasOtherToolTags(xmlString, validTools = []) {
-  const defaultTools = ["search", "query", "extract", "listFiles", "searchFiles", "implement", "attempt_completion"];
-  const toolsToCheck = validTools.length > 0 ? validTools : defaultTools;
+  const toolsToCheck = validTools.length > 0 ? validTools : DEFAULT_VALID_TOOLS;
   for (const tool4 of toolsToCheck) {
     if (tool4 !== "attempt_completion" && xmlString.includes(`<${tool4}`)) {
       return true;
@@ -44537,6 +44545,7 @@ ${thinkingContent}`);
 var init_xmlParsingUtils = __esm({
   "src/agent/xmlParsingUtils.js"() {
     "use strict";
+    init_common2();
   }
 });
 

package/cjs/index.cjs

@@ -30515,261 +30515,6 @@ var init_imageConfig = __esm({
   }
 });
 
-// src/agent/xmlParsingUtils.js
-function removeThinkingTags(xmlString) {
-  let result = xmlString;
-  result = result.replace(/<thinking>[\s\S]*?<\/thinking>/g, "");
-  const thinkingIndex = result.indexOf("<thinking>");
-  if (thinkingIndex !== -1) {
-    const afterThinking = result.substring(thinkingIndex + "<thinking>".length);
-    const toolPattern = /<(search|query|extract|listFiles|searchFiles|implement|attempt_completion|attempt_complete)>/;
-    const toolMatch = afterThinking.match(toolPattern);
-    if (toolMatch) {
-      const toolStart = thinkingIndex + "<thinking>".length + toolMatch.index;
-      result = result.substring(0, thinkingIndex) + result.substring(toolStart);
-    } else {
-      result = result.substring(0, thinkingIndex);
-    }
-  }
-  return result.trim();
-}
-function extractThinkingContent(xmlString) {
-  const thinkingMatch = xmlString.match(/<thinking>([\s\S]*?)<\/thinking>/);
-  return thinkingMatch ? thinkingMatch[1].trim() : null;
-}
-function checkAttemptCompleteRecovery(cleanedXmlString, validTools = []) {
-  const openTagIndex = cleanedXmlString.indexOf("<attempt_completion>");
-  if (openTagIndex !== -1) {
-    const afterOpenTag = cleanedXmlString.substring(openTagIndex + "<attempt_completion>".length);
-    const closeTagIndex = cleanedXmlString.lastIndexOf("</attempt_completion>");
-    let content;
-    let hasClosingTag = false;
-    if (closeTagIndex !== -1 && closeTagIndex >= openTagIndex + "<attempt_completion>".length) {
-      content = cleanedXmlString.substring(
-        openTagIndex + "<attempt_completion>".length,
-        closeTagIndex
-      ).trim();
-      hasClosingTag = true;
-    } else {
-      content = afterOpenTag.trim();
-      hasClosingTag = false;
-    }
-    if (content) {
-      return {
-        toolName: "attempt_completion",
-        params: { result: content }
-      };
-    }
-    return {
-      toolName: "attempt_completion",
-      params: { result: hasClosingTag ? "" : "__PREVIOUS_RESPONSE__" }
-    };
-  }
-  const attemptCompletePatterns = [
-    // Standard shorthand with optional whitespace
-    /^<attempt_complete>\s*$/,
-    // Empty with proper closing tag (common case from the logs)
-    /^<attempt_complete>\s*<\/attempt_complete>\s*$/,
-    // Self-closing variant
-    /^<attempt_complete\s*\/>\s*$/,
-    // Incomplete opening tag (missing closing bracket)
-    /^<attempt_complete\s*$/,
-    // With trailing content (extract just the tag part) - must come after empty tag pattern
-    /^<attempt_complete>(.*)$/s,
-    // Self-closing with trailing content
-    /^<attempt_complete\s*\/>(.*)$/s
-  ];
-  for (const pattern of attemptCompletePatterns) {
-    const match2 = cleanedXmlString.match(pattern);
-    if (match2) {
-      return {
-        toolName: "attempt_completion",
-        params: { result: "__PREVIOUS_RESPONSE__" }
-      };
-    }
-  }
-  if (cleanedXmlString.includes("<attempt_complete") && !hasOtherToolTags(cleanedXmlString, validTools)) {
-    return {
-      toolName: "attempt_completion",
-      params: { result: "__PREVIOUS_RESPONSE__" }
-    };
-  }
-  return null;
-}
-function hasOtherToolTags(xmlString, validTools = []) {
-  const defaultTools = ["search", "query", "extract", "listFiles", "searchFiles", "implement", "attempt_completion"];
-  const toolsToCheck = validTools.length > 0 ? validTools : defaultTools;
-  for (const tool4 of toolsToCheck) {
-    if (tool4 !== "attempt_completion" && xmlString.includes(`<${tool4}`)) {
-      return true;
-    }
-  }
-  return false;
-}
-function processXmlWithThinkingAndRecovery(xmlString, validTools = []) {
-  const thinkingContent = extractThinkingContent(xmlString);
-  const cleanedXmlString = removeThinkingTags(xmlString);
-  const recoveryResult = checkAttemptCompleteRecovery(cleanedXmlString, validTools);
-  if (process.env.DEBUG === "1" && thinkingContent) {
-    console.log(`[DEBUG] AI Thinking Process:
-${thinkingContent}`);
-  }
-  return {
-    cleanedXmlString,
-    thinkingContent,
-    recoveryResult
-  };
-}
-var init_xmlParsingUtils = __esm({
-  "src/agent/xmlParsingUtils.js"() {
-    "use strict";
-  }
-});
-
-// src/agent/tools.js
-function createTools(configOptions) {
-  const tools2 = {};
-  const isToolAllowed = configOptions.isToolAllowed || ((toolName) => {
-    if (!configOptions.allowedTools) return true;
-    return configOptions.allowedTools.isEnabled(toolName);
-  });
-  if (isToolAllowed("search")) {
-    tools2.searchTool = searchTool(configOptions);
-  }
-  if (isToolAllowed("query")) {
-    tools2.queryTool = queryTool(configOptions);
-  }
-  if (isToolAllowed("extract")) {
-    tools2.extractTool = extractTool(configOptions);
-  }
-  if (configOptions.enableDelegate && isToolAllowed("delegate")) {
-    tools2.delegateTool = delegateTool(configOptions);
-  }
-  if (configOptions.enableBash && isToolAllowed("bash")) {
-    tools2.bashTool = bashTool(configOptions);
-  }
-  if (configOptions.allowEdit && isToolAllowed("edit")) {
-    tools2.editTool = editTool(configOptions);
-  }
-  if (configOptions.allowEdit && isToolAllowed("create")) {
-    tools2.createTool = createTool(configOptions);
-  }
-  return tools2;
-}
-function parseXmlToolCallWithThinking(xmlString, validTools) {
-  const { cleanedXmlString, recoveryResult } = processXmlWithThinkingAndRecovery(xmlString, validTools);
-  if (recoveryResult) {
-    return recoveryResult;
-  }
-  return parseXmlToolCall(cleanedXmlString, validTools);
-}
-var import_crypto2, implementToolDefinition, listFilesToolDefinition, searchFilesToolDefinition, readImageToolDefinition;
-var init_tools = __esm({
-  "src/agent/tools.js"() {
-    "use strict";
-    init_index();
-    import_crypto2 = require("crypto");
-    init_xmlParsingUtils();
-    implementToolDefinition = `
-## implement
-Description: Implement a given task. Can modify files. Can be used ONLY if task explicitly stated that something requires modification or implementation.
-
-Parameters:
-- task: (required) The task description. Should be as detailed as possible, ideally pointing to exact files which needs be modified or created.
-- autoCommits: (optional) Whether to enable auto-commits in aider. Default is false.
-
-Usage Example:
-
-<examples>
-
-User: Can you implement a function to calculate Fibonacci numbers in main.js?
-<implement>
-<task>Implement a recursive function to calculate the nth Fibonacci number in main.js</task>
-</implement>
-
-User: Can you implement a function to calculate Fibonacci numbers in main.js with auto-commits?
-<implement>
-<task>Implement a recursive function to calculate the nth Fibonacci number in main.js</task>
-<autoCommits>true</autoCommits>
-</implement>
-
-</examples>
-`;
-    listFilesToolDefinition = `
-## listFiles
-Description: List files and directories in a specified location.
-
-Parameters:
-- directory: (optional) The directory path to list files from. Defaults to current directory if not specified.
-
-Usage Example:
-
-<examples>
-
-User: Can you list the files in the src directory?
-<listFiles>
-<directory>src</directory>
-</listFiles>
-
-User: What files are in the current directory?
-<listFiles>
-</listFiles>
-
-</examples>
-`;
-    searchFilesToolDefinition = `
-## searchFiles
-Description: Find files with name matching a glob pattern with recursive search capability.
-
-Parameters:
-- pattern: (required) The glob pattern to search for (e.g., "**/*.js", "*.md").
-- directory: (optional) The directory to search in. Defaults to current directory if not specified.
-- recursive: (optional) Whether to search recursively. Defaults to true.
-
-Usage Example:
-
-<examples>
-
-User: Can you find all JavaScript files in the project?
-<searchFiles>
-<pattern>**/*.js</pattern>
-</searchFiles>
-
-User: Find all markdown files in the docs directory, but only at the top level.
-<searchFiles>
-<pattern>*.md</pattern>
-<directory>docs</directory>
-<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>
-`;
-  }
-});
-
 // node_modules/zod/v3/helpers/util.js
 var util, objectUtil, ZodParsedType, getParsedType;
 var init_util2 = __esm({
@@ -34877,6 +34622,14 @@ var init_zod = __esm({
 });
 
 // src/tools/common.js
+function buildToolTagPattern(tools2 = DEFAULT_VALID_TOOLS) {
+  const allTools = [...tools2];
+  if (allTools.includes("attempt_completion") && !allTools.includes("attempt_complete")) {
+    allTools.push("attempt_complete");
+  }
+  const escaped = allTools.map((t4) => t4.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+  return new RegExp(`<(${escaped.join("|")})>`);
+}
 function getValidParamsForTool(toolName) {
   const schemaMap = {
     search: searchSchema,
@@ -35328,11 +35081,267 @@ User: Check system info
       "listFiles",
       "searchFiles",
       "implement",
+      "bash",
       "attempt_completion"
     ];
   }
 });
 
+// src/agent/xmlParsingUtils.js
+function removeThinkingTags(xmlString) {
+  let result = xmlString;
+  result = result.replace(/<thinking>[\s\S]*?<\/thinking>/g, "");
+  const thinkingIndex = result.indexOf("<thinking>");
+  if (thinkingIndex !== -1) {
+    const afterThinking = result.substring(thinkingIndex + "<thinking>".length);
+    const toolPattern = buildToolTagPattern(DEFAULT_VALID_TOOLS);
+    const toolMatch = afterThinking.match(toolPattern);
+    if (toolMatch) {
+      const toolStart = thinkingIndex + "<thinking>".length + toolMatch.index;
+      result = result.substring(0, thinkingIndex) + result.substring(toolStart);
+    } else {
+      result = result.substring(0, thinkingIndex);
+    }
+  }
+  return result.trim();
+}
+function extractThinkingContent(xmlString) {
+  const thinkingMatch = xmlString.match(/<thinking>([\s\S]*?)<\/thinking>/);
+  return thinkingMatch ? thinkingMatch[1].trim() : null;
+}
+function checkAttemptCompleteRecovery(cleanedXmlString, validTools = []) {
+  const openTagIndex = cleanedXmlString.indexOf("<attempt_completion>");
+  if (openTagIndex !== -1) {
+    const afterOpenTag = cleanedXmlString.substring(openTagIndex + "<attempt_completion>".length);
+    const closeTagIndex = cleanedXmlString.lastIndexOf("</attempt_completion>");
+    let content;
+    let hasClosingTag = false;
+    if (closeTagIndex !== -1 && closeTagIndex >= openTagIndex + "<attempt_completion>".length) {
+      content = cleanedXmlString.substring(
+        openTagIndex + "<attempt_completion>".length,
+        closeTagIndex
+      ).trim();
+      hasClosingTag = true;
+    } else {
+      content = afterOpenTag.trim();
+      hasClosingTag = false;
+    }
+    if (content) {
+      return {
+        toolName: "attempt_completion",
+        params: { result: content }
+      };
+    }
+    return {
+      toolName: "attempt_completion",
+      params: { result: hasClosingTag ? "" : "__PREVIOUS_RESPONSE__" }
+    };
+  }
+  const attemptCompletePatterns = [
+    // Standard shorthand with optional whitespace
+    /^<attempt_complete>\s*$/,
+    // Empty with proper closing tag (common case from the logs)
+    /^<attempt_complete>\s*<\/attempt_complete>\s*$/,
+    // Self-closing variant
+    /^<attempt_complete\s*\/>\s*$/,
+    // Incomplete opening tag (missing closing bracket)
+    /^<attempt_complete\s*$/,
+    // With trailing content (extract just the tag part) - must come after empty tag pattern
+    /^<attempt_complete>(.*)$/s,
+    // Self-closing with trailing content
+    /^<attempt_complete\s*\/>(.*)$/s
+  ];
+  for (const pattern of attemptCompletePatterns) {
+    const match2 = cleanedXmlString.match(pattern);
+    if (match2) {
+      return {
+        toolName: "attempt_completion",
+        params: { result: "__PREVIOUS_RESPONSE__" }
+      };
+    }
+  }
+  if (cleanedXmlString.includes("<attempt_complete") && !hasOtherToolTags(cleanedXmlString, validTools)) {
+    return {
+      toolName: "attempt_completion",
+      params: { result: "__PREVIOUS_RESPONSE__" }
+    };
+  }
+  return null;
+}
+function hasOtherToolTags(xmlString, validTools = []) {
+  const toolsToCheck = validTools.length > 0 ? validTools : DEFAULT_VALID_TOOLS;
+  for (const tool4 of toolsToCheck) {
+    if (tool4 !== "attempt_completion" && xmlString.includes(`<${tool4}`)) {
+      return true;
+    }
+  }
+  return false;
+}
+function processXmlWithThinkingAndRecovery(xmlString, validTools = []) {
+  const thinkingContent = extractThinkingContent(xmlString);
+  const cleanedXmlString = removeThinkingTags(xmlString);
+  const recoveryResult = checkAttemptCompleteRecovery(cleanedXmlString, validTools);
+  if (process.env.DEBUG === "1" && thinkingContent) {
+    console.log(`[DEBUG] AI Thinking Process:
+${thinkingContent}`);
+  }
+  return {
+    cleanedXmlString,
+    thinkingContent,
+    recoveryResult
+  };
+}
+var init_xmlParsingUtils = __esm({
+  "src/agent/xmlParsingUtils.js"() {
+    "use strict";
+    init_common2();
+  }
+});
+
+// src/agent/tools.js
+function createTools(configOptions) {
+  const tools2 = {};
+  const isToolAllowed = configOptions.isToolAllowed || ((toolName) => {
+    if (!configOptions.allowedTools) return true;
+    return configOptions.allowedTools.isEnabled(toolName);
+  });
+  if (isToolAllowed("search")) {
+    tools2.searchTool = searchTool(configOptions);
+  }
+  if (isToolAllowed("query")) {
+    tools2.queryTool = queryTool(configOptions);
+  }
+  if (isToolAllowed("extract")) {
+    tools2.extractTool = extractTool(configOptions);
+  }
+  if (configOptions.enableDelegate && isToolAllowed("delegate")) {
+    tools2.delegateTool = delegateTool(configOptions);
+  }
+  if (configOptions.enableBash && isToolAllowed("bash")) {
+    tools2.bashTool = bashTool(configOptions);
+  }
+  if (configOptions.allowEdit && isToolAllowed("edit")) {
+    tools2.editTool = editTool(configOptions);
+  }
+  if (configOptions.allowEdit && isToolAllowed("create")) {
+    tools2.createTool = createTool(configOptions);
+  }
+  return tools2;
+}
+function parseXmlToolCallWithThinking(xmlString, validTools) {
+  const { cleanedXmlString, recoveryResult } = processXmlWithThinkingAndRecovery(xmlString, validTools);
+  if (recoveryResult) {
+    return recoveryResult;
+  }
+  return parseXmlToolCall(cleanedXmlString, validTools);
+}
+var import_crypto2, implementToolDefinition, listFilesToolDefinition, searchFilesToolDefinition, readImageToolDefinition;
+var init_tools = __esm({
+  "src/agent/tools.js"() {
+    "use strict";
+    init_index();
+    import_crypto2 = require("crypto");
+    init_xmlParsingUtils();
+    implementToolDefinition = `
+## implement
+Description: Implement a given task. Can modify files. Can be used ONLY if task explicitly stated that something requires modification or implementation.
+
+Parameters:
+- task: (required) The task description. Should be as detailed as possible, ideally pointing to exact files which needs be modified or created.
+- autoCommits: (optional) Whether to enable auto-commits in aider. Default is false.
+
+Usage Example:
+
+<examples>
+
+User: Can you implement a function to calculate Fibonacci numbers in main.js?
+<implement>
+<task>Implement a recursive function to calculate the nth Fibonacci number in main.js</task>
+</implement>
+
+User: Can you implement a function to calculate Fibonacci numbers in main.js with auto-commits?
+<implement>
+<task>Implement a recursive function to calculate the nth Fibonacci number in main.js</task>
+<autoCommits>true</autoCommits>
+</implement>
+
+</examples>
+`;
+    listFilesToolDefinition = `
+## listFiles
+Description: List files and directories in a specified location.
+
+Parameters:
+- directory: (optional) The directory path to list files from. Defaults to current directory if not specified.
+
+Usage Example:
+
+<examples>
+
+User: Can you list the files in the src directory?
+<listFiles>
+<directory>src</directory>
+</listFiles>
+
+User: What files are in the current directory?
+<listFiles>
+</listFiles>
+
+</examples>
+`;
+    searchFilesToolDefinition = `
+## searchFiles
+Description: Find files with name matching a glob pattern with recursive search capability.
+
+Parameters:
+- pattern: (required) The glob pattern to search for (e.g., "**/*.js", "*.md").
+- directory: (optional) The directory to search in. Defaults to current directory if not specified.
+- recursive: (optional) Whether to search recursively. Defaults to true.
+
+Usage Example:
+
+<examples>
+
+User: Can you find all JavaScript files in the project?
+<searchFiles>
+<pattern>**/*.js</pattern>
+</searchFiles>
+
+User: Find all markdown files in the docs directory, but only at the top level.
+<searchFiles>
+<pattern>*.md</pattern>
+<directory>docs</directory>
+<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>
+`;
+  }
+});
+
 // node_modules/balanced-match/index.js
 var require_balanced_match = __commonJS({
   "node_modules/balanced-match/index.js"(exports2, module2) {
@@ -88796,12 +88805,14 @@ For GitHub-compatible mermaid diagrams, avoid single quotes and parentheses in n
 var tools_exports = {};
 __export(tools_exports, {
   DEFAULT_SYSTEM_MESSAGE: () => DEFAULT_SYSTEM_MESSAGE,
+  DEFAULT_VALID_TOOLS: () => DEFAULT_VALID_TOOLS,
   attemptCompletionSchema: () => attemptCompletionSchema,
   attemptCompletionToolDefinition: () => attemptCompletionToolDefinition,
   bashDescription: () => bashDescription,
   bashSchema: () => bashSchema,
   bashTool: () => bashTool,
   bashToolDefinition: () => bashToolDefinition,
+  buildToolTagPattern: () => buildToolTagPattern,
   createDescription: () => createDescription,
   createExtractTool: () => createExtractTool,
   createQueryTool: () => createQueryTool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc198",
+  "version": "0.6.0-rc199",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/xmlParsingUtils.js

@@ -3,6 +3,8 @@
  * This module contains the core logic for thinking tag removal and attempt_complete recovery
  */
 
+import { DEFAULT_VALID_TOOLS, buildToolTagPattern } from '../tools/common.js';
+
 /**
  * Remove thinking tags and their content from XML string
  * Handles both closed and unclosed thinking tags
@@ -24,7 +26,8 @@ export function removeThinkingTags(xmlString) {
     const afterThinking = result.substring(thinkingIndex + '<thinking>'.length);
 
     // Look for any tool tags in the remaining content
-    const toolPattern = /<(search|query|extract|listFiles|searchFiles|implement|attempt_completion|attempt_complete)>/;
+    // Use the shared tool list to build the pattern dynamically
+    const toolPattern = buildToolTagPattern(DEFAULT_VALID_TOOLS);
     const toolMatch = afterThinking.match(toolPattern);
 
     if (toolMatch) {
@@ -148,8 +151,8 @@ export function checkAttemptCompleteRecovery(cleanedXmlString, validTools = [])
  * @returns {boolean} - True if other tool tags are found
  */
 function hasOtherToolTags(xmlString, validTools = []) {
-  const defaultTools = ['search', 'query', 'extract', 'listFiles', 'searchFiles', 'implement', 'attempt_completion'];
-  const toolsToCheck = validTools.length > 0 ? validTools : defaultTools;
+  // Use the shared canonical tool list as default
+  const toolsToCheck = validTools.length > 0 ? validTools : DEFAULT_VALID_TOOLS;
   
   // Check for any tool tags other than attempt_complete variants
   for (const tool of toolsToCheck) {

package/src/tools/common.js

@@ -325,7 +325,8 @@ export const delegateDescription = 'Automatically delegate big distinct tasks to
 export const bashDescription = 'Execute bash commands for system exploration and development tasks. Secure by default with built-in allow/deny lists.';
 
 // Valid tool names that should be parsed as tool calls
-const DEFAULT_VALID_TOOLS = [
+// This is the canonical list - all other tool lists should reference this
+export const DEFAULT_VALID_TOOLS = [
 	'search',
 	'query',
 	'extract',
@@ -333,9 +334,25 @@ const DEFAULT_VALID_TOOLS = [
 	'listFiles',
 	'searchFiles',
 	'implement',
+	'bash',
 	'attempt_completion'
 ];
 
+/**
+ * Build a regex pattern to match any tool tag from the valid tools list
+ * @param {string[]} tools - List of tool names (defaults to DEFAULT_VALID_TOOLS)
+ * @returns {RegExp} - Regex pattern to match tool opening tags
+ */
+export function buildToolTagPattern(tools = DEFAULT_VALID_TOOLS) {
+	// Also include attempt_complete as an alias for attempt_completion
+	const allTools = [...tools];
+	if (allTools.includes('attempt_completion') && !allTools.includes('attempt_complete')) {
+		allTools.push('attempt_complete');
+	}
+	const escaped = allTools.map(t => t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+	return new RegExp(`<(${escaped.join('|')})>`);
+}
+
 /**
  * Get valid parameter names for a specific tool from its schema
  * @param {string} toolName - Name of the tool

package/src/tools/index.js

@@ -25,7 +25,9 @@ export {
 	attemptCompletionSchema,
 	attemptCompletionToolDefinition,
 	parseAndResolvePaths,
-	resolveTargetPath
+	resolveTargetPath,
+	DEFAULT_VALID_TOOLS,
+	buildToolTagPattern
 } from './common.js';
 
 // Export edit and create schemas