@atlashub/smartstack-cli 1.1.0

package/templates/commands/gitflow/13-sync.md

@@ -0,0 +1,216 @@
+---
+description: Phase 13 - Sync local branch with remote (push/pull)
+agent: gitflow-status
+model: haiku
+---
+
+# Phase 13: SYNC - Synchronize with Remote
+
+Synchronise la branche locale avec sa branche remote tracking.
+
+---
+
+## STEP 1: Fetch et analyse
+
+```bash
+# Fetch pour avoir les infos a jour
+git fetch --quiet 2>/dev/null
+
+BRANCH=$(git branch --show-current)
+UPSTREAM=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null)
+
+echo "Branche locale: $BRANCH"
+echo "Remote tracking: $UPSTREAM"
+```
+
+---
+
+## STEP 2: Determiner l'action necessaire
+
+```bash
+if [ -z "$UPSTREAM" ]; then
+  # Pas de remote tracking - proposer push initial
+  ACTION="PUSH_NEW"
+  echo "Status: NO REMOTE - branche non pushee"
+else
+  LOCAL=$(git rev-parse @)
+  REMOTE=$(git rev-parse @{upstream})
+  BASE=$(git merge-base @ @{upstream})
+
+  if [ "$LOCAL" = "$REMOTE" ]; then
+    ACTION="UP_TO_DATE"
+    echo "Status: UP-TO-DATE - rien a faire"
+  elif [ "$LOCAL" = "$BASE" ]; then
+    BEHIND=$(git rev-list --count @..@{upstream})
+    ACTION="PULL"
+    echo "Status: BEHIND $BEHIND commits - pull needed"
+  elif [ "$REMOTE" = "$BASE" ]; then
+    AHEAD=$(git rev-list --count @{upstream}..@)
+    ACTION="PUSH"
+    echo "Status: AHEAD $AHEAD commits - push needed"
+  else
+    AHEAD=$(git rev-list --count @{upstream}..@)
+    BEHIND=$(git rev-list --count @..@{upstream})
+    ACTION="DIVERGED"
+    echo "Status: DIVERGED +$AHEAD/-$BEHIND - pull --rebase needed"
+  fi
+fi
+```
+
+---
+
+## STEP 3: Executer l'action
+
+### Si UP_TO_DATE
+
+```
+================================================================================
+                           ALREADY SYNCHRONIZED
+================================================================================
+
+Branche: {branch}
+Remote:  {upstream}
+Status:  UP-TO-DATE
+
+Rien a faire.
+
+================================================================================
+```
+
+### Si PUSH_NEW (pas de remote)
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Push this branch to remote for the first time?",
+    header: "Push new",
+    options: [
+      { label: "Yes, push", description: "git push -u origin {branch}" },
+      { label: "No, cancel", description: "Keep local only" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+**Si Yes:**
+```bash
+git push -u origin "$BRANCH"
+echo "Branche pushee et tracking configure"
+```
+
+### Si PULL
+
+```bash
+echo "Pulling $BEHIND commits from remote..."
+git pull --ff-only
+
+if [ $? -ne 0 ]; then
+  echo "WARNING: Fast-forward not possible, trying rebase..."
+  git pull --rebase
+fi
+```
+
+### Si PUSH
+
+```bash
+echo "Pushing $AHEAD commits to remote..."
+git push
+```
+
+### Si DIVERGED
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Branch has diverged from remote. How to resolve?",
+    header: "Diverged",
+    options: [
+      { label: "Pull --rebase (recommended)", description: "Rebase local commits on top of remote" },
+      { label: "Force push", description: "Overwrite remote with local (DANGEROUS)" },
+      { label: "Cancel", description: "Review manually first" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+**Si Pull --rebase:**
+```bash
+git pull --rebase
+if [ $? -ne 0 ]; then
+  echo "CONFLITS DETECTES - resolvez puis: git rebase --continue"
+  exit 1
+fi
+git push
+```
+
+**Si Force push:**
+```bash
+# Double confirmation pour force push
+echo "WARNING: Force push va ecraser les commits distants!"
+```
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "CONFIRM: Force push will overwrite remote commits. Are you sure?",
+    header: "Force push",
+    options: [
+      { label: "Yes, force push", description: "I understand the risk" },
+      { label: "No, cancel", description: "Abort operation" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+```bash
+git push --force-with-lease
+```
+
+---
+
+## STEP 4: Verification
+
+```bash
+echo ""
+echo "Verification post-sync..."
+
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse @{upstream} 2>/dev/null)
+
+if [ "$LOCAL" = "$REMOTE" ]; then
+  echo "SYNCHRONIZED"
+else
+  echo "WARNING: Still not synchronized"
+  git status
+fi
+```
+
+---
+
+## Summary
+
+```
+================================================================================
+                           SYNC COMPLETE
+================================================================================
+
+Branche: {branch}
+Remote:  origin/{branch}
+Action:  {PULL|PUSH|PUSH_NEW|REBASE}
+Status:  SYNCHRONIZED
+
+================================================================================
+```
+
+---
+
+## Codes sortie
+
+| Code | Signification |
+|------|---------------|
+| 0 | Sync reussie |
+| 1 | Conflits (rebase en cours) |
+| 2 | Erreur reseau ou permission |

package/templates/commands/gitflow/14-rebase.md

@@ -0,0 +1,251 @@
+---
+description: Phase 14 - Rebase current branch on develop (or specified base)
+agent: gitflow-status
+model: haiku
+argument-hint: "[base-branch]"
+---
+
+# Phase 14: REBASE - Rebase on Base Branch
+
+Rebase la branche courante sur develop (ou une autre branche specifiee).
+
+**Usage:**
+- `/gitflow:14-rebase` - Rebase sur develop (default)
+- `/gitflow:14-rebase main` - Rebase sur main
+- `/gitflow:14-rebase feature/other` - Rebase sur une autre feature
+
+---
+
+## STEP 1: Verification pre-rebase
+
+```bash
+BRANCH=$(git branch --show-current)
+BASE_BRANCH="${1:-develop}"
+
+echo "Branche courante: $BRANCH"
+echo "Branche cible:    $BASE_BRANCH"
+
+# Verifier working directory clean
+if [ -n "$(git status --porcelain)" ]; then
+  echo "ERROR: Working directory not clean"
+  git status --short
+  exit 1
+fi
+
+# Verifier que la branche cible existe
+if ! git rev-parse --verify "$BASE_BRANCH" >/dev/null 2>&1; then
+  echo "ERROR: Branch '$BASE_BRANCH' does not exist"
+  exit 1
+fi
+```
+
+---
+
+## STEP 2: Fetch et analyse divergence
+
+```bash
+git fetch --quiet 2>/dev/null
+
+# Calculer divergence
+AHEAD=$(git rev-list --count "$BASE_BRANCH".."$BRANCH")
+BEHIND=$(git rev-list --count "$BRANCH".."$BASE_BRANCH")
+
+echo ""
+echo "Divergence vs $BASE_BRANCH:"
+echo "  Commits ahead:  $AHEAD"
+echo "  Commits behind: $BEHIND"
+
+if [ "$BEHIND" -eq 0 ]; then
+  echo ""
+  echo "Already up-to-date with $BASE_BRANCH"
+fi
+```
+
+---
+
+## STEP 3: Confirmation
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Rebase {branch} on {base_branch}? ({ahead} commits will be replayed)",
+    header: "Rebase",
+    options: [
+      { label: "Yes, rebase", description: "Replay commits on top of {base_branch}" },
+      { label: "No, cancel", description: "Keep current state" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+**Si No -> Stop**
+
+---
+
+## STEP 4: Check EF Core migrations (si applicable)
+
+```bash
+# Detecter si des migrations sont impliquees
+MIGRATIONS_IN_BRANCH=$(git diff "$BASE_BRANCH"..."$BRANCH" --name-only | grep -E "Migrations/.*\.cs$" | grep -v Designer | wc -l)
+SNAPSHOT_MODIFIED=$(git diff "$BASE_BRANCH"..."$BRANCH" --name-only | grep "ModelSnapshot.cs" | wc -l)
+
+if [ "$MIGRATIONS_IN_BRANCH" -gt 0 ] || [ "$SNAPSHOT_MODIFIED" -gt 0 ]; then
+  echo ""
+  echo "WARNING: EF Core migrations detected in this branch!"
+  echo "  Migrations: $MIGRATIONS_IN_BRANCH"
+  echo "  ModelSnapshot modified: $SNAPSHOT_MODIFIED"
+fi
+```
+
+Si migrations detectees:
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "EF Core migrations detected. Rebase may cause ModelSnapshot conflicts. Continue?",
+    header: "EF Core",
+    options: [
+      { label: "Continue rebase", description: "I'll handle migration conflicts manually" },
+      { label: "Use /efcore:rebase-snapshot", description: "Specialized command for EF Core rebase" },
+      { label: "Cancel", description: "Review migrations first" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+**Si "Use /efcore:rebase-snapshot" -> Redirect:**
+```
+Utilisez la commande specialisee:
+
+  /efcore:rebase-snapshot
+
+Cette commande gere automatiquement:
+- Regeneration du ModelSnapshot
+- Resolution des conflits de migration
+- Validation post-rebase
+```
+
+---
+
+## STEP 5: Execute rebase
+
+```bash
+echo "Starting rebase..."
+
+git rebase "$BASE_BRANCH"
+
+if [ $? -ne 0 ]; then
+  echo ""
+  echo "================================================================================
+                         REBASE CONFLICTS DETECTED
+================================================================================"
+  echo ""
+  echo "Des conflits ont ete detectes. Pour les resoudre:"
+  echo ""
+  echo "  1. Editez les fichiers en conflit"
+  echo "  2. git add <fichiers resolus>"
+  echo "  3. git rebase --continue"
+  echo ""
+  echo "Pour annuler le rebase:"
+  echo "  git rebase --abort"
+  echo "  ou /gitflow:6-abort"
+  echo ""
+  exit 1
+fi
+```
+
+---
+
+## STEP 6: Push avec force-with-lease
+
+```bash
+UPSTREAM=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null)
+
+if [ -n "$UPSTREAM" ]; then
+  echo ""
+  echo "La branche a ete rebasee. Un force push est necessaire."
+fi
+```
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Push rebased branch to remote? (requires force push)",
+    header: "Push",
+    options: [
+      { label: "Yes, force push", description: "git push --force-with-lease (safe)" },
+      { label: "No, later", description: "Push manually when ready" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+**Si Yes:**
+```bash
+git push --force-with-lease
+
+if [ $? -eq 0 ]; then
+  echo "Force push successful"
+else
+  echo "ERROR: Force push failed (remote may have new commits)"
+  echo "Retry with: git push --force-with-lease"
+fi
+```
+
+---
+
+## STEP 7: Summary
+
+```
+================================================================================
+                           REBASE COMPLETE
+================================================================================
+
+Branche:     {branch}
+Rebase sur:  {base_branch}
+Commits:     {ahead} replayed
+Push:        {done|pending}
+
+DIVERGENCE APRES REBASE:
+  vs {base_branch}: +{ahead}/-0
+
+{Si EF Core:}
+NEXT: Verifiez les migrations avec /efcore:db-status
+
+================================================================================
+Actions: /gitflow:2-status | /gitflow:13-sync | /gitflow:3-commit
+================================================================================
+```
+
+---
+
+## Codes sortie
+
+| Code | Signification |
+|------|---------------|
+| 0 | Rebase reussi |
+| 1 | Conflits (rebase en cours) |
+| 2 | Working directory dirty |
+| 3 | Branche cible inexistante |
+
+---
+
+## Recovery si conflits
+
+Si le rebase echoue avec des conflits:
+
+```bash
+# Option 1: Resoudre manuellement
+# Editez les fichiers, puis:
+git add .
+git rebase --continue
+
+# Option 2: Annuler completement
+git rebase --abort
+
+# Option 3: Via Claude Code
+/gitflow:6-abort
+```

package/templates/commands/gitflow/2-status.md

@@ -0,0 +1,167 @@
+---
+description: Phase 2 - Display GitFlow state with versioning and EF Core details
+agent: gitflow-status
+model: haiku
+---
+
+# Phase 2: STATUS - Overview
+
+Tu es expert GitFlow et EF Core. Affiche l'etat complet du projet .NET.
+
+---
+
+## Informations a collecter
+
+### Git
+- Branche courante et type (feature/release/hotfix/develop/main)
+- Etat working directory (clean/dirty)
+- Synchronisation locale vs remote (push/pull needed)
+- Synchronisation vs develop et main (commits ahead/behind)
+- Dernier tag
+
+### Sync Local vs Remote
+```bash
+# Fetch pour avoir les infos a jour (sans modifier le working directory)
+git fetch --quiet 2>/dev/null
+
+# Verifier si la branche a un remote tracking
+UPSTREAM=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null)
+
+if [ -n "$UPSTREAM" ]; then
+  # Comparer local vs remote
+  LOCAL=$(git rev-parse @)
+  REMOTE=$(git rev-parse @{upstream})
+  BASE=$(git merge-base @ @{upstream})
+
+  if [ "$LOCAL" = "$REMOTE" ]; then
+    SYNC_STATUS="UP-TO-DATE"
+  elif [ "$LOCAL" = "$BASE" ]; then
+    BEHIND=$(git rev-list --count @..@{upstream})
+    SYNC_STATUS="BEHIND $BEHIND (pull needed)"
+  elif [ "$REMOTE" = "$BASE" ]; then
+    AHEAD=$(git rev-list --count @{upstream}..@)
+    SYNC_STATUS="AHEAD $AHEAD (push needed)"
+  else
+    AHEAD=$(git rev-list --count @{upstream}..@)
+    BEHIND=$(git rev-list --count @..@{upstream})
+    SYNC_STATUS="DIVERGED +$AHEAD/-$BEHIND (pull --rebase needed)"
+  fi
+else
+  SYNC_STATUS="NO REMOTE (not pushed yet)"
+fi
+```
+
+### Version
+Read from configured source in [.claude/gitflow/config.json](.claude/gitflow/config.json):
+- `versioning.source` → type (csproj, Directory.Build.props, AssemblyInfo, VERSION, git-tag)
+- `versioning.sourceFile` → file path
+- Read current version from THAT file (not from config.json)
+
+### EF Core
+- Lister les migrations (total et pending)
+- Lister les DbContext detectes
+
+### EF Core - Vue globale (toutes branches)
+Si `--all-branches` ou si plusieurs branches GitFlow actives:
+```bash
+# Scanner les branches actives
+FEATURES=$(git branch -r | grep 'feature/' | wc -l)
+RELEASES=$(git branch -r | grep 'release/' | wc -l)
+HOTFIXES=$(git branch -r | grep 'hotfix/' | wc -l)
+
+# Pour chaque branche, detecter migrations ajoutees
+for BRANCH in $(git branch -r | grep -E 'feature/|release/|hotfix/'); do
+  MIGRATIONS=$(git diff origin/develop..$BRANCH --name-only | grep -E "Migrations/.*\.cs$" | grep -v Designer | grep -v ModelSnapshot)
+  CONFLICT=$(git diff origin/develop..$BRANCH --name-only | grep "ModelSnapshot" | wc -l)
+done
+```
+
+### Plans GitFlow
+- Plans actifs (non termines)
+- Plans termines recemment (7 jours)
+
+### Operations en cours
+- Rebase, merge, cherry-pick en cours?
+- Conflits detectes?
+
+### Risques
+- Divergence > 5 commits vs develop
+- Migrations non commitees
+- ModelSnapshot modifie non commite
+
+---
+
+## Affichage
+
+```
+================================================================================
+                           GITFLOW STATUS
+================================================================================
+
+BRANCHE: {branch} ({type}) | {clean|dirty}
+VERSION: {version} ({source})
+
+REMOTE SYNC
+  vs origin/{branch}: {UP-TO-DATE|AHEAD N|BEHIND N|DIVERGED|NO REMOTE}
+  {Action: /gitflow:13-sync}
+
+SYNC vs BASE BRANCHES
+  vs develop: +{ahead}/-{behind} | vs main: +{ahead}/-{behind} | Tag: {tag}
+
+EF CORE (branche courante)
+  Migrations: {total} total, {pending} pending
+  [Pending] {liste}
+
+--------------------------------------------------------------------------------
+BRANCHES ACTIVES ({features} features, {releases} releases, {hotfixes} hotfixes)
+--------------------------------------------------------------------------------
+{Si branches actives avec migrations:}
+  feature/add-users        +1 migration  (AddUsersTable)      Conflit: NON
+  feature/add-orders       +1 migration  (AddOrdersTable)     Conflit: NON
+  feature/add-products     +2 migrations (AddProducts, AddFK) Conflit: OUI
+
+  ORDRE DE MERGE RECOMMANDE:
+  1. feature/add-users (independant)
+  2. feature/add-orders (independant)
+  3. feature/add-products (conflit ModelSnapshot - rebase requis)
+--------------------------------------------------------------------------------
+
+PLANS: {n} active | OPERATIONS: {none|rebase|merge} | RISKS: {liste}
+
+================================================================================
+Actions: /gitflow:13-sync | /gitflow:14-rebase | /gitflow:3-commit | /gitflow:4-plan
+================================================================================
+```
+
+---
+
+## Modes
+
+| Mode | Output |
+|------|--------|
+| Normal | Affichage complet |
+| `--short` | `[branch] status \| vX.Y.Z \| +X/-Y \| N pending` |
+| `--json` | JSON structure |
+
+## Codes sortie
+
+| Code | Signification |
+|------|---------------|
+| 0 | OK |
+| 1 | Warnings (pending, divergence) |
+| 2 | Problemes (conflits, operation en cours) |
+| 3 | Erreur (pas repo, no config) |
+
+## Actions suggerees
+
+| Etat | Commande Claude Code |
+|------|----------------------|
+| AHEAD N (push needed) | `/gitflow:13-sync` |
+| BEHIND N (pull needed) | `/gitflow:13-sync` |
+| DIVERGED (pull --rebase needed) | `/gitflow:13-sync` |
+| NO REMOTE (not pushed yet) | `/gitflow:13-sync` |
+| Divergence > 5 vs develop | `/gitflow:14-rebase` |
+| Pending migrations | `/efcore:db-deploy` |
+| Dirty workdir | `/gitflow:3-commit` |
+| Operation en cours | `/gitflow:6-abort` |
+| No config | `/gitflow:1-init` |