@atlashub/smartstack-cli 3.36.0 → 3.38.0

package/templates/skills/gitflow/references/start-worktree-creation.md

@@ -0,0 +1,50 @@
+# Worktree Creation and Validation
+
+## Determine Worktree Path
+
+**Read worktree mode from config (already loaded by read_gitflow_config):**
+```bash
+WORKTREE_MODE="$GF_WORKTREE_MODE"
+```
+
+## Worktree Path Selection (Organized Mode)
+
+> **FORBIDDEN — Numbered directories:**
+> NEVER create directories like `03-Release`, `04-Feature`, `05-Hotfix`.
+> Only `01-Main` and `02-Develop` use numbers (they are permanent, created at init).
+> All other worktrees MUST use the paths from `config.json → worktrees.structure`:
+> - `$GF_FEATURES_PATH/{name}` (e.g., `features/my-feature`, NOT `04-Feature`)
+> - `$GF_RELEASES_PATH/v{version}` (e.g., `releases/v2.15.0`, NOT `03-Release`)
+> - `$GF_HOTFIXES_PATH/{name}` (e.g., `hotfixes/fix-bug`, NOT `05-Hotfix`)
+
+```bash
+case "$branch_type" in
+  feature) WORKTREE_PATH="$GF_FEATURES_PATH/$BRANCH_NAME" ;;
+  release) WORKTREE_PATH="$GF_RELEASES_PATH/v$VERSION" ;;
+  hotfix)  WORKTREE_PATH="$GF_HOTFIXES_PATH/$BRANCH_NAME" ;;
+esac
+
+mkdir -p "$(dirname "$WORKTREE_PATH")"
+git worktree add -b "$FULL_BRANCH" "$WORKTREE_PATH" "origin/$BASE_BRANCH"
+
+# Fix cross-platform paths in worktree metadata (if created from different platform)
+repair_worktree_paths "$(git rev-parse --git-common-dir)"
+
+# POST-CREATION VALIDATION (BLOCKING)
+# Detect if worktree was accidentally created with a numbered prefix
+CREATED_PATH=$(git worktree list | grep "$FULL_BRANCH" | awk '{print $1}')
+validate_worktree_path "$CREATED_PATH" || {
+  echo "BLOCKING: Recreating worktree at correct path..."
+  git worktree remove "$CREATED_PATH" --force
+  git branch -D "$FULL_BRANCH" 2>/dev/null
+  git worktree add -b "$FULL_BRANCH" "$WORKTREE_PATH" "origin/$BASE_BRANCH"
+  repair_worktree_paths "$(git rev-parse --git-common-dir)"
+}
+```
+
+## No-Worktree Mode
+
+```bash
+git checkout "$BASE_BRANCH" && git pull origin "$BASE_BRANCH"
+git checkout -b "$FULL_BRANCH"
+```

package/templates/skills/gitflow/references/sync-push-verify.md

@@ -0,0 +1,44 @@
+# Push and Force Push with Verification
+
+## Push Local Commits
+
+```bash
+[ "$AHEAD" -gt 0 ] && {
+  echo "Pushing $AHEAD commit(s) to origin/$CURRENT..."
+  git push origin $CURRENT
+
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/$CURRENT)
+  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+    echo "✅ Push verified - local/remote in sync"
+  else
+    echo "⚠️ Push verification FAILED - refs may be stale"
+    echo "  Local:  $LOCAL_SHA"
+    echo "  Remote: $REMOTE_SHA"
+  fi
+}
+```
+
+## Force Push After Rebase
+
+```bash
+# After successful rebase
+if [ "$REBASED" = true ]; then
+  echo "Rebase complete. Force pushing..."
+  git push --force-with-lease origin $CURRENT
+
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/$CURRENT)
+  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+    echo "✅ Force push verified - local/remote in sync"
+  else
+    echo "⚠️ Force push verification FAILED"
+    echo "  Local:  $LOCAL_SHA"
+    echo "  Remote: $REMOTE_SHA"
+  fi
+fi
+```

package/templates/skills/gitflow/references/sync-rebase-conflicts.md

