@loomhelm/multi-task-flow 0.0.0-stage → 0.2.6

package/toolkit/skills/docs/vendor/dot-codex/specs/r4m7k-fast-track-merge-intent-closeout/IMPLEMENTATION.md

@@ -0,0 +1,176 @@
+# Fast-track merge intent closeout 实现状态
+
+> 当前有效规范仍以 `./SPEC.md` 为准；这里记录实现覆盖、交付进度与 rollout 相关事实，避免这些细节散落到 PR / Git 历史里。
+
+## Current Status
+
+- Implementation: 已实现
+- Delivery role coverage: `direct|child|aggregate` 已在 fast-flow、PR create/merge 与 initiative handoff 对齐
+- Lifecycle: active
+- Catalog note: 普通“合并”完成 PR merge、远端 head 删除与 primary base 对齐；merge 后先跟踪 merge-SHA target CI，再判定仓库发布链。预期发版必须等待实际 Release/package/container 终态，并报告版本/tag、channel、SHA、链接、时间与产物摘要
+
+## Historical rollout snapshot
+
+- Legacy status snapshot: 已实现
+- Legacy created: 2026-03-17
+- Legacy last-tracked: 2026-03-17
+- Current lifecycle: active
+- Catalog note: 普通“合并”完成 PR merge、删除远端 PR head，并让 Git primary worktree 的 PR base 包含最新 remote base；dirty/ahead/diverged 时进入待决策菜单，只有“合并并收尾”才进入本地 cleanup；merge 后按 merge SHA 使用 sub-agent 追踪目标分支 CI
+
+## Delivery Milestones
+
+- [x] M1: 建立规格与 README 索引
+- [x] M2: 对齐 shared contracts 与入口 skill
+- [x] M3: 扩展 replay checker 与 fixtures
+- [x] M4: 跑本地校验并收口到 Step 5L Ready（local）
+- [x] M5: 以 sub-agent 替换计划任务作为 PR/head 与 post-merge target-branch CI 的主追踪路径，将不变量下沉到共享 CI tracking contract，并保留 watcher/defer fallback
+- [x] M6: 将 post-merge 扩展为 target CI + repository release chain 双终态门禁，并用 replay 覆盖发布状态机
+
+## Rollout Artifacts
+
+### Docs touched
+
+- `docs/specs/README.md`
+- `docs/specs/fast-track-merge-intent-closeout/SPEC.md`
+- `AGENTS.md`
+- `skills/project-engineering-workflow/references/ci-tracking-short-contract.md`
+- `skills/project-engineering-workflow/references/release-tracking-short-contract.md`
+- `skills/project-engineering-workflow/references/pr-diagnosis-short-contract.md`
+- `skills/project-engineering-workflow/references/review-proof-short-contract.md`
+- `skills/project-engineering-workflow/SKILL.md`
+- `skills/fast-flow/SKILL.md`
+- `skills/flow-continue/SKILL.md`
+- `skills/pr-create/SKILL.md`
+- `skills/pr-merge/SKILL.md`
+- `skills/pr-post-merge-cleanup/SKILL.md`
+- `skills/dev-plan/SKILL.md`
+- `bin/pr_skill_replay_check.py`
+- `docs/specs/fast-track-merge-intent-closeout/replay/*`
+
+### Plan assets
+
+None
+
+### Asset promotion
+
+None
+
+## Related Changes
+
+- `ff72d05` fix(flow): align fast-track merge closeout semantics
+- current worktree: add `skills/pr-merge/scripts/base_alignment_helper.py` plus unit coverage so merge-only closeout can inspect/apply primary-base alignment without relying on ad-hoc shell prose
+- current worktree: make fast-track stop at aggregate `Step 5C Ready` until owner approves the current head SHA, while child merges return to integration CI instead of Step 6
+- current worktree: extend the helper with `safe-align`, including backup-branch creation, `stash -u`, `rebase`, `stash apply`, and recoverable conflict reporting for owner-approved base alignment
+- `b39a914` docs(specs): adopt topic-level spec model
+- current worktree: distinguish plain merge from merge+cleanup; cleanup includes PR worktree deletion
+- current worktree: once stop condition is `merge-only` / `merge+cleanup` and Step 5 merge path is active, same-PR in-scope writable convergence is on by default; `merge-ready` still stops at `Step 5C Ready`
+- review follow-up: classify explicit cleanup phrases such as `合并 PR 并收尾` / `merge PR and cleanup` before plain merge-only substrings
+- review follow-up: recognize flow-anchor stop conditions such as `收工条件=merge+cleanup` as merge+cleanup intent
+- review follow-up: require actual cleanup evidence (`$pr-post-merge-cleanup`, `cleanup_skill_invoked=yes`, or `cleanup_proof`) instead of trusting assistant summary text such as `本地收尾=完成`
+- review follow-up: keep explicit `merge+cleanup` anchors even when the same line contains readiness wording, and reject negated `$pr-post-merge-cleanup` mentions as cleanup proof
+- review follow-up: require positive `cleanup_proof` values and restrict assistant-side cleanup intent to explicit state anchors, not option text
+- review follow-up: preserve `merge-ready` for `准备好合并 PR`, reject `不会/不调用 $pr-post-merge-cleanup`, and keep assistant `merge+cleanup` state anchors even when the same line says proof is not ready
+- review follow-up: reject future-tense `$pr-post-merge-cleanup` promises as cleanup proof; proof must come from positive structured fields
+- review follow-up: allow positive cleanup proof on lines that also report merge-scope base update skips
+- review follow-up: restrict merge evidence to actual merge tool invocations and cleanup proof to trusted final cleanup status, so diagnostic command text cannot satisfy merge/cleanup gates
+- review follow-up: parse `gh` merge commands with global flags such as `--repo`, and require mutating `gh api --method PUT .../merge` before counting API calls as merge evidence
+- review follow-up: enforce cleanup proof only after merge success evidence, so failed merge attempts do not require post-merge cleanup
+- review follow-up: ignore `gh pr merge --help` as non-execution, and let later explicit merge-ready requests supersede earlier merge/cleanup intents
+- review follow-up: unwrap `sh/bash/zsh -c` before detecting real `gh` merge calls
+- review follow-up: scan simple shell command segments and scope merge evidence to the active intent
+- review follow-up: prefer mutating merge segments when a shell command runs diagnostic `gh` calls first
+- review follow-up: parse `shell` command arrays and let cleanup intent win over ready substrings
+- review follow-up: reject future cleanup proof placeholders and keep active proof closeout blocking merge wording
+- review follow-up: recognize path-qualified `gh` merge invocations by executable basename
+- review follow-up: reuse merge-success parsing for final task closeout text
+- owner correction: remote PR head deletion belongs to merge scope; local branch/worktree deletion remains cleanup
+- owner correction: plain merge also owns Git primary worktree PR base alignment, where aligned means local base contains latest remote base; local PR topic branch/worktree deletion still remains cleanup
+- owner correction: alignment means local base contains latest remote base; local ahead commits may remain after owner-approved safe alignment. plain merge auto-update is limited to clean exact/ff-only states; dirty/ahead/diverged primary base should become `主工作区基线更新=待主人决策` with a safe-align menu, and safe-align must restore dirty/untracked content to the worktree after stash/rebase.
+- review follow-up: allow explicit fork/protected remote-head delete exemptions and detect `gh api ... -X DELETE` after the endpoint
+- review follow-up: treat `[deleted] <branch>` as success even when branch names contain failure words, and reject negated fork diagnostics as exemptions
+- review follow-up: parse common `git push origin --delete <branch>` / `git push origin -d <branch>` forms as remote PR head deletion proof
+- review follow-up: reject `gh api ... -X DELETE` failure output such as `gh:` / HTTP 4xx as remote branch deletion proof
+- review follow-up: require tool evidence for `远端分支=不存在`; assistant final status alone is not deletion proof
+- review follow-up: treat explicit tool output such as `remote branch: not found` as successful absence verification
+- review follow-up: accept deletion-looking output only from recognized delete or verification commands, not unrelated diagnostics
+- review follow-up: reject failed `gh pr merge --delete-branch` deletion output and wrong-branch deletion when `headRefName` is known
+- review follow-up: strip natural sentence punctuation from captured PR head names before matching deletion output
+- review follow-up: parse compound remote-delete commands by shell segment before matching verification output
+- review follow-up: require PR head evidence for branch-specific deletion proof and recurse into shell-wrapped compound deletes
+- review follow-up: ignore shell redirection and pipeline suffixes when extracting `git push --delete` branch names
+- review follow-up: normalize `refs/heads/` prefixes from git delete refspecs before matching PR head
+- review follow-up: split multiline shell scripts and capture PR head names with non-alphanumeric ref characters such as `+`
+- review follow-up: preserve `||` fallback semantics so a successful merge does not imply an unexecuted fallback branch delete
+- review follow-up: require concrete fork, permission, or protection evidence before accepting remote branch deletion exemptions
+- owner follow-up: merge-scope base alignment now has a dedicated helper that always resolves the Git primary worktree first, auto-applies only safe ff/tracking-ref updates, and leaves dirty/ahead/diverged primary-base states on the existing owner-decision path
+- owner follow-up: once the owner explicitly chooses `安全对齐`, the helper now performs the rebase path itself and reports `backup_branch` / `stash_ref` / recoverable conflict state instead of forcing agents back into ad-hoc shell composition
+- compression pass: reduce repeated skill prose while keeping the shared stop-condition contract as the single source of truth
+- current worktree: split local Step 4 wording from live PR status: local handoff is now `可开 PR（local）`, while `merge-ready` / `Step 5C Ready` / `latest PR 可立即合并` require `PR状态=存在`; `pr_skill_replay_check.py` now reports `READY_CLAIM_WITHOUT_OPEN_PR` when this is violated
+- merge-proof follow-up: terminal `task_complete.last_agent_message` is now treated as assistant text for ready-claim detection, and replay coverage includes a final-message-only false-claim case
+- current worktree: replace the scheduled app-automation path with one low-cost sub-agent tracker per PR head SHA or merge SHA, centralize its invariants in the shared CI tracking contract, block main-agent on `wait_agent`, allow one transient rerun, and report code failures
+- current worktree: add a separate release tracking contract and expand shared Step 6 into target-CI plus repository-release barriers; release snapshots now hand off intent only, expected releases wait up to 30 minutes for actual publication, and every remote merge reports release status
+- review follow-up: once `merge+cleanup` already has a positive `cleanup_proof`, `flow-continue` must resume `$pr-merge` for unresolved Step 6 follow-up instead of rerunning `$git-cleanup`
+- review follow-up: non-positive `cleanup_proof` values such as `blocked|pending|unchecked` must continue `$git-cleanup` rather than skipping ahead to `$pr-merge`
+- review follow-up: `flow_continue_replay_check.py` now covers both the positive-proof resume path and the non-positive-proof keep-cleanup path with dedicated `docs/specs/fast-track-merge-intent-closeout/SPEC.md` replay cases
+- review follow-up: CI tracker replay now requires a real `wait_agent` function call, validates a concrete SHA, and distinguishes historical `app-automation` state from an actual automation launch
+- review follow-up: CI tracker replay now binds launch, wait, and SHA evidence to the same tracker instance, accepts automatic `push`-triggered PR checks, and ignores unrelated automation pause/archive calls
+- review follow-up: CI tracker replay now matches `wait_agent.targets` and the reported SHA against the launch-bound tracker identity and SHA, with defer closeout kept separate from terminal tracker evidence
+- review follow-up: CI tracker replay now accepts implicit `wait_agent` barriers, resolves spawned identities from function output/activity, preserves earlier matching waits, and checks the launch phase against the returned tracker card
+- review follow-up: CI tracker replay now rejects launches without a status card, prefers concrete agent identities over task names, and ignores scheduled automation outside the active follow-up mode
+- review follow-up: CI tracker replay now accepts the PR-head result card, requires completed wait output, and falls back to the returned checked SHA when spawn arguments cannot expose the encrypted prompt binding
+
+## Remaining Gaps
+
+- review follow-up: CI tracker replay now requires terminal post-merge result/disposition fields and detects scheduled launches that precede their legacy status card
+- review follow-up: CI tracker replay now derives phase only from structured launch metadata or canonical tracker names, validates post-merge-only fields, and filters negated automation mentions
+
+- Replay checker coverage for the release state machine is implemented in this change and must remain green with the existing CI tracker suite.
+
+## Current Validation
+
+- `pr_skill_replay_check.py`: passed, including published, not-triggered, snapshot-early-close, running, failed, retry-success, timeout, SHA/tag mismatch, and metadata-missing cases
+- review follow-up: every completed remote merge now requires an explicit release status/expectation; published evidence is bound to actual tag/SHA, package/container-only evidence is accepted, contradictory expectation/status pairs fail, and timeout requires an incomplete-state recovery anchor
+- review follow-up: publication proof now preserves raw tool strings, rejects draft-only timestamps, scopes evidence to the current expectation/repository epoch, requires an actual artifact SHA, enforces one proven-safe rerun, and requires tool-side skip/absence evidence for `release_expected=false`
+- review follow-up: structured disabled decisions retain boolean values, container tags are bound to the reported version, pre-release CI reruns are excluded, and release idempotency proof must be relevant and precede the single rerun
+- review follow-up: GitHub drafts require `published_at`, publication identity is bound per tool fact, timeout requires `未终态`, release reruns bind an explicit run id, and successful closeout requires an explicit positive expectation
+- review follow-up: release reruns honor `gh` global flags, no-release decisions require evidence beyond a bare boolean, and a single publication fact must bind repository/tag/SHA while the reported version matches that identity
+- review follow-up: release expectations now accept only trusted assistant merge-status cards or structured discovery booleans, every non-N/A release outcome requires an expectation decision, and merge+cleanup resumes unresolved Step 6B after cleanup
+- review follow-up: structured discovery identity keeps its keys, publication evidence is split per artifact object with inherited parent identity, and expectation epoch changes clear all release identity state
+- review follow-up: release expectations and rerun safety now require structured attributable evidence, every declared surface must publish, and final URL/time are bound to observed artifact metadata with ISO-8601 validation
+- review follow-up: structured `release_epoch` distinguishes tracker heartbeats from new identities; same-epoch cards preserve and accumulate state, epoch changes reset it, inherited rerun flags are parsed, and assistant prose cannot overwrite repo/SHA/tag discovery
+- review follow-up: published closeout requires a trusted discovery `target_sha`, rerun detection scans every shell segment, and same-epoch no-release heartbeats preserve earlier repository evidence
+- review follow-up: workflow URLs bind the observed release run, tag comparison normalizes optional `v`, no-release evidence stays attributable to discovery, and declared package/image identities support names that differ from the source repository
+- review follow-up: no-release decisions require the full merge identity, explicitly non-success artifact records cannot prove publication, and local merges may report the release surface as not applicable
+- review follow-up: stringified JSON publication lists retain per-artifact atomicity, release reruns reject every mismatched run id, and a release epoch cannot rebind repository/SHA/tag identity
+- review follow-up: expectation cannot flip inside one release epoch, optional `v` prefixes remain equivalent in final tag checks, and failed closeout requires a bound live failure fact
+- review follow-up: pre-discovery reruns require structured Step 6A transient-CI identity, missing-epoch heartbeats cannot reset release identity, and `release_expected=unknown` remains a valid unresolved state
+- review follow-up: release reruns now require a failure fact for the exact tracked run, batched failure facts stay atomic per run, and declared surfaces are accepted only from the active release epoch
+- review follow-up: actual publication facts now reject explicit cross-epoch evidence, while GitHub Release and Actions path recognition supports the active GitHub Enterprise host
+- review follow-up: structured release discovery now unwraps JSON-string and text-content tool outputs before evaluating expectation, epoch, surfaces, identities, and retry evidence
+- review follow-up: split structured content blocks are merged, and every declared package/container identity must have its own atomic terminal publication fact
+- review follow-up: atomic facts reject any conflicting tag/SHA, same-epoch cards may add an immutable run ID, and scalar conflicts survive split-content normalization
+- review follow-up: release reruns bind any explicit `gh --repo/-R` target to the tracked repository, while equivalent short/full SHA and optional-`v` tag representations remain compatible
+- review follow-up: pre-release Step 6A rerun evidence also binds `target_repo`, preventing cross-repository run-ID collisions before release discovery
+- review follow-up: structured PR-head CI reruns remain outside release retry safety, non-GHCR package URLs bind their repository, and container alias tags coexist with the version tag
+- review follow-up: release identity now includes the target branch, and explicit tracker-unavailable outcomes may return `未终态` immediately with a recovery anchor
+- review follow-up: every rerun in a compound shell command is counted independently, and standard MCP `structuredContent` discovery output is decoded
+- review follow-up: every same-epoch tracker card keeps repository/branch/SHA/tag identity immutable, and a `gh run rerun` without a literal run ID is an unsafe retry
+- review follow-up: actual package/container publication requires an explicit terminal surface marker, release rerun invalidates prior failure evidence, and failed closeout reports both failing surface and owner disposition
+- review follow-up: `发布状态=不适用` is permitted only when neither trusted release context nor a remote-merge signal exists; local merge wording alone does not invalidate it
+- review follow-up: a remote merge becomes release context only after the merge call's success evidence, so failed merge attempts retain `发布状态=不适用`
+- review follow-up: expected or unresolved releases must retain all owner-facing fields even when not terminal-success, and structured `success=false` is a failure fact for the bound run
+- review follow-up: structured merge-success facts establish remote release context, while a target-SHA-matching failure workflow URL binds its repository without an optional release run ID
+- review follow-up: direct structured expectation fields are conflict-normalized, and release run identity starts only from explicit release-run fields rather than arbitrary workflow URLs
+- review follow-up: every remote merge success spelling establishes post-merge release context, and every expected release outcome retains the complete owner-facing field set, including published and untriggered results
+- `flow_continue_replay_check.py`: passed for both the historical `docs/specs/flow-continue-lock-guard/SPEC.md` suite and the `docs/specs/fast-track-merge-intent-closeout/SPEC.md` cleanup/release resume suite
+- Python compile, plan contract replay, `git diff --check`, and spec drift: passed
+- review-proof historical replay: blocked by a pre-existing missing `sessions/2026/03/16/...jsonl` fixture referenced by its cases file
+- `spec_disposition=update`
+- `solution_disposition=none`
+- `project_doc_disposition=update` (`AGENTS.md`, `skills/README.md`)
+- `视觉证据=不适用`; reason: workflow/docs/checker-only change with no rendered UI surface
+
+## References
+
+- `./SPEC.md`
+- `./HISTORY.md`

