75 lines
11 KiB
Markdown
75 lines
11 KiB
Markdown
# Task: Merge teacher reply cleanup and approved UI changes into main
|
||
|
||
## Identity
|
||
|
||
- Task ID: 20260928-merge-reply-cleanup-eb8d39b3
|
||
- Mode: Feature
|
||
- Branch: codex/20260928-merge-reply-cleanup-eb8d39b3-merge-reply-cleanup
|
||
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20260928-merge-reply-cleanup-eb8d39b3
|
||
- Base commit: a21a1f077cc11976213290a6b843bb74be97ab44
|
||
- Owner: codex
|
||
- Status: Ready for Integration
|
||
|
||
## Scope
|
||
|
||
- Merge committed teacher/UI cleanup source 40c247a into latest origin/main and push normally; preserve existing continuous-chat and per-turn project/version behavior.
|
||
|
||
## Intent And Constraints
|
||
|
||
- User explicitly authorizes main integration and repository push; packaging belongs to their colleague. No packaging, native app restart, cloud publication, real model calls or focus changes. Preserve all foreign worktrees and source records.
|
||
|
||
## Outcome
|
||
|
||
- Source cleanup `40c247a` merged with the current account/Agent continuous-chat behavior in `581ebc8`, then incorporated complete remote main `077184a` before publication. Preserve its reply recovery, cloud-owned teaching policy, 0–3 new shortcuts, welcome dismissal, pagination and per-turn source/version behavior.
|
||
- Additional merge safeguards: old component mutation route removed from the continuous API; no new per-project component state is created or imported; existing malformed legacy component archives are retained verbatim. Old component instructions cannot persist through a reused pre-upgrade cloud checkpoint: first reply-protocol turn rotates the internal thread and carries bounded public reply history, without changing the visible chat.
|
||
- Unconfirmed legacy hint requests retain their old text, ID and original project/source. Migrated per-project drafts keep that original scope; cross-project or cross-source hint retry waits for the original scope instead of issuing another charge. Existing send-in-flight and incomplete-reply retry safeguards remain intact.
|
||
- No package, app restart/update, cloud configuration publication, paid model call or desktop focus change. Source/live-trial and all foreign worktrees remain intact. Product merge `f6944c46ebdeb05a940043ba629aee6716b5e44a` was pushed normally from `077184a` to remote main; `git ls-remote` matched the merge HEAD. Primary checkout is owned by another task and was left untouched; packaging can fetch remote main.
|
||
|
||
## Verification
|
||
|
||
- Final `corepack pnpm run typecheck`, `corepack pnpm run lint:check` and `corepack pnpm run build:vite` passed. Lint has 8 existing unrelated warnings; build has existing chunk-size/dynamic-import warnings. No dependencies or build outputs committed.
|
||
- Final backend focused validation: 7 suites / 261 tests passed; UI/companion/chat: 4 suites / 144 tests passed; continuous storage/retired routes: 2 suites / 17 tests passed. These runs overlap and are not an additive unique-test count.
|
||
- Headless Chrome: all 28 teacher reply/preview layout cases verified. First run passed 27; one initial Vite scan observed an in-progress shared-type merge marker, then passed when rerun after resolution. Native Pi Electron E2E fixture parses and lists 19 tests; not launched because it opens a foreground app.
|
||
- Full `corepack pnpm test`: 261 files / 2639 tests passed, 3 tests skipped; 3 failures in 2 unrelated Pi files. Independently reproduced exactly those same 3 failures on a disposable archive of original remote `077184a` (12 passed / 3 failed in the selected two files): two event-projector old error-message assertions and the managed-worker opener runtime-v6/v7 assertion. Baseline log: `/tmp/makelore-baseline-077184a-21n6od02/baseline-tests.log`. The script's separately gated pressure suite was then run manually and passed 1/1.
|
||
- `git diff --check`, required project-document structure and semantic comparison against latest remote passed. Task drift checker reports 5 imported source-task documents as foreign relative to the original base; byte comparison against `077184a` confirms every imported document unchanged. Only this task's own record is authored here; no canonical writes, ownership override, baseline alteration or source-document edits were used to suppress the inherited diagnostic.
|
||
|
||
## Follow-ups
|
||
|
||
- Remote main publication complete at product merge `f6944c46ebdeb05a940043ba629aee6716b5e44a`. Packaging and installation belong to the user's colleague; this final record commit carries no product changes. Source/live-trial worktree retained.
|
||
- The 3 pre-existing Pi test assertions were subsequently repaired at the user's request; see the follow-up below. Native Electron foreground interactions and signed package verification are not claimed.
|
||
|
||
## Promotion Candidates
|
||
|
||
- A later canonical-memory integration should reflect current text/quick-reply-only teacher behavior and first-upgrade cloud-thread rotation. Evidence is the merged implementation, focused regressions and baseline comparison; existing cloud-defined policy and continuous-chat decisions remain unchanged. This feature task does not own the canonical integration lock.
|
||
|
||
## Project Context Loaded
|
||
|
||
- Identity verified by official start/status: feature task `20260928-merge-reply-cleanup-eb8d39b3`, this managed worktree/branch, base `a21a1f077cc11976213290a6b843bb74be97ab44`. Source checkout is owned by the completed cleanup task and still hosts the temporary app, so it remains read-only.
|
||
- Read entry/memory index, own record, project positioning, latest integrated state, decisions, architecture, success criteria and all registered peer scope/intent/promotion sections. Reuse previously loaded teacher domain/evidence/reflection/commitment context; changed continuous-chat rules checked against current main/source task records.
|
||
- Goal: student-owned creation with cloud-defined teachers, Main-owned request/history/version boundaries, prose and quick replies only. Preserve main's unique account/Agent chat and per-turn project/source/version; remove retired component UI/protocol/state and retain approved empty-composer hint/retry/preview-header styling.
|
||
- Other tasks: a broader latest-main integration is also registered planning; prepare this requested source in isolation, check remote again before push and never overwrite a concurrent remote advance. Prompt-boundary, truncation repair and welcome changes are separately owned and not added speculatively. Child-language task is unfinished. Canonical integration lock is held elsewhere; keep all canonical/source records read-only.
|
||
- New integrated single-chat behavior is compatible with component cleanup; overlaps require combined code/tests rather than choosing an entire side. No new product decision needed. Gate Passed.
|
||
|
||
## Plan
|
||
|
||
1. Merge source 40c247a into fetched main in this isolated branch; preserve source history and resolve overlaps with the current continuous-chat contract.
|
||
2. Verify backend/context/parser/history and UI/preview/refresh paths, typecheck, lint, production compile and headless layout; independently review the merge.
|
||
3. Recheck origin/main, integrate any concurrent advance, push normally to main and verify remote ancestry/hash. Keep the live trial checkout; packaging and app updates are outside this request.
|
||
|
||
## Follow-up: Three Baseline Test Failures
|
||
|
||
- User asks what the reported 3 failures mean, whether they affect the product and requests their repair. Resume the same integration-validation task in its existing owned checkout at `405846c`; official start/status verify the same task ID/mode/branch/worktree. No subagents unless separately approved; this follow-up is performed independently.
|
||
- Context gate passed: entry/memory/task/peer scopes rechecked; unchanged positioning and prior teacher context retained; read Pi ADR-006, Main architecture, provider/domain success criteria and evidence/reflection/commitment/stale indexes. Main owns credential isolation, public error classification and managed runtime resources. No change to the accepted Pi 0.84.2/runtime-v7 behavior or login recovery flow.
|
||
- Peers still own application installation/testing and an unfinished child-language task; their files stay read-only. This work repairs the specifically reported test debt in two Pi test files and the matching release-proof filename metadata. No semantic conflict, new product direction, paid call, packaging or app restart is involved.
|
||
- Evidence: commit `7951cca` deliberately changed the public Provider-auth message and expanded expired-session recognition; `26cbb29` deliberately advanced the managed extension from v6 to v7. Session-projector already expects the new public message. Runtime opener uses the real materialized extension path. The three failed assertions are stale; release proof also retains a stale v6 report label.
|
||
- Plan: align exact public-message assertions without weakening status/error-code/redaction checks; use the canonical extension filename and verify the concrete extension argument points to a readable file; remove the stale release-proof label; run focused tests, typecheck/lint/build and then the full suite. Preserve histories and production behavior.
|
||
|
||
### Follow-up Outcome And Verification
|
||
|
||
- Repaired both exact Provider-auth message expectations to the accepted public wording; error code, terminal state, recoverability and secret-redaction checks remain intact.
|
||
- Worker-opener regression now uses the authoritative versioned extension filename, verifies its exact `--extension` argument path and reads the generated module. The release-proof report uses that same filename instead of an obsolete v6 label. No authentication, runtime version, model behavior or billing change.
|
||
- Focused event/session projector, managed opener and actual extension bundle: 4 files / 37 tests passed. Full `corepack pnpm test` now passes: 263 files / 2642 tests passed, 3 unchanged skipped tests, followed by the separately executed pressure stage 1 file / 1 test passed. No remaining failed tests.
|
||
- `typecheck`, full `lint:check` (0 errors / 8 prior warnings), `build:vite`, `git diff --check` and required documentation structure passed. Task drift retains the same 5 unchanged imported source-document diagnostics from the previous integration; current follow-up modifies only this owned record plus the 3 listed test/metadata files relative to `405846c`.
|
||
- Impact: stale expectations made the full validation command fail although the intended auth projection and v7 extension were operating correctly; stale release-proof metadata could mislabel an artifact report. Repair restores meaningful release validation without downgrading runtime behavior. Formal package verification remains the packaging owner's responsibility.
|
||
- Continue the authorized repository handoff with a normal fast-forward push to main after commit; no app restart, package, cloud publication, real model request or subagent creation.
|