docs: integrate teacher streaming into main

.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-29：按用户要求，将老师流式源 `8ccc4650a2d36ea4a1a7426dbaffc8178255a5e3` 从 `f443f3b` 无冲突快进合入本地 `main`。Yuxi 主线程思考独立流式显示并保存，正文从未完成结构化回复逐步投影，最终回复确认正文与快捷回复；思考不进入工具活动、后续模型上下文或带回草稿。工具续接与取消保留已收内容，子线程仍只推进游标。产品与测试保持源一致，沿用 322 项相关单测、标准类型检查、lint、生产构建及 1 项 Electron 场景证据；扩展 Main 仍有 66 项既有诊断。已核对 Yuxi 现有事件协议，无配套服务端改动；需更新客户端，真实模型思考事件与安装版尚未验收。三份外来文档原样保留且未提交；未推送、部署或打包。见[源记录](tasks/20260929-teacher-stream-f00acb6f.md)和[集成记录](tasks/20260929-merge-teacher-stream-1e4177fe.md)。
+
 - 2026-09-29：按用户要求，将已独立审查的快捷提示源 `53d5b6b` 无冲突快进合入本地 `main`。Yuxi 配置多项展示文案和实际提示词，显式发布冻结后经 WS 下发，Makelore 按序显示并通过普通提问发送；空列表隐藏入口，历史缺字段保留旧入口。源验证 73 项 UI 单测、21 项浏览器布局场景、类型检查、lint 和生产构建通过；独立 Reviewer PASS。合并保留已审查产品与测试，新增修改仅为项目记忆；原有跨仓 7 份外来文档保持未提交。快捷提示不新增迁移；上线顺序为 WS API、Yuxi、Makelore，本次未推送、部署或打包。见[源记录](tasks/20260929-teacher-shortcuts-ml-8ce941d7.md)及[集成记录](tasks/20260929-integrate-shortcuts-ml-b75d3c29.md)。
 
 - 2026-09-29：用户确认“一次发布，自动更新 Makelore”并要求合并。源 `913ccad5774df9a8e1f8259394658a524f8255d4` 无冲突快进合入本地 `main`。Yuxi 管理员在可管理的原生智能体编辑页一次“保存并发布”即可更新 Makelore；普通保存只改草稿。Yuxi 固定不可变快照并携同一操作身份交给 WS，只有 WS 登记提交后才报成功，失败重试不发布后来编辑的草稿。WS 按来源绑定稳定老师 ID，首次复用唯一启用旧项，歧义需显式选择；保留默认、停用和历史，不自动合并旧身份，重新启用需要显式动作。 前台每五秒读取小型目录 revision，进入模块及回到前台补查，变化才重新读取完整配置；后台停止轮询。刷新独立于聊天、输入和正在回答，不触发模型。Main 每次接受新问题仍读取当前版本，运行中的问题固定原版本，同项目可见聊天保持连续。 独立 Reviewer 发现的历史字符串 ID `coding-teacher` 被 UUID 约束拒绝问题已修复并复核通过。WS 33 项（含真实 PostgreSQL 迁移/并发）、Yuxi 2260 后端单测/1 跳过及发布 HTTP/PG、worker/Redis、浏览器和前端构建，MakeLore 208 项及类型/lint/构建通过；具体分批证据见源记录。必须先部署 WS `20260929_0099`/API，再更新 Yuxi 和客户端；本次仅本地合并，未推送、部署或测量生产延迟。原有跨仓共 7 份外来文档保留未提交。此条更新旧运营必经和旧话题固定版本的发布说明，下方日期条目保留为历史。见[源记录](tasks/20260929-teacher-publish-ml-e6b32168.md)、[集成记录](tasks/20260929-integrate-teacher-ml-a19f72c4.md)。

.project-docs/30-worklog/tasks/20260929-merge-teacher-stream-1e4177fe.md

@@ -0,0 +1,41 @@
+# Task: Integrate teacher reasoning and answer streaming into main
+
+## Identity
+
+- Task ID: 20260929-merge-teacher-stream-1e4177fe
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: f443f3bc668dfc6c9df111506d739d343ee82bba
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Integrate completed teacher streaming source 8ccc4650a2d36ea4a1a7426dbaffc8178255a5e3 into local main and promote its accepted project-memory changes.
+
+## Intent And Constraints
+
+- User explicitly requested merging into main. Concurrent and Planning Gates Passed with exact registry identity and exclusive integration lock. Loaded entry, own/source records, positioning, current state, teacher ADR, architecture and domain/success rules; retained prior same-base peer scope assessment. Historical placeholder peer records remain unknown with no concrete conflicting dependency.
+- Reused the human-authorized primary-checkout handoff recorded by the preceding integration task 20260929-integrate-shortcuts-ml-b75d3c29. Its drift check proved the same three foreign documents unchanged before official release/start --adopt-existing. Preserve them without staging: 20260901-package-122-c5e8.md, 20260901-package-123-d7f3.md and 20260902-client-hang-diagnosis-a47c9e2b.md under this task-record directory.
+- Source records are read-only. Main owns cloud transport; preserve project isolation, published model configuration and billing. No subagents, product redesign, cloud writes, push, deployment or packaging.
+
+## Outcome
+
+- Fast-forwarded local main from f443f3bc668dfc6c9df111506d739d343ee82bba to source 8ccc4650a2d36ea4a1a7426dbaffc8178255a5e3 without conflicts. Main now includes independent streamed reasoning and answer previews with final reply reconciliation.
+- Promoted the user-authorized source candidate into the teacher ADR, decision index, system overview, business rules and Integrated Through. README arrived with the source. The new visible reasoning rule supersedes the old visibility exclusion without including reasoning in answers, tools, future model context or bring-back drafts.
+
+## Verification
+
+- Source evidence: 322 distinct relevant unit cases, standard typecheck, scoped lint, final Vite production compile and one Electron streaming interaction passed. Extended Main typecheck has 66 documented existing diagnostics, none in changed teacher files. Source used deterministic fixtures; real paid-provider and installed-client acceptance remain unverified.
+- Integration checks passed: source ancestry, identical product/tests/source record and diff whitespace. Reused source test evidence because additional edits only update canonical documents. Task-aware documentation drift checked before commit/completion.
+
+## Follow-ups
+
+- User explicitly approved cleaning source task 20260929-teacher-stream-f00acb6f at D:\Datas\OthersProjects\.codex-worktrees\makelore\20260929-teacher-stream-f00acb6f, including ignored dependencies/build output while preserving its branch and commits. Rechecked ready/managed registry state, clean source, committed source record and source inclusion in main; resolved the exact approved path before official retire from the primary checkout.
+- Cleanup BLOCKED: official retire exited 1 with Git error `Directory not empty`. Git removed the linked-worktree registration and .git file, but left a partial directory (including node_modules and some source/resources). Branch codex/20260929-teacher-stream-f00acb6f-teacher-stream still resolves to 8ccc4650a2d36ea4a1a7426dbaffc8178255a5e3. Retained residue and remaining task registry state; did not bypass the skill's exclusive-retire rule with manual deletion or reconstruct metadata. Requires separate supported recovery. This does not invalidate the completed merge.
+- Shipping the updated client and verifying production model reasoning availability remain release work, outside this local merge.
+
+## Promotion Candidates
+
+- Source candidate accepted and promoted as described above; no unresolved canonical conflict or additional promotion.