Skip to content

Commit cc4ee77

Browse files
pm-dispatch: subscribe relay-opened PRs at collection; seats land through the allow-listed ccr pair; a landing denial stops and surfaces (#19997)
Fixes #19990 Clause-②: no Rule text only, in three `pm-dispatch` references. This PR adds no allow row, no tool and no gate. `.claude/settings.json`, `scripts/pm/**`, `SKILL.md` and `AGENTS.md` are untouched. Line counts are unchanged (183 / 101 / 37), and every edited line is at or under 120 bytes. The maintainer's words, in the `domain:engine#1` seat's session, quoted on the card verbatim and in order: > 「你的pr为什么没有挂在当前session上」 > 「写一个 skills 卡片,更新技能」 > 「包括你刚才为什么不能merge,我当前session设置的是auto」 The same words reached the `domain:skills` seat directly (claim comment 5817962037): 「你的pr应该挂在当前 session上,对应的卡片优先派发」. ## What changed | file · line (after) | bytes | rule | |---|---|---| | `execution-duties.md` :149 (new) | 118 | Case 1. When a report names a PR, a session seat subscribes it at once (`subscribe_pr_activity`) and lists it on the seat post. Reason, stated once: a PR the relay opens is never attached to the session automatically. | | `execution-duties.md` :147 | 87 → 116 | The collection line now covers both modes itself ("(两种模式)", "评论与返回消息皆无"), replacing the deleted report-channel line (see *Line budget*). | | `landing-operations.md` :49 | 82 → 117 | (b). The landing executes the verdict of record (ACCEPT, or the contract-review PASS). It is not a self-approval. | | `landing-operations.md` :51 | 65 → 115 | (a). Ready and auto-merge go only through the two ccr commands that `settings.json` allow-lists (`rest-channel.md` :51 / :55). | | `landing-operations.md` :54 (new) | 120 | (c). A classifier denial during landing means: stop, report to the maintainer, and record the command and the denial reason on the card. ⛔ Never respell the command or switch to the relay to get around it. | | `landing-operations.md` :77 | 106 + 89 → 111 | Case 1, landing side. Every PR in a session seat's window must be subscribed; subscribe any that is missing. The optional 「关键 PR」 wording is gone. The old :77 "not before the report" clause is folded in as 「⛔ 不早于报告」. Routine seats keep polling. | | `reading-discipline.md` :23 | 82 → 120 | (d). A timer text carries no verdict or landing write verb. | Wording choices that differ from the dispatch text: - **`判决`, not `裁决`, at :49.** In this corpus `裁决` is a maintainer ruling, and `判决` is the review verdict (`execution-duties.md` :180–:183, 「判决 ACCEPT / REWORK / ESCALATE」). - **`判决与落地类写动词`, not only `落地类写动词`, at :23.** The timer that was denied `[Self-Approval]` told the seat to post the ACCEPT as well as run the two landing ops. ## Why no new allow row is owed: case 2 (a) The allow-listed landing route already exists. The skill already names it, and this PR only makes §B's landing step name it too. - `.claude/settings.json` :61–:66 allow-lists `curl -sS -X POST …/pulls/*/ccr/ready_for_review` and `curl -sS -X PUT …/pulls/*/ccr/auto_merge` for all three repos. The hotcrm pair was added on 2026-09-24 by `e6a5ecb9`. That commit also deliberately gave `fleet-write/dispatch.mjs` no row. `git grep -n 'with-fleet' .claude/settings.json` gives 0 hits; the control `git grep -n 'label-write' .claude/settings.json` gives 2. - `SKILL.md` :201 says 「ready/draft 走 ccr 路」, and `platform-readings.md` :48 says 「undraft 单通道:席位凭据走 `POST .../pulls/{n}/ccr/ready_for_review`」. - Measured on the timeline (`GET /issues/N/timeline`, 2026-09-24T16:3xZ): - PRs #19873, #19895, #19902, #19941, #19948, #19956, #19970 and #19993 were landed by the `domain:skills` seat under auto mode. Each has `ready_for_review` and `added_to_merge_queue` with actor `os-zhuang` (the ccr route, which writes as the seat's linked user). - PRs #19971, #19972 and #19979 have the same two events with actor `objectstack-fleet[bot]` (the relay route). - Both routes work. The ccr pair is the one with an allow row. The relay route has none, so under auto mode the classifier judges it call by call. ## Where the standing authorization is recorded: case 2 (b) It is already recorded in the tree, so this PR adds only the one clause at :49: - `AGENTS.md` Prime Directive #14: Tier S lands "by the owning seat on a contract-tier review of record". - `AGENTS.md` Multi-agent discipline §7 and Post-Task Checklist step 2: arm auto-merge on a PR that is green and accepted. - `landing-operations.md` :59 (Tier S). Whether that is enough for a seat landing a PR written by its own `mode:subagent` dev is put to the maintainer below. This PR does not rule on it. ## Line budget: what left, and where each fact still lives All three files stand at headroom 0. Each new line is paid for by deleting content, not by re-wrapping or raising a ceiling. - **`execution-duties.md` old :147 deleted.** It read 「报告通道统一:GitHub 是两种模式共用的真相源;dev 终报先落 issue 评论、再作返回消息。」 - The dev-side ordering lives in `.claude/agents/os-dev.md` :17–:18 (「报告交付两次,GitHub 优先:同一段 JSON 先作 issue 评论 … 再作为终报消息」). - "GitHub is authoritative in both modes" lives in `os-dev.md` :324 (「两种派发模式(`mode:subagent` 与 `mode:cloud`)下 GitHub 都是报告的权威源」). It also stays on the collection line as 「(两种模式)」. - **`landing-operations.md` old :77, second clause, deleted.** It read 「订阅是感知补充,⛔ 不替代 flip 定点」. The fact lives on: - :50: the flip timer is set at ACCEPT. - :52: 「CI success webhook 不可靠:⛔ 不坐等」. - `platform-readings.md` :40: 「订阅来的 `check_suite.completed` 是唤醒不是放行读数」. - Its first clause is kept on :77 as 「⛔ 不早于报告」. - **`landing-operations.md` old :76 rewritten in place.** It dates from `42af12fe7` (the 2026-08-07 ruling on subscribing *key* PRs). The newer maintainer words quoted above replace its optional scope. ## Measured risk that stays open - An allow row does not stop a denial based on content. `mcp__Claude_Code_Remote__send_later` is allow-listed (`settings.json` :23, present since before 2026-09-20), yet the engine seat's timer was denied `[Self-Approval]`. `platform-readings.md` :435 records another content-based `[Self-Approval]` denial. - Two explanations are possible: that session did not load this settings file, or the classifier judges content over an allow row. Which one holds was not measured. The eight ccr landings are the positive reading. The new :54 line covers the negative case. - **Write identity, a tension this PR did not create.** The ccr pair writes as the seat's linked user, `os-zhuang`, which is in `GOVERNED_APPROVERS` (`scripts/pm/check-governed-queue-guard.mjs` :576). Three texts point the other way: - `AGENTS.md`: "Every GitHub write leaves through `scripts/pm/`, as `objectstack-fleet[bot]` … ⛔ Never a bare `curl` … write". - `SKILL.md` :92: 「批准账号永不跑席位或作其关联用户」. - `SKILL.md` :94: 「写侧恒为 `objectstack-fleet[bot]`」. `SKILL.md` :201 already routes ready/draft through ccr, so this tension predates this PR. The new :51 states the same route more plainly. The choice is the maintainer's; see the question below. ## Verification At `04357257d`, every command from `node scripts/pm/dispatch-gates.mjs --commands --repo objectstack-ai/objectstack` was run, with the exit code captured before any pipe. All exited 0: 17 derived commands, plus `pnpm check:pm-governed-prose`, `node scripts/check-skills-token-ratchet.mjs` and `pnpm check:pm-settings-deny-roster`. The reconciliation `dispatch-gates --ran` reports: "17 derived famil(ies) accounted for — 17 run, 0 NOT-MEASURED (a DERIVED zero …)". Verdict lines: - `check:pm-skill-ratchet`: `execution-duties.md is 183 lines (ceiling 183; headroom 0)` · `landing-operations.md is 101 lines (ceiling 101; headroom 0)` · `reading-discipline.md is 37 lines (ceiling 37; headroom 0)`. - `check:pm-skill-id-lint`: `34 file(s) clean`. - `check:skill-frame-sync`: `the one declared copy of the decision frame is internally coherent`. - `check:nul-bytes`: `OK … no raw ASCII control bytes`. - `check:doc-formula-expressions` first exited 3 (PREREQUISITE NOT MET, unbuilt `@objectstack/formula` / `@objectstack/lint`). It exited 0 after `turbo run build` for those two packages under the verify lock. That first run measured nothing; it was not a failure. No build, test, reverse check or ablation applies to this change: it is rule text only, with no code path. ## Acceptance notes - `dispatch-runbook.md` :128 has cloud cards subscribe as soon as the draft PR exists. The folded 「⛔ 不早于报告」 agrees with it only because a cloud dev reports at draft-PR time (runbook :135). No change is made. - `origin/main` was not merged before opening. It moved by one commit (a `docs(qa)` change touching none of these files), and the queue rebuilds on current `main`. ## 维护者速读(草稿) **改了什么** - dev 报告里点名了 PR,席位当场订阅这个 PR 的动态,并记进座位贴。规则里写明原因:经中继开出的 PR 永远不会自动挂到会话上。落地说明里原来"给关键 PR 挂订阅"是可选说法,现在改成"落地窗口里每个 PR 都要挂上,缺了就补"。 - 落地(转 ready、挂 auto-merge)只走 `.claude/settings.json` 已放行的两条 ccr 命令。席位落地是在执行已记录的复核判决,不是自己批准自己。 - 落地过程中如果被权限分类器拒绝:停手,报给您,在卡上记下命令和拒绝原因;不换写法,也不改走中继绕过去。 - 定时提醒的文本里不再写"判决/落地"这类写操作,只写"到时重读什么、满足什么条件"。 **为什么改** - 您问了两个问题。 - PR 为什么没挂在当前 session 上:中继开的 PR 不会自动挂上,而技能里只有可选的"关键 PR 挂订阅"。 - auto 模式下为什么不能 merge:engine 席被拒了两次,一次是一条回读命令,一次是一条写着"发 ACCEPT 并落地"的定时器。它随后改走中继落地,而中继没有放行规则。放行的路本来就有:本席今天在 auto 模式下用它落地了 8 个 PR,一次都没被拒。 **风险与代价(含回滚)** - 只改三个技能参考文件的规则文本。行数不变,每行不超过 120 字节。回滚就是 revert 本 PR。 - ccr 两条命令记在 os-zhuang 名下。而 AGENTS.md 写的是"所有 GitHub 写都经 scripts/pm,以 objectstack-fleet[bot] 身份,永不裸 curl 写",SKILL.md 也写"批准账号永不作席位的关联用户"。这个矛盾早就存在(SKILL.md 本来就写"ready/draft 走 ccr 路"),本 PR 没有新造,只是把它写得更明确。 - 放行规则不保证分类器一定放行。`send_later` 在放行清单里,engine 席那条定时器还是按内容被拒了。所以新加了"被拒就停手上报"这一条。 **席位意见** **你要做的** - 回一句话,确认下面两件事,或者指出要改哪一件: - ① AGENTS.md 第 14 条(Tier S 由所属席位在达档复核记录在案后落地)和 Multi-agent discipline 第 7 条(PR 全绿且已验收就挂 auto-merge),就是席位落地自己子代理所写 PR 的常设授权,不用另外记。 - ② 用 ccr 两条命令落地,算 AGENTS.md「写只经 scripts/pm」这条规则的例外。是把这个例外写进 AGENTS.md,还是改走中继并加一条新的放行规则,都由您决定。 --- _Generated by [Claude Code](https://claude.ai/code/session_01A22sUB3mUWs6M36VgfijBq)_ Co-authored-by: Claude <noreply@anthropic.com>
1 parent b5853da commit cc4ee77

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎.claude/skills/pm-dispatch/references/execution-duties.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@
144144

145145
## 收集
146146

147-
- 报告通道统一:GitHub 是两种模式共用的真相源;dev 终报先落 issue 评论、再作返回消息。
148-
- 收集先扫 GitHub,标记评论在 = 报告完整;两处皆无才进探活/判死。
147+
- 收集先扫 GitHub(两种模式),标记评论在 = 报告完整;评论与返回消息皆无才进探活/判死。
149148
- 标记两种拼写等效(HTML 注释形、首行 `os-dev-report`);⛔ 永不把没收到失败通知读作还在跑。
149+
- 报告点名 PR ⇒ 会话席当即 `subscribe_pr_activity` 并记座位贴;中继开的 PR 永不自动挂会话。
150150
- 探活是每轮巡检的固定动作;完成通知不可靠,缺席什么都不证明。
151151
- ① 巡检首动作 `list_triggers` 确认 Routine 启用,在飞重挂加速器;唤醒归 Routine,漏挂不断链。
152152
- ② 在飞期间主巡检间隔 ≤45 分钟,待命期 60–70;节奏维护者明示可改。

‎.claude/skills/pm-dispatch/references/landing-operations.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@
4646

4747
## B. 跟到 MERGED 为止;入队后的看护归车道 PM 落地窗口
4848

49-
- 车道 PM 的权责三件:验收(复核清单)、首次入队、确认 MERGED。
49+
- 车道 PM 的权责三件:验收(复核清单)、首次入队、确认 MERGED;落地执行在案判决,非自批。
5050
- 首次入队:ACCEPT 后挂 6–9 分钟 flip 定点,到点核门禁 job 结论。
51-
- 绿即转 ready + 挂 auto-merge;未绿按阶梯重挂定点。
51+
- 绿即转 ready + 挂 auto-merge,只走 `settings.json` allow 行的 ccr 两命令;未绿按阶梯重挂定点。
5252
- CI success webhook 不可靠:⛔ 不坐等,也 ⛔ 不忙轮询;定点文本照定时器写法纪律。
5353
- undraft 撞 429 ⇒ 落地入等 `resets at` 态:该刻记卡,到点一次重试;⛔ 不报阻塞、不自定节奏。
54+
- 落地中遭分类器拒 ⇒ 停手、报维护者、卡上记命令与拒因;⛔ 不换拼法或改走中继绕过。
5455
- 确认 MERGED 要两个读数:每轮同时读队列分支与 `origin/main`。
5556
- 契约复核 PASS 落地的 PR 到窗口时已 ready 且 auto-merge 在挂,见 `contract-review.md`。
5657
- 窗口自身权责不变:跟到 MERGED、踢出处置、落地后对账。
@@ -73,8 +74,7 @@
7374
- 取 open 卡清单对照预期 diff:预期之外从 open 消失的,就是被闭合关键词静默误关的卡。
7475
- 落地后再核一次落地判据本身:队列的合并同样走 os-regen,A 的静默吞并一样能发生。
7576
- MERGED 不是终点:发版后义务见 `release-aftercare.md`。
76-
- 落地窗口给关键 PR 挂 `subscribe_pr_activity`,会话型座位专用;Routine 座位维持轮询。
77-
- ⛔ 不订阅 dev 交报告前的 PR;订阅是感知补充,⛔ 不替代 flip 定点。
77+
- 会话席窗口内 PR 须在挂 `subscribe_pr_activity`,缺即补;⛔ 不早于报告,Routine 座位轮询。
7878
- MERGED 或关闭即退订,同刻把 `mode:cloud` 派的会话 `archive_session`。
7979
- 触发条件是卡终局且报告已收复核;⛔ 合并前不归档,误归档可 unarchive 但容器现场已失。
8080
- 暂停或交接时把在挂订阅清点进座位贴,⛔ 不留孤儿订阅。

‎.claude/skills/pm-dispatch/references/reading-discipline.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- 门禁两次误报(假红、实测假绿、处方句点名不存在路径)⇒ 删肢或删门禁,PR 引两次测量。
2121
- 只有护产品落地或用户可见契约的门禁才立修复卡;门禁上「稳定 > 功能」= 更少零件。
2222
- 自设定时器的文本以先重读状态开头,只写关键判据(若 X 则 Y),其余指针化。
23-
- 定时器文本 ⛔ 不写结论、不含未经重读即可执行的祈使句。
23+
- 定时器文本 ⛔ 不写结论、不含未经重读即可执行的祈使句,⛔ 不带判决与落地类写动词。
2424
- 放行认门禁 job 的结论(`completed: success`),⛔ 不认聚合读数。
2525
- advisory 门禁红着进 main 是共享损伤,任何车道发现都立即止血并立单,见 landing-operations B。
2626
- 仪器纪律(硬门禁面、只报告面、新增授权、工具位)见 `references/instrument-discipline.md`。

0 commit comments

Comments
 (0)