From 62752ee14e7eb14724b2c130c2decee4e81cfd02 Mon Sep 17 00:00:00 2001 From: Roo Code Date: Sun, 24 Aug 2025 08:34:54 +0000 Subject: [PATCH 1/3] fix: change default showRooIgnoredFiles to false to hide ignored files - Changed default value from true to false across all files - Updated tests to reflect the new default behavior - This prevents ignored files from appearing in environment details Fixes #7368 --- src/__tests__/command-mentions.spec.ts | 2 +- .../environment/__tests__/getEnvironmentDetails.spec.ts | 2 +- src/core/environment/getEnvironmentDetails.ts | 2 +- .../mentions/__tests__/processUserContentMentions.spec.ts | 4 ++-- src/core/mentions/index.ts | 4 ++-- src/core/mentions/processUserContentMentions.ts | 2 +- src/core/task/Task.ts | 2 +- src/core/tools/listFilesTool.ts | 2 +- src/core/webview/ClineProvider.ts | 4 ++-- src/core/webview/__tests__/ClineProvider.spec.ts | 6 +++--- src/core/webview/webviewMessageHandler.ts | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/__tests__/command-mentions.spec.ts b/src/__tests__/command-mentions.spec.ts index b120f3720cb7..cb55eb84e7ba 100644 --- a/src/__tests__/command-mentions.spec.ts +++ b/src/__tests__/command-mentions.spec.ts @@ -34,7 +34,7 @@ describe("Command Mentions", () => { mockUrlContentFetcher, // urlContentFetcher undefined, // fileContextTracker undefined, // rooIgnoreController - true, // showRooIgnoredFiles + false, // showRooIgnoredFiles true, // includeDiagnosticMessages 50, // maxDiagnosticMessages undefined, // maxReadFileLine diff --git a/src/core/environment/__tests__/getEnvironmentDetails.spec.ts b/src/core/environment/__tests__/getEnvironmentDetails.spec.ts index 780feed2f622..955ae4ddab74 100644 --- a/src/core/environment/__tests__/getEnvironmentDetails.spec.ts +++ b/src/core/environment/__tests__/getEnvironmentDetails.spec.ts @@ -78,7 +78,7 @@ describe("getEnvironmentDetails", () => { experiments: {}, customInstructions: "test instructions", language: "en", - showRooIgnoredFiles: true, + showRooIgnoredFiles: false, } mockProvider = { diff --git a/src/core/environment/getEnvironmentDetails.ts b/src/core/environment/getEnvironmentDetails.ts index fbc1f2dc577f..c0139649ab54 100644 --- a/src/core/environment/getEnvironmentDetails.ts +++ b/src/core/environment/getEnvironmentDetails.ts @@ -253,7 +253,7 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo details += "(Workspace files context disabled. Use list_files to explore if needed.)" } else { const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles) - const { showRooIgnoredFiles = true } = state ?? {} + const { showRooIgnoredFiles = false } = state ?? {} const result = formatResponse.formatFilesList( cline.cwd, diff --git a/src/core/mentions/__tests__/processUserContentMentions.spec.ts b/src/core/mentions/__tests__/processUserContentMentions.spec.ts index 3aebd66e53b2..9e0049eea109 100644 --- a/src/core/mentions/__tests__/processUserContentMentions.spec.ts +++ b/src/core/mentions/__tests__/processUserContentMentions.spec.ts @@ -293,7 +293,7 @@ describe("processUserContentMentions", () => { }) describe("showRooIgnoredFiles parameter", () => { - it("should default showRooIgnoredFiles to true", async () => { + it("should default showRooIgnoredFiles to false", async () => { const userContent = [ { type: "text" as const, @@ -314,7 +314,7 @@ describe("processUserContentMentions", () => { mockUrlContentFetcher, mockFileContextTracker, undefined, - true, // showRooIgnoredFiles should default to true + false, // showRooIgnoredFiles should default to false true, // includeDiagnosticMessages 50, // maxDiagnosticMessages undefined, diff --git a/src/core/mentions/index.ts b/src/core/mentions/index.ts index a57dfcb6d4fa..282e795ce4d7 100644 --- a/src/core/mentions/index.ts +++ b/src/core/mentions/index.ts @@ -83,7 +83,7 @@ export async function parseMentions( urlContentFetcher: UrlContentFetcher, fileContextTracker?: FileContextTracker, rooIgnoreController?: RooIgnoreController, - showRooIgnoredFiles: boolean = true, + showRooIgnoredFiles: boolean = false, includeDiagnosticMessages: boolean = true, maxDiagnosticMessages: number = 50, maxReadFileLine?: number, @@ -270,7 +270,7 @@ async function getFileOrFolderContent( mentionPath: string, cwd: string, rooIgnoreController?: any, - showRooIgnoredFiles: boolean = true, + showRooIgnoredFiles: boolean = false, maxReadFileLine?: number, ): Promise { const unescapedPath = unescapeSpaces(mentionPath) diff --git a/src/core/mentions/processUserContentMentions.ts b/src/core/mentions/processUserContentMentions.ts index b903e7439611..4bdb422d48ba 100644 --- a/src/core/mentions/processUserContentMentions.ts +++ b/src/core/mentions/processUserContentMentions.ts @@ -12,7 +12,7 @@ export async function processUserContentMentions({ urlContentFetcher, fileContextTracker, rooIgnoreController, - showRooIgnoredFiles = true, + showRooIgnoredFiles = false, includeDiagnosticMessages = true, maxDiagnosticMessages = 50, maxReadFileLine, diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 104cb8720671..8117baf758e6 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -1622,7 +1622,7 @@ export class Task extends EventEmitter implements TaskLike { ) const { - showRooIgnoredFiles = true, + showRooIgnoredFiles = false, includeDiagnosticMessages = true, maxDiagnosticMessages = 50, maxReadFileLine = -1, diff --git a/src/core/tools/listFilesTool.ts b/src/core/tools/listFilesTool.ts index dcd7655b1fd0..e51453c5d9e9 100644 --- a/src/core/tools/listFilesTool.ts +++ b/src/core/tools/listFilesTool.ts @@ -61,7 +61,7 @@ export async function listFilesTool( cline.consecutiveMistakeCount = 0 const [files, didHitLimit] = await listFiles(absolutePath, recursive, 200) - const { showRooIgnoredFiles = true } = (await cline.providerRef.deref()?.getState()) ?? {} + const { showRooIgnoredFiles = false } = (await cline.providerRef.deref()?.getState()) ?? {} const result = formatResponse.formatFilesList( absolutePath, diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index b6c00ee37901..9ba6ab91f3fe 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -1850,7 +1850,7 @@ export class ClineProvider telemetrySetting, telemetryKey, machineId, - showRooIgnoredFiles: showRooIgnoredFiles ?? true, + showRooIgnoredFiles: showRooIgnoredFiles ?? false, language: language ?? formatLanguage(vscode.env.language), renderContext: this.renderContext, maxReadFileLine: maxReadFileLine ?? -1, @@ -2043,7 +2043,7 @@ export class ClineProvider openRouterUseMiddleOutTransform: stateValues.openRouterUseMiddleOutTransform ?? true, browserToolEnabled: stateValues.browserToolEnabled ?? true, telemetrySetting: stateValues.telemetrySetting || "unset", - showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? true, + showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? false, maxReadFileLine: stateValues.maxReadFileLine ?? -1, maxImageFileSize: stateValues.maxImageFileSize ?? 5, maxTotalImageSize: stateValues.maxTotalImageSize ?? 20, diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts index 80c2f537a214..1d15678ea20d 100644 --- a/src/core/webview/__tests__/ClineProvider.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.spec.ts @@ -534,7 +534,7 @@ describe("ClineProvider", () => { maxWorkspaceFiles: 200, browserToolEnabled: true, telemetrySetting: "unset", - showRooIgnoredFiles: true, + showRooIgnoredFiles: false, renderContext: "sidebar", maxReadFileLine: 500, maxImageFileSize: 5, @@ -984,8 +984,8 @@ describe("ClineProvider", () => { await provider.resolveWebviewView(mockWebviewView) const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0] - // Default value should be true - expect((await provider.getState()).showRooIgnoredFiles).toBe(true) + // Default value should be false + expect((await provider.getState()).showRooIgnoredFiles).toBe(false) // Test showRooIgnoredFiles with true await messageHandler({ type: "showRooIgnoredFiles", bool: true }) diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 8e42707a95d9..f74aafdc4839 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -1309,7 +1309,7 @@ export const webviewMessageHandler = async ( await provider.postStateToWebview() break case "showRooIgnoredFiles": - await updateGlobalState("showRooIgnoredFiles", message.bool ?? true) + await updateGlobalState("showRooIgnoredFiles", message.bool ?? false) await provider.postStateToWebview() break case "hasOpenedModeSelector": From e232dacf27c87b0f0b6aff6263cef377463e880d Mon Sep 17 00:00:00 2001 From: Roo Code Date: Sun, 24 Aug 2025 08:36:19 +0000 Subject: [PATCH 2/3] fix: update tests to match new showRooIgnoredFiles default --- .../mentions/__tests__/processUserContentMentions.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/mentions/__tests__/processUserContentMentions.spec.ts b/src/core/mentions/__tests__/processUserContentMentions.spec.ts index 9e0049eea109..36bea7e0bc13 100644 --- a/src/core/mentions/__tests__/processUserContentMentions.spec.ts +++ b/src/core/mentions/__tests__/processUserContentMentions.spec.ts @@ -51,7 +51,7 @@ describe("processUserContentMentions", () => { mockUrlContentFetcher, mockFileContextTracker, mockRooIgnoreController, - true, + false, true, // includeDiagnosticMessages 50, // maxDiagnosticMessages 100, @@ -80,7 +80,7 @@ describe("processUserContentMentions", () => { mockUrlContentFetcher, mockFileContextTracker, mockRooIgnoreController, - true, + false, true, // includeDiagnosticMessages 50, // maxDiagnosticMessages undefined, @@ -110,7 +110,7 @@ describe("processUserContentMentions", () => { mockUrlContentFetcher, mockFileContextTracker, mockRooIgnoreController, - true, + false, true, // includeDiagnosticMessages 50, // maxDiagnosticMessages -1, From 3722796afbaa853ddc5fa13e3cd78ff0024bdc27 Mon Sep 17 00:00:00 2001 From: daniel-lxs Date: Wed, 27 Aug 2025 16:31:50 -0500 Subject: [PATCH 3/3] fix: update test expectation to match new showRooIgnoredFiles default value The PR changed the default value of showRooIgnoredFiles from true to false, so the test needs to expect false instead of true when calling formatFilesList. --- src/core/environment/__tests__/getEnvironmentDetails.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/environment/__tests__/getEnvironmentDetails.spec.ts b/src/core/environment/__tests__/getEnvironmentDetails.spec.ts index 955ae4ddab74..1110aa8831b9 100644 --- a/src/core/environment/__tests__/getEnvironmentDetails.spec.ts +++ b/src/core/environment/__tests__/getEnvironmentDetails.spec.ts @@ -173,7 +173,7 @@ describe("getEnvironmentDetails", () => { ["file1.ts", "file2.ts"], false, mockCline.rooIgnoreController, - true, + false, ) })