MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-01 08:51:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): resolve ACP Operation Aborted Errors in grep_search (#23821)

Browse Source 
Co-authored-by: Sri Pasumarthi <sripas@google.com>
This commit is contained in:
Ivan Porty
2026-03-27 19:12:34 -04:00
committed by GitHub
parent 9e74a7ec18
commit b5529c2475
3 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/core/src/tools/grep.test.ts
View File

@@ -53,6 +53,13 @@ describe('GrepTool', () => {
getFileExclusions: () => ({
getGlobExcludes: () => [],
}),
getFileFilteringOptions: () => ({
respectGitIgnore: true,
respectGeminiIgnore: true,
maxFileCount: 1000,
searchTimeout: 30000,
customIgnoreFilePaths: [],
}),
storage: {
getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
},
@@ -337,6 +344,13 @@ describe('GrepTool', () => {
getFileExclusions: () => ({
getGlobExcludes: () => [],
}),
getFileFilteringOptions: () => ({
respectGitIgnore: true,
respectGeminiIgnore: true,
maxFileCount: 1000,
searchTimeout: 30000,
customIgnoreFilePaths: [],
}),
storage: {
getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
},
@@ -414,6 +428,13 @@ describe('GrepTool', () => {
getFileExclusions: () => ({
getGlobExcludes: () => [],
}),
getFileFilteringOptions: () => ({
respectGitIgnore: true,
respectGeminiIgnore: true,
maxFileCount: 1000,
searchTimeout: 30000,
customIgnoreFilePaths: [],
}),
storage: {
getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
},
@@ -618,6 +639,13 @@ describe('GrepTool', () => {
getFileExclusions: () => ({
getGlobExcludes: () => [],
}),
getFileFilteringOptions: () => ({
respectGitIgnore: true,
respectGeminiIgnore: true,
maxFileCount: 1000,
searchTimeout: 30000,
customIgnoreFilePaths: [],
}),
} as unknown as Config;
const multiDirGrepTool = new GrepTool(

17
packages/core/src/tools/grep.ts
View File

@@ -215,9 +215,17 @@ class GrepToolInvocation extends BaseToolInvocation<
// Create a timeout controller to prevent indefinitely hanging searches
const timeoutController = new AbortController();
const configTimeout = this.config.getFileFilteringOptions().searchTimeout;
// If configTimeout is less than standard default, it might be too short for grep.
// We check if it's greater or if we should use DEFAULT_SEARCH_TIMEOUT_MS as a fallback.
// Let's assume the user can set it higher if they want. Using it directly if it exists, otherwise fallback.
const timeoutMs =
configTimeout && configTimeout > DEFAULT_SEARCH_TIMEOUT_MS
? configTimeout
: DEFAULT_SEARCH_TIMEOUT_MS;
const timeoutId = setTimeout(() => {
timeoutController.abort();
}, DEFAULT_SEARCH_TIMEOUT_MS);
}, timeoutMs);
// Link the passed signal to our timeout controller
const onAbort = () => timeoutController.abort();
@@ -252,6 +260,13 @@ class GrepToolInvocation extends BaseToolInvocation<
allMatches = allMatches.concat(matches);
}
} catch (error) {
if (timeoutController.signal.aborted) {
throw new Error(
`Operation timed out after ${timeoutMs}ms. In large repositories, consider narrowing your search scope by specifying a 'dir_path' or an 'include_pattern'.`,
);
}
throw error;
} finally {
clearTimeout(timeoutId);
signal.removeEventListener('abort', onAbort);

17
packages/core/src/tools/ripGrep.ts
View File

@@ -250,9 +250,17 @@ class GrepToolInvocation extends BaseToolInvocation<
// Create a timeout controller to prevent indefinitely hanging searches
const timeoutController = new AbortController();
const configTimeout = this.config.getFileFilteringOptions().searchTimeout;
// If configTimeout is less than standard default, it might be too short for grep.
// We check if it's greater or if we should use DEFAULT_SEARCH_TIMEOUT_MS as a fallback.
// Let's assume the user can set it higher if they want. Using it directly if it exists, otherwise fallback.
const timeoutMs =
configTimeout && configTimeout > DEFAULT_SEARCH_TIMEOUT_MS
? configTimeout
: DEFAULT_SEARCH_TIMEOUT_MS;
const timeoutId = setTimeout(() => {
timeoutController.abort();
}, DEFAULT_SEARCH_TIMEOUT_MS);
}, timeoutMs);
// Link the passed signal to our timeout controller
const onAbort = () => timeoutController.abort();
@@ -279,6 +287,13 @@ class GrepToolInvocation extends BaseToolInvocation<
max_matches_per_file: this.params.max_matches_per_file,
signal: timeoutController.signal,
});
} catch (error) {
if (timeoutController.signal.aborted) {
throw new Error(
`Operation timed out after ${timeoutMs}ms. In large repositories, consider narrowing your search scope by specifying a 'dir_path' or an 'include_pattern'.`,
);
}
throw error;
} finally {
clearTimeout(timeoutId);
signal.removeEventListener('abort', onAbort);