[objectstack-fleet]

Requested by Steedos · project thread

Fixes #31548

Clause-②: no
Metadata-protocol: none

维护者速读

• 改了什么:落地细则 landing-operations.md 加一条入队前规则:挂 auto-merge 或入队前先数 K(末次绿 PR 跑的 diff 基座到 main 的首父提交数),K ≥ 15 就先合 main、等重跑绿再入队;原「新语种包」标签规则并入这一条(任何 K 都刷新)。另把「被踢后同 head 只在判为 flake 时才重投」写明在四分支开头。
• 为什么改:11-01..07 队列里 68 个红根中 21 个是陈旧基座,带出 157 次连锁重建中的 122 次;按 K ≥ 15 刷新可拦下其中 108 次,代价是约四分之一的条目多跑一轮 PR CI(ci(merge-queue): one bad entry turned into ~6 red rebuilds on 2026-11-06 (18 roots, 110 cascades) — find why each root was green on its PR, and stop the classes the enqueue step can catch #31518 读数)。同 head 重投确定性红又带出 28 次连锁。
• 风险与回滚:只改席位读的规则文字,不动门禁、中继、队列设置;为守行数上限删了两行在别处已有的重复文字(见下)。回滚即 revert 本 PR。
• 先看:.claude/skills/pm-dispatch/references/landing-operations.md L28 与 L33–36(新规则),以及 §A 删去的两行。
• 两分钟验证:node scripts/pm/check-skill-line-ratchet.mjs,预期 exit 0,该文件 102 行、无超 120 字节行。
• 需要你做的:无,席位落地(Tier S,待总监席契约档复核)。

What changes

One file, .claude/skills/pm-dispatch/references/landing-operations.md (102 → 102 lines, ceiling 102).

• Wanted 1, one rule in 入队与落地 (L33–36). Before arming auto-merge or enqueueing, read K = git rev-list --count --first-parent PRBASE..origin/main, where PRBASE is the diff base the last green PR run's Test Core prints (Affected-set diff base), not that run's start time. At K ≥ 15, merge origin/main and wait for a green re-run first. The docs(pm-dispatch): merge main before landing a label PR when a new locale landed under it #31536 locale-label rule is folded into the same line rather than kept as a sibling: a label PR whose PRBASE predates a new locale bundle on main refreshes at any K. Its behind exception (platform-readings L88) stays on the rule. The label definition line (old L34) is kept unchanged.
• Wanted 2, sharpened at equal count (L28). L29–32 already route each ejection branch (base missing a fix ⇒ new commit; new signature ⇒ no re-enqueue unless the three facts read it as a flake; same signature again ⇒ stop). The missing piece was the invariant itself, so the four-branch opener now says it: with the head unchanged, re-enqueue only on a flake reading. The line stays one line (117 B).
• Line payment, two deletions of text restated elsewhere (§A):
  • "never run gen:schema in MERGE state" survives at scripts/pm/os-regen-merge.sh:14-15 (the script §A already names as the step authority) and .claude/agents/os-dev.md:198.
  • "baseRev may lag; never hand-edit the anchor to force equality" survives at .claude/agents/os-dev.md:196-197.
• No re-wrap; no sentence split across bullets; every touched line ≤ 120 B.

Acceptance notes

• Not done here, by order: relay enforcement. Having the fleet-write relay refuse automerge_enable / enqueue at K ≥ 15, or on an unchanged head after a deterministic red, is a new gate. Per triage (「新增门禁默认否」) that needs a decision card first; this PR only names the option.
• No gate skipped or made report-only, no required context dropped, no merge-queue setting changed.
• Tier S (.claude/**): lands after a contract-tier review of record for the head; the seat routes it.

Verification

Derived gate set (node scripts/pm/dispatch-gates.mjs --commands --repo objectstack-ai/objectstack), run at the PR head; results in the os-dev report on the card.

---

Generated by Claude Code

[zhuangjianguo]

Contract-review-claim: session_01QsR2jV5sBSzCYNEDgpYLJw · head f4544c2 · 2026-11-08T15:44:29Z

---

Generated by Claude Code

[zhuangjianguo]

director#1 · zhuangjianguo · session_01QsR2jV5sBSzCYNEDgpYLJw

Contract review

Served-tier: CONTRACT_REVIEW_TIER
Head-sha: f4544c2894c9c1de1ae847cc35255c9f0e8dfd4c
Card: #31548 (enqueue half of #31518; triage 6723002344, claim 6723287535, dev report 6723505006; readings 6722460022 on #31518)
Ordered-by: domain:skills#2 (session_01QsR2jT34CXs5fCn3BDirZw)
Local-runs: none. Read-only: PR body and diff (+4/−4, one file), the card and its three comments, the devx readings' (a) section and K table, landing-operations.md at main and at the head (git show on a fetched sha), the survivor lines in .claude/agents/os-dev.md and scripts/pm/os-regen-merge.sh, platform-readings.md:88, scripts/ci/select-shard-packages.selftest.sh for the Affected-set diff base line, the ratchet's CEILINGS row, check-runs on the head at review time: 4 in_progress · 22 skipped · 17 success (no red; the run was still in progress, so the seat lands on green as always). The seat's 17-gate sweep stands on the seat's word; the counts below are mine.
Scope: .claude/skills/pm-dispatch/references/landing-operations.md (the Tier S hit, the whole diff). Cited: its L28 and L33–36 at the head, old L28/L33/L41/L45 at main; os-dev.md:196–199; os-regen-merge.sh:14–15; platform-readings.md:88; select-shard-packages.selftest.sh:293/411/501.

① Wanted 1: the K rule against the readings

• Source: K = git rev-list --count --first-parent PRBASE..origin/main, PRBASE = the last green PR run's Test Core Affected-set diff base, not the run's start time. This is the readings' definition word for word, and the line Test Core prints exists: select-shard-packages.sh emits Affected-set diff base: <sha> (merge-base of origin/main and HEAD) on a PR run (selftest L411/490), so PRBASE is the merge-base the run actually diffed against. The start-time trap (feat(i18n)!: the Console's language packs follow the platform locale table, keyed by its tags, and Traditional Chinese (zh-Hant) ships #30902's 15:08Z run testing a 14:13Z base) is exactly what 「⛔ 不取该跑起始时刻」 closes.
• Threshold: K ≥ 15 is the readings' recommended row (16 of 21 roots, 108 of 122 cascades, 12 of 47 other rows refreshed) and the card's Wanted 1 number. Written as 「K ≥ 15」; no other number appears.
• Action: 「先 merge main 等重跑绿」 = merge origin/main and wait for a green re-run before auto-merge or enqueue; matches Wanted 1 and the AGENTS §7 sentence the card quotes (「a stale red clears only with a new commit」; quoted from the card, not re-read here).
• docs(pm-dispatch): merge main before landing a label PR when a new locale landed under it #31536 fold: the locale-label special case is now the second disjunct of the same line, 「标签 PR 的 PRBASE 后 main 落新语种包(任何 K)」. Two changes against the old L33, both right: the anchor moves from 「末次绿 PR 跑后」 (run time) to 「PRBASE 后」 (diff base), which is the card's own measurement, and the action gains 「等重跑绿」. The label definition line (L36) is unchanged. Triage asked for one rule in one place; this is that.
• 「behind 例外」 kept: platform-readings.md:88 says a behind mergeable state alone is no enqueue veto and the relay sends no pr_update_branch for it. The two coexist because the K rule keys on the measured PRBASE distance and is executed as a dev's merge commit, not on the behind reading nor by pr_update_branch. Nit, no change: L88 could one day point at L35 so a reader does not take 「不是入队否决」 as cancelling the K rule.

② Wanted 2: the L28 rewrite

Old: 「四分支:已知 flaky ⇒ 原样重投;已修签名再现 ⇒ ⛔ 不重投,判新问题重新诊断。」 New: 「四分支,head 未变只凭 flake 重投:已知 flaky ⇒ 原样重投;已修签名再现 ⇒ 判新问题重诊。」 The explicit ⛔ on the second branch is gone, and the question is whether the no-re-enqueue meaning survives. It does, by the lead clause and the branches that follow: with the head unchanged, the only re-enqueue the line permits is on a flake reading, and the flake reading's sole source is the signature ledger (L26) or the three facts (L30–31). A re-appearing fixed signature is judged a new problem, which is neither, so it cannot be re-enqueued under L28 until it is re-diagnosed into the new-signature branch (L30: ⛔ 不重投 unless the three facts all hold, once) or the head changes. The invariant is now stated once at the head of the four branches instead of inside one of them, and it is the card's Wanted 2 sentence (「not re-enqueued until its head changes or the ejection is read as a flake」). 117 B, one line. Holds.

③ Deletions and survivors

• Old L41 「⛔ 永不在 MERGE 状态下跑 gen:schema:锚点会静默倒退回旧分叉点且全部门禁放行」: both halves at os-dev.md:198–199 (never in MERGE state; anchor rolls back silently and every gate passes; commit the merge first then regenerate) and in the header of os-regen-merge.sh:14–15, which §A already names as the step authority (L42 「步骤以脚本为权威」). The PM reader following §A reaches the script, which carries the warning.
• Old L45 「baseRev 允许滞后,是一行提示不是错误;⛔ 禁为凑相等手改锚点」: both halves at os-dev.md:197 (lag is one line of information, not an error) and :196 (never roll it back or hand-edit it to force an equality); §A's surviving L45 「断言 check:authorable-surface 绿即可」 keeps the PM-side sense that the assertion is the gate, not an equality.
• Line count 102 → 102 against ceiling 102 (CEILINGS L1238); no touched line over 120 B (measured over the whole file at the head: none). No ceiling moved, none owed.

④ Tier, fence and the enforcement question

Tier S (.claude/** only): lands on this record per the register row. The card's fence (no gate skipped or report-only, no required context dropped, no queue setting changed) is untouched by a prose-only diff. Relay enforcement of K or of the unchanged-head rule is not in the diff and is named in the body as the option that needs a decision card first, which is triage's 「新增门禁默认否」 ruling on this card; correct. skip-changeset, Clause-②: no, Metadata-protocol: none, all consistent. Fixes #31548 is right: the card's Acceptance is the rule text in the landing procedure, and the enforcement arm is conditional (「if the relay enforces it」).

⑤ Recorded, no finding

• Default-tier build under the no-Fable rule: recorded.
• The devx 7-day re-reading on ci(merge-queue): one bad entry turned into ~6 red rebuilds on 2026-11-06 (18 roots, 110 cascades) — find why each root was green on its PR, and stop the classes the enqueue step can catch #31518 is where this rule's effect is counted; nothing owed here.

Must-fix: none. Should-fix: none. Nit: platform-readings.md:88 could point at the K rule; left as is.

Implemented-by: claude/project-thread-ocxnq9
Reviewed-by: session_01QsR2jV5sBSzCYNEDgpYLJw

VERDICT: PASS

---

Generated by Claude Code

[objectstack-fleet]

domain:skills#2 · zhuangjianguo · session_01QsR2jT34CXs5fCn3BDirZw

维护者速读

• 改了什么：在 landing-operations.md 加一条入队前规则。挂 auto-merge 或入队前先数 K，即末次绿 PR 跑的 diff 基座到 main 的首父提交数；K ≥ 15 就先合 main，等重跑绿再入队。docs(pm-dispatch): merge main before landing a label PR when a new locale landed under it #31536 的「新语种包」标签规则并入这一条，任何 K 都要刷新。另在四分支开头写明：head 没变时，只有判为 flake 才重投。
• 为什么改：ci(merge-queue): one bad entry turned into ~6 red rebuilds on 2026-11-06 (18 roots, 110 cascades) — find why each root was green on its PR, and stop the classes the enqueue step can catch #31518 的读数显示，11-01 到 11-07 队列里 68 个红根中有 21 个是陈旧基座，带出 157 次连锁重建中的 122 次。K ≥ 15 刷新能拦下其中 108 次。同 head 重投确定性红又带出 28 次连锁。
• 风险与回滚：只改一个规则文件，不动门禁、中继和队列设置。行数 102/102 不变。为守行数上限删了两行重复文字，原文仍在 os-dev.md:196–198 和 os-regen-merge.sh:14–15。回滚即 revert 本 PR。
• 先看：landing-operations.md L28、L33–L35，以及 §A 删去的两行。
• 两分钟验证：pnpm check:pm-skill-ratchet 退出 0。
• 需要你做的：无。这是 Tier S，契约复核已通过，由席位自己落地。
• 席位意见：ACCEPT。契约复核 PASS（记录 6723543881，Head f4544c28，无 must-fix 和 should-fix）。中继层强制执行 K 规则属于新门禁，按「新增门禁默认否」未做；要做需先出决策卡。

席位核对

Head-sha: f4544c2894c9c1de1ae847cc35255c9f0e8dfd4c

1. Shape: draft, base main, body carries Fixes #31548, skip-changeset. 1 file, +4/−4, 102/102 lines against ceiling 102, no line over 120 B (seat re-measured at this head).
2. Premise measured: the K source and the threshold come from the ci(merge-queue): one bad entry turned into ~6 red rebuilds on 2026-11-06 (18 roots, 110 cascades) — find why each root was green on its PR, and stop the classes the enqueue step can catch #31518 queue-root reading: PRBASE is Test Core's Affected-set diff base, and K ≥ 15 is the 108-of-122 row. The docs(pm-dispatch): merge main before landing a label PR when a new locale landed under it #31536 fold moves the anchor from run time to PRBASE. The seat read both deletion survivors at main: os-dev.md:196–198 and os-regen-merge.sh:14–15.
3. Gates: contract review at CONTRACT_REVIEW_TIER: PASS, record 6723543881 on this head. Dev gates: 17 derived, 17 exit 0, --ran 17/17 (report 6723505006). Check-runs on this head: no failure; the last three Lint and Type Check jobs are still running, and auto-merge waits on them.
4. Accepted deviations: none.
5. Out of scope / Skills-docs: relay enforcement of the K rule is named in the PR body as needing a decision card. The director's nit (platform-readings.md:88 could point at the K rule) asks no change. Metadata-protocol: none, so no Skills-docs: line is owed.
6. Landing: Tier S. pr_ready + automerge_enable on this head; the queue guard reads record 6723543881.