fix: use marketplace actions for git operations, add memory-manager README

nsheaps · nsheaps · commit 2eb3ad4f3d00 · 2025-12-26T20:36:08.000-05:00
- Replace custom bash scripts with stefanzweifel/git-auto-commit-action
- Remove .github/scripts/ directory (git-push-with-retry.sh, collect-lint-errors.sh, create-brew-formula.sh)
- Add README.md for memory-manager plugin
- Update ci-cd conventions to prefer marketplace actions over custom scripts
- Simplify workflow files (~200 lines removed)
diff --git a/.ai/rules/ci-cd/conventions.md b/.ai/rules/ci-cd/conventions.md
@@ -27,12 +27,21 @@ Every action in `.github/actions/` must:
 
 1. Have a test workflow that runs when the action changes
 2. Include a dry-run mode for PR validation
-3. Scripts >3 lines should be in separate files for linting
-4. Work locally via justfile commands
+3. Work locally via justfile commands
 
-## Git Push Retry Logic
+## Prefer Marketplace Actions Over Custom Scripts
 
-All workflows use exponential backoff (4 attempts: 2s, 4s, 8s, 16s).
+**CRITICAL:** When working with GitHub Actions workflows:
+
+1. **Prefer popular upstream actions** over writing custom bash scripts
+2. **Check what's already in use** in the repo before introducing new dependencies
+3. **Be consistent** - if refactoring to use a different action, update all similar usages
+4. Keep inline bash to a minimum (simple one-liners only)
+
+Common actions already in use:
+- `stefanzweifel/git-auto-commit-action@v5` - git config, add, commit, push
+- `peter-evans/create-or-update-comment@v4` - PR comments
+- `peter-evans/find-comment@v3` - finding existing comments
 
 ## Secrets Used
 
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -67,172 +67,44 @@ jobs:
         id: update
         uses: ./.github/actions/update-marketplace
 
-      - name: Commit marketplace changes
-        if: steps.update.outputs.updated == 'true'
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-
-          git add .claude-plugin/marketplace.json
-
-          CHANGED_PLUGINS="${{ steps.update.outputs.changed-plugins }}"
-
-          git commit -m "$(cat <<'EOF'
-          chore: update marketplace metadata [skip ci]
-
-          Updated marketplace.json with latest plugin versions.
-
-          Changed plugins: $CHANGED_PLUGINS
-          EOF
-          )"
-
-          echo "::group::Pushing marketplace changes"
-          set +e
-          RETRY_COUNT=0
-          MAX_RETRIES=4
-          RETRY_DELAY=2
-
-          while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
-            if git push; then
-              echo "::notice::Successfully pushed marketplace update"
-              break
-            else
-              RETRY_COUNT=$((RETRY_COUNT + 1))
-              if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
-                echo "::warning::Push failed, retrying in ${RETRY_DELAY}s (attempt $RETRY_COUNT/$MAX_RETRIES)"
-                sleep $RETRY_DELAY
-                RETRY_DELAY=$((RETRY_DELAY * 2))
-              else
-                echo "::error::Failed to push after $MAX_RETRIES attempts"
-                exit 1
-              fi
-            fi
-          done
-          echo "::endgroup::"
-
       - name: Create brew formula
         if: steps.update.outputs.updated == 'true'
-        id: brew-formula
         run: |
-          echo "::group::Creating Homebrew formula"
-
-          FORMULA_DIR="Formula"
-          mkdir -p "$FORMULA_DIR"
-
-          REPO_URL="https://github.com/${{ github.repository }}"
-          REPO_NAME="${{ github.event.repository.name }}"
-
-          cat > "$FORMULA_DIR/claude-plugin-marketplace.rb" <<'FORMULA_EOF'
+          mkdir -p Formula
+          cat > Formula/claude-plugin-marketplace.rb <<'EOF'
           class ClaudePluginMarketplace < Formula
-            desc "Claude Code plugin marketplace - community-driven plugins for Claude Code"
+            desc "Claude Code plugin marketplace - community-driven plugins"
             homepage "https://github.com/${{ github.repository }}"
             url "https://github.com/${{ github.repository }}/archive/refs/heads/main.tar.gz"
             version "latest"
             sha256 :no_check
 
             def install
-              # This is a meta-formula that doesn't install binaries
-              # Instead, it sets up the marketplace for Claude Code
               libexec.install Dir["*"]
-
-              # Create setup script
               (bin/"claude-plugin-marketplace-setup").write <<~EOS
                 #!/bin/bash
                 set -e
-
                 MARKETPLACE_DIR="${HOME}/.claude-code/marketplaces/community"
