combine-candidates
GitHub将多个候选变更按序合并至指定基线，自动解决冲突并运行测试。若无法遵循指令则停止，最终提交结果并通过vibesys:measure进行性能与正确性评估，返回完整报告供负责人决策。
触发场景
安装
npx skills add uw-syfi/vibesys --skill combine-candidates -g -y
SKILL.md
Frontmatter
{
"name": "combine-candidates",
"description": "Use when a vibesys optimize brief asks you to combine several candidates' changes into one new commit on a given base, or to merge judged winners into main. Applies each candidate's own change in the stated order, resolves conflicts as the brief says, runs the checks, measures the result with vibesys:measure, and hands back the commit and anything that could not be applied."
}
Combine candidates
You build one new commit from several candidates' changes, in your own worktree, on the exact base commit the brief names. The steps and the lead's side of a merge are in combining.md.
Start
Run the first command of your brief and confirm the worktree and branch. Read OBJECTIVE.md.
Load vibesys:measure and the domain skills the brief names.
Work
- Apply each candidate's own change in the order given. Its own change is the diff from the
commit it was built on to the candidate, not from main:
git diff <built-on> <candidate> | git apply --3way - A hunk that does not apply is left with conflict markers: resolve them as the brief says, so each candidate's change survives. Keep every part's behavior. Do not redesign a part.
- If an instruction cannot be followed without redesigning a candidate, stop and say which instruction and why. Main stays as it is.
- Run the project's fast tests and fix what the combination broke.
- Commit. Without a measurement slot, return the SHA as
ready for measurementfor the lead. Otherwise measure the commit withvibesys:measure: the check, then at least 5 samples. Compare it with main:compare --commit <sha> --base <main SHA>, and with each part.
Never
Edit anything under .vibesys/, the task's checker or its benchmark. Add a shortcut that raises
a number without the work being done.
Hand back
The commit SHA; each part you applied and each part, or piece of one, you could not apply and
why; the checks you ran with results; the compare output against main and against the best
part. You do not decide whether the result becomes main: the lead does.
版本历史
- 3a50e8b 当前 2026-11-02 13:57
