Skip to main content
ClaudeWave
Skill856 estrellas del repoactualizado 11d ago

vc:merge-worktree

The vc:merge-worktree skill automates the process of merging a git worktree branch back into the main checkout and cleaning up associated resources. Use this when a developer has completed work in a worktree and needs to safely integrate changes into main, remove the worktree directory, delete the feature branch, and prepare the repository for the next task.

Instalar en Claude Code
Copiar
git clone --depth 1 https://github.com/withkynam/vibecode-pro-max-kit /tmp/vc-merge-worktree && cp -r /tmp/vc-merge-worktree/.claude/skills/vc-merge-worktree ~/.claude/skills/vc-merge-worktree
Después abre una sesión nueva de Claude Code; el skill carga automáticamente.

SKILL.md

# Merge Worktree

Use this skill for safe worktree merge and cleanup. Skip RIPER-5 mode routing for this operational task.

## Workflow

1. Confirm the current path is a worktree, not the main checkout.
2. Run `git status --short` and stop if there are uncommitted changes.
3. Capture the current branch and worktree path.
4. Locate the main checkout with `git worktree list`.
5. Switch to the main checkout and update `main` if the user wants latest remote changes included.
6. Merge the worktree branch into `main`.
7. If merge succeeds, remove the worktree with `git worktree remove <path>`.
8. Delete the local branch with `git branch -d <branch>`.
9. Run `git worktree prune`.
10. Report the merge result and whether a push is still needed.

## Safety

- Never run from `main` or `master`.
- Never delete a branch before a successful merge.
- Stop on conflicts and explain the exact recovery state.
code-reviewerSubagent

Comprehensive code review with scout-based edge case detection. Use after implementing features, before PRs, for quality assessment, security audits, or performance optimization.

code-simplifierSubagent

Simplifies and refines code for clarity, consistency, and maintainability while preserving all functionality. Focuses on recently modified code unless instructed otherwise.

debuggerSubagent

Use this agent when you need to investigate issues, analyze system behavior, diagnose performance problems, examine database structures, collect and analyze logs from servers or CI/CD pipelines, run tests for debugging purposes, or optimize system performance. This includes troubleshooting errors, identifying bottlenecks, analyzing failed deployments, investigating test failures, and creating diagnostic reports. Examples:\n\n<example>\nContext: The user needs to investigate why an API endpoint is returning 500 errors.\nuser: "The /api/users endpoint is throwing 500 errors"\nassistant: "I''ll use the debugger agent to investigate this issue"\n<commentary>\nSince this involves investigating an issue, use the Task tool to launch the debugger agent.\n</commentary>\n</example>\n\n<example>\nContext: The user wants to analyze why the CI/CD pipeline is failing.\nuser: "The GitHub Actions workflow keeps failing on the test step"\nassistant: "Let me use the debugger agent to analyze the CI/CD pipeline logs and identify the issue"\n<commentary>\nThis requires analyzing CI/CD logs and test failures, so use the debugger agent.\n</commentary>\n</example>\n\n<example>\nContext: The user notices performance degradation in the application.\nuser: "The application response times have increased by 300% since yesterday"\nassistant: "I''ll launch the debugger agent to analyze system behavior and identify performance bottlenecks"\n<commentary>\nPerformance analysis and bottleneck identification requires the debugger agent.\n</commentary>\n</example>

execute-agentSubagent

EXECUTE MODE - Implementing EXACTLY what was planned. Full tool access. Can only be invoked after explicit user confirmation. Use after plan is approved.

fast-mode-agentSubagent

FAST MODE - Execute compressed RIPER-5 workflow (RESEARCH + INNOVATE + PLAN) in one session, then pause for EXECUTE confirmation. Use when you want quick end-to-end solution.

git-managerSubagent

Stage, commit, and push code changes with conventional commits. Use when user says "commit", "push", or finishes a feature/fix.

innovate-agentSubagent

INNOVATE MODE - Brainstorming and exploring implementation approaches. Discusses possibilities without making decisions. Use after research is complete.

plan-agentSubagent

PLAN MODE - Creating exhaustive technical specifications and implementation plans. Can write to process/general-plans/active/ and process/features/*/active/ only. Use after approach is decided.