@atlashub/smartstack-cli 4.38.0 → 4.39.0

package/package.json

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

package/templates/agents/efcore/migration.md

@@ -47,6 +47,7 @@ SmartStack uses two separate DbContexts with separate migration histories:
 | `extensions` | ExtensionsDbContext | `extensions` | `extensions.__EFMigrationsHistory` | Client-specific entities |
 
 **Detection Logic:**
+0. If `--context` flag provided → use specified DbContext (skip auto-detection)
 1. If project contains `SmartStack.Domain` → use `CoreDbContext`
 2. If project contains `{ClientName}.Domain` with SmartStack NuGet → use `ExtensionsDbContext`
 3. If unclear → ask user which context to use
@@ -80,6 +81,8 @@ MCP returns the fully compliant name: `{context}_v{version}_{sequence}_{Descript
 
 ## Commands
 
+> **IMPORTANT:** Project detection, migration search, and migration creation should run in a single Bash call to preserve shell variables (`$INFRA_PROJECT`, `$MIGRATIONS_DIR`, `$STARTUP_PROJECT`).
+
 **Prerequisite — ensure `dotnet ef` is on PATH (MANDATORY before any command):**
 
 ```bash
@@ -96,23 +99,29 @@ fi
 > NEVER rely on `$HOME` alone — in WSL it resolves to `/home/{user}` where .NET SDK is absent.
 
 ```bash
+# Detect project paths
+INFRA_PROJECT=$(find src -name "*Infrastructure.csproj" | head -1)
+INFRA_DIR=$(dirname "$INFRA_PROJECT")
+MIGRATIONS_DIR=$(find "$INFRA_DIR" -type d -name "Migrations" -path "*/Persistence/*" | head -1)
+STARTUP_PROJECT=$(find src -name "*.Api.csproj" | head -1)
+
 # Existing migrations for Core
-find Migrations -name "core_*.cs" | grep -v Designer | grep -v Snapshot
+find "$MIGRATIONS_DIR" -name "core_*.cs" | grep -v Designer | grep -v Snapshot
 
 # Existing migrations for Extensions
-find Persistence/Migrations -name "ext_*.cs" | grep -v Designer | grep -v Snapshot
+find "$MIGRATIONS_DIR" -name "ext_*.cs" | grep -v Designer | grep -v Snapshot
 
-# Create Core migration (use MCP_NAME from suggest_migration)
-dotnet ef migrations add $MCP_NAME --context CoreDbContext -o Persistence/Migrations
+# Create Core migration (use MCP_MIGRATION_NAME from suggest_migration)
+dotnet ef migrations add "$MCP_MIGRATION_NAME" --context CoreDbContext -o Persistence/Migrations --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT"
 
-# Create Extensions migration (use MCP_NAME from suggest_migration)
-dotnet ef migrations add $MCP_NAME --context ExtensionsDbContext -o Persistence/Migrations
+# Create Extensions migration (use MCP_MIGRATION_NAME from suggest_migration)
+dotnet ef migrations add "$MCP_MIGRATION_NAME" --context ExtensionsDbContext -o Persistence/Migrations --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT"
 
 # Delete existing migration
-rm Persistence/Migrations/*${OLD_NAME}*.cs
+rm -f "$MIGRATIONS_DIR"/*${OLD_NAME}*.cs
 ```
 
-> **Note:** `$MCP_NAME` is obtained via MCP call, never computed locally.
+> **Note:** `$MCP_MIGRATION_NAME` is obtained via MCP call, never computed locally.
 
 ## SQL Objects (NO injection needed)
 
@@ -186,16 +195,6 @@ After rebase on develop:
 3. Report the error with dotnet output
 4. Suggest corrective action
 
-## SQL in Migrations (STRICT RULE)
-
-**FORBIDDEN:** Raw SQL inline in migrations (e.g., `migrationBuilder.Sql("CREATE FUNCTION ...")`)
-
-**ONLY** SQL objects defined in `src/{Project}.Infrastructure/Persistence/SqlObjects/` are authorized.
-
-- All SQL objects (functions, views, procedures, TVFs) MUST be `.sql` files in `Persistence/SqlObjects/`
-- SQL objects are applied **automatically at startup** via `SqlObjectHelper.ApplyAllAsync()` — no migration injection needed
-- **Never** write raw SQL directly inside migration `Up()` or `Down()` methods
-
 ## Important Notes
 
 - **Core migrations** go to `CoreDbContextModelSnapshot.cs`

package/templates/agents/efcore/rebase-snapshot.md

@@ -21,12 +21,9 @@ if [ -f .git ] && grep -q '^gitdir: [A-Za-z]:' .git 2>/dev/null && grep -qi micr
 fi
 ```
 
-## SQL in Migrations (STRICT RULE)
+## SQL Objects
 
-**FORBIDDEN:** Raw SQL inline in migrations (e.g., `migrationBuilder.Sql("CREATE FUNCTION ...")`)
-
-**ONLY** SQL objects defined in `src/{Project}.Infrastructure/Persistence/SqlObjects/` are authorized.
-SQL objects are applied **automatically at startup** via `SqlObjectHelper.ApplyAllAsync()` — no migration injection needed.
+SQL objects (TVFs, views, SPs) are applied **at startup** via `SqlObjectHelper.ApplyAllAsync()` — never inject in migrations.
 
 ## Workflow
 
@@ -36,42 +33,128 @@ SQL objects are applied **automatically at startup** via `SqlObjectHelper.ApplyA
 4. **Regenerate** consolidated migration
 5. **Validate** build OK
 
+## Shared Functions
+
+> **Reference:** See `references/shared-init-functions.md` for `ensure_dotnet_ef()`, `detect_efcore_project()`, `detect_dbcontext()`, `determine_base_branch()`.
+
 ## Key Commands
 
