@probelabs/probe 0.6.0-rc228 → 0.6.0-rc230

package/build/agent/ProbeAgent.js

@@ -58,6 +58,8 @@ import {
   implementToolDefinition,
   editToolDefinition,
   createToolDefinition,
+  googleSearchToolDefinition,
+  urlContextToolDefinition,
   attemptCompletionSchema,
   parseXmlToolCallWithThinking
 } from './tools.js';
@@ -404,6 +406,10 @@ export class ProbeAgent {
     // Initialize the AI model
     this.initializeModel();
 
+    // Gemini built-in tools (provider-defined, server-side)
+    // These are enabled automatically when the provider is Google
+    this._geminiToolsEnabled = this._initializeGeminiBuiltinTools();
+
     // Note: MCP initialization is now done in initialize() method
     // Constructor must remain synchronous for backward compatibility
   }
@@ -1320,6 +1326,15 @@ export class ProbeAgent {
           abortSignal: controller.signal
         };
 
+        // Strip Gemini provider-defined tools when falling back to non-Google provider
+        // These tools have no execute function and would cause errors on other providers
+        if (config.provider !== 'google' && fallbackOptions.tools) {
+          delete fallbackOptions.tools;
+          if (this.debug) {
+            console.error(`[DEBUG] Stripped Gemini built-in tools for fallback to ${config.provider} provider`);
+          }
+        }
+
         const providerRetryManager = new RetryManager({
           maxRetries: config.maxRetries ?? this.retryConfig.maxRetries ?? 3,
           initialDelay: this.retryConfig.initialDelay ?? 1000,
@@ -1442,6 +1457,83 @@ export class ProbeAgent {
     }
   }
 
+  /**
+   * Initialize Gemini built-in tools (gemini_google_search, gemini_url_context).
+   * These are provider-defined tools that execute server-side on Google's infrastructure.
+   * They are only available when the provider is Google Gemini.
+   * @returns {{ googleSearch: boolean, urlContext: boolean }} Which tools were enabled
+   * @private
+   */
+  _initializeGeminiBuiltinTools() {
+    const isToolAllowed = (toolName) => this.allowedTools.isEnabled(toolName);
+    const result = { googleSearch: false, urlContext: false };
+
+    if (this.apiType !== 'google') {
+      // Log info about unavailability for non-Google providers
+      if (isToolAllowed('gemini_google_search') || isToolAllowed('gemini_url_context')) {
+        if (this.debug) {
+          console.error(`[DEBUG] Gemini built-in tools (gemini_google_search, gemini_url_context) are not available: provider is '${this.apiType}', not 'google'. These tools require the Google Gemini provider.`);
+        }
+      }
+      return result;
+    }
+
+    // Check SDK support
+    if (!this.provider || !this.provider.tools) {
+      console.error('[ProbeAgent] Gemini built-in tools unavailable: @ai-sdk/google does not expose provider.tools. Upgrade to @ai-sdk/google v2.0.14+.');
+      return result;
+    }
+
+    if (isToolAllowed('gemini_google_search')) {
+      result.googleSearch = true;
+      if (this.debug) {
+        console.error('[DEBUG] Gemini built-in tool enabled: gemini_google_search');
+      }
+    }
+
+    if (isToolAllowed('gemini_url_context')) {
+      result.urlContext = true;
+      if (this.debug) {
+        console.error('[DEBUG] Gemini built-in tool enabled: gemini_url_context');
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Build Gemini provider-defined tools object for streamText().
+   * Returns undefined if no Gemini tools are enabled.
+   * @returns {Object|undefined}
+   * @private
+   */
+  _buildGeminiProviderTools() {
+    if (this.apiType !== 'google' || !this._geminiToolsEnabled) {
+      return undefined;
+    }
+
+    const { googleSearch, urlContext } = this._geminiToolsEnabled;
+    if (!googleSearch && !urlContext) {
+      return undefined;
+    }
+
+    if (!this.provider || !this.provider.tools) {
+      return undefined;
+    }
+
+    const tools = {};
+    const providerTools = this.provider.tools;
+
+    if (googleSearch && providerTools.googleSearch) {
+      tools.google_search = providerTools.googleSearch({});
+    }
+    if (urlContext && providerTools.urlContext) {
+      tools.url_context = providerTools.urlContext({});
+    }
+
+    return Object.keys(tools).length > 0 ? tools : undefined;
+  }
+
   /**
    * Initialize AWS Bedrock model
    */
@@ -2420,6 +2512,14 @@ ${extractGuidance}
       toolDefinitions += `${analyzeAllToolDefinition}\n`;
     }
 
+    // Gemini built-in tools (only when using Google provider)
+    if (this._geminiToolsEnabled?.googleSearch && isToolAllowed('gemini_google_search')) {
+      toolDefinitions += `${googleSearchToolDefinition}\n`;
+    }
+    if (this._geminiToolsEnabled?.urlContext && isToolAllowed('gemini_url_context')) {
+      toolDefinitions += `${urlContextToolDefinition}\n`;
+    }
+
     // Build XML tool guidelines with dynamic examples based on allowed tools
     // Build examples only for allowed tools
     let toolExamples = '';
@@ -2497,6 +2597,12 @@ The configuration is loaded from src/config.js lines 15-25 which contains the da
       availableToolsList += '- attempt_completion: Finalize the task and provide the result to the user.\n';
       availableToolsList += '- attempt_complete: Quick completion using previous response (shorthand).\n';
     }
+    if (this._geminiToolsEnabled?.googleSearch && isToolAllowed('gemini_google_search')) {
+      availableToolsList += '- gemini_google_search: (auto) Web search via Google — invoked automatically by the model when it needs current information.\n';
+    }
+    if (this._geminiToolsEnabled?.urlContext && isToolAllowed('gemini_url_context')) {
+      availableToolsList += '- gemini_url_context: (auto) URL content reader via Google — automatically fetches and reads URLs mentioned in the conversation.\n';
+    }
 
     let xmlToolGuidelines = `
 # Tool Use Formatting
@@ -3049,12 +3155,21 @@ Follow these instructions carefully:
               // Prepare messages with potential image content
               const messagesForAI = this.prepareMessagesWithImages(currentMessages);
 
-              const result = await this.streamTextWithRetryAndFallback({
+              // Build streamText options, including Gemini provider-defined tools if applicable
+              const streamOptions = {
                 model: this.provider ? this.provider(this.model) : this.model,
                 messages: messagesForAI,
                 maxTokens: maxResponseTokens,
                 temperature: 0.3,
-              });
+              };
+
+              // Inject Gemini built-in tools (gemini_google_search, gemini_url_context) when using Google provider
+              const geminiProviderTools = this._buildGeminiProviderTools();
+              if (geminiProviderTools) {
+                streamOptions.tools = geminiProviderTools;
+              }
+
+              const result = await this.streamTextWithRetryAndFallback(streamOptions);
 
               // Get the promise reference BEFORE consuming stream (doesn't lock it)
               const usagePromise = result.usage;
@@ -3585,6 +3700,12 @@ Follow these instructions carefully:
 
                 let toolResultContent = typeof toolResult === 'string' ? toolResult : JSON.stringify(toolResult, null, 2);
 
+                // Convert absolute workspace paths to relative in tool results
+                if (this.workspaceRoot && toolResultContent) {
+                  const wsPrefix = this.workspaceRoot.endsWith(sep) ? this.workspaceRoot : this.workspaceRoot + sep;
+                  toolResultContent = toolResultContent.split(wsPrefix).join('');
+                }
+
                 // Truncate if output exceeds token limit
                 try {
                   const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);

package/build/agent/index.js

@@ -3314,6 +3314,29 @@ async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
   try {
     const stats = await fs5.stat(normalizedPath);
     if (!stats.isDirectory()) {
+      const resolvedPath = safeRealpath(normalizedPath);
+      const dirPath = path4.dirname(resolvedPath);
+      try {
+        const dirStats = await fs5.stat(dirPath);
+        if (dirStats.isDirectory()) {
+          return safeRealpath(dirPath);
+        }
+      } catch (dirError) {
+        if (dirError.code === "ENOENT") {
+          throw new PathError(`Parent directory does not exist for file: ${normalizedPath}`, {
+            suggestion: "The specified path is a file whose parent directory does not exist.",
+            details: { path: normalizedPath, parentPath: dirPath, type: "file" }
+          });
+        }
+        if (dirError.code === "EACCES") {
+          throw new PathError(`Permission denied accessing parent directory: ${dirPath}`, {
+            recoverable: false,
+            suggestion: "Permission denied accessing the parent directory of the specified file.",
+            details: { path: normalizedPath, parentPath: dirPath, type: "file" }
+          });
+        }
+        throw dirError;
+      }
       throw new PathError(`Path is not a directory: ${normalizedPath}`, {
         suggestion: "The specified path is a file, not a directory. Please provide a directory path for searching.",
         details: { path: normalizedPath, type: "file" }
@@ -9807,7 +9830,7 @@ function resolveTargetPath(target, cwd) {
   }
   return filePart + suffix;
 }
-var searchSchema, querySchema, extractSchema, delegateSchema, listSkillsSchema, useSkillSchema, bashSchema, analyzeAllSchema, attemptCompletionSchema, searchToolDefinition, queryToolDefinition, extractToolDefinition, delegateToolDefinition, attemptCompletionToolDefinition, analyzeAllToolDefinition, bashToolDefinition, searchDescription, queryDescription, extractDescription, delegateDescription, analyzeAllDescription, DEFAULT_VALID_TOOLS;
+var searchSchema, querySchema, extractSchema, delegateSchema, listSkillsSchema, useSkillSchema, bashSchema, analyzeAllSchema, attemptCompletionSchema, searchToolDefinition, queryToolDefinition, extractToolDefinition, delegateToolDefinition, attemptCompletionToolDefinition, analyzeAllToolDefinition, bashToolDefinition, googleSearchToolDefinition, urlContextToolDefinition, searchDescription, queryDescription, extractDescription, delegateDescription, analyzeAllDescription, DEFAULT_VALID_TOOLS;
 var init_common = __esm({
   "src/tools/common.js"() {
     "use strict";
@@ -10163,6 +10186,28 @@ User: Check system info
 </bash>
 
 </examples>
+`;
+    googleSearchToolDefinition = `
+## gemini_google_search (Gemini Built-in)
+Description: Web search powered by Google. This is a built-in Gemini capability that automatically searches the web when the model needs current information. The model decides when to search and integrates results directly into its response with source citations.
+
+This tool is invoked automatically by the model \u2014 you do NOT need to use XML tool calls for it. Simply ask questions that require up-to-date or real-world information and the model will search the web as needed.
+
+Capabilities:
+- Real-time web search with grounded citations
+- Automatic query generation and result synthesis
+- Source attribution with URLs
+`;
+    urlContextToolDefinition = `
+## gemini_url_context (Gemini Built-in)
+Description: URL content reader powered by Google. This is a built-in Gemini capability that automatically fetches and analyzes the content of URLs mentioned in the conversation. When you include URLs in your message, the model can read and understand their content.
+
+This tool is invoked automatically by the model \u2014 you do NOT need to use XML tool calls for it. Simply include URLs in your message and the model will fetch and analyze their content.
+
+Capabilities:
+- Fetch and read web page content from URLs in the prompt
+- Supports up to 20 URLs per request
+- Processes HTML content (does not execute JavaScript)
 `;
     searchDescription = "Search code in the repository. Free-form questions are accepted, but Elasticsearch-style keyword queries work best. Use this tool first for any code-related questions.";
     queryDescription = "Search code using ast-grep structural pattern matching. Use this tool to find specific code structures like functions, classes, or methods.";
@@ -10288,6 +10333,7 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     `Options: exact=${exact ? "true" : "false"}, language=${language || "auto"}, allow_tests=${allowTests ? "true" : "false"}.`,
     "",
     'Return ONLY valid JSON: {"targets": ["path/to/file.ext#Symbol", "path/to/file.ext:line", "path/to/file.ext:start-end"]}',
+    'IMPORTANT: Use ABSOLUTE file paths in targets (e.g., "/full/path/to/file.ext#Symbol"). If you only have relative paths, make them relative to the search path above.',
     "Prefer #Symbol when a function/class name is clear; otherwise use line numbers.",
     "Deduplicate targets. Do NOT explain or answer - ONLY return the JSON targets."
   ].join("\n");
@@ -10409,11 +10455,11 @@ var init_vercel = __esm({
               }
               return await runRawSearch();
             }
-            const effectiveCwd = options.cwd || ".";
-            const resolvedTargets = targets.map((target) => resolveTargetPath(target, effectiveCwd));
+            const resolutionBase = searchPaths[0] || options.cwd || ".";
+            const resolvedTargets = targets.map((target) => resolveTargetPath(target, resolutionBase));
             const extractOptions = {
               files: resolvedTargets,
-              cwd: effectiveCwd,
+              cwd: resolutionBase,
               allowTests: allow_tests ?? true
             };
             if (outline) {
@@ -59410,7 +59456,13 @@ var init_config = __esm({
     __filename4 = fileURLToPath6(import.meta.url);
     __dirname4 = dirname3(__filename4);
     DEFAULT_TIMEOUT = 3e4;
-    MAX_TIMEOUT = 6e5;
+    MAX_TIMEOUT = (() => {
+      if (process.env.MCP_MAX_TIMEOUT) {
+        const parsed = parseInt(process.env.MCP_MAX_TIMEOUT, 10);
+        if (!isNaN(parsed) && parsed >= 3e4 && parsed <= 72e5) return parsed;
+      }
+      return 18e5;
+    })();
     DEFAULT_CONFIG = {
       mcpServers: {
         // Example probe server configuration
@@ -70515,6 +70567,7 @@ var init_ProbeAgent = __esm({
         this.fallbackManager = null;
         this.engine = null;
         this.initializeModel();
+        this._geminiToolsEnabled = this._initializeGeminiBuiltinTools();
       }
       /**
        * Parse allowedTools configuration
@@ -71247,6 +71300,12 @@ var init_ProbeAgent = __esm({
               model: provider(model),
               abortSignal: controller.signal
             };
+            if (config.provider !== "google" && fallbackOptions.tools) {
+              delete fallbackOptions.tools;
+              if (this.debug) {
+                console.error(`[DEBUG] Stripped Gemini built-in tools for fallback to ${config.provider} provider`);
+              }
+            }
             const providerRetryManager = new RetryManager({
               maxRetries: config.maxRetries ?? this.retryConfig.maxRetries ?? 3,
               initialDelay: this.retryConfig.initialDelay ?? 1e3,
@@ -71350,6 +71409,69 @@ var init_ProbeAgent = __esm({
           console.log(`Using Google API with model: ${this.model}${apiUrl ? ` (URL: ${apiUrl})` : ""}`);
         }
       }
+      /**
+       * Initialize Gemini built-in tools (gemini_google_search, gemini_url_context).
+       * These are provider-defined tools that execute server-side on Google's infrastructure.
+       * They are only available when the provider is Google Gemini.
+       * @returns {{ googleSearch: boolean, urlContext: boolean }} Which tools were enabled
+       * @private
+       */
+      _initializeGeminiBuiltinTools() {
+        const isToolAllowed = (toolName) => this.allowedTools.isEnabled(toolName);
+        const result = { googleSearch: false, urlContext: false };
+        if (this.apiType !== "google") {
+          if (isToolAllowed("gemini_google_search") || isToolAllowed("gemini_url_context")) {
+            if (this.debug) {
+              console.error(`[DEBUG] Gemini built-in tools (gemini_google_search, gemini_url_context) are not available: provider is '${this.apiType}', not 'google'. These tools require the Google Gemini provider.`);
+            }
+          }
+          return result;
+        }
+        if (!this.provider || !this.provider.tools) {
+          console.error("[ProbeAgent] Gemini built-in tools unavailable: @ai-sdk/google does not expose provider.tools. Upgrade to @ai-sdk/google v2.0.14+.");
+          return result;
+        }
+        if (isToolAllowed("gemini_google_search")) {
+          result.googleSearch = true;
+          if (this.debug) {
+            console.error("[DEBUG] Gemini built-in tool enabled: gemini_google_search");
+          }
+        }
+        if (isToolAllowed("gemini_url_context")) {
+          result.urlContext = true;
+          if (this.debug) {
+            console.error("[DEBUG] Gemini built-in tool enabled: gemini_url_context");
+          }
+        }
+        return result;
+      }
+      /**
+       * Build Gemini provider-defined tools object for streamText().
+       * Returns undefined if no Gemini tools are enabled.
+       * @returns {Object|undefined}
+       * @private
+       */
+      _buildGeminiProviderTools() {
+        if (this.apiType !== "google" || !this._geminiToolsEnabled) {
+          return void 0;
+        }
+        const { googleSearch, urlContext } = this._geminiToolsEnabled;
+        if (!googleSearch && !urlContext) {
+          return void 0;
+        }
+        if (!this.provider || !this.provider.tools) {
+          return void 0;
+        }
+        const tools2 = {};
+        const providerTools = this.provider.tools;
+        if (googleSearch && providerTools.googleSearch) {
+          tools2.google_search = providerTools.googleSearch({});
+        }
+        if (urlContext && providerTools.urlContext) {
+          tools2.url_context = providerTools.urlContext({});
+        }
+        return Object.keys(tools2).length > 0 ? tools2 : void 0;
+      }
       /**
        * Initialize AWS Bedrock model
        */
@@ -72138,6 +72260,14 @@ Workspace: ${this.allowedFolders.join(", ")}`;
         }
         if (isToolAllowed("analyze_all")) {
           toolDefinitions += `${analyzeAllToolDefinition}
+`;
+        }
+        if (this._geminiToolsEnabled?.googleSearch && isToolAllowed("gemini_google_search")) {
+          toolDefinitions += `${googleSearchToolDefinition}
+`;
+        }
+        if (this._geminiToolsEnabled?.urlContext && isToolAllowed("gemini_url_context")) {
+          toolDefinitions += `${urlContextToolDefinition}
 `;
         }
         let toolExamples = "";
@@ -72214,6 +72344,12 @@ The configuration is loaded from src/config.js lines 15-25 which contains the da
           availableToolsList += "- attempt_completion: Finalize the task and provide the result to the user.\n";
           availableToolsList += "- attempt_complete: Quick completion using previous response (shorthand).\n";
         }
+        if (this._geminiToolsEnabled?.googleSearch && isToolAllowed("gemini_google_search")) {
+          availableToolsList += "- gemini_google_search: (auto) Web search via Google \u2014 invoked automatically by the model when it needs current information.\n";
+        }
+        if (this._geminiToolsEnabled?.urlContext && isToolAllowed("gemini_url_context")) {
+          availableToolsList += "- gemini_url_context: (auto) URL content reader via Google \u2014 automatically fetches and reads URLs mentioned in the conversation.\n";
+        }
         let xmlToolGuidelines = `
 # Tool Use Formatting
 
@@ -72664,12 +72800,17 @@ You are working with a workspace. Available paths: ${workspaceDesc}
               try {
                 const executeAIRequest = async () => {
                   const messagesForAI = this.prepareMessagesWithImages(currentMessages);
-                  const result = await this.streamTextWithRetryAndFallback({
+                  const streamOptions = {
                     model: this.provider ? this.provider(this.model) : this.model,
                     messages: messagesForAI,
                     maxTokens: maxResponseTokens,
                     temperature: 0.3
-                  });
+                  };
+                  const geminiProviderTools = this._buildGeminiProviderTools();
+                  if (geminiProviderTools) {
+                    streamOptions.tools = geminiProviderTools;
+                  }
+                  const result = await this.streamTextWithRetryAndFallback(streamOptions);
                   const usagePromise = result.usage;
                   for await (const delta of result.textStream) {
                     assistantResponseContent += delta;
@@ -73059,6 +73200,10 @@ ${errorXml}
                     }
                     currentMessages.push({ role: "assistant", content: assistantResponseContent });
                     let toolResultContent = typeof toolResult === "string" ? toolResult : JSON.stringify(toolResult, null, 2);
+                    if (this.workspaceRoot && toolResultContent) {
+                      const wsPrefix = this.workspaceRoot.endsWith(sep5) ? this.workspaceRoot : this.workspaceRoot + sep5;
+                      toolResultContent = toolResultContent.split(wsPrefix).join("");
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {

package/build/agent/mcp/config.js

@@ -15,7 +15,13 @@ const __dirname = dirname(__filename);
  * Timeout configuration constants
  */
 export const DEFAULT_TIMEOUT = 30000; // 30 seconds
-export const MAX_TIMEOUT = 600000; // 10 minutes max to prevent resource exhaustion
+export const MAX_TIMEOUT = (() => {
+  if (process.env.MCP_MAX_TIMEOUT) {
+    const parsed = parseInt(process.env.MCP_MAX_TIMEOUT, 10);
+    if (!isNaN(parsed) && parsed >= 30000 && parsed <= 7200000) return parsed;
+  }
+  return 1800000; // 30 minutes default - workflow tools (code checkouts, AI exploration) need time
+})();
 
 /**
  * Validate and normalize a timeout value

package/build/agent/tools.js

@@ -27,6 +27,8 @@ import {
   bashToolDefinition,
   editToolDefinition,
   createToolDefinition,
+  googleSearchToolDefinition,
+  urlContextToolDefinition,
   parseXmlToolCall
 } from '../index.js';
 import { randomUUID } from 'crypto';
@@ -108,6 +110,8 @@ export {
   editToolDefinition,
   createToolDefinition,
   attemptCompletionToolDefinition,
+  googleSearchToolDefinition,
+  urlContextToolDefinition,
   parseXmlToolCall
 };
 

package/build/index.js

@@ -35,6 +35,8 @@ import {
 	analyzeAllToolDefinition,
 	attemptCompletionToolDefinition,
 	bashToolDefinition,
+	googleSearchToolDefinition,
+	urlContextToolDefinition,
 	parseXmlToolCall
 } from './tools/common.js';
 import {
@@ -114,6 +116,8 @@ export {
 	bashToolDefinition,
 	editToolDefinition,
 	createToolDefinition,
+	googleSearchToolDefinition,
+	urlContextToolDefinition,
 	// Export parser function
 	parseXmlToolCall,
 	// Export task management

package/build/tools/common.js

@@ -386,6 +386,30 @@ User: Check system info
 </examples>
 `;
 
+export const googleSearchToolDefinition = `
+## gemini_google_search (Gemini Built-in)
+Description: Web search powered by Google. This is a built-in Gemini capability that automatically searches the web when the model needs current information. The model decides when to search and integrates results directly into its response with source citations.
+
+This tool is invoked automatically by the model — you do NOT need to use XML tool calls for it. Simply ask questions that require up-to-date or real-world information and the model will search the web as needed.
+
+Capabilities:
+- Real-time web search with grounded citations
+- Automatic query generation and result synthesis
+- Source attribution with URLs
+`;
+
+export const urlContextToolDefinition = `
+## gemini_url_context (Gemini Built-in)
+Description: URL content reader powered by Google. This is a built-in Gemini capability that automatically fetches and analyzes the content of URLs mentioned in the conversation. When you include URLs in your message, the model can read and understand their content.
+
+This tool is invoked automatically by the model — you do NOT need to use XML tool calls for it. Simply include URLs in your message and the model will fetch and analyze their content.
+
+Capabilities:
+- Fetch and read web page content from URLs in the prompt
+- Supports up to 20 URLs per request
+- Processes HTML content (does not execute JavaScript)
+`;
+
 export const searchDescription = 'Search code in the repository. Free-form questions are accepted, but Elasticsearch-style keyword queries work best. Use this tool first for any code-related questions.';
 export const queryDescription = 'Search code using ast-grep structural pattern matching. Use this tool to find specific code structures like functions, classes, or methods.';
 export const extractDescription = 'Extract code blocks from files based on file paths and optional line numbers. Use this tool to see complete context after finding relevant files.';

package/build/tools/vercel.js

@@ -140,6 +140,7 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		`Options: exact=${exact ? 'true' : 'false'}, language=${language || 'auto'}, allow_tests=${allowTests ? 'true' : 'false'}.`,
 		'',
 		'Return ONLY valid JSON: {"targets": ["path/to/file.ext#Symbol", "path/to/file.ext:line", "path/to/file.ext:start-end"]}',
+		'IMPORTANT: Use ABSOLUTE file paths in targets (e.g., "/full/path/to/file.ext#Symbol"). If you only have relative paths, make them relative to the search path above.',
 		'Prefer #Symbol when a function/class name is clear; otherwise use line numbers.',
 		'Deduplicate targets. Do NOT explain or answer - ONLY return the JSON targets.'
 	].join('\n');
@@ -267,11 +268,14 @@ export const searchTool = (options = {}) => {
 					return await runRawSearch();
 				}
 
-				const effectiveCwd = options.cwd || '.';
-				const resolvedTargets = targets.map(target => resolveTargetPath(target, effectiveCwd));
+				// Resolve relative paths against the actual search directory, not the general cwd.
+				// The delegate returns paths relative to where the search was performed (searchPaths[0]),
+				// which may differ from options.cwd when the user specifies a path parameter.
+				const resolutionBase = searchPaths[0] || options.cwd || '.';
+				const resolvedTargets = targets.map(target => resolveTargetPath(target, resolutionBase));
 				const extractOptions = {
 					files: resolvedTargets,
-					cwd: effectiveCwd,
+					cwd: resolutionBase,
 					allowTests: allow_tests ?? true
 				};
 

package/build/utils/path-validation.js

@@ -55,9 +55,9 @@ export function safeRealpath(inputPath) {
  * - Does NOT restrict access to specific directories (that's the responsibility
  *   of higher-level components like ProbeAgent with allowedFolders)
  *
- * @param {string} inputPath - The path to validate
+ * @param {string} inputPath - The path to validate (can be a file or directory; file paths are resolved to their parent directory)
  * @param {string} [defaultPath] - Default path to use if inputPath is not provided
- * @returns {Promise<string>} Normalized absolute path
+ * @returns {Promise<string>} Normalized absolute directory path. If inputPath is a file, returns its parent directory.
  * @throws {PathError} If the path is invalid or doesn't exist
  */
 export async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
@@ -72,6 +72,32 @@ export async function validateCwdPath(inputPath, defaultPath = process.cwd()) {
 	try {
 		const stats = await fs.stat(normalizedPath);
 		if (!stats.isDirectory()) {
+			// If the path is a file, resolve to its parent directory
+			// This handles cases where a file path is passed as cwd
+			// Use safeRealpath to resolve symlinks before extracting parent directory
+			const resolvedPath = safeRealpath(normalizedPath);
+			const dirPath = path.dirname(resolvedPath);
+			try {
+				const dirStats = await fs.stat(dirPath);
+				if (dirStats.isDirectory()) {
+					return safeRealpath(dirPath);
+				}
+			} catch (dirError) {
+				if (dirError.code === 'ENOENT') {
+					throw new PathError(`Parent directory does not exist for file: ${normalizedPath}`, {
+						suggestion: 'The specified path is a file whose parent directory does not exist.',
+						details: { path: normalizedPath, parentPath: dirPath, type: 'file' }
+					});
+				}
+				if (dirError.code === 'EACCES') {
+					throw new PathError(`Permission denied accessing parent directory: ${dirPath}`, {
+						recoverable: false,
+						suggestion: 'Permission denied accessing the parent directory of the specified file.',
+						details: { path: normalizedPath, parentPath: dirPath, type: 'file' }
+					});
+				}
+				throw dirError;
+			}
 			throw new PathError(`Path is not a directory: ${normalizedPath}`, {
 				suggestion: 'The specified path is a file, not a directory. Please provide a directory path for searching.',
 				details: { path: normalizedPath, type: 'file' }