Revert "fix: load all agent rules files (AGENTS.md, AGENT.md, AGENTS.local.md) when present"

roomote-v0[bot] · web-flow · commit fb5d34726a72 · 2026-02-04T01:22:47.000Z
This reverts commit f17637d.
diff --git a/src/core/prompts/sections/__tests__/custom-instructions.spec.ts b/src/core/prompts/sections/__tests__/custom-instructions.spec.ts
@@ -862,7 +862,7 @@ describe("addCustomInstructions", () => {
 		expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining("AGENT.md"), "utf-8")
 	})
 
-	it("should load both AGENTS.md and AGENT.md when both exist", async () => {
+	it("should prefer AGENTS.md over AGENT.md when both exist", async () => {
 		// Simulate no .roo/rules-test-mode directory
 		statMock.mockRejectedValueOnce({ code: "ENOENT" })
 
@@ -902,13 +902,11 @@ describe("addCustomInstructions", () => {
 			},
 		)
 
-		// Should contain BOTH AGENTS.md and AGENT.md content
+		// Should contain AGENTS.md content (preferred) and not AGENT.md
 		expect(result).toContain("# Agent Rules Standard (AGENTS.md):")
 		expect(result).toContain("Agent rules from AGENTS.md file (plural)")
-		expect(result).toContain("# Agent Rules Standard (AGENT.md):")
-		expect(result).toContain("Agent rules from AGENT.md file (singular)")
+		expect(result).not.toContain("Agent rules from AGENT.md file (singular)")
 		expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining("AGENTS.md"), "utf-8")
-		expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining("AGENT.md"), "utf-8")
 	})
 
 	it("should return empty string when no instructions provided", async () => {
diff --git a/src/core/prompts/sections/custom-instructions.ts b/src/core/prompts/sections/custom-instructions.ts
@@ -276,13 +276,12 @@ async function readAgentRulesFile(filePath: string): Promise<string> {
 }
 
 /**
- * Load agent rules files from a specific directory
- * Loads ALL of the following files if they exist:
- * - AGENTS.md (standard agent rules)
- * - AGENT.md (alternative naming)
- * - AGENTS.local.md (personal overrides, not checked in to version control)
+ * Load AGENTS.md or AGENT.md file from a specific directory
+ * Checks for both AGENTS.md (standard) and AGENT.md (alternative) for compatibility
+ * Also loads AGENTS.local.md for personal overrides (not checked in to version control)
+ * AGENTS.local.md can be loaded even if AGENTS.md doesn't exist
  *
- * @param directory - Directory to check for agent rules files
+ * @param directory - Directory to check for AGENTS.md
  * @param showPath - Whether to include the directory path in the header
  * @param cwd - Current working directory for computing relative paths (optional)
  */
@@ -307,7 +306,9 @@ async function loadAgentRulesFileFromDirectory(
 					? `# Agent Rules Standard (${filename}) from ${displayPath}:`
 					: `# Agent Rules Standard (${filename}):`
 				results.push(`${header}\n${content}`)
-				// Continue to check for additional agent rules files
+
+				// Found a standard file, don't check alternative
+				break
 			}
 		} catch (err) {
 			// Silently ignore errors - agent rules files are optional
