From eb773f7421bda1fc4484c18761881add286a607b Mon Sep 17 00:00:00 2001
From: brother7 <7brother7@gmail.com>
Date: Fri, 9 Oct 2026 16:10:31 +0800
Subject: [PATCH] docs: record product integration on main branch

---
 .project-docs/05-agent-entry/memory-index.md  |  2 +-
 .../community-collaboration.md                |  4 +-
 .project-docs/30-worklog/current-state.md     |  2 +
 .../tasks/20261009-merge-product-dd0461f9.md  | 42 +++++++++++++++++++
 .project-docs/50-evidence/evidence-index.md   |  2 +-
 .project-docs/80-commitments/commitments.md   |  2 +-
 6 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 .project-docs/30-worklog/tasks/20261009-merge-product-dd0461f9.md

diff --git a/.project-docs/05-agent-entry/memory-index.md b/.project-docs/05-agent-entry/memory-index.md
index cbe5846a..4ee6adff 100644
--- a/.project-docs/05-agent-entry/memory-index.md
+++ b/.project-docs/05-agent-entry/memory-index.md
@@ -2,7 +2,7 @@
 
 ## Community Collaboration · 2026-10-09
 
-先读[社区协作与充值边界](../20-architecture/community-collaboration.md)：麦洛不体现课程；D01 当前账号充值已本地实现，家长登录孩子号。任务证据、真实支付和安装版留项分别记录，不恢复旧客户端课程待办。
+先读[社区协作与充值边界](../20-architecture/community-collaboration.md)：麦洛不体现课程；D01 当前账号充值及正式设计已合入本地 main，家长登录孩子号。任务证据、真实支付和安装版留项分别记录，不恢复旧客户端课程待办。
 
 Use this as the high-density entry point after the Concurrent Task Gate establishes task identity and worktree ownership.
 
diff --git a/.project-docs/20-architecture/community-collaboration.md b/.project-docs/20-architecture/community-collaboration.md
index 49b43280..fc003745 100644
--- a/.project-docs/20-architecture/community-collaboration.md
+++ b/.project-docs/20-architecture/community-collaboration.md
@@ -1,6 +1,6 @@
 # 麦洛与社区、LMS 的协作边界
 
-日期：2026-10-09。状态：用户已确认，本地 D01 代码及正式设计在独立集成分支对齐；未更新安装版或部署服务。
+日期：2026-10-09。状态：用户已确认，D01 代码及正式设计已合入本地 main；未推送、更新安装版或部署服务。
 
 ## 产品职责
 
@@ -40,7 +40,7 @@
 
 源 281e6dc / 0d442ce 的 41 项定向单测、类型检查、相关 lint、Renderer/Main/preload 构建和 1 项 Electron 流程已通过；详见[实施任务](../30-worklog/tasks/20261009-makelore-product-implementation-eaa0ffa5.md)。本次只整合正式文档，应用和测试文件与源保持相同，不把文档检查算成重新运行这些测试。
 
-先更新 WS 的当前账号充值资格，再发布配套客户端。实际支付提供方对孩子账号令牌的接受、真实到账及正式安装版仍需验收。本次没有付费请求、打包、安装、主分支合并或部署。
+先更新 WS 的当前账号充值资格，再发布配套客户端。实际支付提供方对孩子账号令牌的接受、真实到账及正式安装版仍需验收。代码与设计已完成本地主分支合并；没有付费请求、打包、安装、推送或部署。
 
 ## 配套权威
 
diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md
index 6bdc83c5..6e3fbb4b 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-10-09：按用户要求，将集成源 `35e2a9149aed7d918176f00369cee6528505cdb8` 从 `fe1a3775` 无冲突快进合入本地 `main`。应用、测试、配置与已验证源保持相同，本次仅补充主分支交付记录。原有 3 份外来文档原样保留且未纳入提交；全部源分支和工作区按用户要求保留。未推送、部署、迁移生产数据或发布安装包；真实机构、OSS/网络、支付和设备验收仍待执行。见[本次合并](tasks/20261009-merge-product-dd0461f9.md)。本条更新下方独立分支阶段的未合主分支状态，历史来源记录不改写。
+
 - 2026-10-09：本独立 integration 分支以实施源 `0d442ce576430880355ca35382b844d2cec14d64` 为基线，整合原创作和永久点数决定及后续用户决定。D01 当前账号充值、可见收款对象及无课程客户端边界已有本地实现；家长登录孩子账号充值、麦洛不体现课程替代旧充值待定/客户端课程提案。应用和测试保持源版本，源记录原样保留。当前正式设计尚未推广到主分支；未部署、支付或删除工作区。本批无客户端迁移。真实机构、OSS/网络、支付或移动验收仍按各项目留项。见[正式设计](../20-architecture/community-collaboration.md)、[实施证据](tasks/20261009-makelore-product-implementation-eaa0ffa5.md)、[本次集成](tasks/20261009-makelore-product-integration-29d647c5.md)。下方日期条目为历史阶段，不以早期未实现/待定描述覆盖本条。
 
 - 2026-09-29：续接用户已授权的老师流式集成任务，将远程 `a77ddbd6813bb71d490544edfef6e1f35240070f` 与本地 `6dee9ea62c42b98a747352378fe1c74ab77f48a5` 合并。保留独立思考／正文流，接入按请求固定的模型选择、语音草稿、真实时间戳、紧凑快捷回复和各老师独立介绍；完成态正文及卡片各显示一次。同步纳入本地空作品检测、社区外部链接和 macOS 主窗口重建。582 项相关单测、47 项浏览器场景、9 项 Electron 场景、标准类型检查、变更文件 lint 与生产构建通过；修正一处仍假设单欢迎气泡的旧布局断言。Windows 夹具不代表原生 macOS、真实模型或云端模型覆盖能力已上线。失效源工作树通过保留残留目录、官方 release-missing/start 恢复登记；三份原有未跟踪文档及远程来源记录保持原样。未推送、部署、打包或更新安装版。见[续接记录](tasks/20260929-merge-teacher-stream-1e4177fe.md#remote-merge-resume)。
diff --git a/.project-docs/30-worklog/tasks/20261009-merge-product-dd0461f9.md b/.project-docs/30-worklog/tasks/20261009-merge-product-dd0461f9.md
new file mode 100644
index 00000000..cd3edfb5
--- /dev/null
+++ b/.project-docs/30-worklog/tasks/20261009-merge-product-dd0461f9.md
@@ -0,0 +1,42 @@
+# Task: Merge approved product integration into main branch
+
+## Identity
+
+- Task ID: 20261009-merge-product-dd0461f9
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: fe1a3775c5f785adaa6372bd7ea3102c79331656
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Fast-forward approved integration source 35e2a9149aed7d918176f00369cee6528505cdb8 into local main; update current canonical delivery status and preserve all source records, branches and worktrees.
+
+## Intent And Constraints
+
+- User explicitly requested main-branch merge. WS/Makelore adoption of the five named foreign documents was separately confirmed; they remain unchanged and excluded from commits. LMS primary checkout was clean; released this conversation's completed implementation/source integration ownership normally before claiming main.
+- Official check/start/status and Concurrent/Planning/Integration Gates Passed. Exact task, integration mode, branch, absolute worktree and base match. Entry, own record, required current memory and source outcome/candidates loaded; source decisions already approved. WS 277/LMS 25/Makelore 146 peer records unchanged. Historical WS Gateway missing Intent has no relevant dependency.
+- Community owns courses/self-study/works/points/support; institutions own teaching with optional LMS; Makelore stays course-free. Retain permanent manual per-child points and current-child-account recharge. No new product scope, subagents, remote push, deployment, payments or deletion.
+- Plan: fast-forward the fixed reviewed source, verify source ancestry/application equality and original foreign bytes, reconcile only current main-branch status, run task-aware documentation checks, commit the integration record and complete. Keep all worktrees by existing user instruction; do not ask again for cleanup.
+
+## Outcome
+
+- Fast-forwarded fe1a3775c5f785adaa6372bd7ea3102c79331656 to approved source 35e2a9149aed7d918176f00369cee6528505cdb8 on local main, without conflicts. Application, tests, configuration and dependencies are unchanged from the verified source. Updated current canonical status and main delivery pointers; imported source records remain unchanged.
+- 3 original foreign documents remain byte-for-byte unchanged and excluded from this commit. All source worktrees and branches retained as explicitly requested; no cleanup question repeated. No push, deployment, production migration, payment, packaging or installation.
+
+## Verification
+
+- PASS: source clean; main base is an ancestor of the exact source; fast-forward succeeded. Source-to-main non-Markdown diff is empty, including working changes. Existing source phase-specific test evidence remains applicable; no unaffected business suite was rerun.
+- PASS: original foreign document bytes unchanged; their paths do not overlap this merge. Source task/proposal imports preserved through real ancestry. Official check_project_docs.py and task-aware check_doc_drift.py passed for all three repositories.
+- Reviewed base-to-integrated changes and the current status-only edits; current task record records actual scope, outcome, verification and follow-ups. Task Documentation Gate complete; Ready for Integration retains the primary checkout for future same-task work.
+
+## Follow-ups
+
+- Real institution/course, OSS/media/network, payment and selected native/WeChat/installed-client acceptance remain separate. Course-package default limits still need real-pilot configuration; no optional receipt/mobile/multi-media expansion is included.
+- Retain all worktrees and branches by user instruction, including ignored output and dependencies; do not delete.
+
+## Promotion Candidates
+
+- Promoted exact source under Integrated Through and updated current pending-main wording in canonical designs, memory/evidence/commitment entry points and applicable root documents. Dated source records and historical entries remain read-only. No business decision changed.
diff --git a/.project-docs/50-evidence/evidence-index.md b/.project-docs/50-evidence/evidence-index.md
index 82963cc8..a6314fc7 100644
--- a/.project-docs/50-evidence/evidence-index.md
+++ b/.project-docs/50-evidence/evidence-index.md
@@ -2,7 +2,7 @@
 
 ## Community Product Integration · 2026-10-09
 
-源 `0d442ce576430880355ca35382b844d2cec14d64` 的D01 当前账号充值、可见收款对象及无课程客户端边界已在独立分支与正式设计对齐。各阶段测试仍以[实施任务](../30-worklog/tasks/20261009-makelore-product-implementation-eaa0ffa5.md)为证据；本次只核对代码/测试/配置一致性、源记录保留、文档链接和门禁，结果见[集成任务](../30-worklog/tasks/20261009-makelore-product-integration-29d647c5.md)。未重新运行未受影响的全套应用测试，也不把本地验证等同真实环境验收。
+源 `0d442ce576430880355ca35382b844d2cec14d64` 的D01 当前账号充值、可见收款对象及无课程客户端边界已与正式设计对齐并合入本地 main。合并源 `35e2a914`，见[主分支交付记录](../30-worklog/tasks/20261009-merge-product-dd0461f9.md)。各阶段测试仍以[实施任务](../30-worklog/tasks/20261009-makelore-product-implementation-eaa0ffa5.md)为证据；本次只核对代码/测试/配置一致性、源记录保留、文档链接和门禁，结果见[集成任务](../30-worklog/tasks/20261009-makelore-product-integration-29d647c5.md)。未重新运行未受影响的全套应用测试，也不把本地验证等同真实环境验收。
 
 2026-09-28 [项目会话隔离修复](../30-worklog/tasks/20260928-agent-project-chat-6644c06d.md) `4b41c23` 已合入本地main：382项相关测试、标准typecheck、变更文件lint、Vite构建及3项Electron场景通过。覆盖同一智能体双项目历史／草稿切换与重载、旧全局轮项目归属／已读迁移／部分写入恢复、新云端checkpoint、独立运行与取消边界、迟到响应排除和目录刷新。产品／测试与源一致，合并沿用其验证；扩展Main仍有66项既有诊断。真实模型、安装版和主动观察组合验收未执行。
 
diff --git a/.project-docs/80-commitments/commitments.md b/.project-docs/80-commitments/commitments.md
index fbef288a..896fbb99 100644
--- a/.project-docs/80-commitments/commitments.md
+++ b/.project-docs/80-commitments/commitments.md
@@ -2,7 +2,7 @@
 
 ## Community Product Rollout · 2026-10-09
 
-本地实现与正式设计在独立分支整合，主分支推广和真实环境验收待安排。按[当前设计](../20-architecture/community-collaboration.md)协调 WS API/迁移、LMS API 与资料客户端、麦洛当前账号充值资格；真实机构/课程、OSS/长视频、支付、真机和微信工具页面分别验收。机构采用回执尚未自动回写社区，先人工登记实际交付。不要恢复已取消的麦洛课程任务或重复已实现的 D06/D07。保留全部工作区/分支，未部署或删除。
+本地实现与正式设计已合入本地 main；发布与真实环境验收待安排。按[当前设计](../20-architecture/community-collaboration.md)协调 WS API/迁移、LMS API 与资料客户端、麦洛当前账号充值资格；真实机构/课程、OSS/长视频、支付、真机和微信工具页面分别验收。机构采用回执尚未自动回写社区，先人工登记实际交付。不要恢复已取消的麦洛课程任务或重复已实现的 D06/D07。保留全部工作区/分支，未部署或删除。
 
 Track future-facing memory: promised follow-ups, unfinished loops, timed checks, and restart points.