docs: record teacher introduction merge scope
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
# Task: Merge grouped teacher introductions into main
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260929-teacher-intro-merge-e8f30c62
|
||||
- Mode: Feature
|
||||
- Branch: codex/20260929-teacher-intro-merge-e8f30c62-teacher-intro-merge
|
||||
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20260929-teacher-intro-merge-e8f30c62
|
||||
- Base commit: 1c07f7b5cb58e383e64994669a9e1d36732cb09e
|
||||
- Owner: codex
|
||||
- Status: Planning
|
||||
|
||||
## Scope
|
||||
|
||||
- Merge approved grouped introductions from 7458c37 into latest origin/main 1c07f7b, preserve teacher streaming and all unrelated main behavior, validate and fast-forward the local main checkout.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User authorizes main merge and conflict resolution. No new remote push, cloud release, application restart, paid model calls, subagents or checkout deletion. Source task records remain byte-identical; canonical project docs are read-only because the registered canonical integration owner remains separate.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Not completed.
|
||||
|
||||
## Verification
|
||||
|
||||
- Not run.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- None recorded.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- None recorded.
|
||||
|
||||
|
||||
## Project Context Loaded
|
||||
|
||||
- Task: 20260929-teacher-intro-merge-e8f30c62, feature mode, verified official owner/reservation in the recorded branch/worktree; base 1c07f7b. App worktree tool unavailable for parent non-Git context; official isolation succeeded.
|
||||
- Read entry/memory/planning gate, active/source records, changed integrated state, teacher ADR/decision index, architecture/data flow and domain rules. Verified unchanged positioning, success criteria, evidence/reflection/commitments against already reviewed a77ddbd context. Peer scope/constraints/promotions reviewed; composer-actions and Code-return are separate changes, excluded from this merge. Child-language has undefined scope but no concrete dependency. No other task's files modified.
|
||||
- Latest remote adds independent teacher reasoning/body streaming. Preserve its final-answer/card rendering, Main contract and tests. The source only changes presentation receipts/round counters, close/open behavior and related regression tests.
|
||||
- Canonical docs still describe individual introduction dismissal. The user's explicit approved all-or-none behavior supersedes that old rule; README/source describe the intended result. Canonical promotion deferred under existing exclusive integration lock; do not overwrite remote docs or source records.
|
||||
- Expected overlap: README and teacher Electron spec, including equivalent native preview clearance assertions. Resolve semantically, keeping both group lifecycle and streaming scenarios.
|
||||
- Gate: Passed.
|
||||
|
||||
## Plan
|
||||
|
||||
1. Merge source 7458c37 into remote-main candidate; inspect every conflict and retain source task record unchanged.
|
||||
2. Run typecheck, focused group/streaming units, lint, production build and affected headless/browser/Electron scenarios without focus activation.
|
||||
3. Record verification, fast-forward clean local main to the validated candidate, verify both parents are ancestors and offer optional cleanup only for this merge checkout.
|
||||
Reference in New Issue
Block a user