-                REPO_URL="#{homepage}"
-
-                echo "Setting up Claude Code Plugin Marketplace..."
-
                 if [ -d "$MARKETPLACE_DIR" ]; then
-                  echo "Marketplace already exists at $MARKETPLACE_DIR"
-                  echo "Updating..."
-                  cd "$MARKETPLACE_DIR"
-                  git pull
+                  cd "$MARKETPLACE_DIR" && git pull
                 else
-                  echo "Cloning marketplace to $MARKETPLACE_DIR"
                   mkdir -p "$(dirname "$MARKETPLACE_DIR")"
-                  git clone "$REPO_URL" "$MARKETPLACE_DIR"
-                fi
-
-                echo "✓ Marketplace setup complete!"
-                echo ""
-                echo "Available plugins:"
-                if command -v jq &> /dev/null; then
-                  jq -r '.plugins[] | "  - \\(.name) (v\\(.version)): \\(.description)"' \
-                    "$MARKETPLACE_DIR/.claude-plugin/marketplace.json"
-                else
-                  echo "  Install jq to see plugin list"
+                  git clone "#{homepage}" "$MARKETPLACE_DIR"
                 fi
+                echo "Marketplace setup complete!"
               EOS
-
               chmod +x bin/"claude-plugin-marketplace-setup"
             end
 
-            def caveats
-              <<~EOS
-                To set up the Claude Code Plugin Marketplace, run:
-                  claude-plugin-marketplace-setup
-
-                This will clone the marketplace repository to:
-                  #{ENV["HOME"]}/.claude-code/marketplaces/community
-
-                You can then install plugins using Claude Code commands.
-              EOS
-            end
-
             test do
-              assert_predicate bin/"claude-plugin-marketplace-setup", :exist?
               assert_predicate bin/"claude-plugin-marketplace-setup", :executable?
             end
           end
-          FORMULA_EOF
-
-          # Replace template variables
-          sed -i "s|\${{ github.repository }}|${{ github.repository }}|g" "$FORMULA_DIR/claude-plugin-marketplace.rb"
-
-          echo "::notice::Homebrew formula created at $FORMULA_DIR/claude-plugin-marketplace.rb"
-          echo "::endgroup::"
-
-          cat "$FORMULA_DIR/claude-plugin-marketplace.rb"
-
-      - name: Commit brew formula
-        if: steps.update.outputs.updated == 'true'
-        run: |
-          git add Formula/
-
-          if [ -n "$(git status --porcelain Formula/)" ]; then
-            git commit -m "$(cat <<'EOF'
-          chore: update homebrew formula [skip ci]
-
-          Updated Homebrew formula for marketplace distribution.
           EOF
-          )"
 
-            echo "::group::Pushing formula"
-            set +e
-            RETRY_COUNT=0
-            MAX_RETRIES=4
-            RETRY_DELAY=2
-
-            while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
-              if git push; then
-                echo "::notice::Successfully pushed formula update"
-                break
-              else
-                RETRY_COUNT=$((RETRY_COUNT + 1))
-                if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
-                  echo "::warning::Push failed, retrying in ${RETRY_DELAY}s (attempt $RETRY_COUNT/$MAX_RETRIES)"
-                  sleep $RETRY_DELAY
-                  RETRY_DELAY=$((RETRY_DELAY * 2))
-                else
-                  echo "::error::Failed to push after $MAX_RETRIES attempts"
-                  exit 1
-                fi
-              fi
-            done
-            echo "::endgroup::"
-          else
-            echo "::notice::No changes to formula"
-          fi
+      - name: Commit changes
+        if: steps.update.outputs.updated == 'true'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: update marketplace metadata [skip ci]'
+          file_pattern: '.claude-plugin/marketplace.json Formula/'
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -78,42 +78,9 @@ jobs:
 
       - name: Commit and push fixes
         if: steps.check-changes.outputs.has-changes == 'true'
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-
-          git add -A
-
-          git commit -m "$(cat <<'EOF'
-          chore: auto-fix lint issues
-
-          Automatically fixed lint errors found in CI.
-          EOF
-          )"
-
-          echo "::group::Pushing changes"
-          set +e
-          RETRY_COUNT=0
-          MAX_RETRIES=4
-          RETRY_DELAY=2
-
-          while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
-            if git push; then
-              echo "::notice::Successfully pushed lint fixes"
-              exit 0
-            else
-              RETRY_COUNT=$((RETRY_COUNT + 1))
-              if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
-                echo "::warning::Push failed, retrying in ${RETRY_DELAY}s (attempt $RETRY_COUNT/$MAX_RETRIES)"
-                sleep $RETRY_DELAY
-                RETRY_DELAY=$((RETRY_DELAY * 2))
-              else
-                echo "::error::Failed to push after $MAX_RETRIES attempts"
-                exit 1
-              fi
-            fi
-          done
-          echo "::endgroup::"
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: auto-fix lint issues'
 
       - name: Rerun lint after fixes
         if: steps.check-changes.outputs.has-changes == 'true'
