diff --git a/docs/r5/R4-RECONCILIATION.md b/docs/r5/R4-RECONCILIATION.md index 41e7715af..b842435f2 100644 --- a/docs/r5/R4-RECONCILIATION.md +++ b/docs/r5/R4-RECONCILIATION.md @@ -1,25 +1,29 @@ -# R5 reconciliation against released R4 / 2.6.4 +# R5 reconciliation against submitted R4 / 2.6.4 source -The owner explicitly confirmed on 22 October 2026 that 2.6.4 is live on the app -stores. That confirmation resolves the earlier stale-record discrepancy; GitHub -PR/tag status and regional store caches are not prerequisites for R5 work. +The R4 source baseline is `1d8a86a7462d935cbd0e28b857934b5718c152fc`. +Its signed iOS620 and Android627 builds were submitted; public release remains +held under the current owner instruction. The [store checkpoint](https://github.com/KeeperCommunity/bitcoin-keeper/pull/7045#issuecomment-6313099996) +records WAITING_FOR_REVIEW with MANUAL release on Apple and IN_REVIEW with +Managed publishing ON on Play as of 21 October. Fresh store status and owner R4 +closure remain separate evidence. Preserve the already-running R5 work under +[the release roadmap](https://github.com/KeeperCommunity/bitcoin-keeper/issues/7065). ## Baseline and history -Released artifact source: `1d8a86a7462d935cbd0e28b857934b5718c152fc` (R4 / 2.6.4, +Submitted artifact source: `1d8a86a7462d935cbd0e28b857934b5718c152fc` (R4 / 2.6.4, iOS620, Android627). The recorded signed-artifact/source checkpoint identifies this exact source. The source is now an ancestor of the isolated R5 branch through reconciliation commit `a8947c867562b6148f328289069785b18053b944`. The earlier R5 head5954 and its history are also preserved. No R4/sprint/other workstream ref was changed, no force push occurred and no GitHub PR was merged. -The single yarn.lock conflict was resolved to the **exact released R4 lockfile**. +The single yarn.lock conflict was resolved to the **exact submitted R4 lockfile**. That file already includes both missing ESLint selectors repaired earlier in R5, so retaining the obsolete R5 resolution would have been incorrect. package.json, yarn.lock, Podfile.lock, Android/iOS native inputs, version metadata and existing -backup/backend/store/worker modules remain byte-identical to the released source. +backup/backend/store/worker modules remain byte-identical to the submitted source. -The PR remains based on sprint per repository guidance. Until released history is +The PR remains based on sprint per repository guidance. Until inherited R4 history is carried to sprint by its owner, its ordinary diff includes inherited R4 history. Review R5's own scope as `git diff 1d8a86a...` (the PR handoff links that range). This inherited history is not new R5 scope or permission to merge R4. @@ -36,7 +40,7 @@ range). This inherited history is not new R5 scope or permission to merge R4. the original app/session explicitly, preventing dispatch-time rebinding. These tests use production transport-session tracking, identity and action creators; native UI, Realm access and the Redux state getter are modeled boundaries. -- R5's Keys entry uses the released navigation dispatch pattern; this removes the +- R5's Keys entry uses the R4 navigation dispatch pattern; this removes the TypeScript overload mismatch exposed by integration. No shared PIN/navigation implementation, transaction formatting or timelock calculation changed. - Six additional startup regressions reproduced token completion and delayed @@ -46,7 +50,7 @@ range). This inherited history is not new R5 scope or permission to merge R4. - Emergency reset uses its Emergency-specific helper; Inheritance retains its own helper. Native display checks remain open. - Existing R5 frozen JavaScript CI preparation is retained. Its recovery lane now - explicitly installs the released Realm N-API binary, and existing Ruby setup + explicitly installs the baseline Realm N-API binary, and existing Ruby setup precedes all Ruby-dependent guards. No dependency version or workflow gate was changed. The existing public-v2 genuine backend fixture remains baseline debt; no protocol, readiness, pin, backend deployment or scanner waiver was introduced. @@ -59,10 +63,10 @@ was reviewed; existing components, layout, theme and critical controls are retai Node22.23.3 / Yarn1.22.22: -- Frozen install PASS; all six explicit dependency patches PASS. Released +- Frozen install PASS; all six explicit dependency patches PASS. Baseline package/lock/Pod/native/version input-immutability checks PASS. - Final full Jest **47 suites /538 tests PASS**, zero failures/skips, including - the released loopback Electrum fixtures. Final R5-focused run **5 suites /106 + the baseline loopback Electrum fixtures. Final R5-focused run **5 suites /106 tests PASS**, including 53 deletion and 20 first-use screen cases. - New guard controls before implementation: **11 assertion failures**, with the other42 deletion tests deliberately deselected (not execution passes). All53 @@ -73,7 +77,7 @@ Node22.23.3 / Yarn1.22.22: the existing retry, duplicate-attempt and unmount cases. - Full recovery **480/480 PASS**, zero skips. Initial execution had470 passes and one file-load failure because the Realm N-API binary was absent. The exact - released binary was installed with prebuild-install; the10 encrypted Realm + baseline binary was installed with prebuild-install; the10 encrypted Realm cases then passed and the complete recovery rerun passed. These are Linux Realm tests, not iOS/Android app-native acceptance. - Gate contracts **11/11 PASS**. Static Android16KB/reproducibility checks **31 PASS**. @@ -84,9 +88,9 @@ Node22.23.3 / Yarn1.22.22: and11 failures from its missing Ruby runner; those failures are preserved and not reported as app regressions or passes. Hosted CI now sets up the existing Ruby3.3.8 prerequisite before these unchanged checks. -- Focused lint remains **FAIL82 errors/25 warnings**, versus85/25 on released R4 +- Focused lint remains **FAIL82 errors/25 warnings**, versus85/25 on submitted R4 for the same six modules/dependencies; normalized0 added,3 removed. -- Whole TypeScript remains **FAIL943 diagnostics**, versus944 on released R4 with +- Whole TypeScript remains **FAIL943 diagnostics**, versus944 on submitted R4 with the same dependencies; normalized0 added,1 removed. The transient new navigation overload finding was fixed before this comparison. Neither check is clean. @@ -99,16 +103,17 @@ substantial features; no additional investigation fix or infrastructure is added ## Finite native handoff -Use the final PR head, reuse compatible released-R4 caches and preserve all data. +Use the final PR head, reuse compatible R4-source caches and preserve all data. Cloud development remains primary; optional Linux setup is not a prerequisite. The separate hosted-native infrastructure PR is not imported as another R5 feature. -Where that approved route is available, run its exact-head development startup -build/smoke; use the Mac only for remaining platform/feature/device checks. +Run exact-head iOS acceptance on hosted macOS/Xcode and Android acceptance on a +capable cloud emulator runner or authorized remote device. The personal Mac is +not required. Physical checks still require actual authorized devices. -Before any Mac work, read its actual local guidance, measure free disk and use the -larger actual build forecast (approximately6GiB is only a planning floor), one -native build at a time. Never delete other worktrees, simulators/AVD users, -wallets/databases, caches, artifacts or evidence without approval. +Before cloud native work, verify toolchain/device readiness, measure free disk +against the actual build forecast and run one native build at a time. Never +delete other worktrees, simulators/AVD users, wallets/databases, caches, artifacts +or evidence without approval. 1. IOS and ANDROID: new development artifacts from the exact head; cold/warm/resume, theme/network/Tor, credential error/retry, deep-link/auth and small display cases. @@ -121,7 +126,7 @@ wallets/databases, caches, artifacts or evidence without approval. device/OS/network configuration. Do not substitute the animation duration or unit-test wall time for native performance. 4. Bounded #7055 More→Wallets and #6991 device timezone/DST/history/details checks; - no speculative patch. Verify Emergency/Inheritance helper and shipped Assisted + no speculative patch. Verify Emergency/Inheritance helper and R4 Assisted Server Backup copy. Owner-parked #7056/#7057 remain excluded. 5. HARDWARE: actual physical PIN/biometric/device scenarios remain explicit. R4's physical deferral is not an R5 pass or automatically transferable scope decision. diff --git a/docs/r5/STARTUP-INVESTIGATION.md b/docs/r5/STARTUP-INVESTIGATION.md index 54353806a..af7b7038a 100644 --- a/docs/r5/STARTUP-INVESTIGATION.md +++ b/docs/r5/STARTUP-INVESTIGATION.md @@ -1,8 +1,9 @@ # R5 startup and bounded investigations — 21 October 2026 -Development evidence only. The owner confirms R4/2.6.4 is live; R5 is now -reconciled to its recorded source1d8a86a. Earlier unmerged/pending descriptions -below retain their original investigation scope. No native acceptance, +Development evidence only. R5 is reconciled to submitted R4 source1d8a86a; +iOS620/Android627 were submitted with public release held. Source ancestry does +not establish public availability or owner R4 closure. Earlier unmerged/pending +descriptions below retain their original investigation scope. No native acceptance, release-readiness, issue closure or performance improvement is claimed here. ## Newer work checked before editing @@ -14,7 +15,7 @@ Its Splash, NewKeeperApp and secure-store modules are identical to the original sprint versions. This permits independent source changes without importing R4. R4's changed Login, Home/navigation, transaction views and backup/backend paths remained untouched during that independent checkpoint. Reconciliation with the -owner-confirmed released source is now complete; see R4-RECONCILIATION.md. +submitted R4 source is now complete; see R4-RECONCILIATION.md. Other open work includes native-validation #7060, cloud-release #7062, bootstrap #7063, lock-selector #7064, PIN fixes #7052/#7053, reproducibility #7043 and the diff --git a/docs/r5/WORKSTREAM.md b/docs/r5/WORKSTREAM.md index a1b3bdd1d..df840da4e 100644 --- a/docs/r5/WORKSTREAM.md +++ b/docs/r5/WORKSTREAM.md @@ -1,17 +1,19 @@ # R5 Cloud workstream -Status: development draft reconciled to owner-confirmed live R4 / 2.6.4 source -`1d8a86a7462d935cbd0e28b857934b5718c152fc`. No R5 app version/date assigned. -The earlier pending-baseline records below are historical and superseded by the -22 October owner confirmation and completed reconciliation. +Status: development draft reconciled to submitted R4 / 2.6.4 source +`1d8a86a7462d935cbd0e28b857934b5718c152fc`. Signed iOS620/Android627 were +submitted; public release remains held. No R5 app version/date assigned. +Source reconciliation is complete; fresh store status and owner R4 closure are +separate. Earlier released/live and pending-baseline wording below is historical; +use [the current reconciliation](R4-RECONCILIATION.md). Preserve running R5 work. ## Authority and budget Owner request and Master Task List, Backlog row 245 (15 October 2026 scope reset), -plus rows 7, 8, 23, 76, 231 and 263. The owner's 22 October confirmation that R4 -2.6.4 is live authorizes reconciliation with its recorded released source on R5 -only. Historical instructions to wait for R4 are superseded. PR base is `sprint`; -do not modify R4 or other workstream branches. +plus rows 7, 8, 23, 76, 231 and 263. The isolated R5 source reconciliation and +already-running work remain preserved. The current R4 handoff keeps public +release held; source ancestry does not establish store availability or owner +release closure. PR base is `sprint`; do not modify R4 or other workstream branches. Pre-implementation changed code/test estimate (not model context or runtime cost): @@ -83,8 +85,9 @@ with the released R4 implementation before deletion can be release-ready. ## Later Local resource plan -No Mac is needed for Cloud source development. R4 is released and reconciliation -is complete. For later native work, use a separate safe checkout, +No personal Mac is required. R4 source reconciliation is complete; public +release remains held. Use hosted macOS/Xcode and a capable cloud Android runner +or authorized remote devices. For native work, use a separate safe checkout, check available disk (approximately 6 GiB minimum planning threshold; require more if the selected build needs it), run one native build at a time and reuse safe compatible caches/artifacts. Preserve every existing worktree, simulator, AVD user, @@ -272,13 +275,14 @@ checks remain open. Previous R5 head98c4 hosted Tests and CodeQL are now SUCCESS job-log download was unavailable, so no new hosted suite count or clean-lint claim. -## Released-baseline reconciliation completed — 22 October 2026 +## Submitted-source reconciliation completed — 22 October 2026 -The owner's explicit confirmation that R4/2.6.4 is live resolves the earlier -metadata discrepancy. No further release/tag/source confirmation is being awaited. -Released source1d8a86a is now an ancestor of R5 through commit a8947c867; previous -R5 history remains intact. R4/sprint/other workstream refs and all released native, -dependency, backend/store/worker/version inputs remain unchanged. The one lock +Submitted source1d8a86a is an ancestor of R5 through commit a8947c867; previous +R5 history remains intact. This completes source reconciliation. Signed +iOS620/Android627 were submitted; public release remains held under the current +instruction. Fresh store readback and owner R4 closure remain separate. +R4/sprint/other workstream refs and all baseline native, dependency, +backend/store/worker/version inputs remain unchanged. The one lock conflict resolves to R4's exact lock, which already includes the two R5 selectors. The [current reconciliation and finite native plan](R4-RECONCILIATION.md) records @@ -287,7 +291,7 @@ Linux Realm cases after installing its missing N-API prerequisite), gate11 PASS, static31 PASS and Node/Python release-tool28/7 PASS. Local Ruby checks remain unavailable/failed-prerequisite, not passed; hosted CI explicitly installs Ruby before them. Lint82/25 and TypeScript943 remain inherited failures with no added -normalized diagnostics versus released R4. Native app/UI/performance/physical +normalized diagnostics versus submitted R4. Native app/UI/performance/physical acceptance has NOT RUN here. Reconciliation also confirmed and fixed eleven stale-origin UI cases: key-delete @@ -295,7 +299,7 @@ selection and confirmation now retain the original account/session, verify curre Redux/Realm ownership, and carry that origin into R4's existing middleware/worker. No R4 reference/session guard was weakened. New tests execute real session-counter, identity and action-creator logic with modeled screen/storage boundaries. The -Keys entry's dispatch form was adapted to the released navigation types. +Keys entry's dispatch form was adapted to the R4 navigation types. Six additional startup session-crossing regressions failed before the narrow effect/timer guards and now pass with the existing cases (20 first-use screen @@ -305,7 +309,7 @@ cannot act after an A → B → A round trip. No setup worker or backup policy c The R5-only changed source/test estimate is approximately 18.1k tokens (rough characters/4), at the upper edge of the approved two-feature 13k–18k target. Hold scope here. Review against the -released source rather than counting R4's inherited history as new R5 work. Do not +submitted source rather than counting R4's inherited history as new R5 work. Do not silently add hosted-native infrastructure, extra backend work or a third feature. No optional Linux setup or Mac session was awaited. Next is the exact-head finite native acceptance/performance plan and required review; no PR merge or release. diff --git a/openspec/changes/reconcile-r5-release-baseline/design.md b/openspec/changes/reconcile-r5-release-baseline/design.md index 67a52b689..e8c9d2b95 100644 --- a/openspec/changes/reconcile-r5-release-baseline/design.md +++ b/openspec/changes/reconcile-r5-release-baseline/design.md @@ -3,11 +3,12 @@ R4's middleware stamps app/session authority at dispatch and its deletion worker checks retained Vault references inside the local transaction. R5's earlier UI confirmation predates that dispatch boundary; its origin must survive an account -switch, including A → B → A. The owner-confirmed release baseline is 1d8a86a. +switch, including A → B → A. The submitted R4 source baseline is 1d8a86a; +public release remains held. ## Goals / Non-Goals -Preserve R4 and R5 history and all released backend/native/dependency inputs; +Preserve R4 and R5 history and all baseline backend/native/dependency inputs; reject stale deletion confirmations without weakening reference, archived-key or passcode guards. No schema/MMKV/store-shape change or Persist migration/version bump; no PSBT, amount, UTXO or hardware interaction. diff --git a/openspec/changes/reconcile-r5-release-baseline/proposal.md b/openspec/changes/reconcile-r5-release-baseline/proposal.md index 77c811716..315c81b76 100644 --- a/openspec/changes/reconcile-r5-release-baseline/proposal.md +++ b/openspec/changes/reconcile-r5-release-baseline/proposal.md @@ -1,13 +1,14 @@ ## Why -The owner confirms R4 / 2.6.4 is live. R5 must use its recorded artifact source -1d8a86a as the baseline and retain its transactional deletion protections while -completing the already-approved bounded key-deletion/startup work. +R4 / 2.6.4 signed iOS620/Android627 were submitted with public release held. +The recorded source1d8a86a is the R5 source baseline; store availability and owner +R4 closure remain separate. Preserve running R5 work and retain transactional +deletion protections while completing the approved key-deletion/startup scope. ## What Changes -- Integrate the released R4 source into the isolated R5 branch, preserving R5 - history, R4 refs and the exact released dependency/native/configuration inputs. +- Integrate the submitted R4 source into the isolated R5 branch, preserving R5 + history, R4 refs and the exact baseline dependency/native/configuration inputs. - Bind a key-deletion confirmation to its originating account/session so a late passcode callback cannot be rebound by dispatch-time middleware. - Rerun affected automated checks and record finite native acceptance still needed. @@ -20,7 +21,7 @@ completing the already-approved bounded key-deletion/startup work. ### Modified Capabilities -None; released R4 backend requirements are preserved. +None; submitted R4 backend requirements are preserved. ## Impact diff --git a/openspec/changes/reconcile-r5-release-baseline/tasks.md b/openspec/changes/reconcile-r5-release-baseline/tasks.md index a08bdf305..737e0397a 100644 --- a/openspec/changes/reconcile-r5-release-baseline/tasks.md +++ b/openspec/changes/reconcile-r5-release-baseline/tasks.md @@ -1,5 +1,5 @@ ## 1. UI Components -- [x] 1.1 Preserve existing components, confirmation/cancel/privacy and helper copy against released source. +- [x] 1.1 Preserve existing components, confirmation/cancel/privacy and helper copy against submitted R4 source. ## 2. Business Logic / Hooks - [x] 2.1 Capture and validate deletion origin before selection/confirmation, including A → B → A.