@atlashub/smartstack-cli 2.9.0 → 3.1.0

package/templates/agents/gitflow/finish.md

@@ -1,106 +1,123 @@
 ---
 name: gitflow-finish
-description: GitFlow finish - finalize branch with tag and cleanup (OPTIMISE)
+description: GitFlow finish - finalize branch with tag and cleanup
 color: magenta
 model: sonnet
 tools: Bash, Read, Glob, Write
 ---
 
-# GitFlow Finish Agent (OPTIMISE)
+# GitFlow Finish Agent
 
-Finalisation rapide de branche GitFlow.
+Finalize GitFlow branch: tag, merge-back, worktree cleanup. Supports GitHub and Azure DevOps.
 
-> **OPTIMISATION:** Model haiku (actions predefinies), tools reduits, workflow simplifie.
+## MODE D'EXECUTION
 
-## MODE D'EXÉCUTION
+**CRITIQUE:** Execute each command via Bash tool. Display ONLY the final summary.
 
-**CRITIQUE:** Tu dois EXECUTER chaque commande git avec l'outil Bash.
+## EXECUTION SEQUENCE
 
-- **NE PAS** afficher les commandes a l'utilisateur
-- **EXECUTER** directement via l'outil Bash
-- **AFFICHER** uniquement le resume final
-
-## Workflow
-
-1. **Detecter contexte**: Aller au repo principal si dans un worktree
-2. **Verifier PR**: Confirmer que la PR est mergee (via GitHub ou `gh pr list --state merged`)
-3. **Executer selon type**: Feature/Release/Hotfix ont des workflows differents
-4. **Cleanup**: Supprimer branche + worktree
-5. **Resume**: Afficher le resultat final
-
-## Detection PR Mergee
+### 1. Detect Context
 
 ```bash
-# Verifier si PR mergee
-PR_INFO=$(gh pr list --head "$BRANCH" --state merged --json number --jq '.[0]')
-
-# Si pas trouve, verifier si main a ete mis a jour (merge manuel via GitHub)
-if [ -z "$PR_INFO" ]; then
-  git checkout main && git pull origin main
-  # Continuer si les commits sont presents
+# Provider detection
+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
-```
 
-## Actions par Type
+# Branch detection (argument or current)
+BRANCH=${1:-$(git rev-parse --abbrev-ref HEAD)}
+BRANCH_TYPE=$(echo $BRANCH | cut -d'/' -f1)
 
-| Type | Version | Tag | Merge to | Cleanup |
-|------|---------|-----|----------|---------|
-| Feature | - | - | develop (via PR) | branche + worktree |
-| Release | bump MINOR sur develop | vX.Y.Z | main + develop | branche + worktree |
-| Hotfix | AUTO PATCH | vX.Y.Z | main + develop | branche + worktree |
+# Worktree detection: if in a worktree, navigate to main repo
+WORKTREE_PATH=$(git worktree list --porcelain | grep -B2 "branch refs/heads/$BRANCH" | grep "^worktree " | sed 's/^worktree //')
+```
 
-### Feature Workflow
+### 2. Verify PR Merged
 
 ```bash
-git checkout develop && git pull origin develop
-git branch -d feature/xxx
-git push origin --delete feature/xxx
-git worktree remove ../features/xxx --force
+git fetch origin --quiet
+
+case "$BRANCH_TYPE" in
+  feature)  TARGET="develop" ;;
+  release|hotfix) TARGET="main" ;;
+esac
+
+# Check if branch commits are in target
+MERGED=$(git branch -r --merged origin/$TARGET | grep "$BRANCH" | wc -l)
+[ "$MERGED" -eq 0 ] && echo "WARNING: Branch not merged to $TARGET"
 ```
 
-### Release Workflow
+### 3. Actions by Type
+
+| Type | Tag | Merge back | Version bump |
+|------|-----|------------|--------------|
+| Feature | - | - (via PR) | - |
+| Release | vX.Y.Z | main -> develop | bump MINOR on develop |
+| Hotfix | vX.Y.Z | main -> develop | bump PATCH on develop |
+
+### Release/Hotfix Workflow
 
 ```bash
+# 1. Tag on main
 git checkout main && git pull origin main
 git tag -a "v$VERSION" -m "Release v$VERSION"
 git push origin "v$VERSION"
+
+# 2. Merge back to develop
 git checkout develop && git pull origin develop
-git merge main --no-ff -m "chore: merge release back to develop"
-# Bump MINOR version
-npm version X.Y+1.0 --no-git-tag-version
-git commit -m "chore: bump develop to vX.Y+1.0"
+git merge main --no-ff -m "Merge v$VERSION back to develop"
 git push origin develop