@@ -128,38 +95,14 @@ jobs:
           steps.check-changes.outputs.has-changes != 'true')
         id: collect-errors
         run: |
-          echo "::group::Collecting lint errors"
-
-          ERROR_LOG=$(mktemp)
-
-          # Rerun linters to collect errors
-          yamllint -f parsable . > $ERROR_LOG 2>&1 || true
-          npx prettier --check "**/*.json" >> $ERROR_LOG 2>&1 || true
-          npx markdownlint-cli2 "**/*.md" "#node_modules" >> $ERROR_LOG 2>&1 || true
-
-          if [ -f "package.json" ]; then
-            npx eslint "**/*.{ts,js,tsx,jsx}" >> $ERROR_LOG 2>&1 || true
-          fi
-
-          if find . -name "*.py" -not -path "*/\.*" | grep -q .; then
-            flake8 . >> $ERROR_LOG 2>&1 || true
-          fi
-
-          # Format errors for comment
-          ERRORS=$(cat $ERROR_LOG | head -50)
-
-          if [ -z "$ERRORS" ]; then
-            ERRORS="No specific errors captured, but lint check failed."
-          fi
-
-          # Save to output
           {
-            echo 'errors<<EOF'
-            echo "$ERRORS"
-            echo 'EOF'
-          } >> $GITHUB_OUTPUT
-
-          echo "::endgroup::"
+            yamllint -f parsable . 2>&1 || true
+            npx prettier --check "**/*.json" 2>&1 || true
+            npx markdownlint-cli2 "**/*.md" "#node_modules" 2>&1 || true
+          } | head -50 > /tmp/errors.txt
+          echo 'errors<<EOF' >> $GITHUB_OUTPUT
+          cat /tmp/errors.txt >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
 
       - name: Comment unfixable errors on PR
         if: >-
diff --git a/plugins/memory-manager/README.md b/plugins/memory-manager/README.md
@@ -0,0 +1,70 @@
+# Memory Manager Plugin
+
+Intelligent memory management for CLAUDE.md files. Automatically detects and stores user preferences, rules, and instructions with smart scope detection and hierarchical organization.
+
+## Features
+
+- **Automatic Detection**: Watches for phrases like "always", "never", "don't forget", "prefer", "remember to", "from now on"
+- **Smart Scope Detection**: Intelligently determines if preferences should be stored globally or per-project
+- **Hierarchical Organization**: Organizes memories into categories with proper markdown structure
+- **Confirmation Messages**: Shows what was remembered and where it was written
+
+## Installation
+
+```bash
+/plugin install memory-manager@nsheaps-claude-plugins
+```
+
+## Usage
+
+Simply express preferences naturally in conversation:
+
+- "Never use rebasing, prefer merge instead"
+- "Always put API endpoints in src/api/ in this project"
+- "Don't forget to run tests before committing"
+
+The plugin will automatically:
+1. Detect the memory-worthy statement
+2. Determine the appropriate scope (global or project)
+3. Update the relevant CLAUDE.md file
+4. Confirm with messages like:
+   - `I'll remember to prefer merging over rebasing`
+   - `Wrote $HOME/.claude/CLAUDE.md`
+
+## Trigger Phrases
+
+The plugin activates on:
+- "always", "never"
+- "don't forget", "make sure"
+- "prefer X over Y"
+- "remember to...", "from now on..."
+- "I can't believe you did that"
+- "You messed up", "did it wrong"
+- Important dates (vacation, birthdays, deadlines)
+
+## Scope Detection
+
+**Global scope** (written to `~/.claude/CLAUDE.md`):
+- Mentions "all projects", "everywhere"
+- Tool preferences, git workflow, communication style
+
+**Project scope** (written to project's CLAUDE.md):
+- Mentions specific files or directories
+- Architecture decisions for this codebase
+- User says "in this project"
+
+## Memory Categories
+
+Memories are organized under sections:
+- Git Workflow
+- Code Style
+- Development Environment
+- Testing Preferences
+- Documentation
+- Architecture
+- Dependencies
+- Communication Style
+
+## License
+
+MIT