@@ -0,0 +1,38 @@
+# Rebase Conflict Handling
+
+## Handle Rebase Conflicts
+
+```bash
+# If rebase has conflicts
+if [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
+  echo "⚠️ REBASE CONFLICT DETECTED"
+
+  CONFLICTS=$(git diff --name-only --diff-filter=U)
+  echo "Conflicting files:"
+  echo "$CONFLICTS"
+
+  # Check for migration conflicts
+  MIGRATION_CONFLICTS=$(echo "$CONFLICTS" | grep "Migrations/")
+  [ -n "$MIGRATION_CONFLICTS" ] && {
+    echo "⚠️ Migration conflicts detected!"
+    echo "Recommend: /efcore:rebase-snapshot"
+  }
+
+  # Options
+  AskUserQuestion:
+    header: "Conflict"
+    question: "How to handle conflicts?"
+    options:
+      - label: "Resolve manually"
+        description: "I'll fix conflicts and continue"
+      - label: "Abort rebase"
+        description: "Cancel and return to previous state"
+      - label: "Accept theirs (migrations)"
+        description: "Use base branch migrations, regenerate ours"
+fi
+```
+
+**User actions:**
+- **Resolve manually**: Fix conflicts in editor, then `git rebase --continue`
+- **Abort rebase**: `git rebase --abort`
+- **Accept theirs**: `git checkout --theirs -- {files}`, then `git rebase --continue`

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

@@ -88,53 +88,13 @@ UNTRACKED=$(git ls-files --others --exclude-standard)
 }
 ```
 
-### 2. Detect EF Core Migrations
+### 2. Detect and Validate EF Core Migrations
 
-```bash
-# Find migration files in changes
-MIGRATIONS=$(echo "$STAGED $MODIFIED $UNTRACKED" | tr ' ' '\n' | grep -E "Migrations/.*\.cs$")
-HAS_MIGRATIONS=$([ -n "$MIGRATIONS" ] && echo "true" || echo "false")
-
-if [ "$HAS_MIGRATIONS" = "true" ]; then
-  # Check for the 3 required files
-  MIGRATION_NAME=$(echo "$MIGRATIONS" | grep -v "Designer\|Snapshot" | head -1 | sed 's/.*\///' | sed 's/\.cs$//')
-
-  HAS_MAIN=$(echo "$MIGRATIONS" | grep -c "${MIGRATION_NAME}.cs")
-  HAS_DESIGNER=$(echo "$MIGRATIONS" | grep -c "${MIGRATION_NAME}.Designer.cs")
-  HAS_SNAPSHOT=$(echo "$MIGRATIONS" | grep -c "ModelSnapshot.cs")
-
-  [ "$HAS_MAIN" -eq 0 ] || [ "$HAS_DESIGNER" -eq 0 ] || [ "$HAS_SNAPSHOT" -eq 0 ] && {
-    echo "❌ INCOMPLETE MIGRATION"
-    echo "Required: Migration.cs + Designer.cs + ModelSnapshot.cs"
-    echo "Found: Main=$HAS_MAIN, Designer=$HAS_DESIGNER, Snapshot=$HAS_SNAPSHOT"
-    STOP
-  }
-fi
-```
-
-### 3. Check Destructive Operations (BLOCKING)
-
-```bash
-if [ "$HAS_MIGRATIONS" = "true" ]; then
-  DESTRUCTIVE=$(grep -l "DropTable\|DropColumn\|DeleteData" $MIGRATIONS 2>/dev/null)
-
-  [ -n "$DESTRUCTIVE" ] && {
-    echo "⚠️ DESTRUCTIVE OPERATIONS DETECTED"
-    grep -n "DropTable\|DropColumn\|DeleteData" $DESTRUCTIVE
-
-    # Require explicit confirmation
-    AskUserQuestion:
-      header: "Confirm"
-      question: "Destructive migration detected. Continue?"
-      options:
-        - label: "Yes, I understand the risks"
-        - label: "No, let me review"
-
-    # Log to audit trail
-    echo "$(date) - DESTRUCTIVE: $DESTRUCTIVE - User: $USER" >> .claude/gitflow/logs/audit.log
-  }
-fi
-```
+See [references/commit-migration-validation.md](../references/commit-migration-validation.md) for:
+- Migration file detection (3-file requirement)
+- Destructive operation detection (DropTable, DropColumn, DeleteData)
+- User confirmation for destructive changes
+- Audit trail logging
 
 ### 4. Stage All Changes
 
@@ -147,52 +107,13 @@ echo "Files to commit:"
 git diff --cached --stat
 ```
 
-### 5. Generate Commit Message
-
-**If no message provided:**
+### 5-6. Generate and Create Commit
 
