Make instruction structure clearer

Author: mrubens

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

@@ -149,10 +149,9 @@ describe("loadRuleFiles", () => {
 		})
 
 		const result = await loadRuleFiles("/fake/path")
-		expect(result).toContain("# Rules from /fake/path/.roo/rules")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules/file1.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules/file1.txt:")
 		expect(result).toContain("content of file1")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules/file2.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules/file2.txt:")
 		expect(result).toContain("content of file2")
 
 		expect(statMock).toHaveBeenCalledWith("/fake/path/.roo/rules/file1.txt")
@@ -352,9 +351,9 @@ describe("addCustomInstructions", () => {
 		)
 
 		expect(result).toContain("# Rules from /fake/path/.roo/rules-test-mode")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules-test-mode/rule1.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules-test-mode/rule1.txt:")
 		expect(result).toContain("mode specific rule 1")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules-test-mode/rule2.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules-test-mode/rule2.txt:")
 		expect(result).toContain("mode specific rule 2")
 
 		expect(statMock).toHaveBeenCalledWith("/fake/path/.roo/rules-test-mode/rule1.txt")
@@ -457,7 +456,7 @@ describe("addCustomInstructions", () => {
 		)
 
 		expect(result).toContain("# Rules from /fake/path/.roo/rules-test-mode")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules-test-mode/rule1.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules-test-mode/rule1.txt:")
 		expect(result).toContain("mode specific rule content")
 
 		expect(statCallCount).toBeGreaterThan(0)
@@ -548,12 +547,11 @@ describe("Rules directory reading", () => {
 
 		const result = await loadRuleFiles("/fake/path")
 
-		expect(result).toContain("# Rules from /fake/path/.roo/rules")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules/file1.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules/file1.txt:")
 		expect(result).toContain("content of file1")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules/file2.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules/file2.txt:")
 		expect(result).toContain("content of file2")
-		expect(result).toContain("# Filename: /fake/path/.roo/rules/file3.txt")
+		expect(result).toContain("# Rules from /fake/path/.roo/rules/file3.txt:")
 		expect(result).toContain("content of file3")
 	})
 

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

@@ -70,13 +70,14 @@ async function readTextFilesFromDirectory(dirPath: string): Promise<Array<{ file
 function formatDirectoryContent(dirPath: string, files: Array<{ filename: string; content: string }>): string {
 	if (files.length === 0) return ""
 
-	const formattedContent = files
-		.map((file) => {
-			return `# Filename: ${file.filename}\n${file.content}`
-		})
-		.join("\n\n")
-
-	return `\n# Rules from ${path.relative(process.cwd(), dirPath)}:\n${formattedContent}\n`
+	return (
+		"\n\n" +
+		files
+			.map((file) => {
+				return `# Rules from ${file.filename}:\n${file.content}:`
+			})
+			.join("\n\n")
+	)
 }
 
 /**