makelore/.project-docs/30-worklog/tasks/20260930-teacher-reference-merge-b731e95a.md

Task: Merge teacher reference isolation into main

Identity

• Task ID: 20260930-teacher-reference-merge-b731e95a
• Mode: Feature
• Branch: codex/20260930-teacher-reference-merge-b731e95a-teacher-reference-merge
• Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20260930-teacher-reference-merge-b731e95a
• Base commit: c55e9c7182
• Owner: codex
• Status: Planning

Scope

• Merge the committed teacher reference-isolation fix a931803 (code 36202e0) into local main while preserving the exact tested implementation.

Intent And Constraints

• User authorizes main merge and conflict resolution. No remote push, live-app refresh, cloud publication, paid calls or subagents. Preserve source records, history/drafts, and foreign task worktrees; canonical memory is read-only.

Outcome

• Not completed.

Verification

• Not run.

Follow-ups

• None recorded.

Promotion Candidates

• None recorded.

Project Context Loaded

• Task ID: 20260930-teacher-reference-merge-b731e95a; Feature mode; owned branch/worktree and c55e9c7 base match official start/status. App worktree tool unavailable in parent non-Git workspace, official isolation fallback succeeded.
• Read AGENTS, entry/memory index, own task, positioning, current integrated state, decision index/teacher ADR, system overview/data flow, domain/success criteria, evidence and commitments, all peer task Scope/Intent/Promotion sections. Reused unchanged source-task verification context.
• Product: cloud-defined teachers help children with their current projects. Account/project/teacher drafts and histories stay separate; explicit operation references retain source identity. This merges the already tested source without changing that contract.
• Peer tasks: preview-toolbar-tabs modifies nearby CodingChatPanel layout independently; alice-tool-leak is read-only diagnosis. Older release/help-label scopes and undefined child-language scope have no dependency on this exact committed merge. No peer uncommitted code adopted. Canonical integration remains owned by a foreign task; no canonical promotion here.
• Latest fetched main/origin/main: c55e9c7, clean and identical. Source a931803 descends directly from it. No semantic conflict; obsolete canonical portions are not reintroduced. Source tests/build/typecheck/Electron evidence available. Files: two product panels, README, unit/Electron regressions and source/merge task records.
• Gate: Passed.

Plan

1. Merge source with its original commits in this owned candidate; inspect tree equivalence and unresolved entries.
2. Reuse exact-source successful regression/type/lint/build/Electron evidence if product/test tree is unchanged; rerun only if conflict resolution changes code.
3. Record result, fast-forward clean unchanged local main to the reviewed candidate, verify ancestry and diff. Ask optional cleanup after completion; do not push.