-```bash
-# Determine commit type from branch
-BRANCH_TYPE=$(echo $CURRENT | cut -d'/' -f1)
-case "$BRANCH_TYPE" in
-  feature) PREFIX="feat" ;;
-  hotfix)  PREFIX="fix" ;;
-  release) PREFIX="chore" ;;
-  *)       PREFIX="chore" ;;
-esac
-
-# Determine scope from branch name
-SCOPE=$(echo $CURRENT | cut -d'/' -f2 | cut -d'-' -f1)
-
-# If migrations present
-[ "$HAS_MIGRATIONS" = "true" ] && PREFIX="db(migrations)"
-
-# Generate message from diff analysis
-SUMMARY=$(git diff --cached --stat | tail -1 | sed 's/^ *//')
-```
-
-**Message format:**
-```
-{type}({scope}): {summary - 50 chars max}
-
-**CHANGE**
-PROBLEM: {what was wrong}
-SOLUTION: {what was done}
-IMPACT: {benefit}
-
-Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
-```
-
-### 6. Create Commit
-
-```bash
-git commit -m "$(cat <<'EOF'
-{generated_message}
-EOF
-)"
-
-COMMIT_HASH=$(git rev-parse --short HEAD)
-```
+See [references/commit-message-generation.md](../references/commit-message-generation.md) for:
+- Commit type determination (feat/fix/chore/db)
+- Scope extraction from branch name
+- Message format with CHANGE block
+- Stage all and commit
 
 ### 7. Push to Remote (ALWAYS ASK USER)
 

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

@@ -73,171 +73,27 @@ esac
 }
 ```
 
-### 3. Create Tag (Release/Hotfix only)
+### 3-4. Create Tag and Merge Back to Develop
 
-```bash
-if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
-  # Get version from config (already loaded)
-  VERSION="$GF_VERSION"
-
-  # For hotfix, increment patch
-  if [ "$BRANCH_TYPE" = "hotfix" ]; then
-    MAJOR=$(echo $VERSION | cut -d'.' -f1)
-    MINOR=$(echo $VERSION | cut -d'.' -f2)
-    PATCH=$(echo $VERSION | cut -d'.' -f3)
-    VERSION="$MAJOR.$MINOR.$((PATCH + 1))"
-  fi
-
-  TAG_NAME="v$VERSION"
-
-  # Check if tag exists
-  TAG_EXISTS=$(git tag -l "$TAG_NAME")
-  [ -n "$TAG_EXISTS" ] && {
-    echo "⚠️ Tag $TAG_NAME already exists"
-    # Options: overwrite, different version, skip
-  }
-
-  # Create tag on main
-  git checkout $GF_MAIN_BRANCH
-  git pull origin $GF_MAIN_BRANCH
-  git tag -a "$TAG_NAME" -m "$BRANCH_TYPE: $BRANCH_NAME"
-  git push origin "$TAG_NAME"
-
-  echo "✅ Created tag: $TAG_NAME"
-fi
-```
-
-### 4. Merge Back to Develop (Release/Hotfix only)
-
-```bash
-if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
-  echo "Merging $TAG_NAME back to $GF_DEVELOP_BRANCH..."
-
-  git checkout $GF_DEVELOP_BRANCH
-  git pull origin $GF_DEVELOP_BRANCH
-
-  # Merge with merge commit (preserve history)
-  git merge $GF_MAIN_BRANCH -m "Merge $TAG_NAME back to $GF_DEVELOP_BRANCH"
-
-  # Handle conflicts
-  CONFLICTS=$(git diff --name-only --diff-filter=U | wc -l)
-  [ "$CONFLICTS" -gt 0 ] && {
-    echo "⚠️ Merge conflicts detected"
-    git diff --name-only --diff-filter=U
-
-    # Options: resolve, abort
-  }
-
-  git push origin $GF_DEVELOP_BRANCH
-
-  # CRITICAL: Verify push and update tracking refs
-  git fetch origin $GF_DEVELOP_BRANCH:refs/remotes/origin/$GF_DEVELOP_BRANCH --force --quiet
-  LOCAL_SHA=$(git rev-parse HEAD)
-  REMOTE_SHA=$(git rev-parse origin/$GF_DEVELOP_BRANCH)
-  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
-    echo "✅ Push verified - local/remote in sync"
-  else
-    echo "⚠️ Push verification FAILED"
-    echo "  Local:  $LOCAL_SHA"
-    echo "  Remote: $REMOTE_SHA"
-    echo "  → Try: git push origin $GF_DEVELOP_BRANCH --force-with-lease"
-  fi
-
-  echo "✅ Merged back to $GF_DEVELOP_BRANCH"
-fi
-```
+**For release/hotfix only:**
+- Create annotated tag on main branch (format: v{VERSION})
+- Merge main back to develop with merge commit
+- Handle merge conflicts
+- Push and verify sync
 
 ### 5. Update Version (Release and Hotfix)
 
-```bash
-if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
-  MAJOR=$(echo $VERSION | cut -d'.' -f1)
-  MINOR=$(echo $VERSION | cut -d'.' -f2)
-  PATCH=$(echo $VERSION | cut -d'.' -f3)
-
-  if [ "$BRANCH_TYPE" = "release" ]; then
-    # Release: increment minor, reset patch
-    NEXT_VERSION="$MAJOR.$((MINOR + 1)).0"
-  else
-    # Hotfix: increment patch (patch was already bumped for the tag, bump again for next dev)
-    NEXT_VERSION="$MAJOR.$MINOR.$((PATCH + 2))"
-  fi
-
-  # Update config (using resolved config path)
-  sed -i "s/\"current\": \".*\"/\"current\": \"$NEXT_VERSION\"/" "$GF_CONFIG_FILE"
+See [references/finish-version-bumping.md](../references/finish-version-bumping.md) for:
+- Version increment logic (release: minor+1.0, hotfix: patch+2)
+- Config and source file updates
+- Push verification
 
