@atlashub/smartstack-cli 1.32.0 → 1.34.0

package/package.json

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

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

@@ -16,7 +16,8 @@ Set up GitFlow configuration with bare repository, worktrees, and branches.
 
 ## MANDATORY QUESTIONS
 
-**⛔ ALWAYS ask these 3 questions, even if values can be auto-detected:**
+**⛔ ALWAYS ask these 3 questions, even if values can be auto-detected.**
+**⛔ ALWAYS detect workspace context (step 2) to show sibling projects.**
 
 | Question | Variable | Auto-detect from |
 |----------|----------|------------------|
@@ -24,6 +25,10 @@ Set up GitFlow configuration with bare repository, worktrees, and branches.
 | Root folder | `{ROOT_FOLDER}` | Parent of current directory |
 | Project name | `{PROJECT_NAME}` | Repo name from URL or folder |
 
+**Multi-project principle:** Each repository has its OWN independent GitFlow config. Step 2 scans for sibling projects to provide context, not to share configuration.
+
+**⛔ FOLLOW-UP RULE:** When a user selects a "Custom..." option (custom name, custom path, custom URL), that selection is just a CHOICE, not the actual value. You MUST immediately ask a follow-up question to capture the actual value. Never proceed with a blank or default value.
+
 ---
 
 ## EXECUTION SEQUENCE:
