Merge pull request #3445 from jeanduplessis/fix/issue-1458-file-filter-limit

fix: apply file limit after .kilocodeignore filtering instead of before

Author: eshurakov

.changeset/great-frogs-tell.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+fix: apply file limit after .kilocodeignore filtering instead of before

src/core/environment/__tests__/getEnvironmentDetails.spec.ts

@@ -166,7 +166,10 @@ describe("getEnvironmentDetails", () => {
 		expect(result).toContain("# Current Workspace Directory")
 		expect(result).toContain("Files")
 
-		expect(listFiles).toHaveBeenCalledWith(mockCwd, true, 50)
+		// kilocode_change start
+		// Expecting 3x multiplier: 50 * 3 = 150
+		expect(listFiles).toHaveBeenCalledWith(mockCwd, true, 150)
+		// kilocode_change end
 
 		expect(formatResponse.formatFilesList).toHaveBeenCalledWith(
 			mockCwd,
@@ -177,6 +180,31 @@ describe("getEnvironmentDetails", () => {
 		)
 	})
 
+	// kilocode_change start
+	it("should NOT apply multiplier when showRooIgnoredFiles is true", async () => {
+		mockProvider.getState.mockResolvedValue({
+			...mockState,
+			showRooIgnoredFiles: true, // No filtering happens - ignored files are just marked
+			maxWorkspaceFiles: 50,
+		})
+
+		const result = await getEnvironmentDetails(mockCline as Task, true)
+		expect(result).toContain("# Current Workspace Directory")
+		expect(result).toContain("Files")
+
+		// Should use normal limit without multiplier since no files will be filtered out
+		expect(listFiles).toHaveBeenCalledWith(mockCwd, true, 50)
+
+		expect(formatResponse.formatFilesList).toHaveBeenCalledWith(
+			mockCwd,
+			["file1.ts", "file2.ts"],
+			false,
+			mockCline.rooIgnoreController,
+			true, // showRooIgnoredFiles = true
+		)
+	})
+	// kilocode_change end
+
 	it("should not include file details when includeFileDetails is false", async () => {
 		await getEnvironmentDetails(mockCline as Task, false)
 		expect(listFiles).not.toHaveBeenCalled()

src/core/environment/getEnvironmentDetails.ts

@@ -26,6 +26,30 @@ import { OpenRouterHandler } from "../../api/providers/openrouter"
 import { TelemetryService } from "@roo-code/telemetry"
 import { t } from "../../i18n"
 import { NativeOllamaHandler } from "../../api/providers/native-ollama"
+
+// Multiplier for fetching extra files when filtering is enabled to ensure enough non-ignored files; only applied when showRooIgnoredFiles is false.
+const FILE_LIST_OVER_FETCH_MULTIPLIER = 3
+
+function trimFileList(fileListStr: string, maxFiles: number) {
+	let lines = fileListStr.split("\n")
+	if (lines.length <= maxFiles) {
+		return fileListStr
+	}
+
+	const lastLine = lines[lines.length - 1]
+	if (lastLine.startsWith("(File list truncated.")) {
+		// Remove last 3 items from lines (two empty lines and truncation message)
+		lines = lines.slice(0, -3)
+	}
+
+	// Truncate lines to maxFiles
+	lines = lines.slice(0, maxFiles)
+
+	const truncationMsg =
+		"(File list truncated. Use list_files on specific subdirectories if you need to explore further.)"
+
+	return lines.join("\n") + "\n\n" + truncationMsg
+}
 // kilocode_change end
 
 export async function getEnvironmentDetails(cline: Task, includeFileDetails: boolean = false) {
@@ -282,9 +306,15 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
 			if (maxFiles === 0) {
 				details += "(Workspace files context disabled. Use list_files to explore if needed.)"
 			} else {
-				const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles)
 				const { showRooIgnoredFiles = false } = state ?? {}
 
+				// kilocode_change start
+				// Only apply multiplier when filtering will remove files (showRooIgnoredFiles = false)
+				// When showRooIgnoredFiles = true, ignored files are just marked with lock symbol, not removed
+				const fetchLimit = showRooIgnoredFiles ? maxFiles : maxFiles * FILE_LIST_OVER_FETCH_MULTIPLIER
+				const [files, didHitLimit] = await listFiles(cline.cwd, true, fetchLimit)
+				// kilocode_change end
+
 				const result = formatResponse.formatFilesList(
 					cline.cwd,
 					files,
@@ -293,7 +323,14 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
 					showRooIgnoredFiles,
 				)
 
-				details += result
+				// kilocode_change start
+				if (!showRooIgnoredFiles) {
+					// Trim because we over-fetched
+					details += trimFileList(result, maxFiles)
+				} else {
+					details += result
+				}
+				// kilocode_change end
 			}
 		}
 	}