Repository navigation
docs(skill): forbid syncing unmerged upstream PRs - #258
Merged
Merged
Conversation
commit: |
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
The 2026-10-17 sync enumerated upstream open PRs when the cursor range was empty and filed #243-#250; #251-#255 were then ported from those unmerged PRs and are being reverted the same week. Root cause: the skill had no scope rule, so an empty range read as "look wider" instead of "nothing to sync". Codify the hard rule - only merged upstream commits are synced: - SKILL.md: new "同步范围" section, Step 2 note, Step 3 merge-state check, 注意事项 bullet - references/priority-rules.md: 前置范围规则 ahead of all priority rules - AGENTS.md: "Every upstream sync" bullet - memory/upstream-sync.md: dated policy entry
cc-hearts
force-pushed
the
docs/skill-no-open-pr-sync
branch
from
October 19, 2026 03:32
71b9c53 to
58449d0
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
背景
本周的事故链：10-17 sync 发现游标区间为空（
compare fc3a0cc...main=identical），于是额外枚举了上游 open PR，立了 #243–#250 共 8 个 tracking issue；10-18 又把其中 5 个 fix 直接移植（#251–#255）；今天这 5 个全部回滚（#257）。根因是 skill 没有任何范围约束——“游标后没有新合并 commit”被当成了“换个方向找活干”，而不是“暂无同步项”。改动
把硬规则写进流程：只同步已合并进上游默认分支的 commit。未合并（
open/draft）PR 一律不枚举、不开 issue、不建sync/*分支、不移植；区间为空即结束。SKILL.md：新增「同步范围（硬性规则）」章节；Step 2 增加区间只含已合并 commit 的提示；Step 3 增加合并状态校验（merged_at != null且 merge commit 在区间内，否则丢弃并标注）；注意事项补充禁令references/priority-rules.md：在所有优先级规则之前加「前置范围规则」AGENTS.md：「Every upstream sync」条目补上同一约束，并指向本次回滚记录memory/upstream-sync.md：追加 2026-10-19 策略条目（含“若要提前移植，必须是维护者的显式决定并自带对账计划”的例外条款）验证
vp check：与基线一致（41 errors / 9 warnings，均为既有项）