Merge authoritative main into the task branch

Why: include the current integration baseline before verification.

Evidence: fetched origin/main=3f32fdacbc5af91bd9212b2ded69f6559d1d92b2.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
This commit is contained in:
2026-10-12 02:33:44 +00:00
7 changed files with 944 additions and 4 deletions
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
# feature/rdm-u1-dev-closeout 任务卡
任务主记录:<PR 链接,交付前填写>;状态:进行中;owner:weichen
任务主记录:PR #363 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/363(merge 3ef65a9142);状态:已完成(回填);owner:weichen
## 基线与授权
@@ -69,7 +69,7 @@
| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
|---|---|---|---|---|---|
## 结果与验证(完成后填写)
## 结果与验证
- 结果:方案 r1 状态行(已合入 #340 + U1 RDM 侧落地);U1 进展段(RDM #199 merge 9b1b78a / #200);INDEX 导航行;Dev 钉 modules/documents=ab6b36c;PROJECT.md 状态行更新。
- 验证:make test exit 0(SELF,收据在卡;含 pins/test-worktree 组合检查);CI 以 PR 为准 [GATE]。
@@ -243,3 +243,9 @@
}
```
| 同步前验收 | 53a3effef777c83bd6baa63f8181f34480533559 | d3e3ce02d600a7e0802ea86d4eb7d4fee012f175 | 2026-10-11T14:21:19Z |
## 闭合记录(card-autoclose 回填)
- 依据:merge 3ef65a91428cf28e73dd2a23127dda014e455d87(PR #363)已包含于 origin/main,分支成果已落盘;本段为合入后回填。
- 合并主题:Merge pull request 'Record U1 progress in the final-target plan and pin the closeout documents' (#363) from feature/rdm-u1-dev-closeout into main
- 归档:随闭合移入 .task/archive/;任务执行期的过程证据见原任务记录与 PR。
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+5
View File
@@ -32,6 +32,11 @@ U2 起实施与部署分别评审。
- [RDM 最终目标核对与完整交付方案 r1](modules/documents/docs/proposals/2026-10-11-rdm-final-target-completion.md):系统级项目、上限内权限覆盖、私域协作、全部文档三权与完整业务链;34 UR/68 SR/10 F 逐条映射;方案已随 #340 合入(2026-10-11),U1 需求基线核对经 RDM #199/#200 落地,U2 起未启动。
- [服务重启与全量数据恢复方案 r2](modules/documents/docs/proposals/2026-10-12-service-restart-data-recovery.md):
svc 启停、异常进程/主机退出后的依赖、配置/数据身份、任务/HITL/副作用、文件与组合备份恢复;
r1 经六角色自审、r2 吸收外部源码复核;2026-10-12 用户批准 r2(五阶段一并),实施、故障注入、部署与运行验收 NOT_RUN;
衔接协作存储案;U2 首切片已由 svc-autorecover 合入 main(PR #396/#401),余量另立增量。
## 验证
`make test` 先核对子模块工作树与固定指针,再运行治理脚本、公开边界、跨仓指针、库及各模块