diff --git a/functions/claude.fish b/functions/claude.fish
index cb05f41..6fdf110 100644
--- a/functions/claude.fish
+++ b/functions/claude.fish
@@ -5,12 +5,10 @@
 #   claude [ARGS...]
 #
 # DESCRIPTION
-#   Wrapper for the claude CLI that ensures CLAUDE.md exists before launch.
-#   Both the current directory and the git project root are checked. When
-#   CLAUDE.md is absent but AGENTS.md is present in a checked directory, a
-#   relative symlink CLAUDE.md -> AGENTS.md is created automatically so that
-#   Claude Code picks up shared agent instructions without duplicating the
-#   file. All arguments are forwarded verbatim to the real claude binary.
+#   Wrapper for the claude CLI that ensures the AGENTS/ sub-repository is
+#   initialized and any agent-made changes are committed before launch.
+#   Delegates all scaffold and commit logic to agents-init --agents.
+#   All arguments are forwarded verbatim to the real claude binary.
 #
 #   Opinionated component (C1): when disabled via __fish_config_op_aliases
 #   (or the __fish_config_opinionated master), the command is passed through
@@ -32,33 +30,7 @@ function claude --wraps=claude --description 'claude wrapper: auto-links AGENTS.
         return $status
     end
 
-    set -l c_ok    (set_color green)
-    set -l c_reset (set_color normal)
-
-    # Build the list of directories to inspect: cwd always, git root when different.
-    set -l check_dirs (pwd)
-    set -l git_root (git rev-parse --show-toplevel 2>/dev/null)
-    if test -n "$git_root" -a "$git_root" != (pwd)
-        set check_dirs $check_dirs $git_root
-    end
-
-    # Anchor for relative display: git root when available, otherwise cwd.
-    set -l anchor $git_root
-    test -z "$anchor" && set anchor (pwd)
-
-    for dir in $check_dirs
-        if not test -e "$dir/CLAUDE.md"
-            if test -f "$dir/AGENTS.md"
-                ln -s AGENTS.md "$dir/CLAUDE.md"
-                set -l prefix ""
-                if test "$dir" != "$anchor"
-                    set prefix (string replace "$anchor/" "" "$dir")/
-                end
-                set -l msg (string join "" "→ Linked " $prefix "CLAUDE.md → " $prefix "AGENTS.md")
-                echo $c_ok$msg$c_reset >&2
-            end
-        end
-    end
+    agents-init --agents
 
     command claude $argv
 end