Merge Yuxi teacher support with classroom discussions

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

@@ -8,7 +8,7 @@
 - Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-teacher-merge
 - Base commit: e5d271bc457b4e91e6bda52a28db4a1ecf91d406
 - Owner: codex
-- Status: Ready for Integration
+- Status: Planning
 
 ## Scope
 
@@ -54,3 +54,15 @@
 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.
+
+## Authorized Push And Trial Restart
+
+- User explicitly requests remote push and trial restart. Same task/worktree resumed via start; matching feature ownership verified, prior project context/peer scope remains applicable. Gate passed. Guidance worktree was retired as approved; other peer scopes unchanged.
+- Scope: reconcile concurrent origin/main updates if needed, push local main, rebuild final main and restart only the known Makelore Teacher Trial with its existing isolated profile and port. No real teacher test messages or cloud publication.
+- Initial push was rejected because remote main advanced; fetch and integrate its commits before retry.
+
+- Reconciled origin/main 158d3ee with the classroom source. Nine textual conflicts were resolved by preserving catalog/Yuxi execution, nullable reasoning and scoped project reads alongside project-role history, proactive check-ins, teaching baseline and persistent discussions. Imported canonical documents and upstream task records (13 files) are byte-identical to origin/main; no new canonical decisions were authored.
+- Cloud requests now carry the complete ordered compiled context through the existing query string contract, including behavior and discussion instructions; the current request binds its actual operation source. Friend retains its persona and has no local read tools. Disabled teacher history cannot borrow another catalog teacher's enabled state or bypass the UI guard with Enter.
+- Independent review found structured output contaminated by pre-tool commentary on both execution paths. Cloud suggestions/discussion now deliver only the completed final output; local model execution uses finalOnly to deliver the successful final tool-free response. Red-capable regressions cover preambles/intermediate JSON, reads, final JSON, cancellation and persisted component state. Reviewer confirmed the finding closed.
+- Final verification: 25 relevant unit suites / 507 tests passed; standard typecheck passed; targeted ESLint passed; 13 headless layout and 3 isolated Electron classroom/proactive/recovery checks passed; final Renderer/Main/Preload/utility build passed. Independent Main diagnostics remain 66 with none in teacher/project-files paths; this is not a clean all-Main typecheck. No paid model or live teacher message was sent.
+- Push and exact-profile restart follow this verified merge; source and backup branches remain preserved.