docs: 记录智能体工具续接修复集成
This commit is contained in:
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-24：从 `0e22e0545d6f58a17a8c85805570a550d1c14c43` 无冲突快进合入源 `79914e1d06a66f78239ebe57f816acc98dc1eaae`。智能体提交工具结果遇到同一 interrupted 父 Run 的临时 run_busy 时，Main 保留原批次等待资源释放后续接，不重读文件或新建问题，沿用取消与原问题时限；其他运行占用及冲突保持失败。产品/测试与源完全一致，沿用源 183 项相关测试及最终 29 项聚焦回归、Renderer 类型检查、scoped lint、Vite 构建和配套本地真实 HTTP/PG/worker 因果验证。原有 3 份文档保持，未推送、打包、安装或部署。详见[源任务](tasks/20260924-consultation-run-busy-9ac245f1.md)和[集成记录](tasks/20260924-merge-agent-rendering-ml-4efb196c.md)；安装版/生产模型仍待验收。
|
||||
|
||||
- 2026-09-24：从 `39b03a1628bcdbc9c6bcf82b874e2814bf1780d0` 无冲突快进合入客户端源 `a10cf000157a1a3edcfad43705e0824f19568a33`。所有下发智能体在顶栏并排显示头像与名称，点击恢复对应历史或空输入框，数量多时横向滚动；移除面板智能体下拉框。草稿按账号／项目／智能体分别保存，旧未归属草稿只读折叠保留；旧话题版本、学生计费和三个只读工具保持。产品与测试文件和源完全一致，沿用源相关单测、17 项浏览器布局、1 项 Electron 交互及类型／lint／构建证据；本次只追加集成文档。3 份原有未提交文档保持，未推送、打包、安装或部署。详见[源记录](tasks/20260924-consultation-topbar-22717e99.md)、[集成记录](tasks/20260924-merge-agent-rendering-ml-4efb196c.md)和[咨询决定](../10-decisions/ADR-2026-09-22-coding-teacher.md)。
|
||||
|
||||
- 2026-09-24：在 `d2150ce5de5cec541f65eba9260d3cdc5172a66d` 上无冲突集成源 `97837cef90baf6bb02cfda0cef7b938081f3c5f7`，保留主线工作台样式。咨询支持 Markdown/表格/代码/公式/图片，普通 JSON 与代码不再被误判为讨论协议；格式失败原文独立折叠留存，工具名称/状态独立展示，修复多余数字 0。配套 Yuxi 源 `02f27f33a8b816589036503f0720d446418c28aa` 在主分支保证 AI 角色投影。合并树重新通过 287 项相关单测、12 项 319/508px 浏览器布局、Renderer typecheck、scoped lint 和 Vite 全目标构建。未推送、打包或部署，真实模型整链验收未执行。旧版已覆盖的原文不能恢复。详见[源任务](tasks/20260924-agent-rendering-a8c2d419.md)、[集成记录](tasks/20260924-merge-agent-rendering-ml-4efb196c.md)及[咨询决定](../10-decisions/ADR-2026-09-22-coding-teacher.md)。用户批准释放旧集成登记，并以当前主线为基线重新登记；原三份未提交文档仍原样保留，不修改历史来源记录。
|
||||
|
||||
@@ -12,10 +12,12 @@
|
||||
|
||||
## Scope
|
||||
|
||||
- 工具续接后续集成（2026-09-24）：合入已验证源 79914e1d06a66f78239ebe57f816acc98dc1eaae，修复同一 interrupted 父 Run 清理资源期间返回 run_busy 导致客户端取消问题。当前主线为源基线 0e22e0545d6f58a17a8c85805570a550d1c14c43。
|
||||
- Merge reviewed source 97837cef90baf6bb02cfda0cef7b938081f3c5f7 (20260924-agent-rendering-a8c2d419) into local main; promote accepted consultation rendering and protocol facts. Paired Yuxi source: 02f27f33a8b816589036503f0720d446418c28aa.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- 本轮继续既有智能体集成任务；官方 same-task start/status 与独占 integration lock、Identity 匹配。Concurrent/Planning/Integration Gates Passed；重读 entry、自身/源记录、当前集成状态及老师决定/架构/领域/证据等上下文，复用未变的 115 个 peer 范围，刷新本次已完成源。历史模板记录没有本次具体语义依赖。3 份既有 adopted 文档保持原样。计划：精确快进、核对源字节与提交祖先、接受 current-state 提议、通过文档门禁、提交完成并询问源工作树清理。产品字节一致时沿用源测试，不重复已完成检查；不推送、打包、安装、部署或创建子智能体。
|
||||
- Concurrent, Planning and Integration Gates Passed: official start/status match Identity and exclusive integration lock. Read entry/memory-index, own/source/reviewer records, positioning/current-state, teacher ADR, architecture, domain, evidence/reflection/commitments and registered peer scopes. Project goal remains server-distributed consultation agents, Main-owned read tools and student billing. No semantic conflict; preserve current workbench styling and guidance from main.
|
||||
- User explicitly authorized official release --force of the prior integration owner and new --adopt-existing registration for three known foreign untracked task documents. They remain unchanged and excluded from commits. The new base avoids attributing old cross-machine imports to this integration. No registry fields were manually rewritten.
|
||||
- Plan: merge exact sources, preserve main styling, rerun relevant client unit/type/build/layout checks, promote accepted facts, pass documentation gates and complete. No push, deployment, paid model request or new subagent. Reuse the completed independent review for unchanged source logic.
|
||||
@@ -23,12 +25,14 @@
|
||||
|
||||
## Outcome
|
||||
|
||||
- 工具续接后续：main 从 0e22e0545d6f58a17a8c85805570a550d1c14c43 无冲突快进至 79914e1d06a66f78239ebe57f816acc98dc1eaae。产品、测试、README 与源一致；源任务记录原样导入，仅在本集成记录和 current-state 收录结果。接受原 Run 清理期间复用原工具批次、保留截止时间与取消的提议，不改变云端互斥或计费。
|
||||
- Source merge committed as 98559e32a75dfbada12a737d7ff0ffda55aa346a. Before the merge commit the drift checker could not recognize the staged foreign source record; exact source-record equality was confirmed, then the unchanged source import was committed and the official drift check passed. No foreign record was edited/adopted to bypass this gate.
|
||||
|
||||
- Merged source without conflicts; the only TeacherChatPanel difference from reviewed source is main's two header/avatar styling classes, and README keeps main's styling description. Source task record and implementation imported unchanged otherwise; cloud guidance already on main remains intact. Promoted Markdown/explicit protocol parsing, retained malformed originals and separate typed activity into teacher ADR and architecture.
|
||||
|
||||
## Verification
|
||||
|
||||
- 工具续接后续：source ancestry、全部产品文件/source-record 精确相等、无 unmerged 路径检查通过。复用已验证源 183 项相关测试、最终 29 项聚焦回归、Renderer typecheck、scoped ESLint 与 Vite 全目标构建；配套 Yuxi 控制验证证明清理前 409、清理后相同批次 200 并完成回答。验证结果未被表述为新的重复测试或生产验收。官方文档门禁及 git diff --check 通过，3 份已 adopted 外来文档仍为原始状态；未改变产品或测试 oracle。
|
||||
- Existing user-approved independent reviewer completed a bounded integration review: PASS, no findings. Of 19 source-changed files, 17 match source blobs exactly; README/header classes only preserve existing main styling. Confirmed canonical semantics and evidence boundaries. Official task-aware drift passes with all three adopted foreign documents unchanged; no unmerged files remain.
|
||||
|
||||
- Merged tree: pnpm exec vitest run teacher-discussion teacher-cloud-activity coding-teacher --maxWorkers=1: 8 files / 287 passed. MAKELORE_LAYOUT_BROWSER_CHANNEL=msedge pnpm exec playwright test tests/e2e/teacher-discussion-layout.spec.ts: 12 passed at 319/508px with fixture API. pnpm run typecheck, ESLint on changed TS/TSX, pnpm run build:vite and whitespace checks passed.
|
||||
@@ -37,6 +41,7 @@
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- 本次 20260924-consultation-run-busy-9ac245f1 源工作树待单独清理确认；分支和提交保留。尚未推送、打包、安装或部署，实际安装版需更新才能包含续接修复。
|
||||
- No push, installer, app restart, deployment or real provider test. Install an updated client and deploy Yuxi API/worker before online acceptance. Existing malformed history is not rewritten. Source checkout cleanup requires separate user consent.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
Reference in New Issue
Block a user