docs(product): integrate implemented community and teaching boundaries
This commit is contained in:
brother7 committed
1 parent
0d442ce576
commit
12af6aed5d
13 files changed
+129
-9
No files matched your search
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 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)。
|
||||
|
||||
- 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)。
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
# Task: Integrate implemented community product boundaries
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20261009-makelore-product-integration-29d647c5
|
||||
- Mode: Integration
|
||||
- Branch: codex/20261009-makelore-product-integration-29d647c5-product-integration
|
||||
- Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20261009-makelore-product-integration-29d647c5
|
||||
- Base commit: 0d442ce576430880355ca35382b844d2cec14d64
|
||||
- Owner: codex
|
||||
- Status: In Progress
|
||||
|
||||
## Scope
|
||||
|
||||
- Integrate the approved product design and implemented source into this isolated integration branch; update canonical architecture, rules, current state, evidence and remaining rollout work. Preserve all source task records and original worktrees.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User explicitly authorized transfer of WS 20261008-integrate-product-design-50fdab23, LMS 20261008-integrate-product-design-b23c91e7 and Makelore 20260929-merge-teacher-stream-1e4177fe. Official release --force changed only those registrations/locks; old directories, branches, files and uncommitted contents retained.
|
||||
- Concurrent/Planning/Integration Gates Passed: bundled check/start/status matched this task, integration mode, absolute worktree, branch and recorded source base. Required entry, positioning, architecture/domain, accepted decisions, success/evidence/reflection/commitment context and source outcomes/candidates loaded. WS 277/LMS 26/Makelore 146 peer records read; none changed since preceding continuation. Historical Gateway record lacks Intent And Constraints, without a concrete dependency.
|
||||
- Project goal: community supplies courses/tools/support and public learning/works; institutions independently manage teaching with optional LMS; Makelore is a creation tool without courses. Current focus: unite separate approved design and implementation histories, amend only later explicitly confirmed behavior, and separate local evidence from deployment. Preserve existing wallet/family/tenant/publication boundaries. No subagents, primary-checkout adoption, main-branch changes, push, deployment, payment or worktree deletion.
|
||||
- Decisions: parents recharge while logged into the child's account; permanent manual per-child points; child-initiated publication; no institution labels in ordinary community; no client course UI/context/deep links/learningOrigins. These user decisions supersede the old design's pending recharge choice and client task entry; no new product decision needed. Source verification remains applicable because application code will remain unchanged.
|
||||
- Implementation plan after gates: merge the retained WS/LMS design commits into the new integration branches, reconcile canonical text with actual feature contracts, verify source-code equality and unchanged imported task records, check edited links and documentation boundaries, then commit and complete the integration records. Makelore needs only canonical creation/recharge boundaries and status.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Promoted implemented D01 and the explicitly confirmed creation-only client boundary from source 0d442ce into community-collaboration, positioning, architecture/module/data-flow, permanent-point rules, success criteria, indexes, evidence and current state. Removed obsolete parent-only recharge and client course assumptions. Preserved teachers/agents and retired Learning data rules; no application change.
|
||||
- All code, tests, deployment configuration and dependencies match the verified implementation source. This is a local isolated integration branch, not a main-branch promotion, deployment or client release. Shared state records exact Integrated Through source commits and keeps real-world acceptance gaps explicit. All original worktrees, branches and uncommitted files retained.
|
||||
|
||||
## Verification
|
||||
|
||||
- PASS: git diff from the recorded source base excluding Markdown is empty; untracked files are Markdown only. This proves application/configuration/test equality with the source and avoids repeating unaffected application tests.
|
||||
- PASS: 12 added local document links resolve; no missing targets. 0 imported source task/proposal records compare unchanged to the retained design commit. git diff --check (working/staged) and check_project_docs.py passed; canonical text no longer presents implemented collaboration or client courses as pending design.
|
||||
- Final task-aware drift validation follows the merge commit so source imports have their shared ancestry proof. The pre-commit WS drift run reported the five unchanged imports as foreign; no source record was edited or adopted to bypass the check. Source branches remain retained for the official provenance check.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Promote the completed integration branches to the main branches in a separately coordinated step; preserve the foreign changes already present in the original WS/Makelore checkouts and the LMS feature owner. No main worktree was claimed or switched here.
|
||||
- Real institution/course pilot, production OSS/long-video/network, actual payment provider/settlement, native devices and WeChat tool pages remain acceptance work. Automatic adoption receipts are unimplemented; Operations records actual delivery manually. Do not revive cancelled Makelore course features or repeat completed D06/D07 work.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Promoted the user-confirmed community/institution/client boundaries and implemented contracts into canonical documents. Exact feature and retained design sources are in current-state Integrated Through. Old historical records stay read-only; current-account recharge and no-course-client policy derive from explicit user decisions, not inferred timestamps. No further product decision or ownership handoff is required for this integration.
|
||||
Reference in new issue
Block a user