-# Cleanup
+
+# 3. Force-verify push
+git fetch origin develop:refs/remotes/origin/develop --force --quiet
 ```
 
-### Hotfix Workflow
+### 4. Version Bump (Release/Hotfix)
 
+For npm projects:
 ```bash
-git checkout main && git pull origin main
-# Auto-increment PATCH
-npm version X.Y.Z+1 --no-git-tag-version
-git commit -m "chore: bump version"
-git tag -a "v$NEW_VERSION" -m "Hotfix v$NEW_VERSION"
-git push origin main "v$NEW_VERSION"
-git checkout develop && git merge main --no-ff
+npm version $NEXT_VERSION --no-git-tag-version
+git add package.json package-lock.json
+git commit -m "$(cat <<'EOF'
+chore: bump version to $NEXT_VERSION for development
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+EOF
+)"
 git push origin develop
-# Cleanup
 ```
 
-## Output Format
+### 5. Cleanup Worktree + Branch
 
-A la fin, afficher UNIQUEMENT:
+```bash
+# Remove worktree (if exists)
+if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
+  git worktree remove "$WORKTREE_PATH" --force
+  git worktree prune
+fi
+
+# Delete remote branch (may already be deleted by PR)
+git push origin --delete "$BRANCH" 2>/dev/null || true
 
