docs(teacher): 集成 Yuxi 老师与学生计费边界

.project-docs/30-worklog/current-state.md

@@ -4,6 +4,10 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
 
 ## Integrated Through
 
+- 2026-09-23：任务 `20260923-merge-yuxi-teachers-ml-9d623c5f` 经用户确认交接主目录，将 `d20c818fe79bc5833cef15d99974b699dde71c6d` 从 `1f2ad3fb3a71b8b35fabb5b319cd3b54b4c2ebbe` 无冲突快进合入本地 `main`。配套三端已统一为 Yuxi 原生老师、WS 运营选择下发/同步/默认/启停、Main 三个项目/Pi 只读工具及学生账号付费；个人 Agents 保持创建者付费。MakeLore `d20c818` 已关闭 Yuxi 源记录中的子线程正文路由待办。
+  源验证：51 项相关测试、typecheck、lint 和生产构建通过；原 Electron 老师选择/带回草稿流程通过。子线程正文混入先复现失败再修复，回归覆盖两种事件格式及断线游标。 产品文件与源一致，未重写实现；完整生产拓扑及真实供应商计费仍待发布验收。原有 3 份外来文档保持未提交原样，未推送或部署，无本次新增迁移。
+  本条取代早期 Main 独立运行/不保存云端老师消息/运营重复编辑配置的现状说明，旧条目保留为历史。见[本次集成](tasks/20260923-merge-yuxi-teachers-ml-9d623c5f.md)和[源任务](tasks/20260923-yuxi-teachers-client-53ba33e2.md)。
+
 - 2026-09-22：原老师集成任务后续将修复源 `44e754a43ec6d286fee6b6492da0d1f9347770e6` 从 `7f5131e` 无冲突快进合入本地 `main`。
   老师能按需只读当前项目目录、UTF-8 代码/配置和本轮捕获的主会话/老师话题原文；长来源及上一轮老师回答保留最近问答节选，避免上下文被全部丢弃或连续追问失败。
   Main 原生工具结果续接最多六批后要求最终回答，检查账号与取消状态，计算完整输入预算并累计模型用量；不启动 Pi、不写文件或执行命令。

.project-docs/30-worklog/tasks/20260923-merge-yuxi-teachers-ml-9d623c5f.md

@@ -0,0 +1,44 @@
+# Task: Integrate Yuxi coding teachers into main branch
+
+## Identity
+
+- Task ID: 20260923-merge-yuxi-teachers-ml-9d623c5f
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 1f2ad3fb3a71b8b35fabb5b319cd3b54b4c2ebbe
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Integrate the approved three-part Yuxi coding-teacher release; this task owns the ml local primary branch and canonical memory. Exact source: d20c818fe79bc5833cef15d99974b699dde71c6d; source task: 20260923-yuxi-teachers-client-53ba33e2.
+
+## Intent And Constraints
+
+- Project Context Loaded: official check/start/status passed in integration mode with the task ID, branch, absolute primary worktree and base in Identity, exclusive integration lock and reservation. The user explicitly approved releasing the three completed prior owners and adopting seven existing foreign documents unchanged; they are excluded from commits.
+- Read entry/memory-index, own and source records, positioning, current-state, decision-index/teacher decisions, system-overview, module-map/data-flow, business-rules/success-criteria, evidence/reflection/commitment/stale indexes. Yuxi root engineering guidance and architecture also loaded. Project goal: MakeLore Main owns desktop credentials, project/Pi reads and local teacher UI/history.
+- Read 105 peer records from registered paths; all readable. Other peer scopes match the previously loaded implementation assessment, apart from the completed source task. Historical placeholder scopes remain unknown/read-only, with no concrete conflict for this exact integration. Yuxi/MakeLore positioning templates are supplemented by AGENTS, architecture, README and verified source.
+- Current integrated teacher behavior is local Main execution; the user's accepted Yuxi-native teacher design and explicit student payer decision supersede that boundary. Existing personal-agent creator billing, Pi execution and local project write boundaries remain. Source tests/reviewer evidence applies to unchanged product bytes; real provider/production topology validation is still pending. The paired client source includes d20c818, resolving the routing follow-up recorded in the Yuxi source.
+- Planning and Integration Gates Passed. Plan: fast-forward the exact verified source; promote the already-approved runtime/distribution/read-tool/billing facts into owning canonical documents; prove source ancestry and product equality, validate documentation/contracts, commit/complete and ask separately about source worktree cleanup. No new subagents, push, deployment or paid model calls.
+
+## Outcome
+
+- Fast-forwarded local main from 1f2ad3fb3a71b8b35fabb5b319cd3b54b4c2ebbe to d20c818fe79bc5833cef15d99974b699dde71c6d without conflicts. All three paired sources are integrated, including MakeLore d20c818, which resolves the child-thread routing follow-up in the unchanged Yuxi source record.
+- Promoted the user-approved Yuxi runtime, Operations distribution, Main read-tool/history, main-thread text routing and student payer boundaries into canonical decisions/architecture/domain/current-state/evidence. Source task records are imported unchanged. Product and test files exactly match the verified source.
+- The three pre-existing foreign documents retain their original adopted state and remain outside commits. No push, deployment, installer update, production migration or paid provider call.
+
+## Verification
+
+- Main contains the exact source HEAD; git merge --ff-only and source ancestry/equality checks passed. Product/test/build evidence is inherited from the exact fast-forwarded source; no conflict or product rewrite required another product test run.
+- New relative document links passed (8 targets in this repository); whitespace checks passed. Official task-aware drift passed with unchanged source provenance and adopted foreign documents. Reviewed the committed/working range from the recorded base; only this integration's canonical documents and task record are committed beyond the source.
+
+## Follow-ups
+
+- Source worktree D:/Datas/OthersProjects/.codex-worktrees/makelore/20260923-yuxi-teachers-client-53ba33e2 (task 20260923-yuxi-teachers-client-53ba33e2) remains pending the separate post-merge cleanup question. Preserve its branch and commits.
+- Initial blocked start created an unclaimed integration checkout at D:/Datas/OthersProjects/.codex-worktrees/makelore/20260923-merge-yuxi-teachers-ml-9d623c5f, branch codex/20260923-merge-yuxi-teachers-ml-9d623c5f-merge-yuxi-teachers. Ownership was rolled back before a task record was created; it is not a ready managed task and is retained for separate cleanup review. The active task owns the primary worktree in Identity, not this unused checkout.
+- Release/real provider billing and full deployed three-service acceptance remain separate; keep existing recovery-backup directories unchanged.
+
+## Promotion Candidates
+
+- Applied the accepted source promotion candidates in integration mode. User confirmation already covers native Yuxi teachers, local read tools and student billing; no unresolved product decision remains.