Merge authoritative main into the task branch

Why: include the current integration baseline before verification.

Evidence: fetched origin/main=27fa4fda7a0dbdf9228f9575f3fd50ca5974df76.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync

# Conflicts:
#	modules/frontend
This commit is contained in:
2026-10-11 14:13:18 +00:00
3 changed files with 331 additions and 5 deletions
@@ -1,6 +1,6 @@
# feature/generative-ui-u5-scope 任务卡
任务主记录:modules/documents/docs/proposals/2026-10-11-generative-ui-u5-action-scope.md r1(待用户评审);发布 PR 见「合入与清理」;状态:发布评审中;owner:weichen
任务主记录:PR #359 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/359(merge 03b2adfdc2);发布 PR 见「合入与清理」;状态:已完成(回填);owner:weichen
## 基线与授权
@@ -64,7 +64,7 @@
| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
|---|---|---|---|---|---|
## 结果与验证(完成后填写)
## 结果与验证
- 结果:
- 验证:<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项;逐条证据由 make evidence 写入上方证据表>
@@ -82,8 +82,8 @@
## 合入与清理
- 合入记录:Documents PR #70 已合入(提案+索引);Dev 发布 PR 见任务主记录行;CI 于 PR HEAD 为权威验收。
- 清理记录:NOT_RUN(授权依据、写者退出确认、worktree/分支/任务卡处置)
- 合入记录:已合入——Documents #70(提案+索引)、Dev PR #359(CI ci/test 于 PR HEAD 通过;一次 405 竞态自动补同步)。本卡交付=提案文档,U5 实施待用户对提案第六节三点裁定后另行开任务。
- 清理记录:已完成——TASK_WRITERS_STOPPED=1 make task-finish 于 2026-10-11 回收 worktree 与本地/远端任务分支(observed_head 6b79aae);子仓 ignored 构建产物显式清除;卡片闭合经 PR #361。
<!-- Local receipt: SELF. Digests detect corruption; they do not authenticate a reviewer or CI. -->
```json
@@ -199,3 +199,9 @@
"receipt_sha256": "9a313e0764e943a92b583ca1767579c7cf3bc4114296b408eec69abfff6ef172"
}
```
## 闭合记录(card-autoclose 回填)
- 依据:merge 03b2adfdc218b45ae2a3f8172fea4110783a4e05(PR #359)已包含于 origin/main,分支成果已落盘;本段为合入后回填。
- 合并主题:Merge pull request 'Publish the U5 action-scope proposal for user review (documents #70)' (#359) from feature/generative-ui-u5-scope into main
- 归档:随闭合移入 .task/archive/;任务执行期的过程证据见原任务记录与 PR。
File diff suppressed because one or more lines are too long