docs: record composer actions merge scope
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
# Task: Merge teacher composer actions into latest main
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260929-merge-composer-actions-23414dc2
|
||||
- Mode: Feature
|
||||
- Branch: codex/20260929-merge-composer-actions-23414dc2-merge-composer-actions
|
||||
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20260929-merge-composer-actions-23414dc2
|
||||
- Base commit: f9089c0c6d7472dc359f39e5833f8c8d47c6b776
|
||||
- Owner: codex
|
||||
- Status: Planning
|
||||
|
||||
## Scope
|
||||
|
||||
- Merge approved teacher-composer-actions source 8af0ca7 and its live-update record a790230 into latest local main f9089c0, which includes fetched origin/main 1c07f7b and grouped teacher introductions.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User explicitly authorizes merging this completed UI change. Preserve main's reasoning/body streaming, grouped introductions, saved model semantics, microphone/send/stop, history and drafts. Validate in this isolated checkout, then fast-forward only a clean and unchanged main. No remote push, app update, cloud change or removal of worktrees is included. Source task records and canonical project memory remain read-only.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Not completed.
|
||||
|
||||
## Verification
|
||||
|
||||
- Not run.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- The approved composer UI supersedes historical visible-model-picker descriptions in canonical teacher documents. The source task already records that promotion; README follows the current user-approved behavior. Canonical reconciliation remains with the existing exclusive integration owner.
|
||||
|
||||
## Project Context Loaded
|
||||
|
||||
- Task ID: 20260929-merge-composer-actions-23414dc2. Mode: Feature. Branch/worktree/base as recorded above. Official start succeeded and status verified matching ownership/reservation.
|
||||
- App worktree creation returned Not a git repository because the chat root is the repository parent. The bundled task script created this isolated checkout. Initial integration claim was refused by canonical owner 20260923-classroom-integration-8b4f1e62; registry rollback succeeded. Scoped this request to code-only feature merge, leaving the integration lock and canonical files unchanged, and claimed the clean checkout successfully.
|
||||
- Read AGENTS, read-before-planning, memory-index, planning-gate, active/source task records, positioning, current-state, teacher ADR/decision index, architecture, relevant domain/success criteria and evidence/reflection/commitments. README is the current product-state authority; historical canonical picker descriptions are superseded by the explicit user request.
|
||||
- Goal: student project creation with cloud-defined teacher capabilities; Main/cloud retain model execution, billing, frozen requests and project-scoped conversations. This task only merges the approved presentation change and its existing regression coverage.
|
||||
- All peer Scope/Intent/Promotion sections reviewed read-only by a subagent. No missing records or concrete conflicts. Older composer UI requirement is superseded by explicit approval; prompt-buttons/group-intro/Code-return remain compatible. Child-language scope is still undefined, with no concrete dependency. Source and remote histories are preserved.
|
||||
- Files: TeacherChatPanel.tsx, existing teacher UI/browser tests, README and task records. Remote main adds streaming in another Panel section; merge semantically rather than copying the file.
|
||||
- Gate: Passed.
|
||||
|
||||
## Plan
|
||||
|
||||
1. Merge a790230 into the latest-main candidate and inspect the combined diff.
|
||||
2. Run typecheck, relevant UI/voice/conversation regressions, the two browser composer cases, scoped lint and production build.
|
||||
3. Record results, fast-forward the clean main checkout, and verify source plus fetched remote ancestry.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- None recorded.
|
||||
Reference in New Issue
Block a user