القائمة
Skill for safely merging completed agent branches back to main. Covers pre-merge checks, conflict resolution, post-merge cleanup, and promotion of newly unblocked tasks.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
| name | branch-merging |
| description | Skill for safely merging completed agent branches back to main. Covers pre-merge checks, conflict resolution, post-merge cleanup, and promotion of newly unblocked tasks. |
| user-invocable | true |
| disable-model-invocation | false |
Use this skill when merging completed agent work back to the main branch.
Before merging, verify:
Task is closed in Beads:
bd show <task-id> # Status should be "closed"
All tests pass on the agent branch:
cd <worktree-path>
# Run project-appropriate tests
npm test / pytest / go test ./... / cargo test
Review changes:
git log main..<branch> --oneline # Commit history
git diff main..<branch> --stat # Files changed
git diff main..<branch> # Full diff
./scripts/merge-agent.sh <branch-name> <task-id>
git checkout main
git pull --rebase
git merge <branch> --no-ff -m "Merge <branch>: agent work complete"
git push origin main
If git merge fails with conflicts:
git diff --name-only --diff-filter=Ugit add <resolved-files>git commit (merge commit message is pre-populated)git push origin main# Remove worktree
git worktree remove <worktree-path>
# Delete branch
git branch -d <branch-name>
# Kill tmux window
tmux kill-window -t <session>:<branch>
# Prune stale references
git worktree prune
After merging, check for newly available work:
bd ready
If tasks are now unblocked, dispatch new agents:
./scripts/spawn-agent.sh <task-id> agent-<name> "<description>"
When multiple branches are ready to merge:
Skill for using Beads (bd) as the single source of truth for task tracking, dependency management, and agent coordination. Covers all bd commands needed for multi-agent orchestration.
Skill for working with artifact contracts — the file-level dependency system that prevents pipeline failures by ensuring tasks produce expected outputs and only start when required inputs exist.
Skill for generating scientific figures from experimental data. Ensures every figure referenced in LaTeX documents exists on disk before compilation, preventing blank PDFs and broken references.
Complete recipe for dispatching, monitoring, merging, and cleaning up worker agents. Read this skill BEFORE dispatching any worker. Covers build_worker_prompt, spawn-agent.sh, merge-agent.sh, checkpoint updates, and common failure modes.
Use when asked to reduce code complexity, simplify code, refactor safely, merge micro-files, remove dead code, shrink functions, reduce coupling, clean modules, or improve maintainability in src/voronoi/.
Use for adversarial review of Voronoi plans, findings, claims, manuscripts, and final deliverables. Covers reviewer-style objections, confounds, alternative explanations, evidence gaps, and falsification-oriented critique.