@atlashub/smartstack-cli 1.13.1 → 1.14.0

package/templates/skills/gitflow/phases/abort.md

@@ -0,0 +1,173 @@
+---
+name: abort
+description: Rollback and recovery operations
+---
+
+# Phase: ABORT - Rollback & Recovery
+
+## YOUR TASK:
+
+Provide rollback and recovery options for GitFlow operations.
+
+---
+
+## OPTIONS:
+
+```yaml
+AskUserQuestion:
+  header: "Recovery"
+  question: "What do you want to abort/rollback?"
+  options:
+    - label: "Abort current merge/rebase"
+      description: "Cancel in-progress git operation"
+    - label: "Abandon current branch"
+      description: "Delete branch and worktree, return to develop"
+    - label: "Restore from checkpoint"
+      description: "Restore to a saved checkpoint"
+    - label: "Reset branch to remote"
+      description: "Discard local changes, match remote"
+```
+
+---
+
+## EXECUTION:
+
+### Option 1: Abort Merge/Rebase
+
+```bash
+# Check for in-progress operations
+if [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
+  echo "Aborting rebase..."
+  git rebase --abort
+elif [ -f ".git/MERGE_HEAD" ]; then
+  echo "Aborting merge..."
+  git merge --abort
+elif [ -f ".git/CHERRY_PICK_HEAD" ]; then
+  echo "Aborting cherry-pick..."
+  git cherry-pick --abort
+else
+  echo "No operation in progress"
+fi
+```
+
+### Option 2: Abandon Branch
+
+```bash
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+BRANCH_TYPE=$(echo $CURRENT | cut -d'/' -f1)
+
+# Confirm
+echo "⚠️ This will delete branch $CURRENT and its worktree"
+echo "All uncommitted changes will be LOST"
+
+# Find worktree
+WORKTREE=$(git worktree list | grep "$CURRENT" | awk '{print $1}')
+
+# Create backup tag
+BACKUP_TAG="backup/$CURRENT-$(date +%Y%m%d-%H%M%S)"
+git tag "$BACKUP_TAG" HEAD
+echo "✓ Backup created: $BACKUP_TAG"
+
+# Switch to develop
+git checkout develop
+
+# Remove worktree
+[ -n "$WORKTREE" ] && {
+  git worktree remove "$WORKTREE" --force
+  git worktree prune
+}
+
+# Delete branch
+git branch -D "$CURRENT"
+git push origin --delete "$CURRENT" 2>/dev/null
+
+echo "✓ Branch $CURRENT abandoned"
+echo "  Backup: $BACKUP_TAG (use 'git checkout $BACKUP_TAG' to recover)"
+```
+
+### Option 3: Restore from Checkpoint
+
+```bash
+# List available checkpoints
+CHECKPOINTS=$(ls -t .claude/gitflow/logs/checkpoint_*.json 2>/dev/null)
+
+if [ -z "$CHECKPOINTS" ]; then
+  echo "No checkpoints found"
+  exit 1
+fi
+
+echo "Available checkpoints:"
+for cp in $CHECKPOINTS; do
+  TIMESTAMP=$(grep -oP '"timestamp":\s*"\K[^"]+' "$cp")
+  BRANCH=$(grep -oP '"branch":\s*"\K[^"]+' "$cp")
+  COMMIT=$(grep -oP '"commit":\s*"\K[^"]+' "$cp")
+  echo "  - $TIMESTAMP: $BRANCH @ $COMMIT"
+done
+
+# Select checkpoint
+# ... user selection ...
+
+# Restore
+COMMIT=$(grep -oP '"commit":\s*"\K[^"]+' "$SELECTED_CHECKPOINT")
+git reset --hard "$COMMIT"
+echo "✓ Restored to $COMMIT"
+```
+
+### Option 4: Reset to Remote
+
+```bash
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+
+# Check for local changes
+CHANGES=$(git status --porcelain | wc -l)
+[ "$CHANGES" -gt 0 ] && {
+  echo "⚠️ $CHANGES uncommitted changes will be LOST"
+  # Confirm
+}
+
+# Stash as backup
+git stash push -m "abort-backup-$(date +%s)" --include-untracked
+
+# Reset to remote
+git fetch origin
+git reset --hard "origin/$CURRENT"
+
+echo "✓ Reset to origin/$CURRENT"
+echo "  Backup in stash (use 'git stash list' to see)"
+```
+
+---
+
+## SAFETY FEATURES:
+
+1. **Backup tag** created before destructive operations
+2. **Stash backup** before reset
+3. **Checkpoint restore** for plan execution
+4. **Confirmation required** for destructive actions
+
+---
+
+## RECOVERY COMMANDS:
+
+```bash
+# List backup tags
+git tag | grep "^backup/"
+
+# Recover from backup
+git checkout backup/{branch-name}
+git checkout -b {new-branch-name}
+
+# List stashes
+git stash list
+
+# Recover from stash
+git stash pop
+```
+
+---
+
+## SUCCESS CRITERIA:
+
+- Operation aborted cleanly
+- Backup created before destructive action
+- User returned to safe state (develop/main)

