fix(cache):adress memory management and error handling feedback 2

Author: Mnehmos

src/core/services/__tests__/fileReadCacheService.spec.ts

@@ -4,6 +4,7 @@ import {
 	subtractRange,
 	subtractRanges,
 	ConversationMessage,
+	mtimeCache,
 } from "../fileReadCacheService"
 import { stat } from "fs/promises"
 import { lruCache } from "../../utils/lruCache"
@@ -60,25 +61,41 @@ describe("fileReadCacheService", () => {
 	})
 	describe("processAndFilterReadRequest", () => {
 		const MOCK_FILE_PATH = "/test/file.txt"
-		const CURRENT_MTIME = new Date().toISOString()
+		const CURRENT_MTIME = new Date("2025-01-01T12:00:00.000Z")
+
 		beforeEach(() => {
 			vi.clearAllMocks()
-			mockedStat.mockResolvedValue({ mtime: { toISOString: () => CURRENT_MTIME } } as any)
+			mtimeCache.clear()
+			vi.useFakeTimers().setSystemTime(CURRENT_MTIME)
+			mockedStat.mockResolvedValue({
+				mtime: CURRENT_MTIME,
+				size: 1024, // Add size for the new cache implementation
+			} as any)
 		})
+
+		afterEach(() => {
+			vi.useRealTimers()
+		})
+
+		afterAll(() => {
+			vi.clearAllMocks()
+		})
+
 		it("should allow all when history is empty", async () => {
 			const requestedRanges = [{ start: 1, end: 10 }]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, [])
 			expect(result.status).toBe("ALLOW_ALL")
 			expect(result.rangesToRead).toEqual(requestedRanges)
 		})
+
 		it("should reject all when a full cache hit occurs", async () => {
 			const requestedRanges = [{ start: 1, end: 10 }]
 			const conversationHistory: ConversationMessage[] = [
 				{
 					files: [
 						{
 							fileName: MOCK_FILE_PATH,
-							mtime: new Date(CURRENT_MTIME).getTime(),
+							mtime: CURRENT_MTIME.getTime(),
 							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
@@ -88,14 +105,15 @@ describe("fileReadCacheService", () => {
 			expect(result.status).toBe("REJECT_ALL")
 			expect(result.rangesToRead).toEqual([])
 		})
+
 		it("should allow partial when a partial cache hit occurs", async () => {
 			const requestedRanges = [{ start: 1, end: 20 }]
 			const conversationHistory: ConversationMessage[] = [
 				{
 					files: [
 						{
 							fileName: MOCK_FILE_PATH,
-							mtime: new Date(CURRENT_MTIME).getTime(),
+							mtime: CURRENT_MTIME.getTime(),
 							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
@@ -105,14 +123,15 @@ describe("fileReadCacheService", () => {
 			expect(result.status).toBe("ALLOW_PARTIAL")
 			expect(result.rangesToRead).toEqual([{ start: 11, end: 20 }])
 		})
+
 		it("should allow all when mtime is older in history", async () => {
 			const requestedRanges = [{ start: 1, end: 10 }]
 			const conversationHistory: ConversationMessage[] = [
 				{
 					files: [
 						{
 							fileName: MOCK_FILE_PATH,
-							mtime: new Date(CURRENT_MTIME).getTime() - 100, // Older mtime
+							mtime: CURRENT_MTIME.getTime() - 100, // Older mtime
 							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
@@ -122,13 +141,15 @@ describe("fileReadCacheService", () => {
 			expect(result.status).toBe("ALLOW_ALL")
 			expect(result.rangesToRead).toEqual(requestedRanges)
 		})
+
 		it("should allow all when file does not exist", async () => {
 			mockedStat.mockRejectedValue({ code: "ENOENT" })
 			const requestedRanges = [{ start: 1, end: 10 }]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, [])
 			expect(result.status).toBe("ALLOW_ALL")
 			expect(result.rangesToRead).toEqual(requestedRanges)
 		})
+
 		it("should throw an error for non-ENOENT stat errors", async () => {
 			const error = new Error("EPERM")
 			mockedStat.mockRejectedValue(error)

src/core/tools/readFileTool.ts

@@ -565,7 +565,7 @@ export async function readFileTool(
 					// Track file read
 					await cline.fileContextTracker.trackFileContext(relPath, "read_tool" as RecordSource)
 
-					const stats = fs.statSync(fullPath)
+					const stats = await fs.promises.stat(fullPath)
 					const metadata = {
 						fileName: relPath,
 						mtime: stats.mtime.toISOString(),