@atlashub/smartstack-cli 2.9.0 → 3.1.0

package/templates/agents/gitflow/merge.md

@@ -8,55 +8,137 @@ tools: Bash, Read, Glob, Grep, Edit
 
 # GitFlow Merge Agent
 
-Merge securise avec validation complete.
+Safe PR merge with review checklist. Supports GitHub and Azure DevOps.
 
-## Workflow
+## EXECUTION SEQUENCE
 
-1. **Verifier**: PR approved, checks pass
-2. **Sync**: Fetch + rebase si necessaire
-3. **Merge**: Selon strategie configuree
-4. **Tag**: Si release/hotfix
-5. **Cleanup**: Supprimer branche si configure
+### 1. Load GitFlow Config (MANDATORY)
 
-## Strategies
+```bash
+# Find and verify config exists
+CONFIG_FILE=""
+if [ -f ".claude/gitflow/config.json" ]; then
+  CONFIG_FILE=".claude/gitflow/config.json"
+elif [ -f ".gitflow/config.json" ]; then
+  CONFIG_FILE=".gitflow/config.json"
+else
+  # Try develop worktree
+  DEVELOP_PATH=$(git worktree list --porcelain 2>/dev/null | grep -A1 "branch refs/heads/develop" | grep "^worktree " | sed 's/^worktree //')
+  if [ -n "$DEVELOP_PATH" ] && [ -f "$DEVELOP_PATH/.claude/gitflow/config.json" ]; then
+    CONFIG_FILE="$DEVELOP_PATH/.claude/gitflow/config.json"
+  elif [ -n "$DEVELOP_PATH" ] && [ -f "$DEVELOP_PATH/.gitflow/config.json" ]; then
+    CONFIG_FILE="$DEVELOP_PATH/.gitflow/config.json"
+  fi
+fi
+
+# CRITICAL: Block if no config
+if [ -z "$CONFIG_FILE" ] || [ ! -f "$CONFIG_FILE" ]; then
+  echo "❌ GitFlow config not found"
+  echo "→ Run: /gitflow init"
+  exit 1
+fi
+
+# Extract config values
+GF_PROVIDER=$(grep -oP '"provider":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+GF_MAIN_BRANCH=$(grep -oP '"main":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+GF_DEVELOP_BRANCH=$(grep -oP '"develop":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+# Validate required values
+if [ -z "$GF_MAIN_BRANCH" ] || [ -z "$GF_DEVELOP_BRANCH" ]; then
+  echo "❌ Invalid GitFlow config (missing branches)"
+  exit 1
+fi
+```
+
+### 2. Detect Provider and Load PR Context
+
+```bash
+# Detect provider
+REMOTE_URL=$(git remote get-url origin 2>/dev/null)
+if [[ "$REMOTE_URL" == *"dev.azure.com"* ]]; then
+  GIT_PROVIDER="azuredevops"
+else
+  GIT_PROVIDER="github"
+fi
+
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+BRANCH_TYPE=$(echo $CURRENT | cut -d'/' -f1)
+
+# Determine target branch (using config values)
+case "$BRANCH_TYPE" in
+  feature) TARGET="$GF_DEVELOP_BRANCH" ;;
+  release) TARGET="$GF_MAIN_BRANCH" ;;
+  hotfix)  TARGET="$GF_MAIN_BRANCH" ;;
+  *)       TARGET="$GF_DEVELOP_BRANCH" ;;
+esac
+
+echo "✓ Config loaded: $CONFIG_FILE"
+echo "✓ Branch: $CURRENT → Target: $TARGET"
+
+# Find PR for current branch
+# GitHub: gh pr list --head "$CURRENT"
+# Azure DevOps: az repos pr list --source-branch "$CURRENT"
+```
 
-| Type | Strategie |
-|------|-----------|
-| Feature | Squash ou merge --no-ff |
-| Release | Merge --no-ff + tag + merge to develop |
-| Hotfix | Merge --no-ff + tag + cherry-pick to develop |
+### 3. Determine Merge Strategy
 
