Merge verified homepage, settings and account updates into main
This commit is contained in:
commit
6ba5b2f99f
45 files changed
+2554
-399
No files matched your search
@@ -20,15 +20,15 @@
|
||||
|
||||
## Outcome
|
||||
|
||||
- Not completed.
|
||||
- Candidate merged in this isolated worktree. All product/tests/README/configuration blobs exactly match the tested published source fafdb826 while retaining every bf39 product change. One knowledge E2E conflict reconciled the old Vite dev fixture with the already tested static build/HTTP fixture; main normalizePath portability remains. Source task records remain unchanged in source branch/merge parent; target canonical/project docs unchanged except this owned merge record. Final push pending.
|
||||
|
||||
## Verification
|
||||
|
||||
- Not run.
|
||||
- Independent read-only reviewer confirmed exact source equivalence and main message/process/resource-label updates retained. Typecheck, 15 focused unit files / 154 tests and conflicted-fixture ESLint passed; source tree/whitespace and task ownership boundaries checked. Complete production Renderer/Main/preload/utility build and all five knowledge fixture cases passed (18.8s). The newly compiled dist/dist-electron/resources/package are byte-identical to the active 2cc542f snapshot, so no new runtime refresh is necessary. Existing original source verification covers combined Main/recovery/channel and eight UI scenarios; no historical unrelated Code assertion altered.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- None recorded.
|
||||
- Primary local main checkout is owned by a different task and remains unchanged; main publication will be performed directly from this reviewed candidate. Running temporary application needs no refresh because merged product is byte-equivalent to its verified source.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
@@ -47,3 +47,5 @@
|
||||
1. Merge exact published source without committing; resolve only compatible overlaps by retaining the tested assembled product and current main changes. Restore any merge-produced project-document delta to main's committed state, except this task's own record.
|
||||
2. Check all product/test/config blobs against tested source, independently review resolution and run appropriate focused verification if any product differences remain.
|
||||
3. Commit the merge/handoff, freshly verify remote main is still the candidate parent, push main without force and prove remote HEAD/source ancestry. Complete and clean this new temporary merge worktree under the existing cleanup instruction, preserving commits and running app.
|
||||
|
||||
- Final merge verification: exact source equivalence, independent semantic review, 154 focused unit tests, 5 conflicted knowledge UI fixtures, typecheck, relevant lint and full reproducible build passed; no unresolved merge markers or documentation drift. Existing active runtime remains intact.
|
||||
Reference in new issue
Block a user