@atlashub/smartstack-cli 1.35.0 → 1.36.0

package/package.json

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

package/templates/skills/_shared.md

@@ -15,13 +15,13 @@ Domain → Application → Infrastructure → API → Web
 ```
 
 ### Layers
-| Layer | Responsibility | Namespace |
-|-------|-----------------|-----------|
-| Domain | Entities, ValueObjects | `SmartStack.Domain.{Context}` |
-| Application | Services, DTOs, Interfaces | `SmartStack.Application.{Context}` |
-| Infrastructure | Implementations, EF Core | `SmartStack.Infrastructure.{Context}` |
-| API | Controllers, Middleware | `SmartStack.Api.Controllers.{Area}` |
-| Web | React components, pages | `src/pages/{context}/{app}/{module}` |
+| Layer | Responsibility | Namespace | Folder Hierarchy |
+|-------|-----------------|-----------|------------------|
+| Domain | Entities, ValueObjects | `SmartStack.Domain.{Context}.{App}.{Module}` | `Domain/{Context}/{App}/{Module}/` |
+| Application | Interfaces (Common), DTOs | `SmartStack.Application.Common.Interfaces` / `.{Context}.{App}.{Module}.DTOs` | `Application/Common/Interfaces/` + `Application/{Context}/{App}/{Module}/DTOs/` |
+| Infrastructure | Service Impl, EF Core | `SmartStack.Infrastructure.Services.{Module}` | `Infrastructure/Services/{Module}/` + `Persistence/Configurations/{Module}/` |
+| API | Controllers, Middleware | `SmartStack.Api.Controllers.{Context}` | `Api/Controllers/{Context}/` |
+| Web | React components, pages | N/A | `pages/{context}/{app}/{module}/` + `components/{context}/{module}/` |
 
 ## Permissions (2 mandatory files)
 

package/templates/skills/application/steps/step-04-backend.md

@@ -80,15 +80,15 @@ Args:
 
 ### 4. Parse MCP Response
 
-The tool generates:
-- `Domain/{EntityName}.cs` - Entity with BaseEntity
-- `Infrastructure/Persistence/Configurations/{EntityName}Configuration.cs` - EF Config
-- `Application/Services/I{EntityName}Service.cs` - Interface
-- `Application/Services/{EntityName}Service.cs` - Implementation
-- `Api/Controllers/{EntityName}Controller.cs` - REST Controller
-- `Application/DTOs/{EntityName}Dto.cs` - Response DTO
-- `Application/DTOs/Create{EntityName}Dto.cs` - Create request
-- `Application/DTOs/Update{EntityName}Dto.cs` - Update request
+The tool generates (paths organized by navRoute hierarchy `{context}.{application}.{module}`):
+- `Domain/{Context}/{Application}/{Module}/{EntityName}.cs` - Entity with BaseEntity
+- `Infrastructure/Persistence/Configurations/{Module}/{EntityName}Configuration.cs` - EF Config
+- `Application/Common/Interfaces/I{EntityName}Service.cs` - Service Interface
+- `Infrastructure/Services/{Module}/{EntityName}Service.cs` - Service Implementation
+- `Api/Controllers/{Context}/{EntityName}Controller.cs` - REST Controller
+- `Application/{Context}/{Application}/{Module}/DTOs/{EntityName}ResponseDto.cs` - Response DTO
+- `Application/{Context}/{Application}/{Module}/DTOs/Create{EntityName}Dto.cs` - Create request
+- `Application/{Context}/{Application}/{Module}/DTOs/Update{EntityName}Dto.cs` - Update request
 
 ### 5. Present Output to User
 
@@ -96,20 +96,20 @@ The tool generates:
 ## Backend Code Generated
 
 ### Domain Layer
-- `Domain/{EntityName}.cs`
+- `Domain/{Context}/{Application}/{Module}/{EntityName}.cs`
 
 ### Infrastructure Layer
-- `Persistence/Configurations/{EntityName}Configuration.cs`
+- `Persistence/Configurations/{Module}/{EntityName}Configuration.cs`
+- `Services/{Module}/{EntityName}Service.cs`
 
 ### Application Layer
-- `Services/I{EntityName}Service.cs`
-- `Services/{EntityName}Service.cs`
-- `DTOs/{EntityName}Dto.cs`
-- `DTOs/Create{EntityName}Dto.cs`
-- `DTOs/Update{EntityName}Dto.cs`
+- `Common/Interfaces/I{EntityName}Service.cs`
+- `{Context}/{Application}/{Module}/DTOs/{EntityName}ResponseDto.cs`
+- `{Context}/{Application}/{Module}/DTOs/Create{EntityName}Dto.cs`
+- `{Context}/{Application}/{Module}/DTOs/Update{EntityName}Dto.cs`
 
 ### API Layer
-- `Controllers/{EntityName}Controller.cs`
+- `Controllers/{Context}/{EntityName}Controller.cs`
   - NavRoute: `{full_path}`
   - Endpoints:
     - GET /api/{code} - List all

package/templates/skills/application/steps/step-05-frontend.md

@@ -129,9 +129,12 @@ Repeat for en, it, de with appropriate translations.
 ```markdown
 ## Frontend Code Generated
 
