@theia/ai-ide 1.72.0 → 1.72.2

package/lib/browser/workspace-functions.d.ts

@@ -4,7 +4,9 @@ import { CancellationToken, PreferenceService, URI } from '@theia/core';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
+import { FileSearchService } from '@theia/file-search/lib/common/file-search-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
+import ignore from 'ignore';
 import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
 import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { ProblemManager } from '@theia/markers/lib/browser';
@@ -125,6 +127,13 @@ export declare class WorkspaceFunctionScope {
      * platform: POSIX `/foo`, UNC `//host/share`, or Windows drive `C:/foo`.
      */
     static isAbsolutePath(normalized: string): boolean;
+    /**
+     * Returns the URI without a trailing path separator (except for a root path). This makes
+     * directory comparisons via {@link URI.isEqualOrParent} insensitive to a trailing slash, so
+     * an allow-list entry such as `/foo/` matches the directory `/foo` itself, not only its
+     * children.
+     */
+    static withoutTrailingSeparator(uri: URI): URI;
     protected getHomeDirUri(): Promise<URI | undefined>;
     /**
      * Whether the already-separator-normalized path contains `..` as a path
@@ -135,6 +144,13 @@ export declare class WorkspaceFunctionScope {
     shouldExclude(stat: FileStat): Promise<boolean>;
     protected isUserExcluded(fileName: string, userExcludePatterns: string[]): boolean;
     protected isGitIgnored(stat: FileStat, workspaceRoot: URI): Promise<boolean>;
+    /**
+     * Returns the cached `.gitignore` matcher for the given root, reading the file at most
+     * once per root. A root with no (or unreadable) `.gitignore` is cached as `undefined`.
+     * The cache is invalidated by {@link initializeGitignoreWatcher} when the `.gitignore` is
+     * created, changed, or deleted, so individual exclusion checks need no filesystem RPC.
+     */
+    protected getGitignoreMatcher(workspaceRoot: URI): Promise<ReturnType<typeof ignore> | undefined>;
 }
 export declare class GetWorkspaceDirectoryStructure implements ToolProvider {
     static ID: string;
@@ -185,10 +201,18 @@ export declare class FindFilesByPattern implements ToolProvider {
     static ID: string;
     protected readonly workspaceScope: WorkspaceFunctionScope;
     protected readonly preferences: PreferenceService;
-    protected readonly fileService: FileService;
+    protected readonly fileSearchService: FileSearchService;
     getTool(): ToolRequest;
     private findFiles;
-    private buildIgnorePatterns;
-    private traverseDirectory;
+    /**
+     * Renders a search-result URI in the format expected by the caller: an absolute
+     * path for external roots, or a `<rootName>/<relativePath>` (or bare relative
+     * path when no root name is available) for workspace roots.
+     */
+    protected toDisplayPath(match: URI, target: {
+        rootUri: URI;
+        rootName?: string;
+        external: boolean;
+    }): string | undefined;
 }
 //# sourceMappingURL=workspace-functions.d.ts.map

package/lib/browser/workspace-functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-functions.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-functions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAyB,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAAkB,iBAAiB,EAAE,GAAG,EAAQ,MAAM,aAAa,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,QAAQ,EAA2C,MAAM,oCAAoC,CAAC;AACvG,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAehE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAsB,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE9F,qBACa,sBAAsB;IAC/B,SAAS,CAAC,QAAQ,CAAC,mBAAmB,gBAAgB;IAGtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,0BAA0B,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,OAAO,CAAC,iBAAiB,CAAgD;IACzE,OAAO,CAAC,4BAA4B,CAAqB;IAEzD,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,YAAY,CAAoB;IAExC,OAAO,CAAC,UAAU,CAAuC;IAKzD,SAAS,CAAC,IAAI,IAAI,IAAI;IAStB;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;;;;;;;;;;;;OAaG;IACH,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;IA0BlC;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAU7C;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;IAc5C;;;OAGG;IACH,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAqBrD;;;;;;;;;;;OAWG;IACH,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG;IA4DxC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAyCrE,qBAAqB,CAAC,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,GAAG,IAAI;IAQlE;;;;;;;;;;;;;OAaG;IACG,gBAAgB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrD,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAoBhC,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAiBvC;;;;;;;OAOG;IACG,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAoBlE;;;;;;;OAOG;IACH,MAAM,KAAK,iBAAiB,IAAI,OAAO,CAEtC;IAED;;;;OAIG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAmBtE;;;;;;;OAOG;cACa,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAclF;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAOlD,SAAS,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IASnD;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;YAM1C,0BAA0B;IAkBlC,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBrD,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,OAAO;cAIlE,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CA6BrF;AAED,qBACa,8BAA+B,YAAW,YAAY;IAC/D,MAAM,CAAC,EAAE,SAAiD;IAE1D,OAAO,IAAI,WAAW;IAsCtB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,cAAc,EAAE,sBAAsB,CAAC;YAEnC,qBAAqB;YAkCrB,uBAAuB;CAwBxC;AAED,qBACa,mBAAoB,YAAW,YAAY;IACpD,MAAM,CAAC,EAAE,SAA4B;IAErC,OAAO,IAAI,WAAW;IAgEtB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,OAAO,CAAC,QAAQ;YAKF,cAAc;IA0C5B,OAAO,CAAC,mBAAmB;YAuBb,kBAAkB;YA+BlB,iBAAiB;IAwE/B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,wBAAwB;CAQnC;AAED,qBACa,oBAAqB,YAAW,YAAY;IACrD,MAAM,CAAC,EAAE,SAAuC;IAEhD,OAAO,IAAI,WAAW;IA+BtB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAE3C,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;YA6CjF,iBAAiB;CA6BlC;AAED,qBACa,sBAAuB,YAAW,YAAY;IACvD,MAAM,CAAC,EAAE,SAA2B;IAGpC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAExD,OAAO,IAAI,WAAW;cAwCN,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuEvG;;;OAGG;IACH,SAAS,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,GAAG,KAAK;CAmBhG;AAED,qBACa,kBAAmB,YAAW,YAAY;IACnD,MAAM,CAAC,EAAE,SAAqC;IAG9C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,OAAO,IAAI,WAAW;YAiER,SAAS;YAwGT,mBAAmB;YA0BnB,iBAAiB;CAgElC"}
+{"version":3,"file":"workspace-functions.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-functions.ts"],"names":[],"mappings":"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"}

