@speclife/cli 0.6.0 → 0.6.2

package/templates/commands/sync.md

@@ -0,0 +1,170 @@
+---
+name: /speclife-sync
+id: speclife-sync
+category: SpecLife
+description: Update current branch with latest changes from main.
+---
+# /speclife sync
+
+Update your branch with latest main. Handles conflicts with guidance.
+
+## ⚡ Execution
+
+**When this command is invoked, IMMEDIATELY execute the workflow below.**
+
+- Check prerequisites first (not on main, clean working directory)
+- Default to rebase unless `--merge` is specified
+- If conflicts occur, guide the user through resolution
+- Push after successful sync
+
+## TL;DR
+
+```
+/speclife sync          # Rebase onto main (default)
+/speclife sync --merge  # Merge main into branch
+```
+
+**Quick flow:**
+1. Check prerequisites (not on main, clean working dir)
+2. Fetch latest
+3. Rebase or merge
+4. Handle conflicts if any
+5. Force push (if rebased)
+
+## Prerequisites
+
+- Not on main branch
+- Working directory clean (commit or stash first)
+
+## Core Steps
+
+### 1. Check State
+```bash
+BRANCH=$(git branch --show-current)
+[[ "$BRANCH" == "main" ]] && echo "Already on main" && exit
+
+# Check for uncommitted changes
+[[ -n $(git status --porcelain) ]] && echo "Commit or stash changes first"
+```
+
+### 2. Fetch & Check
+```bash
+git fetch origin main
+BEHIND=$(git rev-list --count HEAD..origin/main)
+[[ "$BEHIND" == "0" ]] && echo "Already up to date" && exit
+```
+
+### 3. Rebase (default) or Merge
+```bash
+# Rebase (cleaner history)
+git rebase origin/main
+
+# Or merge (preserves history)
+git merge origin/main
+```
+
+### 4. Handle Conflicts
+If conflicts:
+```bash
+# List conflicts
+git diff --name-only --diff-filter=U
+```
+
+Tell user:
+```
+⚠️ Conflicts in 3 files:
+   - src/auth/login.ts
+   - package.json
+   
+To resolve:
+1. Edit files, remove <<<<<<< ======= >>>>>>> markers
+2. git add <resolved-files>
+3. git rebase --continue
+
+Or abort: git rebase --abort
+```
+
+### 5. Push
+```bash
+# After rebase (force required)
+git push --force-with-lease origin <branch>
+
+# After merge (normal push)
+git push origin <branch>
+```
+
+### 6. Report
+```
+✓ Rebased onto main (5 commits)
+✓ No conflicts
+✓ Pushed
+```
+
+---
+
+<!-- REFERENCE SECTIONS - Read only when needed -->
+
+## Appendix: Conflict Resolution
+
+**Conflict markers:**
+```
+<<<<<<< HEAD (yours)
+const timeout = 5000;
+=======
+const timeout = 10000;
+>>>>>>> origin/main (theirs)
+```
+
+**Resolution strategies:**
+- Keep yours: delete their section + markers
+- Keep theirs: delete your section + markers
+- Combine: merge logic, delete markers
+
+**Common conflicts:**
+- `package.json` version → keep higher (main)
+- Import conflicts → combine imports
+
+## Appendix: Error Handling
+
+**On main:**
+```
+ℹ️ Already on main - nothing to sync.
+```
+
+**Uncommitted changes:**
+```
+⚠️ Uncommitted changes detected.
+Commit or stash, then retry.
+```
+
+**Rebase in progress:**
+```
+⚠️ Rebase already in progress.
+Continue: git rebase --continue
+Abort: git rebase --abort
+```
+
+## Appendix: Examples
+
+**Clean sync:**
+```
+User: /speclife sync
+
+Agent:
+✓ Fetched latest
+ℹ️ 3 commits behind main
+✓ Rebased - no conflicts
+✓ Force pushed
+```
+
+**With conflicts:**
+```
+User: /speclife sync
+
+Agent:
+⚠️ Conflicts in 2 files:
+   - src/auth.ts
+   - package.json
+
+[Offers to help resolve]
+```

package/templates/speclife-release.yml

@@ -0,0 +1,96 @@
+# SpecLife Release Workflow
+# Automatically creates GitHub releases when version changes are detected
+# Triggered by version bump in package.json (from /speclife land)
+
+name: Create Release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version_changed: ${{ steps.check.outputs.changed }}
+      new_version: ${{ steps.check.outputs.version }}
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      
+      - name: Check for version change
+        id: check
+        run: |
+          # Get version from current commit
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          
+          # Get version from previous commit
+          git checkout HEAD~1 -- package.json 2>/dev/null || true
+          PREV_VERSION=$(node -p "require('./package.json').version" 2>/dev/null || echo "0.0.0")
+          git checkout HEAD -- package.json
+          
+          echo "Previous version: $PREV_VERSION"
+          echo "Current version: $CURRENT_VERSION"
+          
+          if [ "$CURRENT_VERSION" != "$PREV_VERSION" ]; then
+            echo "Version changed: $PREV_VERSION -> $CURRENT_VERSION"
+            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "version=v$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          else
+            echo "No version change"
+            echo "changed=false" >> $GITHUB_OUTPUT
+          fi
+
+  release:
+    needs: check-version
+    runs-on: ubuntu-latest
+    if: needs.check-version.outputs.version_changed == 'true'
+    
+    permissions:
+      contents: write
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Create and push tag
+        run: |
+          VERSION="${{ needs.check-version.outputs.new_version }}"
+          echo "Creating tag: $VERSION"
+          
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag "$VERSION"
+          git push origin "$VERSION"
+      
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.check-version.outputs.new_version }}
+          generate_release_notes: true
+          body: |
+            ## What's Changed
+            
+            See the [full changelog](https://github.com/${{ github.repository }}/compare/.../${{ needs.check-version.outputs.new_version }}) for details.
+
+  # Optional: Add publish job for npm/other registries
+  # Uncomment and configure as needed
+  #
+  # publish:
+  #   needs: [check-version, release]
+  #   if: ${{ always() && needs.release.result == 'success' }}
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         registry-url: 'https://registry.npmjs.org'
+  #     - run: npm ci
+  #     - run: npm publish
+  #       env:
+  #         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}