+> **IMPORTANT:** Steps 1-2 MUST run in a single Bash call to preserve shell variables. Step 2b (confirm) is a separate interactive call. Step 3 requires variables from steps 1-2.
+
+### Step 1: Initialize
+
 ```bash
-# Detect project and DbContext
-detect_efcore_project   # → $DBCONTEXT, $DBCONTEXT_TYPE, $SCHEMA
-determine_base_branch   # → $BASE_BRANCH, $BRANCH_TYPE
+# Determine parent branch
+CURRENT_BRANCH=$(git branch --show-current)
+case "$CURRENT_BRANCH" in
+  feature/*) BASE_BRANCH="develop"; BRANCH_TYPE="feature" ;;
+  release/*) BASE_BRANCH="main";    BRANCH_TYPE="release" ;;
+  hotfix/*)  BASE_BRANCH="main";    BRANCH_TYPE="hotfix" ;;
+  develop)   BASE_BRANCH="main";    BRANCH_TYPE="develop" ;;
+  main|master) echo "BLOCKED: Cannot rebase on main/master"; exit 1 ;;
+  *)         BASE_BRANCH="develop"; BRANCH_TYPE="unknown" ;;
+esac
+
+# Detect project
+INFRA_PROJECT=$(find src -name "*Infrastructure.csproj" | head -1)
+INFRA_DIR=$(dirname "$INFRA_PROJECT")
+MIGRATIONS_DIR=$(find "$INFRA_DIR" -type d -name "Migrations" -path "*/Persistence/*" | head -1)
+MIGRATIONS_REL=$(realpath --relative-to="$(git rev-parse --show-toplevel)" "$MIGRATIONS_DIR")
+STARTUP_PROJECT=$(find src -name "*.Api.csproj" | head -1)
+
+# Detect DbContext (override via --context flag, else auto-detect)
+CONTEXT_OVERRIDE="${CONTEXT:-}"
+if [ "$CONTEXT_OVERRIDE" = "CoreDbContext" ] || [ "$CONTEXT_OVERRIDE" = "core" ]; then
+  DBCONTEXT="CoreDbContext"; DBCONTEXT_TYPE="core"
+elif [ "$CONTEXT_OVERRIDE" = "ExtensionsDbContext" ] || [ "$CONTEXT_OVERRIDE" = "extensions" ]; then
+  DBCONTEXT="ExtensionsDbContext"; DBCONTEXT_TYPE="extensions"
+elif find src -type d -name "SmartStack.Domain" | grep -q .; then
+  DBCONTEXT="CoreDbContext"; DBCONTEXT_TYPE="core"
+else
+  DBCONTEXT="ExtensionsDbContext"; DBCONTEXT_TYPE="extensions"
+fi
+
+echo "Branch: $CURRENT_BRANCH → Base: $BASE_BRANCH"
+echo "Migrations: $MIGRATIONS_DIR"
+echo "DbContext: $DBCONTEXT"
+```
+
+### Step 2: Backup
 
-# Backup
+```bash
 BACKUP_DIR=".claude/gitflow/backup/migrations/rebase_$(date +%Y%m%d_%H%M%S)"
 mkdir -p "$BACKUP_DIR"
-cp Migrations/*.cs "$BACKUP_DIR/"
+cp "$MIGRATIONS_DIR"/*.cs "$BACKUP_DIR/"
+echo "Backup: $BACKUP_DIR"
+```
 
-# Reset snapshot to parent branch (develop or main depending on context)
+### Step 2b: Confirm (skip if `--force`)
+
+If `--force` flag is NOT set:
+
+```javascript
+AskUserQuestion({
+  question: "Rebase snapshot will:\n1. Reset ModelSnapshot to " + BASE_BRANCH + "\n2. Delete branch-specific migrations\n3. Regenerate consolidated migration\n\nBranch-specific migrations to recreate:\n" + BRANCH_ONLY_MIGS + "\n\nProceed?",
+  header: "EF Core Rebase-Snapshot",
+  options: [
+    { label: "Yes, rebase", description: "Backup + rebase snapshot" },
+    { label: "Cancel", description: "Do nothing" }
+  ]
+})
+```
+
+### Step 3: Identify branch-specific migrations + Reset
+
+```bash
 git fetch origin "$BASE_BRANCH"
-git checkout "origin/$BASE_BRANCH" -- Migrations/*ModelSnapshot.cs
+
+# List parent branch migrations (names only)
+BASE_MIGS=$(git ls-tree -r --name-only "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL/" 2>/dev/null | grep "\.cs$" | grep -v "Designer\|Snapshot" | xargs -I{} basename {} .cs)
+
+# List local migrations (names only)
+LOCAL_MIGS=$(find "$MIGRATIONS_DIR" -maxdepth 1 -name "*.cs" ! -name "*Designer*" ! -name "*Snapshot*" | xargs -I{} basename {} .cs)
+
+# Calculate branch-specific migrations (in local but NOT in base)
+BRANCH_ONLY_MIGS=""
+for mig in $LOCAL_MIGS; do
+  if ! echo "$BASE_MIGS" | grep -qx "$mig"; then
+    BRANCH_ONLY_MIGS="$BRANCH_ONLY_MIGS $mig"
+  fi
+done
+BRANCH_ONLY_MIGS=$(echo "$BRANCH_ONLY_MIGS" | xargs)
+
+echo "Branch-specific migrations to recreate:"
+for mig in $BRANCH_ONLY_MIGS; do echo "  - $mig"; done
+
+# Reset snapshot to parent branch
+git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL"/*ModelSnapshot.cs
 
 # Retrieve parent branch migrations
-BASE_MIGS=$(git ls-tree -r --name-only "origin/$BASE_BRANCH" -- Migrations/ | grep "\.cs$" | grep -v "Designer\|Snapshot")
 for base_mig in $BASE_MIGS; do
-  base_name=$(basename "${base_mig%.cs}")
-  git checkout "origin/$BASE_BRANCH" -- "Migrations/${base_name}.cs" 2>/dev/null || true
-  git checkout "origin/$BASE_BRANCH" -- "Migrations/${base_name}.Designer.cs" 2>/dev/null || true
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL/${base_mig}.cs" 2>/dev/null || true
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL/${base_mig}.Designer.cs" 2>/dev/null || true
+done
+
+# Delete branch-specific migrations by exact name (NOT by branch type pattern)
+for mig in $BRANCH_ONLY_MIGS; do
+  rm -f "$MIGRATIONS_DIR"/*"${mig}"*.cs
+  echo "  Deleted: $mig"
 done
+```
 
