docs: record remote integration and trial restart

.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: Planning
+- Status: Ready for Integration
 
 ## Scope
 
@@ -16,7 +16,7 @@
 
 ## 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.
+- User explicitly authorizes main integration and conflict resolution, followed by remote push and restart of the existing trial app. Preserve real trial/session data and known legacy consensus work separately from the approved teacher product. No cloud deployment or real teacher test messages requested.
 
 ## Outcome
 
@@ -34,7 +34,7 @@
 
 ## Follow-ups
 
-- Main integration is complete. User explicitly approved only guidance cleanup. The bundled retire command removed /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-teacher-guidance and its registry ownership; branch codex/20260923-teacher-guidance-6d29b8f1-teacher-guidance and commit 847a752 are preserved. Retain discussion for the trial source, presence for its untracked local launcher, and classroom/current merge worktrees because they are unmanaged. Branches, commits and backups remain available. No remote push requested.
+- Main integration is complete. User explicitly approved only guidance cleanup. The bundled retire command removed /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-teacher-guidance and its registry ownership; branch codex/20260923-teacher-guidance-6d29b8f1-teacher-guidance and commit 847a752 are preserved. Other worktrees, branches, commits and backups remain available; no further cleanup was authorized. The restarted trial now loads the main checkout, as verified below.
 
 ## Promotion Candidates
 
@@ -65,4 +65,6 @@
 - 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.
+- Merge dd96a7b7b43f915b530190e97c1e41d5b5240d4e was pushed to origin/main and verified against the actual remote reference. Both selected source tips remain ancestors; backup/20260924-main-consensus still points to 342f3e58. Main was rebuilt successfully from this pushed merge.
+- Restarted only Makelore Teacher Trial (bundle cn.makelore.teacher-presence.trial), replacing PID 92884 with PID 717. It now loads /Users/chillishark/Makelore 麦洛/makelore/dist-electron/main/index.js, preserving /var/folders/mx/ltbgwsks5_n8zllj69p_wbcw0000gn/T/makelore-trial-tdq_nuah/user-data and Host API port 54599. Exact process command and port ownership were checked; OPTIONS /api/app/runtime-info returned 204.
+- Native window inspection confirmed the module selection screen loaded from the main checkout's dist/index.html. No live teacher message, credential change or user-data reset was performed. Subsequent task-record-only commits do not change these verified runtime artifacts.