package/lib/browser/workspace-functions.js

@@ -9,6 +9,7 @@ const env_variables_1 = require("@theia/core/lib/common/env-variables");
 const inversify_1 = require("@theia/core/shared/inversify");
 const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
 const files_1 = require("@theia/filesystem/lib/common/files");
+const file_search_service_1 = require("@theia/file-search/lib/common/file-search-service");
 const browser_1 = require("@theia/workspace/lib/browser");
 const workspace_functions_1 = require("../common/workspace-functions");
 const toolcall_utils_1 = require("@theia/ai-chat-ui/lib/browser/chat-response-renderer/toolcall-utils");
@@ -310,7 +311,9 @@ let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionS
             }
             const uri = await this.toExternalUri(trimmed);
             if (uri && uri.scheme === 'file') {
-                result.push(uri.normalizePath());
+                // Strip a trailing separator so an entry like `/foo/` still matches the
+                // directory `/foo` itself (URI.isEqualOrParent compares the last segment exactly).
+                result.push(WorkspaceFunctionScope_1.withoutTrailingSeparator(uri.normalizePath()));
             }
         }
         return result;
@@ -381,6 +384,19 @@ let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionS
         }
         return /^[A-Za-z]:\//.test(normalized);
     }
+    /**
+     * Returns the URI without a trailing path separator (except for a root path). This makes
+     * directory comparisons via {@link URI.isEqualOrParent} insensitive to a trailing slash, so
+     * an allow-list entry such as `/foo/` matches the directory `/foo` itself, not only its
+     * children.
+     */
+    static withoutTrailingSeparator(uri) {
+        const path = uri.path.toString();
+        if (path.length > 1 && path.endsWith('/')) {
+            return uri.withPath(path.substring(0, path.length - 1));
+        }
+        return uri;
+    }
     getHomeDirUri() {
         if (!this.homeDirUri) {
             this.homeDirUri = this.envVariablesServer.getHomeDirUri()
@@ -429,31 +445,41 @@ let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionS
         return userExcludePatterns.some(pattern => new minimatch_1.Minimatch(pattern, { dot: true }).match(fileName));
     }
     async isGitIgnored(stat, workspaceRoot) {
+        const matcher = await this.getGitignoreMatcher(workspaceRoot);
+        if (!matcher) {
+            return false;
+        }
+        const relativePath = workspaceRoot.relative(stat.resource);
+        if (!relativePath) {
+            return false;
+        }
+        const relativePathStr = relativePath.toString() + (stat.isDirectory ? '/' : '');
+        return matcher.ignores(relativePathStr);
+    }
+    /**
+     * Returns the cached `.gitignore` matcher for the given root, reading the file at most
+     * once per root. A root with no (or unreadable) `.gitignore` is cached as `undefined`.
+     * The cache is invalidated by {@link initializeGitignoreWatcher} when the `.gitignore` is
+     * created, changed, or deleted, so individual exclusion checks need no filesystem RPC.
+     */
+    async getGitignoreMatcher(workspaceRoot) {
         await this.initializeGitignoreWatcher(workspaceRoot);
         const rootKey = workspaceRoot.toString();
-        const gitignoreUri = workspaceRoot.resolve(this.GITIGNORE_FILE_NAME);
+        if (this.gitignoreMatchers.has(rootKey)) {
+            return this.gitignoreMatchers.get(rootKey);
+        }
+        let matcher;
         try {
-            const fileStat = await this.fileService.resolve(gitignoreUri);
-            if (fileStat) {
-                let matcher = this.gitignoreMatchers.get(rootKey);
-                if (!matcher) {
-                    const gitignoreContent = await this.fileService.read(gitignoreUri);
-                    matcher = (0, ignore_1.default)().add(gitignoreContent.value);
-                    this.gitignoreMatchers.set(rootKey, matcher);
-                }
-                const relativePath = workspaceRoot.relative(stat.resource);
-                if (relativePath) {
-                    const relativePathStr = relativePath.toString() + (stat.isDirectory ? '/' : '');
-                    if (matcher.ignores(relativePathStr)) {
-                        return true;
-                    }
-                }
-            }
+            const gitignoreUri = workspaceRoot.resolve(this.GITIGNORE_FILE_NAME);
+            const gitignoreContent = await this.fileService.read(gitignoreUri);
+            matcher = (0, ignore_1.default)().add(gitignoreContent.value);
         }
         catch {
-            // If .gitignore does not exist or cannot be read, continue without error
+            // No .gitignore (or it cannot be read): cache the absence so we don't retry on every check.
+            matcher = undefined;
         }
-        return false;
+        this.gitignoreMatchers.set(rootKey, matcher);
+        return matcher;
     }
 };
 exports.WorkspaceFunctionScope = WorkspaceFunctionScope;
