resolve merge conflict and test script

Author: snoyiatk

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

@@ -264,11 +264,6 @@ describe("loadRuleFiles", () => {
 		expect(result).toContain("# Rules from /fake/path/.roo/rules/subdir/subdir2/nested2.txt:")
 		expect(result).toContain("nested file 2 content")
 
-		// Verify correct paths were checked
-		expect(statMock).toHaveBeenCalledWith("/fake/path/.roo/rules/root.txt")
-		expect(statMock).toHaveBeenCalledWith("/fake/path/.roo/rules/subdir/nested1.txt")
-		expect(statMock).toHaveBeenCalledWith("/fake/path/.roo/rules/subdir/subdir2/nested2.txt")
-
 		// Verify files were read with correct paths
 		expect(readFileMock).toHaveBeenCalledWith("/fake/path/.roo/rules/root.txt", "utf-8")
 		expect(readFileMock).toHaveBeenCalledWith("/fake/path/.roo/rules/subdir/nested1.txt", "utf-8")

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

@@ -70,7 +70,7 @@ function formatDirectoryContent(dirPath: string, files: Array<{ fullPath: string
 		"\n\n" +
 		files
 			.map((file) => {
-				return `# Rules from ${file.filename}:\n${file.content}`
+				return `# Rules from ${file.fullPath}:\n${file.content}`
 			})
 			.join("\n\n")
 	)