-### Components
+### Pages
 - `pages/{context}/{application}/{module}/{EntityName}Page.tsx`
 - `pages/{context}/{application}/{module}/{EntityName}ListView.tsx`
+
+### Components
+- `components/{context}/{module}/{EntityName}.tsx`
 - `hooks/use{EntityName}.ts`
 
 ### API Client

package/templates/skills/application/templates-backend.md

@@ -49,7 +49,7 @@ public static class Erp
 ```csharp
 // src/SmartStack.Application/Common/Interfaces/I{Module}Service.cs
 
-using SmartStack.Application.$MODULE_PASCAL.Models;
+using SmartStack.Application.$CONTEXT_PASCAL.$APPLICATION_PASCAL.$MODULE_PASCAL.DTOs;
 
 namespace SmartStack.Application.Common.Interfaces;
 
@@ -88,8 +88,8 @@ public interface I$MODULE_PASCALService
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using SmartStack.Application.Common.Interfaces;
-using SmartStack.Application.$MODULE_PASCAL.Models;
-using SmartStack.Domain.$MODULE_PASCAL;
+using SmartStack.Application.$CONTEXT_PASCAL.$APPLICATION_PASCAL.$MODULE_PASCAL.DTOs;
+using SmartStack.Domain.$CONTEXT_PASCAL.$APPLICATION_PASCAL.$MODULE_PASCAL;
 
 namespace SmartStack.Infrastructure.Services.$MODULE_PASCAL;
 
@@ -269,9 +269,9 @@ public class $MODULE_PASCALService : I$MODULE_PASCALService
 ## TEMPLATE: DTOs
 
 ```csharp
-// src/SmartStack.Application/$MODULE_PASCAL/Models/$ENTITY_PASCALDto.cs
+// src/SmartStack.Application/$CONTEXT_PASCAL/$APPLICATION_PASCAL/$MODULE_PASCAL/DTOs/$ENTITY_PASCALDto.cs
 