-## Validation Pre-Merge
+| Type | Strategy | Delete Branch |
+|------|----------|---------------|
+| Feature | squash | yes |
+| Release | merge --no-ff | yes |
+| Hotfix | merge --no-ff | yes |
 
-- PR approved
-- Checks pass (CI)
-- No conflicts
-- Version bumped (release/hotfix)
+### 4. Review Checklist
 
-## Commandes
+Display review checklist:
+- Build status (pass/fail)
+- Tests (pass/fail/none)
+- Migrations (valid/invalid/none)
+- Conflicts (none/detected)
+- CI status (if available)
 
+### 5. Execute Merge
+
+**GitHub:**
 ```bash
-# Merge avec strategie
-git merge --no-ff {branch} -m "Merge {type}/{name}"
+# Feature (squash)
+gh pr merge $PR_NUMBER --squash --delete-branch
 
-# Tag release
-git tag -a v{version} -m "Release {version}"
+# Release/Hotfix (merge commit)
+gh pr merge $PR_NUMBER --merge --delete-branch
+```
+
+**Azure DevOps:**
+```bash
+# Feature (squash)
+az repos pr update --id $PR_ID --status completed --squash true --delete-source-branch true
+
+# Release/Hotfix (merge commit)
+az repos pr update --id $PR_ID --status completed --squash false --delete-source-branch true
+```
+
+### 6. Verify Merge
+
+```bash
+# Force update tracking refs
+git fetch origin $TARGET:refs/remotes/origin/$TARGET --force --quiet
+git fetch origin --prune --quiet
 
-# Push
-git push origin {target} --tags
+# Verify branch is merged
+MERGED=$(git branch -r --merged origin/$TARGET | grep "$CURRENT" | wc -l)
 ```
 
-## Output Format
+### 7. Summary
 
 ```
-MERGE COMPLETE
-  Source: {branch}
-  Target: {target}
-  Strategy: {merge|squash}
-  Tag: {version|none}
-  Deleted: {branch|kept}
+PR MERGED
+  PR:       #{number}
+  Strategy: {squash|merge}
+  Target:   {target}
+  Branch:   deleted
+  NEXT: /gitflow finish
 ```
 
 ## Priority
 
-Safety > Correctness > Speed. Jamais merger si checks fail.
+Safety > Correctness > Speed. Never merge if checks fail.

package/templates/agents/gitflow/pr.md

@@ -8,78 +8,183 @@ tools: Bash, Glob
 
 # GitFlow Pull Request Agent
 
-Creation rapide de PR avec description auto-generee et detection automatique de la cible.
+Create PR with auto-generated description, Azure DevOps and GitHub support.
 
-## Workflow
+> **OPTIMISED:** haiku model, reduced tools. Access to current context.
 
-1. **Detecter**: Type de branche et cible automatique
-2. **Analyser**: Commits depuis branche base
-3. **Generer**: Titre et description
-4. **Creer**: `gh pr create`
-5. **Retourner**: URL de la PR
+## EXECUTION SEQUENCE
 
