docs: integrate project conversations and coding teacher
This commit is contained in:
@@ -4,6 +4,12 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-22：集成任务 `20260922-merge-coding-teacher-client-b80c376f` 以 `00ad84c` 合入教师源 `9242a40d874984159d71494ac6510f3a248e89c0`，保留当前永久点数钱包。
|
||||
项目自动创建默认 Agent，会话直接位于项目下；右侧老师按云端发布配置独立答疑，回答可追加主草稿。
|
||||
唯一 Sidebar 引用冲突保留项目切换引用及主线钱包行为；合并代码 112 项相关单测、Renderer typecheck、Vite 全目标构建与 3 项 Electron 流程通过。
|
||||
ADR-008 的旧创建入口已按用户批准方案修订，采用[老师决定](../10-decisions/ADR-2026-09-22-coding-teacher.md)。
|
||||
三份外部任务文档原样保留；未推送/部署。真实模型计费仍待发布验收；扩展 Main 类型检查的既有 66 项诊断见源记录。见[集成记录](tasks/20260922-merge-coding-teacher-client-b80c376f.md)。
|
||||
|
||||
- 2026-09-22：任务 `20260922-integrate-permanent-points-client-38f5b921` 经用户授权交接主目录登记，
|
||||
将永久词元点数客户端源 `a1cce428afcca9b7e32ef043705a25a4685fbbdd` 从 `2f82b9f` 无冲突快进合入本地 `main`。
|
||||
账号菜单改为个人余额、充值、订单及点数流水，移除会员、订阅、周额度与重置卡。
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
# Task: Merge cloud coding teacher into main
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260922-merge-coding-teacher-client-b80c376f
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: 0cf67befb5922b9cb24dbdca6fb47d06efe31902
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Integrate approved coding teacher source 9242a40d874984159d71494ac6510f3a248e89c0 into the local primary branch and reconcile canonical memory; preserve unrelated dirty documents.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User explicitly approved merge and takeover of both completed primary integration owners; five foreign documents are adopted unchanged and excluded from commits. No subagents, remote push, deployment or paid model calls.
|
||||
- Project Context Loaded: Concurrent Task Gate Passed. Official start/status match this task ID, integration mode, branch and absolute worktree in Identity, base 0cf67befb5922b9cb24dbdca6fb47d06efe31902, exclusive integration lock and task reservation.
|
||||
- Read: read-before-planning, planning-gate, memory-index, own record, positioning, current-state, decision-index, system-overview, module-map/data-flow, business-rules/success-criteria, evidence/reflection/commitment/stale indexes, source outcomes and promotion candidates; MakeLore ADR-006/008 supply relevant accepted behavior.
|
||||
- Project goal: MakeLore is an Electron client: Main owns runtime/auth/storage; Renderer owns interaction. Current integrated focus: permanent Token Points; active scope: approved default coding Agent, project conversation navigation and official teacher chat/configuration.
|
||||
- Other local tasks: 122 records read; 17 peer placeholder scopes unknown. Defective/placeholder records remain unknown, read-only coordination context; no concrete conflicting dependency affects these exact completed sources. Existing personal cloud Agents, Canvas/Robot, Pi execution, billing and plugin contracts remain.
|
||||
- Decisions: user-approved teacher proposal supersedes manual Agent creation and Agent-grouped navigation. ADR-008 still describes the old first-Agent entry and will be amended in client integration; client positioning is a template, so README, accepted ADRs and executable code supply facts.
|
||||
- Evidence/commitments: source focused tests and build passed; Main extended strict typing retains 66 pre-existing diagnostics. Real external model billing, PostgreSQL deployment and release acceptance remain unverified.
|
||||
- Files: source feature files, own integration record and canonical teacher architecture/domain/decision/current-state. Main wallet Sidebar conflict preserves current wallet behavior and the projectEntryIntentRef addition.
|
||||
- Planning Gate Passed. Plan: merge exact source; resolve the bounded Sidebar conflict; promote approved facts; verify relevant merged behavior and documentation boundaries; commit and complete. Offer source worktree cleanup separately.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Merged source 9242a40d874984159d71494ac6510f3a248e89c0 into main in 00ad84c, preserving main permanent wallet source a1cce42. Only conflict was Sidebar refs: retain projectEntryIntentRef, do not reintroduce removed tokenPointRequestIdRef/resetCardRequestIdRef. README auto-merge retains both features.
|
||||
- Promoted accepted project/default-Agent/teacher contracts; amended ADR-008 old first-Agent entry using the already-approved product decision. Source task record imported unchanged.
|
||||
- User authorized old wallet recovery: renamed the invalid residual directory to D:/Datas/OthersProjects/.codex-worktrees/makelore/20260922-permanent-points-client-7f4c9a2e-recovery-backup, preserving all contents and its node_modules junction. Official release-missing cleared the exact stale reservation; integration claim then succeeded.
|
||||
- User explicitly approved cleanup of both teacher source checkouts. Server retire succeeded. Client official retire failed with Directory not empty after removing its Git marker and registration. Applied the same session-approved preservation/recovery approach within that cleanup scope: renamed remaining files to D:/Datas/OthersProjects/.codex-worktrees/makelore/20260922-coding-teacher-client-4b901ae7-recovery-backup and ran official release-missing successfully. No manual registry edits or force deletion; branch and 9242a40 remain.
|
||||
- Three original foreign task documents and primary node_modules remain unchanged.
|
||||
|
||||
## Verification
|
||||
|
||||
- Primary pnpm typecheck initially failed because tsc was absent from the existing primary dependency directory; no product diagnostic ran there.
|
||||
- Copied the resolved merged Git index to C:/Users/7brot/AppData/Local/Temp/teacher-merge-client-20260922-b80c376f, linked source-verified dependencies, then completed all checks before source cleanup: 112 relevant unit tests (teacher service/UI, workspace/project entry/schema/conversation store, wallet/sidebar/billing client/routes), pnpm run typecheck and pnpm run build:vite passed.
|
||||
- Three real Electron scenarios passed on that merged build: teacher answer appends the main draft without submission; first PI Conversation editable under 500 ms and submits before Snapshot; wallet reopens unpaid frozen order and refreshes only after confirmed credit. Controlled local responses, no real payment/model charge.
|
||||
- Extra Main strict typing was not rerun: source documented 66 pre-existing diagnostics vs baseline 67. Renderer/build success is not a claim that the full Main strict check passes.
|
||||
- Staged product diff and whitespace checked; source latest HEAD ancestry, source cleanliness and committed Ready for Integration status verified before cleanup.
|
||||
|
||||
- Task Documentation Gate: reviewed working and committed changes from recorded base; task-aware drift passed, including exact unchanged foreign-document states. Approved canonical facts and source provenance are recorded.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- No remote push, installer or deployment. Pair with server 93ece7c6; migrate 0095 then configure/test/publish/enable teacher and verify real gateway billing.
|
||||
- Keep both client recovery-backup directories. The teacher checkout cleanup is partial: its registered worktree is released, residual backup retained. Removing backup bytes is not claimed as completed.
|
||||
- Existing primary dependency directory is incomplete; validation used isolated dependencies. Reinstalling the primary development environment is separate work.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Applied the user-approved source candidates in integration mode; no unresolved teacher product decision remains.
|
||||
Reference in New Issue
Block a user