@probelabs/probe 0.6.0-rc280 → 0.6.0-rc282

package/build/agent/ProbeAgent.js

@@ -2876,7 +2876,7 @@ ${searchToolDesc1}
 - searchFiles: Find files by name patterns`;
 
     if (this.enableBash) {
-      systemPrompt += `\n- bash: Execute bash commands for system operations`;
+      systemPrompt += `\n- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) — always use search and extract tools instead, they are faster and more accurate.`;
     }
 
     const searchGuidance1 = this.searchDelegate
@@ -2942,7 +2942,7 @@ ${searchToolDesc2}
 - searchFiles: Find files by name patterns`;
 
     if (this.enableBash) {
-      systemPrompt += `\n- bash: Execute bash commands for system operations`;
+      systemPrompt += `\n- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) — always use search and extract tools instead, they are faster and more accurate.`;
     }
 
     const searchGuidance2 = this.searchDelegate
@@ -3018,7 +3018,8 @@ Follow these instructions carefully:
 3. You should always prefer the search tool for code-related questions.${this.searchDelegate ? ' Ask natural language questions — the search subagent handles keyword formulation and returns extracted code blocks. Use extract only to expand context or read full files.' : ' Search handles stemming and case variations automatically — do NOT try keyword variations manually. Read full files only if really necessary.'}
 4. Ensure to get really deep and understand the full picture before answering.
 5. Once the task is fully completed, use the attempt_completion tool to provide the final result.
