Skip to content

fix(agent): 分支合并判定改以实际提交结构为准,信号交 judge 权衡#118

Merged
huhamhire merged 1 commit into
devfrom
fix/branch-merge-judge
Jun 23, 2026
Merged

fix(agent): 分支合并判定改以实际提交结构为准,信号交 judge 权衡#118
huhamhire merged 1 commit into
devfrom
fix/branch-merge-judge

Conversation

@huhamhire

Copy link
Copy Markdown
Owner

问题

源分支恰为主干(master / dev 等)的 fork 原创 PR,被 autopilot 误判为「纯分支合并」而跳过预评审。

变更

  • classifyBranchMerge 不再仅凭源分支名裁决:仅当提交全为 merge commit 才判 isBranchMerge,源是否主干降为 sourceMainline 背景信号。
  • autopilot 改为逐候选拉 commits、按实际提交结构判定。
  • judge prompt 以中性 signals 列出证据(去掉 prefer-skip 硬措辞),明确「仅源为主干不构成跳过理由」,由 judge 综合权衡。
  • branch-merge / autopilot-judge 回归测试,更新 docs/arch/06-agent.md

🤖 Generated with Claude Code

源分支恰为主干(master/dev 等)的 fork 原创 PR 被 autopilot 误判为「纯分支合并」
而跳过。classifyBranchMerge 不再仅凭源分支名裁决:仅当提交全为 merge commit 才判
isBranchMerge,源是否主干降为 sourceMainline 背景信号。autopilot 改为逐候选拉
commits 按结构判定;judge prompt 以中性 signals 列出证据(去掉 prefer skip 硬措辞),
明确「仅源为主干不构成跳过理由」,由 judge 综合权衡。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@huhamhire huhamhire added the bug Something isn't working label Jun 23, 2026
@huhamhire huhamhire merged commit 384fba4 into dev Jun 23, 2026
1 check passed
@huhamhire huhamhire deleted the fix/branch-merge-judge branch June 23, 2026 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant