合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
自动推进授权：无；授权范围：无；授权来源：无；授权终点：无；停止条件：无（未授权）
当前阶段：文档阶段 8–9 已完成；Dev 阶段 7 固定候选已批准，按影响同步核验后进入阶段 8–9；当前增量：I5（实际合入规范/计划固定与最新 Dev 组合）
流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
本轮阶段 7 结论与合入授权（当前状态）
用户在本轮交付说明后回复「批准」，审阅对象为 Dev 17ea5fd0a7b63febe52a03fbdc7596a6f112cc3b / base ee9b437b22b49f96e1bc65f79417b22e8e82a37c 的固定组合验证结果。此前说明明确最新 main 已前进，智能体随后负责合入前同步、按影响验证、当前 HEAD CI 和 PR 合入。人工结论来源是实际聊天输入，与 SELF/GATE/REPLAY 执行证据分开。
原固定候选 CI run2974 attempt2 三个必需上下文及全部作业/步骤通过；普通测试和服务组合保留首次成功，PG仅单次诊断重跑。首次 RDM 构建退出152，因上游脚本丢弃 npm 输出具体原因未证实，原失败完整记录保留；重跑通过不声称根因修复。
合入前实际同步已纳入最新 main 5aae47ebca20ad1f3add3b080212cca7e1c6edf9：相对已验收候选仅其他任务的验收脚本和任务归档/证据记录变更；本任务 CLI、规范、组件和 CI 定义未改变。保留既有实现/组合 Review 的不变部分，针对同步差异核验并重放必要检查；新 HEAD 必需 CI 仍须真实通过，不复制旧状态放行。
尝试 1（80f5e9ade365e7e411a7b76ee663749ce951f6da / ff3fb4a7ebe432ab21c6b9668abc9823aca2fdd1）：完整本地 make test && make build 与 CI run2915 三个必需作业均通过；CI 触发 weichen，执行器 home-runner/runner_id3，定义 ci.yaml@refs/pull/519/head。原始证据和平台运行链接只证明该旧候选。
首次重新同步检测到短暂 index.lock 并拒绝；已结束自己的并行取证命令，确认锁自然释放后串行重试，未删除锁。成功同步至新目标，递归组件正确物化，tested_head=b37d0575edac4483118dc6bf5079cee53d3c8679；无文本冲突，保留新主干组合，当前完整验证与 CI 待重新执行。
Guidelines actual merge=2f5b19872be2a4597838a4131ad75d1be089ee5e（#5）；Documents actual merge=129cc3579d9c9e3edfb46c99270d65f3e1dad0a0（#96）；相同实际物化组件与入口，未提升调度激活状态。
Why: establish the authorized task workspace and its initial baseline.
Evidence: preserved precheck receipt in .task/feature-merge-queue-policy-draft.md; R0=05085d9a08f2e34d65712434894144d010203d8a.
Impact: task metadata only; the feature workspace starts at 05085d9a08.
Refs: .task/feature-merge-queue-policy-draft.md
Why: prepare a reviewable delivery window and migration contract that reduces repeated synchronization while preserving final CI and approval requirements.
Evidence: SELF precheck, document checks and read-only platform observations are preserved in .task/feature-merge-queue-policy-draft.md; runtime queue and platform trials remain NOT_RUN.
Impact: proposed policy, project entry and task record only; scripts, workflow, platform protection and guideline gitlink are not changed by this draft.
Refs: policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=3e5416a8226c2dfdd108d6282566639c2ed41f1e.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: retain the actual synchronization and document checks for review of the proposed scheduling policy.
Evidence: make evidence captured precheck, task-sync, file digests and relative-link checks as SELF in the task card; CI and execution trials remain NOT_RUN.
Impact: task evidence only; the candidate policy remains proposed and the runtime delivery mode is unchanged.
Refs: .task/feature-merge-queue-policy-draft.md; policy/merge-queue.md
Why: preserve the user's continuation from the delivered r1 specification into a concrete implementation and verification plan.
Evidence: precheck and plan source/link/example checks are preserved as SELF receipts in the task card; code, CI and platform trials remain NOT_RUN.
Impact: approval metadata, plan association and project entry only; the delivery mode remains unchanged and the plan awaits stage 5 review.
Refs: policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md; Documents docs/proposals/2026-10-13-merge-queue-implementation-plan.md
Why: retain original planning-stage receipts and fixed source references before requesting implementation-plan review.
Evidence: SELF precheck, document checks and synchronization outputs were captured by make evidence in the task card; implementation and platform trials remain NOT_RUN.
Impact: task record only; no delivery-mode or runtime change.
Refs: .task/feature-merge-queue-policy-draft.md; Documents docs/proposals/2026-10-13-merge-queue-implementation-plan.md
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=aa6364fddc597beeacf1381a207d131841b8c54e.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: retain original planning-stage receipts and fixed source references before requesting implementation-plan review.
Evidence: SELF precheck, document checks and synchronization outputs were captured by make evidence in the task card; implementation and platform trials remain NOT_RUN.
Impact: task record only; no delivery-mode or runtime change.
Refs: .task/feature-merge-queue-policy-draft.md; Documents docs/proposals/2026-10-13-merge-queue-implementation-plan.md
Why: repeated task-sync calls changed HEAD and invalidated CI even when main had not advanced.
Evidence: SELF red-green regression and 58 task lifecycle tests recorded through make evidence in the task card.
Impact: sync still fetches and validates components, creates records only for an actual merge, and reports the complete final source SHA.
Refs: U1; policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
Why: an existing authorized task should not merge a moving target merely to resume local work, while new task startup and delivery remain strict.
Evidence: SELF red-green recovery and environment regressions; task, recovery, evidence and local-mode write-guard suites passed through make evidence.
Impact: add explicit LOCAL_READY and task-resume, validate worktree/card/baseline and receipt purpose, preserve schema 1 and prevent local receipts from starting or releasing tasks.
Refs: U2; policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
Why: recording checks in a frozen task card can change the candidate and invalidate current-head CI.
Evidence: SELF fixed-candidate capture regression and all 33 evidence tests passed; actual output and object digests are preserved by make evidence.
Impact: document preparation, external receipts and post-phase import using existing schema 1; no filesystem freeze or trust upgrade is introduced.
Refs: U3; policy/governance.md; .task/feature-merge-queue-policy-draft.md
Why: agents need consistent entrypoints and recording defaults to avoid retrying synchronization and CI outside the final delivery window.
Evidence: SELF generated-task-card red-green regression and governance suite recorded through make evidence; pending shared record created as Issue #518.
Impact: rules, task template and capability matrix stay explicit about pending activation, default strict startup, manual coordination and unchanged CI triggers.
Refs: U4; policy/merge-queue.md; .task/feature-merge-queue-policy-draft.md
Why: the observed main protection does not require status checks, so platform admission must be verified before activating the delivery queue.
Evidence: SELF read-only configuration and actual PR context names recorded in the task card; protection changes and negative-case replay remain NOT_RUN.
Impact: owner instructions and six-field configuration proposal only; no remote protection, approval count or workflow is changed.
Refs: U5; policy/platform-admission.md; .task/feature-merge-queue-policy-draft.md
Why: waiting branches should keep their work while one candidate syncs and merges, and a conflict must not block unrelated healthy work.
Evidence: SELF three Git scenarios and governance suite captured by make evidence; real CI and three-business-task acceptance remain NOT_RUN.
Impact: local regression scenarios only; no automatic queue mutex, production merge or measured CI savings are claimed.
Refs: U6; tests/test_merge_queue_trial.py; .task/feature-merge-queue-policy-draft.md
Why: make the approved increment and its remaining activation gates reviewable without treating local tests as platform admission.
Evidence: original SELF red-green, direct suites, governance suite and read-only platform outputs were captured by make evidence in the task card.
Impact: task record and source references only; no platform operation, CI trigger change or activation.
Refs: .task/feature-merge-queue-policy-draft.md; policy/platform-admission.md; Gitea Issue #518
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=ff3fb4a7ebe432ab21c6b9668abc9823aca2fdd1.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: make the approved increment and its remaining activation gates reviewable without treating local tests as platform admission.
Evidence: original SELF red-green, direct suites, governance suite and read-only platform outputs were captured by make evidence in the task card.
Impact: task record and source references only; no platform operation, CI trigger change or activation.
Refs: .task/feature-merge-queue-policy-draft.md; policy/platform-admission.md; Gitea Issue #518
Why: A LOCAL_READY receipt must permit normal target advancement without accepting a rewind or divergent target history after its observation.
Evidence: Two disposable real Git regressions reproduced erroneous successful recovery before the guard; all 18 task recovery tests pass afterward. Raw SELF receipts are in the task card.
Impact: Reject abnormal target ancestry before receipt import; preserve normal local recovery and strict delivery defaults. Correct stale implementation-stage documentation without activating the queue.
Refs: Documents implementation plan ba4044d U2; independent review R1 and R2; .task/feature-merge-queue-policy-draft.md
Why: Preserve the exact implementation object, independent review findings, remediation evidence and remaining stage gates for the owner review.
Evidence: External task-sync and test-governance receipts measured clean candidate cca59c88dd before and after execution. Governance ran 340 tests: 322 passed and 18 environment-dependent skips. Local receipts remain SELF.
Impact: Task record and removal of one trailing policy blank line only; tested code and check definitions unchanged. No queue activation, platform protection change or real CI/trial claim.
Refs: .task/feature-merge-queue-policy-draft.md; Documents plan ba4044d U1-U6; independent review R1/R2; Issue #518
Why: The owner confirmed the delivered implementation and authorized the stated combination-validation and PR-preparation exit.
Evidence: Strict recovery precheck was READY and task-resume imported its original SELF receipt without changing source HEAD. The task card records the owner's confirmation separately from command evidence.
Impact: Task state only; stage-seven acceptance, Guidelines integration order, platform owner actions and real-trial gates remain distinct.
Refs: .task/feature-merge-queue-policy-draft.md; policy/delivery.md stages 6-7; approved implementation plan U4
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=10d54d5ffb3d3fa4a4ea256537b2439cef4cc7f3.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: Main advanced after the first fixed candidate passed CI, changing four component pins and invalidating final admission against the new target. Stage progress must also be referenced outside fixed source to avoid status-driven commits.
Evidence: Source-external original receipts preserve the previous clean local test/build, three successful CI jobs on 80f5e9a, detection of target advance, the refused transient lock and successful serial synchronization to 10d54d5. New combination verification and exact-head CI are pending.
Impact: Preserve the merged authoritative component versions; record the expired candidate honestly and replace a temporary stage-status sentence with its authoritative record pointers. No platform protection change or queue activation.
Refs: PR #519; main PR #513; implementation plan U1/U3/U4; Issue #518
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=20e086e48b9cec7f300feba5342db7a0661a4d4e.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: The approved document dependencies have been reviewed and merged. Their actual immutable merge commits must be fixed before final host validation, while operational activation remains a separate gate.
Evidence: Independent document replay and verified PR merges are recorded in the task card. The staged host combination passed make test with actual merged child pointers; final commit build/CI remains pending and will be recorded outside source.
Impact: Advance only the two reviewed merged child pins, expose the real plan path, and record partial stage-seven approval and pending activation. Preserve current main components and existing admission/owner boundaries.
Refs: Guidelines PR #5 (2f5b198); Documents PR #96 (129cc35); Dev PR #519; implementation plan U4-U6; Issue #518
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=ee9b437b22b49f96e1bc65f79417b22e8e82a37c.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=5aae47ebca20ad1f3add3b080212cca7e1c6edf9.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: Preserve the user-approved stage-7 conclusion before the final merge candidate is frozen.
Evidence: Import original precheck, sync, build, CI and independent replay receipts; validate current fixed components, document links and the incoming acceptance script syntax through make evidence.
Impact: Update this task card only; preserve implementation and activation boundaries. New HEAD CI remains required before merge.
Refs: Dev PR #519; Guidelines PR #5; Documents PR #96; queue Issue #518
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=5efbeebbdc09f8c2484613230a29c882c54652f0.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
本描述由同一任务卡固定前状态段生成；工具原始收据在任务卡，固定后的当前结果只登记在本段/PR及源码外收据，不增加源码提交。
feature/merge-queue-policy-draft 任务卡
任务主记录：本文件；PR #519 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/519；状态：当前固定候选验收已批准，智能体执行 Review/合入；owner：weichen
基线与授权
权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）=
05085d9a08工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-merge-queue-policy-draft（worktree）；分支：feature/merge-queue-policy-draft
授权与交付终点：用户 2026-10-13 回复「可以，开始吧」，承接上一轮「整理通用规范与 Dev 配套条文草案」；本轮交付可评审的本地草案和记录模板。脚本、CI、平台保护、实际队列及 gitlink 切换另按计划评审；不推送或合入本轮候选。
本轮续办授权：用户在 r1 本地草案交付后回复「继续」，按上一轮“条文评审后进入实施计划”的出口，使用已存在的 r1/通用候选为计划基线。当前交付终点为 Documents 的实施计划 r1 和验证方法；不启动源码实施、平台操作或线上试行。
实施授权：用户在 Documents r1@ba4044d57e38d0887dd425d052abf26b20a28bf4 交付后回复「批准」，按推荐的原生方式执行计划。阶段 6 源码、自检、配套规则和隔离验证可连续完成；正式验收、实际模式切换、所有者平台操作和真实业务试行保留各自条件。前述“只编制计划”的阶段范围已被本项覆盖，不将旧限制误作当前禁止实施。
本次恢复与续办：用户对上一轮实现产物回复「确认」，确认阶段 6 并授权其出口中明确的正式组合验证与 PR 交付准备；阶段 7 人工结论、高后果双钥匙、实际激活/真实业务试行仍各自保留。任务中途不再重复启动检查。
交付模式：manual（前序人工决策，智能体 Review/合入）；其他阶段明确授权后可记为 authorized-continuous
合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
自动推进授权：无；授权范围：无；授权来源：无；授权终点：无；停止条件：无（未授权）
当前阶段：文档阶段 8–9 已完成；Dev 阶段 7 固定候选已批准，按影响同步核验后进入阶段 8–9；当前增量：I5（实际合入规范/计划固定与最新 Dev 组合）
流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
本轮阶段 7 结论与合入授权（当前状态）
17ea5fd0a7b63febe52a03fbdc7596a6f112cc3b/ baseee9b437b22b49f96e1bc65f79417b22e8e82a37c的固定组合验证结果。此前说明明确最新 main 已前进，智能体随后负责合入前同步、按影响验证、当前 HEAD CI 和 PR 合入。人工结论来源是实际聊天输入，与 SELF/GATE/REPLAY 执行证据分开。5aae47ebca20ad1f3add3b080212cca7e1c6edf9：相对已验收候选仅其他任务的验收脚本和任务归档/证据记录变更；本任务 CLI、规范、组件和 CI 定义未改变。保留既有实现/组合 Review 的不变部分，针对同步差异核验并重放必要检查；新 HEAD 必需 CI 仍须真实通过，不复制旧状态放行。2f5b19872be2a4597838a4131ad75d1be089ee5e，方案库 PR #96 实际合入 SHA129cc3579d9c9e3edfb46c99270d65f3e1dad0a0；本候选实际 gitlink/组件物化一致，正式固定采纳已准备。历史条目中的未发布/未合入状态仅描述当时对象，以本段及平台 PR 当前事实为准。目标与非目标
降低同目标多个分支交付时反复同步、冲突处置和重跑最终 CI 的成本；采用覆盖最终同步至合入核验的串行交付窗口，局部开发继续并行。
当前实施增量包含 CLI 同步/恢复、源码外证据基础、配套规则及隔离 Git 场景；首版调度采用 manual 记录，不实施自动 daemon。人工阶段结论、独立 Review 和平台准入要求保留。
关联方向与规划
需求分析
方案与计划
阶段评审
1e9bb9ec5e产物交付后用户「确认」；行为候选及审阅整改已确认，未合入/启用探索试验与迭代
同步记录
05085d9a0805085d9a08提前独立审阅与整改
证据（Evidence）
阶段 7 组合验证与交付准备
主干推进后的候选重建
本轮已批准部分与实际组件交付
结果与验证（完成后填写）
结果：U1 同步幂等化@03cbeac8e610657b2a5b5f6997de36d55efb0304；U2 显式局部恢复/严格用途@eb46bbb296043b8b002d4ef727b5c9ed602e567d，异常目标历史整改@cca59c88dd75dab20ae9da5e5106f8e72a8653df；U3 源码外收据流程/回归@1024c389f6b893679256f2719d00d832a3cb3bce。
后续准备：U4 本地规则/模板/能力登记@4629b871db8df32aeea4d620886dc8956296ddb9 与准备中 Issue #518；U5 所有者配置/恢复材料@501c727620ebd39eef4f5f6124fb463a967c82b2；U6 临时真实 Git 场景@d3d60f4a40932123812c195c195c74197e1dc4a0。正文仍在各归属仓。
验证：红绿回归、各直接套件及 make test-governance 完整输出由 evidence 写入下方（SELF）；真实 PG/组合专项按实际输出 SKIP/NOT_RUN，平台正负例、真实 CI/三任务业务试行 NOT_RUN。配置读取为 SELF，不证明门禁生效。
影响与剩余项：三个草稿 PR 已创建且未合入；workflow 触发、规范 gitlink、远端保护和实际交付模式未切换。阶段 6 产物已确认；阶段 7 验证结果待人工评审；Guidelines/Docs/Dev 的 Review/组合交付、所有者平台操作和真实试行各按其条件执行。
最终自检对象：cca59c88dd75dab20ae9da5e5106f8e72a8653df；同步与 make test-governance 均以源码外 RECEIPT 捕获，执行前后 HEAD 相同且工作树 clean。原始收据导入见下方，来源 SELF。完整套件 340 项，322 项通过、18 项跳过（2 项真实 PG 身份、16 项真实服务组合条件未提供）；这些真实专项仍是 NOT_RUN。
实现期审阅问题闭合：R1 两项真实错误接受红灯→18项恢复测试绿灯→完整治理套件绿灯；R2 状态矛盾已修正；无延期 minor。最终收据保存提交只整理本卡及条文末尾空行，不改变被测代码、测试、Makefile 或其他规则；按影响复用上述本地自检，正式交付仍须精确待合入 HEAD 的 GATE。
执行裁定留存：保留 U1–U6 原编号并直接提取单元（误判风险为范围错配）；U6 隔离 Git 用例先于平台动作（误判风险为过读成真实平台证明）；平台/Issue/精确CI不得由本地审阅替代（误判风险为未强制或陈旧候选放行）；真实三任务、恢复、组件保留与成本改善等待 U6（误判风险为未经观察的效果声明）；manual 不声称自动锁/fencing/OS冻结（风险是不遵守协调的写者仍可推进目标，必须使候选失效并对账）。完整执行 ledger 保留在本计划 .superpowers/sdd 工作区；计划后续项及阶段评审未完成，现场不回收。
规划进展与下一步
合入与清理
cca59c8完整治理自检通过；正式组合验收及 CI NOT_RUN。当前最终合入候选
536f0e4b553c3c70988650d21788d1d561ffedca；base=5efbeebbdc09f8c2484613230a29c882c54652f0。阶段7用户已批准17ea5fd/baseee9b437的固定候选结果，并授权后续按影响同步、当前HEAD CI及智能体合入；本次同步只纳入其他任务验收脚本/归档证据与本任务记录，不改变本次CLI、规范、固定组件、workflow或检查定义，既有验收与实现Review不受影响。2f5b19872be2a4597838a4131ad75d1be089ee5e（#5）；Documents actual merge=129cc3579d9c9e3edfb46c99270d65f3e1dad0a0（#96）；相同实际物化组件与入口，未提升调度激活状态。/tmp/mq-stage9-before-merge-sync-20261013-01.json，changed=1，执行前8ffe4a5、执行后新head按上段固定，组件不变且前后clean，随后不再向源码/卡片写入。最终智能体准入及合入核验
536f0e4b553c3c70988650d21788d1d561ffedca；base=5efbeebbdc09f8c2484613230a29c882c54652f0；最新权威目标为候选祖先，工作区clean。合入前task-sync原始仓外收据保存，对象未变时幂等检查没有增加提交。ci.yaml@refs/pull/519/head，actorweichen，run_attempt=1，当前head全部必需作业及步骤completed/success；未复用旧对象状态。ci / svc-realcombo (pull_request)success；runnerhome-runner（id=3），head同上，完成 2026-10-13T15:48:18Z。ci / test (pull_request)success；runnerhome-runner（id=3），head同上，完成 2026-10-13T15:51:52Z。ci / test-pg (pull_request)success；runnerhome-runner（id=3），head同上，完成 2026-10-13T15:55:01Z。实际合入及后续边界
536f0e4b553c3c70988650d21788d1d561ffedca，merge=f2d863b4018727a2611ea6d024dddcb5f705ef8d，merged_by=weichen，时间 2026-10-13T15:57:05Z。原始执行/远端观察与Git祖先、树等价及实际指针核验由/tmp/mq-stage9-merge-attempt2-20261013-01.jsonevidence收据保存（SELF执行记录）；合入前GATE run2991绑定该verified_head，独立REPLAY身份/原始收据见上段。2f5b19872be2a4597838a4131ad75d1be089ee5e，Documents=129cc3579d9c9e3edfb46c99270d65f3e1dad0a0，候选与合入提交均为本轮获取目标的祖先。父检出没有改动或pull；本任务源码仍保持上述固定head。/tmp/mq-stage10-cleanup-inventory-20261013.json。记录时间 2026-10-13T23:58:09.638903+08:00。