diff --git a/.project-docs/20-architecture/system-overview.md b/.project-docs/20-architecture/system-overview.md index 64e140aa..cdb99644 100644 --- a/.project-docs/20-architecture/system-overview.md +++ b/.project-docs/20-architecture/system-overview.md @@ -1,5 +1,7 @@ # System Overview +云端咨询最多执行六批本地读取。Yuxi 消费最后一批结果后通过 `tool_choice: none` 请求最终答案;Main 保留第七批保护,并区分 `teacher_read_limit`、`teacher_context_expired` 和 `teacher_protocol_invalid`。真实模型与安装版验收保持独立,失败问题不自动重试。 + 智能体图标跟随发布定义:Yuxi 将原生 `icon` 固定到发布快照,Works Square 转为公开地址 `icon_url` 下发。Makelore 顶栏、邀请、面板标题、欢迎区和消息行统一读取该字段;缺失或加载失败时回退到既有 `avatar_id`。新话题取当前发布定义,旧话题保持原版本;自定义图标使用正常图像渲染,内置像素头像保持像素样式。 详见[图标集成记录](../30-worklog/tasks/20260926-merge-agent-avatar-ml-92dc837e.md)。 diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index 35718220..3103101a 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre ## Integrated Through +- 2026-09-26:从 `287dcd303d3c99665e95eca3345c4ee3270a855f` 无冲突快进合入已独立审查源 `60c20f996e8428d4dfbd5efb92792d3900722af5`。云端咨询最多执行六批本地读取。Yuxi 消费最后一批结果后通过 `tool_choice: none` 请求最终答案;Main 保留第七批保护,并区分 `teacher_read_limit`、`teacher_context_expired` 和 `teacher_protocol_invalid`。真实模型与安装版验收保持独立,失败问题不自动重试。 产品、测试和源记录与审查版本一致,沿用源验证;两仓共 5 份外来文档原样保留。未推送、部署或更新安装版。见[源任务](tasks/20260926-teacher-read-expired-087d82f7.md)和[集成记录](tasks/20260926-merge-teacher-read-ml-616605aa.md)。 + - 2026-09-26:合入图标修复源 `a3c02e74649c743c445fb2304bec9e0ac954ad96`,合并提交 `e3d01a1da4c836d0f5c9d9fc42bd9257088a4669`。智能体图标跟随发布定义:Yuxi 将原生 `icon` 固定到发布快照,Works Square 转为公开地址 `icon_url` 下发。Makelore 顶栏、邀请、面板标题、欢迎区和消息行统一读取该字段;缺失或加载失败时回退到既有 `avatar_id`。新话题取当前发布定义,旧话题保持原版本;自定义图标使用正常图像渲染,内置像素头像保持像素样式。 产品与测试保持已审查源字节,复用源验证;7 份跨仓外来文档原样保留且未纳入提交。未推送、部署或更新安装版;发布配套三端后需在运营端同步 Yuxi 配置,新话题使用新版本。见[源任务](tasks/20260926-agent-avatar-ml-3c3686ec.md)及[本次集成](tasks/20260926-merge-agent-avatar-ml-92dc837e.md)。 - 2026-09-26:以已集成技术基线 `1037356090eca90793ffe74750c273cbb44d7aef` 为基础,记录并按用户进一步澄清修订[老师 Agent 产品定位](../00-brief/project-positioning.md#老师-agent-的产品定位):老师 Agent 是某一领域杰出人物的能力转化而成的智能体,供平台学生使用,提供专业理解、判断与解决问题的能力支持。蒸馏属于实现方法,产品定义围绕人的领域能力及学生价值。同步 README、老师 ADR 和决定索引;本次仅记录理念,不变更运行代码、线上配置或既有智能体角色模型,也不代表所有下发项已完成能力验收。 diff --git a/.project-docs/30-worklog/tasks/20260926-merge-teacher-read-ml-616605aa.md b/.project-docs/30-worklog/tasks/20260926-merge-teacher-read-ml-616605aa.md new file mode 100644 index 00000000..0f2b7831 --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260926-merge-teacher-read-ml-616605aa.md @@ -0,0 +1,41 @@ +# Task: Integrate teacher read completion repair + +## Identity + +- Task ID: 20260926-merge-teacher-read-ml-616605aa +- Mode: Integration +- Branch: main +- Worktree: D:\Datas\OthersProjects\makelore +- Base commit: 287dcd303d3c99665e95eca3345c4ee3270a855f +- Owner: codex +- Status: Ready for Integration + +## Scope + +- Merge reviewed source 60c20f996e8428d4dfbd5efb92792d3900722af5 into local main and promote the confirmed teacher read-completion contract. No product changes beyond the reviewed source. + +## Intent And Constraints + +- Concurrent and Planning Gates Passed. Official check/start/status establish exclusive integration ownership with Identity above. Loaded entry, own/source records, current teacher positioning/decisions/architecture/domain and evidence/reflection/commitments; inspected peer records and reused unchanged previous context. Historical template scopes/positioning remain unknown with no concrete dependency on this merge. +- User explicitly approved handing off the previous avatar integration registration through release --force and preserving the known foreign documents through --adopt-existing. All five documents across both repositories stay unchanged and outside commits. Source records stay read-only; no new subagents, push, deployment, installation or deletion. +- Plan: fast-forward the exact reviewed source, verify ancestry and equality with the reviewed product/test tree, promote runtime facts to canonical memory, pass documentation and whitespace gates, then commit and complete. Reuse source test/review evidence when the product tree is identical. + +## Outcome + +- Fast-forwarded local main to reviewed source 60c20f996e8428d4dfbd5efb92792d3900722af5 without conflicts. Product, tests, public documentation and imported source records match the reviewed source. +- Promoted the six-batch completion and distinct client error semantics into system-overview and current-state. No conflicting accepted product or billing decision; original read quota/context/version/deadline and student funding remain. + +## Verification + +- Source independent review 20260926-teacher-read-review-b7d3e91a: PASS without material findings; independent reruns covered one six-batch HTTP/PG/Redis/worker/SDK case and six focused client cases. +- Reused source evidence for identical product/test bytes: Makelore 130 related unit tests plus three corrected malformed-batch cases, typecheck and Vite all-target build passed; existing build warnings remain disclosed. +- Fast-forward ancestry, exact reviewed product-tree comparison, imported source-record equality, whitespace and official task-aware documentation gates passed. The drift check also confirms all adopted foreign documents retain their original states. + +## Follow-ups + +- Source worktree retained awaiting the separate post-merge cleanup confirmation. Branch and committed result remain preserved; cleanup does not block the completed local merge. +- Production supplier requests, live billing and installed-client acceptance remain unverified. Deploy the matching Yuxi worker and updated client before acceptance; existing failures are not automatically replayed. + +## Promotion Candidates + +- Accepted source runtime proposal applied to system-overview/current-state. No new product direction or semantic conflict; no source record modified.