refactor: streamline rule loading and formatting in custom instructions

Author: daniel-lxs

src/core/prompts/sections/__tests__/custom-instructions-global.spec.ts

@@ -1,9 +1,6 @@
 import * as path from "path"
 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest"
 
-// Access the original console.log that was saved in vitest.setup.ts
-const originalConsoleLog = (global as any).originalConsoleLog || console.error
-
 // Use vi.hoisted to ensure mocks are available during hoisting
 const { mockHomedir, mockStat, mockReadFile, mockReaddir, mockGetRooDirectoriesForCwd, mockGetGlobalRooDirectory } =
 	vi.hoisted(() => ({
@@ -77,14 +74,10 @@ describe("custom-instructions global .roo support", () => {
 
 			const result = await loadRuleFiles(mockCwd)
 
-			originalConsoleLog("Result:", result)
-			originalConsoleLog("mockStat calls:", mockStat.mock.calls)
-			originalConsoleLog("mockReaddir calls:", mockReaddir.mock.calls)
-			originalConsoleLog("mockReadFile calls:", mockReadFile.mock.calls)
-
-			expect(result).toContain("# Global rules:")
+			expect(result).toContain("# Rules from")
+			expect(result).toContain("rules.md:")
 			expect(result).toContain("global rule content")
-			expect(result).not.toContain("# Project-specific rules:")
+			expect(result).not.toContain("project rule content")
 		})
 
 		it("should load project rules only when global rules do not exist", async () => {
@@ -104,9 +97,10 @@ describe("custom-instructions global .roo support", () => {
 
 			const result = await loadRuleFiles(mockCwd)
 
-			expect(result).toContain("# Project-specific rules:")
+			expect(result).toContain("# Rules from")
+			expect(result).toContain("rules.md:")
 			expect(result).toContain("project rule content")
-			expect(result).not.toContain("# Global rules:")
+			expect(result).not.toContain("global rule content")
 		})
 
 		it("should merge global and project rules with project rules after global", async () => {
@@ -127,14 +121,15 @@ describe("custom-instructions global .roo support", () => {
 
 			const result = await loadRuleFiles(mockCwd)
 
-			expect(result).toContain("# Global rules:")
+			expect(result).toContain("# Rules from")
+			expect(result).toContain("global.md:")
 			expect(result).toContain("global rule content")
-			expect(result).toContain("# Project-specific rules:")
+			expect(result).toContain("project.md:")
 			expect(result).toContain("project rule content")
 
 			// Ensure project rules come after global rules
-			const globalIndex = result.indexOf("# Global rules:")
-			const projectIndex = result.indexOf("# Project-specific rules:")
+			const globalIndex = result.indexOf("global rule content")
+			const projectIndex = result.indexOf("project rule content")
 			expect(globalIndex).toBeLessThan(projectIndex)
 		})
 
@@ -203,9 +198,10 @@ describe("custom-instructions global .roo support", () => {
 
 			const result = await addCustomInstructions("", "", mockCwd, mode)
 
-			expect(result).toContain("# Global mode-specific rules:")
+			expect(result).toContain("# Rules from")
+			expect(result).toContain("global-mode.md:")
 			expect(result).toContain("global mode rule content")
-			expect(result).toContain("# Project-specific mode-specific rules:")
+			expect(result).toContain("project-mode.md:")
 			expect(result).toContain("project mode rule content")
 		})
 

src/core/prompts/sections/custom-instructions.ts

@@ -146,14 +146,11 @@ async function readTextFilesFromDirectory(dirPath: string): Promise<Array<{ file
 function formatDirectoryContent(dirPath: string, files: Array<{ filename: string; content: string }>): string {
 	if (files.length === 0) return ""
 
-	return (
-		"\n\n" +
-		files
-			.map((file) => {
-				return `# Rules from ${file.filename}:\n${file.content}`
-			})
-			.join("\n\n")
-	)
+	return files
+		.map((file) => {
+			return `# Rules from ${file.filename}:\n${file.content}`
+		})
+		.join("\n\n")
 }
 
 /**
@@ -170,17 +167,15 @@ export async function loadRuleFiles(cwd: string): Promise<string> {
 		if (await directoryExists(rulesDir)) {
 			const files = await readTextFilesFromDirectory(rulesDir)
 			if (files.length > 0) {
-				const isGlobal = path.resolve(rooDir) === path.resolve(getGlobalRooDirectory())
-				const prefix = isGlobal ? "# Global rules" : "# Project-specific rules"
 				const content = formatDirectoryContent(rulesDir, files)
-				rules.push(`${prefix}:\n${content}`)
+				rules.push(content)
 			}
 		}
 	}
 
 	// If we found rules in .roo/rules/ directories, return them
 	if (rules.length > 0) {
-		return "\n\n" + rules.join("\n\n")
+		return "\n" + rules.join("\n\n")
 	}
 
 	// Fall back to existing behavior for legacy .roorules/.clinerules files
@@ -219,17 +214,15 @@ export async function addCustomInstructions(
 			if (await directoryExists(modeRulesDir)) {
 				const files = await readTextFilesFromDirectory(modeRulesDir)
 				if (files.length > 0) {
-					const isGlobal = path.resolve(rooDir) === path.resolve(getGlobalRooDirectory())
-					const prefix = isGlobal ? "# Global mode-specific rules" : "# Project-specific mode-specific rules"
 					const content = formatDirectoryContent(modeRulesDir, files)
-					modeRules.push(`${prefix}:\n${content}`)
+					modeRules.push(content)
 				}
 			}
 		}
 
 		// If we found mode-specific rules in .roo/rules-${mode}/ directories, use them
 		if (modeRules.length > 0) {
-			modeRuleContent = "\n\n" + modeRules.join("\n\n")
+			modeRuleContent = "\n" + modeRules.join("\n\n")
 			usedRuleFile = `rules-${mode} directories`
 		} else {
 			// Fall back to existing behavior for legacy files