@atlashub/smartstack-cli 1.21.0 → 1.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlashub/smartstack-cli",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "description": "SmartStack Claude Code automation toolkit - GitFlow, APEX, EF Core migrations, prompts and more",
   "author": {
     "name": "SmartStack",

package/templates/agents/gitflow/init.md

@@ -10,6 +10,48 @@ tools: Bash, Read, Write, Glob, AskUserQuestion
 
 You initialize a GitFlow project.
 
+## MANDATORY FIRST CHECK: Existing GitFlow Configuration
+
+**BEFORE anything else, check if GitFlow is already initialized in the current directory:**
+
+```bash
+# Check for existing GitFlow config
+if [ -f ".claude/gitflow/config.json" ]; then
+  echo "EXISTING_GITFLOW=true"
+  cat .claude/gitflow/config.json
+else
+  echo "EXISTING_GITFLOW=false"
+fi
+```
+
+**If `EXISTING_GITFLOW=true`, you MUST ask the user BEFORE proceeding:**
+
+```json
+{
+  "questions": [{
+    "question": "GitFlow is already initialized in this project. What do you want to do?",
+    "header": "Existing",
+    "options": [
+      {"label": "View configuration", "description": "Display current GitFlow settings"},
+      {"label": "Reconfigure", "description": "Reset and reconfigure GitFlow (keeps git history)"},
+      {"label": "Repair", "description": "Fix missing directories or corrupted config"},
+      {"label": "Cancel", "description": "Exit without changes"}
+    ],
+    "multiSelect": false
+  }]
+}
+```
+
+**Handle responses:**
+- **View configuration**: Display the config in a formatted table and EXIT
+- **Reconfigure**: Continue with the init workflow (will overwrite existing config)
+- **Repair**: Check directories, validate config, fix issues, then EXIT
+- **Cancel**: EXIT immediately
+
+**⛔ DO NOT continue to URL/clone steps if user selects "View" or "Cancel".**
+
+---
+
 ## MANDATORY WORKFLOW FOR URL MODE
 
 When the user provides a URL (starts with `https://` or `git@`), you MUST execute these steps IN ORDER:

package/templates/skills/gitflow/steps/step-init.md

@@ -8,110 +8,219 @@ next_step: null
 
 ## YOUR TASK:
 
-Set up GitFlow configuration, create main/develop branches, and configure worktree structure.
+Set up GitFlow configuration with bare repository, worktrees, and branches.
 
 **ULTRA THINK before creating configuration.**
 
 ---
 
+## MANDATORY QUESTIONS
+
+**⛔ ALWAYS ask these 3 questions, even if values can be auto-detected:**
+
+| Question | Variable | Auto-detect from |
+|----------|----------|------------------|
+| Repository URL | `{REPO_URL}` | `git remote get-url origin` |
+| Root folder | `{ROOT_FOLDER}` | Parent of current directory |
+| Project name | `{PROJECT_NAME}` | Repo name from URL or folder |
+
+---
+
 ## EXECUTION SEQUENCE:
 
-### 1. Detect Environment
+### 1. Detect Environment (for defaults only)
 
 ```bash
-# Check if already initialized
-[ -f ".claude/gitflow/config.json" ] && {
-  echo "GitFlow already initialized"
-  # Show current config and ask to reinitialize
-}
+# Check if we're in a git repository
+IS_GIT_REPO=$(git rev-parse --git-dir 2>/dev/null && echo "true" || echo "false")
+
+# Auto-detect values for defaults (will be confirmed by user)
+DETECTED_URL=$(git remote get-url origin 2>/dev/null || echo "")
+DETECTED_FOLDER=$(dirname "$(pwd)")
+DETECTED_NAME=$(basename -s .git "$DETECTED_URL" 2>/dev/null || basename "$(pwd)")
 
 # Detect git provider
-REMOTE_URL=$(git remote get-url origin 2>/dev/null || echo "")
-if [[ "$REMOTE_URL" == *"github.com"* ]]; then
+if [[ "$DETECTED_URL" == *"github.com"* ]]; then
   GIT_PROVIDER="github"
-elif [[ "$REMOTE_URL" == *"dev.azure.com"* ]]; then
+elif [[ "$DETECTED_URL" == *"dev.azure.com"* ]]; then
   GIT_PROVIDER="azuredevops"
 else
   GIT_PROVIDER="unknown"
 fi
 
-# Detect existing branches
-HAS_MAIN=$(git branch -r --list "origin/main" | wc -l)
-HAS_DEVELOP=$(git branch -r --list "origin/develop" | wc -l)
+# Check if already initialized
+ALREADY_INITIALIZED=$([ -f ".claude/gitflow/config.json" ] && echo "true" || echo "false")
 ```
 
-### 2. Configuration Questions
+### 2. Handle Existing Configuration
+
+**If `ALREADY_INITIALIZED` = true:**
+
+Display current configuration and ask what to do:
 
 ```yaml
 AskUserQuestion:
-  - header: "Mode"
-    question: "How do you want to set up GitFlow?"
+  - header: "Existing"
+    question: "GitFlow is already initialized. Current config will be shown. What do you want to do?"
     options:
-      - label: "Quick Setup (Recommended)"
-        description: "Auto-detect settings, create branches"
-      - label: "Custom Setup"
-        description: "Configure each option manually"
-      - label: "Existing Config"
-        description: "Use existing .claude/gitflow/config.json"
+      - label: "Reconfigure (Recommended)"
+        description: "Review and update all settings"
+      - label: "Repair"
+        description: "Fix missing directories only"
+      - label: "View only"
+        description: "Display current config and exit"
+      - label: "Cancel"
+        description: "Exit without changes"
+    multiSelect: false
+```
+
+**Handle choices:**
+- **Reconfigure**: Continue to step 3 (will ask all questions again)
+- **Repair**: Check directories, fix missing ones, exit
+- **View only**: Display config, exit
+- **Cancel**: Exit immediately
+
+### 3. MANDATORY: Ask Repository URL
+
+**⛔ ALWAYS ask, even if URL was detected:**
+
+```yaml
+AskUserQuestion:
+  - header: "Repository"
+    question: "Repository URL? (detected: {DETECTED_URL})"
+    options:
+      - label: "Use detected URL (Recommended)"
+        description: "{DETECTED_URL}"
+      - label: "Enter GitHub URL"
+        description: "https://github.com/org/repo.git"
+      - label: "Enter Azure DevOps URL"
+        description: "https://dev.azure.com/org/project/_git/repo"
+      - label: "Local only (no remote)"
+        description: "Initialize without remote (limited features)"
+    multiSelect: false
+```
+
+**If user selects "Enter GitHub URL" or "Enter Azure DevOps URL":**
+- Capture URL via "Other" input
+- Validate format
+- Update `{REPO_URL}` and `{GIT_PROVIDER}`
+
+### 4. MANDATORY: Ask Root Folder
+
+**⛔ ALWAYS ask where to create the project structure:**
+
+```yaml
+AskUserQuestion:
+  - header: "Location"
+    question: "Root folder for project? (All worktrees will be created here)"
+    options:
+      - label: "Use parent folder (Recommended)"
+        description: "{DETECTED_FOLDER}/"
+      - label: "Use current folder"
+        description: "$(pwd)/ - Will create subfolders here"
+      - label: "Enter custom path"
+        description: "Specify a different location"
+    multiSelect: false
+```
+
+**Explain the structure that will be created:**
+
+```
+{ROOT_FOLDER}/
+├── .bare/                 # Git bare repository
+├── 01-Main/               # Worktree: main branch
+├── 02-Develop/            # Worktree: develop branch
+├── features/              # Feature branch worktrees
+├── releases/              # Release branch worktrees
+└── hotfixes/              # Hotfix branch worktrees
+```
+
+### 5. MANDATORY: Ask Project Name
 
+**⛔ ALWAYS ask to confirm project name:**
+
+```yaml
+AskUserQuestion:
+  - header: "Project"
+    question: "Project name? (detected: {DETECTED_NAME})"
+    options:
+      - label: "Use detected name (Recommended)"
+        description: "Project: {DETECTED_NAME}"
+      - label: "Enter custom name"
+        description: "Specify a different project name"
+    multiSelect: false
+```
+
+### 6. Ask Worktree Mode
+
+```yaml
+AskUserQuestion:
   - header: "Worktrees"
     question: "How should worktrees be organized?"
     options:
       - label: "Organized (Recommended)"
-        description: "../features/, ../releases/, ../hotfixes/"
-      - label: "Adjacent"
-        description: "../worktrees/{type}/"
+        description: "01-Main, 02-Develop, features/, releases/, hotfixes/"
+      - label: "Simple"
+        description: "main/, develop/, features/, releases/, hotfixes/"
       - label: "Disabled"
-        description: "No worktrees, use git checkout"
+        description: "No worktrees, use git checkout (not recommended)"
+    multiSelect: false
 ```
 
-### 3. Create Branches (if needed)
+### 7. Create Directory Structure
+
+**⛔ Create the COMPLETE structure:**
 
 ```bash
-# Ensure we have main
-[ "$HAS_MAIN" -eq 0 ] && {
-  git checkout -b main
-  git push -u origin main
-}
+cd "{ROOT_FOLDER}"
 
-# Ensure we have develop
-[ "$HAS_DEVELOP" -eq 0 ] && {
-  git checkout main
-  git checkout -b develop
-  git push -u origin develop
-}
-```
+# Create bare repository if not exists
+if [ ! -d ".bare" ]; then
+  git clone --bare "{REPO_URL}" .bare
+  # Configure bare repo for worktrees
+  cd .bare
+  git config core.bare false
+  git config core.worktree ..
+  cd ..
+fi
 
-### 4. Create Directory Structure
+# Create worktree directories
+mkdir -p features releases hotfixes
 
-```bash
-mkdir -p .claude/gitflow/{plans,logs,cache,backup}
-
-# Create worktree directories if mode != disabled
-case "$WORKTREE_MODE" in
-  organized)
-    mkdir -p ../features ../releases ../hotfixes
-    ;;
-  adjacent)
-    mkdir -p ../worktrees/{features,releases,hotfixes}
-    ;;
-esac
+# Organized mode: numbered main folders
+if [ "$WORKTREE_MODE" = "organized" ]; then
+  # Create main worktree
+  [ ! -d "01-Main" ] && git worktree add 01-Main main
+
+  # Create develop worktree
+  [ ! -d "02-Develop" ] && git worktree add 02-Develop develop
+fi
+
+# Simple mode: named folders
+if [ "$WORKTREE_MODE" = "simple" ]; then
+  [ ! -d "main" ] && git worktree add main main
+  [ ! -d "develop" ] && git worktree add develop develop
+fi
+
+# Create gitflow config directory (in develop worktree)
+DEVELOP_PATH=$([ "$WORKTREE_MODE" = "organized" ] && echo "02-Develop" || echo "develop")
+mkdir -p "$DEVELOP_PATH/.claude/gitflow/{plans,logs,cache,backup}"
 ```
 
-### 5. Create Configuration
+### 8. Create Configuration
 
-**Write `.claude/gitflow/config.json`:**
+**Write `.claude/gitflow/config.json` in develop worktree:**
 
 ```json
 {
   "version": "2.0.0",
   "repository": {
-    "name": "{repo_name}",
-    "defaultBranch": "main",
-    "remoteUrl": "{remote_url}"
+    "name": "{PROJECT_NAME}",
+    "rootFolder": "{ROOT_FOLDER}",
+    "remoteUrl": "{REPO_URL}"
   },
   "git": {
-    "provider": "{github|azuredevops}",
+    "provider": "{GIT_PROVIDER}",
     "branches": {
       "main": "main",
       "develop": "develop"
@@ -124,24 +233,25 @@ esac
   },
   "worktrees": {
     "enabled": true,
-    "mode": "{organized|adjacent|disabled}",
+    "mode": "{WORKTREE_MODE}",
     "structure": {
-      "features": "../features",
-      "releases": "../releases",
-      "hotfixes": "../hotfixes"
+      "main": "{ROOT_FOLDER}/01-Main",
+      "develop": "{ROOT_FOLDER}/02-Develop",
+      "features": "{ROOT_FOLDER}/features",
+      "releases": "{ROOT_FOLDER}/releases",
+      "hotfixes": "{ROOT_FOLDER}/hotfixes"
     }
   },
   "versioning": {
     "strategy": "semver",
-    "current": "{X.Y.Z}",
+    "current": "{VERSION}",
     "tagPrefix": "v",
     "sources": ["csproj", "package.json", "VERSION"]
   },
   "efcore": {
     "enabled": true,
     "validateOnCommit": true,
-    "blockDestructive": true,
-    "migrationNaming": "{context}_v{version}_{sequence}_{Description}"
+    "blockDestructive": true
   },
   "workflow": {
     "push": {
@@ -151,16 +261,16 @@ esac
       "autoLabels": true,
       "requireReview": true
     }
-  },
-  "language": {
-    "code": "en"
   }
 }
 ```
 
-### 6. Detect Version
+### 9. Detect Version
 
 ```bash
+# In develop worktree
+cd "$DEVELOP_PATH"
+
 # Priority: csproj > Directory.Build.props > package.json > VERSION > tag
 VERSION=$(grep -oP '<Version>\K[^<]+' *.csproj 2>/dev/null | head -1)
 [ -z "$VERSION" ] && VERSION=$(grep -oP '<Version>\K[^<]+' Directory.Build.props 2>/dev/null)
@@ -170,40 +280,68 @@ VERSION=$(grep -oP '<Version>\K[^<]+' *.csproj 2>/dev/null | head -1)
 [ -z "$VERSION" ] && VERSION="0.1.0"
 ```
 
-### 7. Summary
+### 10. Summary
 
 ```
 ╔══════════════════════════════════════════════════════════════════╗
 ║                    GITFLOW INITIALIZED                            ║
 ╠══════════════════════════════════════════════════════════════════╣
-║  Repository: {repo_name}                                          ║
-║  Provider:   {github|azuredevops}                                 ║
-║  Version:    {X.Y.Z}                                              ║
+║  Project:    {PROJECT_NAME}                                       ║
+║  Root:       {ROOT_FOLDER}                                        ║
+║  Remote:     {REPO_URL}                                           ║
+║  Provider:   {GIT_PROVIDER}                                       ║
+║  Version:    {VERSION}                                            ║
 ╠══════════════════════════════════════════════════════════════════╣
-║  Branches:                                                        ║
-║  - main:    ✅ Ready                                              ║
-║  - develop: ✅ Ready                                              ║
+║  Structure:                                                        ║
+║  ├── .bare/           (git bare repository)                       ║
+║  ├── 01-Main/         (main branch)         ✅                    ║
+║  ├── 02-Develop/      (develop branch)      ✅                    ║
+║  ├── features/        (feature worktrees)   ✅                    ║
+║  ├── releases/        (release worktrees)   ✅                    ║
+║  └── hotfixes/        (hotfix worktrees)    ✅                    ║
 ╠══════════════════════════════════════════════════════════════════╣
-║  Worktrees: {mode}                                                ║
-║  - ../features/  (for feature branches)                           ║
-║  - ../releases/  (for release branches)                           ║
-║  - ../hotfixes/  (for hotfix branches)                            ║
+║  Config: 02-Develop/.claude/gitflow/config.json                   ║
 ╠══════════════════════════════════════════════════════════════════╣
-║  Config: .claude/gitflow/config.json                              ║
-╠══════════════════════════════════════════════════════════════════╣
-║  NEXT: /gitflow start feature <name>                              ║
+║  NEXT: cd 02-Develop && /gitflow -f <feature-name>                ║
 ╚══════════════════════════════════════════════════════════════════╝
 ```
 
 ---
 
+## VALIDATION CHECKLIST:
+
+Before completing init, verify:
+
+- [ ] Repository URL confirmed by user
+- [ ] Root folder confirmed by user
+- [ ] Project name confirmed by user
+- [ ] .bare/ directory exists
+- [ ] 01-Main/ worktree exists and is on main branch
+- [ ] 02-Develop/ worktree exists and is on develop branch
+- [ ] features/, releases/, hotfixes/ directories exist
+- [ ] .claude/gitflow/config.json created in develop worktree
+
+---
+
+## ERROR HANDLING:
+
+| Error | Solution |
+|-------|----------|
+| Clone fails | Check URL, network, credentials |
+| Worktree exists | Skip or offer to recreate |
+| Permission denied | Check folder permissions |
+| Branch missing | Create from default branch |
+
+---
+
 ## SUCCESS CRITERIA:
 
-- Configuration file created
-- main and develop branches exist
-- Worktree directories created (if enabled)
-- Version detected and stored
+- ✅ All 3 mandatory questions asked
+- ✅ Complete folder structure created
+- ✅ Both main and develop worktrees functional
+- ✅ Configuration file created
+- ✅ User can navigate to 02-Develop and start working
 
 ## NEXT STEP:
 
-Init is standalone. User can now run `/gitflow start feature <name>`.
+Init is standalone. User should `cd 02-Develop` then run `/gitflow -f <feature-name>`.