package/templates/skills/gitflow/phases/cleanup.md

@@ -0,0 +1,226 @@
+---
+name: cleanup
+description: Audit and remove orphan worktrees and branches
+---
+
+# Phase: CLEANUP - Maintenance
+
+## YOUR TASK:
+
+Audit worktrees and branches, remove orphaned/stale items.
+
+**IMPORTANT:** Must be run from main or develop branch.
+
+---
+
+## PRE-CHECK:
+
+```bash
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+
+[[ "$CURRENT" != "main" ]] && [[ "$CURRENT" != "develop" ]] && {
+  echo "❌ Cleanup must be run from main or develop"
+  echo "   Current branch: $CURRENT"
+  echo "→ Run: git checkout develop"
+  STOP
+}
+```
+
+---
+
+## EXECUTION:
+
+### 1. Audit Worktrees
+
+```bash
+echo "Scanning worktrees..."
+
+git worktree list > /tmp/worktrees.txt
+
+ORPHANED=()
+STALE=()
+VALID=()
+
+while read -r line; do
+  WT_PATH=$(echo "$line" | awk '{print $1}')
+  WT_COMMIT=$(echo "$line" | awk '{print $2}')
+  WT_BRANCH=$(echo "$line" | awk '{print $3}' | tr -d '[]')
+
+  # Check if path exists
+  if [ ! -d "$WT_PATH" ]; then
+    ORPHANED+=("$WT_PATH:$WT_BRANCH")
+    continue
+  fi
+
+  # Check if branch still exists on remote
+  REMOTE_EXISTS=$(git branch -r --list "origin/$WT_BRANCH" | wc -l)
+  if [ "$REMOTE_EXISTS" -eq 0 ] && [[ "$WT_BRANCH" != "main" ]] && [[ "$WT_BRANCH" != "develop" ]]; then
+    STALE+=("$WT_PATH:$WT_BRANCH")
+    continue
+  fi
+
+  VALID+=("$WT_PATH:$WT_BRANCH")
+done < /tmp/worktrees.txt
+```
+
+### 2. Audit Local Branches
+
+```bash
+echo "Scanning local branches..."
+
+MERGED_BRANCHES=()
+UNMERGED_BRANCHES=()
+
+# Find merged branches
+for branch in $(git branch --merged develop | grep -v "^\*" | grep -v "main" | grep -v "develop"); do
+  # Check if remote exists
+  REMOTE_EXISTS=$(git branch -r --list "origin/$branch" | wc -l)
+  [ "$REMOTE_EXISTS" -eq 0 ] && MERGED_BRANCHES+=("$branch")
+done
+
+# Find branches without remote
+for branch in $(git branch | grep -v "^\*" | grep -v "main" | grep -v "develop"); do
+  REMOTE_EXISTS=$(git branch -r --list "origin/$branch" | wc -l)
+  [ "$REMOTE_EXISTS" -eq 0 ] && {
+    MERGED=$(git branch --merged develop | grep -c "$branch")
+    [ "$MERGED" -eq 0 ] && UNMERGED_BRANCHES+=("$branch")
+  }
+done
+```
+
+### 3. Display Audit Results
+
+```
+╔══════════════════════════════════════════════════════════════════╗
+║                    CLEANUP AUDIT                                  ║
+╠══════════════════════════════════════════════════════════════════╣
+
+## Worktrees
+
+| Status | Count |
+|--------|-------|
+| Valid | {#VALID} |
+| Orphaned | {#ORPHANED} |
+| Stale | {#STALE} |
+
+{if ORPHANED}
+### Orphaned Worktrees (path missing)
+{list with paths}
+{endif}
+
+{if STALE}
+### Stale Worktrees (remote deleted)
+{list with paths and branches}
+{endif}
+
+## Local Branches
+
+| Status | Count |
+|--------|-------|
+| Merged (safe to delete) | {#MERGED_BRANCHES} |
+| Unmerged (caution) | {#UNMERGED_BRANCHES} |
+
+{if MERGED_BRANCHES}
+### Merged Branches
+{list}
+{endif}
+
+{if UNMERGED_BRANCHES}
+### Unmerged Branches ⚠️
+{list}
+{endif}
+
+╚══════════════════════════════════════════════════════════════════╝
+```
+
+### 4. Cleanup Actions
+
+```yaml
+AskUserQuestion:
+  header: "Cleanup"
+  question: "What do you want to clean?"
+  options:
+    - label: "All safe items (Recommended)"
+      description: "Orphaned worktrees + merged branches"
+    - label: "Worktrees only"
+      description: "Remove orphaned and stale worktrees"
+    - label: "Branches only"
+      description: "Delete merged local branches"
+    - label: "Nothing (dry run)"
+      description: "Just show what would be cleaned"
+  multiSelect: false
+```
+
+### 5. Execute Cleanup
+
+**Worktrees:**
+```bash
+# Remove orphaned
+for item in "${ORPHANED[@]}"; do
+  WT_PATH=$(echo "$item" | cut -d':' -f1)
+  git worktree remove "$WT_PATH" --force 2>/dev/null || rm -rf "$WT_PATH"
+done
+
+# Prune
+git worktree prune
+
+# Remove stale
+for item in "${STALE[@]}"; do
+  WT_PATH=$(echo "$item" | cut -d':' -f1)
+  WT_BRANCH=$(echo "$item" | cut -d':' -f2)
+
+  git worktree remove "$WT_PATH" --force 2>/dev/null || rm -rf "$WT_PATH"
+  git branch -D "$WT_BRANCH" 2>/dev/null
+done
+```
+
+**Branches:**
+```bash
+# Delete merged branches
+for branch in "${MERGED_BRANCHES[@]}"; do
+  git branch -d "$branch"
+done
+```
+
+### 6. Summary
+
+```
+╔══════════════════════════════════════════════════════════════════╗
+║                    CLEANUP COMPLETE                               ║
+╠══════════════════════════════════════════════════════════════════╣
+║  Worktrees removed: {count}                                       ║
+║  Branches deleted:  {count}                                       ║
+╠══════════════════════════════════════════════════════════════════╣
+║  Remaining worktrees: {count}                                     ║
+║  Remaining branches:  {count}                                     ║
+╚══════════════════════════════════════════════════════════════════╝
+```
+
+---
+
+## DRY RUN MODE:
+
+```bash
+# With --dry-run flag
+echo "DRY RUN - No changes will be made"
+echo ""
+echo "Would remove worktrees:"
+for item in "${ORPHANED[@]}" "${STALE[@]}"; do
+  echo "  - $item"
+done
+echo ""
+echo "Would delete branches:"
+for branch in "${MERGED_BRANCHES[@]}"; do
+  echo "  - $branch"
+done
+```
+
+---
+
+## SUCCESS CRITERIA:
+
+- Audit completed
+- Orphaned worktrees removed
+- Stale worktrees removed
+- Merged branches deleted
+- Summary displayed

