feat(core): let grep results satisfy prior-read checks #5043
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /** | ||
| * @license | ||
| * Copyright 2026 Qwen Team | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; | ||
| import fs from 'node:fs/promises'; | ||
| import os from 'node:os'; | ||
| import path from 'node:path'; | ||
| import type { Config } from '../config/config.js'; | ||
| import { FileReadCache } from '../services/fileReadCache.js'; | ||
| import { recordGrepResultFileReads } from './grepReadTracking.js'; | ||
|
|
||
| describe('recordGrepResultFileReads', () => { | ||
| let tempRootDir: string; | ||
| let fileReadCache: FileReadCache; | ||
|
|
||
| beforeEach(async () => { | ||
| tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-read-cache-')); | ||
| fileReadCache = new FileReadCache(); | ||
| }); | ||
|
|
||
| afterEach(async () => { | ||
| vi.restoreAllMocks(); | ||
| await fs.rm(tempRootDir, { recursive: true, force: true }); | ||
| }); | ||
|
|
||
| function mockConfig( | ||
| cache: FileReadCache | undefined = fileReadCache, | ||
| disabled = false, | ||
| ): Config { | ||
| return { | ||
| getFileReadCacheDisabled: () => disabled, | ||
| getFileReadCache: () => cache, | ||
| } as unknown as Config; | ||
| } | ||
|
|
||
| it('does nothing when the cache is disabled', async () => { | ||
| const filePath = path.join(tempRootDir, 'result.ts'); | ||
| await fs.writeFile(filePath, 'match'); | ||
| const stats = await fs.stat(filePath); | ||
|
|
||
| await recordGrepResultFileReads(mockConfig(fileReadCache, true), [ | ||
| filePath, | ||
| ]); | ||
|
|
||
| expect(fileReadCache.check(stats).state).toBe('unknown'); | ||
| }); | ||
|
|
||
| it('does nothing when the config has no cache', async () => { | ||
| const filePath = path.join(tempRootDir, 'result.ts'); | ||
| await fs.writeFile(filePath, 'match'); | ||
|
|
||
| await expect( | ||
| recordGrepResultFileReads(mockConfig(undefined), [filePath]), | ||
| ).resolves.toBeUndefined(); | ||
| }); | ||
|
|
||
| it('records text grep results as partial cacheable reads', async () => { | ||
| const filePath = path.join(tempRootDir, 'result.ts'); | ||
| await fs.writeFile(filePath, 'const value = "match";'); | ||
| const stats = await fs.stat(filePath); | ||
|
|
||
| await recordGrepResultFileReads(mockConfig(), [filePath]); | ||
|
|
||
| const result = fileReadCache.check(stats); | ||
| expect(result.state).toBe('fresh'); | ||
| if (result.state === 'fresh') { | ||
| expect(result.entry.lastReadWasFull).toBe(false); | ||
| expect(result.entry.lastReadCacheable).toBe(true); | ||
| } | ||
| }); | ||
|
|
||
| it('does not make notebook grep results cacheable', async () => { | ||
| const filePath = path.join(tempRootDir, 'notebook.ipynb'); | ||
| await fs.writeFile(filePath, '{"cells":[{"source":"match"}]}'); | ||
| const stats = await fs.stat(filePath); | ||
|
|
||
| await recordGrepResultFileReads(mockConfig(), [filePath]); | ||
|
|
||
| const result = fileReadCache.check(stats); | ||
| expect(result.state).toBe('fresh'); | ||
| if (result.state === 'fresh') { | ||
| expect(result.entry.lastReadWasFull).toBe(false); | ||
| expect(result.entry.lastReadCacheable).toBe(false); | ||
| } | ||
| }); | ||
|
|
||
| it('ignores non-file grep result paths', async () => { | ||
| const dirPath = path.join(tempRootDir, 'nested'); | ||
| await fs.mkdir(dirPath); | ||
| const stats = await fs.stat(dirPath); | ||
|
|
||
| await recordGrepResultFileReads(mockConfig(), [dirPath]); | ||
|
|
||
| expect(fileReadCache.check(stats).state).toBe('unknown'); | ||
| }); | ||
|
|
||
| it('ignores result paths that disappear before stat', async () => { | ||
| await expect( | ||
| recordGrepResultFileReads(mockConfig(), [ | ||
| path.join(tempRootDir, 'missing.ts'), | ||
| ]), | ||
| ).resolves.toBeUndefined(); | ||
| }); | ||
|
|
||
| it('continues after a stat failure', async () => { | ||
| const filePath = path.join(tempRootDir, 'result.ts'); | ||
| const blockedPath = path.join(tempRootDir, 'blocked.ts'); | ||
| await fs.writeFile(filePath, 'match'); | ||
| const stats = await fs.stat(filePath); | ||
| const actualStat = fs.stat.bind(fs); | ||
| vi.spyOn(fs, 'stat').mockImplementation(async (target) => { | ||
| if (target === blockedPath) { | ||
| throw Object.assign(new Error('denied'), { code: 'EACCES' }); | ||
| } | ||
| return actualStat(target); | ||
| }); | ||
|
|
||
| await recordGrepResultFileReads(mockConfig(), [blockedPath, filePath]); | ||
|
|
||
| expect(fileReadCache.check(stats).state).toBe('fresh'); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /** | ||
| * @license | ||
| * Copyright 2026 Qwen Team | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import fs from 'node:fs/promises'; | ||
| import path from 'node:path'; | ||
| import type { Config } from '../config/config.js'; | ||
| import { createDebugLogger } from '../utils/debugLogger.js'; | ||
|
|
||
| const STAT_BATCH_SIZE = 50; | ||
| const NON_CACHEABLE_GREP_EXTENSIONS = new Set(['.ipynb']); | ||
| const debugLogger = createDebugLogger('GREP_READ_TRACKING'); | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. [Suggestion] No dedicated — qwen3.7-max via Qwen Code /review |
||
| export async function recordGrepResultFileReads( | ||
| config: Config, | ||
| filePaths: string[], | ||
| ): Promise<void> { | ||
| if (config.getFileReadCacheDisabled?.()) { | ||
| return; | ||
| } | ||
| const cache = config.getFileReadCache?.(); | ||
| if (!cache) { | ||
| return; | ||
| } | ||
|
|
||
| const uniqueFilePaths = Array.from(new Set(filePaths)); | ||
| for (let i = 0; i < uniqueFilePaths.length; i += STAT_BATCH_SIZE) { | ||
| const batch = uniqueFilePaths.slice(i, i + STAT_BATCH_SIZE); | ||
| await Promise.all( | ||
| batch.map(async (filePath) => { | ||
| try { | ||
| const stats = await fs.stat(filePath); | ||
| if (!stats.isFile()) { | ||
| return; | ||
| } | ||
| cache.recordRead(filePath, stats, { | ||
| full: false, | ||
| cacheable: isGrepResultCacheable(filePath), | ||
| }); | ||
| } catch (error) { | ||
| if ((error as NodeJS.ErrnoException).code !== 'ENOENT') { | ||
| debugLogger.debug( | ||
| 'Failed to stat grep result path', | ||
| filePath, | ||
| error, | ||
| ); | ||
| } | ||
| } | ||
| }), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| function isGrepResultCacheable(filePath: string): boolean { | ||
| return !NON_CACHEABLE_GREP_EXTENSIONS.has( | ||
| path.extname(filePath).toLowerCase(), | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Suggestion] These assertions only verify
state === 'fresh'but do not checklastReadWasFull === falseorlastReadCacheable === true. The{full: false, cacheable: true}contract — which is the entire semantic point of this PR — is unverified. If someone accidentally flippedfulltotrue, these tests would still pass but the Read tool would incorrectly returnfile_unchangedplaceholders.— qwen3.7-max via Qwen Code /review