@@ -52,7 +57,51 @@ fi
 ALREADY_INITIALIZED=$([ -f ".claude/gitflow/config.json" ] && echo "true" || echo "false")
 ```
 
-### 2. Handle Existing Configuration
+### 2. Detect Workspace (multi-project context)
+
+**Scan the parent directory for sibling projects already using GitFlow:**
+
+```bash
+WORKSPACE_DIR=$(dirname "$(pwd)")
+SIBLING_PROJECTS=()
+
+for dir in "$WORKSPACE_DIR"/*/; do
+  [ -d "$dir/.bare" ] || [ -d "$dir/01-Main" ] || [ -d "$dir/02-Develop" ] && {
+    PROJECT_NAME_SIBLING=$(basename "$dir")
+    SIBLING_PROJECTS+=("$PROJECT_NAME_SIBLING")
+  }
+done
+```
+
+**Display workspace context:**
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│  WORKSPACE: {WORKSPACE_DIR}                                  │
+├─────────────────────────────────────────────────────────────┤
+│  Each project has its OWN independent GitFlow configuration. │
+│  This init configures only: {DETECTED_NAME}                  │
+├─────────────────────────────────────────────────────────────┤
+{if SIBLING_PROJECTS not empty}
+│  Existing GitFlow projects:                                  │
+│  {for each SIBLING} ✅ {SIBLING_NAME}/                       │
+│     ├── .bare/  01-Main/  02-Develop/                        │
+│     └── features/  releases/  hotfixes/                      │
+│  {end for}                                                   │
+│                                                              │
+│  New project to initialize:                                  │
+│  ⬜ {DETECTED_NAME}/                                         │
+│     └── (same structure will be created)                     │
+{else}
+│  No existing GitFlow projects detected.                      │
+│  This will be the first project in this workspace.           │
+{endif}
+└─────────────────────────────────────────────────────────────┘
+```
+
+**Key principle:** GitFlow is **per-repository**. Each project has its own `config.json`, its own worktree structure, and its own version history. Projects do not share configuration.
+
+### 3. Handle Existing Configuration
 
 **If `ALREADY_INITIALIZED` = true:**
 
@@ -75,12 +124,12 @@ AskUserQuestion:
 ```
 
 **Handle choices:**
-- **Reconfigure**: Continue to step 3 (will ask all questions again)
+- **Reconfigure**: Continue to step 4 (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
+### 4. MANDATORY: Ask Repository URL
 
 **⛔ ALWAYS ask, even if URL was detected:**
 
@@ -100,34 +149,83 @@ AskUserQuestion:
     multiSelect: false
 ```
 
-**If user selects "Enter GitHub URL" or "Enter Azure DevOps URL":**
-- Capture URL via "Other" input
+**⛔ FOLLOW-UP: If user selects "Enter GitHub URL" or "Enter Azure DevOps URL":**
+
+The selected option is just a choice, NOT the actual URL. You MUST ask a follow-up question:
+
+```yaml
+AskUserQuestion:
+  - header: "URL"
+    question: "Enter the repository URL:"
+    options:
+      - label: "https://github.com/org/repo.git"
+        description: "Example GitHub format"
+      - label: "https://dev.azure.com/org/project/_git/repo"
+        description: "Example Azure DevOps format"
+    multiSelect: false
+```
+
+The user will type the actual URL via "Other". Then:
 - Validate format
 - Update `{REPO_URL}` and `{GIT_PROVIDER}`
 
-### 4. MANDATORY: Ask Root Folder
+### 5. MANDATORY: Ask Root Folder
+
+**⛔ ALWAYS ask where to create THIS project's structure:**
 
-**⛔ ALWAYS ask where to create the project structure:**
+**If sibling projects exist, show where it fits:**
+
+```
+{WORKSPACE_DIR}/
+├── SmartStack.app/    ✅ (gitflow)
+├── SmartStack.mcp/    ✅ (gitflow)
+├── SmartStack.cli/    ✅ (gitflow)
+└── NewProject/        ← THIS PROJECT
+    ├── .bare/
+    ├── 01-Main/
+    ├── 02-Develop/
+    ├── features/
+    ├── releases/
+    └── hotfixes/
+```
 
 ```yaml
 AskUserQuestion:
   - header: "Location"
-    question: "Root folder for project? (All worktrees will be created here)"
+    question: "Root folder for THIS project? (worktrees will be created here)"
     options:
       - label: "Use parent folder (Recommended)"
-        description: "{DETECTED_FOLDER}/"
+        description: "{DETECTED_FOLDER}/ - consistent with {#SIBLING_PROJECTS} sibling project(s)"
       - label: "Use current folder"
         description: "$(pwd)/ - Will create subfolders here"
-      - label: "Enter custom path"
+      - label: "Custom path"
         description: "Specify a different location"
     multiSelect: false
 ```
 
-**Explain the structure that will be created:**
+**⛔ FOLLOW-UP: If user selects "Custom path":**
+
+You MUST ask a follow-up question to get the actual path:
+
+```yaml
+AskUserQuestion:
+  - header: "Path"
+    question: "Enter the full path for the project root folder:"
+    options:
+      - label: "{DETECTED_FOLDER}/"
+        description: "Parent of current directory"
+      - label: "{WORKSPACE_DIR}/"
+        description: "Workspace root"
+    multiSelect: false
+```
+
+The user will type the actual path via "Other". Validate the path exists or can be created.
+
+**Explain the structure that will be created for this project:**
 
 ```
 {ROOT_FOLDER}/
-├── .bare/                 # Git bare repository
+├── .bare/                 # Git bare repository (this repo only)
 ├── 01-Main/               # Worktree: main branch
 ├── 02-Develop/            # Worktree: develop branch
 ├── features/              # Feature branch worktrees
@@ -135,7 +233,7 @@ AskUserQuestion:
 └── hotfixes/              # Hotfix branch worktrees
 ```
 
-### 5. MANDATORY: Ask Project Name
+### 6. MANDATORY: Ask Project Name
 
 **⛔ ALWAYS ask to confirm project name:**
 
@@ -146,12 +244,30 @@ AskUserQuestion:
     options:
       - label: "Use detected name (Recommended)"
         description: "Project: {DETECTED_NAME}"
-      - label: "Enter custom name"
+      - label: "Custom name"
         description: "Specify a different project name"
     multiSelect: false
 ```
 
-### 6. Ask Worktree Mode
+**⛔ FOLLOW-UP: If user selects "Custom name":**
+
+You MUST ask a follow-up question to get the actual name:
+
+```yaml
+AskUserQuestion:
+  - header: "Name"
+    question: "Enter the project name:"
+    options:
+      - label: "{DETECTED_NAME}"
+        description: "Detected from repository"
+      - label: "{DETECTED_NAME}-v2"
+        description: "Variant of detected name"
+    multiSelect: false
+```
+
+The user will type the actual name via "Other". Use it as `{PROJECT_NAME}`.
+
+### 7. Ask Worktree Mode
 
 ```yaml
 AskUserQuestion:
@@ -167,7 +283,7 @@ AskUserQuestion:
     multiSelect: false
 ```
 
-### 7. Create Directory Structure
+### 8. Create Directory Structure
 
 **⛔ Create the COMPLETE structure:**
 
@@ -207,7 +323,7 @@ DEVELOP_PATH=$([ "$WORKTREE_MODE" = "organized" ] && echo "02-Develop" || echo "
 mkdir -p "$DEVELOP_PATH/.claude/gitflow/{plans,logs,cache,backup}"
 ```
 
-### 8. Create Configuration
+### 9. Create Configuration
 
 **Write `.claude/gitflow/config.json` in develop worktree:**
 
@@ -265,7 +381,7 @@ mkdir -p "$DEVELOP_PATH/.claude/gitflow/{plans,logs,cache,backup}"
 }
 ```
 
-### 9. Detect Version
+### 10. Detect Version
 
 ```bash
 # In develop worktree
@@ -280,7 +396,7 @@ VERSION=$(grep -oP '<Version>\K[^<]+' *.csproj 2>/dev/null | head -1)
 [ -z "$VERSION" ] && VERSION="0.1.0"
 ```
 
-### 10. Summary
+### 11. Summary
 
 ```
 ╔══════════════════════════════════════════════════════════════════╗
@@ -300,6 +416,11 @@ VERSION=$(grep -oP '<Version>\K[^<]+' *.csproj 2>/dev/null | head -1)
 ║  ├── releases/        (release worktrees)   ✅                    ║
 ║  └── hotfixes/        (hotfix worktrees)    ✅                    ║
 ╠══════════════════════════════════════════════════════════════════╣
+{if SIBLING_PROJECTS not empty}
+║  Workspace: {WORKSPACE_DIR}                                       ║
+║  GitFlow projects: {#SIBLING_PROJECTS + 1} (including this one)   ║
+╠══════════════════════════════════════════════════════════════════╣
+{endif}
 ║  Config: 02-Develop/.claude/gitflow/config.json                   ║
 ╠══════════════════════════════════════════════════════════════════╣
 ║  NEXT: cd 02-Develop && /gitflow -f <feature-name>                ║