docs: record shortcut style merge scope

.project-docs/30-worklog/tasks/20260930-shortcut-style-merge-9ac716e4.md

@@ -0,0 +1,50 @@
+# Task: Merge colored teacher shortcuts into main
+
+## Identity
+
+- Task ID: 20260930-shortcut-style-merge-9ac716e4
+- Mode: Feature
+- Branch: codex/20260930-shortcut-style-merge-9ac716e4-shortcut-merge
+- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20260930-shortcut-style-merge-9ac716e4
+- Base commit: 72218e0c79018a79e81cfb28eabb91cfae8f7d8b
+- Owner: codex
+- Status: Planning
+
+## Scope
+
+- Merge source b934945 (three newer shortcut-style commits) into current main 72218e0 and clean only the source and merge worktrees after validation.
+
+## Intent And Constraints
+
+- User explicitly authorizes merge/conflict handling and worktree cleanup. No subagents, remote push, cloud publication, live trial reload, focus change or deletion of user history. Preserve peer work and source records. Canonical documents remain read-only under the existing separate integration owner.
+
+## Outcome
+
+- Not completed.
+
+## Verification
+
+- Not run.
+
+## Follow-ups
+
+- None recorded.
+
+## Promotion Candidates
+
+- None recorded.
+
+## Project Context Loaded
+
+- Task 20260930-shortcut-style-merge-9ac716e4; feature mode, exact branch/worktree/base above verified through official start/status. App worktree tool cannot resolve the parent non-Git context. Initial integration claim was rejected by the existing integration owner; its empty unowned checkout was removed, and official feature isolation succeeded with managed ownership. No prior owner/lock changed.
+- Read entry, memory index, active/source task records, positioning, current-state, decisions, system overview, business rules and success criteria. Reused unchanged prior teacher/design context; latest main includes composer actions and grouped introductions. README is current product behavior; canonical docs include older per-teacher receipts and component history and remain untouched.
+- Goal: cloud-configured teachers support children with domain expertise; preserve exact configured labels/prompts and project/history/model/voice behavior. Merge scope is shortcut CSS, layout tests and README only, plus immutable source task record and own merge record.
+- Peer scopes read: teacher composer height work and sidebar grouping are active and remain independent, not merged or cleaned. Child-language scope unspecified but no concrete dependency. Canonical lock is held by 20260923-classroom-integration-8b4f1e62; no canonical updates are required for this code merge.
+- Fetched origin/main: local main already contains it and is 10 commits ahead. Source has exactly fd0b720, 83a19fb, b934945 newer than main. No semantic conflict expected; inspect actual merge.
+- Gate: Passed.
+
+## Plan
+
+1. Merge the approved source, preserving independent main code and immutable task records.
+2. Run typecheck, relevant teacher units/layout checks, lint and production build on the combined tree; check source/canonical boundaries.
+3. Fast-forward clean main to validated result, verify ancestry, and retire authorized source and merge worktrees after checking process use. Preserve branches/commits and independent trial files.