@@ -565,16 +591,23 @@ let GetWorkspaceDirectoryStructure = class GetWorkspaceDirectoryStructure {
         const stat = await this.fileService.resolve(uri);
         const result = {};
         if (stat && stat.isDirectory && stat.children) {
+            // Determine which child directories to include (the exclusion check may be async)...
+            const childDirs = [];
             for (const child of stat.children) {
                 if (cancellationToken?.isCancellationRequested) {
                     return { error: 'Operation cancelled by user' };
                 }
-                if (!child.isDirectory || (await this.workspaceScope.shouldExclude(child))) {
-                    continue;
+                if (child.isDirectory && !(await this.workspaceScope.shouldExclude(child))) {
+                    childDirs.push(child.resource);
                 }
-                const dirName = child.resource.path.base;
-                result[dirName] = await this.buildDirectoryStructure(child.resource, cancellationToken);
             }
+            // ...then resolve their subtrees concurrently, so the traversal costs O(depth)
+            // round-trips instead of one serial round-trip per directory. Empty directories
+            // are preserved (they resolve to an empty object).
+            const subtrees = await Promise.all(childDirs.map(childUri => this.buildDirectoryStructure(childUri, cancellationToken)));
+            childDirs.forEach((childUri, index) => {
+                result[childUri.path.base] = subtrees[index];
+            });
         }
         return result;
     }
@@ -928,34 +961,29 @@ let GetWorkspaceFileList = class GetWorkspaceFileList {
             if (!stat || !stat.isDirectory) {
                 return JSON.stringify({ error: 'Directory not found' });
             }
-            return await this.listFilesDirectly(targetUri, cancellationToken);
+            return await this.listFilesDirectly(stat, cancellationToken);
         }
         catch (error) {
             return JSON.stringify({ error: 'Directory not found' });
         }
     }
