docs: record homepage and settings main integration plan

.project-docs/30-worklog/tasks/20261013-merge-home-settings-9b6e1d47.md

@@ -0,0 +1,49 @@
+# Task: Merge verified homepage and settings updates into main
+
+## Identity
+
+- Task ID: 20261013-merge-home-settings-9b6e1d47
+- Mode: Feature
+- Branch: codex/20261013-merge-home-settings-9b6e1d47-merge-home-settings
+- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261013-merge-home-settings-9b6e1d47
+- Base commit: bf39f4071fa957704521542e1909d53b0452c5a2
+- Owner: codex
+- Status: Planning
+
+## Scope
+
+- Merge the already published and verified combined source fafdb826 into current origin/main bf39f407, retain accepted latest homepage/account/Settings/knowledge/recovery behavior and publish main with a normal push.
+
+## Intent And Constraints
+
+- User explicitly requests main integration after the previous feature-branch publication. This continues the authorized push; no new temporary-app refresh, cloud deployment, real user-data operation or peer-code inclusion. Primary checkout is owned by another task and remains untouched; publish main from this isolated candidate. Preserve origin canonical/source documents unchanged and record source provenance only in this owned task record.
+
+## Outcome
+
+- Not completed.
+
+## Verification
+
+- Not run.
+
+## Follow-ups
+
+- None recorded.
+
+## Promotion Candidates
+
+- None recorded.
+
+## Project Context Loaded
+
+- Task ID/mode/branch/worktree/base exactly match Identity and successful bundled start/status. Managed isolated feature branch at current verified remote main bf39f407; source fafdb826 is published and its old checkout has been retired.
+- Read startup, planning gate, memory index, active record, positioning, integrated current state, decision index/system overview, domain/success criteria and source combined record via git show. Retain previously checked personal-cloud-Agent decisions, Main-owned credentials/request/billing and explicit knowledge save/apply boundaries. Current-state remains the prior canonical integrated snapshot.
+- All 36 peer Scope/Intent/Promotion records inspected read-only. Draft-conflict/child-language scopes remain unknown but live in separate checkouts; no dependency for merging this exact tested source. Active knowledge task may have later changes; this merge includes only published fafdb826, preserving any separate task results for their own integration. No canonical/architecture reversal or unresolved semantic conflict.
+- Goal: publish the user-approved actual temporary-app source to main, maintaining single light UI and existing module/auth/project safety. Likely conflicts are README, knowledge/page tests and project docs because prior assembly imported latest main product via patches rather than ancestry. Validate product/source/test tree equivalence against fafdb826 after semantic resolution. Keep origin's project documents intact; source provenance remains reachable through the merge parent/feature branch, with no canonical promotion in feature mode.
+- Gate result: Passed.
+
+## Plan
+
+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.