feat(file-reads): Implement file-read caching

Author: Mnehmos

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

@@ -83,10 +83,10 @@ describe("fileReadCacheService", () => {
 						{
 							fileName: MOCK_FILE_PATH,
 							mtime: CURRENT_MTIME,
-							loadedRanges: [{ start: 1, end: 10 }],
+							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
-				},
+				} as any,
 			]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, conversationHistory)
 			expect(result.status).toBe("REJECT_ALL")
@@ -101,10 +101,10 @@ describe("fileReadCacheService", () => {
 						{
 							fileName: MOCK_FILE_PATH,
 							mtime: CURRENT_MTIME,
-							loadedRanges: [{ start: 1, end: 10 }],
+							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
-				},
+				} as any,
 			]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, conversationHistory)
 			expect(result.status).toBe("ALLOW_PARTIAL")
@@ -119,10 +119,10 @@ describe("fileReadCacheService", () => {
 						{
 							fileName: MOCK_FILE_PATH,
 							mtime: CURRENT_MTIME - 100, // Older mtime
-							loadedRanges: [{ start: 1, end: 10 }],
+							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
-				},
+				} as any,
 			]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, conversationHistory)
 			expect(result.status).toBe("ALLOW_ALL")
@@ -137,10 +137,10 @@ describe("fileReadCacheService", () => {
 						{
 							fileName: "/another/file.txt",
 							mtime: CURRENT_MTIME,
-							loadedRanges: [{ start: 1, end: 10 }],
+							lineRanges: [{ start: 1, end: 10 }],
 						},
 					],
-				},
+				} as any,
 			]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, conversationHistory)
 			expect(result.status).toBe("ALLOW_ALL")
@@ -156,20 +156,20 @@ describe("fileReadCacheService", () => {
 						{
 							fileName: MOCK_FILE_PATH,
 							mtime: CURRENT_MTIME - 100,
-							loadedRanges: [{ start: 1, end: 20 }],
+							lineRanges: [{ start: 1, end: 20 }],
 						},
 					],
-				},
+				} as any,
 				{
 					// Newer, correct mtime but only partial coverage
 					files: [
 						{
 							fileName: MOCK_FILE_PATH,
 							mtime: CURRENT_MTIME,
-							loadedRanges: [{ start: 1, end: 5 }],
+							lineRanges: [{ start: 1, end: 5 }],
 						},
 					],
-				},
+				} as any,
 			]
 			const result = await processAndFilterReadRequest(MOCK_FILE_PATH, requestedRanges, conversationHistory)
 			expect(result.status).toBe("ALLOW_PARTIAL")

src/core/services/fileReadCacheService.ts

@@ -8,7 +8,7 @@ export interface LineRange {
 
 export interface FileMetadata {
 	fileName: string
-	mtime: string
+	mtime: number
 	lineRanges: LineRange[]
 }
 
@@ -24,9 +24,9 @@ export interface ConversationMessage {
 }
 
 type CacheResult =
-	| { status: "ALLOW_ALL" }
+	| { status: "ALLOW_ALL"; rangesToRead: LineRange[] }
 	| { status: "ALLOW_PARTIAL"; rangesToRead: LineRange[] }
-	| { status: "REJECT_ALL" }
+	| { status: "REJECT_ALL"; rangesToRead: LineRange[] }
 
 /**
  * Checks if two line ranges overlap.
@@ -44,7 +44,7 @@ function rangesOverlap(r1: LineRange, r2: LineRange): boolean {
  * @param toSubtract - The range to subtract.
  * @returns An array of ranges remaining after subtraction.
  */
-function subtractRange(from: LineRange, toSubtract: LineRange): LineRange[] {
+export function subtractRange(from: LineRange, toSubtract: LineRange): LineRange[] {
 	// No overlap
 	if (from.end < toSubtract.start || from.start > toSubtract.end) {
 		return [from]
@@ -61,6 +61,19 @@ function subtractRange(from: LineRange, toSubtract: LineRange): LineRange[] {
 	return remainingRanges
 }
 
+/**
+ * Subtracts a set of ranges from another set of ranges.
+ */
+export function subtractRanges(originals: LineRange[], toRemoves: LineRange[]): LineRange[] {
+	let remaining = [...originals]
+
+	for (const toRemove of toRemoves) {
+		remaining = remaining.flatMap((original) => subtractRange(original, toRemove))
+	}
+
+	return remaining
+}
+
 /**
  * Processes a read request against cached file data in conversation history.
  * @param requestedFilePath - The full path of the file being requested.
@@ -85,7 +98,7 @@ export async function processAndFilterReadRequest(
 			// This logic is simplified; in a real scenario, you'd get the line count.
 			// For this example, we'll assume we can't determine the full range without reading the file,
 			// so we proceed with ALLOW_ALL if no ranges are specified.
-			return { status: "ALLOW_ALL" }
+			return { status: "ALLOW_ALL", rangesToRead: requestedRanges }
 		}
 
 		for (const message of conversationHistory) {
@@ -107,20 +120,20 @@ export async function processAndFilterReadRequest(
 		}
 
 		if (rangesToRead.length === 0) {
-			return { status: "REJECT_ALL" }
+			return { status: "REJECT_ALL", rangesToRead: [] }
 		} else if (rangesToRead.length < requestedRanges.length) {
 			return { status: "ALLOW_PARTIAL", rangesToRead }
 		} else {
-			return { status: "ALLOW_ALL" }
+			return { status: "ALLOW_ALL", rangesToRead: requestedRanges }
 		}
 	} catch (error) {
 		// If we can't get file stats, it's safer to allow the read.
 		if (error.code === "ENOENT") {
 			// File doesn't exist, let the regular tool handle it.
-			return { status: "ALLOW_ALL" }
+			return { status: "ALLOW_ALL", rangesToRead: requestedRanges }
 		}
 		console.error(`Error processing file read request for ${requestedFilePath}:`, error)
 		// On other errors, allow the read to proceed to handle it.
-		return { status: "ALLOW_ALL" }
+		return { status: "ALLOW_ALL", rangesToRead: requestedRanges }
 	}
 }