start-vibing 2.0.10 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "start-vibing",
-	"version": "2.0.10",
+	"version": "2.0.11",
 	"description": "Setup Claude Code agents, skills, and hooks in your project. Smart copy that preserves your custom domains and configurations.",
 	"type": "module",
 	"bin": {

package/template/.claude/hooks/stop-validator.ts

@@ -4,7 +4,7 @@
  *
  * THIS HOOK BLOCKS TASK COMPLETION IF ANY OF THESE CONDITIONS FAIL:
  *
- * 1. BRANCH CHECK: Must be on 'main' branch (PR must be merged)
+ * 1. BRANCH CHECK: Must be on 'main' branch (work must be merged)
  * 2. GIT TREE CHECK: Working tree must be clean (no uncommitted changes)
  * 3. CLAUDE.MD CHECK: Must be updated with session changes
  * 4. CLAUDE.MD STRUCTURE: Must have required sections
@@ -227,51 +227,50 @@ REQUIRED STEPS (execute in order):
 2. COMMIT with conventional message:
    git commit -m "feat: description of changes"
 
-3. PUSH to remote:
-   git push -u origin ${currentBranch}
+3. SWITCH to main:
+   git checkout main
 
-4. CREATE Pull Request:
-   gh pr create --title "Title" --body "$(cat <<'EOF'
-## Summary
-- What was changed
+4. MERGE branch:
+   git merge ${currentBranch}
 
-## Test plan
-- How to verify
+5. SYNC with remote (if exists):
+   git pull origin main --rebase || true
+   git push origin main || true
 
-Generated with Claude Code
-EOF
-)"
-
-5. MERGE the PR (auto-delete branch):
-   gh pr merge --merge --delete-branch
-
-6. SWITCH to main and pull:
-   git checkout main && git pull
+6. DELETE branch (cleanup):
+   git branch -d ${currentBranch}
 
 THEN the task can complete. The stop hook will verify main branch + clean tree.
 ================================================================================`,
 		};
 	}
 
-	// Case 2: On feature branch with clean tree - just need to switch
+	// Case 2: On feature branch with clean tree - just need to merge
 	if (!isMainBranch && modifiedFiles.length === 0) {
 		return {
 			type: 'NOT_ON_MAIN_BRANCH',
 			message: `Currently on branch '${currentBranch}'. Task completion requires being on 'main'.`,
 			action: `
 ================================================================================
-SWITCH TO MAIN BRANCH
+MERGE TO MAIN BRANCH
 ================================================================================
 
 The working tree is clean but you're on branch '${currentBranch}'.
 
-If your PR was merged:
-   git checkout main && git pull
+REQUIRED STEPS:
+
+1. SWITCH to main:
+   git checkout main
+
+2. MERGE branch:
+   git merge ${currentBranch}
+
+3. SYNC with remote (if exists):
+   git pull origin main --rebase || true
+   git push origin main || true
 
-If you still need to create/merge PR:
-   gh pr create (if not created)
-   gh pr merge --merge --delete-branch (to merge)
-   git checkout main && git pull
+4. DELETE branch (cleanup):
+   git branch -d ${currentBranch}
 
 IMPORTANT: Task completion is BLOCKED until you are on 'main' with a clean tree.
 ================================================================================`,
@@ -305,7 +304,7 @@ REQUIRED STEPS:
 
 2. CONTINUE your work on the new branch
 
-3. When done, create PR to merge back to main
+3. When done, merge back to main
 
 NEVER commit directly to main. The stop hook will BLOCK this.
 ================================================================================`,