diff --git a/.gitignore b/.gitignore
index 1d6407690e..077403bdb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,6 +135,16 @@ auto-save-list
 tramp
 .\#*
 
+# =============================================================================
+# Agent tooling
+# =============================================================================
+
+# Local agent state and configuration
+.codex/
+.pi/
+.claude/settings.local.json
+.claude/worktrees/
+
 # =============================================================================
 # OS
 # =============================================================================
@@ -203,15 +213,9 @@ artifacts/
 # Local mise settings
 mise.local.toml
 
-# Local Codex app state
-.codex/
-
 # Ignore plans for now
 architecture/plans
 
-# Claude
-.claude/settings.local.json
-.claude/worktrees/
 rfc.md
 .worktrees
 .z3-trace