summaryrefslogtreecommitdiff
path: root/packages/core/src/tools/read-many-files.ts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/core/src/tools/read-many-files.ts')
-rw-r--r--packages/core/src/tools/read-many-files.ts38
1 files changed, 19 insertions, 19 deletions
diff --git a/packages/core/src/tools/read-many-files.ts b/packages/core/src/tools/read-many-files.ts
index 7ea6c722..fb160a79 100644
--- a/packages/core/src/tools/read-many-files.ts
+++ b/packages/core/src/tools/read-many-files.ts
@@ -128,8 +128,6 @@ export class ReadManyFilesTool extends BaseTool<
> {
static readonly Name: string = 'read_many_files';
- private readonly geminiIgnorePatterns: string[] = [];
-
constructor(private config: Config) {
const parameterSchema: Schema = {
type: Type.OBJECT,
@@ -213,9 +211,6 @@ Use this tool when the user's query implies needing the content of several files
Icon.FileSearch,
parameterSchema,
);
- this.geminiIgnorePatterns = config
- .getFileService()
- .getGeminiIgnorePatterns();
}
validateParams(params: ReadManyFilesParams): string | null {
@@ -233,17 +228,19 @@ Use this tool when the user's query implies needing the content of several files
// Determine the final list of exclusion patterns exactly as in execute method
const paramExcludes = params.exclude || [];
const paramUseDefaultExcludes = params.useDefaultExcludes !== false;
-
+ const geminiIgnorePatterns = this.config
+ .getFileService()
+ .getGeminiIgnorePatterns();
const finalExclusionPatternsForDescription: string[] =
paramUseDefaultExcludes
- ? [...DEFAULT_EXCLUDES, ...paramExcludes, ...this.geminiIgnorePatterns]
- : [...paramExcludes, ...this.geminiIgnorePatterns];
+ ? [...DEFAULT_EXCLUDES, ...paramExcludes, ...geminiIgnorePatterns]
+ : [...paramExcludes, ...geminiIgnorePatterns];
let excludeDesc = `Excluding: ${finalExclusionPatternsForDescription.length > 0 ? `patterns like \`${finalExclusionPatternsForDescription.slice(0, 2).join('`, `')}${finalExclusionPatternsForDescription.length > 2 ? '...`' : '`'}` : 'none specified'}`;
// Add a note if .geminiignore patterns contributed to the final list of exclusions
- if (this.geminiIgnorePatterns.length > 0) {
- const geminiPatternsInEffect = this.geminiIgnorePatterns.filter((p) =>
+ if (geminiIgnorePatterns.length > 0) {
+ const geminiPatternsInEffect = geminiIgnorePatterns.filter((p) =>
finalExclusionPatternsForDescription.includes(p),
).length;
if (geminiPatternsInEffect > 0) {
@@ -305,15 +302,18 @@ Use this tool when the user's query implies needing the content of several files
}
try {
- const entries = await glob(searchPatterns, {
- cwd: this.config.getTargetDir(),
- ignore: effectiveExcludes,
- nodir: true,
- dot: true,
- absolute: true,
- nocase: true,
- signal,
- });
+ const entries = await glob(
+ searchPatterns.map((p) => p.replace(/\\/g, '/')),
+ {
+ cwd: this.config.getTargetDir(),
+ ignore: effectiveExcludes,
+ nodir: true,
+ dot: true,
+ absolute: true,
+ nocase: true,
+ signal,
+ },
+ );
const gitFilteredEntries = fileFilteringOptions.respectGitIgnore
? fileDiscovery