Merge authoritative main into the task branch

Why: include the current integration baseline before verification.

Evidence: fetched origin/main=b4649d79c2bdd66c3bcb9e60752abdb99b5667df.

Impact: integrate upstream changes without rewriting task history.

Refs: task-sync
This commit is contained in:
2026-10-12 04:20:37 +00:00
4 changed files with 138 additions and 4 deletions
@@ -1,6 +1,6 @@
# feature/genui-auto-trigger-optin 任务卡
任务主记录:<PR 链接,交付前填写>;状态:进行中;owner:weichen
任务主记录:PR #425 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/425(merge 5942ba7a94);状态:已完成(回填);owner:weichen
## 基线与授权
@@ -68,7 +68,7 @@
| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
|---|---|---|---|---|---|
## 结果与验证(完成后填写)
## 结果与验证
- 结果:
- 验证:<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项;逐条证据由 make evidence 写入上方证据表>
@@ -127,3 +127,9 @@
}
```
| 同步前验收 | b6307db015da4a3718baadb242c52cb66b024f74 | 575f53bd3df4da84ed6d9ead583dd7a4300c7744 | 2026-10-12T03:46:01Z |
## 闭合记录(card-autoclose 回填)
- 依据:merge 5942ba7a949f3032cacf75856529726a7c24fa8e(PR #425)已包含于 origin/main,分支成果已落盘;本段为合入后回填。
- 合并主题:Merge pull request 'Land Generative UI auto-present opt-in (backend #168/#169, documents #80)' (#425) from feature/genui-auto-trigger-optin into main
- 归档:随闭合移入 .task/archive/;任务执行期的过程证据见原任务记录与 PR。
File diff suppressed because one or more lines are too long