-## Detection Cible (GitFlow Standard)
+### 1. Load GitFlow Config (MANDATORY)
 
 ```bash
-# Detection robuste de la branche courante (compatible worktrees)
-CURRENT=$(git branch --show-current 2>/dev/null)
-if [ -z "$CURRENT" ]; then
-  CURRENT=$(git symbolic-ref --short HEAD 2>/dev/null)
+# Find and verify config exists
+CONFIG_FILE=""
+if [ -f ".claude/gitflow/config.json" ]; then
+  CONFIG_FILE=".claude/gitflow/config.json"
+elif [ -f ".gitflow/config.json" ]; then
+  CONFIG_FILE=".gitflow/config.json"
+else
+  # Try develop worktree
+  DEVELOP_PATH=$(git worktree list --porcelain 2>/dev/null | grep -A1 "branch refs/heads/develop" | grep "^worktree " | sed 's/^worktree //')
+  if [ -n "$DEVELOP_PATH" ] && [ -f "$DEVELOP_PATH/.claude/gitflow/config.json" ]; then
+    CONFIG_FILE="$DEVELOP_PATH/.claude/gitflow/config.json"
+  elif [ -n "$DEVELOP_PATH" ] && [ -f "$DEVELOP_PATH/.gitflow/config.json" ]; then
+    CONFIG_FILE="$DEVELOP_PATH/.gitflow/config.json"
+  fi
 fi
-if [ -z "$CURRENT" ]; then
-  CURRENT=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+
+# CRITICAL: Block if no config
+if [ -z "$CONFIG_FILE" ] || [ ! -f "$CONFIG_FILE" ]; then
+  echo "❌ GitFlow config not found"
+  echo "→ Run: /gitflow init"
+  exit 1
 fi
 
-# Detection automatique selon le type de branche
-if [[ "$CURRENT" == hotfix/* ]]; then
-  TARGET="main"    # Hotfix → main
-elif [[ "$CURRENT" == release/* ]]; then
-  TARGET="main"    # Release → main
+# Extract config values
+GF_PROVIDER=$(grep -oP '"provider":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+GF_MAIN_BRANCH=$(grep -oP '"main":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+GF_DEVELOP_BRANCH=$(grep -oP '"develop":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+GF_REMOTE_URL=$(grep -oP '"remoteUrl":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+# Validate required values
+if [ -z "$GF_MAIN_BRANCH" ] || [ -z "$GF_DEVELOP_BRANCH" ]; then
+  echo "❌ Invalid GitFlow config (missing branches)"
+  exit 1
+fi
+```
+
+### 2. Detect Provider and Branch Context
+
+```bash
+# Detect provider from config or remote URL
+if [ -z "$GF_PROVIDER" ]; then
+  REMOTE_URL=$(git remote get-url origin 2>/dev/null)
+  if [[ "$REMOTE_URL" == *"dev.azure.com"* ]] || [[ "$REMOTE_URL" == *"visualstudio.com"* ]]; then
+    GIT_PROVIDER="azuredevops"
+  else
+    GIT_PROVIDER="github"
+  fi
 else
-  TARGET="develop" # Feature → develop
+  GIT_PROVIDER="$GF_PROVIDER"
 fi
+
+# Extract Azure DevOps details if needed
+if [ "$GIT_PROVIDER" = "azuredevops" ]; then
+  REMOTE_URL="${GF_REMOTE_URL:-$(git remote get-url origin 2>/dev/null)}"
+  [[ "$REMOTE_URL" =~ dev\.azure\.com/([^/]+)/([^/]+)/_git/([^/]+) ]] && {
+    AZURE_ORG="${BASH_REMATCH[1]}"
+    AZURE_PROJECT="${BASH_REMATCH[2]}"
+    AZURE_REPO="${BASH_REMATCH[3]}"
+  }
+fi
+
+# Get current branch (worktree-compatible)
+CURRENT=$(git branch --show-current 2>/dev/null || git rev-parse --abbrev-ref HEAD)
+BRANCH_TYPE=$(echo $CURRENT | cut -d'/' -f1)
+BRANCH_NAME=$(echo $CURRENT | sed 's/.*\///')
+```
+
+### 3. Determine Target Branch
+
+```bash
+# Map branch type to target branch (using config values)
+case "$BRANCH_TYPE" in
+  feature) TARGET="$GF_DEVELOP_BRANCH" ;;
+  release) TARGET="$GF_MAIN_BRANCH" ;;
+  hotfix)  TARGET="$GF_MAIN_BRANCH" ;;
+  *)       TARGET="$GF_DEVELOP_BRANCH" ;;
+esac
+
+echo "✓ Config loaded: $CONFIG_FILE"
+echo "✓ Branch: $CURRENT (type: $BRANCH_TYPE)"
+echo "✓ Target: $TARGET"
 ```
 