-namespace SmartStack.Application.$MODULE_PASCAL.Models;
+namespace SmartStack.Application.$CONTEXT_PASCAL.$APPLICATION_PASCAL.$MODULE_PASCAL.DTOs;
 
 public record $ENTITY_PASCALDto
 {
@@ -310,11 +310,11 @@ public record $ENTITY_PASCALQueryParameters
 ## TEMPLATE: DOMAIN ENTITY
 
 ```csharp
-// src/SmartStack.Domain/$MODULE_PASCAL/$ENTITY_PASCAL.cs
+// src/SmartStack.Domain/$CONTEXT_PASCAL/$APPLICATION_PASCAL/$MODULE_PASCAL/$ENTITY_PASCAL.cs
 
 using SmartStack.Domain.Common;
 
-namespace SmartStack.Domain.$MODULE_PASCAL;
+namespace SmartStack.Domain.$CONTEXT_PASCAL.$APPLICATION_PASCAL.$MODULE_PASCAL;
 
 public class $ENTITY_PASCAL : BaseEntity
 {
@@ -363,7 +363,7 @@ public class $ENTITY_PASCAL : BaseEntity
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using SmartStack.Domain.$MODULE_PASCAL;
+using SmartStack.Domain.$CONTEXT_PASCAL.$APPLICATION_PASCAL.$MODULE_PASCAL;
 
 namespace SmartStack.Infrastructure.Persistence.Configurations.$MODULE_PASCAL;
 

package/templates/skills/application/templates-frontend.md

@@ -8,11 +8,11 @@
 
 ```
 web/smartstack-web/src/
-├── pages/$CONTEXT/$MODULE/
+├── pages/$CONTEXT/$APPLICATION/$MODULE/
 │   ├── $MODULE_PASCALPage.tsx          # Main page (list)
 │   ├── $MODULE_PASCALDetailPage.tsx    # Detail page
 │   └── Create$MODULE_PASCALPage.tsx    # Create page
-├── components/$MODULE/
+├── components/$CONTEXT/$MODULE/
 │   ├── $MODULE_PASCALListView.tsx      # Reusable list component
 │   ├── $MODULE_PASCALForm.tsx          # CRUD form
 │   └── $MODULE_PASCALFilters.tsx       # Filters
@@ -35,10 +35,10 @@ web/smartstack-web/src/
 ## TEMPLATE: MAIN PAGE
 
 ```tsx
-// pages/$CONTEXT/$MODULE/$MODULE_PASCALPage.tsx
+// pages/$CONTEXT/$APPLICATION/$MODULE/$MODULE_PASCALPage.tsx
 
 import { useTranslation } from 'react-i18next';
-import { $MODULE_PASCALListView } from '@/components/$MODULE/$MODULE_PASCALListView';
+import { $MODULE_PASCALListView } from '@/components/$CONTEXT/$MODULE/$MODULE_PASCALListView';
 
 export function $MODULE_PASCALPage() {
   const { t } = useTranslation(['$module', 'common']);
@@ -59,7 +59,7 @@ export function $MODULE_PASCALPage() {
 ## TEMPLATE: LIST VIEW (Reusable component)
 
 ```tsx
-// components/$MODULE/$MODULE_PASCALListView.tsx
+// components/$CONTEXT/$MODULE/$MODULE_PASCALListView.tsx
 
 import { useState, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -491,9 +491,9 @@ React Router v7 **requires** nested routes for multi-module applications.
 ```tsx
 // Add to App.tsx
 
-import { $MODULE_PASCALPage } from '@/pages/$CONTEXT/$MODULE/$MODULE_PASCALPage';
-import { $MODULE_PASCALDetailPage } from '@/pages/$CONTEXT/$MODULE/$MODULE_PASCALDetailPage';
-import { Create$MODULE_PASCALPage } from '@/pages/$CONTEXT/$MODULE/Create$MODULE_PASCALPage';
+import { $MODULE_PASCALPage } from '@/pages/$CONTEXT/$APPLICATION/$MODULE/$MODULE_PASCALPage';
+import { $MODULE_PASCALDetailPage } from '@/pages/$CONTEXT/$APPLICATION/$MODULE/$MODULE_PASCALDetailPage';
+import { Create$MODULE_PASCALPage } from '@/pages/$CONTEXT/$APPLICATION/$MODULE/Create$MODULE_PASCALPage';
 
 // In routes - NESTED STRUCTURE
 <Route path="$APPLICATION">

package/templates/skills/gitflow/_shared.md

@@ -45,12 +45,113 @@ normalize_branch_name() {
 
 ---
 
+## RESOLVE_CONFIG_PATH
+
+Resolves the config.json path regardless of current working directory.
+Searches in: pwd, develop worktree, then git root.
+
+```bash
+resolve_gitflow_config_path() {
+  # 1. Try current directory
+  [ -f ".claude/gitflow/config.json" ] && { echo ".claude/gitflow/config.json"; return 0; }
+
+  # 2. Try to find develop worktree from git worktree list
+  local DEVELOP_PATH
+  DEVELOP_PATH=$(git worktree list --porcelain 2>/dev/null | grep -A1 "branch refs/heads/develop" | grep "^worktree " | sed 's/^worktree //')
+  [ -n "$DEVELOP_PATH" ] && [ -f "$DEVELOP_PATH/.claude/gitflow/config.json" ] && {
+    echo "$DEVELOP_PATH/.claude/gitflow/config.json"
+    return 0
+  }
+
+  # 3. Try git toplevel
+  local GIT_ROOT
+  GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
+  [ -n "$GIT_ROOT" ] && [ -f "$GIT_ROOT/.claude/gitflow/config.json" ] && {
+    echo "$GIT_ROOT/.claude/gitflow/config.json"
+    return 0
+  }
+
+  return 1
+}
+```
+
+---
+
+## READ_GITFLOW_CONFIG
+
+Reads GitFlow configuration from config.json. Exposes all variables needed by steps and phases.
+
+```bash
+read_gitflow_config() {
+  local CONFIG_FILE
+  CONFIG_FILE=$(resolve_gitflow_config_path) || {
+    echo "❌ GitFlow config not found. Run /gitflow init first."
+    return 1
+  }
+
+  # Repository
+  GF_PROJECT_NAME=$(grep -oP '"name":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_ROOT_FOLDER=$(grep -oP '"rootFolder":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_REMOTE_URL=$(grep -oP '"remoteUrl":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+  # Git provider and branches
+  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)
+
+  # Prefixes
+  GF_FEATURE_PREFIX=$(grep -oP '"feature":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_RELEASE_PREFIX=$(grep -oP '"release":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_HOTFIX_PREFIX=$(grep -oP '"hotfix":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+  # Worktrees
+  GF_WORKTREE_MODE=$(grep -oP '"mode":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_MAIN_PATH=$(grep -A1 '"structure"' "$CONFIG_FILE" | grep -oP '"main":\s*"\K[^"]+' | head -1)
+  GF_DEVELOP_PATH=$(grep -A2 '"structure"' "$CONFIG_FILE" | grep -oP '"develop":\s*"\K[^"]+' | head -1)
+  GF_FEATURES_PATH=$(grep -oP '"features":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_RELEASES_PATH=$(grep -oP '"releases":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_HOTFIXES_PATH=$(grep -oP '"hotfixes":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+  # Language
+  GF_LANG=$(grep -oP '"code":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+  # Versioning
+  GF_VERSION=$(grep -oP '"current":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+  GF_TAG_PREFIX=$(grep -oP '"tagPrefix":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+
+  # Defaults for missing values
+  GF_LANG=${GF_LANG:-en}
+  GF_WORKTREE_MODE=${GF_WORKTREE_MODE:-organized}
+  GF_MAIN_BRANCH=${GF_MAIN_BRANCH:-main}
+  GF_DEVELOP_BRANCH=${GF_DEVELOP_BRANCH:-develop}
+  GF_FEATURE_PREFIX=${GF_FEATURE_PREFIX:-feature/}
+  GF_RELEASE_PREFIX=${GF_RELEASE_PREFIX:-release/}
+  GF_HOTFIX_PREFIX=${GF_HOTFIX_PREFIX:-hotfix/}
+  GF_TAG_PREFIX=${GF_TAG_PREFIX:-v}
+  GF_VERSION=${GF_VERSION:-0.1.0}
+
+  # Export config file path for steps that need to update it
+  GF_CONFIG_FILE="$CONFIG_FILE"
+}
+```
+
+---
+
 ## DETECT_WORKTREE_MODE
 
-Detects worktree mode (organized, adjacent, none).
+Detects worktree mode. Reads config first, falls back to filesystem detection.
 
 ```bash
 detect_worktree_mode() {
+  # 1. Try config first (authoritative)
+  local CONFIG_FILE
+  CONFIG_FILE=$(resolve_gitflow_config_path 2>/dev/null)
+  if [ -n "$CONFIG_FILE" ] && [ -f "$CONFIG_FILE" ]; then
+    WORKTREE_MODE=$(grep -oP '"mode":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
+    [ -n "$WORKTREE_MODE" ] && return 0
+  fi
+
+  # 2. Fallback: filesystem detection
   if [ -d "../features" ] && [ -d "../releases" ] && [ -d "../hotfixes" ]; then
     WORKTREE_MODE="organized"
   elif [ -d "../01-Main" ] && [ -d "../02-Develop" ]; then
@@ -58,9 +159,7 @@ detect_worktree_mode() {
   elif [ -d "../worktrees" ]; then
     WORKTREE_MODE="adjacent"
   else
-    CONFIG_FILE=".claude/gitflow/config.json"
-    [ -f "$CONFIG_FILE" ] && WORKTREE_MODE=$(grep -oP '"mode":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
-    WORKTREE_MODE=${WORKTREE_MODE:-adjacent}
+    WORKTREE_MODE="organized"
   fi
 }
 ```
@@ -69,26 +168,30 @@ detect_worktree_mode() {
 
 ## CLEANUP_WORKTREE
 
-Cleans up a worktree for a given branch.
+Cleans up a worktree for a given branch. Uses config paths when available.
 
 ```bash
 cleanup_worktree_for_branch() {
-  local BRANCH=$1 WORKTREE_BASE="../worktrees" WORKTREE_PATH=""
-
-  case "$BRANCH" in
-    feature/*) WORKTREE_PATH="$WORKTREE_BASE/features/${BRANCH#feature/}" ;;
-    release/*) WORKTREE_PATH="$WORKTREE_BASE/releases/${BRANCH#release/}" ;;
-    hotfix/*)  WORKTREE_PATH="$WORKTREE_BASE/hotfixes/${BRANCH#hotfix/}" ;;
-  esac
-
-  # Organized mode
-  [ -d "../features" ] && case "$BRANCH" in
-    feature/*) WORKTREE_PATH="../features/${BRANCH#feature/}" ;;
-    release/*) WORKTREE_PATH="../releases/${BRANCH#release/}" ;;
-    hotfix/*)  WORKTREE_PATH="../hotfixes/${BRANCH#hotfix/}" ;;
-  esac
-
-  [ -d "$WORKTREE_PATH" ] && {
+  local BRANCH=$1 WORKTREE_PATH=""
+
+  # Try config-based paths first (absolute, reliable)
+  read_gitflow_config 2>/dev/null
+  if [ -n "$GF_FEATURES_PATH" ]; then
+    case "$BRANCH" in
+      feature/*) WORKTREE_PATH="$GF_FEATURES_PATH/${BRANCH#feature/}" ;;
+      release/*) WORKTREE_PATH="$GF_RELEASES_PATH/${BRANCH#release/}" ;;
+      hotfix/*)  WORKTREE_PATH="$GF_HOTFIXES_PATH/${BRANCH#hotfix/}" ;;
+    esac
+  else
+    # Fallback: relative paths
+    case "$BRANCH" in
+      feature/*) WORKTREE_PATH="../features/${BRANCH#feature/}" ;;
+      release/*) WORKTREE_PATH="../releases/${BRANCH#release/}" ;;
+      hotfix/*)  WORKTREE_PATH="../hotfixes/${BRANCH#hotfix/}" ;;
+    esac
+  fi
+
+  [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ] && {
     git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || rm -rf "$WORKTREE_PATH"
     git worktree prune
     echo "✓ Worktree cleaned: $WORKTREE_PATH"
@@ -116,47 +219,79 @@ sync_with_remote() {
 
 ---
 
-## READ_GITFLOW_CONFIG
-
-Reads GitFlow configuration.
-
-```bash
-read_gitflow_config() {
-  local CONFIG_FILE=".claude/gitflow/config.json"
-  [ ! -f "$CONFIG_FILE" ] && return 1
-
-  # Exported variables
-  GF_LANG=$(grep -oP '"code":\s*"\K[^"]+' "$CONFIG_FILE" | head -1)
-  GF_WORKTREE_MODE=$(grep -oP '"mode":\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_LANG=${GF_LANG:-en}
-  GF_WORKTREE_MODE=${GF_WORKTREE_MODE:-adjacent}
-  GF_MAIN_BRANCH=${GF_MAIN_BRANCH:-main}
-  GF_DEVELOP_BRANCH=${GF_DEVELOP_BRANCH:-develop}
-}
-```
-
----
-
 ## CONFIG_TEMPLATE
 
-GitFlow configuration JSON template (minimal version).
+GitFlow configuration JSON template v2.0.0 (aligned with `templates/config.json`).
 
 ```json
 {
-  "version": "1.3.0",
-  "branches": { "main": "main", "develop": "develop" },
-  "prefixes": { "feature": "feature/", "release": "release/", "hotfix": "hotfix/" },
-  "worktrees": { "mode": "organized" },
-  "language": { "code": "en" }
+  "version": "2.0.0",
+  "repository": {
+    "name": "",
+    "rootFolder": "",
+    "nameVariants": {
+      "pascalCaseDot": "",
+      "pascalCase": "",
+      "kebabCase": "",
+      "snakeCase": "",
+      "displayName": ""
+    },
+    "defaultBranch": "main",
+    "remoteUrl": ""
+  },
+  "git": {
+    "provider": "",
+    "branches": {
+      "main": "main",
+      "develop": "develop"
+    },
+    "prefixes": {
+      "feature": "feature/",
+      "release": "release/",
+      "hotfix": "hotfix/"
+    }
+  },
+  "worktrees": {
+    "enabled": true,
+    "mode": "organized",
+    "structure": {
+      "main": "",
+      "develop": "",
+      "features": "",
+      "releases": "",
+      "hotfixes": ""
+    }
+  },
+  "versioning": {
+    "strategy": "semver",
+    "current": "0.1.0",
+    "tagPrefix": "v",
+    "sources": ["csproj", "package.json", "VERSION"]
+  },
+  "efcore": {
+    "enabled": true,
+    "validateOnCommit": true,
+    "blockDestructive": true,
+    "migrationNaming": "{context}_v{version}_{sequence}_{Description}"
+  },
+  "workflow": {
+    "push": {
+      "afterCommit": "worktree"
+    },
+    "pr": {
+      "autoLabels": true,
+      "requireReview": true
+    }
+  },
+  "language": {
+    "code": "en"
+  }
 }
 ```
 
 **worktrees.mode options:**
-- `organized`: `../features/`, `../releases/`, `../hotfixes/`
-- `adjacent`: `../worktrees/{type}/`
+- `organized`: Uses absolute paths from config (`structure.features`, etc.)
+- `adjacent`: `{rootFolder}/worktrees/{type}/`
 - `disabled`: No worktrees
 
 ---

package/templates/skills/gitflow/phases/abort.md

@@ -11,6 +11,13 @@ Provide rollback and recovery options for GitFlow operations.
 
 ---
 
+## PRE-CHECK:
+
+```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+```
+
 ## OPTIONS:
 
 ```yaml
@@ -23,7 +30,7 @@ AskUserQuestion:
     - label: "Abandon current branch"
       description: "Delete branch and worktree, return to develop"
     - label: "Restore from checkpoint"
-      description: "Restore to a saved checkpoint"
+      description: "Restore to a saved checkpoint (not yet implemented)"
     - label: "Reset branch to remote"
       description: "Discard local changes, match remote"
 ```
@@ -69,7 +76,7 @@ git tag "$BACKUP_TAG" HEAD
 echo "✓ Backup created: $BACKUP_TAG"
 
 # Switch to develop
-git checkout develop
+git checkout $GF_DEVELOP_BRANCH
 
 # Remove worktree
 [ -n "$WORKTREE" ] && {
@@ -87,30 +94,35 @@ echo "  Backup: $BACKUP_TAG (use 'git checkout $BACKUP_TAG' to recover)"
 
 ### Option 3: Restore from Checkpoint
 
+> **Note:** Checkpoint creation is not yet implemented. This option uses backup tags
+> created by abort operations as a recovery mechanism. Full checkpoint support
+> (automatic state snapshots during plan execution) is planned for a future release.
+
 ```bash
-# List available checkpoints
-CHECKPOINTS=$(ls -t .claude/gitflow/logs/checkpoint_*.json 2>/dev/null)
+# List available backup tags (created by abandon operations)
+BACKUPS=$(git tag -l "backup/*" --sort=-creatordate 2>/dev/null)
 
-if [ -z "$CHECKPOINTS" ]; then
-  echo "No checkpoints found"
+if [ -z "$BACKUPS" ]; then
+  echo "No backup tags found"
+  echo "  Backup tags are created automatically when abandoning branches."
+  echo "  Use 'Reset branch to remote' instead."
   exit 1
 fi
 
-echo "Available checkpoints:"
-for cp in $CHECKPOINTS; do
-  TIMESTAMP=$(grep -oP '"timestamp":\s*"\K[^"]+' "$cp")
-  BRANCH=$(grep -oP '"branch":\s*"\K[^"]+' "$cp")
-  COMMIT=$(grep -oP '"commit":\s*"\K[^"]+' "$cp")
-  echo "  - $TIMESTAMP: $BRANCH @ $COMMIT"
+echo "Available backups:"
+for tag in $BACKUPS; do
+  COMMIT=$(git rev-parse --short "$tag")
+  DATE=$(git log -1 --format=%ci "$tag" 2>/dev/null)
+  echo "  - $tag → $COMMIT ($DATE)"
 done
 
-# Select checkpoint
+# Select backup
 # ... user selection ...
 
 # Restore
-COMMIT=$(grep -oP '"commit":\s*"\K[^"]+' "$SELECTED_CHECKPOINT")
-git reset --hard "$COMMIT"
-echo "✓ Restored to $COMMIT"
+git checkout "$SELECTED_TAG"
+git checkout -b "recovered-$(date +%Y%m%d-%H%M%S)"
+echo "✓ Restored from $SELECTED_TAG to new branch"
 ```
 
 ### Option 4: Reset to Remote

package/templates/skills/gitflow/phases/cleanup.md

@@ -16,12 +16,15 @@ Audit worktrees and branches, remove orphaned/stale items.
 ## PRE-CHECK:
 
 ```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+
 CURRENT=$(git rev-parse --abbrev-ref HEAD)
 
-[[ "$CURRENT" != "main" ]] && [[ "$CURRENT" != "develop" ]] && {
-  echo "❌ Cleanup must be run from main or develop"
+[[ "$CURRENT" != "$GF_MAIN_BRANCH" ]] && [[ "$CURRENT" != "$GF_DEVELOP_BRANCH" ]] && {
+  echo "❌ Cleanup must be run from $GF_MAIN_BRANCH or $GF_DEVELOP_BRANCH"
   echo "   Current branch: $CURRENT"
-  echo "→ Run: git checkout develop"
+  echo "→ Run: git checkout $GF_DEVELOP_BRANCH"
   STOP
 }
 ```
@@ -35,7 +38,8 @@ CURRENT=$(git rev-parse --abbrev-ref HEAD)
 ```bash
 echo "Scanning worktrees..."
 
-git worktree list > /tmp/worktrees.txt
+mkdir -p .claude/gitflow/cache
+git worktree list > .claude/gitflow/cache/worktrees.txt
 
 ORPHANED=()
 STALE=()
@@ -54,13 +58,13 @@ while read -r line; do
 
   # Check if branch still exists on remote
   REMOTE_EXISTS=$(git branch -r --list "origin/$WT_BRANCH" | wc -l)
-  if [ "$REMOTE_EXISTS" -eq 0 ] && [[ "$WT_BRANCH" != "main" ]] && [[ "$WT_BRANCH" != "develop" ]]; then
+  if [ "$REMOTE_EXISTS" -eq 0 ] && [[ "$WT_BRANCH" != "$GF_MAIN_BRANCH" ]] && [[ "$WT_BRANCH" != "$GF_DEVELOP_BRANCH" ]]; then
     STALE+=("$WT_PATH:$WT_BRANCH")
     continue
   fi
 
   VALID+=("$WT_PATH:$WT_BRANCH")
-done < /tmp/worktrees.txt
+done < .claude/gitflow/cache/worktrees.txt
 ```
 
 ### 2. Audit Local Branches
@@ -72,17 +76,17 @@ MERGED_BRANCHES=()
 UNMERGED_BRANCHES=()
 
 # Find merged branches
-for branch in $(git branch --merged develop | grep -v "^\*" | grep -v "main" | grep -v "develop"); do
+for branch in $(git branch --merged $GF_DEVELOP_BRANCH | grep -v "^\*" | grep -v "$GF_MAIN_BRANCH" | grep -v "$GF_DEVELOP_BRANCH"); do
   # Check if remote exists
   REMOTE_EXISTS=$(git branch -r --list "origin/$branch" | wc -l)
   [ "$REMOTE_EXISTS" -eq 0 ] && MERGED_BRANCHES+=("$branch")
 done
 
 # Find branches without remote
-for branch in $(git branch | grep -v "^\*" | grep -v "main" | grep -v "develop"); do
+for branch in $(git branch | grep -v "^\*" | grep -v "$GF_MAIN_BRANCH" | grep -v "$GF_DEVELOP_BRANCH"); do
   REMOTE_EXISTS=$(git branch -r --list "origin/$branch" | wc -l)
   [ "$REMOTE_EXISTS" -eq 0 ] && {
-    MERGED=$(git branch --merged develop | grep -c "$branch")
+    MERGED=$(git branch --merged $GF_DEVELOP_BRANCH | grep -c "$branch")
     [ "$MERGED" -eq 0 ] && UNMERGED_BRANCHES+=("$branch")
   }
 done