@atlashub/smartstack-cli 1.13.2 → 1.14.0

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

@@ -1,216 +0,0 @@
----
-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

@@ -1,251 +0,0 @@
----
-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

@@ -1,122 +0,0 @@
----
-description: Phase 2 - Display GitFlow state with versioning and EF Core details
-agent: gitflow-status
-model: haiku
----
-
-# Phase 2: STATUS - Overview
-
----
-
-## Informations à collecter
-
-### 1. Branches
-
-```bash
-git fetch --all --quiet
-git for-each-ref --sort=-committerdate --format='%(refname:short)|%(objectname:short)|%(committerdate:short)|%(subject)' refs/heads
-git for-each-ref --sort=-committerdate --format='%(refname:short)|%(objectname:short)|%(committerdate:short)|%(subject)' refs/remotes/origin
-git worktree list
-```
-
-### 2. Tags
-
-```bash
-git for-each-ref --sort=-v:refname --format='%(refname:short)|%(creatordate:short)|%(subject)' refs/tags | head -5
-# Par branche
-for branch in main develop; do
-  TAG=$(git describe --tags --abbrev=0 $branch 2>/dev/null || echo "none")
-  AHEAD=$(git rev-list --count $TAG..$branch 2>/dev/null || echo "0")
-  echo "$branch: $TAG (+$AHEAD)"
-done
-```
-
-### 3. Sync local vs remote
-
-```bash
-UPSTREAM=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null)
-[ -n "$UPSTREAM" ] && {
-  LOCAL=$(git rev-parse @)
-  REMOTE=$(git rev-parse @{upstream})
-  BASE=$(git merge-base @ @{upstream})
-  [ "$LOCAL" = "$REMOTE" ] && echo "UP-TO-DATE"
-  [ "$LOCAL" = "$BASE" ] && echo "BEHIND $(git rev-list --count @..@{upstream})"
-  [ "$REMOTE" = "$BASE" ] && echo "AHEAD $(git rev-list --count @{upstream}..@)"
-}
-```
-
-### 4. develop vs main (CRITIQUE)
-
-```bash
-DEVELOP_AHEAD=$(git rev-list --count main..develop 2>/dev/null || echo "0")
-MAIN_AHEAD=$(git rev-list --count develop..main 2>/dev/null || echo "0")
-
-echo "develop → main: +$DEVELOP_AHEAD (à releaser)"
-echo "main → develop: +$MAIN_AHEAD"
-[ "$MAIN_AHEAD" -gt 0 ] && echo "⚠️ DIVERGENCE: main a commits non mergés dans develop"
-```
-
-### 5. Version
-
-```bash
-VERSION=$(grep '"version"' package.json 2>/dev/null | head -1 | sed 's/.*: "\(.*\)".*/\1/')
-[ -z "$VERSION" ] && VERSION=$(grep -oP '(?<=<Version>).*(?=</Version>)' *.csproj 2>/dev/null | head -1)
-[ -z "$VERSION" ] && VERSION=$(git describe --tags --abbrev=0 2>/dev/null)
-```
-
-### 6. EF Core
-
-Migrations: total, pending, branches avec migrations, conflits potentiels
-
----
-
-## Affichage
-
-```
-GITFLOW STATUS
-──────────────────────────────────
-BRANCHE: {branch} ({type}) | {clean|dirty}
-VERSION: {version} ({source})
-REMOTE:  {UP-TO-DATE|AHEAD N|BEHIND N|DIVERGED}
-
-BRANCHES: {n} locales | {n} remote | {n} worktrees
-TAGS: {n} total | main: {tag} | develop: {tag}
-
-DEVELOP vs MAIN
-  develop: {N} commits à publier
-  main: {N} commits à récupérer
-  STATUS: {SYNCHRONIZED|RELEASE_NEEDED|DIVERGED ⚠️}
-
-{Si DIVERGED:}
-⚠️ Commits sur main non présents sur develop:
-  {hash} {message}
-→ ACTION: git checkout develop && git merge origin/main
-
-FEATURES: {n} actives
-RELEASES: {n} en cours
-EF CORE: {N} migrations | {N} pending | Conflits: {OUI/NON}
-──────────────────────────────────
-```
-
----
-
-## Actions suggérées
-
-| État | Commande |
-|------|----------|
-| AHEAD (push needed) | `/gitflow:13-sync` |
-| BEHIND (pull needed) | `/gitflow:13-sync` |
-| main ahead of develop | `git merge origin/main` |
-| develop ahead of main | `/gitflow:10-start release` |
-| Pending migrations | `/efcore:db-deploy` |
-| Dirty workdir | `/gitflow:3-commit` |
-
----
-
-## Modes
-
-| Mode | Output |
-|------|--------|
-| Normal | Affichage complet |
-| `--short` | `[branch] status \| vX.Y.Z \| dev→main:+X` |
-| `--json` | JSON structuré |