@probelabs/probe 0.6.0-rc198 → 0.6.0-rc200

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/delegate.js

@@ -229,6 +229,9 @@ export async function delegate({
 			console.error(`[DELEGATE] Using ProbeAgent SDK with code-researcher prompt`);
 		}
 		// Create a new ProbeAgent instance for the delegated task
+		// IMPORTANT: We pass both path and cwd set to the same value (workspace root)
+		// to prevent path doubling issues. The parent's navigation context should not
+		// affect the subagent's path resolution - subagents always work from workspace root.
 		const subagent = new ProbeAgent({
 			sessionId,
 			promptType: 'code-researcher',  // Clean prompt, not inherited from parent
@@ -238,7 +241,8 @@ export async function delegate({
 			maxIterations: remainingIterations,
 			debug,
 			tracer,
-			path,       // Inherit from parent
+			path,       // Workspace root (from delegateTool)
+			cwd: path,  // Explicitly set cwd to workspace root to prevent path doubling
 			provider,   // Inherit from parent
 			model,      // Inherit from parent
 			enableBash, // Inherit from parent

package/build/tools/common.js

@@ -5,6 +5,7 @@
 
 import { z } from 'zod';
 import { resolve, isAbsolute } from 'path';
+import { editSchema, createSchema } from './edit.js';
 
 // Common schemas for tool parameters (used for internal execution after XML parsing)
 export const searchSchema = z.object({
@@ -325,7 +326,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,23 +335,41 @@ 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
  * @returns {string[]} - Array of valid parameter names for this tool
  */
 function getValidParamsForTool(toolName) {
-	// Map tool names to their schemas
+	// Map tool names to their schemas (supports both Zod and JSON Schema formats)
 	const schemaMap = {
 		search: searchSchema,
 		query: querySchema,
 		extract: extractSchema,
 		delegate: delegateSchema,
 		bash: bashSchema,
-		attempt_completion: attemptCompletionSchema
+		attempt_completion: attemptCompletionSchema,
+		edit: editSchema,
+		create: createSchema
 	};
 
 	const schema = schemaMap[toolName];
@@ -365,10 +385,15 @@ function getValidParamsForTool(toolName) {
 	}
 
 	// Extract keys from Zod schema
-	if (schema && schema._def && schema._def.shape) {
+	if (schema._def && schema._def.shape) {
 		return Object.keys(schema._def.shape());
 	}
 
+	// Extract keys from JSON Schema (used by edit and create tools)
+	if (schema.properties) {
+		return Object.keys(schema.properties);
+	}
+
 	// Fallback: return empty array if we can't extract schema keys
 	return [];
 }

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/build/tools/vercel.js

@@ -295,9 +295,22 @@ export const delegateTool = (options = {}) => {
 				throw new TypeError('model must be a string, null, or undefined');
 			}
 
-			// Use inherited path if not specified in AI call
-			// Priority: explicit path > cwd > first allowedFolder
-			const effectivePath = path || cwd || (allowedFolders && allowedFolders[0]);
+			// Determine the path to pass to the subagent
+			// NOTE: Delegation intentionally uses DIFFERENT priority than other tools.
+			//
+			// Other tools (search, extract, query, bash) use: cwd || allowedFolders[0]
+			// Delegation uses: path || allowedFolders[0] || cwd
+			//
+			// This is intentional because:
+			// - Other tools operate within the parent's navigation context (cwd is correct)
+			// - Subagents need a FRESH start from workspace root, not parent's navigation state
+			// - Using parent's cwd would cause "path doubling" (Issue #348) where paths like
+			//   /workspace/project/src/internal/build/src/internal/build/file.go get constructed
+			//
+			// The workspace root (allowedFolders[0]) is the security boundary and correct base
+			// for subagent operations. Parent navigation context should not leak to subagents.
+			const workspaceRoot = allowedFolders && allowedFolders[0];
+			const effectivePath = path || workspaceRoot || cwd;
 
 			if (debug) {
 				console.error(`Executing delegate with task: "${task.substring(0, 100)}${task.length > 100 ? '...' : ''}"`);
@@ -305,7 +318,7 @@ export const delegateTool = (options = {}) => {
 					console.error(`Parent session: ${parentSessionId}`);
 				}
 				if (effectivePath && effectivePath !== path) {
-					console.error(`Using inherited path: ${effectivePath}`);
+					console.error(`Using workspace root: ${effectivePath} (cwd was: ${cwd || 'not set'})`);
 				}
 			}