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

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

@@ -0,0 +1,111 @@
+# Fast-track merge intent closeout 演进历史（#r4m7k）
+
+> 这里记录会影响 Agent 理解“为什么一步步变成现在这样”的关键演进；单次任务流水账不放这里，规范正文仍以 `./SPEC.md` 为准。
+
+## Decision Trace
+
+- locked fast-track 的 Step 4/local proof 不再可作为 terminal；replay 只有在缺少当前 epoch 的 live PR/current-head 事实时报告 `FAST_TRACK_STOPPED_BEFORE_PR`，并把后续卡片中的旧、待定、未知/不明/不确定/未确认或否定 head 描述视为未证明并撤销既有 live fact，不改变 CI 实际运行时长或现有无 evidence 重判合同。
+
+- Review proof semantics are aligned with the shared contract: missing, stale, malformed, unavailable, or `unchecked` direct evidence blocks closeout, while valid terminal `clear` evidence is classified by finding disposition rather than by blocker wording alone.
+
+- current-head invalidation 现在保留 “not stale / not unknown / no longer pending” 等肯定确认，只撤销明确的旧、未知、待定或否定 live-binding 事实。
+
+- owner-bound `convergence-reopen` 在当前 PR 的首个受限 repair 提交后一次性桥接到 initial review，避免已授权的同一 P2 修复因 SHA 改变而重复索取意图；bridge 仍要求 live PR current head，并保留原 validation/review budget。
+
+- `ff72d05` fix(flow): align fast-track merge closeout semantics
+- `b39a914` docs(specs): adopt topic-level spec model
+- Initiative roles refine, rather than weaken, fast-track authority: direct delivery keeps its existing merge semantics; child delivery stops at integration CI and aggregate delivery requires SHA-bound owner approval.
+- current worktree: 根据 owner 反馈，明确“合并”与“合并并收尾”不是同一终点：普通“合并/merge PR”是 `merge-only`，完成 PR merge 并删除远端 PR head；只有“合并并收尾/merge and cleanup”才执行本地 cleanup。cleanup 包含删除 PR 工作区，并负责处理已合并 PR head 本地分支等本地收尾对象。
+- current worktree: CI tracker 子代理已明确为自执行观察者；`$flow-continue` 对 live handle 继续等待，对 terminal `unavailable|incomplete` handle 只创建一个保留 bound identity/retry history 的新 tracker，不复用 completed card，也不再把缺少嵌套 agent-control API 当作 tracker 不可用。
+- current worktree: 根据 owner 反馈，明确 `merge-only` / `merge+cleanup` 一旦进入 shared Step 5 merge path，就默认允许 same-PR、in-scope writable convergence；`merge-ready` 仍只表示停在 `Step 5C Ready`，不会自动携带这层可写收敛授权。
+- review follow-up: `合并 PR 并收尾` 与 `merge PR and cleanup` 必须优先归类为 `merge+cleanup`，不能被 `合并 PR` / `merge PR` 子串误归类为 `merge-only`。
+- review follow-up: `收工条件=merge+cleanup` / `stop condition=merge+cleanup` 这类流程锚点也必须触发 merge+cleanup 守卫，避免会话停在 `Step 5C Ready` 被误判通过。
+- review follow-up: `本地收尾=完成` 只是 assistant 总结，不是 cleanup 证据；replay checker 只接受 `$pr-post-merge-cleanup`、`cleanup_skill_invoked=yes` 或 `cleanup_proof`。
+- review follow-up: readiness 文案不能压过显式 `merge+cleanup` 锚点；否定句里的 `$pr-post-merge-cleanup` 名称也不能被算作 cleanup proof。
+- review follow-up: `cleanup_proof` 必须有正向值，assistant 侧只有显式 state anchor 能设置 `merge+cleanup` intent，普通选项说明不能设置。
+- review follow-up: `准备好合并 PR` 仍是 `merge-ready`；`不会/不调用 $pr-post-merge-cleanup` 是否定 proof；assistant `merge+cleanup` state anchor 不会被同句 proof-status 文案清除。
+- review follow-up: `$pr-post-merge-cleanup` 的未来承诺不是 cleanup proof；checker 只接受正向结构化 proof 字段。
+- review follow-up: 主工作区基线状态属于 merge scope，不会否定同句正向 `cleanup_proof`。
+- review follow-up: 诊断命令或搜索输出中出现 `gh pr merge` / `cleanup_proof` 不能被当作真实 merge 或 cleanup proof；checker 必须把证据绑定到实际 merge 调用与最终可信收尾状态。
+- review follow-up: `gh --repo owner/repo pr merge` 是真实 merge 证据；只读 `gh api .../merge` 不是，API merge 只有显式 mutating method 才能满足 merge proof。
+- review follow-up: cleanup guard 必须以 merge success 为前提；merge 调用被 GitHub 拒绝时，`merge+cleanup` 不能被误判为已合并但跳过收尾。
+- review follow-up: `gh pr merge --help` 不是 merge 证据；用户后续明确切回 `准备好 PR` 时，最新 `merge-ready` stop condition 覆盖之前的 merge/cleanup 意图。
+- review follow-up: shell-wrapped `gh pr merge` 是常见 exec 形态，checker 必须先解开 `sh/bash/zsh -c` 再判断 merge 证据。
+- review follow-up: shell script 中的 `set -e; cd repo && gh pr merge ...` 也是真实 merge 证据，但只能满足其后的 active intent，不能复用早先 turn 的 merge。
+- review follow-up: 同一 shell command 若先诊断再 merge，checker 必须继续扫描后续 segment，不能停在第一个非 mutating `gh`。
+- review follow-up: replay 里 `shell` tool 的 command-array 形态也要识别；`准备好合并并收尾` 中 cleanup intent 优先于 ready 子串。
+- review follow-up: `cleanup_proof=稍后生成` 仍是 pending 占位；活 proof 未终态时，即使 final closeout 写“PR 已合并”也必须失败。
+- review follow-up: `/opt/homebrew/bin/gh pr merge ...` 这类 path-qualified gh 调用按 basename 识别为真实 merge 证据。
+- review follow-up: final closeout 中的英文 `Merged pull request` 也算 merge success，不能绕过 cleanup-skipped guard。
+- owner correction: 远端 PR head 删除属于 merge scope，不属于“合并并收尾”的本地 cleanup；普通合并也必须验证 `远端分支=不存在`。
+- owner correction: 普通合并还必须对齐 Git primary worktree 的 PR target base branch，或明确报告 `主工作区基线更新=阻断/待主人决策`；本地 PR topic branch 与 PR worktree 删除仍只属于 cleanup。
+- owner correction: `对齐` 定义为 local base 包含最新 remote base，而不是必须等于 remote；dirty/ahead/diverged primary base 应进入 `待主人决策` 菜单，安全对齐必须在 stash/rebase 后把 dirty/untracked 恢复回工作区。
+- review follow-up: fork / protected head 的明确 `远端分支=不适用/阻断` 是合法 merge 结果；`gh api .../git/refs/heads/<branch> -X DELETE` 的 endpoint-before-method 写法也必须识别。
+- review follow-up: 成功 `[deleted] <branch>` 输出优先于分支名里的失败词；`不是 fork PR head` 不是远端删除豁免。
+- review follow-up: `git push origin --delete <branch>` / `git push origin -d <branch>` 是常见远端 head 删除形态，必须用 token 解析识别。
+- review follow-up: `gh api ... -X DELETE` 的 `gh:` / HTTP 4xx/5xx 输出是删除失败，不得当成远端 head 已删除。
+- review follow-up: `远端分支=不存在` 必须有工具证据支撑；assistant 自报状态不满足远端 head 删除门禁。
+- review follow-up: 工具确认 `remote branch: not found` 是远端 head 已不存在的成功证据，不受通用失败词 veto。
+- review follow-up: 删除样式输出必须绑定到已识别的删除或验证命令；无关诊断输出不能满足远端 head 删除门禁。
+- review follow-up: `gh pr merge --delete-branch` 的删除失败输出不能算远端 head 删除；已知 `headRefName` 时必须匹配被删除 ref。
+- review follow-up: PR head 取自自然语言句子时会去掉句尾标点，再与实际删除输出匹配。
+- review follow-up: 组合命令里的远端删除先按 shell segment 解析，避免后续验证命令参数污染被删除分支名。
+- review follow-up: 分支特定删除 proof 必须绑定 PR head 证据，并递归解析 shell wrapper 内的组合删除。
+- review follow-up: `git push --delete` 分支解析会截断重定向与管道后缀，避免把日志捕获参数当成 ref。
+- review follow-up: `git push origin :refs/heads/<branch>` 删除 refspec 会归一为短分支名后再匹配 PR head。
+- review follow-up: 多行 shell script 按换行分段，PR head 捕获支持 `+` 等合法 ref 字符。
+- owner follow-up: merge-scope base alignment新增专用 helper，先固定解析 Git primary worktree，再只自动执行安全的 tracking-ref / ff-only 更新；dirty、ahead、diverged 等主工作区 base 状态继续保留给主人决策。
+- owner follow-up: 在主人明确选择 `安全对齐` 后，base-alignment helper 现在也接管备份分支、`stash -u`、`rebase`、`stash apply` 与冲突恢复态输出，不再依赖临时 shell 拼接。
+- compression pass: skill 文案压缩为引用共享 stop-condition contract，减少重复展开但不改变行为。
+- owner correction: 本地 Step 4 收口和 live PR `merge-ready` 必须拆词；没有 open PR 时只能称为 `可开 PR（local）`，不得宣告 `Step 5C Ready` 或 `latest PR 可立即合并`。
+- owner correction: merge / cleanup 不是所有 run 的最终语义；若 release / deploy / publish / post-merge workflow 仍未终态，shared flow 必须继续进入 `Step 6 post-merge finality follow-up`，优先 app automation，CLI 再回退 repo-native watcher，并统一使用 `gpt-5.6-luna + xhigh`。
+- review follow-up: `merge+cleanup` 只有在拿到正向 `cleanup_proof` 后，`Step 6` 未决时才能恢复到 `$pr-merge`；`blocked|pending|unchecked` 等非正向值仍必须继续 `$git-cleanup`。
+- review follow-up: `flow_continue_replay_check.py` 与 `r4m7k` replay fixtures 现在同时覆盖“cleanup 已完成再回 Step 6”和“cleanup proof 非正向时不得跳过 cleanup”两条恢复路径。
+- owner follow-up: 根据成本约束，Step 6 改为只追踪 merge SHA 在目标分支触发的 CI；PR head 与 merge SHA 各使用一个 `gpt-5.6-luna + low` sub-agent，主 agent 通过阻塞式 `wait_agent` 等待，计划任务不再作为主动路径；共享不变量集中在 CI tracking short contract，入口 skill 只保留 phase/identity 与编排职责。
+- owner correction: target-branch CI 不是完整 post-merge 终态。`Release Snapshot` 只证明发布意图；当仓库合同与 merge-SHA live facts 表明预期发版时，流程必须继续等待实际 Release/package/container 终态，并在最终回复明确报告版本等核心发布信息。发布跟踪使用独立 short contract，30 分钟未终态仍视为流程未完成，失败仅在可证明幂等时重跑一次。
+- review follow-up: release replay 现在拦截完全漏报、expectation/status 矛盾、实际 tag/SHA 错绑与 timeout 缺恢复锚点，并接受仓库合同声明的 package/container-only 发布证据。
+- review follow-up: release evidence 进一步绑定当前 expectation/repository epoch，区分 draft creation 与 actual publication，要求实际 artifact SHA，并对未发版证据与幂等单次 rerun 进行可回放校验。
+- review follow-up: harden tracker replay evidence so real `wait_agent` tool calls, concrete SHA bindings, and historical automation compatibility are distinguished correctly
+- review follow-up: bind tracker launch, wait, and SHA evidence to one instance, include automatic topic-branch push checks, and ignore unrelated automation pause/archive calls
+- review follow-up: bind replay evidence to the launched agent identity and bound SHA, and make `defer` terminal through its explicit infra-blocked record rather than a nonexistent tracker
+- review follow-up: support real collaboration spawn output and implicit wait schemas, retain matched barrier evidence across later waits, and enforce phase identity in replay cards
+- review follow-up: require a tracker status card, prefer concrete spawned-agent identities, and scope legacy scheduled evidence to the active follow-up mode
+- review follow-up: accept PR-head result cards, validate completed wait outputs, and use checked SHA when collaboration arguments hide the encrypted tracker prompt
+
+## Legacy Change Log
+
+- review follow-up: require terminal result/disposition fields for post-merge cards and retain pre-status scheduled-launch candidates for legacy-route detection
+- review follow-up: limit phase inference to structured tracker inputs, enforce post-merge-only fields, and ignore negated automation prose
+- review follow-up: bind retry authorization to an observed failure for the tracked run and prevent batched or cross-epoch facts from contaminating release state
+- review follow-up: reject stale publication facts with a conflicting release epoch and recognize GitHub Enterprise release paths
+- review follow-up: normalize string-encoded and text-wrapped tool output before applying the release discovery contract
+- review follow-up: merge split discovery blocks and require complete publication coverage for all declared release identities
+- review follow-up: reject conflicting artifact identity, accumulate immutable same-epoch run IDs, and preserve split-block scalar conflicts
+- review follow-up: reject cross-repository release reruns without treating equivalent short/full SHA or tag forms as conflicts
+- review follow-up: bind pre-discovery target-CI rerun authorization to the repository as well as the run ID
+- review follow-up: distinguish PR-head CI reruns and support non-GHCR packages plus version-tagged container aliases
+- review follow-up: bind release decisions to the target branch and support immediate incomplete recovery when no tracker is available
+- review follow-up: count compound release reruns per command segment and accept standard MCP structured-content wrappers
+- review follow-up: same-epoch heartbeat cards cannot rebind repository/branch/SHA/tag, and unresolved `gh run rerun` targets are rejected as unsafe
+- review follow-up: snapshots and candidate package metadata cannot prove publication, reruns require a fresh terminal fact, and failure closeout names its surface and disposition
+- review follow-up: release applicability follows trusted release context and remote-merge identity rather than a generic merge phrase, preserving valid local-closeout semantics
+- review follow-up: failed `gh pr merge` attempts never establish remote release context; only matching success output does
+- review follow-up: expected/unresolved non-success closeout retains explicit owner fields, while `success=false` is distinct from `published=false` for retry evidence
+- review follow-up: structured remote merge success cannot use release-not-applicable, and target repository identity may come from a bound Actions workflow URL
+- review follow-up: direct `release_expected`/`release_enabled` conflicts are rejected, and unrelated Actions URLs do not initialize release-run identity
+- review follow-up: normalize all remote merge success result spellings into the release gate, and require complete terminal reporting fields for both published and untriggered release outcomes
+
+- current worktree: Step 5C now uses a runtime decision card derived from target-repository policy and current PR facts; merge-only and merge+cleanup require explicit owner confirmation including the version expectation, while post-merge release facts bind to target repository, branch, and merge SHA. New plan syntax adds no release arrangement fields or final version.
+- owner correction: Step 5C confirmation is a single natural-language interaction. A clear message may confirm the card, state the version expectation, and request merge together; the Agent must not prescribe a reply template or split the action into a second turn.
+
+- No legacy change-log section was recorded for this spec.
+
+## References
+
+- `./SPEC.md`
+- `./IMPLEMENTATION.md`
+- Legacy compatibility identity: `#r4m7k`.
+
+- Added ADR 0019 and the pre-merge `release_disposition` route gate; target repositories retain ownership of release vocabulary and managed labels.
+
+- Superseded the plan route gate with ADR 0021: pre-merge route resolution is runtime-derived, and an absent route becomes `no-managed-route` without blocking PR publication.

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