-  # Update source files
-  # csproj, package.json, etc.
+### 6-8. Clean Up Worktree, Delete Branches, Archive Plan
 
-  git add -A
-  git commit -m "chore: bump version to $NEXT_VERSION for development"
-  git push origin $GF_DEVELOP_BRANCH
-
-  # CRITICAL: Verify push and update tracking refs
-  git fetch origin $GF_DEVELOP_BRANCH:refs/remotes/origin/$GF_DEVELOP_BRANCH --force --quiet
-  LOCAL_SHA=$(git rev-parse HEAD)
-  REMOTE_SHA=$(git rev-parse origin/$GF_DEVELOP_BRANCH)
-  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
-    echo "✅ Push verified - local/remote in sync"
-  else
-    echo "⚠️ Push verification FAILED"
-    echo "  Local:  $LOCAL_SHA"
-    echo "  Remote: $REMOTE_SHA"
-  fi
-
-  echo "✅ Version bumped to $NEXT_VERSION"
-fi
-```
-
-### 6. Clean Up Worktree
-
-```bash
-# Find worktree for this branch (use --porcelain for reliable parsing)
-WORKTREE_PATH=$(git worktree list --porcelain | grep -B2 "branch refs/heads/$BRANCH" | grep "^worktree " | sed 's/^worktree //')
-
-if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
-  echo "Removing worktree: $WORKTREE_PATH"
-
-  # Make sure we're not in the worktree directory
-  cd "$GF_DEVELOP_PATH" 2>/dev/null || cd "$(git rev-parse --show-toplevel)"
-
-  git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || {
-    rm -rf "$WORKTREE_PATH"
-  }
-
-  git worktree prune
-  echo "✅ Worktree removed"
-fi
-```
-
-### 7. Delete Remote Branch
-
-```bash
-# Check if remote branch still exists
-REMOTE_EXISTS=$(git branch -r --list "origin/$BRANCH")
-
-if [ -n "$REMOTE_EXISTS" ]; then
-  echo "Deleting remote branch: $BRANCH"
-  git push origin --delete "$BRANCH" 2>/dev/null || {
-    echo "⚠️ Could not delete remote branch (may already be deleted by PR)"
-  }
-fi
-
-# Delete local branch
-git branch -D "$BRANCH" 2>/dev/null || echo "Local branch already deleted"
-```
-
-### 8. Archive Plan (if exists)
-
-```bash
-PLAN_FILE=$(ls .claude/gitflow/plans/*${BRANCH_NAME}*.md 2>/dev/null | head -1)
-
-if [ -f "$PLAN_FILE" ]; then
-  ARCHIVE_NAME="${PLAN_FILE%.md}_DONE_$(date +%Y%m%d-%H%M%S).md"
-  mv "$PLAN_FILE" "$ARCHIVE_NAME"
-  echo "✅ Plan archived: $ARCHIVE_NAME"
-fi
-```
+See [references/finish-cleanup.md](../references/finish-cleanup.md) for:
+- Worktree removal with fallback
+- Remote and local branch deletion
+- Plan file archival
 
 ### 9. Summary