-6. ${this.searchDelegate ? 'Ask clear, specific questions when searching. Each search should target a distinct concept or question.' : 'Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results.'}${this.allowEdit ? `
+6. ${this.searchDelegate ? 'Ask clear, specific questions when searching. Each search should target a distinct concept or question.' : 'Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results.'}
+7. NEVER use bash for code exploration (no grep, cat, find, head, tail, awk, sed) — always use search and extract tools instead. Bash is only for system operations like building, running tests, or git commands.${this.allowEdit ? `
 7. When modifying files, choose the appropriate tool:
     - Use 'edit' for all code modifications:
       * PREFERRED: Use start_line (and optionally end_line) for line-targeted editing — this is the safest and most precise approach.${this.hashLines ? ' Use the line:hash references from extract/search output (e.g. "42:ab") for integrity verification.' : ''} Always use extract first to see line numbers${this.hashLines ? ' and hashes' : ''}, then edit by line reference.
@@ -3035,22 +3036,30 @@ Follow these instructions carefully:
     // Use predefined prompts from shared module (imported at top of file)
     let systemMessage = '';
 
-    // Use custom prompt if provided
-    if (this.customPrompt) {
+    // Build system message from predefined prompt + optional custom prompt
+    if (this.customPrompt && this.promptType && predefinedPrompts[this.promptType]) {
+      // Both: use predefined as base, append custom wrapped in tag
+      systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
+      systemMessage += commonInstructions;
+      systemMessage += "\n<custom-instructions>\n" + this.customPrompt + "\n</custom-instructions>";
+      if (this.debug) {
+        console.log(`[DEBUG] Using predefined prompt: ${this.promptType} + custom prompt`);
+      }
+    } else if (this.customPrompt) {
+      // Only custom prompt
       systemMessage = "<role>" + this.customPrompt + "</role>";
       if (this.debug) {
         console.log(`[DEBUG] Using custom prompt`);
       }
-    }
-    // Use predefined prompt if specified
-    else if (this.promptType && predefinedPrompts[this.promptType]) {
+    } else if (this.promptType && predefinedPrompts[this.promptType]) {
+      // Only predefined prompt
       systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
       if (this.debug) {
         console.log(`[DEBUG] Using predefined prompt: ${this.promptType}`);
       }
       systemMessage += commonInstructions;
     } else {
-      // Use the default prompt (code explorer) if no prompt type is specified
+      // Default: code explorer
       systemMessage = "<role>" + predefinedPrompts['code-explorer'] + "</role>";
       if (this.debug) {
         console.log(`[DEBUG] Using default prompt: code explorer`);

package/build/agent/index.js

@@ -9185,13 +9185,19 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     "- listFiles: Understand directory structure to find where relevant code might live.",
     "",
     "CRITICAL - How probe search works (do NOT ignore):",
-    "- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting.",
+    "- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting automatically.",
     '- Searching "allowed_ips" ALREADY matches "AllowedIPs", "allowedIps", "allowed_ips", etc. Do NOT manually try case/style variations.',
     '- Searching "getUserData" ALREADY matches "get", "user", "data" and their variations.',
-    "- NEVER repeat the same search query \u2014 you will get the same results.",
+    "- NEVER repeat the same search query \u2014 you will get the same results. Changing the path does NOT change this.",
     "- NEVER search trivial variations of the same keyword (e.g., AllowedIPs then allowedIps then allowed_ips). This is wasteful \u2014 probe handles it.",
-    "- If a search returns no results, the term likely does not exist in that path. Try a genuinely DIFFERENT keyword or concept, not a variation.",
-    "- If 2-3 consecutive searches return no results for a concept, STOP searching for it and move on.",
+    "- If a search returns no results, the term likely does not exist. Try a genuinely DIFFERENT keyword or concept, not a variation.",
+    "- If 2-3 searches return no results for a concept, STOP searching for it and move on. Do NOT keep retrying.",
+    "",
+    "When to use exact=true:",
+    "- Use exact=true when searching for a KNOWN symbol name (function, type, variable, struct).",
+    "- exact=true matches the literal string only \u2014 no stemming, no splitting.",
+    '- This is ideal for precise lookups: exact=true "ForwardMessage", exact=true "SessionLimiter", exact=true "ThrottleRetryLimit".',
+    "- Do NOT use exact=true for exploratory/conceptual queries \u2014 use the default for those.",
     "",
     "GOOD search strategy (do this):",
     '  Query: "How does authentication work and how are sessions managed?"',
@@ -9200,10 +9206,18 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     '  \u2192 search "allowlist middleware" (one search, probe handles IP/ip/Ip variations)',
     '  Query: "How does BM25 scoring work with SIMD optimization?"',
     '  \u2192 search "BM25 scoring" \u2192 search "SIMD optimization" (two different concepts)',
+    '  Query: "Find ForwardMessage and SessionLimiter functions"',
+    '  \u2192 search exact=true "ForwardMessage" \u2192 search exact=true "SessionLimiter" (known symbols, use exact)',
+    '  Query: "Find ThrottleRetryLimit usage"',
+    '  \u2192 search exact=true "ThrottleRetryLimit" (one search, if no results the symbol does not exist \u2014 stop)',
     "",
     "BAD search strategy (never do this):",
-    '  \u2192 search "AllowedIPs" \u2192 search "allowedIps" \u2192 search "allowed_ips" (WRONG: these are trivial case variations, probe handles them)',
-    '  \u2192 search "CIDR" \u2192 search "cidr" \u2192 search "Cidr" \u2192 search "*cidr*" (WRONG: same keyword repeated with variations)',
+    '  \u2192 search "AllowedIPs" \u2192 search "allowedIps" \u2192 search "allowed_ips" (WRONG: case/style variations, probe handles them)',
+    '  \u2192 search "limitDRL" \u2192 search "LimitDRL" (WRONG: case variation of same term)',
+    '  \u2192 search "throttle_retry_limit" after searching "ThrottleRetryLimit" (WRONG: snake_case variation, probe handles it)',
+    '  \u2192 search "ThrottleRetryLimit" path=tyk \u2192 search "ThrottleRetryLimit" path=gateway \u2192 search "ThrottleRetryLimit" path=apidef (WRONG: same query on different paths hoping for different results)',
+    '  \u2192 search "func (k *RateLimitAndQuotaCheck) handleRateLimitFailure" (WRONG: do not search full function signatures, just use exact=true "handleRateLimitFailure")',
+    '  \u2192 search "ForwardMessage" \u2192 search "ForwardMessage" \u2192 search "ForwardMessage" (WRONG: repeating the exact same query)',
     '  \u2192 search "error handling" \u2192 search "error handling" \u2192 search "error handling" (WRONG: repeating exact same query)',
     "",
     "Keyword tips:",
@@ -9212,12 +9226,13 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     '- To bypass stopword filtering: wrap terms in quotes ("return", "struct") or set exact=true. Both disable stemming and splitting too.',
     "- Multiple words without operators use OR logic: foo bar = foo OR bar. Use AND explicitly if you need both: foo AND bar.",
     '- camelCase terms are split: getUserData becomes "get", "user", "data" \u2014 so one search covers all naming styles.',
+    '- Do NOT search for full function signatures like "func (r *Type) Method(args)". Just search for the method name with exact=true.',
     "",
     "Strategy:",
     "1. Analyze the query - identify key concepts, entities, and relationships",
-    "2. Run ONE focused search per concept with the most natural keyword. Trust probe to handle variations.",
+    "2. Run ONE focused search per concept. For known symbol names use exact=true. For concepts use default (exact=false).",
     "3. If a search returns results, use extract to verify relevance",
-    "4. Only try a different keyword if the first one returned irrelevant results (not if it returned no results \u2014 that means the concept is absent)",
+    "4. If a search returns NO results, the term does not exist in the codebase. Do NOT retry with variations, different paths, or longer strings. Move on.",
     "5. Combine all relevant targets in your final response",
     "",
     `Query: ${searchQuery}`,
@@ -9538,6 +9553,36 @@ var init_vercel = __esm({
             } else if (targets) {
               const parsedTargets = parseTargets(targets);
               extractFiles = parsedTargets.map((target) => resolveTargetPath(target, effectiveCwd));
+              if (options.allowedFolders && options.allowedFolders.length > 0) {
+                extractFiles = extractFiles.map((target) => {
+                  const { filePart, suffix } = splitTargetSuffix(target);
+                  if (existsSync(filePart)) return target;
+                  const cwdPrefix = effectiveCwd.endsWith("/") ? effectiveCwd : effectiveCwd + "/";
+                  const relativePart = filePart.startsWith(cwdPrefix) ? filePart.slice(cwdPrefix.length) : null;
+                  if (relativePart) {
+                    for (const folder of options.allowedFolders) {
+                      const candidate = folder + "/" + relativePart;
+                      if (existsSync(candidate)) {
+                        if (debug) console.error(`[extract] Auto-fixed path: ${filePart} \u2192 ${candidate}`);
+                        return candidate + suffix;
+                      }
+                    }
+                  }
+                  for (const folder of options.allowedFolders) {
+                    const folderPrefix = folder.endsWith("/") ? folder : folder + "/";
+                    const wsParent = folderPrefix.replace(/[^/]+\/$/, "");
+                    if (filePart.startsWith(wsParent)) {
+                      const tail = filePart.slice(wsParent.length);
+                      const candidate = folderPrefix + tail;
+                      if (candidate !== filePart && existsSync(candidate)) {
+                        if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} \u2192 ${candidate}`);
+                        return candidate + suffix;
+                      }
+                    }
+                  }
+                  return target;
+                });
+              }
               let effectiveFormat = format;
               if (outline && format === "outline-xml") {
                 effectiveFormat = "xml";
@@ -84097,7 +84142,7 @@ ${searchToolDesc1}
 - searchFiles: Find files by name patterns`;
         if (this.enableBash) {
           systemPrompt += `
-- bash: Execute bash commands for system operations`;
+- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) \u2014 always use search and extract tools instead, they are faster and more accurate.`;
         }
         const searchGuidance1 = this.searchDelegate ? "1. Start with search \u2014 ask a question about what you want to understand. It returns extracted code blocks directly." : "1. Start with search to find relevant code patterns. One search per concept is usually enough \u2014 probe handles stemming and case variations.";
         const extractGuidance1 = this.searchDelegate ? "2. Use extract only if you need more context or a full file" : "2. Use extract to get detailed context when needed";
@@ -84152,7 +84197,7 @@ ${searchToolDesc2}
 - searchFiles: Find files by name patterns`;
         if (this.enableBash) {
           systemPrompt += `
-- bash: Execute bash commands for system operations`;
+- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) \u2014 always use search and extract tools instead, they are faster and more accurate.`;
         }
         const searchGuidance2 = this.searchDelegate ? "1. Start with search \u2014 ask a question about what you want to understand. It returns extracted code blocks directly." : "1. Start with search to find relevant code patterns. One search per concept is usually enough \u2014 probe handles stemming and case variations.";
         const extractGuidance2 = this.searchDelegate ? "2. Use extract only if you need more context or a full file" : "2. Use extract to get detailed context when needed";
@@ -84218,7 +84263,8 @@ Follow these instructions carefully:
 3. You should always prefer the search tool for code-related questions.${this.searchDelegate ? " Ask natural language questions \u2014 the search subagent handles keyword formulation and returns extracted code blocks. Use extract only to expand context or read full files." : " Search handles stemming and case variations automatically \u2014 do NOT try keyword variations manually. Read full files only if really necessary."}
 4. Ensure to get really deep and understand the full picture before answering.
 5. Once the task is fully completed, use the attempt_completion tool to provide the final result.
-6. ${this.searchDelegate ? "Ask clear, specific questions when searching. Each search should target a distinct concept or question." : "Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results."}${this.allowEdit ? `
+6. ${this.searchDelegate ? "Ask clear, specific questions when searching. Each search should target a distinct concept or question." : "Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results."}
+7. NEVER use bash for code exploration (no grep, cat, find, head, tail, awk, sed) \u2014 always use search and extract tools instead. Bash is only for system operations like building, running tests, or git commands.${this.allowEdit ? `
 7. When modifying files, choose the appropriate tool:
     - Use 'edit' for all code modifications:
       * PREFERRED: Use start_line (and optionally end_line) for line-targeted editing \u2014 this is the safest and most precise approach.${this.hashLines ? ' Use the line:hash references from extract/search output (e.g. "42:ab") for integrity verification.' : ""} Always use extract first to see line numbers${this.hashLines ? " and hashes" : ""}, then edit by line reference.
@@ -84232,7 +84278,14 @@ Follow these instructions carefully:
 </instructions>
 `;
         let systemMessage = "";
-        if (this.customPrompt) {
+        if (this.customPrompt && this.promptType && predefinedPrompts[this.promptType]) {
+          systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
+          systemMessage += commonInstructions;
+          systemMessage += "\n<custom-instructions>\n" + this.customPrompt + "\n</custom-instructions>";
+          if (this.debug) {
+            console.log(`[DEBUG] Using predefined prompt: ${this.promptType} + custom prompt`);
+          }
+        } else if (this.customPrompt) {
           systemMessage = "<role>" + this.customPrompt + "</role>";
           if (this.debug) {
             console.log(`[DEBUG] Using custom prompt`);

package/build/tools/common.js

@@ -154,7 +154,7 @@ export const searchDelegateDescription = 'Search code in the repository by askin
 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. Line numbers from output can be used with edit start_line/end_line for precise editing.';
 export const delegateDescription = 'Automatically delegate big distinct tasks to specialized probe subagents within the agentic loop. Used by AI agents to break down complex requests into focused, parallel tasks.';
-export const bashDescription = 'Execute bash commands for system exploration and development tasks. Secure by default with built-in allow/deny lists.';
+export const bashDescription = 'Execute bash commands for system operations: building, running tests, git, package management, etc. NEVER use for code exploration (no grep, cat, find, head, tail) — use search and extract tools instead. Secure by default with built-in allow/deny lists.';
 export const analyzeAllDescription = 'Answer questions that require analyzing ALL matching data in the codebase. Use for aggregate questions like "What features exist?", "List all API endpoints", "Count TODO comments". The AI automatically plans the search strategy, processes all results via map-reduce, and synthesizes a comprehensive answer. WARNING: Slower than search - only use when you need complete coverage.';
 
 

package/build/tools/vercel.js

@@ -144,13 +144,19 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'- listFiles: Understand directory structure to find where relevant code might live.',
 		'',
 		'CRITICAL - How probe search works (do NOT ignore):',
-		'- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting.',
+		'- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting automatically.',
 		'- Searching "allowed_ips" ALREADY matches "AllowedIPs", "allowedIps", "allowed_ips", etc. Do NOT manually try case/style variations.',
 		'- Searching "getUserData" ALREADY matches "get", "user", "data" and their variations.',
-		'- NEVER repeat the same search query — you will get the same results.',
+		'- NEVER repeat the same search query — you will get the same results. Changing the path does NOT change this.',
 		'- NEVER search trivial variations of the same keyword (e.g., AllowedIPs then allowedIps then allowed_ips). This is wasteful — probe handles it.',
-		'- If a search returns no results, the term likely does not exist in that path. Try a genuinely DIFFERENT keyword or concept, not a variation.',
-		'- If 2-3 consecutive searches return no results for a concept, STOP searching for it and move on.',
+		'- If a search returns no results, the term likely does not exist. Try a genuinely DIFFERENT keyword or concept, not a variation.',
+		'- If 2-3 searches return no results for a concept, STOP searching for it and move on. Do NOT keep retrying.',
+		'',
+		'When to use exact=true:',
+		'- Use exact=true when searching for a KNOWN symbol name (function, type, variable, struct).',
+		'- exact=true matches the literal string only — no stemming, no splitting.',
+		'- This is ideal for precise lookups: exact=true "ForwardMessage", exact=true "SessionLimiter", exact=true "ThrottleRetryLimit".',
+		'- Do NOT use exact=true for exploratory/conceptual queries — use the default for those.',
 		'',
 		'GOOD search strategy (do this):',
 		'  Query: "How does authentication work and how are sessions managed?"',
@@ -159,10 +165,18 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'  → search "allowlist middleware" (one search, probe handles IP/ip/Ip variations)',
 		'  Query: "How does BM25 scoring work with SIMD optimization?"',
 		'  → search "BM25 scoring" → search "SIMD optimization" (two different concepts)',
+		'  Query: "Find ForwardMessage and SessionLimiter functions"',
+		'  → search exact=true "ForwardMessage" → search exact=true "SessionLimiter" (known symbols, use exact)',
+		'  Query: "Find ThrottleRetryLimit usage"',
+		'  → search exact=true "ThrottleRetryLimit" (one search, if no results the symbol does not exist — stop)',
 		'',
 		'BAD search strategy (never do this):',
-		'  → search "AllowedIPs" → search "allowedIps" → search "allowed_ips" (WRONG: these are trivial case variations, probe handles them)',
-		'  → search "CIDR" → search "cidr" → search "Cidr" → search "*cidr*" (WRONG: same keyword repeated with variations)',
+		'  → search "AllowedIPs" → search "allowedIps" → search "allowed_ips" (WRONG: case/style variations, probe handles them)',
+		'  → search "limitDRL" → search "LimitDRL" (WRONG: case variation of same term)',
+		'  → search "throttle_retry_limit" after searching "ThrottleRetryLimit" (WRONG: snake_case variation, probe handles it)',
+		'  → search "ThrottleRetryLimit" path=tyk → search "ThrottleRetryLimit" path=gateway → search "ThrottleRetryLimit" path=apidef (WRONG: same query on different paths hoping for different results)',
+		'  → search "func (k *RateLimitAndQuotaCheck) handleRateLimitFailure" (WRONG: do not search full function signatures, just use exact=true "handleRateLimitFailure")',
+		'  → search "ForwardMessage" → search "ForwardMessage" → search "ForwardMessage" (WRONG: repeating the exact same query)',
 		'  → search "error handling" → search "error handling" → search "error handling" (WRONG: repeating exact same query)',
 		'',
 		'Keyword tips:',
@@ -171,12 +185,13 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'- To bypass stopword filtering: wrap terms in quotes ("return", "struct") or set exact=true. Both disable stemming and splitting too.',
 		'- Multiple words without operators use OR logic: foo bar = foo OR bar. Use AND explicitly if you need both: foo AND bar.',
 		'- camelCase terms are split: getUserData becomes "get", "user", "data" — so one search covers all naming styles.',
+		'- Do NOT search for full function signatures like "func (r *Type) Method(args)". Just search for the method name with exact=true.',
 		'',
 		'Strategy:',
 		'1. Analyze the query - identify key concepts, entities, and relationships',
-		'2. Run ONE focused search per concept with the most natural keyword. Trust probe to handle variations.',
+		'2. Run ONE focused search per concept. For known symbol names use exact=true. For concepts use default (exact=false).',
 		'3. If a search returns results, use extract to verify relevance',
-		'4. Only try a different keyword if the first one returned irrelevant results (not if it returned no results — that means the concept is absent)',
+		'4. If a search returns NO results, the term does not exist in the codebase. Do NOT retry with variations, different paths, or longer strings. Move on.',
 		'5. Combine all relevant targets in your final response',
 		'',
 		`Query: ${searchQuery}`,
@@ -570,6 +585,50 @@ export const extractTool = (options = {}) => {
 					// Resolve relative paths in targets against cwd
 					extractFiles = parsedTargets.map(target => resolveTargetPath(target, effectiveCwd));
 
+					// Auto-fix: if resolved paths don't exist, try allowedFolders subdirs
+					// Handles when search returns relative paths (e.g., "gateway/file.go") and
+					// model constructs wrong absolute paths (e.g., /workspace/gateway/file.go
+					// instead of /workspace/tyk/gateway/file.go)
+					if (options.allowedFolders && options.allowedFolders.length > 0) {
+						extractFiles = extractFiles.map(target => {
+							const { filePart, suffix } = splitTargetSuffix(target);
+							if (existsSync(filePart)) return target;
+
+							// Try resolving the relative tail against each allowedFolder
+							const cwdPrefix = (effectiveCwd.endsWith('/') ? effectiveCwd : effectiveCwd + '/');
+							const relativePart = filePart.startsWith(cwdPrefix)
+								? filePart.slice(cwdPrefix.length)
+								: null;
+
+							if (relativePart) {
+								for (const folder of options.allowedFolders) {
+									const candidate = folder + '/' + relativePart;
+									if (existsSync(candidate)) {
+										if (debug) console.error(`[extract] Auto-fixed path: ${filePart} → ${candidate}`);
+										return candidate + suffix;
+									}
+								}
+							}
+
+							// Try stripping workspace prefix and resolving against allowedFolders
+							// e.g., /tmp/visor-workspaces/abc/gateway/file.go → try each folder + gateway/file.go
+							for (const folder of options.allowedFolders) {
+								const folderPrefix = folder.endsWith('/') ? folder : folder + '/';
+								const wsParent = folderPrefix.replace(/[^/]+\/$/, '');
+								if (filePart.startsWith(wsParent)) {
+									const tail = filePart.slice(wsParent.length);
+									const candidate = folderPrefix + tail;
+									if (candidate !== filePart && existsSync(candidate)) {
+										if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} → ${candidate}`);
+										return candidate + suffix;
+									}
+								}
+							}
+
+							return target;
+						});
+					}
+
 					// Apply format mapping for outline-xml to xml
 					let effectiveFormat = format;
 					if (outline && format === 'outline-xml') {

package/cjs/agent/ProbeAgent.cjs

@@ -4205,7 +4205,7 @@ var init_NormalizedSchema = __esm({
         if (this.isDocumentSchema()) {
           return member([15, 0], memberName);
         }
-        throw new Error(`@smithy/core/schema - ${this.getName(true)} has no no member=${memberName}.`);
+        throw new Error(`@smithy/core/schema - ${this.getName(true)} has no member=${memberName}.`);
       }
       getMemberSchemas() {
         const buffer = {};
@@ -5996,7 +5996,7 @@ var init_EventStreamSerde = __esm({
             throw new Error("@smithy/core/event-streams - non-struct member not supported in event stream union.");
           }
         }
-        const messageSerialization = serializer.flush();
+        const messageSerialization = serializer.flush() ?? new Uint8Array();
         const body = typeof messageSerialization === "string" ? (this.serdeContext?.utf8Decoder ?? import_util_utf8.fromUtf8)(messageSerialization) : messageSerialization;
         return {
           body,
@@ -36563,13 +36563,19 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     "- listFiles: Understand directory structure to find where relevant code might live.",
     "",
     "CRITICAL - How probe search works (do NOT ignore):",
-    "- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting.",
+    "- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting automatically.",
     '- Searching "allowed_ips" ALREADY matches "AllowedIPs", "allowedIps", "allowed_ips", etc. Do NOT manually try case/style variations.',
     '- Searching "getUserData" ALREADY matches "get", "user", "data" and their variations.',
-    "- NEVER repeat the same search query \u2014 you will get the same results.",
+    "- NEVER repeat the same search query \u2014 you will get the same results. Changing the path does NOT change this.",
     "- NEVER search trivial variations of the same keyword (e.g., AllowedIPs then allowedIps then allowed_ips). This is wasteful \u2014 probe handles it.",
-    "- If a search returns no results, the term likely does not exist in that path. Try a genuinely DIFFERENT keyword or concept, not a variation.",
-    "- If 2-3 consecutive searches return no results for a concept, STOP searching for it and move on.",
+    "- If a search returns no results, the term likely does not exist. Try a genuinely DIFFERENT keyword or concept, not a variation.",
+    "- If 2-3 searches return no results for a concept, STOP searching for it and move on. Do NOT keep retrying.",
+    "",
+    "When to use exact=true:",
+    "- Use exact=true when searching for a KNOWN symbol name (function, type, variable, struct).",
+    "- exact=true matches the literal string only \u2014 no stemming, no splitting.",
+    '- This is ideal for precise lookups: exact=true "ForwardMessage", exact=true "SessionLimiter", exact=true "ThrottleRetryLimit".',
+    "- Do NOT use exact=true for exploratory/conceptual queries \u2014 use the default for those.",
     "",
     "GOOD search strategy (do this):",
     '  Query: "How does authentication work and how are sessions managed?"',
@@ -36578,10 +36584,18 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     '  \u2192 search "allowlist middleware" (one search, probe handles IP/ip/Ip variations)',
     '  Query: "How does BM25 scoring work with SIMD optimization?"',
     '  \u2192 search "BM25 scoring" \u2192 search "SIMD optimization" (two different concepts)',
+    '  Query: "Find ForwardMessage and SessionLimiter functions"',
+    '  \u2192 search exact=true "ForwardMessage" \u2192 search exact=true "SessionLimiter" (known symbols, use exact)',
+    '  Query: "Find ThrottleRetryLimit usage"',
+    '  \u2192 search exact=true "ThrottleRetryLimit" (one search, if no results the symbol does not exist \u2014 stop)',
     "",
     "BAD search strategy (never do this):",
-    '  \u2192 search "AllowedIPs" \u2192 search "allowedIps" \u2192 search "allowed_ips" (WRONG: these are trivial case variations, probe handles them)',
-    '  \u2192 search "CIDR" \u2192 search "cidr" \u2192 search "Cidr" \u2192 search "*cidr*" (WRONG: same keyword repeated with variations)',
+    '  \u2192 search "AllowedIPs" \u2192 search "allowedIps" \u2192 search "allowed_ips" (WRONG: case/style variations, probe handles them)',
+    '  \u2192 search "limitDRL" \u2192 search "LimitDRL" (WRONG: case variation of same term)',
+    '  \u2192 search "throttle_retry_limit" after searching "ThrottleRetryLimit" (WRONG: snake_case variation, probe handles it)',
+    '  \u2192 search "ThrottleRetryLimit" path=tyk \u2192 search "ThrottleRetryLimit" path=gateway \u2192 search "ThrottleRetryLimit" path=apidef (WRONG: same query on different paths hoping for different results)',
+    '  \u2192 search "func (k *RateLimitAndQuotaCheck) handleRateLimitFailure" (WRONG: do not search full function signatures, just use exact=true "handleRateLimitFailure")',
+    '  \u2192 search "ForwardMessage" \u2192 search "ForwardMessage" \u2192 search "ForwardMessage" (WRONG: repeating the exact same query)',
     '  \u2192 search "error handling" \u2192 search "error handling" \u2192 search "error handling" (WRONG: repeating exact same query)',
     "",
     "Keyword tips:",
@@ -36590,12 +36604,13 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     '- To bypass stopword filtering: wrap terms in quotes ("return", "struct") or set exact=true. Both disable stemming and splitting too.',
     "- Multiple words without operators use OR logic: foo bar = foo OR bar. Use AND explicitly if you need both: foo AND bar.",
     '- camelCase terms are split: getUserData becomes "get", "user", "data" \u2014 so one search covers all naming styles.',
+    '- Do NOT search for full function signatures like "func (r *Type) Method(args)". Just search for the method name with exact=true.',
     "",
     "Strategy:",
     "1. Analyze the query - identify key concepts, entities, and relationships",
-    "2. Run ONE focused search per concept with the most natural keyword. Trust probe to handle variations.",
+    "2. Run ONE focused search per concept. For known symbol names use exact=true. For concepts use default (exact=false).",
     "3. If a search returns results, use extract to verify relevance",
-    "4. Only try a different keyword if the first one returned irrelevant results (not if it returned no results \u2014 that means the concept is absent)",
+    "4. If a search returns NO results, the term does not exist in the codebase. Do NOT retry with variations, different paths, or longer strings. Move on.",
     "5. Combine all relevant targets in your final response",
     "",
     `Query: ${searchQuery}`,
@@ -36918,6 +36933,36 @@ var init_vercel = __esm({
             } else if (targets) {
               const parsedTargets = parseTargets(targets);
               extractFiles = parsedTargets.map((target) => resolveTargetPath(target, effectiveCwd));
+              if (options.allowedFolders && options.allowedFolders.length > 0) {
+                extractFiles = extractFiles.map((target) => {
+                  const { filePart, suffix } = splitTargetSuffix(target);
+                  if ((0, import_fs4.existsSync)(filePart)) return target;
+                  const cwdPrefix = effectiveCwd.endsWith("/") ? effectiveCwd : effectiveCwd + "/";
+                  const relativePart = filePart.startsWith(cwdPrefix) ? filePart.slice(cwdPrefix.length) : null;
+                  if (relativePart) {
+                    for (const folder of options.allowedFolders) {
+                      const candidate = folder + "/" + relativePart;
+                      if ((0, import_fs4.existsSync)(candidate)) {
+                        if (debug) console.error(`[extract] Auto-fixed path: ${filePart} \u2192 ${candidate}`);
+                        return candidate + suffix;
+                      }
+                    }
+                  }
+                  for (const folder of options.allowedFolders) {
+                    const folderPrefix = folder.endsWith("/") ? folder : folder + "/";
+                    const wsParent = folderPrefix.replace(/[^/]+\/$/, "");
+                    if (filePart.startsWith(wsParent)) {
+                      const tail = filePart.slice(wsParent.length);
+                      const candidate = folderPrefix + tail;
+                      if (candidate !== filePart && (0, import_fs4.existsSync)(candidate)) {
+                        if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} \u2192 ${candidate}`);
+                        return candidate + suffix;
+                      }
+                    }
+                  }
+                  return target;
+                });
+              }
               let effectiveFormat = format2;
               if (outline && format2 === "outline-xml") {
                 effectiveFormat = "xml";
@@ -111043,7 +111088,7 @@ ${searchToolDesc1}
 - searchFiles: Find files by name patterns`;
         if (this.enableBash) {
           systemPrompt += `
-- bash: Execute bash commands for system operations`;
+- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) \u2014 always use search and extract tools instead, they are faster and more accurate.`;
         }
         const searchGuidance1 = this.searchDelegate ? "1. Start with search \u2014 ask a question about what you want to understand. It returns extracted code blocks directly." : "1. Start with search to find relevant code patterns. One search per concept is usually enough \u2014 probe handles stemming and case variations.";
         const extractGuidance1 = this.searchDelegate ? "2. Use extract only if you need more context or a full file" : "2. Use extract to get detailed context when needed";
@@ -111098,7 +111143,7 @@ ${searchToolDesc2}
 - searchFiles: Find files by name patterns`;
         if (this.enableBash) {
           systemPrompt += `
-- bash: Execute bash commands for system operations`;
+- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) \u2014 always use search and extract tools instead, they are faster and more accurate.`;
         }
         const searchGuidance2 = this.searchDelegate ? "1. Start with search \u2014 ask a question about what you want to understand. It returns extracted code blocks directly." : "1. Start with search to find relevant code patterns. One search per concept is usually enough \u2014 probe handles stemming and case variations.";
         const extractGuidance2 = this.searchDelegate ? "2. Use extract only if you need more context or a full file" : "2. Use extract to get detailed context when needed";
@@ -111164,7 +111209,8 @@ Follow these instructions carefully:
 3. You should always prefer the search tool for code-related questions.${this.searchDelegate ? " Ask natural language questions \u2014 the search subagent handles keyword formulation and returns extracted code blocks. Use extract only to expand context or read full files." : " Search handles stemming and case variations automatically \u2014 do NOT try keyword variations manually. Read full files only if really necessary."}
 4. Ensure to get really deep and understand the full picture before answering.
 5. Once the task is fully completed, use the attempt_completion tool to provide the final result.
-6. ${this.searchDelegate ? "Ask clear, specific questions when searching. Each search should target a distinct concept or question." : "Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results."}${this.allowEdit ? `
+6. ${this.searchDelegate ? "Ask clear, specific questions when searching. Each search should target a distinct concept or question." : "Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results."}
+7. NEVER use bash for code exploration (no grep, cat, find, head, tail, awk, sed) \u2014 always use search and extract tools instead. Bash is only for system operations like building, running tests, or git commands.${this.allowEdit ? `
 7. When modifying files, choose the appropriate tool:
     - Use 'edit' for all code modifications:
       * PREFERRED: Use start_line (and optionally end_line) for line-targeted editing \u2014 this is the safest and most precise approach.${this.hashLines ? ' Use the line:hash references from extract/search output (e.g. "42:ab") for integrity verification.' : ""} Always use extract first to see line numbers${this.hashLines ? " and hashes" : ""}, then edit by line reference.
@@ -111178,7 +111224,14 @@ Follow these instructions carefully:
 </instructions>
 `;
         let systemMessage = "";
-        if (this.customPrompt) {
+        if (this.customPrompt && this.promptType && predefinedPrompts[this.promptType]) {
+          systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
+          systemMessage += commonInstructions;
+          systemMessage += "\n<custom-instructions>\n" + this.customPrompt + "\n</custom-instructions>";
+          if (this.debug) {
+            console.log(`[DEBUG] Using predefined prompt: ${this.promptType} + custom prompt`);
+          }
+        } else if (this.customPrompt) {
           systemMessage = "<role>" + this.customPrompt + "</role>";
           if (this.debug) {
             console.log(`[DEBUG] Using custom prompt`);

package/cjs/index.cjs

@@ -6063,7 +6063,7 @@ var init_NormalizedSchema = __esm({
         if (this.isDocumentSchema()) {
           return member([15, 0], memberName);
         }
-        throw new Error(`@smithy/core/schema - ${this.getName(true)} has no no member=${memberName}.`);
+        throw new Error(`@smithy/core/schema - ${this.getName(true)} has no member=${memberName}.`);
       }
       getMemberSchemas() {
         const buffer = {};
@@ -7854,7 +7854,7 @@ var init_EventStreamSerde = __esm({
             throw new Error("@smithy/core/event-streams - non-struct member not supported in event stream union.");
           }
         }
-        const messageSerialization = serializer.flush();
+        const messageSerialization = serializer.flush() ?? new Uint8Array();
         const body = typeof messageSerialization === "string" ? (this.serdeContext?.utf8Decoder ?? import_util_utf8.fromUtf8)(messageSerialization) : messageSerialization;
         return {
           body,
@@ -36422,7 +36422,7 @@ var init_common2 = __esm({
     queryDescription = "Search code using ast-grep structural pattern matching. Use this tool to find specific code structures like functions, classes, or methods.";
     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. Line numbers from output can be used with edit start_line/end_line for precise editing.";
     delegateDescription = "Automatically delegate big distinct tasks to specialized probe subagents within the agentic loop. Used by AI agents to break down complex requests into focused, parallel tasks.";
-    bashDescription = "Execute bash commands for system exploration and development tasks. Secure by default with built-in allow/deny lists.";
+    bashDescription = "Execute bash commands for system operations: building, running tests, git, package management, etc. NEVER use for code exploration (no grep, cat, find, head, tail) \u2014 use search and extract tools instead. Secure by default with built-in allow/deny lists.";
     analyzeAllDescription = 'Answer questions that require analyzing ALL matching data in the codebase. Use for aggregate questions like "What features exist?", "List all API endpoints", "Count TODO comments". The AI automatically plans the search strategy, processes all results via map-reduce, and synthesizes a comprehensive answer. WARNING: Slower than search - only use when you need complete coverage.';
   }
 });
@@ -108200,7 +108200,7 @@ ${searchToolDesc1}
 - searchFiles: Find files by name patterns`;
         if (this.enableBash) {
           systemPrompt += `
-- bash: Execute bash commands for system operations`;
+- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) \u2014 always use search and extract tools instead, they are faster and more accurate.`;
         }
         const searchGuidance1 = this.searchDelegate ? "1. Start with search \u2014 ask a question about what you want to understand. It returns extracted code blocks directly." : "1. Start with search to find relevant code patterns. One search per concept is usually enough \u2014 probe handles stemming and case variations.";
         const extractGuidance1 = this.searchDelegate ? "2. Use extract only if you need more context or a full file" : "2. Use extract to get detailed context when needed";
@@ -108255,7 +108255,7 @@ ${searchToolDesc2}
 - searchFiles: Find files by name patterns`;
         if (this.enableBash) {
           systemPrompt += `
-- bash: Execute bash commands for system operations`;
+- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) \u2014 always use search and extract tools instead, they are faster and more accurate.`;
         }
         const searchGuidance2 = this.searchDelegate ? "1. Start with search \u2014 ask a question about what you want to understand. It returns extracted code blocks directly." : "1. Start with search to find relevant code patterns. One search per concept is usually enough \u2014 probe handles stemming and case variations.";
         const extractGuidance2 = this.searchDelegate ? "2. Use extract only if you need more context or a full file" : "2. Use extract to get detailed context when needed";
@@ -108321,7 +108321,8 @@ Follow these instructions carefully:
 3. You should always prefer the search tool for code-related questions.${this.searchDelegate ? " Ask natural language questions \u2014 the search subagent handles keyword formulation and returns extracted code blocks. Use extract only to expand context or read full files." : " Search handles stemming and case variations automatically \u2014 do NOT try keyword variations manually. Read full files only if really necessary."}
 4. Ensure to get really deep and understand the full picture before answering.
 5. Once the task is fully completed, use the attempt_completion tool to provide the final result.
-6. ${this.searchDelegate ? "Ask clear, specific questions when searching. Each search should target a distinct concept or question." : "Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results."}${this.allowEdit ? `
+6. ${this.searchDelegate ? "Ask clear, specific questions when searching. Each search should target a distinct concept or question." : "Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results."}
+7. NEVER use bash for code exploration (no grep, cat, find, head, tail, awk, sed) \u2014 always use search and extract tools instead. Bash is only for system operations like building, running tests, or git commands.${this.allowEdit ? `
 7. When modifying files, choose the appropriate tool:
     - Use 'edit' for all code modifications:
       * PREFERRED: Use start_line (and optionally end_line) for line-targeted editing \u2014 this is the safest and most precise approach.${this.hashLines ? ' Use the line:hash references from extract/search output (e.g. "42:ab") for integrity verification.' : ""} Always use extract first to see line numbers${this.hashLines ? " and hashes" : ""}, then edit by line reference.
@@ -108335,7 +108336,14 @@ Follow these instructions carefully:
 </instructions>
 `;
         let systemMessage = "";
-        if (this.customPrompt) {
+        if (this.customPrompt && this.promptType && predefinedPrompts[this.promptType]) {
+          systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
+          systemMessage += commonInstructions;
+          systemMessage += "\n<custom-instructions>\n" + this.customPrompt + "\n</custom-instructions>";
+          if (this.debug) {
+            console.log(`[DEBUG] Using predefined prompt: ${this.promptType} + custom prompt`);
+          }
+        } else if (this.customPrompt) {
           systemMessage = "<role>" + this.customPrompt + "</role>";
           if (this.debug) {
             console.log(`[DEBUG] Using custom prompt`);
@@ -110717,13 +110725,19 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     "- listFiles: Understand directory structure to find where relevant code might live.",
     "",
     "CRITICAL - How probe search works (do NOT ignore):",
-    "- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting.",
+    "- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting automatically.",
     '- Searching "allowed_ips" ALREADY matches "AllowedIPs", "allowedIps", "allowed_ips", etc. Do NOT manually try case/style variations.',
     '- Searching "getUserData" ALREADY matches "get", "user", "data" and their variations.',
-    "- NEVER repeat the same search query \u2014 you will get the same results.",
+    "- NEVER repeat the same search query \u2014 you will get the same results. Changing the path does NOT change this.",
     "- NEVER search trivial variations of the same keyword (e.g., AllowedIPs then allowedIps then allowed_ips). This is wasteful \u2014 probe handles it.",
-    "- If a search returns no results, the term likely does not exist in that path. Try a genuinely DIFFERENT keyword or concept, not a variation.",
-    "- If 2-3 consecutive searches return no results for a concept, STOP searching for it and move on.",
+    "- If a search returns no results, the term likely does not exist. Try a genuinely DIFFERENT keyword or concept, not a variation.",
+    "- If 2-3 searches return no results for a concept, STOP searching for it and move on. Do NOT keep retrying.",
+    "",
+    "When to use exact=true:",
+    "- Use exact=true when searching for a KNOWN symbol name (function, type, variable, struct).",
+    "- exact=true matches the literal string only \u2014 no stemming, no splitting.",
+    '- This is ideal for precise lookups: exact=true "ForwardMessage", exact=true "SessionLimiter", exact=true "ThrottleRetryLimit".',
+    "- Do NOT use exact=true for exploratory/conceptual queries \u2014 use the default for those.",
     "",
     "GOOD search strategy (do this):",
     '  Query: "How does authentication work and how are sessions managed?"',
@@ -110732,10 +110746,18 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     '  \u2192 search "allowlist middleware" (one search, probe handles IP/ip/Ip variations)',
     '  Query: "How does BM25 scoring work with SIMD optimization?"',
     '  \u2192 search "BM25 scoring" \u2192 search "SIMD optimization" (two different concepts)',
+    '  Query: "Find ForwardMessage and SessionLimiter functions"',
+    '  \u2192 search exact=true "ForwardMessage" \u2192 search exact=true "SessionLimiter" (known symbols, use exact)',
+    '  Query: "Find ThrottleRetryLimit usage"',
+    '  \u2192 search exact=true "ThrottleRetryLimit" (one search, if no results the symbol does not exist \u2014 stop)',
     "",
     "BAD search strategy (never do this):",
-    '  \u2192 search "AllowedIPs" \u2192 search "allowedIps" \u2192 search "allowed_ips" (WRONG: these are trivial case variations, probe handles them)',
-    '  \u2192 search "CIDR" \u2192 search "cidr" \u2192 search "Cidr" \u2192 search "*cidr*" (WRONG: same keyword repeated with variations)',
+    '  \u2192 search "AllowedIPs" \u2192 search "allowedIps" \u2192 search "allowed_ips" (WRONG: case/style variations, probe handles them)',
+    '  \u2192 search "limitDRL" \u2192 search "LimitDRL" (WRONG: case variation of same term)',
+    '  \u2192 search "throttle_retry_limit" after searching "ThrottleRetryLimit" (WRONG: snake_case variation, probe handles it)',
+    '  \u2192 search "ThrottleRetryLimit" path=tyk \u2192 search "ThrottleRetryLimit" path=gateway \u2192 search "ThrottleRetryLimit" path=apidef (WRONG: same query on different paths hoping for different results)',
+    '  \u2192 search "func (k *RateLimitAndQuotaCheck) handleRateLimitFailure" (WRONG: do not search full function signatures, just use exact=true "handleRateLimitFailure")',
+    '  \u2192 search "ForwardMessage" \u2192 search "ForwardMessage" \u2192 search "ForwardMessage" (WRONG: repeating the exact same query)',
     '  \u2192 search "error handling" \u2192 search "error handling" \u2192 search "error handling" (WRONG: repeating exact same query)',
     "",
     "Keyword tips:",
@@ -110744,12 +110766,13 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     '- To bypass stopword filtering: wrap terms in quotes ("return", "struct") or set exact=true. Both disable stemming and splitting too.',
     "- Multiple words without operators use OR logic: foo bar = foo OR bar. Use AND explicitly if you need both: foo AND bar.",
     '- camelCase terms are split: getUserData becomes "get", "user", "data" \u2014 so one search covers all naming styles.',
+    '- Do NOT search for full function signatures like "func (r *Type) Method(args)". Just search for the method name with exact=true.',
     "",
     "Strategy:",
     "1. Analyze the query - identify key concepts, entities, and relationships",
-    "2. Run ONE focused search per concept with the most natural keyword. Trust probe to handle variations.",
+    "2. Run ONE focused search per concept. For known symbol names use exact=true. For concepts use default (exact=false).",
     "3. If a search returns results, use extract to verify relevance",
-    "4. Only try a different keyword if the first one returned irrelevant results (not if it returned no results \u2014 that means the concept is absent)",
+    "4. If a search returns NO results, the term does not exist in the codebase. Do NOT retry with variations, different paths, or longer strings. Move on.",
     "5. Combine all relevant targets in your final response",
     "",
     `Query: ${searchQuery}`,
@@ -111072,6 +111095,36 @@ var init_vercel = __esm({
             } else if (targets) {
               const parsedTargets = parseTargets(targets);
               extractFiles = parsedTargets.map((target) => resolveTargetPath(target, effectiveCwd));
+              if (options.allowedFolders && options.allowedFolders.length > 0) {
+                extractFiles = extractFiles.map((target) => {
+                  const { filePart, suffix } = splitTargetSuffix(target);
+                  if ((0, import_fs11.existsSync)(filePart)) return target;
+                  const cwdPrefix = effectiveCwd.endsWith("/") ? effectiveCwd : effectiveCwd + "/";
+                  const relativePart = filePart.startsWith(cwdPrefix) ? filePart.slice(cwdPrefix.length) : null;
+                  if (relativePart) {
+                    for (const folder of options.allowedFolders) {
+                      const candidate = folder + "/" + relativePart;
+                      if ((0, import_fs11.existsSync)(candidate)) {
+                        if (debug) console.error(`[extract] Auto-fixed path: ${filePart} \u2192 ${candidate}`);
+                        return candidate + suffix;
+                      }
+                    }
+                  }
+                  for (const folder of options.allowedFolders) {
+                    const folderPrefix = folder.endsWith("/") ? folder : folder + "/";
+                    const wsParent = folderPrefix.replace(/[^/]+\/$/, "");
+                    if (filePart.startsWith(wsParent)) {
+                      const tail = filePart.slice(wsParent.length);
+                      const candidate = folderPrefix + tail;
+                      if (candidate !== filePart && (0, import_fs11.existsSync)(candidate)) {
+                        if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} \u2192 ${candidate}`);
+                        return candidate + suffix;
+                      }
+                    }
+                  }
+                  return target;
+                });
+              }
               let effectiveFormat = format2;
               if (outline && format2 === "outline-xml") {
                 effectiveFormat = "xml";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc280",
+  "version": "0.6.0-rc282",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -75,7 +75,7 @@
   "dependencies": {
     "@ai-sdk/amazon-bedrock": "^1.0.8",
     "@ai-sdk/anthropic": "^2.0.8",
-    "@ai-sdk/google": "^2.0.14",
+    "@ai-sdk/google": "^3.0.37",
     "@ai-sdk/openai": "^2.0.10",
     "@anthropic-ai/claude-agent-sdk": "^0.1.46",
     "@modelcontextprotocol/sdk": "^1.0.0",

package/src/agent/ProbeAgent.js

@@ -2876,7 +2876,7 @@ ${searchToolDesc1}
 - searchFiles: Find files by name patterns`;
 
     if (this.enableBash) {
-      systemPrompt += `\n- bash: Execute bash commands for system operations`;
+      systemPrompt += `\n- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) — always use search and extract tools instead, they are faster and more accurate.`;
     }
 
     const searchGuidance1 = this.searchDelegate
@@ -2942,7 +2942,7 @@ ${searchToolDesc2}
 - searchFiles: Find files by name patterns`;
 
     if (this.enableBash) {
-      systemPrompt += `\n- bash: Execute bash commands for system operations`;
+      systemPrompt += `\n- bash: Execute bash commands for system operations (building, running tests, git, etc.). NEVER use bash for code exploration (no grep, cat, find, head, tail) — always use search and extract tools instead, they are faster and more accurate.`;
     }
 
     const searchGuidance2 = this.searchDelegate
@@ -3018,7 +3018,8 @@ Follow these instructions carefully:
 3. You should always prefer the search tool for code-related questions.${this.searchDelegate ? ' Ask natural language questions — the search subagent handles keyword formulation and returns extracted code blocks. Use extract only to expand context or read full files.' : ' Search handles stemming and case variations automatically — do NOT try keyword variations manually. Read full files only if really necessary.'}
 4. Ensure to get really deep and understand the full picture before answering.
 5. Once the task is fully completed, use the attempt_completion tool to provide the final result.
-6. ${this.searchDelegate ? 'Ask clear, specific questions when searching. Each search should target a distinct concept or question.' : 'Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results.'}${this.allowEdit ? `
+6. ${this.searchDelegate ? 'Ask clear, specific questions when searching. Each search should target a distinct concept or question.' : 'Prefer concise and focused search queries. Use specific keywords and phrases to narrow down results.'}
+7. NEVER use bash for code exploration (no grep, cat, find, head, tail, awk, sed) — always use search and extract tools instead. Bash is only for system operations like building, running tests, or git commands.${this.allowEdit ? `
 7. When modifying files, choose the appropriate tool:
     - Use 'edit' for all code modifications:
       * PREFERRED: Use start_line (and optionally end_line) for line-targeted editing — this is the safest and most precise approach.${this.hashLines ? ' Use the line:hash references from extract/search output (e.g. "42:ab") for integrity verification.' : ''} Always use extract first to see line numbers${this.hashLines ? ' and hashes' : ''}, then edit by line reference.
@@ -3035,22 +3036,30 @@ Follow these instructions carefully:
     // Use predefined prompts from shared module (imported at top of file)
     let systemMessage = '';
 
-    // Use custom prompt if provided
-    if (this.customPrompt) {
+    // Build system message from predefined prompt + optional custom prompt
+    if (this.customPrompt && this.promptType && predefinedPrompts[this.promptType]) {
+      // Both: use predefined as base, append custom wrapped in tag
+      systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
+      systemMessage += commonInstructions;
+      systemMessage += "\n<custom-instructions>\n" + this.customPrompt + "\n</custom-instructions>";
+      if (this.debug) {
+        console.log(`[DEBUG] Using predefined prompt: ${this.promptType} + custom prompt`);
+      }
+    } else if (this.customPrompt) {
+      // Only custom prompt
       systemMessage = "<role>" + this.customPrompt + "</role>";
       if (this.debug) {
         console.log(`[DEBUG] Using custom prompt`);
       }
-    }
-    // Use predefined prompt if specified
-    else if (this.promptType && predefinedPrompts[this.promptType]) {
+    } else if (this.promptType && predefinedPrompts[this.promptType]) {
+      // Only predefined prompt
       systemMessage = "<role>" + predefinedPrompts[this.promptType] + "</role>";
       if (this.debug) {
         console.log(`[DEBUG] Using predefined prompt: ${this.promptType}`);
       }
       systemMessage += commonInstructions;
     } else {
-      // Use the default prompt (code explorer) if no prompt type is specified
+      // Default: code explorer
       systemMessage = "<role>" + predefinedPrompts['code-explorer'] + "</role>";
       if (this.debug) {
         console.log(`[DEBUG] Using default prompt: code explorer`);

package/src/tools/common.js

@@ -154,7 +154,7 @@ export const searchDelegateDescription = 'Search code in the repository by askin
 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. Line numbers from output can be used with edit start_line/end_line for precise editing.';
 export const delegateDescription = 'Automatically delegate big distinct tasks to specialized probe subagents within the agentic loop. Used by AI agents to break down complex requests into focused, parallel tasks.';
-export const bashDescription = 'Execute bash commands for system exploration and development tasks. Secure by default with built-in allow/deny lists.';
+export const bashDescription = 'Execute bash commands for system operations: building, running tests, git, package management, etc. NEVER use for code exploration (no grep, cat, find, head, tail) — use search and extract tools instead. Secure by default with built-in allow/deny lists.';
 export const analyzeAllDescription = 'Answer questions that require analyzing ALL matching data in the codebase. Use for aggregate questions like "What features exist?", "List all API endpoints", "Count TODO comments". The AI automatically plans the search strategy, processes all results via map-reduce, and synthesizes a comprehensive answer. WARNING: Slower than search - only use when you need complete coverage.';
 
 

package/src/tools/vercel.js

@@ -144,13 +144,19 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'- listFiles: Understand directory structure to find where relevant code might live.',
 		'',
 		'CRITICAL - How probe search works (do NOT ignore):',
-		'- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting.',
+		'- By default (exact=false), probe ALREADY handles stemming, case-insensitive matching, and camelCase/snake_case splitting automatically.',
 		'- Searching "allowed_ips" ALREADY matches "AllowedIPs", "allowedIps", "allowed_ips", etc. Do NOT manually try case/style variations.',
 		'- Searching "getUserData" ALREADY matches "get", "user", "data" and their variations.',
-		'- NEVER repeat the same search query — you will get the same results.',
+		'- NEVER repeat the same search query — you will get the same results. Changing the path does NOT change this.',
 		'- NEVER search trivial variations of the same keyword (e.g., AllowedIPs then allowedIps then allowed_ips). This is wasteful — probe handles it.',
-		'- If a search returns no results, the term likely does not exist in that path. Try a genuinely DIFFERENT keyword or concept, not a variation.',
-		'- If 2-3 consecutive searches return no results for a concept, STOP searching for it and move on.',
+		'- If a search returns no results, the term likely does not exist. Try a genuinely DIFFERENT keyword or concept, not a variation.',
+		'- If 2-3 searches return no results for a concept, STOP searching for it and move on. Do NOT keep retrying.',
+		'',
+		'When to use exact=true:',
+		'- Use exact=true when searching for a KNOWN symbol name (function, type, variable, struct).',
+		'- exact=true matches the literal string only — no stemming, no splitting.',
+		'- This is ideal for precise lookups: exact=true "ForwardMessage", exact=true "SessionLimiter", exact=true "ThrottleRetryLimit".',
+		'- Do NOT use exact=true for exploratory/conceptual queries — use the default for those.',
 		'',
 		'GOOD search strategy (do this):',
 		'  Query: "How does authentication work and how are sessions managed?"',
@@ -159,10 +165,18 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'  → search "allowlist middleware" (one search, probe handles IP/ip/Ip variations)',
 		'  Query: "How does BM25 scoring work with SIMD optimization?"',
 		'  → search "BM25 scoring" → search "SIMD optimization" (two different concepts)',
+		'  Query: "Find ForwardMessage and SessionLimiter functions"',
+		'  → search exact=true "ForwardMessage" → search exact=true "SessionLimiter" (known symbols, use exact)',
+		'  Query: "Find ThrottleRetryLimit usage"',
+		'  → search exact=true "ThrottleRetryLimit" (one search, if no results the symbol does not exist — stop)',
 		'',
 		'BAD search strategy (never do this):',
-		'  → search "AllowedIPs" → search "allowedIps" → search "allowed_ips" (WRONG: these are trivial case variations, probe handles them)',
-		'  → search "CIDR" → search "cidr" → search "Cidr" → search "*cidr*" (WRONG: same keyword repeated with variations)',
+		'  → search "AllowedIPs" → search "allowedIps" → search "allowed_ips" (WRONG: case/style variations, probe handles them)',
+		'  → search "limitDRL" → search "LimitDRL" (WRONG: case variation of same term)',
+		'  → search "throttle_retry_limit" after searching "ThrottleRetryLimit" (WRONG: snake_case variation, probe handles it)',
+		'  → search "ThrottleRetryLimit" path=tyk → search "ThrottleRetryLimit" path=gateway → search "ThrottleRetryLimit" path=apidef (WRONG: same query on different paths hoping for different results)',
+		'  → search "func (k *RateLimitAndQuotaCheck) handleRateLimitFailure" (WRONG: do not search full function signatures, just use exact=true "handleRateLimitFailure")',
+		'  → search "ForwardMessage" → search "ForwardMessage" → search "ForwardMessage" (WRONG: repeating the exact same query)',
 		'  → search "error handling" → search "error handling" → search "error handling" (WRONG: repeating exact same query)',
 		'',
 		'Keyword tips:',
@@ -171,12 +185,13 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'- To bypass stopword filtering: wrap terms in quotes ("return", "struct") or set exact=true. Both disable stemming and splitting too.',
 		'- Multiple words without operators use OR logic: foo bar = foo OR bar. Use AND explicitly if you need both: foo AND bar.',
 		'- camelCase terms are split: getUserData becomes "get", "user", "data" — so one search covers all naming styles.',
+		'- Do NOT search for full function signatures like "func (r *Type) Method(args)". Just search for the method name with exact=true.',
 		'',
 		'Strategy:',
 		'1. Analyze the query - identify key concepts, entities, and relationships',
-		'2. Run ONE focused search per concept with the most natural keyword. Trust probe to handle variations.',
+		'2. Run ONE focused search per concept. For known symbol names use exact=true. For concepts use default (exact=false).',
 		'3. If a search returns results, use extract to verify relevance',
-		'4. Only try a different keyword if the first one returned irrelevant results (not if it returned no results — that means the concept is absent)',
+		'4. If a search returns NO results, the term does not exist in the codebase. Do NOT retry with variations, different paths, or longer strings. Move on.',
 		'5. Combine all relevant targets in your final response',
 		'',
 		`Query: ${searchQuery}`,
@@ -570,6 +585,50 @@ export const extractTool = (options = {}) => {
 					// Resolve relative paths in targets against cwd
 					extractFiles = parsedTargets.map(target => resolveTargetPath(target, effectiveCwd));
 
+					// Auto-fix: if resolved paths don't exist, try allowedFolders subdirs
+					// Handles when search returns relative paths (e.g., "gateway/file.go") and
+					// model constructs wrong absolute paths (e.g., /workspace/gateway/file.go
+					// instead of /workspace/tyk/gateway/file.go)
+					if (options.allowedFolders && options.allowedFolders.length > 0) {
+						extractFiles = extractFiles.map(target => {
+							const { filePart, suffix } = splitTargetSuffix(target);
+							if (existsSync(filePart)) return target;
+
+							// Try resolving the relative tail against each allowedFolder
+							const cwdPrefix = (effectiveCwd.endsWith('/') ? effectiveCwd : effectiveCwd + '/');
+							const relativePart = filePart.startsWith(cwdPrefix)
+								? filePart.slice(cwdPrefix.length)
+								: null;
+
+							if (relativePart) {
+								for (const folder of options.allowedFolders) {
+									const candidate = folder + '/' + relativePart;
+									if (existsSync(candidate)) {
+										if (debug) console.error(`[extract] Auto-fixed path: ${filePart} → ${candidate}`);
+										return candidate + suffix;
+									}
+								}
+							}
+
+							// Try stripping workspace prefix and resolving against allowedFolders
+							// e.g., /tmp/visor-workspaces/abc/gateway/file.go → try each folder + gateway/file.go
+							for (const folder of options.allowedFolders) {
+								const folderPrefix = folder.endsWith('/') ? folder : folder + '/';
+								const wsParent = folderPrefix.replace(/[^/]+\/$/, '');
+								if (filePart.startsWith(wsParent)) {
+									const tail = filePart.slice(wsParent.length);
+									const candidate = folderPrefix + tail;
+									if (candidate !== filePart && existsSync(candidate)) {
+										if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} → ${candidate}`);
+										return candidate + suffix;
+									}
+								}
+							}
+
+							return target;
+						});
+					}
+
 					// Apply format mapping for outline-xml to xml
 					let effectiveFormat = format;
 					if (outline && format === 'outline-xml') {