-| Type | Cible | Raison |
-|------|-------|--------|
-| `feature/*` | develop | Integration continue |
-| `release/*` | main | Deploiement production |
-| `hotfix/*` | main | Correction urgente production |
+| Type | Target | Reason |
+|------|--------|--------|
+| `feature/*` | develop | Continuous integration |
+| `release/*` | main | Production deployment |
+| `hotfix/*` | main | Urgent production fix |
 
-## Commandes
+### 3. Check Prerequisites
 
 ```bash
-# Commits a inclure
-git log origin/{TARGET}..HEAD --oneline
+# Ensure branch is pushed
+git fetch origin
+REMOTE_EXISTS=$(git branch -r --list "origin/$CURRENT")
+if [ -z "$REMOTE_EXISTS" ]; then
+  git push -u origin $CURRENT
+  git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+fi
 
-# Creer PR vers la cible detectee
-gh pr create --base $TARGET --title "{title}" --body "{body}"
+# Check for uncommitted changes → warn user to /gitflow commit first
+# Check if PR already exists → show existing PR and STOP
 ```
 
-## Output Format
+### 4. Build Check
 
+```bash
+# .NET project
+if ls *.sln 2>/dev/null || ls src/*/*.csproj 2>/dev/null; then
+  dotnet build --no-restore || STOP "Build failed"
+
+# Node.js project
+elif [ -f "package.json" ]; then
+  npm run build || STOP "Build failed"
+fi
 ```
-PR CREATED
-  Branch: {branch} -> {base}
-  Commits: {n}
-  URL: {url}
+
+### 5. Generate PR Content
+
+**Title:**
+- feature → `feat: {branch-name}`
+- hotfix → `fix: {branch-name}`
+- release → `release: v{version}`
+
+**Body:** Auto-generate from `git log origin/{TARGET}..HEAD --oneline`
+
+### 6. Create Pull Request
+
+**GitHub:**
+```bash
+gh pr create --base $TARGET --title "$TITLE" --body "$(cat <<'EOF'
+{PR_BODY}
+EOF
+)"
+PR_URL=$(gh pr view --json url --jq '.url')
+```
+
+**Azure DevOps:**
+```bash
+az repos pr create \
+  --title "$TITLE" \
+  --description "{PR_BODY}" \
+  --source-branch "$CURRENT" \
+  --target-branch "$TARGET" \
+  --repository "$AZURE_REPO" \
+  --project "$AZURE_PROJECT" \
+  --org "https://dev.azure.com/$AZURE_ORG"
 ```
 
-## Template Description
+### 7. Auto-complete with squash (Azure DevOps release/hotfix)
 
-```markdown
-## Summary
-{liste des commits}
+For release/hotfix PRs on Azure DevOps, set auto-complete with squash merge:
+```bash
+az repos pr update --id $PR_ID --auto-complete true --squash true --delete-source-branch true
+```
 
-## Type
-{feature|hotfix|release}
+### 8. Summary
 
-## Checklist
-- [ ] Tests pass
-- [ ] Build OK
-- [ ] Migrations valid (si applicable)
+```
+PR CREATED
+  PR:     #{number}
+  Title:  {title}
+  URL:    {url}
+  Source: {branch} -> {target}
+  Provider: {github|azuredevops}
+  NEXT: Wait for review, then /gitflow merge
 ```
 
 ## Priority
 
-Speed > Detail. PR fonctionnelle rapidement.
+Speed > Detail. PR created quickly with proper target.

package/templates/agents/gitflow/start.md

@@ -8,55 +8,98 @@ tools: Bash, Read, Glob, Write
 
 # GitFlow Start Agent
 
-Creation rapide de branche GitFlow avec worktree.
+Create GitFlow branch with worktree and local environment configuration.
 
-## Workflow
+## EXECUTION SEQUENCE
 
-1. **Analyser**: Contexte (branche, version, ahead/behind)
-2. **Choisir**: Type (feature/release/hotfix)
-3. **Creer**: Worktree ou checkout
-4. **Configurer**: appsettings.Local.json + launchSettings.json Local profile si .NET
-5. **Configurer**: .env.local + npm run local si Web
-6. **Verifier ports**: Detecter conflits entre projets
-7. **Resume**: Prochaines etapes
+### 1. Analyze Context
 
-## Commandes
+```bash
+CURRENT_BRANCH=$(git branch --show-current)
+git fetch origin --quiet
+
+VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0")
+DEVELOP_AHEAD=$(git rev-list --count origin/main..origin/develop 2>/dev/null || echo "0")
+DIRTY=$(git status --porcelain | wc -l)
+```
+
+### 2. Parse Input
+
+| Flag | Type | Base | Target |
+|------|------|------|--------|
+| `-f` | feature | develop | develop |
+| `-r` | release | develop | main |
+| `-h` | hotfix | main | main |
+
+If branch_type or branch_name missing, ask user via AskUserQuestion.
+
+### 3. Normalize and Validate
 
 ```bash
