@probelabs/probe 0.6.0-rc173 → 0.6.0-rc175

package/index.d.ts

@@ -17,6 +17,8 @@ export interface ProbeAgentOptions {
   allowEdit?: boolean;
   /** Search directory path */
   path?: string;
+  /** Working directory for resolving relative paths (independent of allowedFolders security) */
+  cwd?: string;
   /** Force specific AI provider */
   provider?: 'anthropic' | 'openai' | 'google';
   /** Override model name */
@@ -41,6 +43,12 @@ export interface ProbeAgentOptions {
   allowedTools?: string[] | null;
   /** Convenience flag to disable all tools (equivalent to allowedTools: []). Takes precedence over allowedTools if set. */
   disableTools?: boolean;
+  /** Disable automatic mermaid diagram validation and fixing */
+  disableMermaidValidation?: boolean;
+  /** Disable automatic JSON validation and fixing (prevents infinite recursion in JsonFixingAgent) */
+  disableJsonValidation?: boolean;
+  /** Custom prompt to run after attempt_completion for validation/review (runs before mermaid/JSON validation) */
+  completionPrompt?: string;
 }
 
 /**
@@ -246,7 +254,10 @@ export declare class ProbeAgent {
   
   /** Allowed search folders */
   readonly allowedFolders: string[];
-  
+
+  /** Working directory for resolving relative paths */
+  readonly cwd: string | null;
+
   /** Debug mode status */
   readonly debug: boolean;
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc173",
+  "version": "0.6.0-rc175",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -79,7 +79,7 @@
     "@ai-sdk/openai": "^2.0.10",
     "@anthropic-ai/claude-agent-sdk": "^0.1.46",
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "@probelabs/maid": "^0.0.21",
+    "@probelabs/maid": "^0.0.22",
     "adm-zip": "^0.5.16",
     "ai": "^5.0.0",
     "ajv": "^8.17.1",

package/src/agent/ProbeAgent.d.ts

@@ -45,6 +45,12 @@ export interface ProbeAgentOptions {
   retry?: RetryOptions;
   /** Fallback configuration for multi-provider support */
   fallback?: FallbackOptions | { auto: boolean };
+  /** Disable automatic mermaid diagram validation and fixing */
+  disableMermaidValidation?: boolean;
+  /** Disable automatic JSON validation and fixing (prevents infinite recursion in JsonFixingAgent) */
+  disableJsonValidation?: boolean;
+  /** Custom prompt to run after attempt_completion for validation/review (runs before mermaid/JSON validation) */
+  completionPrompt?: string;
 }
 
 /**

package/src/agent/ProbeAgent.js

@@ -95,6 +95,7 @@ export class ProbeAgent {
    * @param {boolean} [options.allowEdit=false] - Allow the use of the 'implement' tool
    * @param {boolean} [options.enableDelegate=false] - Enable the delegate tool for task distribution to subagents
    * @param {string} [options.path] - Search directory path
+   * @param {string} [options.cwd] - Working directory for resolving relative paths (independent of allowedFolders)
    * @param {string} [options.provider] - Force specific AI provider
    * @param {string} [options.model] - Override model name
    * @param {boolean} [options.debug] - Enable debug mode
@@ -123,6 +124,7 @@ export class ProbeAgent {
    * @param {Array<Object>} [options.fallback.providers] - List of provider configurations for custom fallback
    * @param {boolean} [options.fallback.stopOnSuccess=true] - Stop on first success
    * @param {number} [options.fallback.maxTotalAttempts=10] - Maximum total attempts across all providers
+   * @param {string} [options.completionPrompt] - Custom prompt to run after attempt_completion for validation/review (runs before mermaid/JSON validation)
    */
   constructor(options = {}) {
     // Basic configuration
@@ -147,6 +149,9 @@ export class ProbeAgent {
     this.disableMermaidValidation = !!options.disableMermaidValidation;
     this.disableJsonValidation = !!options.disableJsonValidation;
 
+    // Completion prompt for post-completion validation/review
+    this.completionPrompt = options.completionPrompt || null;
+
     // Tool filtering configuration
     // Parse allowedTools option: ['*'] = all tools, [] or null = no tools, ['tool1', 'tool2'] = specific tools
     // Supports exclusion with '!' prefix: ['*', '!bash'] = all tools except bash
@@ -180,6 +185,9 @@ export class ProbeAgent {
       this.allowedFolders = [process.cwd()];
     }
 
+    // Working directory for resolving relative paths (separate from allowedFolders security)
+    this.cwd = options.cwd || null;
+
     // API configuration
     this.clientApiProvider = options.provider || null;
     this.clientApiModel = options.model || null;
@@ -425,7 +433,8 @@ export class ProbeAgent {
     const configOptions = {
       sessionId: this.sessionId,
       debug: this.debug,
-      defaultPath: this.allowedFolders.length > 0 ? this.allowedFolders[0] : process.cwd(),
+      // Use explicit cwd if set, otherwise fall back to first allowed folder
+      cwd: this.cwd || (this.allowedFolders.length > 0 ? this.allowedFolders[0] : process.cwd()),
       allowedFolders: this.allowedFolders,
       outline: this.outline,
       allowEdit: this.allowEdit,
@@ -2743,6 +2752,63 @@ IMPORTANT: When using <attempt_complete>, this must be the ONLY content in your
         // Continue even if storage fails
       }
 
+      // Completion prompt handling - run a follow-up prompt after attempt_completion for validation/review
+      // This runs BEFORE mermaid validation and JSON schema validation
+      // Skip if we're already in a completion prompt follow-up call or if no completion prompt is configured
+      if (completionAttempted && this.completionPrompt && !options._completionPromptProcessed) {
+        if (this.debug) {
+          console.log('[DEBUG] Running completion prompt for post-completion validation/review...');
+        }
+
+        try {
+          // Record completion prompt start in telemetry
+          if (this.tracer) {
+            this.tracer.recordEvent('completion_prompt.started', {
+              'completion_prompt.original_result_length': finalResult?.length || 0
+            });
+          }
+
+          // Create the completion prompt with the current result as context
+          const completionPromptMessage = `${this.completionPrompt}
+
+Here is the result to review:
+<result>
+${finalResult}
+</result>
+
+After reviewing, provide your final answer using attempt_completion.`;
+
+          // Make a follow-up call with the completion prompt
+          // Pass _completionPromptProcessed to prevent infinite loops
+          const completionResult = await this.answer(completionPromptMessage, [], {
+            ...options,
+            _completionPromptProcessed: true
+          });
+
+          // Update finalResult with the result from the completion prompt
+          finalResult = completionResult;
+
+          if (this.debug) {
+            console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
+          }
+
+          // Record completion prompt completion in telemetry
+          if (this.tracer) {
+            this.tracer.recordEvent('completion_prompt.completed', {
+              'completion_prompt.final_result_length': finalResult?.length || 0
+            });
+          }
+        } catch (error) {
+          console.error('[ERROR] Completion prompt failed:', error);
+          // Keep the original result if completion prompt fails
+          if (this.tracer) {
+            this.tracer.recordEvent('completion_prompt.error', {
+              'completion_prompt.error': error.message
+            });
+          }
+        }
+      }
+
       // Schema handling - format response according to provided schema
       // Skip schema processing if result came from attempt_completion tool
       // Don't apply schema formatting if we failed due to max iterations
@@ -3330,6 +3396,7 @@ Convert your previous response content into actual JSON data that follows this s
       enableDelegate: this.enableDelegate,
       path: this.allowedFolders[0], // Use first allowed folder as primary path
       allowedFolders: [...this.allowedFolders],
+      cwd: this.cwd, // Preserve explicit working directory
       provider: this.clientApiProvider,
       model: this.clientApiModel,
       debug: this.debug,
@@ -3338,6 +3405,7 @@ Convert your previous response content into actual JSON data that follows this s
       maxIterations: this.maxIterations,
       disableMermaidValidation: this.disableMermaidValidation,
       disableJsonValidation: this.disableJsonValidation,
+      completionPrompt: this.completionPrompt,
       allowedTools: allowedToolsArray,
       enableMcp: !!this.mcpBridge,
       mcpConfig: this.mcpConfig,

package/src/agent/probeTool.js

@@ -8,6 +8,7 @@ import fs from 'fs';
 import { promises as fsPromises } from 'fs';
 import path from 'path';
 import { glob } from 'glob';
+import { getEntryType } from '../utils/symlink-utils.js';
 
 // Create an event emitter for tool calls (simplified for single-shot operations)
 export const toolCallEmitter = new EventEmitter();
@@ -287,23 +288,13 @@ export const listFilesTool = {
 
       // Format the results as ls-style output
       const entries = await Promise.all(files.map(async (file) => {
-        const isDirectory = file.isDirectory();
         const fullPath = path.join(targetDir, file.name);
-
-        let size = 0;
-        try {
-          const stats = await fsPromises.stat(fullPath);
-          size = stats.size;
-        } catch (statError) {
-          if (debug) {
-            console.log(`[DEBUG] Could not stat file ${file.name}:`, statError.message);
-          }
-        }
+        const entryType = await getEntryType(file, fullPath);
 
         return {
           name: file.name,
-          isDirectory,
-          size
+          isDirectory: entryType.isDirectory,
+          size: entryType.size
         };
       }));
 

package/src/downloader.js

@@ -14,6 +14,7 @@ import os from 'os';
 import { fileURLToPath } from 'url';
 import { ensureBinDirectory } from './utils.js';
 import { getPackageBinDir } from './directory-resolver.js';
+import { getEntryType } from './utils/symlink-utils.js';
 
 const exec = promisify(execCallback);
 
@@ -770,10 +771,13 @@ async function extractBinary(assetPath, outputDir) {
 			for (const entry of entries) {
 				const fullPath = path.join(dir, entry.name);
 
-				if (entry.isDirectory()) {
+				// Use shared utility to follow symlinks and get actual target type
+				const entryType = await getEntryType(entry, fullPath);
+
+				if (entryType.isDirectory) {
 					const result = await findBinary(fullPath);
 					if (result) return result;
-				} else if (entry.isFile()) {
+				} else if (entryType.isFile) {
 					// Check if this is the binary we're looking for
 					if (entry.name === binaryName ||
 						entry.name === BINARY_NAME ||

package/src/extract.js

@@ -6,6 +6,7 @@
 import { exec, spawn } from 'child_process';
 import { promisify } from 'util';
 import { getBinaryPath, buildCliArgs, escapeString } from './utils.js';
+import { validateCwdPath } from './utils/path-validation.js';
 
 const execAsync = promisify(exec);
 
@@ -27,6 +28,7 @@ const EXTRACT_FLAG_MAP = {
  * @param {string[]} [options.files] - Files to extract from (can include line numbers with colon, e.g., "/path/to/file.rs:10")
  * @param {string} [options.inputFile] - Path to a file containing unstructured text to extract file paths from
  * @param {string|Buffer} [options.content] - Content to pipe to stdin (e.g., git diff output). Alternative to inputFile.
+ * @param {string} [options.cwd] - Working directory for resolving relative file paths
  * @param {boolean} [options.allowTests] - Include test files
  * @param {number} [options.contextLines] - Number of context lines to include
  * @param {string} [options.format] - Output format ('markdown', 'plain', 'json', 'xml', 'color', 'outline-xml', 'outline-diff')
@@ -71,6 +73,10 @@ export async function extract(options) {
 		}
 	}
 
+	// Get the working directory (cwd option sets working directory for relative file resolution)
+	// Validate and normalize the path to prevent path traversal attacks
+	const cwd = await validateCwdPath(options.cwd);
+
 	// Create a single log record with all extract parameters (only in debug mode)
 	if (process.env.DEBUG === '1') {
 		let logMessage = `\nExtract:`;
@@ -79,6 +85,7 @@ export async function extract(options) {
 		}
 		if (options.inputFile) logMessage += ` inputFile="${options.inputFile}"`;
 		if (options.content) logMessage += ` content=(${typeof options.content === 'string' ? options.content.length : options.content.byteLength} bytes)`;
+		if (options.cwd) logMessage += ` cwd="${cwd}"`;
 		if (options.allowTests) logMessage += " allowTests=true";
 		if (options.contextLines) logMessage += ` contextLines=${options.contextLines}`;
 		if (options.format) logMessage += ` format=${options.format}`;
@@ -88,14 +95,14 @@ export async function extract(options) {
 
 	// If content is provided, use spawn with stdin piping
 	if (hasContent) {
-		return extractWithStdin(binaryPath, cliArgs, options.content, options);
+		return extractWithStdin(binaryPath, cliArgs, options.content, options, cwd);
 	}
 
 	// Otherwise use exec for simple command execution
 	const command = `${binaryPath} extract ${cliArgs.join(' ')}`;
 
 	try {
-		const { stdout, stderr } = await execAsync(command);
+		const { stdout, stderr } = await execAsync(command, { cwd });
 
 		if (stderr) {
 			console.error(`stderr: ${stderr}`);
@@ -104,7 +111,7 @@ export async function extract(options) {
 		return processExtractOutput(stdout, options);
 	} catch (error) {
 		// Enhance error message with command details
-		const errorMessage = `Error executing extract command: ${error.message}\nCommand: ${command}`;
+		const errorMessage = `Error executing extract command: ${error.message}\nCommand: ${command}\nCwd: ${cwd}`;
 		throw new Error(errorMessage);
 	}
 }
@@ -113,10 +120,11 @@ export async function extract(options) {
  * Extract with content piped to stdin
  * @private
  */
-function extractWithStdin(binaryPath, cliArgs, content, options) {
+function extractWithStdin(binaryPath, cliArgs, content, options, cwd) {
 	return new Promise((resolve, reject) => {
 		const childProcess = spawn(binaryPath, ['extract', ...cliArgs], {
-			stdio: ['pipe', 'pipe', 'pipe']
+			stdio: ['pipe', 'pipe', 'pipe'],
+			cwd
 		});
 
 		let stdout = '';

package/src/extractor.js

@@ -9,6 +9,7 @@ import tar from 'tar';
 import AdmZip from 'adm-zip';
 import os from 'os';
 import { fileURLToPath } from 'url';
+import { getEntryType } from './utils/symlink-utils.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -148,10 +149,13 @@ async function findBinary(dir, baseDir, binaryName, isWindows) {
 			continue;
 		}
 
-		if (entry.isDirectory()) {
+		// Use shared utility to follow symlinks and get actual target type
+		const entryType = await getEntryType(entry, fullPath);
+
+		if (entryType.isDirectory) {
 			const result = await findBinary(fullPath, baseDir, binaryName, isWindows);
 			if (result) return result;
-		} else if (entry.isFile()) {
+		} else if (entryType.isFile) {
 			// Check if this is the binary we're looking for
 			if (entry.name === binaryName ||
 				entry.name === BINARY_NAME ||

package/src/query.js

@@ -6,6 +6,7 @@
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { getBinaryPath, buildCliArgs, escapeString } from './utils.js';
+import { validateCwdPath } from './utils/path-validation.js';
 
 const execAsync = promisify(exec);
 
@@ -26,6 +27,7 @@ const QUERY_FLAG_MAP = {
  * 
  * @param {Object} options - Query options
  * @param {string} options.path - Path to search in
+ * @param {string} [options.cwd] - Working directory for resolving relative paths (defaults to process.cwd())
  * @param {string} options.pattern - The ast-grep pattern to search for
  * @param {string} [options.language] - Programming language to search in
  * @param {string[]} [options.ignore] - Patterns to ignore
@@ -62,9 +64,14 @@ export async function query(options) {
 	// Add pattern and path as positional arguments
 	cliArgs.push(escapeString(options.pattern), escapeString(options.path));
 
+	// Get the working directory (cwd option for resolving relative paths)
+	// Validate and normalize the path to prevent path traversal attacks
+	const cwd = await validateCwdPath(options.cwd);
+
 	// Create a single log record with all query parameters (only in debug mode)
 	if (process.env.DEBUG === '1') {
 		let logMessage = `Query: pattern="${options.pattern}" path="${options.path}"`;
+		if (options.cwd) logMessage += ` cwd="${options.cwd}"`;
 		if (options.language) logMessage += ` language=${options.language}`;
 		if (options.maxResults) logMessage += ` maxResults=${options.maxResults}`;
 		if (options.allowTests) logMessage += " allowTests=true";
@@ -75,7 +82,7 @@ export async function query(options) {
 	const command = `${binaryPath} query ${cliArgs.join(' ')}`;
 
 	try {
-		const { stdout, stderr } = await execAsync(command);
+		const { stdout, stderr } = await execAsync(command, { cwd });
 
 		if (stderr) {
 			console.error(`stderr: ${stderr}`);
@@ -110,7 +117,7 @@ export async function query(options) {
 		return stdout;
 	} catch (error) {
 		// Enhance error message with command details
-		const errorMessage = `Error executing query command: ${error.message}\nCommand: ${command}`;
+		const errorMessage = `Error executing query command: ${error.message}\nCommand: ${command}\nCwd: ${cwd}`;
 		throw new Error(errorMessage);
 	}
 }

package/src/search.js

@@ -6,6 +6,7 @@
 import { execFile } from 'child_process';
 import { promisify } from 'util';
 import { getBinaryPath, buildCliArgs } from './utils.js';
+import { validateCwdPath } from './utils/path-validation.js';
 
 const execFileAsync = promisify(execFile);
 
@@ -38,6 +39,7 @@ const SEARCH_FLAG_MAP = {
  *
  * @param {Object} options - Search options
  * @param {string} options.path - Path to search in
+ * @param {string} [options.cwd] - Working directory for resolving relative paths (defaults to process.cwd())
  * @param {string|string[]} options.query - Search query or queries
  * @param {boolean} [options.filesOnly] - Only output file paths
  * @param {string[]} [options.ignore] - Patterns to ignore
@@ -125,9 +127,14 @@ export async function search(options) {
 	// Add query and path as positional arguments
 	const queries = Array.isArray(options.query) ? options.query : [options.query];
 
+	// Get the working directory (cwd option for resolving relative paths)
+	// Validate and normalize the path to prevent path traversal attacks
+	const cwd = await validateCwdPath(options.cwd);
+
 	// Create a single log record with all search parameters (only in debug mode)
 	if (process.env.DEBUG === '1') {
 		let logMessage = `\nSearch: query="${queries[0]}" path="${options.path}"`;
+		if (options.cwd) logMessage += ` cwd="${options.cwd}"`;
 		if (options.maxResults) logMessage += ` maxResults=${options.maxResults}`;
 		logMessage += ` maxTokens=${options.maxTokens}`;
 		logMessage += ` timeout=${options.timeout}`;
@@ -154,6 +161,7 @@ export async function search(options) {
 	try {
 		// Execute with execFile (no shell, prevents command injection)
 		const { stdout, stderr } = await execFileAsync(binaryPath, args, {
+			cwd,
 			timeout: options.timeout * 1000, // Convert seconds to milliseconds
 			maxBuffer: 50 * 1024 * 1024 // 50MB buffer for large outputs
 		});
@@ -226,13 +234,13 @@ export async function search(options) {
 	} catch (error) {
 		// Check if the error is a timeout
 		if (error.code === 'ETIMEDOUT' || error.killed) {
-			const timeoutMessage = `Search operation timed out after ${options.timeout} seconds.\nBinary: ${binaryPath}\nArgs: ${args.join(' ')}`;
+			const timeoutMessage = `Search operation timed out after ${options.timeout} seconds.\nBinary: ${binaryPath}\nArgs: ${args.join(' ')}\nCwd: ${cwd}`;
 			console.error(timeoutMessage);
 			throw new Error(timeoutMessage);
 		}
 
 		// Enhance error message with command details
-		const errorMessage = `Error executing search command: ${error.message}\nBinary: ${binaryPath}\nArgs: ${args.join(' ')}`;
+		const errorMessage = `Error executing search command: ${error.message}\nBinary: ${binaryPath}\nArgs: ${args.join(' ')}\nCwd: ${cwd}`;
 		throw new Error(errorMessage);
 	}
 }

package/src/tools/bash.js

@@ -22,15 +22,15 @@ import { executeBashCommand, formatExecutionResult, validateExecutionOptions } f
  * @param {Object} [options.bashConfig.env={}] - Default environment variables
  * @param {number} [options.bashConfig.maxBuffer] - Maximum output buffer size
  * @param {boolean} [options.debug=false] - Enable debug logging
- * @param {string} [options.defaultPath] - Default working directory from probe config
+ * @param {string} [options.cwd] - Working directory from probe config
  * @param {string[]} [options.allowedFolders] - Allowed directories for execution
  * @returns {Object} Configured bash tool
  */
 export const bashTool = (options = {}) => {
-  const { 
+  const {
     bashConfig = {},
     debug = false,
-    defaultPath,
+    cwd,
     allowedFolders = []
   } = options;
 
@@ -48,8 +48,8 @@ export const bashTool = (options = {}) => {
     if (bashConfig.workingDirectory) {
       return bashConfig.workingDirectory;
     }
-    if (defaultPath) {
-      return defaultPath;
+    if (cwd) {
+      return cwd;
     }
     if (allowedFolders && allowedFolders.length > 0) {
       return allowedFolders[0];

package/src/tools/edit.js

@@ -40,7 +40,7 @@ function parseFileToolOptions(options = {}) {
   return {
     debug: options.debug || false,
     allowedFolders: options.allowedFolders || [],
-    defaultPath: options.defaultPath
+    cwd: options.cwd
   };
 }
 
@@ -50,11 +50,11 @@ function parseFileToolOptions(options = {}) {
  * @param {Object} [options] - Configuration options
  * @param {boolean} [options.debug=false] - Enable debug logging
  * @param {string[]} [options.allowedFolders] - Allowed directories for file operations
- * @param {string} [options.defaultPath] - Default working directory
+ * @param {string} [options.cwd] - Working directory
  * @returns {Object} Configured edit tool
  */
 export const editTool = (options = {}) => {
-  const { debug, allowedFolders, defaultPath } = parseFileToolOptions(options);
+  const { debug, allowedFolders, cwd } = parseFileToolOptions(options);
 
   return tool({
     name: 'edit',
@@ -111,7 +111,7 @@ Important:
         }
 
         // Resolve the file path
-        const resolvedPath = isAbsolute(file_path) ? file_path : resolve(defaultPath || process.cwd(), file_path);
+        const resolvedPath = isAbsolute(file_path) ? file_path : resolve(cwd || process.cwd(), file_path);
 
         if (debug) {
           console.error(`[Edit] Attempting to edit file: ${resolvedPath}`);
@@ -182,11 +182,11 @@ Important:
  * @param {Object} [options] - Configuration options
  * @param {boolean} [options.debug=false] - Enable debug logging
  * @param {string[]} [options.allowedFolders] - Allowed directories for file operations
- * @param {string} [options.defaultPath] - Default working directory
+ * @param {string} [options.cwd] - Working directory
  * @returns {Object} Configured create tool
  */
 export const createTool = (options = {}) => {
-  const { debug, allowedFolders, defaultPath } = parseFileToolOptions(options);
+  const { debug, allowedFolders, cwd } = parseFileToolOptions(options);
 
   return tool({
     name: 'create',
@@ -235,7 +235,7 @@ Important:
         }
 
         // Resolve the file path
-        const resolvedPath = isAbsolute(file_path) ? file_path : resolve(defaultPath || process.cwd(), file_path);
+        const resolvedPath = isAbsolute(file_path) ? file_path : resolve(cwd || process.cwd(), file_path);
 
         if (debug) {
           console.error(`[Create] Attempting to create file: ${resolvedPath}`);

package/src/tools/langchain.js

@@ -9,7 +9,9 @@ import { extract } from '../extract.js';
 import { searchSchema, querySchema, extractSchema, searchDescription, queryDescription, extractDescription, parseTargets } from './common.js';
 
 // LangChain tool for searching code
-export function createSearchTool() {
+export function createSearchTool(options = {}) {
+	const { cwd } = options;
+
 	return {
 		name: 'search',
 		description: searchDescription,
@@ -19,6 +21,7 @@ export function createSearchTool() {
 				const results = await search({
 					query: searchQuery,
 					path,
+					cwd, // Working directory for resolving relative paths
 					allow_tests,
 					exact,
 					json: false,
@@ -37,7 +40,9 @@ export function createSearchTool() {
 }
 
 // LangChain tool for querying code
-export function createQueryTool() {
+export function createQueryTool(options = {}) {
+	const { cwd } = options;
+
 	return {
 		name: 'query',
 		description: queryDescription,
@@ -47,6 +52,7 @@ export function createQueryTool() {
 				const results = await query({
 					pattern,
 					path,
+					cwd, // Working directory for resolving relative paths
 					language,
 					allow_tests,
 					json: false
@@ -62,7 +68,9 @@ export function createQueryTool() {
 }
 
 // LangChain tool for extracting code
-export function createExtractTool() {
+export function createExtractTool(options = {}) {
+	const { cwd } = options;
+
 	return {
 		name: 'extract',
 		description: extractDescription,
@@ -74,6 +82,7 @@ export function createExtractTool() {
 
 				const results = await extract({
 					files,
+					cwd, // Working directory for resolving relative paths
 					allowTests: allow_tests,
 					contextLines: context_lines,
 					format