start-vibing 2.0.30 → 2.0.32

package/dist/cli.js

@@ -132,6 +132,7 @@ async function copyClaudeSetup(targetDir, options = {}) {
 import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
 import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
+import { execSync as execSync3 } from "child_process";
 
 // src/update.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
@@ -738,6 +739,35 @@ function getVersion() {
   }
 }
 var VERSION = getVersion();
+function autoCommitClaudeFiles(targetDir) {
+  try {
+    try {
+      execSync3("git rev-parse --git-dir", { cwd: targetDir, stdio: "pipe" });
+    } catch {
+      return { success: false, message: "Not a git repository" };
+    }
+    const status = execSync3("git status --porcelain .claude CLAUDE.md .claude/", {
+      cwd: targetDir,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    if (!status) {
+      return { success: true, message: "No changes to commit" };
+    }
+    execSync3("git add .claude/ CLAUDE.md", {
+      cwd: targetDir,
+      stdio: "pipe"
+    });
+    execSync3(`git commit --no-verify -m "chore: update Claude Code agents and skills (start-vibing v${VERSION})"`, {
+      cwd: targetDir,
+      stdio: "pipe"
+    });
+    return { success: true, message: "Changes committed" };
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
+    return { success: false, message: errorMessage };
+  }
+}
 var BANNER = `
   _____ _             _    __     __ _  _      _
  / ____| |           | |   \\ \\   / /(_)| |    (_)
@@ -846,6 +876,21 @@ async function main() {
     if (result.preserved > 0) {
       console.log(`\n  Preserved ${result.preserved} custom file(s) (domains, etc.)`);
     }
+    console.log("\n  Auto-committing Claude files...");
+    const commitResult = autoCommitClaudeFiles(targetDir);
+    if (commitResult.success) {
+      if (commitResult.message === "No changes to commit") {
+        console.log("  No new changes to commit.");
+      } else {
+        console.log("  Claude files committed (--no-verify used to bypass hooks).");
+      }
+    } else {
+      if (commitResult.message === "Not a git repository") {
+        console.log("  Skipped auto-commit (not a git repository).");
+      } else {
+        console.log("  Auto-commit skipped (non-critical).");
+      }
+    }
     const hooksResult = ensureHooksEnabled();
     if (hooksResult.modified) {
       console.log("\n  Fixed global settings: removed disableAllHooks (hooks now enabled)");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "start-vibing",
-	"version": "2.0.30",
+	"version": "2.0.32",
 	"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/agents/08-git/commit-manager.md

@@ -1,6 +1,6 @@
 ---
 name: commit-manager
-description: "AUTOMATICALLY invoke as FINAL AGENT when implementation is complete. Triggers: 'commit', 'push', 'finalize', implementation done. Creates conventional commits, updates tracking. PROACTIVELY runs AFTER domain-updater."
+description: "AUTOMATICALLY invoke as FINAL AGENT when implementation is complete. Triggers: 'commit', 'push', 'finalize', implementation done. Creates conventional commits, merges to main. PROACTIVELY runs AFTER domain-updater."
 model: haiku
 tools: Read, Write, Edit, Bash, Grep, Glob
 skills: docs-tracker, codebase-knowledge, git-workflow
@@ -8,7 +8,7 @@ skills: docs-tracker, codebase-knowledge, git-workflow
 
 # Commit Manager Agent
 
-You manage commits and are the FINAL agent in the workflow.
+You manage commits, merges, and are the FINAL agent in the workflow.
 
 ## Workflow Order
 
@@ -23,14 +23,14 @@ final-validator -> domain-updater -> commit-manager
 - [ ] Tests passing?
 - [ ] Documentation updated?
 
-## Commit Flow
+## Complete Git Flow (NO PRs)
 
 ```bash
 # 1. Check status
 git status && git diff --name-status
 
 # 2. Stage files
-git add [files]
+git add -A
 
 # 3. Create commit
 git commit -m "$(cat <<'EOF'
@@ -42,6 +42,19 @@ Generated with Claude Code
 Co-Authored-By: Claude <noreply@anthropic.com>
 EOF
 )"
+
+# 4. Switch to main
+git checkout main
+
+# 5. Merge branch
+git merge [branch-name]
+
+# 6. Sync with remote
+git pull origin main --rebase || true
+git push origin main
+
+# 7. Delete feature branch (cleanup)
+git branch -d [branch-name]
 ```
 
 ## Conventional Commits
@@ -61,3 +74,5 @@ EOF
 2. **ALWAYS conventional commits** - Consistent format
 3. **NEVER force push main** - Ask first
 4. **NEVER skip hooks** - Unless requested
+5. **ALWAYS merge to main** - NO Pull Requests, direct merge
+6. **ALWAYS end on main** - Checkout main after merge

package/template/.claude/hooks/user-prompt-submit.ts

@@ -5,7 +5,7 @@
  * This hook runs BEFORE Claude processes any user prompt and ENFORCES:
  * 1. MANDATORY detailed todo list creation from prompt
  * 2. MANDATORY research agent for new features
- * 3. STRICT workflow: audit -> branch -> implement -> document -> quality -> PR
+ * 3. STRICT workflow: audit -> branch -> implement -> document -> quality -> merge to main
  * 4. Separate UI for mobile/tablet/desktop (NOT just responsive)
  *
  * AGENT SYSTEM: 82 specialized agents in 14 categories
@@ -48,7 +48,7 @@ const STRICT_WORKFLOW = `
 ╚═════════════════════════════════════════════════════════════════╝
 
 ⚠️  STOP HOOK BLOCKS task completion if:
-    - NOT on main branch (PR must be merged first)
+    - NOT on main branch (work must be merged to main first)
     - Git tree NOT clean (all changes must be committed)
     - CLAUDE.md NOT updated (must reflect session changes)
     - CLAUDE.md missing required sections (Last Change, Stack, etc.)
@@ -380,15 +380,10 @@ const AGENT_CATEGORIES: Record<string, CategoryInfo> = {
 				skills: ['git-workflow'],
 			},
 			'commit-manager': {
-				triggers: ['commit', 'push', 'finalize'],
-				when: 'FINAL AGENT when implementation is complete',
+				triggers: ['commit', 'push', 'finalize', 'merge'],
+				when: 'FINAL AGENT when implementation is complete - commits and merges to main',
 				skills: ['git-workflow', 'docs-tracker', 'codebase-knowledge'],
 			},
-			'pr-creator': {
-				triggers: ['pr', 'pull request', 'merge'],
-				when: 'AFTER commit-manager when feature is ready',
-				skills: ['git-workflow'],
-			},
 		},
 	},
 	'09-quality': {
@@ -400,7 +395,7 @@ const AGENT_CATEGORIES: Record<string, CategoryInfo> = {
 				skills: ['quality-gate', 'codebase-knowledge'],
 			},
 			'code-reviewer': {
-				triggers: ['review', 'pr review', 'code quality'],
+				triggers: ['review', 'code review', 'code quality'],
 				when: 'AFTER significant code is written',
 				skills: ['quality-gate', 'codebase-knowledge'],
 			},
@@ -571,7 +566,7 @@ const SKILLS: Record<string, string> = {
 	'docker-patterns': 'Containerization, multi-stage builds, Docker Compose, security',
 	'docs-tracker': 'Documentation maintenance, git diff detection, changelog',
 	'final-check': 'Final validation, tests pass, docs updated, security audited',
-	'git-workflow': 'Branch management, conventional commits, PR creation, hooks',
+	'git-workflow': 'Branch management, conventional commits, merge to main, hooks',
 	'mongoose-patterns': 'MongoDB schema design, queries, indexes, aggregations',
 	'nextjs-app-router': 'Next.js 15 App Router, Server/Client components, data fetching',
 	'performance-patterns': 'React optimization, bundle analysis, memory leaks, API latency',

package/template/.claude/skills/git-workflow/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: git-workflow
-description: Git workflow patterns and best practices. Branch management, conventional commits, PR creation, hooks. Use when working with git operations.
+description: Git workflow patterns and best practices. Branch management, conventional commits, direct merge to main, hooks. Use when working with git operations.
 allowed-tools: Bash, Read, Grep, Glob
 ---
 
@@ -12,9 +12,9 @@ Expert guidance for Git:
 
 - **Branch Management** - Feature, fix, release branches
 - **Conventional Commits** - Standardized commit messages
-- **Pull Requests** - Well-formatted PRs with gh CLI
+- **Direct Merge to Main** - NO Pull Requests, merge directly
 - **Git Hooks** - Automated quality gates
-- **Merge Strategies** - Rebase, squash, merge
+- **Merge Strategies** - Local merge, no remote PRs
 
 ---
 
@@ -176,84 +176,53 @@ git config commit.template .gitmessage
 
 ---
 
-## Pull Request Creation
+## Direct Merge to Main (NO Pull Requests)
 
-### Using GitHub CLI
+### Complete Workflow
 
-```bash
-# Create PR with title and body
-gh pr create --title "feat(auth): add OAuth2 Google login" --body "$(cat <<'EOF'
-## Summary
-- Implements Google OAuth2 authentication
-- Adds login button to auth page
-- Stores OAuth tokens securely
-
-## Changes
-- `src/auth/oauth.ts` - OAuth client implementation
-- `src/pages/login.tsx` - UI integration
-- `src/types/auth.ts` - New auth types
-
-## Test Plan
-- [ ] Login with Google account
-- [ ] Verify session persists
-- [ ] Test logout flow
-- [ ] Check token refresh
-
-## Screenshots
-[If applicable]
-EOF
-)"
-
-# Create draft PR
-gh pr create --draft --title "WIP: feature name"
-
-# Create PR with specific base branch
-gh pr create --base develop --title "feat: ..."
-
-# Create PR and assign reviewers
-gh pr create --title "feat: ..." --reviewer user1,user2
-
-# Create PR with labels
-gh pr create --title "feat: ..." --label "enhancement,priority:high"
-```
-
-### PR Template
-
-```markdown
-## Summary
-
-[Brief description of changes]
+This project uses **direct merge to main** instead of Pull Requests.
 
-## Type of Change
+```bash
+# 1. Create feature branch
+git checkout main
+git pull origin main
+git checkout -b feature/my-feature
 
-- [ ] Feature (new functionality)
-- [ ] Bug fix (fixes an issue)
-- [ ] Refactor (code change, no feature/fix)
-- [ ] Documentation
-- [ ] Tests
+# 2. Work on feature, commit changes
+git add -A
+git commit -m "$(cat <<'EOF'
+feat(scope): description
 
-## Changes Made
+- Detail 1
+- Detail 2
 
-- [Change 1]
-- [Change 2]
+Generated with Claude Code
+Co-Authored-By: Claude <noreply@anthropic.com>
+EOF
+)"
 
-## Test Plan
+# 3. Switch to main
+git checkout main
 
-- [ ] Unit tests pass
-- [ ] E2E tests pass
-- [ ] Manual testing done
+# 4. Merge branch
+git merge feature/my-feature
 
-## Screenshots
+# 5. Sync with remote
+git pull origin main --rebase || true
+git push origin main
 
-[If UI changes]
+# 6. Delete feature branch (cleanup)
+git branch -d feature/my-feature
+```
 
-## Checklist
+### Key Rules
 
-- [ ] Code follows project style
-- [ ] Self-review completed
-- [ ] Documentation updated
-- [ ] Tests added/updated
-```
+| Rule | Description |
+|------|-------------|
+| NO Pull Requests | Merge directly to main |
+| Always end on main | Checkout main after merge |
+| Delete branch after merge | Keep repo clean |
+| Push after merge | Sync with remote |
 
 ---
 
@@ -316,43 +285,46 @@ export default {
 
 ---
 
-## Merge Strategies
+## Merge Strategies (Local)
 
-### Squash Merge (Recommended for Features)
+### Standard Merge (Recommended)
 
 ```bash
-# Combines all commits into one
-gh pr merge --squash
-
-# Result: Clean main history
+# Simple merge - preserves commits
+git checkout main
+git merge feature/my-feature
+git push origin main
 ```
 
-### Rebase Merge (For Clean History)
+### Squash Merge (Clean History)
 
 ```bash
-# Replays commits on top of base
-gh pr merge --rebase
-
-# Result: Linear history, individual commits preserved
+# Combines all branch commits into one
+git checkout main
+git merge --squash feature/my-feature
+git commit -m "feat: complete feature description"
+git push origin main
 ```
 
-### Merge Commit (For Preserving History)
+### Rebase Then Merge (Linear History)
 
 ```bash
-# Creates merge commit
-gh pr merge --merge
-
-# Result: Preserves full branch history
+# Rebase branch first
+git checkout feature/my-feature
+git rebase main
+git checkout main
+git merge feature/my-feature  # Fast-forward
+git push origin main
 ```
 
 ### Recommendation
 
 | Branch Type | Strategy |
 | ----------- | -------- |
-| feature/\*  | Squash   |
-| fix/\*      | Squash   |
-| release/\*  | Merge    |
-| hotfix/\*   | Merge    |
+| feature/\*  | Merge    |
+| fix/\*      | Merge    |
+| refactor/\* | Squash   |
+| chore/\*    | Squash   |
 
 ---
 
@@ -431,9 +403,8 @@ git stash apply stash@{2}
 
 This skill is used by:
 
-- **commit-manager** agent
-- **branch-manager** agent
-- **pr-creator** agent
+- **commit-manager** agent - commits and merges to main
+- **branch-manager** agent - creates feature branches
 - **quality-checker** for pre-commit validation
 
 ---

package/template/.claude/agents/08-git/pr-creator.md

@@ -1,76 +0,0 @@
----
-name: pr-creator
-description: "AUTOMATICALLY invoke AFTER commit-manager when feature is ready. Triggers: feature complete, 'create PR', ready to merge. Creates well-formatted PRs with gh CLI. PROACTIVELY creates PRs after committing."
-model: haiku
-tools: Bash, Read, Grep
-skills: git-workflow
----
-
-# PR Creator Agent
-
-You create well-formatted pull requests.
-
-## PR Creation Flow
-
-```bash
-# 1. Check current state
-git status
-git log main..HEAD --oneline
-
-# 2. Push branch
-git push -u origin [branch]
-
-# 3. Create PR
-gh pr create --title "type: description" --body "$(cat <<'EOF'
-## Summary
-- Change 1
-- Change 2
-
-## Test Plan
-- [ ] Tests pass
-- [ ] Manual testing done
-
-Generated with Claude Code
-EOF
-)"
-```
-
-## PR Template
-
-```markdown
-## Summary
-
-[1-3 bullet points explaining changes]
-
-## Changes
-
-- [List of specific changes]
-
-## Test Plan
-
-- [ ] Unit tests pass
-- [ ] E2E tests pass
-- [ ] Manual testing completed
-
-## Screenshots (if UI)
-
-[Add screenshots]
-
-Generated with Claude Code
-```
-
-## Labels
-
-| Label    | Use             |
-| -------- | --------------- |
-| feature  | New feature     |
-| bug      | Bug fix         |
-| docs     | Documentation   |
-| breaking | Breaking change |
-
-## Critical Rules
-
-1. **DESCRIPTIVE TITLE** - Conventional commit format
-2. **SUMMARY FIRST** - What and why
-3. **TEST PLAN** - How to verify
-4. **LINK ISSUES** - Reference related issues