-# Worktree (defaut) - Structure organisee par type
-WORKTREE_BASE="../worktrees"
-mkdir -p "${WORKTREE_BASE}/${TYPE}s"
-WORKTREE_PATH="${WORKTREE_BASE}/${TYPE}s/${NAME}"
+# kebab-case, no accents, max 50 chars
+BRANCH_NAME=$(normalize "$input")
+FULL_BRANCH="${type}/${BRANCH_NAME}"
 
-git worktree add -b {type}/{name} "$WORKTREE_PATH" origin/{base}
+# Check if already exists (local or remote)
+```
 
-# Checkout (--no-worktree)
-git checkout -b {type}/{name} origin/{base}
+### 4. Create Branch + Worktree
+
+```bash
+# Worktree paths from config or convention:
+# feature → ../features/{name}
+# release → ../releases/v{version}
+# hotfix  → ../hotfixes/{name}
+
+git worktree add -b "$FULL_BRANCH" "$WORKTREE_PATH" "origin/$BASE_BRANCH"
+```
+
+### 5. Push Branch to Remote (AUTOMATIC)
+
+```bash
+# ALWAYS push immediately after creation
+cd "$WORKTREE_PATH"
+git push -u origin "$FULL_BRANCH"
+git fetch origin $FULL_BRANCH:refs/remotes/origin/$FULL_BRANCH --force --quiet
 ```
 
-## Detection Projet .NET
+### 6. Local Environment Config
+
+**Backend (.NET API detected):**
+- Create `appsettings.Local.json` with unique DB name + port per branch
+- Add `Local` profile to `launchSettings.json`
+
+**Frontend (web project detected):**
+- Create `.env.local` pointing to the API port
+- Add `npm run local` script if missing
+
+**Port allocation:** Hash branch name for unique ports (API: 5200+, Web: 5300+)
+
+### 7. Version Bump (Release only)
 
 ```bash
-# Si appsettings.json existe
-find . -name "appsettings.json" -not -path "*/bin/*"
+# For release: bump version in source files
+npm version $VERSION --no-git-tag-version  # if package.json
+# OR update .csproj <Version> tag
 ```
 
-## Output Format
+### 8. Summary
 
 ```
-BRANCH CREATED
-  Type: {feature|release|hotfix}
-  Name: {branch}
-  Base: {develop|main}
-  Worktree: ../worktrees/{type}s/{name}
-  Config: {appsettings.Local.json + launchSettings.json Local|skipped}
-  Ports: {✓ OK|⚠️ Conflicts resolved|⚠️ Conflicts ignored}
-
-NEXT STEPS:
-  cd ../worktrees/{type}s/{name}
-  /efcore:db-deploy
+{TYPE} CREATED
+  Branch:   {full_branch}
+  Base:     {base_branch}
+  Worktree: {worktree_path}
+  LOCAL ENVIRONMENT:
+    Database: {db_name}
+    API:      http://localhost:{api_port}
+    Web:      http://localhost:{web_port}
+  NEXT STEPS:
+    cd {worktree_path}
+    dotnet run --project src/{Project}.Api --launch-profile Local
+    /gitflow commit
 ```
 
 ## Priority
 
-Speed > Detail. Branche prete rapidement.
+Speed > Detail. Branch ready quickly with local environment configured.