docs: record verified teacher task integration

.project-docs/30-worklog/tasks/20260924-merge-teacher-tasks-9ca317b2.md

@@ -0,0 +1,56 @@
+# Task: Integrate teacher interaction and discussion tasks into main
+
+## Identity
+
+- Task ID: 20260924-merge-teacher-tasks-9ca317b2
+- Mode: Feature
+- Branch: codex/20260924-merge-teacher-tasks-9ca317b2
+- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-teacher-merge
+- Base commit: e5d271bc457b4e91e6bda52a28db4a1ecf91d406
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Merge the two user-selected teacher tasks, including the component task's delivered teacher guidance. Preserve source commits and unrelated main work.
+
+## Intent And Constraints
+
+- User explicitly authorizes main integration and conflict resolution. Keep real trial/session state untouched. Preserve known legacy consensus work separately from the approved teacher product. No remote push or deployment requested.
+
+## Outcome
+
+- Discussion branch e47df91 and guidance branch 847a752 merged as a68ed4b, including classroom 12d800e and presence 7951cca. No product conflict; product tree matches 847a752 exactly. All four imported source records are byte-identical to their source commits.
+- Preserved all 19 known legacy main consensus files in backup/20260924-main-consensus at 342f3e58f70afbcf01506363828897aaac5a08d7 and a full-file archive/patch/manifest at /Users/chillishark/Makelore 麦洛/合并前备份/20260924-main-consensus. SHA-256 verification confirms every file is identical to the previous preserved version. These files are outside the selected tasks and approved product scope.
+
+- Landed merge a68ed4b on local main with a clean checkout. Preserved tracked and untracked legacy work additionally in stash 2ca9c67680cf7ef1d46759189bfd8df1353ae96c; verified all 19 stash/snapshot blobs against the archived originals. Original feature worktrees remain retained.
+
+## Verification
+
+- Independent read-only review found no merge-induced blocking issues; scoped ESLint passed on 66 TS/TSX files with no diagnostics.
+- corepack pnpm 10.33.4: standard typecheck passed; all 21 affected unit suites passed (448 tests); production Renderer/Main/Preload/utility build passed; all 13 headless Chrome discussion/preview layout tests passed; git diff --check passed.
+- No live app restart, real teacher messages, production publication or remote push. Existing independent Main typecheck limitations remain as recorded by source; the standard project typecheck passed.
+- check_project_docs passed. check_doc_drift reports four FOREIGN_DOC entries because it counts unchanged source records imported from the task base. Direct source-blob equality proves no foreign record edits; no new canonical document writes. This is a documented checker limitation, not a passing drift result.
+
+## Follow-ups
+
+- None recorded.
+
+## Promotion Candidates
+
+- Existing canonical teacher memory predates classroom/discussion/guidance; source task records and current README contain authoritative implementation details. Reconcile during a future exclusively owned canonical integration. This task changes no canonical decisions.
+
+## Project Context Loaded
+
+- Task ID: 20260924-merge-teacher-tasks-9ca317b2; mode: feature; branch: codex/20260924-merge-teacher-tasks-9ca317b2; worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-teacher-merge; base: e5d271bc457b4e91e6bda52a28db4a1ecf91d406. Matching start/status ownership verified.
+- Read entry/planning gate, memory index, active record, positioning, current-state teacher entries, decision index/teacher ADR, architecture teacher entries, domain/success criteria, evidence/reflection/commitments/stale indexes and all five peer records.
+- Goal: project creation with independent teacher/friend consultation, persistent discussion tools and teacher guidance. Main owns context, auth, model calls and state; Renderer uses Host API.
+- Peers classroom/presence/discussion/guidance are completed sources. Existing classroom-integration is a completed documentation candidate holding canonical integration ownership; this task performs code merges and owns only its record/README, with no new canonical edits. Source records remain unchanged.
+- Main has 19 known legacy consensus files. Source task records identify them as abandoned and outside approved product scope. Preserve recovery material; do not silently import their behavior. Positioning has template fields and old canonical teacher behavior is stale relative to explicit approved source.
+- Gate: Passed for isolated code integration.
+
+## Plan
+
+1. Merge completed discussion and guidance source branches; presence/classroom ancestors are included.
+2. Verify typecheck, affected unit tests, lint, production build and isolated interaction checks.
+3. Preserve known main work, land verified commits on main and verify ancestry and work preservation.