# Task: Integrate Makelore reset card wallet ## Identity - Task ID: 20260908-integrate-reset-card-wallet-9c4e2a71 - Mode: Integration - Branch: codex/20260908-integrate-reset-card-wallet-9c4e2a71-integrate-reset-card-wallet - Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20260908-integrate-reset-card-wallet-9c4e2a71 - Base commit: 01525834fd326a0fbcd6f537b11d6f278470f992 - Owner: codex - Status: Ready for Integration ## Scope - Integrate exact client source commit `01525834fd326a0fbcd6f537b11d6f278470f992` from Feature task `20260908-reset-card-wallet-client-6c3e8a1f` onto local `main`. - Promote the Main-owned reset-card proxy boundary, account-menu wallet flow, and paid-versus-granted-card distinction into canonical project memory. - Verify the exact integrated tree, advance `main` by fast-forward only, and preserve the three adopted foreign task records in the primary worktree byte-for-byte. ## Intent And Constraints - Keep Works credentials, DTO filtering, and safe error mapping in Electron Main; Renderer must not call Works Square directly or receive internal grant/audit data. - Keep server-confirmed redemption authoritative and refresh both cards and Token Point balance after fulfillment; do not introduce optimistic success or local allowance calculation. - Preserve youth-owned entitlement support and family-shared redemption blocking; Works Square remains the final ownership authority. - Preserve paid reset-card immediate fulfillment as a separate non-inventory flow. - Do not change product code during Integration, package or publish an installer, deploy a service, push a remote branch, or touch the three adopted task records. ## Outcome - Confirmed that the exact Feature source commit `01525834fd326a0fbcd6f537b11d6f278470f992` was the local `main` frontier and the integration branch was its direct descendant; no cherry-pick, conflict resolution, or product-code rewrite was required. - Promoted the Main-owned reset-card route boundary, lazy account-menu wallet, server-confirmed redemption/refresh flow, shared-wallet restriction, and separation from paid immediate fulfillment into canonical current state, architecture, data flow, and business rules. - Fast-forwarded the primary `main` worktree from source commit `0152583` through canonical documentation commit `8425039` without touching the three adopted untracked task records. - Kept packaging, deployment, publication, remote push, and production user-data mutation outside this integration. ## Verification - The source task's current product tree passed 3 focused files / 78 tests, typecheck, scoped ESLint, full lint with 0 errors and 5 existing warnings, all Vite production targets, and 3/3 Electron reset-card E2E runs. - The source full unit run passed 224 files / 1,952 tests with 2 skips; its sole failure was the previously recorded Pi real-process 2,124ms cold timing sample against a 2,000ms threshold. That unchanged file passed 6/6 in isolation and the pressure test passed 1/1, so no unrelated Pi threshold or runtime code was changed. - `git merge-base --is-ancestor` and the exact source-HEAD check passed before the fast-forward; the Integration worktree diff from the source commit contained only canonical `.project-docs` files and this integration record. - `check_project_docs.py`, task-aware `check_doc_drift.py`, and `git diff --check` passed in the Integration worktree. - The primary worktree fast-forwarded with `--ff-only`; the three adopted records remained present and excluded from every commit. ## Follow-ups - Deploy Works Square with migration `20260908_reset_card_grants_0087` before enabling this card wallet against that environment, then rebuild Makelore and smoke one grant, redemption, and authoritative weekly-balance refresh. - Push `main` only if the user separately requests remote publication. ## Promotion Candidates - Applied: `current-state.md`, `system-overview.md`, `data-flow.md`, and `business-rules.md` now record the reset-card wallet authority and behavior. No further client-side promotion is pending.