@bastani/atomic 0.9.2 → 0.9.3-alpha.2

package/dist/core/tools/find.js

@@ -1,3 +1,5 @@
+import { statSync } from "node:fs";
+import { stat as fsStat } from "node:fs/promises";
 import { createInterface } from "node:readline";
 import { Text } from "@earendil-works/pi-tui";
 import { spawn } from "child_process";
@@ -5,39 +7,181 @@ import path from "path";
 import { Type } from "typebox";
 import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
 import { ensureTool } from "../../utils/tools-manager.js";
+import { normalizePathLikeInput, splitPathLikeGlob } from "./glob-path-utils.js";
+import { loadNativeSearchBinding } from "./search-native.js";
 import { pathExists, resolveToCwd } from "./path-utils.js";
-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";
+import { resolveInternalSelector } from "./resource-selectors.js";
+import { getTextOutput } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";
-function toPosixPath(value) {
-    return value.split(path.sep).join("/");
-}
+const toPosixPath = (value) => value.split(path.sep).join("/");
 const findSchema = Type.Object({
-    pattern: Type.String({
-        description: "Glob pattern to match files, e.g. '*.ts', '**/*.json', or 'src/**/*.spec.ts'",
-    }),
-    path: Type.Optional(Type.String({ description: "Directory to search in (default: current directory)" })),
-    limit: Type.Optional(Type.Number({ description: "Maximum number of results (default: 1000)" })),
-});
-const DEFAULT_LIMIT = 1000;
+    paths: Type.Array(Type.String({ description: "File, directory, or glob path to find." }), { description: "Paths or glob paths to find.", minItems: 1 }),
+    hidden: Type.Optional(Type.Boolean({ description: "Include hidden files. Defaults to true." })),
+    gitignore: Type.Optional(Type.Boolean({ description: "Respect gitignore. Defaults to true." })),
+    limit: Type.Optional(Type.Number({ description: "Maximum number of results, clamped to 1-200.", minimum: 1, maximum: 200 })),
+    timeout: Type.Optional(Type.Number({ description: "Timeout in seconds; default 5, clamped to 0.5..60.", minimum: 0.5, maximum: 60 })),
+}, { additionalProperties: false });
+const DEFAULT_LIMIT = 200;
+const MAX_LIMIT = 200;
+const DEFAULT_TIMEOUT_MS = 5000;
+const MIN_TIMEOUT_MS = 500;
+const MAX_TIMEOUT_MS = 60_000;
+function normalizeLimit(limit) { return limit === undefined || !Number.isFinite(limit) ? DEFAULT_LIMIT : Math.max(1, Math.min(MAX_LIMIT, Math.floor(limit))); }
+function normalizeTimeoutMs(timeout) { return timeout === undefined || !Number.isFinite(timeout) ? DEFAULT_TIMEOUT_MS : Math.max(MIN_TIMEOUT_MS, Math.min(MAX_TIMEOUT_MS, Math.floor(timeout * 1000))); }
+function formatTimeoutSeconds(timeoutMs) { const seconds = timeoutMs / 1000; return Number.isInteger(seconds) ? String(seconds) : seconds.toFixed(1); }
+async function resolveFindInternal(input, cwd, ctx) { const parsed = splitPathLikeGlob(input); if (!/^[a-z]+:\/\//i.test(parsed.basePath))
+    return input; for (const resolve of [ctx?.internalRouter?.resolve, ctx?.internalResourceRouter?.resolve, ctx?.resolveInternalUrl]) {
+    const resolved = await resolve?.(parsed.basePath);
+    if (typeof resolved === "string")
+        return parsed.glob ? `${resolved}/${parsed.glob}` : resolved;
+} const fallback = resolveInternalSelector(parsed.basePath, cwd); return fallback ? parsed.glob ? `${fallback}/${parsed.glob}` : fallback : input; }
+function isWindowsAbsolutePath(value) { return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith("\\\\"); }
+function resolveFindBackendPath(input, cwd, customBackend) { if (!customBackend)
+    return resolveToCwd(input, cwd); if (input === "." || input === "")
+    return cwd; if (input.startsWith("/") || isWindowsAbsolutePath(input))
+    return input; if (cwd.includes("\\") || isWindowsAbsolutePath(cwd))
+    return path.resolve(cwd, input); return `${cwd.replace(/\/+$/, "")}/${input}`; }
+async function delimiterInExistingGlobRoot(value, cwd, ops, customBackend) { const parsed = splitPathLikeGlob(value); return !!parsed.glob && /[;,\s]/.test(parsed.basePath) && await ops.exists(resolveFindBackendPath(parsed.basePath, cwd, customBackend)); }
+async function expandDelimitedFindPaths(pathsValue, cwd, ops, ctx, customBackend = false) {
+    if (!pathsValue?.length)
+        throw new Error("find.paths must include at least one path or glob.");
+    const expanded = [];
+    for (const input of pathsValue) {
+        const raw = normalizePathLikeInput(input);
+        if (raw === "")
+            throw new Error("find.paths entries must not be empty.");
+        const resolvedRaw = await resolveFindInternal(raw, cwd, ctx);
+        const rawParsed = splitPathLikeGlob(resolvedRaw);
+        if ((rawParsed.glob === undefined && await ops.exists(resolveFindBackendPath(rawParsed.basePath, cwd, customBackend))) || await delimiterInExistingGlobRoot(resolvedRaw, cwd, ops, customBackend)) {
+            expanded.push(resolvedRaw);
+            continue;
+        }
+        const parts = await Promise.all(raw.split(/[;,\s]+/).map(normalizePathLikeInput).filter(Boolean).map((part) => resolveFindInternal(part, cwd, ctx)));
+        const delimiterCanSplit = /[;,]/.test(raw) ? (await Promise.all(parts.map((part) => ops.exists(resolveFindBackendPath(splitPathLikeGlob(part).basePath, cwd, customBackend))))).some(Boolean) : (await Promise.all(parts.map((part) => ops.exists(resolveFindBackendPath(splitPathLikeGlob(part).basePath, cwd, customBackend))))).every(Boolean);
+        if (parts.length > 1 && delimiterCanSplit)
+            expanded.push(...parts);
+        else
+            expanded.push(resolvedRaw);
+    }
+    return expanded;
+}
+function normalizeFindTargets(cwd, pathsValue, customBackend = false) {
+    if (!pathsValue || pathsValue.length === 0)
+        throw new Error("find.paths must include at least one path or glob.");
+    return pathsValue.map((searchPath) => {
+        const parsed = splitPathLikeGlob(searchPath);
+        const target = { searchPath: resolveFindBackendPath(parsed.basePath, cwd, customBackend), pattern: parsed.glob ?? "**/*", exactPathInput: parsed.glob === undefined, inputPath: searchPath };
+        if (path.parse(target.searchPath).root === target.searchPath)
+            throw new Error("Refusing to search filesystem root with find; provide a narrower path.");
+        return target;
+    });
+}
+function relativizeFoundPath(foundPath, searchPath) {
+    const hadTrailingSlash = foundPath.endsWith("/") || foundPath.endsWith("\\");
+    const relativePath = path.relative(searchPath, foundPath) || path.basename(foundPath);
+    const outputPath = hadTrailingSlash && !relativePath.endsWith("/") ? `${relativePath}/` : relativePath;
+    return toPosixPath(outputPath);
+}
+function formatExactFoundPath(foundPath, cwd) { return toPosixPath(path.relative(cwd, foundPath) || path.basename(foundPath)); }
+function containsHiddenSegment(value) { return toPosixPath(value).split("/").some((part) => part.startsWith(".") && part.length > 1); }
+function findTargetMentionsNodeModules(target) { return target.pattern.includes("node_modules") || toPosixPath(target.searchPath).split("/").includes("node_modules"); }
+function formatFoundPath(foundPath, searchPath, searchPaths, cwd) {
+    let absoluteFoundPath = path.isAbsolute(foundPath) ? foundPath : path.resolve(searchPath, foundPath);
+    if (foundPath.endsWith("/") && !absoluteFoundPath.endsWith("/"))
+        absoluteFoundPath += "/";
+    const relative = relativizeFoundPath(absoluteFoundPath, searchPath);
+    if (searchPaths.length <= 1)
+        return relative;
+    const rootLabel = toPosixPath(path.relative(cwd, searchPath) || path.basename(searchPath) || ".");
+    return `${rootLabel}/${relative}`;
+}
+function createFindTreeNode() { return { files: new Set(), dirs: new Map() }; }
+function formatFindTree(relativized) {
+    const root = createFindTreeNode();
+    for (const item of relativized) {
+        const isDir = item.endsWith("/");
+        const parts = item.replace(/\/+$/g, "").split("/").filter(Boolean);
+        if (parts.length === 0)
+            continue;
+        let node = root;
+        const dirParts = isDir ? parts : parts.slice(0, -1);
+        for (const dir of dirParts) {
+            let child = node.dirs.get(dir);
+            if (!child) {
+                child = createFindTreeNode();
+                node.dirs.set(dir, child);
+            }
+            node = child;
+        }
+        if (!isDir)
+            node.files.add(parts[parts.length - 1]);
+    }
+    const lines = [];
+    const collapse = (dir, node) => {
+        const parts = [dir];
+        let current = node;
+        while (current.files.size === 0 && current.dirs.size === 1) {
+            const [[nextDir, nextNode]] = [...current.dirs.entries()];
+            parts.push(nextDir);
+            current = nextNode;
+        }
+        return { label: parts.join("/"), node: current };
+    };
+    const render = (node, depth) => {
+        for (const file of [...node.files].sort())
+            lines.push(file);
+        for (const [dir, child] of [...node.dirs.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+            const folded = collapse(dir, child);
+            lines.push(`${"#".repeat(depth + 1)} ${folded.label}/`);
+            render(folded.node, depth + 1);
+        }
+    };
+    render(root, 0);
+    return lines.join("\n");
+}
+function buildFindResult(relativized, effectiveLimit, timedOut, timeoutMs, skippedMissingPaths = [], resultLimitReached = false) {
+    const rawOutput = relativized.length > 0 ? formatFindTree(relativized) : "No files found matching pattern";
+    const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
+    let resultOutput = truncation.content;
+    const details = { scopePath: ".", fileCount: relativized.length, files: relativized, meta: { limits: { resultLimit: effectiveLimit } } };
+    const notices = [];
+    if (resultLimitReached) {
+        notices.push(`${effectiveLimit} results limit reached. Refine pattern or path to narrow results`);
+        details.resultLimitReached = effectiveLimit;
+    }
+    if (timedOut) {
+        notices.push(`find timed out after ${formatTimeoutSeconds(timeoutMs)}s; returning ${relativized.length} partial matches — increase timeout or narrow pattern`);
+        details.timedOut = true;
+        details.truncated = true;
+    }
+    if (skippedMissingPaths.length > 0) {
+        notices.push(`Skipped missing paths: ${skippedMissingPaths.join(", ")}`);
+        details.skippedMissingPaths = skippedMissingPaths;
+        details.missingPaths = skippedMissingPaths;
+    }
+    if (truncation.truncated) {
+        notices.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit reached`);
+        details.truncation = truncation;
+        details.meta = { ...(details.meta ?? {}), truncation };
+        details.truncated = true;
+    }
+    if (notices.length > 0) {
+        resultOutput += `\n\n[${notices.join(". ")}]`;
+    }
+    return { content: [{ type: "text", text: resultOutput }], details };
+}
 const defaultFindOperations = {
     exists: pathExists,
-    // This is a placeholder. Actual fd execution happens in execute() when no custom glob is provided.
     glob: () => [],
 };
+function stripTrailingForwardSlashes(value) { let end = value.length; while (end > 0 && value[end - 1] === "/")
+    end--; return value.slice(0, end); }
 function formatFindCall(args, theme) {
-    const pattern = str(args?.pattern);
-    const rawPath = str(args?.path);
-    const path = rawPath !== null ? shortenPath(rawPath || ".") : null;
-    const limit = args?.limit;
-    const invalidArg = invalidArgText(theme);
-    let text = theme.fg("toolTitle", theme.bold("find")) +
-        " " +
-        (pattern === null ? invalidArg : theme.fg("accent", pattern || "")) +
-        theme.fg("toolOutput", ` in ${path === null ? invalidArg : path}`);
-    if (limit !== undefined) {
-        text += theme.fg("toolOutput", ` (limit ${limit})`);
-    }
+    const paths = Array.isArray(args?.paths) ? args.paths.map((item) => splitPathLikeGlob(item).glob ? item : `${stripTrailingForwardSlashes(item)}/**/*`).join(", ") : "<paths>";
+    let text = `${theme.fg("toolTitle", theme.bold("find"))} ${theme.fg("accent", paths)}`;
+    if (args?.limit !== undefined)
+        text += theme.fg("toolOutput", ` (limit ${args.limit})`);
     return text;
 }
 function formatFindResult(result, options, theme, showImages) {
@@ -55,10 +199,13 @@ function formatFindResult(result, options, theme, showImages) {
     }
     const resultLimit = result.details?.resultLimitReached;
     const truncation = result.details?.truncation;
-    if (resultLimit || truncation?.truncated) {
+    const timedOut = result.details?.timedOut;
+    if (resultLimit || truncation?.truncated || timedOut) {
         const warnings = [];
         if (resultLimit)
             warnings.push(`${resultLimit} results limit`);
+        if (timedOut)
+            warnings.push("timeout");
         if (truncation?.truncated)
             warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
         text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
@@ -70,10 +217,10 @@ export function createFindToolDefinition(cwd, options) {
     return {
         name: "find",
         label: "find",
-        description: `Search for files by glob pattern. Returns matching file paths relative to the search directory. Respects .gitignore. Output is truncated to ${DEFAULT_LIMIT} results or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first).`,
-        promptSnippet: "Find files by glob pattern (respects .gitignore)",
+        description: "Find filesystem paths by glob; use search when you need content matches instead of path matches.",
+        promptSnippet: "Find filesystem paths by glob.",
         parameters: findSchema,
-        async execute(_toolCallId, { pattern, path: searchDir, limit }, signal, _onUpdate, _ctx) {
+        async execute(_toolCallId, params, signal, _onUpdate, _ctx) {
             return new Promise((resolve, reject) => {
                 if (signal?.aborted) {
                     reject(new Error("Operation aborted"));
@@ -94,66 +241,158 @@ export function createFindToolDefinition(cwd, options) {
                     settle(() => reject(new Error("Operation aborted")));
                 };
                 signal?.addEventListener("abort", onAbort, { once: true });
+                const { limit, hidden, gitignore, timeout } = params;
+                const paths = params.paths;
+                const resourceCtx = _ctx;
                 (async () => {
                     try {
-                        const searchPath = resolveToCwd(searchDir || ".", cwd);
-                        const effectiveLimit = limit ?? DEFAULT_LIMIT;
                         const ops = customOps ?? defaultFindOperations;
-                        // If custom operations provide glob(), use that instead of fd.
-                        if (customOps?.glob) {
-                            if (!(await ops.exists(searchPath))) {
-                                settle(() => reject(new Error(`Path not found: ${searchPath}`)));
-                                return;
+                        const targets = normalizeFindTargets(cwd, await expandDelimitedFindPaths(paths, cwd, ops, resourceCtx, !!customOps), !!customOps);
+                        const searchPaths = targets.map((target) => target.searchPath);
+                        const effectiveLimit = normalizeLimit(limit);
+                        const timeoutMs = normalizeTimeoutMs(timeout);
+                        const emitUpdate = (files) => _onUpdate?.({ content: [{ type: "text", text: files.join("\n") || "No files found matching pattern" }], details: { scopePath: ".", files, fileCount: files.length, truncated: false } });
+                        const exactFileResults = [];
+                        const searchableTargets = [];
+                        const skippedMissingPaths = [];
+                        for (const target of targets) {
+                            if (target.searchPath === path.parse(target.searchPath).root)
+                                throw new Error("Refusing to search filesystem root with find; provide a narrower path.");
+                            const stat = customOps ? await customOps.stat?.(target.searchPath) : await fsStat(target.searchPath).catch(() => undefined);
+                            if (!stat && targets.length > 1 && !customOps) {
+                                skippedMissingPaths.push(target.inputPath);
+                                continue;
                             }
-                            if (signal?.aborted) {
-                                settle(() => reject(new Error("Operation aborted")));
-                                return;
-                            }
-                            const results = await ops.glob(pattern, searchPath, {
-                                ignore: ["**/node_modules/**", "**/.git/**"],
-                                limit: effectiveLimit,
-                            });
-                            if (signal?.aborted) {
-                                settle(() => reject(new Error("Operation aborted")));
-                                return;
+                            if (!stat && targets.length === 1 && !customOps) {
+                                throw new Error(`ENOENT: Path not found: ${target.searchPath}`);
                             }
-                            if (results.length === 0) {
-                                settle(() => resolve({
-                                    content: [{ type: "text", text: "No files found matching pattern" }],
-                                    details: undefined,
-                                }));
-                                return;
-                            }
-                            // Relativize paths against the search root for stable output.
-                            const relativized = results.map((p) => {
-                                if (p.startsWith(searchPath))
-                                    return toPosixPath(p.slice(searchPath.length + 1));
-                                return toPosixPath(path.relative(searchPath, p));
-                            });
-                            const resultLimitReached = relativized.length >= effectiveLimit;
-                            const rawOutput = relativized.join("\n");
-                            const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
-                            let resultOutput = truncation.content;
-                            const details = {};
-                            const notices = [];
-                            if (resultLimitReached) {
-                                notices.push(`${effectiveLimit} results limit reached`);
-                                details.resultLimitReached = effectiveLimit;
+                            if (target.exactPathInput) {
+                                const isFile = typeof stat?.isFile === "function" ? stat.isFile() : stat?.isFile;
+                                if (isFile) {
+                                    exactFileResults.push(formatExactFoundPath(target.searchPath, cwd));
+                                    continue;
+                                }
                             }
-                            if (truncation.truncated) {
-                                notices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);
-                                details.truncation = truncation;
+                            searchableTargets.push(target);
+                        }
+                        if (exactFileResults.length > effectiveLimit || searchableTargets.length === 0) {
+                            const resultLimitReached = exactFileResults.length > effectiveLimit;
+                            settle(() => resolve(buildFindResult(exactFileResults.slice(0, effectiveLimit), effectiveLimit, false, timeoutMs, skippedMissingPaths, resultLimitReached)));
+                            emitUpdate(exactFileResults.slice(0, effectiveLimit));
+                            return;
+                        }
+                        if (customOps?.glob) {
+                            const deadline = Date.now() + timeoutMs;
+                            let timedOut = false;
+                            const relativized = [...exactFileResults];
+                            let customLimitReached = false;
+                            for (const target of searchableTargets) {
+                                if (!(await ops.exists(target.searchPath))) {
+                                    if (targets.length > 1) {
+                                        skippedMissingPaths.push(target.inputPath);
+                                        continue;
+                                    }
+                                    settle(() => reject(new Error(`Path not found: ${target.searchPath}`)));
+                                    return;
+                                }
+                                if (signal?.aborted) {
+                                    settle(() => reject(new Error("Operation aborted")));
+                                    return;
+                                }
+                                const remaining = effectiveLimit - relativized.length;
+                                const remainingMs = deadline - Date.now();
+                                if (remaining <= 0) {
+                                    const ignore = findTargetMentionsNodeModules(target) ? ["**/.git/**"] : ["**/node_modules/**", "**/.git/**"];
+                                    const probe = await Promise.resolve(ops.glob(target.pattern, target.searchPath, { ignore, limit: 1, hidden: hidden !== false }));
+                                    if (probe.some((p) => hidden !== false || !containsHiddenSegment(p)))
+                                        customLimitReached = true;
+                                    if (customLimitReached)
+                                        break;
+                                    continue;
+                                }
+                                if (remainingMs <= 0) {
+                                    timedOut = true;
+                                    break;
+                                }
+                                const timeoutResult = Symbol("find-timeout");
+                                let raceTimer;
+                                const ignore = findTargetMentionsNodeModules(target) ? ["**/.git/**"] : ["**/node_modules/**", "**/.git/**"];
+                                const results = await Promise.race([
+                                    Promise.resolve(ops.glob(target.pattern, target.searchPath, { ignore, limit: remaining + 1, hidden: hidden !== false })),
+                                    new Promise((resolveTimeout) => {
+                                        raceTimer = setTimeout(() => resolveTimeout(timeoutResult), remainingMs);
+                                    }),
+                                ]);
+                                if (raceTimer)
+                                    clearTimeout(raceTimer);
+                                if (!Array.isArray(results)) {
+                                    timedOut = true;
+                                    break;
+                                }
+                                if (target.exactPathInput && results.length === 0) {
+                                    const stat = await customOps.stat?.(target.searchPath);
+                                    if (!stat?.isDirectory)
+                                        relativized.push(formatExactFoundPath(target.searchPath, cwd));
+                                    continue;
+                                }
+                                if (signal?.aborted) {
+                                    settle(() => reject(new Error("Operation aborted")));
+                                    return;
+                                }
+                                const visible = results.filter((p) => hidden !== false || !containsHiddenSegment(p));
+                                if (visible.length > remaining)
+                                    customLimitReached = true;
+                                relativized.push(...visible.slice(0, remaining).map((p) => formatFoundPath(p, target.searchPath, searchPaths, cwd)));
+                                emitUpdate(relativized);
+                                if (customLimitReached)
+                                    break;
                             }
-                            if (notices.length > 0) {
-                                resultOutput += `\n\n[${notices.join(". ")}]`;
+                            settle(() => resolve(buildFindResult(relativized, effectiveLimit, timedOut, timeoutMs, skippedMissingPaths, customLimitReached)));
+                            return;
+                        }
+                        const nativeBinding = loadNativeSearchBinding();
+                        if (nativeBinding) {
+                            const matches = exactFileResults.map((path) => ({ path, mtime: Number.POSITIVE_INFINITY }));
+                            let timedOut = false;
+                            const deadline = Date.now() + timeoutMs;
+                            for (const target of searchableTargets) {
+                                const remainingMs = deadline - Date.now();
+                                if (remainingMs <= 0) {
+                                    timedOut = true;
+                                    break;
+                                }
+                                try {
+                                    const result = await nativeBinding.glob({
+                                        pattern: target.pattern,
+                                        path: target.searchPath,
+                                        recursive: false,
+                                        hidden: hidden !== false,
+                                        gitignore: gitignore !== false,
+                                        includeNodeModules: findTargetMentionsNodeModules(target),
+                                        maxResults: effectiveLimit + 1,
+                                        cache: false,
+                                        sortByMtime: true,
+                                        timeoutMs: remainingMs,
+                                        signal,
+                                    });
+                                    matches.push(...result.matches.map((match) => { const fileType = match.fileType ?? match.file_type; const isDir = (fileType === 2 || fileType === "Dir" || (fileType === undefined && statSync(path.resolve(target.searchPath, match.path), { throwIfNoEntry: false })?.isDirectory())) && !match.path.endsWith("/"); const matchPath = isDir ? `${match.path}/` : match.path; return { path: formatFoundPath(matchPath, target.searchPath, searchPaths, cwd), mtime: match.mtime ?? 0 }; }));
+                                    emitUpdate(matches.map((match) => match.path));
+                                }
+                                catch (error) {
+                                    if (String(error).toLowerCase().includes("timed out")) {
+                                        timedOut = true;
+                                        break;
+                                    }
+                                    throw error;
+                                }
                             }
-                            settle(() => resolve({
-                                content: [{ type: "text", text: resultOutput }],
-                                details: Object.keys(details).length > 0 ? details : undefined,
-                            }));
+                            const uniqueMatches = [...matches.reduce((map, match) => { const previous = map.get(match.path); if (!previous || match.mtime > previous.mtime)
+                                    map.set(match.path, match); return map; }, new Map()).values()];
+                            uniqueMatches.sort((a, b) => b.mtime - a.mtime || a.path.localeCompare(b.path));
+                            const resultLimitReached = uniqueMatches.length > effectiveLimit;
+                            settle(() => resolve(buildFindResult(uniqueMatches.slice(0, effectiveLimit).map((match) => match.path), effectiveLimit, timedOut, timeoutMs, skippedMissingPaths, resultLimitReached)));
                             return;
                         }
-                        // Default implementation uses fd.
                         const fdPath = await ensureTool("fd", true);
                         if (signal?.aborted) {
                             settle(() => reject(new Error("Operation aborted")));
@@ -163,110 +402,95 @@ export function createFindToolDefinition(cwd, options) {
                             settle(() => reject(new Error("fd is not available and could not be downloaded")));
                             return;
                         }
-                        // Build fd arguments. --no-require-git makes fd apply hierarchical .gitignore
-                        // semantics whether or not the search path is inside a git repository, without
-                        // leaking sibling-directory rules the way --ignore-file (a global source) would.
-                        const args = [
-                            "--glob",
-                            "--color=never",
-                            "--hidden",
-                            "--no-require-git",
-                            "--max-results",
-                            String(effectiveLimit),
-                        ];
-                        // fd --glob matches against the basename unless --full-path is set; in --full-path
-                        // mode it matches against the absolute candidate path, so a path-containing
-                        // pattern like 'src/**/*.spec.ts' needs a leading '**/' to match anything.
-                        let effectivePattern = pattern;
-                        if (pattern.includes("/")) {
-                            args.push("--full-path");
-                            if (!pattern.startsWith("/") && !pattern.startsWith("**/") && pattern !== "**") {
-                                effectivePattern = `**/${pattern}`;
+                        let timedOut = false;
+                        const relativized = [...exactFileResults];
+                        const deadline = Date.now() + timeoutMs;
+                        const runFdForTarget = async (target, remaining) => {
+                            const args = ["--glob", "--color=never", "--no-require-git", "--max-results", String(remaining + 1)];
+                            if (hidden !== false)
+                                args.push("--hidden");
+                            if (gitignore === false)
+                                args.push("--no-ignore");
+                            if (!findTargetMentionsNodeModules(target))
+                                args.push("--exclude", "node_modules");
+                            let fdPattern = target.pattern;
+                            if (target.pattern.includes("/")) {
+                                args.push("--full-path");
+                                if (!target.pattern.startsWith("/") && !target.pattern.startsWith("**/") && target.pattern !== "**")
+                                    fdPattern = `**/${target.pattern}`;
                             }
-                        }
-                        args.push("--", effectivePattern, searchPath);
-                        const child = spawn(fdPath, args, { stdio: ["ignore", "pipe", "pipe"] });
-                        const rl = createInterface({ input: child.stdout });
-                        let stderr = "";
-                        const lines = [];
-                        stopChild = () => {
-                            if (!child.killed) {
-                                child.kill();
+                            args.push("--", fdPattern, target.searchPath);
+                            const remainingMs = deadline - Date.now();
+                            if (remainingMs <= 0) {
+                                timedOut = true;
+                                return false;
                             }
+                            return await new Promise((resolveTarget, rejectTarget) => {
+                                const child = spawn(fdPath, args, { stdio: ["ignore", "pipe", "pipe"] });
+                                const rl = createInterface({ input: child.stdout });
+                                let stderr = "";
+                                const lines = [];
+                                stopChild = () => {
+                                    if (!child.killed)
+                                        child.kill();
+                                };
+                                const targetTimer = setTimeout(() => {
+                                    timedOut = true;
+                                    stopChild?.();
+                                }, remainingMs);
+                                const cleanup = () => {
+                                    clearTimeout(targetTimer);
+                                    rl.close();
+                                };
+                                child.stderr?.on("data", (chunk) => {
+                                    stderr += chunk.toString();
+                                });
+                                rl.on("line", (line) => lines.push(line));
+                                child.on("error", (error) => {
+                                    cleanup();
+                                    rejectTarget(new Error(`Failed to run fd: ${error.message}`));
+                                });
+                                child.on("close", (code) => {
+                                    cleanup();
+                                    if (signal?.aborted) {
+                                        rejectTarget(new Error("Operation aborted"));
+                                        return;
+                                    }
+                                    if (!timedOut && code !== 0 && lines.length === 0) {
+                                        rejectTarget(new Error(stderr.trim() || `fd exited with code ${code}`));
+                                        return;
+                                    }
+                                    for (const rawLine of lines.slice(0, remaining)) {
+                                        const line = rawLine.replace(/\r$/, "").trim();
+                                        if (line) {
+                                            const found = statSync(path.resolve(target.searchPath, line), { throwIfNoEntry: false })?.isDirectory() && !line.endsWith("/") ? `${line}/` : line;
+                                            relativized.push(formatFoundPath(found, target.searchPath, searchPaths, cwd));
+                                        }
+                                    }
+                                    emitUpdate(relativized);
+                                    resolveTarget(lines.length > Math.max(0, remaining));
+                                });
+                            });
                         };
-                        const cleanup = () => {
-                            rl.close();
-                        };
-                        child.stderr?.on("data", (chunk) => {
-                            stderr += chunk.toString();
-                        });
-                        rl.on("line", (line) => {
-                            lines.push(line);
-                        });
-                        child.on("error", (error) => {
-                            cleanup();
-                            settle(() => reject(new Error(`Failed to run fd: ${error.message}`)));
-                        });
-                        child.on("close", (code) => {
-                            cleanup();
-                            if (signal?.aborted) {
-                                settle(() => reject(new Error("Operation aborted")));
-                                return;
-                            }
-                            const output = lines.join("\n");
-                            if (code !== 0) {
-                                const errorMsg = stderr.trim() || `fd exited with code ${code}`;
-                                if (!output) {
-                                    settle(() => reject(new Error(errorMsg)));
-                                    return;
+                        let resultLimitReached = false;
+                        for (const target of searchableTargets) {
+                            const remaining = effectiveLimit - relativized.length;
+                            if (timedOut)
+                                break;
+                            if (remaining <= 0) {
+                                if (await runFdForTarget(target, 0)) {
+                                    resultLimitReached = true;
+                                    break;
                                 }
+                                continue;
                             }
-                            if (!output) {
-                                settle(() => resolve({
-                                    content: [{ type: "text", text: "No files found matching pattern" }],
-                                    details: undefined,
-                                }));
-                                return;
+                            const targetLimitReached = await runFdForTarget(target, remaining);
+                            if (targetLimitReached) {
+                                resultLimitReached = true;
+                                break;
                             }
-                            const relativized = [];
-                            for (const rawLine of lines) {
-                                const line = rawLine.replace(/\r$/, "").trim();
-                                if (!line)
-                                    continue;
-                                const hadTrailingSlash = line.endsWith("/") || line.endsWith("\\");
-                                let relativePath = line;
-                                if (line.startsWith(searchPath)) {
-                                    relativePath = line.slice(searchPath.length + 1);
-                                }
-                                else {
-                                    relativePath = path.relative(searchPath, line);
-                                }
-                                if (hadTrailingSlash && !relativePath.endsWith("/"))
-                                    relativePath += "/";
-                                relativized.push(toPosixPath(relativePath));
-                            }
-                            const resultLimitReached = relativized.length >= effectiveLimit;
-                            const rawOutput = relativized.join("\n");
-                            const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
-                            let resultOutput = truncation.content;
-                            const details = {};
-                            const notices = [];
-                            if (resultLimitReached) {
-                                notices.push(`${effectiveLimit} results limit reached. Use limit=${effectiveLimit * 2} for more, or refine pattern`);
-                                details.resultLimitReached = effectiveLimit;
-                            }
-                            if (truncation.truncated) {
-                                notices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);
-                                details.truncation = truncation;
-                            }
-                            if (notices.length > 0) {
-                                resultOutput += `\n\n[${notices.join(". ")}]`;
-                            }
-                            settle(() => resolve({
-                                content: [{ type: "text", text: resultOutput }],
-                                details: Object.keys(details).length > 0 ? details : undefined,
-                            }));
-                        });
+                        }
+                        settle(() => resolve(buildFindResult(relativized.slice(0, effectiveLimit), effectiveLimit, timedOut, timeoutMs, skippedMissingPaths, resultLimitReached)));
                     }
                     catch (e) {
                         if (signal?.aborted) {