package/toolkit/skills/docs/vendor/dot-codex/specs/r4m7k-fast-track-merge-intent-closeout/SPEC.md

@@ -0,0 +1,370 @@
+# Fast-track merge intent closeout
+
+> 当前有效规范以本文为准；实现覆盖与当前状态见 `./IMPLEMENTATION.md`，关键演进原因见 `./HISTORY.md`。
+
+## 背景 / 问题陈述
+
+- session `019cfa20-c48c-75e2-9acd-39c94c3e1201` 暴露出一个收尾语义缺口：agent 在 latest review proof 仍处于 active 状态时提前 `task_complete`，导致“PR 已收敛”和“PR 已合并”被混成了一件事。
+- 顶层语义也存在错位：`AGENTS.md` 与 `skills/dev-plan/SKILL.md` 仍把 `fast-track` 教成“`push + PR + checks 结果明确 + review 循环结果明确` 即可收口”，但 `fast-flow` / Step 5 实际已经包含 merge-proof / cleanup 路径。
+- 这不是单个判断条件漏掉，而是三个地方同时漂移：
+  - 快车道 stop condition 必须区分普通“合并”和“合并并收尾”：普通“合并”是 `merge-only`，只有显式“合并并收尾”才是 `merge+cleanup`；
+  - `Step 5C Ready` 缺少显式 handoff 语义，导致 `$pr-create` 可以把 merge 请求降级成“只到 PR clear”；
+  - `active review proof` 与共享 `外部门禁等待态` 的 closeout guard 没有被足够前置地强调。
+- 新一轮 owner 需求又补出第四层语义：merge 后必须确认目标分支上由本次 merge SHA 触发的 CI，不能把其他 release / deploy / publish 或计划任务误归属于本次 merge。
+- session `019f9ce7-e16d-7ea0-a42b-dd260a1e260a` 又暴露出 post-merge 最后一层缺口：`Release Snapshot` 已给出 `release_enabled=True` 与 `release_tag=0.63.12`，agent 却在实际 GitHub Release `0.63.12` 完成前结束，并且最终回复没有明确报告是否发版、版本号或发布链接。
+
+## 目标 / 非目标
+
+### Goals
+
+- 将 `fast-track` 终点语义显式拆成三档：
+  - `merge-ready intent`：停在 latest PR 的 `Step 5C Ready`
+  - `merge-only intent`：普通“合并/合并 PR/merge PR/merge”继续到 `$pr-merge` 完成 merge、删除同仓远端 PR head，并让 Git primary worktree 的 PR target base branch 包含最新 remote base，或进入明确的待决策/阻断状态，且不执行本地 cleanup
+  - `merge+cleanup intent`：仅在主人明确“合并并收尾/merge and cleanup”时，完成 merge 后执行 cleanup
+- 为 `PR_ROLE=direct|child|aggregate` 固化边界：child 合入后只等待 integration CI；aggregate 的最终 merge 必须由主人对最新 head SHA 明确批准，快车道和 generic continuation 都不能代替该批准。
+- 让 `AGENTS.md`、`$fast-flow`、`$flow-continue`、shared Step 5、`$pr-create`、`$pr-merge`、`$dev-plan` 使用同一套口径，避免旧文案把已锁定 session 的 stop condition 拉偏。
+- 把“`merge-only` / `merge+cleanup` 一旦进入 shared Step 5 merge path，就默认允许 same-PR、in-scope writable convergence”写成共享 contract；`merge-ready` 只表示停在 `Step 5C Ready`，不携带这层可写语义。
+- 把“活 proof / in-budget wait-state 不得提前收尾”的硬规则前置到共享短规约和入口 skill 顶部可见区。
+- 为 merge 后目标分支上的 merge-SHA CI 引入共享 `Step 6 post-merge target-branch CI follow-up`：
+  - 默认使用一个 `gpt-5.6-luna + low` 的 sub-agent tracker，主 agent 阻塞等待
+  - sub-agent 创建或阻塞等待不可用时回退到 repo-native watcher
+  - 两种方式都不可安全建立时记录 `defer`，不由主 agent 轮询
+- 将共享 Step 6 扩展为 post-merge delivery gate：Step 6A 保留 merge-SHA target CI，Step 6B 使用独立 release tracking contract 判定并跟踪仓库发布链；预期发版时必须等待实际 Release/package/container 终态。
+- 让所有远端 merge 终态明确报告 `发布状态`；已发布时给出版本/tag、channel、绑定 SHA、链接、发布时间与产物摘要，未触发时给出判定证据。
+- 用 replay checker 固化本次事故，确保真实 session 与合成样例都能区分：
+  - 提前 closeout
+  - merge-ready 正常停靠
+  - merge-only 正常 handoff / merge
+  - merge+cleanup 正常 handoff / merge / cleanup
+
+### Non-goals
+
+- 不重写整个软件工程流程，也不改变 `local-merge` 主路径终点模型。
+- 不修改 `gh CLI` 远端控制面或 Codex runtime。
+- 不把所有 skills 做审美式全量瘦身；只处理与本次事故直接相关的入口层和共享短规约。
+
+## 范围（Scope）
+
+### In scope
+
+- 更新 `docs/specs/README.md` 与本规格。
+- 更新共享短规约：
+  - `skills/project-engineering-workflow/references/ci-tracking-short-contract.md`
+  - `skills/project-engineering-workflow/references/release-tracking-short-contract.md`
+  - `skills/project-engineering-workflow/references/pr-diagnosis-short-contract.md`
+  - `skills/project-engineering-workflow/references/review-proof-short-contract.md`
+- 对齐并适度瘦身：
+  - `AGENTS.md`
+  - `skills/project-engineering-workflow/SKILL.md`
+  - `skills/fast-flow/SKILL.md`
+  - `skills/flow-continue/SKILL.md`
+  - `skills/pr-create/SKILL.md`
+  - `skills/pr-merge/SKILL.md`
+  - `skills/dev-plan/SKILL.md`
+- 扩展 `bin/pr_skill_replay_check.py` 并新增 replay fixtures / cases。
+
+### Out of scope
+
+- 修改业务仓库代码。
+- 新增第四个大型 checker。
+- 追溯改写历史 spec 的验收标准；若有旧口径冲突，以本规格 supersede。
+
+## 需求（Requirements）
+
+### MUST
+
+- `fast-track` stop condition 必须按意图切换：
+  - `准备好 PR / 预备合并 / 准备好合并 / 完成合并前准备` => `merge-ready`
+  - `合并 / 合并 PR / merge PR / merge / 只合并 / 不收尾 / merge only / no cleanup` => `merge-only`
+  - `合并并收尾 / 合并 PR 并收尾 / 推进到合并并收尾 / merge and cleanup / merge PR and cleanup` => `merge+cleanup`
+- 泛化 `继续` 只能继承当前 stop condition，不得静默升级或降级；`合并 / 合并 PR / merge PR / merge` 是明确 merge-only 意图，不得静默升级成 cleanup。
+- 共享 Step 5 到达 `Step 5C Ready` 后：
+  - `merge-ready` 可以停下
+  - `merge-only` 与 `merge+cleanup` 必须 handoff 到 `$pr-merge`
+  - `merge-ready` / `Step 5C Ready` / `latest PR 可立即合并` 都是 live PR 当前状态表述，必须先确认 `PR状态=存在`；若当前仍无 open PR，只能表述为 `PR状态=不存在` 或本地 `可开 PR（local）`
+  - 一旦当前 stop condition 已是 `merge-only` / `merge+cleanup` 且 run 已进入 shared Step 5 merge path，默认允许 same-PR、in-scope writable convergence；覆盖 review-fix、CI/blocker fix、freshness `BEHIND`、conflict `DIRTY` / `CONFLICTING`、missing fresh merge-proof，以及这些 live facts 直接逼出的兼容修复
+  - 上述可写收敛不会覆盖 `scope expansion`、`same-PR reopen`、权限/高风险门禁或 `convergence drag blocker`
+  - 普通“合并”完成 PR merge 后必须确认远端 PR head 已删除，并停在 `本地收尾=未执行`；不得删除本地分支或工作区；Git primary worktree 的 PR target base branch 必须包含最新 remote base，或明确报告 `主工作区基线更新=待主人决策/阻断` 与原因；这不是 cleanup
+  - `主工作区基线更新=已更新` 表示 local base 已包含 remote base；在用户选择安全对齐并完成 rebase 后，local base 仍可保留本地 ahead commits。
+  - plain merge 的自动更新只覆盖 clean exact match 或 clean ff-only；dirty/ahead/diverged primary base 不得被默默归为硬阻断或直接当作已更新，若用户可以选择安全对齐，必须报告 `主工作区基线更新=待主人决策`，并提供 `安全对齐 / 保持阻断 / 稍后处理` 三选项菜单。
+  - 用户选择 `安全对齐` 时，skill 必须创建备份分支、stash dirty/untracked、把 local base rebase 到 remote base，然后把 stash apply 回 primary worktree 并保留 stash 备份；不得把 dirty/untracked 只留在 stash 里当作完成。
+  - rebase 或 stash apply 冲突时，skill 必须停在可恢复状态，报告 backup branch、stash ref、当前 rebase/apply 状态；不得自动 abort 或自动选择 ours/theirs。
+  - `main`/PR base branch 不得被 checkout 到 linked/disposable worktree；若 base branch 已由非 primary worktree 持有，merge-only 必须把主工作区基线更新报告为阻断而不是自动搬移
+  - “合并并收尾 / 合并 PR 并收尾 / merge PR and cleanup”完成 PR merge 后必须进入 cleanup，包含安全删除已合并 PR head 本地分支与 PR 工作区；删除工作区是收尾的一部分
+  - 若 merge / cleanup 完成后，本次 merge SHA 在目标分支上触发的 CI 仍未终态，则 run 不得直接报 terminal success；必须先把共享 `Step 6 post-merge target-branch CI follow-up` 决议到 `none|sub-agent|repo-watcher|defer`
+  - `Step 6` 默认使用绑定 merge SHA 的 sub-agent tracker；主 agent 必须通过阻塞式 `wait_agent` 等待 tracker，不得自行轮询；sub-agent 不可用时才回退 repo-native watcher，再不可用才 `defer`
+  - `Step 6` 的默认模型策略必须是：
+    - PR CI 与 post-merge CI 观察：`gpt-5.6-luna` + `low`
+  - merge 之后只允许对已存在且明确属于瞬态基础设施故障的 CI run rerun 一次；不得 dispatch 新 workflow、改代码、创建 follow-up PR 或直接写入 merged base
+  - target-branch CI 终态后必须继续判定 `release_expected=true|false|unknown`；CI 内的 `Release Snapshot` / intent job 只能提供候选 version/tag/channel，不能证明实际发布
+  - `release_expected=true` 时，仓库声明的 Release/package/container 等发布面必须与 merge SHA/version 形成可核验绑定并达到实际终态；否则不得报告成功收口
+  - release tracking 等待预算为 30 分钟；预算耗尽必须返回 `发布状态=未终态` 与恢复锚点，不能把 target CI green 写成整个 run 完成
+  - 发布失败只在可证明幂等且 retry-safe 时允许 rerun 已存在 run 一次；不得盲目 dispatch、修改 merged code 或重复创建半发布产物
+  - 每次远端 merge 最终输出必须有 `发布状态`；发布成功时核心元数据与产物摘要不得缺失，未触发时必须给出一行 live/repository-contract 证据
+- 只要 latest `active review proof` 未终态，任何父 flow / PR skill 都不得宣告“完成 / 收尾完成”或触发 `task_complete`。
+- 若本轮只能因共享等待预算耗尽停下，结论必须明确写 `等待预算耗尽`，且 `流程锚点.下一门禁` 只能指回继续轮询当前外部门禁等待态。
+- `bin/pr_skill_replay_check.py` 至少覆盖：
+  - `ACTIVE_GATE_CLOSED_OUT_EARLY` 历史回归 fixture
+  - 一个 `merge-ready` 正例
+  - 一个 `merge+cleanup` 正例
+  - 一个没有 open PR 却宣告 `Step 5C Ready` 的反例，必须报 `READY_CLAIM_WITHOUT_OPEN_PR`
+
+### SHOULD
+
+- 入口 skill 顶部前 100-150 行应直接出现：
+  - `merge-ready` vs `merge-only` vs `merge+cleanup` stop condition
+  - `Step 5C Ready` handoff 规则
+  - `active review proof` 不得提前收尾
+- 共享真相源优先下沉到短规约，入口 skill 只保留职责、例外和输出契约，减少 partial-read 注意力漂移。
+
+## 功能与行为规格（Functional/Behavior Spec）
+
+### Fast-track stop condition
+
+- `fast-track` 不再默认等同于“只把 PR 收到绿”。
+- stop condition 来自最近一次明确意图，且对 generic continuation 稳定：
+  - 若当前已是 `merge-ready`，后续泛化 `继续` 仍只推进到 `Step 5C Ready`
+  - 若当前已是 `merge-ready`，后续明确 `合并 / 合并 PR / merge PR / merge` 必须把 stop condition 更新为 `merge-only`
+  - 若当前已是 `merge+cleanup`，后续泛化 `继续 / 收尾` 必须继续 merge-path 并完成 cleanup
+  - 若当前已是 `merge-only`，后续泛化 `继续` 只继承不收尾语义；后续明确“收尾/cleanup”才进入 `$pr-post-merge-cleanup`
+
+### Shared Step 5 handoff
+
+- `$pr-create` 负责把 latest PR 收敛到 `Step 5C Ready`。
+- `$pr-merge` 负责 final refresh、fresh merge-proof、merge、远端 PR head 删除、Git primary worktree 的 PR base 对齐或待决策/阻断报告，并且只在 `merge+cleanup` stop condition 下执行本地 cleanup；`merge-only` 只跳过本地 cleanup，不跳过 merge gate、远端分支删除或主工作区基线门禁。
+- `Step 5C Ready` 本身不是“是否收尾”的答案；真正答案来自当前 stop condition。
+- child PR 的 merge 不是 initiative 的终态：它不触发 Step 6/release tracking，必须交回 `$initiative-flow` 等待 integration CI 后才允许关闭 Ticket。
+- aggregate PR 的 `Step 5C Ready` 仍不是最终 merge 授权；只有主人明确批准其当前 `PR.head.sha` 才能调用 `$pr-merge`。
+
+### Merge-path writable convergence
+
+- `merge-ready` 只定义停靠点：latest PR 到达 `Step 5C Ready` 后可以停下，但不会自动授权在当前 PR 上继续产出新的 review-fix / merge-proof / freshness / conflict 修复提交。
+- `merge-only` / `merge+cleanup` 则同时定义 merge-path 上的默认可写收敛语义：只要当前 run 已进入 shared Step 5 merge path，就默认允许 same-PR、in-scope writable convergence。
+- 这层默认可写收敛覆盖：
+  - reviewer feedback / review threads
+  - current CI/blocker fixes
+  - freshness `mergeStateStatus=BEHIND`
+  - conflict `mergeStateStatus=DIRTY` / `mergeable=CONFLICTING`
+  - missing fresh merge-proof
+  - 以及上述 live facts 直接逼出的兼容修复
+- 这层默认可写收敛不等于 `same-PR reopen`：
+  - 不允许普通 merge-path 修复顺势扩范围
+  - 不会提供额外验证次数预算，也不会重置 `PR收敛修复轮次`、repair permit 或 PR 绑定门禁
+  - 仍受 shared `post-open scope freeze`、权限/风险门禁与 `convergence drag blocker` 限制
+
+### Closeout guard
+
+- `active review proof` 一旦达到 `startup_success`，只能 relay/poll，不能被重写成共享 `外部门禁等待态`。
+- 若 proof / in-budget wait-state 仍 live，skill 只能继续轮询，不能宣告完成。
+
+### Post-merge target-branch CI follow-up
+
+- `merge-only` 与 `merge+cleanup` 都只解决“PR 已合 / 本地收尾是否完成”；如果目标分支上本次 merge SHA 的 CI 仍在运行，不能直接报告终态。
+- `Step 6` 只追踪 `target_repo + target_branch + merge_sha` 对应的 `push` CI 与 CI check runs，排除 schedule、workflow_dispatch、release、deploy、publish。
+- `后续追踪=sub-agent`：一个 `post-merge-ci-tracker` 绑定一个 merge SHA；tracker 终态前主 agent 必须阻塞等待。
+- `后续追踪=repo-watcher`：仅在 sub-agent 创建或阻塞等待不可用时使用同一 SHA 绑定的仓库 watcher。
+- `后续追踪=defer`：sub-agent 与 watcher 都无法安全接管时，记录最小可恢复事实，不得让主 agent 自己轮询。
+- `Step 6` 不是 generic wait-state 的延长线，而是一次有明确 SHA 所有权的 CI 观察 barrier。
+- post-merge CI 失败时默认为 `report-only`；仅瞬态基础设施失败允许一次已有 run 的 rerun，其他失败唤醒主 agent 报告，不自动改代码。
+
+### Post-merge repository release chain
+
+- Step 6A target CI clear 后进入 Step 6B；release tracking 使用独立合同，避免把有副作用的发布 retry 语义混入 CI tracker。
+- 发版预期由仓库 workflow/config/标签合同与绑定 merge SHA 的 live facts 共同决定。缺乏充分证据时保持 `unknown`，不能静默写成“未发版”。
+- `Release Snapshot`、release intent、build artifacts 或 workflow green 只证明候选发布身份；`发布状态=已发布` 必须有实际 GitHub Release/package/container 等仓库声明产物终态。
+- release tracker 绑定 `target_repo + merge_sha + version/tag`，30 分钟内持续等待；失败仅在幂等安全时 rerun 一次，timeout/不可追踪均保持流程未完成。
+- 独立生产部署不自动进入本门禁；只有仓库把部署声明为同一 release pipeline 的组成部分时才跟踪。
+
+### Replay checker
+
+- focused checker 继续复用 `bin/pr_skill_replay_check.py`。
+- 新增两类 finding：
+  - `MERGE_INTENT_DROPPED_TO_PR_CONVERGENCE`
+  - `ACTIVE_GATE_CLOSED_OUT_EARLY`
+- Step 6 replay 还必须拒绝 `LEGACY_SCHEDULED_TRACKER_ROUTE`、缺少状态卡的 tracker，以及缺少同一 tracker 启动、phase/SHA 卡片或 `wait_agent` 的 sub-agent tracker；旧 tracker 的证据不得污染新 tracker。
+- PR head tracker 卡片使用 `result + tracking_target + checked_sha`；post-merge tracker 额外使用 `后续追踪 + 追踪目标 + 追踪绑定sha`。`wait_agent` 只有在对应完成输出明确 `timed_out=false` 后才算 barrier。
+- 对历史回归 fixture，至少应能报出其中一个 finding。
+- 必须识别流程锚点中的 stop condition 形式，例如 `收工条件=merge+cleanup` / `stop condition=merge+cleanup`，不能只识别自然语言指令。
+- 必须识别 shell-wrapped `gh` merge 调用，例如 `/bin/zsh -lc 'gh pr merge ...'`、`bash -lc 'set -e; cd repo && gh pr merge ...'`。
+- merge 证据必须出现在当前 active merge intent 之后，不能用早先 turn 的 merge 调用满足后续 intent。
+
+## 验收标准（Acceptance Criteria）
+
+- Given `ACTIVE_GATE_CLOSED_OUT_EARLY` 历史回归 fixture When 跑 replay checker Then 必须至少报出 `ACTIVE_GATE_CLOSED_OUT_EARLY` 或 `MERGE_INTENT_DROPPED_TO_PR_CONVERGENCE`。
+
+- Given `merge-ready intent` When latest PR 到达 `Step 5C Ready` Then skill 可停在可立即合并态，且 replay checker 通过。
+
+- Given 当前事实是 `PR状态=不存在` When assistant 宣告 `Step 5C Ready` / `latest PR 可立即合并` Then replay checker 必须报 `READY_CLAIM_WITHOUT_OPEN_PR`，并要求改用 `可开 PR（local）` 或先进入 `$pr-create`。
+
+- Given `准备好合并 PR` When latest PR 到达 `Step 5C Ready` Then replay checker 必须按 `merge-ready` 处理，不能被 `合并 PR` 子串误判为 `merge-only`。
+
+- Given `merge+cleanup intent` When latest PR 到达 `Step 5C Ready` Then flow 必须继续进入 `$pr-merge` 或已出现实际 merge 调用，且 cleanup 结果必须可验证。
+
+- Given `merge-only` 或 `merge+cleanup` 已进入 shared Step 5 merge path When 当前剩余阻断主要是 reviewer feedback / review threads Then flow 必须直接续推到 `$pr-create`，而不是再追问是否切到 PR convergence。
+
+- Given `merge-only` 或 `merge+cleanup` 已进入 shared Step 5 merge path When latest `PR.head.sha` 缺 fresh merge-proof Then flow 必须允许 same-PR writable merge-proof convergence；若当前 run 停在“需要额外授权才能跑 writable review-loop”，则视为 contract 失败。
+
+- Given `merge-only` 或 `merge+cleanup` 已进入 shared Step 5 merge path When live PR facts 显示 `mergeStateStatus=BEHIND`、`mergeStateStatus=DIRTY` 或 `mergeable=CONFLICTING` Then flow 必须继续 freshness / conflict auto-heal，而不是把 merge 请求降级成额外授权问题。
+
+- Given `merge+cleanup intent` When cleanup proof 为正向值，但同句记录 `主工作区基线更新=阻断/待主人决策` Then replay checker 必须通过，不能把 merge scope 的阻断或待决策状态误判为 cleanup 未执行。
+
+- Given `merge+cleanup intent` When 已存在正向 `cleanup_proof`，但共享 `Step 6` 仍是 `后续追踪=unchecked|blocked` Then flow 恢复必须回 `$pr-merge` 清掉 follow-up gate，不能再次续推 `$git-cleanup`。
+
+- Given `merge+cleanup intent` When `cleanup_proof=blocked|pending|unchecked` 等非正向值，且共享 `Step 6` 仍是 `后续追踪=unchecked|blocked` Then flow 恢复不得把 cleanup 当作已完成；必须继续 `$git-cleanup`，不能直接回 `$pr-merge`。
+
+- Given `merge-only` 或 `merge+cleanup` 已完成 merge-scope 与必要 cleanup When 本次 merge SHA 在目标分支上触发的 CI 仍未终态 Then flow 不得直接宣告 terminal success；必须先把共享 `Step 6` 决议成 `后续追踪=none|sub-agent|repo-watcher|defer`。
+
+- Given merge SHA 的目标分支 CI 仍在运行 When `Step 6` 需要建立 CI tracker Then flow 必须启动一个绑定该 SHA 的 `post-merge-ci-tracker`，并让主 agent 进入阻塞式 `wait_agent`，不得由主 agent 轮询。
+
+- Given target CI 的 `Release Snapshot` 输出 `release_enabled=True` 与候选版本 When 实际 Release/package/container 尚未终态 Then flow 必须继续 Step 6B，不能宣告 post-merge 完成或把 snapshot 写成已发版。
+
+- Given 仓库合同与 live facts 证明本次 merge 不触发发版 When flow 输出最终 merge 结果 Then 必须用同一 `release_epoch + target_repo + target_sha` 的结构化 discovery 明确报告 `发布状态=未触发` 与判定依据，不能省略发版结论或复用无关/过期 skip evidence。
+
+- Given 仓库发布链成功发布版本 When flow 报告 `发布状态=已发布` Then 版本/tag、channel、merge SHA、Release 或 workflow URL、发布时间和产物摘要必须齐全并相互匹配；任何明确为 failed/cancelled/running 的 artifact 或父 release run 都不能作为发布成功证据。
+
+- Given 仓库声明的 package/image 名称与 source repository 不同 When Step 6B 绑定实际发布产物 Then discovery 必须记录结构化 `release_surface_identities`，并按声明的产物身份验证 URL/tag/SHA；不得要求 image path 与 `target_repo` 字面相同。
+
+- Given flow 报告 Release URL 或 workflow URL When Step 6B 宣告发布成功 Then 每个已报告链接必须绑定同一 release identity 的实际 artifact 或 `release_run_id` live fact，且版本 tag 的可选 `v` 前缀应按等价标识处理。
+
+- Given 预期发版运行超过 30 分钟 When 当前 turn 停靠 Then 必须报告 `发布状态=未终态`、post-merge 未完成与同一 tracker 的恢复锚点，不能报告成功。
+
+- Given 发布 run 失败 When repo contract/live facts 不能证明幂等安全 Then 不得自动 rerun；只有可证明幂等时才允许对既有 run rerun 一次。
+
+- Given sub-agent 创建或阻塞等待不可用，但仓库已有或本轮可安全建立 watcher surface When `Step 6` 需要 CI tracker Then flow 必须使用同一目标分支与 merge SHA 的 repo-native watcher，不得让当前 CLI 会话长期 sleep/poll。
+
+- Given sub-agent 与 repo-native watcher 都不可用 When `Step 6` 需要 CI tracker Then flow 必须记录 `后续追踪=defer`，不把主 agent 轮询作为替代路径。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When PR merge 成功 Then flow 必须确认 `远端分支=不存在`、完成或待决策/阻断报告 Git primary worktree 的 PR base 对齐，并停在 `本地收尾=未执行`，不得调用 `$pr-post-merge-cleanup`，不得删除本地分支或 PR 工作区。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When PR merge 成功，primary base dirty/ahead/diverged 但可由用户选择安全对齐 Then flow 必须报告 `主工作区基线更新=待主人决策`，并提供 `安全对齐 / 保持阻断 / 稍后处理` 三选项菜单；不得只报告硬阻断后结束。
+
+- Given 用户选择 `安全对齐` When skill 需要 stash dirty/untracked 才能 rebase local base Then skill 必须在 rebase 后把 stash apply 回 primary worktree，并保留 stash 备份；不得把 dirty/untracked 只留在 stash 中。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When replay 里出现 PR merge 调用、远端分支删除证据，且没有后续 `$pr-post-merge-cleanup` 调用或 cleanup 结果 Then replay checker 必须通过，因为普通合并不是收尾。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When PR merge 成功但没有远端 PR head 删除证据 Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`，不能把远端分支遗漏归到本地 cleanup。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When 只有 assistant 最终状态写 `远端分支=不存在`，但没有删除命令或工具输出 Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When unrelated command output contains `remote branch: not found` or `[deleted]` Then replay checker 不能把它当成远端 head 删除证据。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When `gh pr merge --delete-branch` 合并成功但同一输出报告 branch delete 失败 Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When 已知 `headRefName` 且删除输出里的 branch 不是该 PR head Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When PR head 以自然句记录为 `PR head branch: topic.` Then replay checker 必须按 `topic` 匹配后续删除证据，不能把句尾标点当成分支名。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When PR head 来自 fork 或受权限/保护规则阻断无法删除 Then replay checker 允许带有 fork、权限或保护规则具体原因的远端删除豁免，不误报远端分支遗漏。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When replay 使用 `gh api repos/.../git/refs/heads/<branch> -X DELETE` Then replay checker 必须识别为远端 head 删除证据。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When `gh api ... -X DELETE` 输出 `gh:` 或 HTTP 4xx/5xx 错误 Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When 工具输出确认 `remote branch: not found` Then replay checker 必须把它视为远端 head 已不存在，而不是通用命令失败。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When replay 使用 `git push origin --delete <branch>` 或 `git push origin -d <branch>` Then replay checker 必须识别为远端 head 删除证据。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When replay 使用 `git push origin --delete <branch> && gh pr view ...` Then replay checker 必须按第一个 shell segment 识别被删除分支，不能把后续命令参数当成分支名。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When merge 与 `git push origin --delete <branch>` 包在 `bash -lc` / `zsh -lc` 内 Then replay checker 必须递归解析 wrapper 内的 shell segment，并识别远端 head 删除证据。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When `git push origin --delete <branch>` 后接输出重定向或管道 Then replay checker 必须只用 `git push` 的 refspec 参数识别被删除分支，不能把重定向或管道参数当成分支名。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When replay 使用 `git push origin :refs/heads/<branch>` Then replay checker 必须把它归一为 `<branch>` 后与 PR head 匹配。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When merge 与远端删除写在多行 shell script 中 Then replay checker 必须按换行分段识别后续 `git push --delete`。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When PR head 包含 `+` 这类合法 ref 字符 Then replay checker 必须完整捕获分支名并与删除证据匹配。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When replay 没有 PR head 证据但删除了任意远端分支 Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`，不能把任意分支删除当成 PR head 删除。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When `git push --delete` 成功输出里的分支名包含 `error` / `failed` 等词 Then replay checker 仍必须识别 `[deleted] <branch>` 为成功删除证据。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When final closeout 写 `不是 fork PR head；远端分支=存在` Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`，不能把否定 fork 诊断当成删除豁免。
+
+- Given 普通 `合并 / 合并 PR / merge PR` When final closeout 只写 `远端分支=阻断`，但没有 fork、权限或保护规则证据 Then replay checker 必须报 `REMOTE_BRANCH_NOT_DELETED_AFTER_MERGE`。
+
+- Given `合并并收尾 / 合并 PR 并收尾 / merge and cleanup / merge PR and cleanup` When replay 里出现 PR merge 调用但没有后续 `$pr-post-merge-cleanup` 调用或 cleanup 结果 Then replay checker 必须报错，不能把“只合并未收尾”判为收尾完成。
+
+- Given `merge+cleanup intent` When final closeout 只写英文 `Merged pull request ...; cleanup not executed` Then replay checker 必须报错，英文 merged wording 也算 merge success。
+
+- Given `merge+cleanup intent` When PR merge 调用被 GitHub 拒绝且结果仍是未合并 Then replay checker 不得要求 cleanup proof，因为未合并 PR 没有 post-merge cleanup 前提。
+
+- Given `merge+cleanup intent` When replay 只出现“本地收尾=完成”这类 assistant 总结，但没有 `$pr-post-merge-cleanup`、`cleanup_skill_invoked=yes` 或 `cleanup_proof` Then replay checker 必须报错，不能把总结文案当作 cleanup 证据。
+
+- Given `merge+cleanup intent` When replay 出现“未调用 `$pr-post-merge-cleanup` / 本地收尾=未执行”这类否定句 Then replay checker 必须报错，不能把否定句中的 skill 名称当作 cleanup 证据。
+
+- Given `merge+cleanup intent` When replay 出现“不会调用 / 不调用 `$pr-post-merge-cleanup`”这类否定句 Then replay checker 必须报错，不能把否定句中的 skill 名称当作 cleanup 证据。
+
+- Given `merge+cleanup intent` When replay 只承诺稍后生成 `cleanup_proof`，或写出 `cleanup_proof=未检查` Then replay checker 必须报错，不能把字段名或 pending 值当作 cleanup 证据。
+
+- Given `merge+cleanup intent` When replay 写出 `cleanup_proof=稍后生成 / later / future` Then replay checker 必须报错，不能把未来占位值当作 cleanup 证据。
+
+- Given `merge+cleanup intent` When replay 只承诺“接下来会调用 `$pr-post-merge-cleanup`” Then replay checker 必须报错，不能把未来动作承诺当作 cleanup 证据。
+
+- Given 普通 `合并 / merge` When replay 只有诊断命令或搜索结果提到 `gh pr merge` Then replay checker 必须报错，不能把命令文本命中当作真实 merge 调用。
+
+- Given 普通 `合并 / merge` When replay 使用 `gh --repo owner/repo pr merge ...` Then replay checker 必须识别为真实 merge 调用，不能误报 dropped-to-PR-convergence。
+
+- Given 普通 `合并 / merge` When replay 使用 `bash -lc` / `zsh -lc` 包裹真实 `gh pr merge ...` Then replay checker 必须识别为真实 merge 调用。
+
+- Given 普通 `合并 / merge` When replay 使用 `set -e; cd repo && gh pr merge ...` 这类 shell script 包裹真实 merge Then replay checker 必须识别为真实 merge 调用。
+
+- Given 普通 `合并 / merge` When replay 在同一 shell command 里先运行 `gh pr view ...` 再运行 `gh pr merge ...` Then replay checker 必须扫描后续 segment 并识别真实 merge 调用。
+
+- Given 普通 `合并 / merge` When replay 使用 `shell` tool 的 `command: ["bash", "-lc", "gh pr merge ..."]` 数组形态 Then replay checker 必须识别为真实 merge 调用。
+
+- Given 普通 `合并 / merge` When replay 使用 path-qualified `gh`，例如 `/opt/homebrew/bin/gh pr merge ...` Then replay checker 必须识别为真实 merge 调用。
+
+- Given 普通 `合并 / merge` When replay 早先已有 merge 调用，但后续最新 merge intent 到达 `Step 5C Ready` 后未再次 merge Then replay checker 必须报错，不能用旧 merge 调用满足新 intent。
+
+- Given 用户说 `准备好合并并收尾` When replay 到达 `Step 5C Ready` 后直接完成 Then replay checker 必须按 `merge+cleanup` 处理并报错，不能被 `准备好合并` 子串降级为 `merge-ready`。
+
+- Given 普通 `合并 / merge` When replay 使用只读 `gh api repos/.../pulls/.../merge` 探测 merge 状态 Then replay checker 必须报错，只有显式 mutating method 的 `gh api` merge 调用才算真实 merge。
+
+- Given 普通 `合并 / merge` When replay 只运行 `gh pr merge --help` Then replay checker 必须报错，help / non-execution flags 不能算真实 merge 调用。
+
+- Given 早先是 `merge+cleanup intent` When 主人后来明确改成 `准备好 PR / merge-ready` Then replay checker 必须按最新 stop condition 处理，允许停在 `Step 5C Ready`。
+
+- Given `merge+cleanup intent` When replay 只有诊断命令或搜索结果提到 `cleanup_proof=allowed_complete` Then replay checker 必须报错，cleanup proof 必须来自可信最终收尾状态。
+
+- Given 同一流程锚点同时出现 `准备好合并` 与 `收工条件=merge+cleanup` When replay 到达 `Step 5C Ready` 后直接完成 Then replay checker 必须按 `merge+cleanup` 处理并报错。
+
+- Given assistant 流程锚点包含 `收工条件=merge+cleanup` 且同句备注 `no cleanup proof yet` When replay 到达 `Step 5C Ready` 后直接完成 Then replay checker 必须保留 `merge+cleanup` 锚点并报错。
+
+- Given assistant 只是列出“准备好 PR / 合并 PR / 合并并收尾”作为选项 When 没有 user cleanup intent 且没有 assistant `merge+cleanup` state anchor Then replay checker 不得把选项文本记录为实际 cleanup intent。
+
+- Given latest `active review proof` When proof 尚未终态 Then 任何 closeout 都必须被判失败。
+
+- Given latest `active review proof` When proof 尚未终态但 final closeout 写 `PR 已合并` Then replay checker 仍必须报 `ACTIVE_GATE_CLOSED_OUT_EARLY`，merge wording 不能豁免活 proof。
+
+## 非功能性验收 / 质量门槛（Quality Gates）
+
+### Testing
+
+- `python3 -m py_compile bin/pr_skill_replay_check.py`
+- `python3 bin/pr_skill_replay_check.py --cases docs/specs/fast-track-merge-intent-closeout/replay/cases.txt`
+- `python3 bin/flow_continue_replay_check.py --cases docs/specs/flow-continue-lock-guard/replay/cases.txt`
+- `python3 bin/flow_continue_replay_check.py --cases docs/specs/fast-track-merge-intent-closeout/replay/flow-continue-cases.txt`
+- `python3 bin/review_proof_replay_check.py --cases docs/specs/review-proof-dedupe-wait-guard/replay/cases.txt`
+- `bash bin/plan_contract_check.sh --cases skills/dev-plan/references/replay-cases/CASES.txt`
+- `git diff --check`
+
+### Quality checks
+
+- 目标 skill 前 150 行人工 spot-check
+- 确认 shared contract 承担主语义，入口 skill 不再大段重复
+
+## 风险 / 假设
+
+- 风险：若未来新增新的 PR 入口 skill/prompt，但没有引用 shared short contract，可能再次把 `Step 5C Ready` 误当成统一终点。
+- 风险：过度瘦身会漏掉现有边界条件，因此本次只下沉共享语义，不删除入口 skill 的专属 guardrail。
+- 假设：focused replay checker 足以覆盖这类流程语义回归，不需要为 skills 引入更重的自动化框架。
+
+## 参考（References）
+
+- Session `019cfa20-c48c-75e2-9acd-39c94c3e1201`
+- `sessions/2026/03/17/rollout-2026-03-17T12-49-37-019cfa20-c48c-75e2-9acd-39c94c3e1201.jsonl`
+- `docs/specs/pr-skill-diagnosis-thinning/SPEC.md`
+- `docs/specs/flow-continue-lock-guard/SPEC.md`
+- `docs/specs/review-proof-dedupe-wait-guard/SPEC.md`