From 9f9248deb1364639fbbcf172650d084d3f9a3ad0 Mon Sep 17 00:00:00 2001
From: rootiest <chris@rootiest.com>
Date: Fri, 12 Jun 2026 23:30:12 -0400
Subject: [PATCH] fix(agents-init): fix gitignore duplicate entries, add block
 comment style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Strip leading / from pattern before git check-ignore so root-anchored
  patterns like /AGENTS.md are checked as repo-relative paths (AGENTS.md)
  and correctly match existing rules — fixes duplicates on every run
- Rework helper to accept multiple patterns and write them as a single
  labeled block with project-style header/footer comment rather than
  appending bare patterns one at a time
- Move gitignore calls out of per-plug loop in --plugins mode so all
  three docs/ patterns are checked and written in one block
- Remove 5 duplicate bare entries left in .gitignore by the broken runs
---
 functions/_agents_init_ensure_gitignore.fish | 85 +++++++++++++-------
 functions/agents-init.fish                   |  6 +-
 2 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/functions/_agents_init_ensure_gitignore.fish b/functions/_agents_init_ensure_gitignore.fish
index f19d6ec..f4f411a 100644
--- a/functions/_agents_init_ensure_gitignore.fish
+++ b/functions/_agents_init_ensure_gitignore.fish
@@ -2,54 +2,81 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 # SYNOPSIS
-#   _agents_init_ensure_gitignore <root> <pattern>
+#   _agents_init_ensure_gitignore <root> <label> <pattern>...
 #
 # DESCRIPTION
-#   Appends <pattern> to <root>/.gitignore if the path it describes is not
-#   already covered by any existing ignore rule. Uses `git check-ignore` for
-#   accurate rule matching (catches wildcards and parent-dir globs). Falls
-#   back to a plain string search when the root is not a git repository.
+#   Appends any patterns not already covered by the project's .gitignore.
+#   Uses `git check-ignore` for accurate rule matching (catches wildcards
+#   and parent-dir globs). Falls back to a plain string search when the
+#   root is not a git repository. Leading `/` is stripped from each pattern
+#   before the path-based check so root-anchored patterns (e.g. /AGENTS.md)
+#   are matched correctly.
+#
+#   Missing patterns are written as a single labeled block:
+#
+#     #   ──────────────── Added by agents-init ──────────────────
+#     #   <label>
+#     <pattern>
+#     #   ────────────────────────────────────────────────────────
 #
 # ARGUMENTS
-#   root     Absolute path to the project root containing .gitignore
-#   pattern  Path pattern to ensure is ignored (e.g. "AGENTS/", "CLAUDE.md")
+#   root      Absolute path to the project root containing .gitignore
+#   label     Short description used in the block comment header
+#   pattern   One or more gitignore patterns to ensure are present
 #
 # RETURNS
-#   0  Pattern already ignored or successfully appended
+#   0  All patterns already ignored or successfully appended
 #   1  Could not write to .gitignore
 #
 # EXAMPLE
-#   _agents_init_ensure_gitignore /home/user/myproject "AGENTS/"
+#   _agents_init_ensure_gitignore /home/user/myproject "agents-init" "AGENTS/" "/AGENTS.md"
 function _agents_init_ensure_gitignore
     set -l c_ok    (set_color green)
     set -l c_reset (set_color normal)
 
-    if test (count $argv) -lt 2
-        echo (set_color red)"_agents_init_ensure_gitignore: requires <root> and <pattern>"(set_color normal) >&2
+    if test (count $argv) -lt 3
+        echo (set_color red)"_agents_init_ensure_gitignore: requires <root> <label> <pattern>..."(set_color normal) >&2
         return 1
     end
 
-    set -l root    $argv[1]
-    set -l pattern $argv[2]
-
+    set -l root     $argv[1]
+    set -l label    $argv[2]
+    set -l patterns $argv[3..]
     set -l gitignore "$root/.gitignore"
 
-    # Prefer git check-ignore (respects wildcards, parent globs, negations).
-    # --no-index lets it evaluate non-existent paths.
-    set -l already_ignored 0
-    if git -C "$root" rev-parse --git-dir >/dev/null 2>&1
-        git -C "$root" check-ignore -q --no-index "$pattern" 2>/dev/null
-        and set already_ignored 1
-    else if test -f "$gitignore"
-        grep -qF "$pattern" "$gitignore"
-        and set already_ignored 1
+    set -l in_git 0
+    git -C "$root" rev-parse --git-dir >/dev/null 2>&1
+    and set in_git 1
+
+    # Collect patterns not already covered
+    set -l missing
+    for pattern in $patterns
+        # Strip leading / so git check-ignore receives a repo-relative path,
+        # not an absolute filesystem path (which it cannot match against rules).
+        set -l check_path (string replace -r '^/' '' "$pattern")
+        set -l already 0
+        if test $in_git -eq 1
+            git -C "$root" check-ignore -q --no-index "$check_path" 2>/dev/null
+            and set already 1
+        else if test -f "$gitignore"
+            grep -qF "$pattern" "$gitignore"
+            and set already 1
+        end
+        if test $already -eq 0
+            set -a missing "$pattern"
+        end
     end
 
-    if test $already_ignored -eq 0
-        if not echo "$pattern" >>"$gitignore"
-            echo (set_color red)"Error: could not write to $gitignore"(set_color normal) >&2
-            return 1
-        end
-        echo "$c_ok→ Added $pattern to .gitignore$c_reset"
+    test (count $missing) -eq 0; and return 0
+
+    # Write missing patterns as a labeled block
+    set -l header "#   ──────────────── Added by agents-init ──────────────────"
+    set -l footer "#   ────────────────────────────────────────────────────────"
+    printf '\n%s\n#   %s\n' "$header" "$label" >>"$gitignore"
+    for p in $missing
+        printf '%s\n' "$p" >>"$gitignore"
     end
+    printf '%s\n' "$footer" >>"$gitignore"
+
+    echo "$c_ok→ Added "(count $missing)" pattern(s) to .gitignore$c_reset"
 end
diff --git a/functions/agents-init.fish b/functions/agents-init.fish
index add22cf..2f3b467 100644
--- a/functions/agents-init.fish
+++ b/functions/agents-init.fish
@@ -208,9 +208,7 @@ function agents-init --description 'scaffold AGENTS/ sub-repo with agent spec fi
         end
 
         # ── .gitignore ────────────────────────────────────────────────────────
-        for pattern in "AGENTS/" "/AGENTS.md" "/CLAUDE.md"
-            _agents_init_ensure_gitignore "$root" "$pattern"
-        end
+        _agents_init_ensure_gitignore "$root" "agents-init --agents" "AGENTS/" "/AGENTS.md" "/CLAUDE.md"
     end
 
     #   ─────────────────────────── --plugins mode ──────────────────────────────
@@ -266,8 +264,8 @@ function agents-init --description 'scaffold AGENTS/ sub-repo with agent spec fi
                 echo "$c_ok→ Linked docs/$plug → AGENTS/plugins/$plug$c_reset"
             end
 
-            _agents_init_ensure_gitignore "$root" "docs/$plug"
         end
+        _agents_init_ensure_gitignore "$root" "agents-init --plugins" "docs/superpowers" "docs/plans" "docs/specs"
     end
 
     #   ──────────────────────── Auto-commit AGENTS/ ────────────────────────────