Merge

alirezarezvani/claude-skills/engineering/agenthub/skills/merge

作者 alirezarezvani19392f7a0826無授權條款27K 個星標收錄於 2026年10月8日更新於 2026年10月8日儲存庫5 週前更新

Merge the winning agent's branch into base, archive losers, and clean up worktrees. Use when the user runs /hub:merge or asks to land the winning AgentHub result and tidy the session.

AI 產生的概覽

將優勝代理的分支合併到基礎分支,把落敗分支封存為標籤,並清理工作樹。

功能
此技能負責 AgentHub 工作階段的最後一步:確認優勝代理(以 --agent 指定,或取最近一次評估排名第一的代理),以非快進方式將其分支合併到基礎分支,並把每個落敗代理的分支封存為 git 標籤後再刪除分支參照。接著清理工作階段的工作樹,將合併摘要寫入 .agenthub/board/results/merge-summary.md,並把工作階段狀態更新為 merged。它透過 /hub:merge 指令呼叫。
適用情境
當使用者執行 /hub:merge,或要求讓優勝的 AgentHub 結果落地並整理工作階段時使用。適合在評估已對多個競爭代理完成排名、需要合併優勝者並封存其餘分支的情境。
執行需求
需要一個具備 AgentHub 分支與工作樹結構的 git 儲存庫,並需要 Python 來執行 scripts/session_manager.py 以清理工作樹和更新狀態。此技能僅為說明文件,本身不附帶指令碼,但會引用該指令碼路徑。

/hub:merge — Merge Winner

Merge the best agent's branch into the base branch, archive losing branches via git tags, and clean up worktrees.

Usage

/hub:merge                                       # Merge winner of latest session/hub:merge 20260317-143022                       # Merge winner of specific session/hub:merge 20260317-143022 --agent agent-2       # Explicitly choose winner

What It Does

1. Identify Winner

If --agent specified, use that. Otherwise, use the #1 ranked agent from the most recent /hub:eval.

2. Merge Winner

bash
git checkout {base_branch}git merge --no-ff hub/{session-id}/{winner}/attempt-1 \  -m "hub: merge {winner} from session {session-id}
Task: {task}Winner: {winner}Session: {session-id}"

3. Archive Losers

For each non-winning agent:

bash
# Create archive tag (preserves commits forever)git tag hub/archive/{session-id}/{agent-id} hub/{session-id}/{agent-id}/attempt-1
# Delete branch ref (commits preserved via tag)git branch -D hub/{session-id}/{agent-id}/attempt-1

4. Clean Up Worktrees

bash
python {skill_path}/scripts/session_manager.py --cleanup {session-id}

5. Post Merge Summary

Write .agenthub/board/results/merge-summary.md:

markdown
---author: coordinatortimestamp: {now}channel: results---
## Merge Summary
- **Session**: {session-id}- **Winner**: {winner}- **Merged into**: {base_branch}- **Archived**: {loser-1}, {loser-2}, ...- **Worktrees cleaned**: {count}

6. Update State

bash
python {skill_path}/scripts/session_manager.py --update {session-id} --state merged

Safety

  • Confirm with user before merging — show the diff summary first
  • Never force-push — merge is always --no-ff for clear history
  • Archive, don't delete — losing agents' commits are preserved via tags
  • Clean worktrees — don't leave orphan directories on disk

After Merge

Tell the user:

  • Winner merged into {base_branch}
  • Losers archived with tags hub/archive/{session-id}/agent-{N}
  • Worktrees cleaned up
  • Session state: merged

來源與署名

來源:alirezarezvani/claude-skills位於engineering/agenthub/skills/merge提交19392f7

授權條款: 無授權條款

內容歸原作者所有。SourceWeft 從公開儲存庫中收錄這些內容。

檢舉或申請下架