+# Delete local branch
+git branch -D "$BRANCH" 2>/dev/null || true
 ```
-{TYPE} FINALISÉ ✓
-- Branche: {branch}
-- Tag: v{version} (ou N/A)
-- Merge back: develop ✓ (ou N/A)
-- Worktree: nettoyé ✓
 
-→ Prochain: /gitflow:10-start feature {name}
+### 6. Summary
+
+```
+{TYPE} FINALIZED
+  Branch:     {branch}
+  Tag:        v{version} (or N/A)
+  Merge back: develop (or N/A)
+  Version:    bumped to {next} (or N/A)
+  Worktree:   cleaned
+  NEXT: /gitflow start feature {name}
 ```
 
 ## Priority
 
-Safety > Correctness > Speed. Verification complete avant suppression.
+Safety > Correctness > Speed. Verify merge status before any destructive cleanup.

package/templates/agents/gitflow/init-clone.md

@@ -0,0 +1,186 @@
+---
+name: gitflow-init-clone
+description: GitFlow init - robust bare clone with worktree creation and verification
+color: blue
+model: sonnet
+tools: Bash, Read, Write
+---
+
+# GitFlow Init Clone Agent
+
+You create the GitFlow directory structure with bare repository and worktrees.
+
+**CRITICAL RULE: NEVER use `cd`. Always use absolute paths, `git -C <path>`, or `GIT_DIR=<path>`.**
+
+## INPUT PARAMETERS
+
+You receive these from the orchestrator:
+- `{REPO_URL}` - Git remote URL
+- `{PROJECT_BASE}` - Absolute path for project root (already platform-normalized)
+- `{PROJECT_NAME}` - Project display name
+- `{WORKTREE_MODE}` - "organized" or "simple"
+- `{PLATFORM}` - Current platform (wsl/windows/macos/linux)
+
+## EXECUTION SEQUENCE
+
+### 1. Create Directory Structure
+
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+
+# Create all directories in one command
+mkdir -p "$PROJECT_BASE/features" "$PROJECT_BASE/releases" "$PROJECT_BASE/hotfixes"
+```
+
+### 2. Clone Bare Repository
+
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+
+# Clone as bare repository (absolute path, no cd needed)
+git clone --bare "{REPO_URL}" "$PROJECT_BASE/.bare" 2>&1
+
+# Verify clone succeeded
+if [ ! -f "$PROJECT_BASE/.bare/HEAD" ]; then
+  echo "FAIL: Bare clone failed - HEAD not found in $PROJECT_BASE/.bare/"
+  exit 1
+fi
+
+echo "OK: Bare repository cloned"
+```
+
+### 3. Configure Bare Repository
+
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+
+# Configure bare repo for worktree support (using git -C, no cd)
+git -C "$PROJECT_BASE/.bare" config core.bare false
+git -C "$PROJECT_BASE/.bare" config core.worktree ..
+```
+
+### 4. Create .git Pseudo-File
+
+Use the Write tool to create `{PROJECT_BASE}/.git` with content:
+```
+gitdir: ./.bare
+```
+
+### 5. Create Worktrees
+
+**Organized mode:**
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+
+# Create main worktree using GIT_DIR (no cd needed)
+if [ ! -d "$PROJECT_BASE/01-Main" ]; then
+  GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/01-Main" main 2>&1
+fi
+
+# Create develop worktree
+if [ ! -d "$PROJECT_BASE/02-Develop" ]; then
+  GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/02-Develop" develop 2>&1
+fi
+```
+
+**Simple mode:**
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+
+if [ ! -d "$PROJECT_BASE/main" ]; then
+  GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/main" main 2>&1
+fi
+
+if [ ! -d "$PROJECT_BASE/develop" ]; then
+  GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/develop" develop 2>&1
+fi
+```
+
+### 6. Create Config Directory
+
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+DEVELOP_DIR=$([ "{WORKTREE_MODE}" = "organized" ] && echo "02-Develop" || echo "develop")
+
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/plans"
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/logs"
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/cache"
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/backup"
+```
+
+### 7. Verify All Operations
+
+```bash
+PROJECT_BASE="{PROJECT_BASE}"
+DEVELOP_DIR=$([ "{WORKTREE_MODE}" = "organized" ] && echo "02-Develop" || echo "develop")
+MAIN_DIR=$([ "{WORKTREE_MODE}" = "organized" ] && echo "01-Main" || echo "main")
+
+ERRORS=0
+
+# Verify bare repo
+if [ -f "$PROJECT_BASE/.bare/HEAD" ]; then
+  echo "OK: .bare/HEAD exists"
+else
+  echo "FAIL: .bare/HEAD missing"
+  ERRORS=$((ERRORS + 1))
+fi
+
+# Verify .git pseudo-file
+if [ -f "$PROJECT_BASE/.git" ]; then
+  echo "OK: .git pseudo-file exists"
+else
+  echo "FAIL: .git pseudo-file missing"
+  ERRORS=$((ERRORS + 1))
+fi
+
+# Verify main worktree
+MAIN_BRANCH=$(git -C "$PROJECT_BASE/$MAIN_DIR" branch --show-current 2>/dev/null)
+if [ "$MAIN_BRANCH" = "main" ]; then
+  echo "OK: $MAIN_DIR is on branch main"
+else
+  echo "FAIL: $MAIN_DIR is on branch '$MAIN_BRANCH', expected 'main'"
+  ERRORS=$((ERRORS + 1))
+fi
+
+# Verify develop worktree
+DEVELOP_BRANCH=$(git -C "$PROJECT_BASE/$DEVELOP_DIR" branch --show-current 2>/dev/null)
+if [ "$DEVELOP_BRANCH" = "develop" ]; then
+  echo "OK: $DEVELOP_DIR is on branch develop"
+else
+  echo "FAIL: $DEVELOP_DIR is on branch '$DEVELOP_BRANCH', expected 'develop'"
+  ERRORS=$((ERRORS + 1))
+fi
+
+# Verify subdirectories
+for subdir in features releases hotfixes; do
+  if [ -d "$PROJECT_BASE/$subdir" ]; then
+    echo "OK: $subdir/ exists"
+  else
+    echo "FAIL: $subdir/ missing"
+    ERRORS=$((ERRORS + 1))
+  fi
+done
+
+# Verify config directory
+if [ -d "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow" ]; then
+  echo "OK: .claude/gitflow/ directory exists"
+else
+  echo "FAIL: .claude/gitflow/ directory missing"
+  ERRORS=$((ERRORS + 1))
+fi
+
+echo ""
+if [ "$ERRORS" -eq 0 ]; then
+  echo "RESULT: SUCCESS - All checks passed"
+else
+  echo "RESULT: FAIL - $ERRORS error(s) detected"
+fi
+```
+
+## OUTPUT
+
+Return the verification results. The orchestrator will use these to decide if validation/repair is needed.
+
+## Priority
+
+Correctness > Speed. Every operation must be verified.

package/templates/agents/gitflow/init-detect.md

@@ -0,0 +1,137 @@
+---
+name: gitflow-init-detect
+description: GitFlow init - platform detection, workspace scanning, environment analysis
+color: cyan
+model: haiku
+tools: Bash, Read
+---
+
+# GitFlow Init Detect Agent
+
+You detect the environment for GitFlow initialization. Return a structured report.
+
+## EXECUTION SEQUENCE
+
+### 1. Detect Platform
+
+```bash
+# WSL detection (highest priority)
+if [ -f /proc/version ] && grep -qi "microsoft\|wsl" /proc/version 2>/dev/null; then
+  PLATFORM="wsl"
+  SHELL_TYPE="bash"
+elif [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "mingw"* ]] || [[ "$OSTYPE" == "cygwin" ]]; then
+  PLATFORM="windows"
+  SHELL_TYPE="gitbash"
+elif [[ -n "$WINDIR" ]] || [[ -n "$SystemRoot" ]]; then
+  PLATFORM="windows"
+  SHELL_TYPE="powershell"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  PLATFORM="macos"
+  SHELL_TYPE="zsh"
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+  PLATFORM="linux"
+  SHELL_TYPE="bash"
+else
+  PLATFORM="unknown"
+  SHELL_TYPE="bash"
+fi
+
+echo "PLATFORM=$PLATFORM"
+echo "SHELL_TYPE=$SHELL_TYPE"
+echo "PWD=$(pwd)"
+```
+
+### 2. Detect Git State
+
+```bash
+# Check if in a git repository
+IS_GIT_REPO=$(git rev-parse --git-dir 2>/dev/null && echo "true" || echo "false")
+
+# Auto-detect values
+DETECTED_URL=$(git remote get-url origin 2>/dev/null || echo "")
+DETECTED_NAME=$(basename -s .git "$DETECTED_URL" 2>/dev/null || basename "$(pwd)")
+CURRENT_DIR=$(pwd)
+PARENT_DIR=$(dirname "$CURRENT_DIR")
+
+# Detect git provider
+GIT_PROVIDER="unknown"
+if [[ "$DETECTED_URL" == *"dev.azure.com"* ]] || [[ "$DETECTED_URL" == *"visualstudio.com"* ]]; then
+  GIT_PROVIDER="azuredevops"
+elif [[ "$DETECTED_URL" == *"github.com"* ]]; then
+  GIT_PROVIDER="github"
+fi
+
+# Check branches
+HAS_MAIN=$(git rev-parse --verify main 2>/dev/null && echo "true" || echo "false")
+HAS_DEVELOP=$(git rev-parse --verify develop 2>/dev/null && echo "true" || echo "false")
+
+# Check existing config
+HAS_CONFIG=$([ -f ".claude/gitflow/config.json" ] && echo "true" || echo "false")
+
+echo "IS_GIT_REPO=$IS_GIT_REPO"
+echo "DETECTED_URL=$DETECTED_URL"
+echo "DETECTED_NAME=$DETECTED_NAME"
+echo "GIT_PROVIDER=$GIT_PROVIDER"
+echo "HAS_MAIN=$HAS_MAIN"
+echo "HAS_DEVELOP=$HAS_DEVELOP"
+echo "HAS_CONFIG=$HAS_CONFIG"
+```
+
+### 3. Scan Workspace for Sibling Projects
+
+```bash
+PARENT_DIR=$(dirname "$(pwd)")
+SIBLINGS=""
+SIBLING_COUNT=0
+
+for dir in "$PARENT_DIR"/*/; do
+  [ ! -d "$dir" ] && continue
+  PROJECT=$(basename "$dir")
+  if [ -d "$dir/.bare" ] || [ -d "$dir/01-Main" ] || [ -d "$dir/02-Develop" ]; then
+    SIBLINGS="$SIBLINGS  $PROJECT (gitflow)\n"
+    SIBLING_COUNT=$((SIBLING_COUNT + 1))
+  elif [ -d "$dir/.git" ]; then
+    SIBLINGS="$SIBLINGS  $PROJECT (git)\n"
+  fi
+done
+
+# Check for workspace.json
+HAS_WORKSPACE=$([ -f "$PARENT_DIR/.smartstack-workspace.json" ] && echo "true" || echo "false")
+
+echo "PARENT_DIR=$PARENT_DIR"
+echo "SIBLING_COUNT=$SIBLING_COUNT"
+echo -e "SIBLINGS:\n$SIBLINGS"
+echo "HAS_WORKSPACE=$HAS_WORKSPACE"
+```
+
+### 4. Output Structured Report
+
+Return all detected values in a clear format:
+
+```
+ENVIRONMENT REPORT
+==================
+Platform:     {PLATFORM} ({SHELL_TYPE})
+Directory:    {CURRENT_DIR}
+Parent:       {PARENT_DIR}
+
+GIT STATE
+=========
+Git repo:     {IS_GIT_REPO}
+Remote URL:   {DETECTED_URL}
+Provider:     {GIT_PROVIDER}
+Project name: {DETECTED_NAME}
+Has main:     {HAS_MAIN}
+Has develop:  {HAS_DEVELOP}
+Has config:   {HAS_CONFIG}
+
+WORKSPACE
+=========
+Workspace:    {HAS_WORKSPACE}
+Siblings:     {SIBLING_COUNT} project(s)
+{SIBLINGS list}
+```
+
+## Priority
+
+Speed > Detail. Detection only, no modifications.