diff --git a/.agents/.gitignore b/.agents/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/.agents/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/.claude/.gitignore b/.claude/.gitignore
new file mode 100644
index 000000000..d32add8fd
--- /dev/null
+++ b/.claude/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!CLAUDE.md
\ No newline at end of file
diff --git a/CLAUDE.md b/.claude/CLAUDE.md
similarity index 100%
rename from CLAUDE.md
rename to .claude/CLAUDE.md
diff --git a/.gitignore b/.gitignore
index 7c0d772c0..8897019ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ venv
 .nv
 .eslintcache
 .gocache
+.system
 /pro/
 /portal/
 /plus/
@@ -85,9 +86,10 @@ Thumbs.db
 .glide
 .idea
 .codex
-.claude
 .config
 .local
+*.local.json
+*.local.yaml
 .project
 .vscode
 *.tmproj
diff --git a/AGENTS.md b/AGENTS.md
index 242dc0a07..82774388a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -26,8 +26,8 @@ This file tells automated coding agents (and humans) where to find the single so
 ### Local Agent Progress
 
 - Use root-level task files to track progress and handoff notes across sessions/environments:
-  - `AGENTS_TODO.md` for actionable tasks.
-  - `AGENTS_DONE.md` for completed tasks.
+  - `.agents/TODO.md` for actionable tasks.
+  - `.agents/DONE.md` for completed tasks.
 - These files are local workflow aids and may not exist yet in a given workspace.
 
 ## Style Notes