@brickhouse-tech/sync-agents 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brickhouse-tech/sync-agents",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Simple scripts to DRY up common agent interactions across multiple LLM providers.",
   "keywords": [
     "agents",

package/src/sh/sync-agents.sh

@@ -75,6 +75,7 @@ ${BOLD}COMMANDS${RESET}
   watch                         Watch .agents/ for changes and auto-regenerate index
   import <url>                  Import a rule/skill/workflow from a URL
   hook                          Install a pre-commit git hook for auto-sync
+  fix [type]                    Migrate legacy dirs into .agents/ (type: skills, rules, workflows, or all)
   inherit <label> <path>        Add an inheritance link to AGENTS.md (convention-based)
   inherit --list                List current inheritance links
   inherit --remove <label>      Remove an inheritance link by label
@@ -184,7 +185,6 @@ cmd_init() {
     else
       # Inline fallback if template not found
       cat > "$PROJECT_ROOT/$AGENTS_DIR/STATE.md" <<'STATE_EOF'
-
 ---
 trigger: always_on
 ---
@@ -222,6 +222,9 @@ CONFIG_EOF
     warn "$AGENTS_MD already exists, skipping (run 'sync-agents index' to regenerate)"
   fi
 
+  # Add default .gitignore entries for agent tool directories
+  add_default_gitignore_entries
+
   info "Initialization complete. Directory structure:"
   print_tree "$PROJECT_ROOT/$AGENTS_DIR"
 }
@@ -247,7 +250,14 @@ cmd_add() {
 
   ensure_agents_dir
 
-  local filepath="$PROJECT_ROOT/$AGENTS_DIR/$type/$name.md"
+  # Skills use directory layout: skills/name/SKILL.md
+  # Rules and workflows use flat files: rules/name.md, workflows/name.md
+  local filepath
+  if [[ "$type" == "skills" ]]; then
+    filepath="$PROJECT_ROOT/$AGENTS_DIR/$type/$name/SKILL.md"
+  else
+    filepath="$PROJECT_ROOT/$AGENTS_DIR/$type/$name.md"
+  fi
 
   if [[ -f "$filepath" ]] && [[ "$FORCE" != "true" ]]; then
     error "File already exists: $filepath (use --force to overwrite)"
@@ -263,6 +273,9 @@ cmd_add() {
     *)         template_name="RULE_TEMPLATE.md" ;;
   esac
 
+  # Create parent directory for skills
+  mkdir -p "$(dirname "$filepath")"
+
   if [[ -f "$TEMPLATES_DIR/$template_name" ]]; then
     sed "s/\${NAME}/$name/g" "$TEMPLATES_DIR/$template_name" > "$filepath"
   elif [[ -f "$TEMPLATES_DIR/RULE_TEMPLATE.md" ]]; then
@@ -270,7 +283,6 @@ cmd_add() {
     sed "s/\${NAME}/$name/g" "$TEMPLATES_DIR/RULE_TEMPLATE.md" > "$filepath"
   else
     cat > "$filepath" <<TMPL_EOF
-
 ---
 trigger: always_on
 ---
@@ -286,6 +298,105 @@ TMPL_EOF
   info "Updated $AGENTS_MD index"
 }
 
+cmd_fix() {
+  ensure_agents_dir
+
+  local fix_type="${1:-all}"
+  local subdirs=()
+
+  case "$fix_type" in
+    skills|rules|workflows)
+      subdirs=("$fix_type")
+      ;;
+    all)
+      subdirs=(skills rules workflows)
+      ;;
+    *)
+      error "Unknown type: $fix_type (expected: skills, rules, workflows, or all)"
+      exit 1
+      ;;
+  esac
+
+  local agents_abs
+  agents_abs="$(cd "$PROJECT_ROOT/$AGENTS_DIR" && pwd)"
+  local fixed=0
+
+  for subdir in "${subdirs[@]}"; do
+    local legacy_dir="$PROJECT_ROOT/$subdir"
+    local agents_subdir="$agents_abs/$subdir"
+
+    # Skip if legacy dir doesn't exist or is already a symlink
+    if [[ ! -d "$legacy_dir" ]] || [[ -L "$legacy_dir" ]]; then
+      continue
+    fi
+
+    info "Found legacy directory: $subdir/"
+    mkdir -p "$agents_subdir"
+
+    # Move each item from legacy dir into .agents/subdir
+    for item in "$legacy_dir"/*/; do
+      [[ -d "$item" ]] || continue
+      local name
+      name="$(basename "$item")"
+
+      if [[ -d "$agents_subdir/$name" ]]; then
+        warn "Skipping $subdir/$name — already exists in $AGENTS_DIR/$subdir/"
+        continue
+      fi
+
+      if [[ "$DRY_RUN" == "true" ]]; then
+        echo "  would move: $subdir/$name -> $AGENTS_DIR/$subdir/$name"
+      else
+        mv "$item" "$agents_subdir/$name"
+        info "Moved: $subdir/$name -> $AGENTS_DIR/$subdir/$name"
+      fi
+      fixed=$((fixed + 1))
+    done
+
+    # Also move any top-level files (e.g. loose .md rules)
+    for item in "$legacy_dir"/*; do
+      [[ -f "$item" ]] || continue
+      local name
+      name="$(basename "$item")"
+
+      if [[ -f "$agents_subdir/$name" ]]; then
+        warn "Skipping $subdir/$name — already exists in $AGENTS_DIR/$subdir/"
+        continue
+      fi
+
+      if [[ "$DRY_RUN" == "true" ]]; then
+        echo "  would move: $subdir/$name -> $AGENTS_DIR/$subdir/$name"
+      else
+        mv "$item" "$agents_subdir/$name"
+        info "Moved: $subdir/$name -> $AGENTS_DIR/$subdir/$name"
+      fi
+      fixed=$((fixed + 1))
+    done
+
+    # Remove the now-empty legacy dir and replace with symlink
+    if [[ "$DRY_RUN" == "true" ]]; then
+      echo "  would replace $subdir/ with symlink -> $AGENTS_DIR/$subdir"
+    else
+      # Check if dir is empty (only . and .. remain)
+      if [[ -z "$(ls -A "$legacy_dir" 2>/dev/null)" ]]; then
+        rmdir "$legacy_dir"
+        ln -s "$AGENTS_DIR/$subdir" "$legacy_dir"
+        info "Replaced $subdir/ with symlink -> $AGENTS_DIR/$subdir"
+      else
+        warn "$subdir/ is not empty after migration — skipping symlink replacement"
+        warn "Remaining items:"
+        find "$legacy_dir" -mindepth 1 -maxdepth 1 -exec basename {} \; | sed 's/^/    /'
+      fi
+    fi
+  done
+
+  if [[ "$fixed" -eq 0 ]]; then
+    info "Nothing to fix — all directories are already in $AGENTS_DIR/ or symlinked."
+  else
+    info "Fixed $fixed item(s). Run 'sync-agents sync' to update agent target symlinks."
+  fi
+}
+
 cmd_sync() {
   ensure_agents_dir
 
@@ -315,9 +426,162 @@ cmd_sync() {
     create_symlink "$AGENTS_MD" "$PROJECT_ROOT/CLAUDE.md" "$DRY_RUN"
   fi
 
+  # Update .gitignore with synced symlink entries
+  update_gitignore
+
   info "Sync complete."
 }
 
+# --------------------------------------------------------------------------
+# .gitignore management
+# --------------------------------------------------------------------------
+
+# Add default .gitignore entries for agent tool directories (called during init)
+add_default_gitignore_entries() {
+  local gitignore="$PROJECT_ROOT/.gitignore"
+  
+  # Create .gitignore if it doesn't exist
+  if [[ ! -f "$gitignore" ]]; then
+    touch "$gitignore"
+    info "Created .gitignore"
+  fi
+
+  # Check if .DS_Store is already present (case-insensitive check)
+  if ! grep -qiE "^\.DS_Store$" "$gitignore" 2>/dev/null; then
+    # Add .DS_Store if not present
+    if [[ -s "$gitignore" ]] && ! tail -c1 "$gitignore" | grep -q '^$'; then
+      echo "" >> "$gitignore"
+    fi
+    echo ".DS_Store" >> "$gitignore"
+    info "Added .DS_Store to .gitignore"
+  fi
+
+  # Define default entries (tool artifacts, not symlinks)
+  # Using pattern: ignore everything in dir, except specific files we want to track
+  local marker="# sync-agents — ignore tool artifacts, keep symlinks"
+  
+  # Check if sync-agents section already exists
+  if grep -qF "$marker" "$gitignore"; then
+    # Section exists - check if we need to add any missing entries
+    local needs_update=false
+    
+    # Check for each pattern
+    if ! grep -qF ".cursor/*" "$gitignore"; then needs_update=true; fi
+    if ! grep -qF "!.cursor/rules" "$gitignore"; then needs_update=true; fi
+    if ! grep -qF ".codex/*" "$gitignore"; then needs_update=true; fi
+    if ! grep -qF "!.codex/instructions.md" "$gitignore"; then needs_update=true; fi
+    if ! grep -qF ".github/copilot/*" "$gitignore"; then needs_update=true; fi
+    if ! grep -qF "!.github/copilot/instructions.md" "$gitignore"; then needs_update=true; fi
+    
+    if [[ "$needs_update" == "true" ]]; then
+      # Rebuild section by reading the file, preserving everything else
+      local tmp
+      tmp="$(mktemp)"
+      local in_section=false
+      
+      while IFS= read -r line; do
+        if [[ "$line" == "$marker" ]]; then
+          in_section=true
+          # Output the marker
+          {
+            echo "$line"
+            echo ".cursor/*"
+            echo "!.cursor/rules"
+            echo ".codex/*"
+            echo "!.codex/instructions.md"
+            echo ".github/copilot/*"
+            echo "!.github/copilot/instructions.md"
+          } >> "$tmp"
+          continue
+        fi
+        
+        # Skip old entries in the sync-agents section (until we hit empty line or new section)
+        if [[ "$in_section" == "true" ]]; then
+          if [[ -z "$line" ]] || [[ "$line" == "#"* ]]; then
+            in_section=false
+            echo "$line" >> "$tmp"
+          fi
+          # Skip old entry lines (they're replaced above)
+          continue
+        fi
+        
+        echo "$line" >> "$tmp"
+      done < "$gitignore"
+      
+      mv "$tmp" "$gitignore"
+      info "Updated sync-agents section in .gitignore"
+    fi
+  else
+    # Section doesn't exist, add entire block
+    # Add separator if file is non-empty
+    if [[ -s "$gitignore" ]] && ! tail -c1 "$gitignore" | grep -q '^$'; then
+      echo "" >> "$gitignore"
+    fi
+    
+    # Add all entries
+    {
+      echo "$marker"
+      echo ".cursor/*"
+      echo "!.cursor/rules"
+      echo ".codex/*"
+      echo "!.codex/instructions.md"
+      echo ".github/copilot/*"
+      echo "!.github/copilot/instructions.md"
+    } >> "$gitignore"
+    
+    info "Added sync-agents section to .gitignore with 7 entries"
+  fi
+}
+
+update_gitignore() {
+  local gitignore="$PROJECT_ROOT/.gitignore"
+
+  # Build list of entries that should be ignored (synced symlinks)
+  local entries=()
+  for target in "${ACTIVE_TARGETS[@]}"; do
+    local target_dir
+    target_dir="$(resolve_target_dir "$target" "$PROJECT_ROOT")"
+    local rel_path="${target_dir#"$PROJECT_ROOT"/}/"
+    entries+=("$rel_path")
+  done
+  entries+=("CLAUDE.md")
+
+  if [[ "$DRY_RUN" == "true" ]]; then
+    for entry in "${entries[@]}"; do
+      if [[ ! -f "$gitignore" ]] || ! grep -qxF "$entry" "$gitignore"; then
+        echo "  would add to .gitignore: $entry"
+      fi
+    done
+    return 0
+  fi
+
+  # Create .gitignore if it doesn't exist
+  [[ -f "$gitignore" ]] || touch "$gitignore"
+
+  local added=0
+  for entry in "${entries[@]}"; do
+    if ! grep -qxF "$entry" "$gitignore"; then
+      # Add sync-agents header on first addition
+      if [[ "$added" -eq 0 ]]; then
+        # Check if header already exists
+        if ! grep -qF "# sync-agents" "$gitignore"; then
+          # Add a blank line separator if file is non-empty
+          if [[ -s "$gitignore" ]]; then
+            echo "" >> "$gitignore"
+          fi
+          echo "# sync-agents (generated symlinks)" >> "$gitignore"
+        fi
+      fi
+      echo "$entry" >> "$gitignore"
+      added=$((added + 1))
+    fi
+  done
+
+  if [[ "$added" -gt 0 ]]; then
+    info "Added $added entries to .gitignore"
+  fi
+}
+
 cmd_status() {
   echo -e "${BOLD}sync-agents${RESET} v${VERSION}"
   echo ""
@@ -749,7 +1013,6 @@ generate_agents_md() {
   fi
 
   cat > "$outfile" <<'HEADER'
-
 ---
 trigger: always_on
 ---
@@ -783,16 +1046,30 @@ HEADER
     fi
     echo ""
 
-    # Skills
+    # Skills (directory layout: skills/name/SKILL.md, or legacy flat: skills/name.md)
     echo "## Skills"
     echo ""
+    local has_skills="false"
+    # Directory skills: skills/name/SKILL.md
+    for d in "$agents_dir/skills/"*/; do
+      [[ -d "$d" ]] || continue
+      local name
+      name="$(basename "$d")"
+      if [[ -f "$d/SKILL.md" ]]; then
+        echo "- [$name](.agents/skills/$name/SKILL.md)"
+        has_skills="true"
+      fi
+    done
+    # Legacy flat skills: skills/name.md
     if compgen -G "$agents_dir/skills/*.md" > /dev/null 2>&1; then
       for f in "$agents_dir/skills/"*.md; do
         local name
         name="$(basename "$f" .md)"
         echo "- [$name](.agents/skills/$name.md)"
+        has_skills="true"
       done
-    else
+    fi
+    if [[ "$has_skills" == "false" ]]; then
       echo "_No skills defined yet. Add one with \`sync-agents add skill <name>\`._"
     fi
     echo ""
@@ -971,6 +1248,9 @@ main() {
     import)
       cmd_import "$@"
       ;;
+    fix)
+      cmd_fix "$@"
+      ;;
     hook)
       cmd_hook
       ;;