@@ -0,0 +1,195 @@
+# Fast-track merge intent closeout 实现状态
+
+> 当前有效规范仍以 `./SPEC.md` 为准；这里记录实现覆盖、交付进度与 rollout 相关事实，避免这些细节散落到 PR / Git 历史里。
+
+## Current Status
+
+- Authorized late-review follow-ups finish the source merge scope first and then use independent fast-flow delivery to Step 5C Ready, preserving source traceability and owner-controlled merges without a stacked or recursive PR chain.
+
+- 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、链接、时间与产物摘要。当前 delivery gate 只认这些外部事实，advisory review 不构成门禁。
+- Review proof: Tier 3/4 direct evidence is validated by terminal status and disposition; a valid clear result may carry a demonstrated finding, while only unresolved in-scope/design-returning findings or invalid/unchecked evidence block closeout.
+- Pre-merge release routing: publication derives a runtime route from current repository and PR facts; absent or non-applicable policy resolves to `no-managed-route` and does not block PR publication. Only explicitly managed release-label groups may be reconciled. Step 6 release tracking remains merge-SHA-bound.
+- Pre-merge release decision: Step 5C now derives one displayable decision card from target-repository policy and current PR facts, covering applicability, components, channel, bump rule, predicted version, policy source, and collision policy. `merge-only` / `merge+cleanup` keep the complete rule in existing plan prose, require explicit owner confirmation including the version expectation, and never prefill a final version string. One clear natural-language message may combine confirmation and continuation; no fixed reply format or second action turn is allowed. Missing or conflicting facts block; route absence is not a no-release decision.
+
+## Current tracking boundary
+
+- CI/release tracking uses one runtime-returned child handle per bound SHA with `[gpt-6-luna, low]`; main-agent waits on that handle. Direct and PTC transports are equivalent. Startup or terminal failure reports `tracking unavailable` and leaves the flow incomplete; no watcher, parent polling, or automatic model retry is used. The child tracker performs direct provider observation; owner continuation replaces only terminal unavailable or incomplete handles, preserving the bound identity and retry history.
+- High-risk changes may use one read-only `[gpt-6.1-sol, xhigh]` advisory reviewer. Findings are supplied to the main Agent for optional fixes and are not recorded as merge proof.
+
+## 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；tracker 不可用时报告未完成，不保留 watcher fallback
+- [x] M6: 将 post-merge 扩展为 target CI + repository release chain 双终态门禁，并用 replay 覆盖发布状态机
+- [x] M7: 为 direct PR 增加只读 merge preflight、locked-head guarded merge 和 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/advisory-review-short-contract.md`
+- `skills/project-engineering-workflow/SKILL.md`
+- `skills/fast-flow/SKILL.md`
+- `skills/flow-continue/SKILL.md`
+- `skills/project-engineering-workflow/references/pr-publication-procedure.md`
+- `skills/project-engineering-workflow/references/pr-merge-procedure.md`
+- `skills/project-engineering-workflow/references/release-planning-short-contract.md`
+- `skills/project-engineering-workflow/scripts/merge_preflight.py`
+- `skills/project-engineering-workflow/scripts/test_merge_preflight.py`
+- `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/*`
+- `docs/adr/0008-direct-pr-merge-preflight.md`
+- `docs/adr/0024-stop-condition-driven-release-decision.md`
+- `CONTEXT.md`
+
+### Plan assets
+
+None
+
+### Asset promotion
+
+None
+
+## Related Changes
+
+- `ff72d05` fix(flow): align fast-track merge closeout semantics
+- current worktree: add `skills/project-engineering-workflow/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
+- current worktree: direct PR merge intent binds to PR identity; `merge_preflight.py` reads live head/base, candidate OID, and clean worktree facts, resolves user-supplied refs after Git's `--end-of-options` delimiter, then workflow PR merge procedure passes its locked head through `--match-head-commit`; child/checkpoint/aggregate approval contracts remain unchanged
+- 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
+- current worktree: locked fast-track task completion now also rejects a Step 4/local proof stop without live PR evidence through `FAST_TRACK_STOPPED_BEFORE_PR`; this reuses the existing receipt closeout path and adds no CI deadline or state machine.
+- current worktree: trusted structured `function_call_output` PR facts with `state=MERGED` or a non-empty `mergedAt` now replace the prior open-PR state, clear its current-head binding, and make later Step 5C readiness claims fail as `READY_CLAIM_WITHOUT_OPEN_PR`
+- replay 将 live PR evidence 绑定到当前 locked fast-track epoch 的同卡、肯定 current-head 事实；任何后续旧、待定、未知/不明/不确定/未确认或否定 live binding 的 head 描述都会撤销既有 live fact，即使该卡未重复 `PR状态`，但 “not stale / not unknown / no longer pending” 这类肯定确认不会误触发撤销；旧 PR 状态、重规划后的旧 flow 与 `workflow_*` 等非 flow 字段继续被忽略。
+- 同一 PR 的 repair commit 现在只通过 live PR/current-head 事实进入 fresh validation；不再创建 convergence-reopen、repair permit 或 review wave gate。
+- 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 the main Agent on the runtime-returned child handle, 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 `workflow PR merge procedure` 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 `workflow PR merge procedure`
+- 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
+- current worktree: CI tracker replay validates only the public phase/SHA/terminal/result card, remains neutral to direct versus PTC transport, and ignores launch, wait, child-ID, transcript, and scheduled-automation shapes except for the legacy scheduled-route guard
+- current worktree: make the CI tracker role self-executing and define recovery by handle state: live handles are waited, terminal unavailable/incomplete handles receive one fresh tracker with the same identity and retry history, and completed output is never reused as fresh evidence
+- current worktree: retire plan-level release arrangement fields from new plans; preserve them only in historical compatibility data, and enforce the Step 5C decision card, explicit version expectation confirmation, complete merge rule, and target-repository/branch/merge-SHA post-merge boundary through shared contracts and replay fixtures
+
+## Remaining Gaps
+
+- current worktree: post-merge cards use the same external terminal-state contract as PR-head cards; unavailable tracker startup or terminal state is reported as `tracking unavailable` and remains incomplete
+
+- 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
+- focused release-decision replay: passed for the confirmed card, missing card, missing confirmation, route-absence, policy-conflict, merge-SHA mismatch, and missing merge-SHA fixtures
+- 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`