-    async listFilesDirectly(uri, cancellationToken) {
+    async listFilesDirectly(stat, cancellationToken) {
         if (cancellationToken?.isCancellationRequested) {
             return JSON.stringify({ error: 'Operation cancelled by user' });
         }
-        const stat = await this.fileService.resolve(uri);
         const result = {};
-        if (stat && stat.isDirectory) {
-            if (await this.workspaceScope.shouldExclude(stat)) {
-                return JSON.stringify(result);
+        if (await this.workspaceScope.shouldExclude(stat)) {
+            return JSON.stringify(result);
+        }
+        // `stat` already carries one level of children from the caller's resolve, so no extra RPC.
+        for (const child of stat.children ?? []) {
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
             }
-            const children = await this.fileService.resolve(uri);
-            if (children.children) {
-                for (const child of children.children) {
-                    if (cancellationToken?.isCancellationRequested) {
-                        return JSON.stringify({ error: 'Operation cancelled by user' });
-                    }
-                    if (await this.workspaceScope.shouldExclude(child)) {
-                        continue;
-                    }
-                    result[child.resource.path.base] = child.isDirectory ? 'directory' : 'file';
-                }
+            if (await this.workspaceScope.shouldExclude(child)) {
+                continue;
             }
+            result[child.resource.path.base] = child.isDirectory ? 'directory' : 'file';
         }
         return JSON.stringify(result);
     }
@@ -1132,8 +1160,6 @@ let FindFilesByPattern = class FindFilesByPattern {
                 '\'src/**/*.js\' for JavaScript files in the src directory. The function respects gitignore patterns and user exclusions, ' +
                 'returns workspace-relative paths (e.g., "my-project/src/index.ts") or absolute paths for external roots, ' +
                 'and limits results to 200 files maximum. ' +
-                'Performance note: This traverses directories recursively which may be slow in large workspaces. ' +
-                'For better performance, use specific subdirectory patterns (e.g., \'src/**/*.ts\' instead of \'**/*.ts\'). ' +
                 'Use this to find files by name/extension. Do NOT use this for searching file contents - use searchInWorkspace instead.',
             parameters: {
                 type: 'object',
@@ -1142,8 +1168,7 @@ let FindFilesByPattern = class FindFilesByPattern {
                         type: 'string',
                         description: 'Glob pattern to match files against. ' +
                             'Examples: \'**/*.ts\' (all TypeScript files), \'src/**/*.js\' (JS files in src), ' +
-                            '\'**/*.{js,ts}\' (JS or TS files), \'**/test/**/*.spec.ts\' (test files). ' +
-                            'Use specific subdirectory prefixes for better performance (e.g., \'packages/core/**/*.ts\' instead of \'**/*.ts\').'
+                            '\'**/*.{js,ts}\' (JS or TS files), \'**/test/**/*.spec.ts\' (test files).'
                     },
                     exclude: {
                         type: 'array',
@@ -1190,29 +1215,19 @@ let FindFilesByPattern = class FindFilesByPattern {
             return JSON.stringify({ error: 'Operation cancelled by user' });
         }
         try {
-            const patternMatcher = new minimatch_1.Minimatch(pattern, { dot: false });
-            const files = [];
             const maxResults = 200;
+            const useGitIgnore = this.preferences.get(workspace_preferences_1.CONSIDER_GITIGNORE_PREF, true);
+            const userExcludes = this.preferences.get(workspace_preferences_1.USER_EXCLUDE_PATTERN_PREF, []);
+            const excludes = [...userExcludes, ...(excludePatterns ?? [])];
+            // Resolve the set of roots to search and how each root's results should be rendered.
+            const targets = [];
             if (searchRoot) {
                 const resolved = await this.workspaceScope.resolveToUri(searchRoot);
                 if (!resolved) {
                     return JSON.stringify({ error: `Invalid searchRoot: '${searchRoot}'` });
                 }
-                const rootUri = resolved;
-                const isExternalRoot = !this.workspaceScope.isInWorkspace(rootUri);
-                await this.workspaceScope.ensureAccessible(rootUri);
-                const ignorePatterns = isExternalRoot
-                    ? this.preferences.get(workspace_preferences_1.USER_EXCLUDE_PATTERN_PREF, [])
-                    : await this.buildIgnorePatterns(rootUri);
-                const allExcludes = [...ignorePatterns];
-                if (excludePatterns && excludePatterns.length > 0) {
-                    allExcludes.push(...excludePatterns);
-                }
-                if (cancellationToken?.isCancellationRequested) {
-                    return JSON.stringify({ error: 'Operation cancelled by user' });
-                }
-                const excludeMatchers = allExcludes.map(excludePattern => new minimatch_1.Minimatch(excludePattern, { dot: true }));
-                await this.traverseDirectory(rootUri, rootUri, undefined, patternMatcher, excludeMatchers, files, maxResults, cancellationToken, isExternalRoot);
+                await this.workspaceScope.ensureAccessible(resolved);
+                targets.push({ rootUri: resolved, external: !this.workspaceScope.isInWorkspace(resolved) });
             }
             else {
                 const rootMapping = this.workspaceScope.getRootMapping();
@@ -1220,19 +1235,38 @@ let FindFilesByPattern = class FindFilesByPattern {
                     return JSON.stringify({ error: 'No workspace has been opened yet' });
                 }
                 for (const [rootName, rootUri] of rootMapping) {
-                    if (cancellationToken?.isCancellationRequested) {
-                        return JSON.stringify({ error: 'Operation cancelled by user' });
-                    }
-                    if (files.length >= maxResults) {
-                        break;
-                    }
-                    const ignorePatterns = await this.buildIgnorePatterns(rootUri);
-                    const allExcludes = [...ignorePatterns];
-                    if (excludePatterns && excludePatterns.length > 0) {
-                        allExcludes.push(...excludePatterns);
+                    targets.push({ rootUri, rootName, external: false });
+                }
+            }
+            // Delegate the actual traversal to the backend ripgrep-based file search.
+            // It runs natively on the backend filesystem (no per-directory RPC) and applies
+            // include/exclude globs.
+            const files = [];
+            for (const target of targets) {
+                if (cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                if (files.length > maxResults) {
+                    break;
+                }
+                // `considerGitIgnore` is scoped to workspace roots (see its preference description),
+                // so external allow-listed roots are searched with user/caller excludes only (plus
+                // `.git`). Applying gitignore there would also leak the user's *global* gitignore
+                // into an explicitly allow-listed directory and silently hide files.
+                // Request one extra result across all roots so we can detect truncation.
+                const matches = await this.fileSearchService.find('', {
+                    rootUris: [target.rootUri.toString()],
+                    includePatterns: [pattern],
+                    excludePatterns: target.external ? [...excludes, '.git'] : excludes,
+                    useGitIgnore: target.external ? false : useGitIgnore,
+                    fuzzyMatch: false,
+                    limit: maxResults - files.length + 1
+                }, cancellationToken);
+                for (const match of matches) {
+                    const display = this.toDisplayPath(new core_1.URI(match), target);
+                    if (display !== undefined) {
+                        files.push(display);
                     }
-                    const excludeMatchers = allExcludes.map(excludePattern => new minimatch_1.Minimatch(excludePattern, { dot: true }));
-                    await this.traverseDirectory(rootUri, rootUri, rootName, patternMatcher, excludeMatchers, files, maxResults, cancellationToken);
                 }
             }
             if (cancellationToken?.isCancellationRequested) {
@@ -1242,7 +1276,6 @@ let FindFilesByPattern = class FindFilesByPattern {
                 files: files.slice(0, maxResults)
             };
             if (files.length > maxResults) {
-                result.totalFound = files.length;
                 result.truncated = true;
             }
             return JSON.stringify(result);
@@ -1251,70 +1284,20 @@ let FindFilesByPattern = class FindFilesByPattern {
             return JSON.stringify({ error: `Failed to find files: ${error.message}` });
         }
     }
-    async buildIgnorePatterns(workspaceRoot) {
-        const patterns = [];
-        // Get user exclude patterns from preferences
-        const userExcludePatterns = this.preferences.get(workspace_preferences_1.USER_EXCLUDE_PATTERN_PREF, []);
-        patterns.push(...userExcludePatterns);
-        // Add gitignore patterns if enabled
-        const shouldConsiderGitIgnore = this.preferences.get(workspace_preferences_1.CONSIDER_GITIGNORE_PREF, false);
-        if (shouldConsiderGitIgnore) {
-            try {
-                const gitignoreUri = workspaceRoot.resolve('.gitignore');
-                const gitignoreContent = await this.fileService.read(gitignoreUri);
-                const gitignoreLines = gitignoreContent.value
-                    .split('\n')
-                    .map(line => line.trim())
-                    .filter(line => line && !line.startsWith('#'));
-                patterns.push(...gitignoreLines);
-            }
-            catch {
-                // Gitignore file doesn't exist or can't be read, continue without it
-            }
-        }
-        return patterns;
-    }
-    async traverseDirectory(currentUri, searchRoot, rootName, patternMatcher, excludeMatchers, results, maxResults, cancellationToken, emitAbsolutePaths = false) {
-        if (cancellationToken?.isCancellationRequested || results.length >= maxResults) {
-            return;
-        }
-        try {
-            const stat = await this.fileService.resolve(currentUri);
-            if (!stat || !stat.isDirectory || !stat.children) {
-                return;
-            }
-            for (const child of stat.children) {
-                if (cancellationToken?.isCancellationRequested || results.length >= maxResults) {
-                    break;
-                }
-                const relativePath = searchRoot.relative(child.resource)?.toString();
-                if (!relativePath) {
-                    continue;
-                }
-                const shouldExclude = excludeMatchers.some(matcher => matcher.match(relativePath)) ||
-                    (await this.workspaceScope.shouldExclude(child));
-                if (shouldExclude) {
-                    continue;
-                }
-                if (child.isDirectory) {
-                    await this.traverseDirectory(child.resource, searchRoot, rootName, patternMatcher, excludeMatchers, results, maxResults, cancellationToken, emitAbsolutePaths);
-                }
-                else if (patternMatcher.match(relativePath)) {
-                    if (emitAbsolutePaths) {
-                        results.push(child.resource.path.toString());
-                    }
-                    else if (rootName) {
-                        results.push(`${rootName}/${relativePath}`);
-                    }
-                    else {
-                        results.push(relativePath);
-                    }
-                }
-            }
+    /**
+     * Renders a search-result URI in the format expected by the caller: an absolute
+     * path for external roots, or a `<rootName>/<relativePath>` (or bare relative
+     * path when no root name is available) for workspace roots.
+     */
+    toDisplayPath(match, target) {
+        if (target.external) {
+            return match.path.toString();
         }
-        catch {
-            // If we can't access a directory, skip it
+        const relativePath = target.rootUri.relative(match)?.toString();
+        if (relativePath === undefined) {
+            return undefined;
         }
+        return target.rootName ? `${target.rootName}/${relativePath}` : relativePath;
     }
 };
 exports.FindFilesByPattern = FindFilesByPattern;
@@ -1327,9 +1310,9 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Object)
 ], FindFilesByPattern.prototype, "preferences", void 0);
 tslib_1.__decorate([
-    (0, inversify_1.inject)(file_service_1.FileService),
-    tslib_1.__metadata("design:type", file_service_1.FileService)
-], FindFilesByPattern.prototype, "fileService", void 0);
+    (0, inversify_1.inject)(file_search_service_1.FileSearchService),
+    tslib_1.__metadata("design:type", Object)
+], FindFilesByPattern.prototype, "fileSearchService", void 0);
 exports.FindFilesByPattern = FindFilesByPattern = FindFilesByPattern_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], FindFilesByPattern);