-# Delete branch migrations only
-rm -f Migrations/*${BRANCH_TYPE}_*.cs
-rm -f Migrations/*${BRANCH_TYPE}_*.Designer.cs
+### Step 4: Regenerate + Validate
 
+```bash
 # Regenerate with MCP naming - MANDATORY
 mcp__smartstack__suggest_migration({ description: "...", context: DBCONTEXT_TYPE })
-# Result: core_v1.7.0_001_UserAuthConsolidated
 
-dotnet ef migrations add "$MIGRATION_NAME" --context "$DBCONTEXT"
+dotnet ef migrations add "$MCP_MIGRATION_NAME" \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$STARTUP_PROJECT" \
+  -o Persistence/Migrations
 
-# NOTE: SQL objects (TVFs, views, SPs) are applied automatically at startup
-# via SqlObjectHelper.ApplyAllAsync() — no injection needed in migrations.
+# NOTE: SQL objects are applied automatically at startup — no injection needed.
 
 # Validate
 dotnet build

package/templates/agents/efcore/squash.md

@@ -21,12 +21,9 @@ if [ -f .git ] && grep -q '^gitdir: [A-Za-z]:' .git 2>/dev/null && grep -qi micr
 fi
 ```
 
-## SQL in Migrations (STRICT RULE)
+## SQL Objects
 
-**FORBIDDEN:** Raw SQL inline in migrations (e.g., `migrationBuilder.Sql("CREATE FUNCTION ...")`)
-
-**ONLY** SQL objects defined in `src/{Project}.Infrastructure/Persistence/SqlObjects/` are authorized.
-SQL objects are applied **automatically at startup** via `SqlObjectHelper.ApplyAllAsync()` — no migration injection needed.
+SQL objects (TVFs, views, SPs) are applied **at startup** via `SqlObjectHelper.ApplyAllAsync()` — never inject in migrations.
 
 ## Core Principle
 
@@ -53,57 +50,158 @@ WARNING: NEVER retrieve only the snapshot without the migrations!
 7. **Create**: Create consolidated migration (MCP mandatory)
 8. **Validate**: Build + script OK
 
+## Shared Functions
+
+> **Reference:** See `references/shared-init-functions.md` for `ensure_dotnet_ef()`, `detect_efcore_project()`, `detect_dbcontext()`, `determine_base_branch()`, `block_production()`.
+
 ## Key Commands
 
+> **IMPORTANT:** Steps 1-3 MUST run in a single Bash call to preserve shell variables ($BASE_BRANCH, $MIGRATIONS_DIR, $BRANCH_ONLY_MIGS, etc.). Step 4 (guard) and Step 5 (confirm) are separate calls. Step 6 requires variables from steps 1-3.
+
+### Step 1: Initialize
+
 ```bash
-# Determine parent branch and DbContext
-determine_base_branch   # → BASE_BRANCH, BRANCH_TYPE
-detect_efcore_project   # → $DBCONTEXT, $DBCONTEXT_TYPE, $SCHEMA
+# Determine parent branch
+CURRENT_BRANCH=$(git branch --show-current)
+case "$CURRENT_BRANCH" in
+  feature/*) BASE_BRANCH="develop"; BRANCH_TYPE="feature" ;;
+  release/*) BASE_BRANCH="main";    BRANCH_TYPE="release" ;;
+  hotfix/*)  BASE_BRANCH="main";    BRANCH_TYPE="hotfix" ;;
+  develop)   BASE_BRANCH="main";    BRANCH_TYPE="develop" ;;
+  main|master) echo "BLOCKED: Cannot squash on main/master"; exit 1 ;;
+  *)         BASE_BRANCH="develop"; BRANCH_TYPE="unknown" ;;
+esac
+echo "Branch: $CURRENT_BRANCH ($BRANCH_TYPE) → Base: $BASE_BRANCH"
+
+# Context override from --context flag (passed via agent prompt)
+CONTEXT_OVERRIDE="${CONTEXT:-}"
+```
 
-# Identify branch-specific migrations
-BASE_MIGS=$(git ls-tree -r --name-only "origin/$BASE_BRANCH" -- Migrations/ | grep "\.cs$" | grep -v "Designer\|Snapshot")
-LOCAL_MIGS=$(find Migrations -name "*.cs" | grep -v Designer | grep -v Snapshot)
+### Step 2: Detect project and migrations directory
 
+```bash
+# Find Infrastructure project and migrations directory
+INFRA_PROJECT=$(find src -name "*Infrastructure.csproj" | head -1)
+INFRA_DIR=$(dirname "$INFRA_PROJECT")
+MIGRATIONS_DIR=$(find "$INFRA_DIR" -type d -name "Migrations" -path "*/Persistence/*" | head -1)
+
+# Detect DbContext (override via --context flag, else auto-detect)
+if [ "$CONTEXT_OVERRIDE" = "CoreDbContext" ] || [ "$CONTEXT_OVERRIDE" = "core" ]; then
+  DBCONTEXT="CoreDbContext"; DBCONTEXT_TYPE="core"
+elif [ "$CONTEXT_OVERRIDE" = "ExtensionsDbContext" ] || [ "$CONTEXT_OVERRIDE" = "extensions" ]; then
+  DBCONTEXT="ExtensionsDbContext"; DBCONTEXT_TYPE="extensions"
+elif find src -type d -name "SmartStack.Domain" | grep -q .; then
+  DBCONTEXT="CoreDbContext"; DBCONTEXT_TYPE="core"
+else
+  DBCONTEXT="ExtensionsDbContext"; DBCONTEXT_TYPE="extensions"
+fi
+
+echo "Migrations: $MIGRATIONS_DIR"
+echo "DbContext: $DBCONTEXT"
+```
+
+### Step 3: Identify branch-specific migrations
+
+```bash
+git fetch origin "$BASE_BRANCH"
+
+# Get migration file paths RELATIVE TO GIT ROOT
+MIGRATIONS_REL=$(realpath --relative-to="$(git rev-parse --show-toplevel)" "$MIGRATIONS_DIR")
+
+# List parent branch migrations (names only, no Designer/Snapshot)
+BASE_MIGS=$(git ls-tree -r --name-only "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL/" 2>/dev/null | grep "\.cs$" | grep -v "Designer\|Snapshot" | xargs -I{} basename {} .cs)
+
+# List local migrations (names only)
+LOCAL_MIGS=$(find "$MIGRATIONS_DIR" -maxdepth 1 -name "*.cs" ! -name "*Designer*" ! -name "*Snapshot*" | xargs -I{} basename {} .cs)
+
+# Calculate branch-specific migrations (in local but NOT in base)
+BRANCH_ONLY_MIGS=""
+for mig in $LOCAL_MIGS; do
+  if ! echo "$BASE_MIGS" | grep -qx "$mig"; then
+    BRANCH_ONLY_MIGS="$BRANCH_ONLY_MIGS $mig"
+  fi
+done
+BRANCH_ONLY_MIGS=$(echo "$BRANCH_ONLY_MIGS" | xargs)  # trim
+
+BRANCH_COUNT=$(echo "$BRANCH_ONLY_MIGS" | wc -w)
+BASE_COUNT=$(echo "$BASE_MIGS" | wc -w)
+
+echo ""
+echo "Parent ($BASE_BRANCH): $BASE_COUNT migration(s)"
+echo "Branch-specific: $BRANCH_COUNT migration(s)"
+for mig in $BRANCH_ONLY_MIGS; do echo "  - $mig"; done
+```
+
+### Step 4: Guard — nothing to squash
+
+```bash
+if [ "$BRANCH_COUNT" -eq 0 ]; then
+  echo "Nothing to squash — no branch-specific migrations found."
+  exit 0
+fi
+if [ "$BRANCH_COUNT" -eq 1 ]; then
+  echo "Only 1 branch-specific migration — squash not needed."
+  exit 0
+fi
+```
+
+### Step 5: Confirm (skip if `--force`)
+
+If `--force` flag is NOT set, display the plan and ask confirmation:
+
+```javascript
+AskUserQuestion({
+  question: "Squash will consolidate " + BRANCH_COUNT + " migrations into 1.\n\nMigrations to squash:\n" + BRANCH_ONLY_MIGS_LIST + "\n\nParent: " + BASE_BRANCH + " (" + BASE_COUNT + " migrations will be preserved)\n\nProceed?",
+  header: "EF Core Squash",
+  options: [
+    { label: "Yes, squash", description: "Backup + consolidate" },
+    { label: "Cancel", description: "Do nothing" }
+  ]
+})
+```
+
+### Step 6: Backup + Fetch + Delete + Create
+
+```bash
 # Backup
 BACKUP_DIR=".claude/gitflow/backup/migrations/squash_$(date +%Y%m%d_%H%M%S)"
-mkdir -p "$BACKUP_DIR" && cp Migrations/*.cs "$BACKUP_DIR/"
+mkdir -p "$BACKUP_DIR" && cp "$MIGRATIONS_DIR"/*.cs "$BACKUP_DIR/"
+echo "Backup: $BACKUP_DIR"
 
 # ═══════════════════════════════════════════════════════════════════════════
 # CRUCIAL: Retrieve SNAPSHOT + MIGRATIONS from parent branch
 # ═══════════════════════════════════════════════════════════════════════════
-git fetch origin "$BASE_BRANCH"
 
 # 1. Retrieve ModelSnapshot
-git checkout "origin/$BASE_BRANCH" -- Migrations/*ModelSnapshot.cs
+git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL"/*ModelSnapshot.cs
 echo "Snapshot retrieved from origin/$BASE_BRANCH"
 
 # 2. Retrieve ALL migrations from parent branch
-# MANDATORY: Without this, develop/main migrations will be lost!
 for base_mig in $BASE_MIGS; do
-  base_name=$(basename "${base_mig%.cs}")
-  git checkout "origin/$BASE_BRANCH" -- "Migrations/${base_name}.cs" 2>/dev/null || true
-  git checkout "origin/$BASE_BRANCH" -- "Migrations/${base_name}.Designer.cs" 2>/dev/null || true
-  echo "  $base_name retrieved"
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL/${base_mig}.cs" 2>/dev/null || true
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_REL/${base_mig}.Designer.cs" 2>/dev/null || true
 done
-echo "$(echo "$BASE_MIGS" | wc -l) migrations retrieved from origin/$BASE_BRANCH"
+echo "$BASE_COUNT migration(s) retrieved from origin/$BASE_BRANCH"
 
-# Delete branch-specific migrations only
-for mig in $BRANCH_ONLY_MIGRATIONS; do
-  rm -f "Migrations/${mig}"*
+# 3. Delete branch-specific migrations only
+for mig in $BRANCH_ONLY_MIGS; do
+  rm -f "$MIGRATIONS_DIR"/*"${mig}"*.cs
+  echo "  Deleted: $mig"
 done
 
-# Create consolidated migration - MCP MANDATORY
-# $DBCONTEXT_TYPE = "core" or "extensions" (from detect_efcore_project)
+# 4. Create consolidated migration - MCP MANDATORY
 mcp__smartstack__suggest_migration({ description: "...", context: DBCONTEXT_TYPE })
-# Result: core_v1.9.0_001_Description
-
-dotnet ef migrations add "$MIGRATION_NAME_FROM_MCP" --context "$DBCONTEXT"
+# Use the name returned by MCP in $MCP_MIGRATION_NAME:
+dotnet ef migrations add "$MCP_MIGRATION_NAME" \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$(find src -name "*.Api.csproj" | head -1)" \
+  -o Persistence/Migrations
 
-# NOTE: SQL objects (TVFs, views, SPs) are applied automatically at startup
-# via SqlObjectHelper.ApplyAllAsync() — no injection needed in migrations.
+# NOTE: SQL objects are applied automatically at startup — no injection needed.
 
-# Validate
-dotnet build && dotnet ef migrations script --idempotent > /dev/null
+# 5. Validate
+dotnet build && dotnet ef migrations script --idempotent --context "$DBCONTEXT" > /dev/null
 ```
 
 ## Safety Checks
@@ -130,7 +228,7 @@ SQUASH - {current_branch}
 
   Consolidated:
     Before: {M} migrations (branch-specific)
-    After:  1 migration ({MIGRATION_NAME} via MCP)
+    After:  1 migration ({MCP_MIGRATION_NAME} via MCP)
 
   Backup: .claude/gitflow/backup/migrations/squash_{timestamp}/
 

package/templates/agents/gitflow/cleanup.md

@@ -43,9 +43,9 @@ fi
 | Categorie | Condition | Action |
 |-----------|-----------|--------|
 | Permanent | main, develop | Protege - jamais supprime |
-| Actif | Branche existe + recent | Conserver |
-| Orphelin | Branche supprimee | Supprimer |
-| Stale | Inactif > 30 jours | Proposer suppression |
+| Actif | Branche existe + non mergee + recent | Conserver |
+| Orphelin | Repertoire manquant ou branche supprimee | Supprimer (worktree + local + remote + parent dir) |
+| Stale | Remote supprime OU branche mergee dans develop/main | Supprimer (worktree + local + remote + parent dir) |
 | Dirty | Modifications non commitees | Warning - confirmation requise |
 
 ## Commandes
@@ -64,9 +64,20 @@ git branch --list $BRANCH
 # Derniere activite
 git log -1 --format=%ci $BRANCH
 
-# Supprimer worktree
-git worktree remove "$WORKTREE_PATH" --force
-git worktree prune
+# Supprimer worktree (3 etapes obligatoires)
+git worktree remove "$WORKTREE_PATH" --force   # 1. Remove worktree
+git push origin --delete "$BRANCH" 2>/dev/null  # 2. Delete remote branch
+git branch -D "$BRANCH" 2>/dev/null             # 3. Delete local branch
+git worktree prune                              # 4. Prune stale refs
+```
+
+## Post-cleanup: empty parent directories
+
+```bash
+# Remove empty parent directories (features/, releases/, hotfixes/)
+for dir in "$FEATURES_DIR" "$RELEASES_DIR" "$HOTFIXES_DIR"; do
+  [ -d "$dir" ] && [ -z "$(ls -A "$dir" 2>/dev/null)" ] && rm -rf "$dir"
+done
 ```
 
 ## Output Format

package/templates/skills/dev-start/SKILL.md

@@ -3,7 +3,7 @@ name: dev-start
 description: Launch SmartStack dev environment (backend + frontend + admin credentials)
 argument-hint: "[--stop] [--reset] [--backend-only] [--frontend-only]"
 model: haiku
-allowed-tools: Read, Bash, Glob, Write
+allowed-tools: Read, Bash, Glob, Write, TaskOutput
 ---
 
 ## Arguments
@@ -106,9 +106,11 @@ If `--stop` argument → skip this step entirely (--stop uses netstat only).
 
 **Skip if CACHE_HIT=true (values loaded from cache in Step 0).**
 
-Find the API and Web directories:
-- API: `src/*.Api` (first match)
-- Web: `web/*-web` (first match)
+Find the API and Web directories using bash (Glob doesn't match directories):
+```bash
+API_DIR=$(ls -d src/*.Api 2>/dev/null | head -1)
+WEB_DIR=$(ls -d web/*-web 2>/dev/null | head -1)
+```
 
 If neither found, display error and exit.
 
@@ -129,6 +131,11 @@ Check if `appsettings.Local.json` exists in the API directory:
 - **Dev backend port**: Default `5142`
 - **Dev frontend port**: Default `6173`
 
+**IMPORTANT: Read config files in parallel.** Use a single message with multiple Read tool calls for:
+- `{API_DIR}/appsettings.json` (or `appsettings.Local.json`)
+- `{WEB_DIR}/.env.development` (or `.env.standalone`)
+- `{API_DIR}/Properties/launchSettings.json`
+
 ## Step 3: Validate config coherence
 
 **Skip if CACHE_HIT=true (values loaded from cache in Step 0).**
@@ -242,7 +249,7 @@ Config Coherence Check:
 3. Write `.claude/config/dev-run.json` using the Write tool with all detected values:
    ```json
    {
-     "version": 1,
+     "version": 2,
      "api_dir": "{API_DIR}",
      "web_dir": "{WEB_DIR}",
      "mode": "{MODE}",
@@ -250,6 +257,7 @@ Config Coherence Check:
      "web_port": {WEB_PORT},
      "backend_cmd": "{BACKEND_CMD}",
      "frontend_cmd": "{FRONTEND_CMD}",
+     "connection_string": "{CONN_STR}",
      "sql_server": "{SQL_SERVER}",
      "sql_database": "{SQL_DATABASE}",
      "sql_status": "{ok|unreachable|db_missing|skipped}",
@@ -277,7 +285,20 @@ If NOT already running and NOT `--frontend-only`:
 cd {API_DIR} && dotnet run {LAUNCH_ARGS}
 ```
 
-Use `Bash(run_in_background=true)` so it runs in background.
+Use `Bash(run_in_background=true)` so it runs in background. **Save the task ID** returned by the background command.
+
+### Fail-fast crash detection
+
+After launching, wait 5 seconds then check if the process crashed:
+```bash
+sleep 5
+```
+Then call `TaskOutput(task_id="{TASK_ID}", block=false)` to read the background output.
+
+**If the output contains a stack trace, "Unhandled exception", or the process has already exited:**
+1. Display the error output to the user
+2. Display: `[FAIL] Backend crashed on startup. Fix the error above and retry /dev-start`
+3. **STOP immediately. Do NOT attempt to diagnose, fix, rebuild, or retry.**
 
 ## Step 6: Launch frontend
 
@@ -294,25 +315,29 @@ Use `Bash(run_in_background=true)` so it runs in background.
 
 1. If `.claude/dev-session.json` exists and contains a password and `--reset` NOT specified -> reuse stored credentials
 2. If `--reset` OR no stored password:
-   a. If backend was just launched, wait for it to be UP first:
+   a. If backend was just launched, wait for it to be UP first.
+      Run the full wait in a **single bash command** to avoid multiple tool calls:
       ```bash
       # Phase 1: Wait for port to be bound (up to 30s)
+      echo "Waiting for backend port ${API_PORT}..."
       for i in $(seq 1 10); do
-        netstat.exe -ano | grep ":${API_PORT} .*LISTENING" && break
+        netstat.exe -ano | grep ":${API_PORT} .*LISTENING" > /dev/null 2>&1 && echo "Port bound." && break
         sleep 3
       done
-      ```
-      ```bash
-      # Phase 2: Wait for API to actually respond to HTTP requests (up to 30s)
-      # Kestrel binds the port BEFORE the app is fully initialized.
-      # We must confirm the API actually responds before resetting the password.
+      # Phase 2: Wait for API to respond (up to 30s) — accept 200 or 302
+      echo "Waiting for API to respond..."
       for i in $(seq 1 10); do
-        curl -s -o /dev/null -w "%{http_code}" "http://localhost:${API_PORT}/scalar" 2>/dev/null | grep -q "200" && break
+        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:${API_PORT}/scalar" 2>/dev/null)
+        [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ] && echo "API ready (HTTP $HTTP_CODE)." && break
         sleep 3
       done
       ```
-      If `/scalar` does not return 200 after 30s, warn the user and attempt the reset anyway.
-   b. Run: `smartstack admin reset --force --json`
+      If `/scalar` does not respond after 30s, warn the user and attempt the reset anyway.
+   b. Run admin reset using the connection string extracted from appsettings (Step 3):
+      ```bash
+      smartstack admin reset --connection "{CONN_STR}" --force --json
+      ```
+      **IMPORTANT:** Always pass `--connection` with the full connection string. Without it, the CLI shows an interactive environment picker that blocks execution.
    c. Parse JSON output to extract email and password
    d. Write `.claude/dev-session.json`:
       ```json
@@ -352,14 +377,18 @@ Use `Bash(run_in_background=true)` so it runs in background.
 
 <important_notes>
 
-1. **Backend must be READY before admin reset** - First poll the port (netstat), then poll the `/health` endpoint (HTTP 200) to confirm the API is fully initialized. Kestrel binds the port before the app finishes starting, so port-only checks are insufficient.
-2. **Cross-worktree support** - Detect the correct API directory regardless of which worktree we're in
-3. **No MCP required** - This skill only uses bash commands and the `smartstack` CLI
-4. **Config coherence is critical** - Mismatched ports between backend/frontend is the #1 cause of "it doesn't work" issues
-5. **Idempotent** - Running twice should detect already-running processes and reuse stored credentials
-6. **dev-session.json contains secrets** - Must be in `.gitignore`
-7. **Cache** - Config detection is cached in `.claude/config/dev-run.json`. Cache is invalidated when config files change (mtime-based hash). Use `--reset` to force re-detection.
-8. **SQL check is non-blocking** - A failed SQL check displays a warning but does not prevent launch. AutoMigrate may create the database on startup.
+1. **NEVER debug or fix code** - This skill ONLY starts processes. If the backend or frontend fails to start, display the error and STOP. Do NOT attempt to: clean/restore/rebuild, upgrade packages, inspect DLLs, clear NuGet cache, read .csproj files, or any other diagnostic/repair action. The user will fix the issue themselves.
+2. **Fail-fast on crash** - After launching backend in background, wait 5s then check TaskOutput. If the process already exited or shows errors, report and STOP immediately.
+3. **Backend must be READY before admin reset** - First poll the port (netstat), then poll the `/scalar` endpoint (HTTP 200/302) to confirm the API is fully initialized. Kestrel binds the port before the app finishes starting, so port-only checks are insufficient.
+4. **Admin reset requires --connection** - Always pass `--connection "{CONN_STR}"` to avoid the interactive environment picker.
+5. **Read config files in parallel** - When reading appsettings, .env, and launchSettings, use multiple Read calls in a single message.
+6. **Cross-worktree support** - Detect the correct API directory regardless of which worktree we're in.
+7. **No MCP required** - This skill only uses bash commands and the `smartstack` CLI.
+8. **Config coherence is critical** - Mismatched ports between backend/frontend is the #1 cause of "it doesn't work" issues.
+9. **Idempotent** - Running twice should detect already-running processes and reuse stored credentials.
+10. **dev-session.json contains secrets** - Must be in `.gitignore`.
+11. **Cache** - Config detection is cached in `.claude/config/dev-run.json`. Cache is invalidated when config files change (mtime-based hash). Use `--reset` to force re-detection.
+12. **SQL check is non-blocking** - A failed SQL check displays a warning but does not prevent launch. AutoMigrate may create the database on startup.
 
 </important_notes>
 

package/templates/skills/efcore/SKILL.md

@@ -24,6 +24,7 @@ Parse `$ARGUMENTS` to determine the command:
 | `migration` | **Agent** `efcore-migration` | sonnet |
 | `squash` | **Agent** `efcore-squash` | sonnet |
 | `rebase-snapshot` | **Agent** `efcore-rebase-snapshot` | sonnet |
+| (none) | **Inline** `<command-help>` | — |
 
 **Inline commands:** Execute directly following the matching `<command-*>` section below.
 **Agent commands:** Delegate via Agent tool:
@@ -31,11 +32,19 @@ Parse `$ARGUMENTS` to determine the command:
 Agent(
   subagent_type: "{agent_name}",
   model: "sonnet",
-  prompt: "Execute /efcore {command} in {cwd}. Branch: {branch}. Flags: {flags}. Description: {description}"
+  prompt: "Execute /efcore {command}.
+    Working directory: {cwd}
+    Branch: {branch}
+    Context: {--context value if provided, else 'auto-detect'}
+    Force: {true if --force flag, else false}
+    Description: {user description if provided}
+  "
 )
 ```
 
-**Flags:** `--context <name>` (CoreDbContext/ExtensionsDbContext), `--force` (skip confirmations)
+**Flags:**
+- `--context <name>` — Force DbContext (`CoreDbContext` or `ExtensionsDbContext`), skip auto-detection
+- `--force` — Skip all confirmations (backup still created)
 
 </routing>
 
@@ -91,6 +100,8 @@ Pattern: `{context}_v{version}_{sequence}_{Description}`
 
 **READ-ONLY: Never modify database or migrations.**
 
+> **Troubleshooting:** See `references/troubleshooting.md` for common errors.
+
 1. Call MCP `mcp__smartstack__check_migrations` with `branch: {current_branch}`
 2. If MCP unavailable, fallback: `dotnet ef migrations list --no-build --context {Context}` per context
 3. Display compact summary
@@ -117,11 +128,14 @@ BRANCH: {branch}
 
 **ONLY runs `dotnet ef database update`. Never creates/deletes migrations.**
 
-1. Verify `appsettings.Local.json` exists in the API project
-2. Apply Core: `dotnet ef database update --context CoreDbContext --verbose`
-3. Apply Extensions: `dotnet ef database update --context ExtensionsDbContext --verbose`
+> **Reference:** See `references/database-operations.md` for connection test and migration count utilities.
+
+1. Detect projects: `INFRA_PROJECT=$(find src -name "*Infrastructure.csproj" | head -1)` and `STARTUP_PROJECT=$(find src -name "*.Api.csproj" | head -1)`
+2. Verify `appsettings.Local.json` exists in the API project
+3. Apply Core: `dotnet ef database update --context CoreDbContext --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT" --verbose`
+4. Apply Extensions: `dotnet ef database update --context ExtensionsDbContext --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT" --verbose`
 
-If connection fails: suggest verifying SQL Server, appsettings.Local.json, or `/efcore db-reset`.
+If connection fails: suggest verifying SQL Server, appsettings.Local.json, or `/efcore db-reset`. See `references/troubleshooting.md`.
 
 ```
 DB DEPLOY
@@ -138,15 +152,18 @@ DB DEPLOY
 
 **ONLY operates on database. Never creates/deletes migration files.**
 
-1. **Confirm** (MANDATORY unless `--force`):
+> **Reference:** See `references/reset-operations.md` for drop/recreate commands.
+
+1. Detect projects: `INFRA_PROJECT=$(find src -name "*Infrastructure.csproj" | head -1)` and `STARTUP_PROJECT=$(find src -name "*.Api.csproj" | head -1)`
+2. **Confirm** (MANDATORY unless `--force`):
    ```
    AskUserQuestion({ question: "DELETE the database? All data will be lost.", options: ["Yes, delete", "No, cancel"] })
    ```
-2. **Backup** (optional): `sqlcmd -S "$SERVER" -E -Q "BACKUP DATABASE [$DB] TO DISK='$FILE' WITH FORMAT, INIT, COMPRESSION"`
-3. **Drop**: `dotnet ef database drop --force`
-4. **Recreate Core**: `dotnet ef database update --context CoreDbContext`
-5. **Recreate Extensions**: `dotnet ef database update --context ExtensionsDbContext`
-6. **Ask** if user wants `/efcore db-seed`
+3. **Backup** (optional): `sqlcmd -S "$SERVER" -E -Q "BACKUP DATABASE [$DB] TO DISK='$FILE' WITH FORMAT, INIT, COMPRESSION"`
+4. **Drop**: `dotnet ef database drop --force --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT"`
+5. **Recreate Core**: `dotnet ef database update --context CoreDbContext --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT"`
+6. **Recreate Extensions**: `dotnet ef database update --context ExtensionsDbContext --project "$INFRA_PROJECT" --startup-project "$STARTUP_PROJECT"`
+7. **Ask** if user wants `/efcore db-seed`
 
 Block if ASPNETCORE_ENVIRONMENT=Production.
 
@@ -167,6 +184,8 @@ Next: /efcore db-status, /efcore db-seed
 
 **Never drop or recreate database.**
 
+> **Reference:** See `references/seed-methods.md` for detection and execution details.
+
 1. **Detect** seeding method:
    - `HasData()` in EF configs → apply via `dotnet ef database update --context {Context}`
    - `IDataSeeder` / `--seed` CLI arg → `dotnet run --project {startup} -- --seed`
@@ -250,3 +269,27 @@ If conflict:
 ```
 
 </command-conflicts>
+
+<command-help>
+
+## (no command) — Show available commands
+
+Display the list of available `/efcore` commands:
+
+```
+EF CORE COMMANDS
+────────────────
+  db-status         Migration state check
+  db-deploy         Apply pending migrations
+  db-reset          Drop + recreate database
+  db-seed           Populate test data
+  scan              Cross-branch migration scanner
+  conflicts         Migration conflict analyzer
+  migration         Create/recreate migration
+  squash            Consolidate migrations
+  rebase-snapshot   Resync ModelSnapshot with parent
+
+Usage: /efcore <command> [--context <name>] [--force]
+```
+
+</command-help>

package/templates/skills/efcore/references/database-operations.md

@@ -7,8 +7,7 @@
 ```bash
 # Validate required variables from step-00-init
 for VAR_NAME in DBCONTEXT DBCONTEXT_TYPE INFRA_PROJECT STARTUP_PROJECT SELECTED_ENV; do
-  eval VAR_VALUE=\$$VAR_NAME
-  if [ -z "$VAR_VALUE" ]; then
+  if [ -z "${!VAR_NAME}" ]; then
     echo "ERROR: Required variable $VAR_NAME is not set"
     echo "Run step-00-init first"
     exit 1
@@ -38,7 +37,7 @@ fi
 ## Connection Test
 
 ```bash
-CONNECTION_TEST=$(dotnet ef database list \
+CONNECTION_TEST=$(dotnet ef migrations list \
   --context "$DBCONTEXT" \
   --project "$INFRA_PROJECT" \
   --startup-project "$STARTUP_PROJECT" 2>&1)

package/templates/skills/efcore/references/seed-methods.md

@@ -27,7 +27,7 @@ if grep -q "\-\-seed" ./src/*/Program.cs 2>/dev/null; then
 fi
 
 # WARNING: SQL scripts detected
