myaidev-method 0.2.5 → 0.2.6

package/src/templates/gemini/commands/myai-git-sync.toml

@@ -0,0 +1,792 @@
+prompt = """
+
+Task: Sync branches and manage git workflow - {{args}}
+
+## Branch Synchronization Workflow
+
+### 1. Branch Status Overview
+
+```bash
+check_branch_status() {
+  echo \"🔍 Checking branch status...\"
+
+  # Current branch
+  current_branch=$(git branch --show-current)
+  echo \"Current branch: $current_branch\"
+
+  # Fetch latest from remote
+  git fetch --all --prune
+
+  # List all branches with status
+  echo \"\"
+  echo \"╔══════════════════════════════════════════════════════════╗\"
+  echo \"║                    BRANCH STATUS                         ║\"
+  echo \"╚══════════════════════════════════════════════════════════╝\"
+
+  # Local branches
+  echo \"\"
+  echo \"📍 Local Branches:\"
+  git branch -vv
+
+  # Remote branches
+  echo \"\"
+  echo \"☁️  Remote Branches:\"
+  git branch -r
+
+  # Check for branches ahead/behind
+  echo \"\"
+  echo \"📊 Sync Status:\"
+
+  for branch in $(git branch --format='%(refname:short)'); do
+    if git rev-parse --verify \"origin/$branch\" &>/dev/null; then
+      ahead=$(git rev-list --count \"origin/$branch..$branch\" 2>/dev/null || echo \"0\")
+      behind=$(git rev-list --count \"$branch..origin/$branch\" 2>/dev/null || echo \"0\")
+
+      if [ \"$ahead\" -gt 0 ] || [ \"$behind\" -gt 0 ]; then
+        echo \"  $branch: ↑$ahead ↓$behind\"
+      else
+        echo \"  $branch: ✅ synced\"
+      fi
+    else
+      echo \"  $branch: ⚠️  not on remote\"
+    fi
+  done
+
+  echo \"\"
+}
+
+# Show status
+check_branch_status
+```
+
+### 2. Sync Main/Master Branch
+
+```bash
+sync_main_branch() {
+  echo \"🔄 Syncing main/master branch...\"
+
+  # Determine main branch name
+  if git show-ref --verify --quiet refs/heads/main; then
+    main_branch=\"main\"
+  elif git show-ref --verify --quiet refs/heads/master; then
+    main_branch=\"master\"
+  else
+    echo \"❌ No main/master branch found\"
+    return 1
+  fi
+
+  echo \"Main branch: $main_branch\"
+
+  # Save current branch
+  current_branch=$(git branch --show-current)
+
+  # Stash changes if any
+  if ! git diff-index --quiet HEAD --; then
+    echo \"💾 Stashing local changes...\"
+    git stash save \"Auto-stash before sync $(date)\"
+    stashed=true
+  else
+    stashed=false
+  fi
+
+  # Switch to main branch
+  git checkout \"$main_branch\" || {
+    echo \"❌ Failed to checkout $main_branch\"
+    return 1
+  }
+
+  # Pull latest changes
+  echo \"⬇️  Pulling latest changes...\"
+  git pull origin \"$main_branch\" --rebase || {
+    echo \"❌ Failed to pull changes\"
+    git checkout \"$current_branch\"
+    return 1
+  }
+
+  # Switch back to original branch
+  if [ \"$current_branch\" != \"$main_branch\" ]; then
+    git checkout \"$current_branch\"
+  fi
+
+  # Restore stashed changes
+  if [ \"$stashed\" = true ]; then
+    echo \"📂 Restoring stashed changes...\"
+    git stash pop
+  fi
+
+  echo \"✅ Main branch synced\"
+}
+
+# Sync main
+sync_main_branch
+```
+
+### 3. Sync Development Branch
+
+```bash
+sync_dev_branch() {
+  echo \"🔄 Syncing development branch...\"
+
+  # Determine dev branch name
+  if git show-ref --verify --quiet refs/heads/dev; then
+    dev_branch=\"dev\"
+  elif git show-ref --verify --quiet refs/heads/develop; then
+    dev_branch=\"develop\"
+  else
+    echo \"⚠️  No dev/develop branch found\"
+    return 0
+  fi
+
+  echo \"Dev branch: $dev_branch\"
+
+  # Save current branch
+  current_branch=$(git branch --show-current)
+
+  # Switch to dev branch
+  git checkout \"$dev_branch\"
+
+  # Pull latest changes
+  echo \"⬇️  Pulling latest changes...\"
+  git pull origin \"$dev_branch\" --rebase || {
+    echo \"❌ Failed to pull changes\"
+    git checkout \"$current_branch\"
+    return 1
+  }
+
+  # Merge main into dev (keep dev updated with main)
+  main_branch=$(git show-ref --verify --quiet refs/heads/main && echo \"main\" || echo \"master\")
+
+  echo \"🔀 Merging $main_branch into $dev_branch...\"
+  git merge \"origin/$main_branch\" --no-edit || {
+    echo \"⚠️  Merge conflicts detected\"
+    echo \"Resolve conflicts and run: git merge --continue\"
+    return 1
+  }
+
+  # Push updated dev branch
+  echo \"⬆️  Pushing updated dev branch...\"
+  git push origin \"$dev_branch\"
+
+  # Switch back to original branch
+  if [ \"$current_branch\" != \"$dev_branch\" ]; then
+    git checkout \"$current_branch\"
+  fi
+
+  echo \"✅ Dev branch synced\"
+}
+
+# Sync dev
+sync_dev_branch
+```
+
+### 4. Sync Staging Branch
+
+```bash
+sync_staging_branch() {
+  echo \"🔄 Syncing staging branch...\"
+
+  if ! git show-ref --verify --quiet refs/heads/staging; then
+    echo \"⚠️  No staging branch found\"
+    return 0
+  fi
+
+  # Save current branch
+  current_branch=$(git branch --show-current)
+
+  # Switch to staging
+  git checkout staging
+
+  # Pull latest changes
+  echo \"⬇️  Pulling latest changes...\"
+  git pull origin staging --rebase || {
+    echo \"❌ Failed to pull changes\"
+    git checkout \"$current_branch\"
+    return 1
+  }
+
+  # Merge dev into staging
+  dev_branch=$(git show-ref --verify --quiet refs/heads/dev && echo \"dev\" || echo \"develop\")
+
+  if git show-ref --verify --quiet \"refs/heads/$dev_branch\"; then
+    echo \"🔀 Merging $dev_branch into staging...\"
+    git merge \"origin/$dev_branch\" --no-edit || {
+      echo \"⚠️  Merge conflicts detected\"
+      return 1
+    }
+
+    # Push updated staging branch
+    echo \"⬆️  Pushing updated staging branch...\"
+    git push origin staging
+  fi
+
+  # Switch back to original branch
+  if [ \"$current_branch\" != \"staging\" ]; then
+    git checkout \"$current_branch\"
+  fi
+
+  echo \"✅ Staging branch synced\"
+}
+
+# Sync staging
+sync_staging_branch
+```
+
+### 5. Merge Main into Feature Branch
+
+```bash
+merge_main_into_feature() {
+  local feature_branch=${1:-$(git branch --show-current)}
+
+  echo \"🔀 Merging main into feature branch: $feature_branch...\"
+
+  # Ensure we're on the feature branch
+  if [ \"$(git branch --show-current)\" != \"$feature_branch\" ]; then
+    git checkout \"$feature_branch\" || {
+      echo \"❌ Failed to checkout $feature_branch\"
+      return 1
+    }
+  fi
+
+  # Determine main branch
+  main_branch=$(git show-ref --verify --quiet refs/heads/main && echo \"main\" || echo \"master\")
+
+  # Fetch latest
+  git fetch origin \"$main_branch\"
+
+  # Check if feature branch is behind main
+  behind=$(git rev-list --count \"$feature_branch..origin/$main_branch\")
+
+  if [ \"$behind\" -eq 0 ]; then
+    echo \"✅ Feature branch is up to date with $main_branch\"
+    return 0
+  fi
+
+  echo \"📊 Feature branch is $behind commits behind $main_branch\"
+
+  # Stash changes if any
+  if ! git diff-index --quiet HEAD --; then
+    echo \"💾 Stashing local changes...\"
+    git stash save \"Auto-stash before merge $(date)\"
+    stashed=true
+  else
+    stashed=false
+  fi
+
+  # Merge main into feature
+  echo \"🔀 Merging $main_branch...\"
+  git merge \"origin/$main_branch\" --no-edit || {
+    echo \"⚠️  Merge conflicts detected\"
+    echo \"\"
+    echo \"Conflicted files:\"
+    git diff --name-only --diff-filter=U
+    echo \"\"
+    echo \"Resolve conflicts then run:\"
+    echo \"  git add <resolved-files>\"
+    echo \"  git merge --continue\"
+
+    if [ \"$stashed\" = true ]; then
+      echo \"  git stash pop\"
+    fi
+
+    return 1
+  }
+
+  # Restore stashed changes
+  if [ \"$stashed\" = true ]; then
+    echo \"📂 Restoring stashed changes...\"
+    git stash pop
+  fi
+
+  # Push updated feature branch
+  read -p \"Push updated feature branch? (yes/no): \" push_confirm
+
+  if [ \"$push_confirm\" == \"yes\" ]; then
+    git push origin \"$feature_branch\"
+    echo \"✅ Feature branch pushed\"
+  fi
+
+  echo \"✅ Main merged into feature branch\"
+}
+
+# Merge main into current branch
+merge_main_into_feature
+```
+
+### 6. Sync All Branches
+
+```bash
+sync_all_branches() {
+  echo \"🔄 Syncing all branches...\"
+
+  # Save current branch
+  current_branch=$(git branch --show-current)
+
+  # Fetch all
+  git fetch --all --prune
+
+  # Define branch hierarchy
+  main_branch=$(git show-ref --verify --quiet refs/heads/main && echo \"main\" || echo \"master\")
+  dev_branch=$(git show-ref --verify --quiet refs/heads/dev && echo \"dev\" || echo \"develop\")
+
+  # Sync main
+  echo \"\"
+  echo \"═══════════════════════════════════════\"
+  echo \"Syncing $main_branch...\"
+  echo \"═══════════════════════════════════════\"
+  git checkout \"$main_branch\"
+  git pull origin \"$main_branch\" --rebase
+
+  # Sync dev
+  if git show-ref --verify --quiet \"refs/heads/$dev_branch\"; then
+    echo \"\"
+    echo \"═══════════════════════════════════════\"
+    echo \"Syncing $dev_branch...\"
+    echo \"═══════════════════════════════════════\"
+    git checkout \"$dev_branch\"
+    git pull origin \"$dev_branch\" --rebase
+    git merge \"origin/$main_branch\" --no-edit
+    git push origin \"$dev_branch\"
+  fi
+
+  # Sync staging
+  if git show-ref --verify --quiet refs/heads/staging; then
+    echo \"\"
+    echo \"═══════════════════════════════════════\"
+    echo \"Syncing staging...\"
+    echo \"═══════════════════════════════════════\"
+    git checkout staging
+    git pull origin staging --rebase
+    if git show-ref --verify --quiet \"refs/heads/$dev_branch\"; then
+      git merge \"origin/$dev_branch\" --no-edit
+    else
+      git merge \"origin/$main_branch\" --no-edit
+    fi
+    git push origin staging
+  fi
+
+  # Return to original branch
+  git checkout \"$current_branch\"
+
+  echo \"\"
+  echo \"✅ All branches synced\"
+}
+
+# Uncomment to sync all branches
+# sync_all_branches
+```
+
+### 7. Clean Up Merged Branches
+
+```bash
+cleanup_merged_branches() {
+  echo \"🧹 Cleaning up merged branches...\"
+
+  # Determine main branch
+  main_branch=$(git show-ref --verify --quiet refs/heads/main && echo \"main\" || echo \"master\")
+
+  # Fetch and prune
+  git fetch --all --prune
+
+  # Find merged branches
+  echo \"🔍 Finding merged branches...\"
+
+  merged_branches=$(git branch --merged \"$main_branch\" | \\
+    grep -v \"^\\*\" | \\
+    grep -v \"$main_branch\" | \\
+    grep -v \"develop\" | \\
+    grep -v \"dev\" | \\
+    grep -v \"staging\" | \\
+    grep -v \"production\")
+
+  if [ -z \"$merged_branches\" ]; then
+    echo \"✅ No merged branches to clean up\"
+    return 0
+  fi
+
+  echo \"Branches merged into $main_branch:\"
+  echo \"$merged_branches\"
+  echo \"\"
+
+  read -p \"Delete these local branches? (yes/no): \" delete_confirm
+
+  if [ \"$delete_confirm\" == \"yes\" ]; then
+    echo \"$merged_branches\" | xargs git branch -d
+    echo \"✅ Local branches deleted\"
+  fi
+
+  # Check remote branches
+  echo \"\"
+  echo \"🔍 Checking remote merged branches...\"
+
+  remote_merged=$(git branch -r --merged \"$main_branch\" | \\
+    grep -v \"HEAD\" | \\
+    grep -v \"$main_branch\" | \\
+    grep -v \"develop\" | \\
+    grep -v \"dev\" | \\
+    grep -v \"staging\" | \\
+    grep -v \"production\" | \\
+    sed 's/origin\\///')
+
+  if [ -z \"$remote_merged\" ]; then
+    echo \"✅ No remote merged branches\"
+    return 0
+  fi
+
+  echo \"Remote branches merged into $main_branch:\"
+  echo \"$remote_merged\"
+  echo \"\"
+
+  read -p \"Delete these remote branches? (yes/no): \" delete_remote
+
+  if [ \"$delete_remote\" == \"yes\" ]; then
+    echo \"$remote_merged\" | xargs -I {} git push origin --delete {}
+    echo \"✅ Remote branches deleted\"
+  fi
+
+  echo \"✅ Branch cleanup complete\"
+}
+
+# Cleanup merged branches
+cleanup_merged_branches
+```
+
+### 8. Handle Merge Conflicts
+
+```bash
+handle_merge_conflicts() {
+  echo \"🔧 Merge conflict resolution helper...\"
+
+  # Check if in merge state
+  if [ ! -f \".git/MERGE_HEAD\" ]; then
+    echo \"✅ No active merge conflicts\"
+    return 0
+  fi
+
+  echo \"⚠️  Active merge detected\"
+
+  # Show conflicted files
+  echo \"\"
+  echo \"📋 Conflicted files:\"
+  git diff --name-only --diff-filter=U
+
+  echo \"\"
+  echo \"Conflict resolution options:\"
+  echo \"  1. Use ours (keep current branch changes)\"
+  echo \"  2. Use theirs (accept incoming changes)\"
+  echo \"  3. Manual resolution\"
+  echo \"  4. Abort merge\"
+  echo \"\"
+
+  read -p \"Choose option (1-4): \" option
+
+  case $option in
+    1)
+      echo \"Accepting current branch changes...\"
+      git diff --name-only --diff-filter=U | xargs git checkout --ours
+      git add -A
+      git merge --continue
+      ;;
+    2)
+      echo \"Accepting incoming changes...\"
+      git diff --name-only --diff-filter=U | xargs git checkout --theirs
+      git add -A
+      git merge --continue
+      ;;
+    3)
+      echo \"Opening merge tool...\"
+      git mergetool
+      ;;
+    4)
+      echo \"Aborting merge...\"
+      git merge --abort
+      echo \"✅ Merge aborted\"
+      ;;
+    *)
+      echo \"Invalid option\"
+      ;;
+  esac
+}
+
+# Handle conflicts if present
+handle_merge_conflicts
+```
+
+### 9. Branch Comparison
+
+```bash
+compare_branches() {
+  local branch1=${1:-main}
+  local branch2=${2:-$(git branch --show-current)}
+
+  echo \"🔍 Comparing branches: $branch1 vs $branch2\"
+
+  # Fetch latest
+  git fetch origin
+
+  # Commits in branch2 not in branch1
+  echo \"\"
+  echo \"📊 Commits in $branch2 not in $branch1:\"
+  ahead_count=$(git rev-list --count \"$branch1..$branch2\")
+  echo \"Total: $ahead_count commits\"
+  if [ \"$ahead_count\" -gt 0 ]; then
+    git log --oneline \"$branch1..$branch2\"
+  fi
+
+  # Commits in branch1 not in branch2
+  echo \"\"
+  echo \"📊 Commits in $branch1 not in $branch2:\"
+  behind_count=$(git rev-list --count \"$branch2..$branch1\")
+  echo \"Total: $behind_count commits\"
+  if [ \"$behind_count\" -gt 0 ]; then
+    git log --oneline \"$branch2..$branch1\"
+  fi
+
+  # File differences
+  echo \"\"
+  echo \"📁 File differences:\"
+  git diff --stat \"$branch1..$branch2\"
+
+  # Summary
+  echo \"\"
+  echo \"═══════════════════════════════════════\"
+  echo \"SUMMARY\"
+  echo \"═══════════════════════════════════════\"
+  echo \"$branch2 is:\"
+  echo \"  ↑ $ahead_count commits ahead\"
+  echo \"  ↓ $behind_count commits behind\"
+  echo \"  of $branch1\"
+}
+
+# Compare current branch with main
+# compare_branches \"main\" \"$(git branch --show-current)\"
+```
+
+### 10. Pull Request Ready Check
+
+```bash
+pr_ready_check() {
+  local feature_branch=${1:-$(git branch --show-current)}
+
+  echo \"✅ PR Ready Check: $feature_branch\"
+
+  # Determine main branch
+  main_branch=$(git show-ref --verify --quiet refs/heads/main && echo \"main\" || echo \"master\")
+
+  # Fetch latest
+  git fetch origin
+
+  # Check 1: Branch is pushed
+  if ! git rev-parse --verify \"origin/$feature_branch\" &>/dev/null; then
+    echo \"❌ Branch not pushed to remote\"
+    echo \"   Run: git push origin $feature_branch\"
+    return 1
+  fi
+
+  # Check 2: No uncommitted changes
+  if ! git diff-index --quiet HEAD --; then
+    echo \"❌ Uncommitted changes detected\"
+    git status --short
+    return 1
+  fi
+
+  # Check 3: Up to date with main
+  behind=$(git rev-list --count \"$feature_branch..origin/$main_branch\")
+  if [ \"$behind\" -gt 0 ]; then
+    echo \"⚠️  Branch is $behind commits behind $main_branch\"
+    echo \"   Consider merging main: /myai-git-sync merge-main\"
+  fi
+
+  # Check 4: Conflicts with main
+  if ! git merge-tree \"$(git merge-base $feature_branch origin/$main_branch)\" \"$feature_branch\" \"origin/$main_branch\" | grep -q \"^-\"; then
+    echo \"✅ No conflicts with $main_branch\"
+  else
+    echo \"⚠️  May have conflicts with $main_branch\"
+  fi
+
+  # Check 5: Tests pass
+  echo \"🧪 Running tests...\"
+  if npm test &>/dev/null; then
+    echo \"✅ Tests passing\"
+  else
+    echo \"❌ Tests failing\"
+    return 1
+  fi
+
+  # Check 6: Linting
+  if command -v npm &>/dev/null && grep -q \"\\\"lint\\\"\" package.json 2>/dev/null; then
+    if npm run lint &>/dev/null; then
+      echo \"✅ Linting passing\"
+    else
+      echo \"⚠️  Linting issues detected\"
+    fi
+  fi
+
+  # Summary
+  echo \"\"
+  echo \"═══════════════════════════════════════\"
+  echo \"✅ Ready to create Pull Request!\"
+  echo \"═══════════════════════════════════════\"
+
+  # Generate PR creation command
+  if command -v gh &>/dev/null; then
+    echo \"\"
+    echo \"Create PR with:\"
+    echo \"  gh pr create --base $main_branch --head $feature_branch\"
+  fi
+}
+
+# Check if ready for PR
+pr_ready_check
+```
+
+### 11. Sync Notification
+
+```bash
+send_sync_notification() {
+  local sync_summary=$1
+
+  # Slack notification
+  if [ -n \"$SLACK_WEBHOOK_URL\" ]; then
+    curl -X POST \"$SLACK_WEBHOOK_URL\" \\
+      -H 'Content-Type: application/json' \\
+      -d \"{
+        \\\"text\\\": \\\"🔄 Branch Sync Complete\\\",
+        \\\"blocks\\\": [
+          {
+            \\\"type\\\": \\\"section\\\",
+            \\\"text\\\": {
+              \\\"type\\\": \\\"mrkdwn\\\",
+              \\\"text\\\": \\\"*Branch Synchronization*\\n$sync_summary\\\"
+            }
+          }
+        ]
+      }\"
+  fi
+
+  # Discord notification
+  if [ -n \"$DISCORD_WEBHOOK_URL\" ]; then
+    curl -X POST \"$DISCORD_WEBHOOK_URL\" \\
+      -H 'Content-Type: application/json' \\
+      -d \"{
+        \\\"content\\\": \\\"🔄 **Branch Sync Complete**\\\",
+        \\\"embeds\\\": [{
+          \\\"description\\\": \\\"$sync_summary\\\",
+          \\\"color\\\": 3447003
+        }]
+      }\"
+  fi
+}
+```
+
+## Complete Sync Script
+
+```bash
+#!/bin/bash
+set -e
+
+echo \"🔄 Git Branch Synchronization\"
+echo \"═══════════════════════════════════════\"
+
+# Parse arguments
+action=${1:-status}
+
+case $action in
+  status)
+    check_branch_status
+    ;;
+
+  main)
+    sync_main_branch
+    ;;
+
+  dev)
+    sync_dev_branch
+    ;;
+
+  staging)
+    sync_staging_branch
+    ;;
+
+  all)
+    sync_all_branches
+    ;;
+
+  merge-main)
+    merge_main_into_feature
+    ;;
+
+  cleanup)
+    cleanup_merged_branches
+    ;;
+
+  compare)
+    compare_branches \"$2\" \"$3\"
+    ;;
+
+  pr-check)
+    pr_ready_check \"$2\"
+    ;;
+
+  conflicts)
+    handle_merge_conflicts
+    ;;
+
+  *)
+    echo \"Usage: /myai-git-sync [command]\"
+    echo \"\"
+    echo \"Commands:\"
+    echo \"  status       - Show branch status overview\"
+    echo \"  main         - Sync main/master branch\"
+    echo \"  dev          - Sync dev/develop branch\"
+    echo \"  staging      - Sync staging branch\"
+    echo \"  all          - Sync all branches\"
+    echo \"  merge-main   - Merge main into current feature branch\"
+    echo \"  cleanup      - Clean up merged branches\"
+    echo \"  compare      - Compare two branches\"
+    echo \"  pr-check     - Check if ready for pull request\"
+    echo \"  conflicts    - Handle merge conflicts\"
+    ;;
+esac
+
+echo \"\"
+echo \"✅ Sync operation complete\"
+```
+
+## Quick Commands
+
+```bash
+# Check status
+/myai-git-sync status
+
+# Sync main branch
+/myai-git-sync main
+
+# Sync all branches
+/myai-git-sync all
+
+# Merge main into feature
+/myai-git-sync merge-main
+
+# Clean up merged branches
+/myai-git-sync cleanup
+
+# Check PR readiness
+/myai-git-sync pr-check
+```
+
+## Environment Configuration
+
+```bash
+# Notifications (optional)
+SLACK_WEBHOOK_URL=https://hooks.slack.com/services/YOUR/WEBHOOK
+DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/YOUR/WEBHOOK
+
+# Branch names (defaults)
+MAIN_BRANCH=main
+DEV_BRANCH=dev
+STAGING_BRANCH=staging
+```
+
+Execute branch synchronization and management operations efficiently.
+
+"""