From c8c1cedaaafb5de1402e3c814de471ea3a543a2e Mon Sep 17 00:00:00 2001
From: zhih <zhih@devvm39990.vll0.facebook.com>
Date: Thu, 28 May 2026 12:17:33 -0700
Subject: [PATCH] fix: add AGENTS.md and .claude/CLAUDE.md to instruction file
 cascade

Fixes #3156

The discover_instruction_files() function now searches for:
- AGENTS.md (in each directory)
- .claude/CLAUDE.md (in each directory's .claude subdirectory)

This enables interoperability with:
- AGENTS.md files used by other agent frameworks
- .claude/CLAUDE.md files used by standard Claude Code config

Updated the discovers_instruction_files_from_ancestor_chain test to
verify the new files are discovered in the correct order.
---
 rust/crates/runtime/src/prompt.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/rust/crates/runtime/src/prompt.rs b/rust/crates/runtime/src/prompt.rs
index a41078d49f..023f9fbdaa 100644
--- a/rust/crates/runtime/src/prompt.rs
+++ b/rust/crates/runtime/src/prompt.rs
@@ -241,7 +241,9 @@ fn discover_instruction_files(cwd: &Path) -> std::io::Result<Vec<ContextFile>> {
         for candidate in [
             dir.join("CLAUDE.md"),
             dir.join("CLAUDE.local.md"),
+            dir.join("AGENTS.md"),
             dir.join(".claw").join("CLAUDE.md"),
+            dir.join(".claude").join("CLAUDE.md"),
             dir.join(".claw").join("instructions.md"),
         ] {
             push_context_file(&mut files, candidate)?;
@@ -595,20 +597,35 @@ mod tests {
         let root = temp_dir();
         let nested = root.join("apps").join("api");
         fs::create_dir_all(nested.join(".claw")).expect("nested claw dir");
+        fs::create_dir_all(nested.join(".claude")).expect("nested claude dir");
         fs::write(root.join("CLAUDE.md"), "root instructions").expect("write root instructions");
         fs::write(root.join("CLAUDE.local.md"), "local instructions")
             .expect("write local instructions");
+        fs::write(root.join("AGENTS.md"), "root agents").expect("write root agents");
         fs::create_dir_all(root.join("apps")).expect("apps dir");
         fs::create_dir_all(root.join("apps").join(".claw")).expect("apps claw dir");
+        fs::create_dir_all(root.join("apps").join(".claude")).expect("apps claude dir");
         fs::write(root.join("apps").join("CLAUDE.md"), "apps instructions")
             .expect("write apps instructions");
+        fs::write(root.join("apps").join("AGENTS.md"), "apps agents")
+            .expect("write apps agents");
         fs::write(
             root.join("apps").join(".claw").join("instructions.md"),
             "apps dot claude instructions",
         )
         .expect("write apps dot claude instructions");
+        fs::write(
+            root.join("apps").join(".claude").join("CLAUDE.md"),
+            "apps claude dir instructions",
+        )
+        .expect("write apps claude dir instructions");
         fs::write(nested.join(".claw").join("CLAUDE.md"), "nested rules")
             .expect("write nested rules");
+        fs::write(
+            nested.join(".claude").join("CLAUDE.md"),
+            "nested claude dir rules",
+        )
+        .expect("write nested claude dir rules");
         fs::write(
             nested.join(".claw").join("instructions.md"),
             "nested instructions",
@@ -627,9 +644,13 @@ mod tests {
             vec![
                 "root instructions",
                 "local instructions",
+                "root agents",
                 "apps instructions",
+                "apps agents",
+                "apps claude dir instructions",
                 "apps dot claude instructions",
                 "nested rules",
+                "nested claude dir rules",
                 "nested instructions"
             ]
         );