package/templates/skills/gitflow/phases/status.md

@@ -0,0 +1,178 @@
+---
+name: status
+description: Complete GitFlow state diagnostic
+---
+
+# Phase: STATUS - Diagnostic
+
+## YOUR TASK:
+
+Display complete GitFlow state including branches, worktrees, remotes, and pending work.
+
+---
+
+## EXECUTION:
+
+### 1. Repository Info
+
+```bash
+REPO_NAME=$(basename $(git rev-parse --show-toplevel))
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+REMOTE_URL=$(git remote get-url origin 2>/dev/null || echo "No remote")
+
+# Detect provider
+[[ "$REMOTE_URL" == *"github.com"* ]] && GIT_PROVIDER="GitHub"
+[[ "$REMOTE_URL" == *"dev.azure.com"* ]] && GIT_PROVIDER="Azure DevOps"
+```
+
+### 2. Branch Status
+
+```bash
+git fetch origin --quiet
+
+# Main branches
+MAIN_LOCAL=$(git rev-parse --short main 2>/dev/null || echo "N/A")
+MAIN_REMOTE=$(git rev-parse --short origin/main 2>/dev/null || echo "N/A")
+DEVELOP_LOCAL=$(git rev-parse --short develop 2>/dev/null || echo "N/A")
+DEVELOP_REMOTE=$(git rev-parse --short origin/develop 2>/dev/null || echo "N/A")
+
+# Divergence
+DEVELOP_AHEAD=$(git rev-list --count origin/main..origin/develop 2>/dev/null || echo "0")
+```
+
+### 3. Active Branches
+
+```bash
+# Feature branches
+FEATURES=$(git branch -r | grep "origin/feature/" | sed 's/origin\///')
+
+# Release branches
+RELEASES=$(git branch -r | grep "origin/release/" | sed 's/origin\///')
+
+# Hotfix branches
+HOTFIXES=$(git branch -r | grep "origin/hotfix/" | sed 's/origin\///')
+```
+
+### 4. Worktree Status
+
+```bash
+WORKTREES=$(git worktree list)
+WORKTREE_COUNT=$(echo "$WORKTREES" | wc -l)
+
+# Check for orphaned worktrees
+ORPHANED=""
+while read -r line; do
+  PATH=$(echo "$line" | awk '{print $1}')
+  BRANCH=$(echo "$line" | awk '{print $3}' | tr -d '[]')
+  [ ! -d "$PATH" ] && ORPHANED="$ORPHANED\n$PATH ($BRANCH)"
+done <<< "$WORKTREES"
+```
+
+### 5. Pending Changes
+
+```bash
+# Current branch changes
+STAGED=$(git diff --cached --name-only | wc -l)
+MODIFIED=$(git diff --name-only | wc -l)
+UNTRACKED=$(git ls-files --others --exclude-standard | wc -l)
+
+# Unpushed commits
+UNPUSHED=$(git rev-list --count origin/$CURRENT..HEAD 2>/dev/null || echo "0")
+```
+
+### 6. EF Core Status
+
+```bash
+# Check for migrations
+MIGRATIONS=$(find . -path "*/Migrations/*.cs" -not -name "*Designer*" -not -name "*Snapshot*" 2>/dev/null | wc -l)
+
+# Check migration status
+if command -v dotnet &> /dev/null; then
+  PENDING=$(dotnet ef migrations list 2>/dev/null | grep -c "(Pending)" || echo "0")
+fi
+```
+
+### 7. Display Status
+
+```
+╔══════════════════════════════════════════════════════════════════╗
+║                    GITFLOW STATUS                                 ║
+╠══════════════════════════════════════════════════════════════════╣
+║  Repository: {REPO_NAME}                                          ║
+║  Provider:   {GIT_PROVIDER}                                       ║
+║  Current:    {CURRENT}                                            ║
+╠══════════════════════════════════════════════════════════════════╣
+
+## Main Branches
+
+| Branch | Local | Remote | Status |
+|--------|-------|--------|--------|
+| main | {MAIN_LOCAL} | {MAIN_REMOTE} | {synced/diverged} |
+| develop | {DEVELOP_LOCAL} | {DEVELOP_REMOTE} | {synced/diverged} |
+
+develop → main: {DEVELOP_AHEAD} commits {DEVELOP_AHEAD > 10 ? "⚠️ Release recommended" : ""}
+
+## Active Branches
+
+**Features:** {count}
+{list of feature branches with status}
+
+**Releases:** {count}
+{list of release branches}
+
+**Hotfixes:** {count}
+{list of hotfix branches}
+
+## Worktrees
+
+| Path | Branch | Status |
+|------|--------|--------|
+{worktree list with status}
+
+{if orphaned}
+⚠️ Orphaned worktrees detected:
+{list}
+→ Run: /gitflow cleanup
+{endif}
+
+## Working Directory
+
+| Type | Count |
+|------|-------|
+| Staged | {STAGED} |
+| Modified | {MODIFIED} |
+| Untracked | {UNTRACKED} |
+| Unpushed | {UNPUSHED} |
+
+## EF Core
+
+| Metric | Value |
+|--------|-------|
+| Migrations | {MIGRATIONS} |
+| Pending | {PENDING} |
+
+╚══════════════════════════════════════════════════════════════════╝
+
+## Recommended Actions
+
+{if UNPUSHED > 0}
+- Push commits: /gitflow sync
+{endif}
+{if DEVELOP_AHEAD > 10}
+- Create release: /gitflow start release
+{endif}
+{if ORPHANED}
+- Clean worktrees: /gitflow cleanup
+{endif}
+{if STAGED + MODIFIED > 0}
+- Commit changes: /gitflow commit
+{endif}
+```
+
+---
+
+## SUCCESS CRITERIA:
+
+- Complete state displayed
+- Recommendations provided
+- No actions taken (diagnostic only)