-if [ -f "./scripts/seed.sql" ] || find . -name "seed*.sql" 2>/dev/null | grep -q .; then
+if [ -f "./scripts/seed.sql" ] || find src -name "seed*.sql" -not -path "*/bin/*" -not -path "*/obj/*" 2>/dev/null | grep -q .; then
   echo ""
   echo "WARNING: SQL seed scripts detected - FORBIDDEN by conventions"
   echo "Migrate to HasData() or IDataSeeder"

package/templates/skills/efcore/references/shared-init-functions.md

@@ -58,7 +58,7 @@ the .NET SDK may not be found even if `dotnet-ef` is. Use `$USERPROFILE` first o
 ```bash
 detect_efcore_project() {
   # Find project with EF Core reference
-  CSPROJ=$(find . -name "*.csproj" -exec grep -l "Microsoft.EntityFrameworkCore" {} \; | head -1)
+  CSPROJ=$(find src-name "*.csproj" -exec grep -l "Microsoft.EntityFrameworkCore" {} \; | head -1)
 
   if [ -z "$CSPROJ" ]; then
     echo "ERROR: No EF Core project found"
@@ -70,8 +70,8 @@ detect_efcore_project() {
   MIGRATIONS_DIR="$PROJECT_DIR/Persistence/Migrations"
 
   # Find startup and infrastructure projects
-  STARTUP_PROJECT=$(find . -name "*.Api.csproj" -o -name "*Web.csproj" | head -1)
-  INFRA_PROJECT=$(find . -name "*Infrastructure.csproj" | head -1)
+  STARTUP_PROJECT=$(find src-name "*.Api.csproj" -o -name "*Web.csproj" | head -1)
+  INFRA_PROJECT=$(find src-name "*Infrastructure.csproj" | head -1)
   [ -z "$INFRA_PROJECT" ] && INFRA_PROJECT="$CSPROJ"
 
   echo "Project: $PROJECT_NAME"
@@ -84,7 +84,7 @@ detect_efcore_project() {
 ```bash
 detect_dbcontext() {
   # Priority 1: SmartStack.Domain exists → SmartStack source project (Core only)
-  if find . -type d -name "SmartStack.Domain" | grep -q .; then
+  if find src-type d -name "SmartStack.Domain" | grep -q .; then
     DBCONTEXT="CoreDbContext"
     DBCONTEXT_TYPE="core"
     SCHEMA="core"
@@ -94,7 +94,7 @@ detect_dbcontext() {
   fi
 
   # Priority 2: Client project with SmartStack NuGet → BOTH contexts
-  if find . -name "*.csproj" -exec grep -ql "PackageReference.*SmartStack" {} \; 2>/dev/null; then
+  if find src-name "*.csproj" -exec grep -ql "PackageReference.*SmartStack" {} \; 2>/dev/null; then
     DBCONTEXT="CoreDbContext"
     DBCONTEXT_TYPE="both"
     SCHEMA="core"
@@ -105,8 +105,8 @@ detect_dbcontext() {
   fi
 
   # Priority 3: Scan for DbContext in code
-  CORE_CTX=$(find . -name "*.cs" -exec grep -l "CoreDbContext" {} \; 2>/dev/null | head -1)
-  EXT_CTX=$(find . -name "*.cs" -exec grep -l "ExtensionsDbContext" {} \; 2>/dev/null | head -1)
+  CORE_CTX=$(find src-name "*.cs" -exec grep -l "CoreDbContext" {} \; 2>/dev/null | head -1)
+  EXT_CTX=$(find src-name "*.cs" -exec grep -l "ExtensionsDbContext" {} \; 2>/dev/null | head -1)
 
   if [ -n "$CORE_CTX" ] && [ -n "$EXT_CTX" ]; then
     DBCONTEXT="CoreDbContext"
@@ -137,7 +137,7 @@ detect_dbcontext() {
 
 ```bash
 detect_environment() {
-  API_DIR=$(find . -type d -name "*.Api" | head -1)
+  API_DIR=$(find src-type d -name "*.Api" | head -1)
   [ -z "$API_DIR" ] && API_DIR="src/SmartStack.Api"
 
   # Priority: --env flag > appsettings.Local.json > error

package/templates/skills/efcore/references/zero-downtime-patterns.md

@@ -2,6 +2,8 @@
 Zero-downtime migration patterns for EF Core. Use when a migration contains destructive operations (column rename, type change, column drop) that could cause downtime during deployment.
 
 These patterns apply to production deployments where the application runs continuously. For development environments, standard migrations are sufficient.
+
+> **Exception to "no raw SQL" rule:** `migrationBuilder.Sql(...)` is authorized ONLY for data backfill operations within zero-downtime migration patterns (e.g., `UPDATE ... SET NewCol = OldCol`). Never use it for DDL (CREATE/ALTER/DROP) — those must go through EF Core Fluent API or `SqlObjects/`.
 </overview>
 
 <when_to_use>

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

@@ -60,9 +60,21 @@ while read -r line; do
     continue
   fi
 
+  # Skip permanent branches
+  [[ "$WT_BRANCH" == "$GF_MAIN_BRANCH" ]] || [[ "$WT_BRANCH" == "$GF_DEVELOP_BRANCH" ]] && {
+    VALID+=("$WT_PATH:$WT_BRANCH")
+    continue
+  }
+
   # 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" != "$GF_MAIN_BRANCH" ]] && [[ "$WT_BRANCH" != "$GF_DEVELOP_BRANCH" ]]; then
+
+  # Check if branch is merged into develop or main
+  MERGED_INTO_DEVELOP=$(git branch --merged "$GF_DEVELOP_BRANCH" | grep -c "$WT_BRANCH" 2>/dev/null || echo 0)
+  MERGED_INTO_MAIN=$(git branch --merged "$GF_MAIN_BRANCH" | grep -c "$WT_BRANCH" 2>/dev/null || echo 0)
+
+  # Stale if: no remote OR already merged
+  if [ "$REMOTE_EXISTS" -eq 0 ] || [ "$MERGED_INTO_DEVELOP" -gt 0 ] || [ "$MERGED_INTO_MAIN" -gt 0 ]; then
     STALE+=("$WT_PATH:$WT_BRANCH")
     continue
   fi
@@ -166,10 +178,14 @@ AskUserQuestion:
 # Remove orphaned
 for item in "${ORPHANED[@]}"; do
   WT_PATH=$(echo "$item" | cut -d':' -f1)
+  WT_BRANCH=$(echo "$item" | cut -d':' -f2)
   git worktree remove "$WT_PATH" --force 2>/dev/null || rm -rf "$WT_PATH"
+  # Delete remote branch if exists
+  git push origin --delete "$WT_BRANCH" 2>/dev/null
+  git branch -D "$WT_BRANCH" 2>/dev/null
 done
 
-# Prune
+# Prune stale worktree references
 git worktree prune
 
 # Remove stale
@@ -178,15 +194,29 @@ for item in "${STALE[@]}"; do
   WT_BRANCH=$(echo "$item" | cut -d':' -f2)
 
   git worktree remove "$WT_PATH" --force 2>/dev/null || rm -rf "$WT_PATH"
+  # Delete remote branch if exists
+  git push origin --delete "$WT_BRANCH" 2>/dev/null
   git branch -D "$WT_BRANCH" 2>/dev/null
 done
+
+# Final prune after all removals
+git worktree prune
 ```
 
 **Branches:**
 ```bash
-# Delete merged branches
+# Delete merged branches (local + remote)
 for branch in "${MERGED_BRANCHES[@]}"; do
   git branch -d "$branch"
+  git push origin --delete "$branch" 2>/dev/null
+done
+```
+
+**Empty parent directories:**
+```bash
+# Clean up empty worktree parent directories
+for dir in "$GF_FEATURES_DIR" "$GF_RELEASES_DIR" "$GF_HOTFIXES_DIR"; do
+  [ -d "$dir" ] && [ -z "$(ls -A "$dir" 2>/dev/null)" ] && rm -rf "$dir"
 done
 ```