@probelabs/probe 0.6.0-rc270 → 0.6.0-rc272

package/cjs/index.cjs

@@ -13365,22 +13365,16 @@ var init_JsonShapeDeserializer = __esm({
           if (Array.isArray(value) && ns.isListSchema()) {
             const listMember = ns.getValueSchema();
             const out = [];
-            const sparse = !!ns.getMergedTraits().sparse;
             for (const item of value) {
-              if (sparse || item != null) {
-                out.push(this._read(listMember, item));
-              }
+              out.push(this._read(listMember, item));
             }
             return out;
           }
           if (ns.isMapSchema()) {
             const mapMember = ns.getValueSchema();
             const out = {};
-            const sparse = !!ns.getMergedTraits().sparse;
             for (const [_k, _v] of Object.entries(value)) {
-              if (sparse || _v != null) {
-                out[_k] = this._read(mapMember, _v);
-              }
+              out[_k] = this._read(mapMember, _v);
             }
             return out;
           }
@@ -15029,18 +15023,18 @@ var init_XmlShapeDeserializer = __esm({
           return value;
         }
         if (typeof value === "object") {
-          const sparse = !!traits.sparse;
           const flat = !!traits.xmlFlattened;
           if (ns.isListSchema()) {
             const listValue = ns.getValueSchema();
             const buffer2 = [];
             const sourceKey = listValue.getMergedTraits().xmlName ?? "member";
             const source = flat ? value : (value[0] ?? value)[sourceKey];
+            if (source == null) {
+              return buffer2;
+            }
             const sourceArray = Array.isArray(source) ? source : [source];
             for (const v5 of sourceArray) {
-              if (v5 != null || sparse) {
-                buffer2.push(this.readSchema(listValue, v5));
-              }
+              buffer2.push(this.readSchema(listValue, v5));
             }
             return buffer2;
           }
@@ -15059,9 +15053,7 @@ var init_XmlShapeDeserializer = __esm({
             for (const entry of entries) {
               const key = entry[keyProperty];
               const value2 = entry[valueProperty];
-              if (value2 != null || sparse) {
-                buffer[key] = this.readSchema(memberNs, value2);
-              }
+              buffer[key] = this.readSchema(memberNs, value2);
             }
             return buffer;
           }
@@ -19403,7 +19395,7 @@ var require_package2 = __commonJS({
     module2.exports = {
       name: "@aws-sdk/client-bedrock-runtime",
       description: "AWS SDK for JavaScript Bedrock Runtime Client for Node.js, Browser and React Native",
-      version: "3.1001.0",
+      version: "3.1002.0",
       scripts: {
         build: "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
         "build:cjs": "node ../../scripts/compilation/inline client-bedrock-runtime",
@@ -19427,21 +19419,21 @@ var require_package2 = __commonJS({
       dependencies: {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.16",
-        "@aws-sdk/credential-provider-node": "^3.972.15",
+        "@aws-sdk/core": "^3.973.17",
+        "@aws-sdk/credential-provider-node": "^3.972.16",
         "@aws-sdk/eventstream-handler-node": "^3.972.9",
         "@aws-sdk/middleware-eventstream": "^3.972.6",
         "@aws-sdk/middleware-host-header": "^3.972.6",
         "@aws-sdk/middleware-logger": "^3.972.6",
         "@aws-sdk/middleware-recursion-detection": "^3.972.6",
-        "@aws-sdk/middleware-user-agent": "^3.972.16",
+        "@aws-sdk/middleware-user-agent": "^3.972.17",
         "@aws-sdk/middleware-websocket": "^3.972.11",
         "@aws-sdk/region-config-resolver": "^3.972.6",
-        "@aws-sdk/token-providers": "3.1001.0",
+        "@aws-sdk/token-providers": "3.1002.0",
         "@aws-sdk/types": "^3.973.4",
         "@aws-sdk/util-endpoints": "^3.996.3",
         "@aws-sdk/util-user-agent-browser": "^3.972.6",
-        "@aws-sdk/util-user-agent-node": "^3.973.1",
+        "@aws-sdk/util-user-agent-node": "^3.973.2",
         "@smithy/config-resolver": "^4.4.9",
         "@smithy/core": "^3.23.7",
         "@smithy/eventstream-serde-browser": "^4.2.10",
@@ -20190,7 +20182,7 @@ var init_package = __esm({
   "node_modules/@aws-sdk/nested-clients/package.json"() {
     package_default = {
       name: "@aws-sdk/nested-clients",
-      version: "3.996.4",
+      version: "3.996.5",
       description: "Nested clients for AWS SDK packages.",
       main: "./dist-cjs/index.js",
       module: "./dist-es/index.js",
@@ -20219,16 +20211,16 @@ var init_package = __esm({
       dependencies: {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.16",
+        "@aws-sdk/core": "^3.973.17",
         "@aws-sdk/middleware-host-header": "^3.972.6",
         "@aws-sdk/middleware-logger": "^3.972.6",
         "@aws-sdk/middleware-recursion-detection": "^3.972.6",
-        "@aws-sdk/middleware-user-agent": "^3.972.16",
+        "@aws-sdk/middleware-user-agent": "^3.972.17",
         "@aws-sdk/region-config-resolver": "^3.972.6",
         "@aws-sdk/types": "^3.973.4",
         "@aws-sdk/util-endpoints": "^3.996.3",
         "@aws-sdk/util-user-agent-browser": "^3.972.6",
-        "@aws-sdk/util-user-agent-node": "^3.973.1",
+        "@aws-sdk/util-user-agent-node": "^3.973.2",
         "@smithy/config-resolver": "^4.4.9",
         "@smithy/core": "^3.23.7",
         "@smithy/fetch-http-handler": "^5.3.12",
@@ -110630,6 +110622,17 @@ function parseDelegatedTargets(rawResponse) {
   }
   return normalizeTargets(fallbackTargetsFromText(trimmed));
 }
+function splitTargetSuffix(target) {
+  const searchStart = target.length > 2 && target[1] === ":" && /[a-zA-Z]/.test(target[0]) ? 2 : 0;
+  const colonIdx = target.indexOf(":", searchStart);
+  const hashIdx = target.indexOf("#");
+  if (colonIdx !== -1 && (hashIdx === -1 || colonIdx < hashIdx)) {
+    return { filePart: target.substring(0, colonIdx), suffix: target.substring(colonIdx) };
+  } else if (hashIdx !== -1) {
+    return { filePart: target.substring(0, hashIdx), suffix: target.substring(hashIdx) };
+  }
+  return { filePart: target, suffix: "" };
+}
 function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, allowTests }) {
   return [
     "You are a code-search subagent. Your job is to find ALL relevant code locations for the given query.",
@@ -110644,7 +110647,7 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     "",
     "Strategy for complex queries:",
     "1. Analyze the query - identify key concepts, entities, and relationships",
-    '2. Run focused searches for each concept (e.g., "error handling" + "authentication" separately)',
+    '2. Run focused searches for each independent concept (e.g., for "how do payments work and how are emails sent", search "payments" and "emails" separately since they are unrelated)',
     "3. Use extract to verify relevance of promising results",
     "4. Combine all relevant targets in your final response",
     "",
@@ -110658,7 +110661,7 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
     "Deduplicate targets. Do NOT explain or answer - ONLY return the JSON targets."
   ].join("\n");
 }
-var import_ai5, CODE_SEARCH_SCHEMA, searchTool, queryTool, extractTool, delegateTool, analyzeAllTool;
+var import_ai5, import_fs11, CODE_SEARCH_SCHEMA, searchTool, queryTool, extractTool, delegateTool, analyzeAllTool;
 var init_vercel = __esm({
   "src/tools/vercel.js"() {
     "use strict";
@@ -110669,6 +110672,7 @@ var init_vercel = __esm({
     init_delegate();
     init_analyzeAll();
     init_common2();
+    import_fs11 = require("fs");
     init_error_types();
     init_hashline();
     CODE_SEARCH_SCHEMA = {
@@ -110794,10 +110798,47 @@ var init_vercel = __esm({
               }
               return fallbackResult;
             }
+            const delegateBase = options.allowedFolders?.[0] || options.cwd || ".";
             const resolutionBase = searchPaths[0] || options.cwd || ".";
-            const resolvedTargets = targets.map((target) => resolveTargetPath(target, resolutionBase));
+            const resolvedTargets = targets.map((target) => resolveTargetPath(target, delegateBase));
+            const validatedTargets = [];
+            for (const target of resolvedTargets) {
+              const { filePart, suffix } = splitTargetSuffix(target);
+              if ((0, import_fs11.existsSync)(filePart)) {
+                validatedTargets.push(target);
+                continue;
+              }
+              let fixed = false;
+              const parts = filePart.split("/").filter(Boolean);
+              for (let i5 = 0; i5 < parts.length - 1; i5++) {
+                if (parts[i5] === parts[i5 + 1]) {
+                  const candidate = "/" + [...parts.slice(0, i5), ...parts.slice(i5 + 1)].join("/");
+                  if ((0, import_fs11.existsSync)(candidate)) {
+                    validatedTargets.push(candidate + suffix);
+                    if (debug) console.error(`[search-delegate] Fixed doubled path segment: ${filePart} \u2192 ${candidate}`);
+                    fixed = true;
+                    break;
+                  }
+                }
+              }
+              if (fixed) continue;
+              for (const altBase of [resolutionBase, options.cwd].filter(Boolean)) {
+                if (altBase === delegateBase) continue;
+                const altResolved = resolveTargetPath(target, altBase);
+                const { filePart: altFile } = splitTargetSuffix(altResolved);
+                if ((0, import_fs11.existsSync)(altFile)) {
+                  validatedTargets.push(altResolved);
+                  if (debug) console.error(`[search-delegate] Resolved with alt base: ${filePart} \u2192 ${altFile}`);
+                  fixed = true;
+                  break;
+                }
+              }
+              if (fixed) continue;
+              if (debug) console.error(`[search-delegate] Warning: target may not exist: ${filePart}`);
+              validatedTargets.push(target);
+            }
             const extractOptions = {
-              files: resolvedTargets,
+              files: validatedTargets,
               cwd: resolutionBase,
               allowTests: allow_tests ?? true
             };
@@ -111350,7 +111391,7 @@ Example: <edit><file_path>${file_path}</file_path><symbol>${allMatches[0].qualif
 Example: <extract><targets>${file_path}#${symbol15}</targets></extract>`;
     }
   }
-  const content = await import_fs11.promises.readFile(resolvedPath2, "utf-8");
+  const content = await import_fs12.promises.readFile(resolvedPath2, "utf-8");
   const lines = content.split("\n");
   if (position) {
     const refIndent = detectBaseIndent(symbolInfo.code);
@@ -111361,7 +111402,7 @@ Example: <extract><targets>${file_path}#${symbol15}</targets></extract>`;
     } else {
       lines.splice(symbolInfo.startLine - 1, 0, ...newLines, "");
     }
-    await import_fs11.promises.writeFile(resolvedPath2, lines.join("\n"), "utf-8");
+    await import_fs12.promises.writeFile(resolvedPath2, lines.join("\n"), "utf-8");
     if (fileTracker) {
       const updated = await findSymbol(resolvedPath2, symbol15, cwd || process.cwd());
       if (updated) {
@@ -111379,7 +111420,7 @@ Example: <extract><targets>${file_path}#${symbol15}</targets></extract>`;
     const reindented = reindent(new_string, originalIndent);
     const newLines = reindented.split("\n");
     lines.splice(symbolInfo.startLine - 1, symbolInfo.endLine - symbolInfo.startLine + 1, ...newLines);
-    await import_fs11.promises.writeFile(resolvedPath2, lines.join("\n"), "utf-8");
+    await import_fs12.promises.writeFile(resolvedPath2, lines.join("\n"), "utf-8");
     if (fileTracker) {
       const updated = await findSymbol(resolvedPath2, symbol15, cwd || process.cwd());
       if (updated) {
@@ -111434,7 +111475,7 @@ async function handleLineEdit({ resolvedPath: resolvedPath2, file_path, start_li
   if (position !== void 0 && position !== null && position !== "before" && position !== "after") {
     return 'Error editing file: Invalid position - must be "before" or "after". Use position="before" to insert before the line, or position="after" to insert after it.';
   }
-  const content = await import_fs11.promises.readFile(resolvedPath2, "utf-8");
+  const content = await import_fs12.promises.readFile(resolvedPath2, "utf-8");
   const fileLines = content.split("\n");
   if (startLine > fileLines.length) {
     return `Error editing file: Line ${startLine} is beyond file length (${fileLines.length} lines). Use 'extract' to read the current file content.`;
@@ -111463,20 +111504,20 @@ async function handleLineEdit({ resolvedPath: resolvedPath2, file_path, start_li
   const newLines = cleaned === "" ? [] : cleaned.split("\n");
   if (position === "after") {
     fileLines.splice(startLine, 0, ...newLines);
-    await import_fs11.promises.writeFile(resolvedPath2, fileLines.join("\n"), "utf-8");
+    await import_fs12.promises.writeFile(resolvedPath2, fileLines.join("\n"), "utf-8");
     if (fileTracker) await fileTracker.trackFileAfterWrite(resolvedPath2);
     const action = `${newLines.length} line${newLines.length !== 1 ? "s" : ""} inserted after line ${startLine}`;
     return buildLineEditResponse(file_path, startLine, startLine, newLines.length, fileLines, startLine, action, modifications);
   } else if (position === "before") {
     fileLines.splice(startLine - 1, 0, ...newLines);
-    await import_fs11.promises.writeFile(resolvedPath2, fileLines.join("\n"), "utf-8");
+    await import_fs12.promises.writeFile(resolvedPath2, fileLines.join("\n"), "utf-8");
     if (fileTracker) await fileTracker.trackFileAfterWrite(resolvedPath2);
     const action = `${newLines.length} line${newLines.length !== 1 ? "s" : ""} inserted before line ${startLine}`;
     return buildLineEditResponse(file_path, startLine, startLine, newLines.length, fileLines, startLine - 1, action, modifications);
   } else {
     const replacedCount = endLine - startLine + 1;
     fileLines.splice(startLine - 1, replacedCount, ...newLines);
-    await import_fs11.promises.writeFile(resolvedPath2, fileLines.join("\n"), "utf-8");
+    await import_fs12.promises.writeFile(resolvedPath2, fileLines.join("\n"), "utf-8");
     if (fileTracker) await fileTracker.trackFileAfterWrite(resolvedPath2);
     let action;
     if (newLines.length === 0) {
@@ -111489,14 +111530,14 @@ async function handleLineEdit({ resolvedPath: resolvedPath2, file_path, start_li
     return buildLineEditResponse(file_path, startLine, endLine, newLines.length, fileLines, startLine - 1, action, modifications);
   }
 }
-var import_ai6, import_fs11, import_path16, import_fs12, editTool, createTool, multiEditTool, editSchema, createSchema, multiEditSchema, editDescription, createDescription, multiEditDescription, editToolDefinition, createToolDefinition, multiEditToolDefinition;
+var import_ai6, import_fs12, import_path16, import_fs13, editTool, createTool, multiEditTool, editSchema, createSchema, multiEditSchema, editDescription, createDescription, multiEditDescription, editToolDefinition, createToolDefinition, multiEditToolDefinition;
 var init_edit = __esm({
   "src/tools/edit.js"() {
     "use strict";
     import_ai6 = require("ai");
-    import_fs11 = require("fs");
-    import_path16 = require("path");
     import_fs12 = require("fs");
+    import_path16 = require("path");
+    import_fs13 = require("fs");
     init_path_validation();
     init_fuzzyMatch();
     init_symbolEdit();
@@ -111580,7 +111621,7 @@ Parameters:
               const relativePath = toRelativePath(resolvedPath2, workspaceRoot);
               return `Error editing file: Permission denied - ${relativePath} is outside allowed directories. Use a file path within the project workspace.`;
             }
-            if (!(0, import_fs12.existsSync)(resolvedPath2)) {
+            if (!(0, import_fs13.existsSync)(resolvedPath2)) {
               return `Error editing file: File not found - ${file_path}. Verify the path is correct and the file exists. Use 'search' to find files by name, or 'create' to make a new file.`;
             }
             if (options.fileTracker && !options.fileTracker.isFileSeen(resolvedPath2)) {
@@ -111610,7 +111651,7 @@ Example: <extract><targets>${displayPath}</targets></extract>`;
 Example: <extract><targets>${displayPath}</targets></extract>`;
               }
             }
-            const content = await import_fs11.promises.readFile(resolvedPath2, "utf-8");
+            const content = await import_fs12.promises.readFile(resolvedPath2, "utf-8");
             let matchTarget = old_string;
             let matchStrategy = "exact";
             if (!content.includes(old_string)) {
@@ -111642,7 +111683,7 @@ Example: <extract><targets>${displayPath}</targets></extract>`;
             if (newContent === content) {
               return `Error editing file: No changes made - the replacement result is identical to the original. Verify that old_string and new_string are actually different. If fuzzy matching was used, the matched text may already equal new_string.`;
             }
-            await import_fs11.promises.writeFile(resolvedPath2, newContent, "utf-8");
+            await import_fs12.promises.writeFile(resolvedPath2, newContent, "utf-8");
             if (options.fileTracker) {
               await options.fileTracker.trackFileAfterWrite(resolvedPath2);
               options.fileTracker.recordTextEdit(resolvedPath2);
@@ -111713,13 +111754,13 @@ Important:
               const relativePath = toRelativePath(resolvedPath2, workspaceRoot);
               return `Error creating file: Permission denied - ${relativePath} is outside allowed directories. Use a file path within the project workspace.`;
             }
-            if ((0, import_fs12.existsSync)(resolvedPath2) && !overwrite) {
+            if ((0, import_fs13.existsSync)(resolvedPath2) && !overwrite) {
               return `Error creating file: File already exists - ${file_path}. Use overwrite: true to replace it.`;
             }
-            const existed = (0, import_fs12.existsSync)(resolvedPath2);
+            const existed = (0, import_fs13.existsSync)(resolvedPath2);
             const dir = (0, import_path16.dirname)(resolvedPath2);
-            await import_fs11.promises.mkdir(dir, { recursive: true });
-            await import_fs11.promises.writeFile(resolvedPath2, content, "utf-8");
+            await import_fs12.promises.mkdir(dir, { recursive: true });
+            await import_fs12.promises.writeFile(resolvedPath2, content, "utf-8");
             if (options.fileTracker) await options.fileTracker.trackFileAfterWrite(resolvedPath2);
             const action = existed && overwrite ? "overwrote" : "created";
             const bytes = Buffer.byteLength(content, "utf-8");
@@ -112361,10 +112402,10 @@ async function listFilesByLevel(options) {
     maxFiles = 100,
     respectGitignore = true
   } = options;
-  if (!import_fs13.default.existsSync(directory)) {
+  if (!import_fs14.default.existsSync(directory)) {
     throw new Error(`Directory does not exist: ${directory}`);
   }
-  const gitDirExists = import_fs13.default.existsSync(import_path17.default.join(directory, ".git"));
+  const gitDirExists = import_fs14.default.existsSync(import_path17.default.join(directory, ".git"));
   if (gitDirExists && respectGitignore) {
     try {
       return await listFilesUsingGit(directory, maxFiles);
@@ -112395,7 +112436,7 @@ async function listFilesByLevelManually(directory, maxFiles, respectGitignore) {
   while (queue.length > 0 && result.length < maxFiles) {
     const { dir, level } = queue.shift();
     try {
-      const entries = import_fs13.default.readdirSync(dir, { withFileTypes: true });
+      const entries = import_fs14.default.readdirSync(dir, { withFileTypes: true });
       const files = entries.filter((entry) => {
         const fullPath = import_path17.default.join(dir, entry.name);
         return getEntryTypeSync(entry, fullPath).isFile;
@@ -112426,11 +112467,11 @@ async function listFilesByLevelManually(directory, maxFiles, respectGitignore) {
 }
 function loadGitignorePatterns(directory) {
   const gitignorePath = import_path17.default.join(directory, ".gitignore");
-  if (!import_fs13.default.existsSync(gitignorePath)) {
+  if (!import_fs14.default.existsSync(gitignorePath)) {
     return [];
   }
   try {
-    const content = import_fs13.default.readFileSync(gitignorePath, "utf8");
+    const content = import_fs14.default.readFileSync(gitignorePath, "utf8");
     return content.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
   } catch (error2) {
     console.error(`Warning: Could not read .gitignore: ${error2.message}`);
@@ -112448,11 +112489,11 @@ function shouldIgnore(filePath, ignorePatterns) {
   }
   return false;
 }
-var import_fs13, import_path17, import_util12, import_child_process10, execAsync3;
+var import_fs14, import_path17, import_util12, import_child_process10, execAsync3;
 var init_file_lister = __esm({
   "src/utils/file-lister.js"() {
     "use strict";
-    import_fs13 = __toESM(require("fs"), 1);
+    import_fs14 = __toESM(require("fs"), 1);
     import_path17 = __toESM(require("path"), 1);
     import_util12 = require("util");
     import_child_process10 = require("child_process");
@@ -112471,11 +112512,11 @@ function initializeSimpleTelemetryFromOptions(options) {
   });
   return telemetry;
 }
-var import_fs14, import_path18, SimpleTelemetry, SimpleAppTracer;
+var import_fs15, import_path18, SimpleTelemetry, SimpleAppTracer;
 var init_simpleTelemetry = __esm({
   "src/agent/simpleTelemetry.js"() {
     "use strict";
-    import_fs14 = require("fs");
+    import_fs15 = require("fs");
     import_path18 = require("path");
     SimpleTelemetry = class {
       constructor(options = {}) {
@@ -112491,10 +112532,10 @@ var init_simpleTelemetry = __esm({
       initializeFileExporter() {
         try {
           const dir = (0, import_path18.dirname)(this.filePath);
-          if (!(0, import_fs14.existsSync)(dir)) {
-            (0, import_fs14.mkdirSync)(dir, { recursive: true });
+          if (!(0, import_fs15.existsSync)(dir)) {
+            (0, import_fs15.mkdirSync)(dir, { recursive: true });
           }
-          this.stream = (0, import_fs14.createWriteStream)(this.filePath, { flags: "a" });
+          this.stream = (0, import_fs15.createWriteStream)(this.filePath, { flags: "a" });
           this.stream.on("error", (error2) => {
             console.error(`[SimpleTelemetry] Stream error: ${error2.message}`);
           });

package/package.json

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

package/src/tools/vercel.js

@@ -10,6 +10,7 @@ import { extract } from '../extract.js';
 import { delegate } from '../delegate.js';
 import { analyzeAll } from './analyzeAll.js';
 import { searchSchema, querySchema, extractSchema, delegateSchema, analyzeAllSchema, searchDescription, queryDescription, extractDescription, delegateDescription, analyzeAllDescription, parseTargets, parseAndResolvePaths, resolveTargetPath } from './common.js';
+import { existsSync } from 'fs';
 import { formatErrorForAI } from '../utils/error-types.js';
 import { annotateOutputWithHashes } from './hashline.js';
 
@@ -118,6 +119,18 @@ function parseDelegatedTargets(rawResponse) {
 	return normalizeTargets(fallbackTargetsFromText(trimmed));
 }
 
+function splitTargetSuffix(target) {
+	const searchStart = (target.length > 2 && target[1] === ':' && /[a-zA-Z]/.test(target[0])) ? 2 : 0;
+	const colonIdx = target.indexOf(':', searchStart);
+	const hashIdx = target.indexOf('#');
+	if (colonIdx !== -1 && (hashIdx === -1 || colonIdx < hashIdx)) {
+		return { filePart: target.substring(0, colonIdx), suffix: target.substring(colonIdx) };
+	} else if (hashIdx !== -1) {
+		return { filePart: target.substring(0, hashIdx), suffix: target.substring(hashIdx) };
+	}
+	return { filePart: target, suffix: '' };
+}
+
 function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, allowTests }) {
 	return [
 		'You are a code-search subagent. Your job is to find ALL relevant code locations for the given query.',
@@ -132,7 +145,7 @@ function buildSearchDelegateTask({ searchQuery, searchPath, exact, language, all
 		'',
 		'Strategy for complex queries:',
 		'1. Analyze the query - identify key concepts, entities, and relationships',
-		'2. Run focused searches for each concept (e.g., "error handling" + "authentication" separately)',
+		'2. Run focused searches for each independent concept (e.g., for "how do payments work and how are emails sent", search "payments" and "emails" separately since they are unrelated)',
 		'3. Use extract to verify relevance of promising results',
 		'4. Combine all relevant targets in your final response',
 		'',
@@ -286,13 +299,61 @@ export const searchTool = (options = {}) => {
 					return fallbackResult;
 				}
 
-				// 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.
+				// The delegate runs from workspace root (allowedFolders[0] or cwd), NOT from searchPaths[0].
+				// It returns paths relative to that workspace root. Resolve against the same base.
+				const delegateBase = options.allowedFolders?.[0] || options.cwd || '.';
 				const resolutionBase = searchPaths[0] || options.cwd || '.';
-				const resolvedTargets = targets.map(target => resolveTargetPath(target, resolutionBase));
+				const resolvedTargets = targets.map(target => resolveTargetPath(target, delegateBase));
+
+				// Auto-fix: detect and repair invalid paths (doubled segments, AI hallucinations)
+				const validatedTargets = [];
+				for (const target of resolvedTargets) {
+					const { filePart, suffix } = splitTargetSuffix(target);
+
+					// 1. Path exists as-is
+					if (existsSync(filePart)) {
+						validatedTargets.push(target);
+						continue;
+					}
+
+					// 2. Detect doubled directory segments: /ws/proj/proj/src → /ws/proj/src
+					let fixed = false;
+					const parts = filePart.split('/').filter(Boolean);
+					for (let i = 0; i < parts.length - 1; i++) {
+						if (parts[i] === parts[i + 1]) {
+							const candidate = '/' + [...parts.slice(0, i), ...parts.slice(i + 1)].join('/');
+							if (existsSync(candidate)) {
+								validatedTargets.push(candidate + suffix);
+								if (debug) console.error(`[search-delegate] Fixed doubled path segment: ${filePart} → ${candidate}`);
+								fixed = true;
+								break;
+							}
+						}
+					}
+					if (fixed) continue;
+
+					// 3. Try resolving against alternative bases (searchPaths[0], cwd)
+					for (const altBase of [resolutionBase, options.cwd].filter(Boolean)) {
+						if (altBase === delegateBase) continue;
+						const altResolved = resolveTargetPath(target, altBase);
+						const { filePart: altFile } = splitTargetSuffix(altResolved);
+						if (existsSync(altFile)) {
+							validatedTargets.push(altResolved);
+							if (debug) console.error(`[search-delegate] Resolved with alt base: ${filePart} → ${altFile}`);
+							fixed = true;
+							break;
+						}
+					}
+					if (fixed) continue;
+
+					// 4. Keep target anyway (probe binary will report the error)
+					//    but log a warning
+					if (debug) console.error(`[search-delegate] Warning: target may not exist: ${filePart}`);
+					validatedTargets.push(target);
+				}
+
 				const extractOptions = {
-					files: resolvedTargets,
+					files: validatedTargets,
 					cwd: resolutionBase,
 					allowTests: allow_tests ?? true
 				};