Safely integrates commits from parallel agent branches using sequential cherry-pick. Use after parallel work completes in isolated branches or worktrees.
The English summary is being prepared. Showing the original description.
See how to installReview the instructions the agent will receive before you install.
Parallel agents produce parallel branches. This skill integrates them safely without merge conflicts destroying work.
vibe-parallel-task-decomposition dispatched workInventory branches — List the branches and worktrees with completed work. Harnesses name them differently, so list rather than guess a pattern:
git worktree list
git branch --sort=-committerdate | head -20
Determine integration order — Cherry-pick in dependency order:
For each branch:
a. Identify commits to cherry-pick: git log main..branch-name --oneline
b. Cherry-pick onto integration branch: git cherry-pick <commit-hash>
c. If conflict:
git cherry-pick --continue
d. Run tests after each cherry-pick: [test command]
e. If tests fail: fix before proceeding to next branchVerify integration — Run full test suite after all cherry-picks
Clean up — Remove integrated branches if desired
Branches integrated: X Commits cherry-picked: Y Conflicts resolved: Z Tests: PASS/FAIL after integration
| Branch | Commits | Conflicts | Tests After |
|---|---|---|---|
| agent/auth-stream | 3 | 0 | PASS |
| agent/api-stream | 2 | 1 | PASS |
No reviews yet. Tell others what you thought.
No login needed. Share how it worked for you, ask a question, or note where it did not run.
No comments yet. Be the first to write one.
Validates completed work against defined acceptance criteria. Use after completing a task that has specific success criteria defined in issues, specs, or task descriptions.
The English summary is being prepared. Showing the original description.
Generates edge case, failure mode, and spec-driven test cases. Covers boundary values, nil inputs, concurrency, resource exhaustion, malformed data, and requirement-linked traceability tests. Use after happy-path tests exist and before claiming coverage is complete, when requirements lack tests, or before a security review.
The English summary is being prepared. Showing the original description.
Catches shortcuts and reward hacking — weakening or deleting tests to make them pass, hard-coding expected outputs, silently dropping requirements, or claiming work is done without running it. Use before declaring a task complete and whenever a test or requirement feels like it's in the way.
The English summary is being prepared. Showing the original description.
Audits tests for concurrency safety — race conditions, shared mock state, cleanup ordering. Use when writing tests that involve goroutines, async operations, or shared mutable state.
The English summary is being prepared. Showing the original description.
Enforces tiered test coverage standards with three dimensions — line coverage by tier, spec-to-test traceability, and spec-to-code implementation mapping. Use before claiming code is complete.
The English summary is being prepared. Showing the original description.
Extracts and records architectural decisions from diffs, conversation context, and explicit choices. Supports automatic extraction from staged changes, deduplication against prior decisions, and persistent ADR-format logging with spec traceability. Use after a significant design or architecture choice, before committing a diff that embeds implicit decisions, or when the same question keeps resurfacing.
The English summary is being prepared. Showing the original description.