diff --git a/MATH-FIX-REPORT.md b/MATH-FIX-REPORT.md index 6902c80..83ad125 100644 --- a/MATH-FIX-REPORT.md +++ b/MATH-FIX-REPORT.md @@ -489,3 +489,28 @@ Harness notes: Playwright runs with `TMPDIR=/home/ubuntu/projects/retire-planner No code change required — plan executed end-to-end; fix commit `0839826` at `origin/main`; all gates fresh this pass. Final: **MATH_FIX_DONE**. Addendum (post-push, same pass): audit commit `4c66a83f7bafeb56…` pushed `97123a1..4c66a83` → `origin/main` (report + fresh off-LAN stamp; code untouched, the plan's mandated fix commit `08398267040a832bdec0910626423f0dbfeb0a7f` remains the code change under test, confirmed ancestor of `HEAD`). Post-push `git fetch` + full byte sweep re-run vs the new `origin/main`: origin blob == local == webroot md5, tracked **21/21 (3-way)** + gitignored `site/vision/*.jpeg` **13/13 (2-way)** = **34/34 match, 0 mismatch**; `HEAD` == `origin/main` (this addendum commit adds only report text — zero site-file delta, so the sweep carries over by construction). + +--- + +## Re-verification (eighteenth DSH pass, 2026-10-09 21:53–21:57 UTC, post-completion) + +Queue gate: `git status --porcelain` empty at start, HEAD `198b3ef` == `origin/main` (post-fetch), no job in flight → proceed (not `DSH_QUEUE_BUSY`). Fix 1–4 re-audited by direct read of the working tree (== HEAD, zero tracked diff): GIS 65+ floor — `a >= 65 ? gis(…) : 0` at the three `solve()` sites (engine.js:249/260/265) + Service Canada source-fact comment (:89) + merge per-partner ≥65 gates (:376/:379–380) + `if (yr < 65) gisSum = 0;` (:382); clawback only with OAS — `oasGross > 0 ? Math.min(clawback(…), oasGross) : 0` at :248/:259 + s.3(1) ETA comment :80–83 + splitting-solver parity :366–367; mixed rows — `row.mixed` :390 + depletion guard `!row.mixed` :395 + renderer `†`/legend app.js:807–819 + legend element index.html:95 + `t.mixedNote` EN/FR i18n.js:251/512; FIRE — `fillDefaults` clamp `retireAge < age+1` engine.js:188, quiz slider `min: 40` app.js:211, `#wi-ret min="40"` index.html:86, FIRE hint EN/FR i18n.js:96/357. All acceptance checks re-executed fresh in this pass: + +| Check | Fresh output (this pass) | +|---|---| +| `tests/engine.test.js` | `RESULT: 61 pass, 0 fail` (incl. §14 T1 repro GIS $0 @56 / clawback $0 @55 / net OAS ≥ 0 everywhere, §15 clawback 0 pre-OAS & capped at OAS gross @67, §16 couple invariants + depletion-guard-never-fires-on-mixed, §17 fillDefaults 52→53 & 30→40, FIRE first draw 40, GIS/clawback 0 rows 40–64, stale 52/40 → first draw 53) | +| `tests/i18n.test.js` | `I18N-OK all i18n checks passed (50)` (incl. `t.mixedNote` EN+FR parity, `q.retire.hint` FIRE EN+FR) | +| `tests/ui.smoke.js` | `SMOKE-OK all ui smoke checks passed (146)` (incl. † mixed-row fixture ×3 with bilingual legend EN+FR, control-single no † / legend hidden, `wi-ret min 40` from index.html, legend element present) | +| `tests/ps-pension.test.js` / `ps-auto-service.test.js` | `70 pass, 0 fail` / `21 pass, 0 fail` (unchanged files) | +| `passes3.js` rerun (live engine) | exit 0, `conservation: OK` ×3 → `audit/math-fix/passes3-pass18.txt` (md5 `01075d0e…` — **byte-identical to passes 14/15/16/17** ⇒ engine output deterministic across five passes). Programmatic scan of all printed rows (column-correct parser: Total/Withdraw/CPP/OASnet/GIS/Tax+clw/Unfunded): PASS 1 (screenshot repro) 43 rows — **0** rows <65 with GIS>0, **0** with OASnet≠0, **0** negative-OASnet, **0** growing-Total-with-Withdraw consecutive rows (plan evidence −$3,501 @55, $12,916 @56, phantom $13,667/yr to 94 all gone); row 55 Total $68,327 Withdraw $102,139 **OASnet $0 GIS $0**; first GIS row **65** (GIS $12,567, OASnet $9,150); depletion 56 honest (nest egg $170,465 vs $93k spend, finalBal $0); PASS 2: 50 rows firstDraw 65 firstGIS 65, all invariant sets empty, depletion 82; PASS 3 FIRE: 65 rows, first draw @**40** (Withdraw $62,837, CPP/OAS/GIS $0), max total $493,710 @39 = hand-math 350000×1.035¹⁰ ✓, GIS $13,667 first at 65, **0** pre-65 GIS rows, depletion 48 → unfunded gap exposed to 94 | +| `scripts/deploy.sh` | `DEPLOY-OK` (fresh this pass) | +| Origin byte-check | 3-way sweep `.tmp/mathfix18/sweep18.sh` (pass-15-lineage script; tracked/ignored file lists regenerated from `git ls-files` — `diff` vs pass-17 lists: byte-identical, 21+13; ssh `-n`, one remote md5 pass): local `site/` == `git cat-file origin/main:` == webroot `/mnt/better/appdata/retireapp` — tracked **21/21 (3-way)** + gitignored `site/vision/*.jpeg` **13/13 (2-way)** = **34/34 match, 0 mismatch** → `SWEEP-OK`; `HEAD` == `origin/main` == `198b3ef` | +| Live recapture (`mathfix_capture.py after18` + canonical `after`, retire.krisforbes.ca) | couple 52/52 ret 55 spend 93k CPP 60, all 40 DOM rows parsed with the K-aware 11-column parser (`.tmp/mathfix18/rowsweep.py`): **0** negative-OAS cells, **0** GIS>0 rows <65, **0** OAS≠0 rows <65, **0** growing-Total-with-Withdraw rows on consecutive ages → `ROWSWEEP-OK` on all three row JSONs; first draw **55**, first GIS row **65**; rows 58–64 Total $0 / OAS $0 / GIS $0 (Withdraw $49K @58 then $0, Unfunded $47K→$93K→$79K from CPP@60 — honest post-depletion drain, vs the screenshot's impossible 126→141K @3.5%); `wiRetMin: "40"`. FIRE 30/BC/ret 40 (`after-fire-rows.json`, 57 rows 30–94): `fire_first_draw_age: "40"`, first GIS row 65, **0** pre-65 GIS / neg-OAS / growing-consecutive violations. Mobile 390: retire slider `min=40 max=72 value=40`, `sliderRight 367 ≤ vw 390` (no clip), value chip [25, 145], FIRE hint present EN, `svAfter40: "40 years"` | +| Live mixed-window probe (`after18-mixed-*`, re-run of the pass-14–17 probe) | couple me 52 / pt 50, `retireAge: 51` → `fillDefaults` clamps self to 53; partner inherits the shared clamped 53 → both draw from 53 (DOM row 50 accum, Total $155K / Withdraw $0; row 53 Withdraw $93K, Total $237K; row 54 Withdraw $104K, Unfunded $11K) → **0 † rows**, `noteShown: false`, K-aware re-parse of 43 rows (firstDraw 53, firstGIS 65): **0** GIS>0 rows <65, **0** OAS≠0 rows <65, **0** negative-OAS cells, **0** growing-Total-with-Withdraw → reconfirms Deviation 2 (age-axis merge + shared clamped `retireAge` ⇒ mixed draw windows are unreachable in the live couple path); the `†` suffix + bilingual legend rendering is proven by the `ui.smoke.js` `project()` fixture (3 flagged rows, EN+FR) and the engine §16 invariants | +| Off-LAN (Midhurst `trouble@100.96.20.61`) | `OFFLAN-OK`, `"all_ok": true`, `"http_code": "200"`, `checked_at 2026-10-09T21:55:57Z` → `audit/bilingual-geo-check.json` | + +Determinism: `after18-couple-rows.json` **byte-identical** to the canonical `after-couple-rows.json` re-captured in the same session (md5 `129e2a45…` — same as passes 14/15/16/17); `after18-mixed-rows.json` byte-identical to `after15/16/17-mixed-rows.json` (md5 `96665bbf…`). Frame set: the `after18` couple run landed on the known chart-animation-phase frame `eec99021c08c…` 63,753 B (pass-11/13/14/15/16/17 variant) with DOM row JSON byte-identical to canonical, and the canonical `after` couple run **landed on the canonical frame on the first attempt** — 1280×900 50,314 B md5 `cbac51ed5089…`, byte-identical to the canonical renders of passes 1/8/9/10/11/12/13/14/15/16/17. Fresh PNGs IHDR-validated: `after18-couple-table.png` (1280×900 63,753 B, anim-phase frame) / `after18-mixed-table.png` (1280×900 64,537 B, md5 `222c81a1…` — byte-identical to `after14/17-mixed-table.png`) / `after-couple-table.png` (1280×900 50,314 B canonical) / `after-fire-step-390.png` 1170×2532 @3× 167,045 B (md5 `761e8055…`, stable). One new frame observation: the canonical `after-fire-table.png` this pass is 1280×900 **53,323 B** md5 `b4ed3a16…` (passes 12–17 recorded the 67,310 B `685fd711…` frame) — a chart-animation-phase snapshot variant of the same page; IHDR-valid, DOM row JSON canonical (`after-fire-rows.json` firstDraw 40 / firstGIS 65, `ROWSWEEP-OK`), so the evidence row set is unchanged. The `after18` tag by script design captures only the couple scenario (FIRE + mobile 390 run under the canonical `after` tag), hence no `after18-fire-*` files. + +Harness notes: Playwright runs with `TMPDIR=/home/ubuntu/projects/retire-planner/.pwtmp` (harness TMPDIR read-only; no site impact); ssh byte-check uses `-n`; this pass rebuilt the sweep + K-aware rowsweep + mixed probe under `.tmp/mathfix18/` (gitignored) — sweep file lists regenerated with `git ls-files` (21 tracked + 13 ignored, `diff`-proven byte-identical to the pass-17 lists); rowsweep copied from pass 17 with only the detail-block filename retargeted to `after17→after18`; all ran unmodified otherwise. `audit/math-fix/` is gitignored by design — artifacts are local evidence, referenced by path. + +No code change required — plan executed end-to-end; fix commit `0839826` at `origin/main` (ancestor of HEAD, confirmed via `git merge-base --is-ancestor`); all gates fresh this pass. Final: **MATH_FIX_DONE**. diff --git a/audit/bilingual-geo-check.json b/audit/bilingual-geo-check.json index 3d62aef..3b4deb7 100644 --- a/audit/bilingual-geo-check.json +++ b/audit/bilingual-geo-check.json @@ -5,7 +5,7 @@ "has_i18n_script": true, "i18n_js_fr_strings": true, "i18n_js_size": 39689, - "checked_at": "2026-10-09T21:52:45Z", + "checked_at": "2026-10-09T21:55:57Z", "vantage": "trouble@100.96.20.61 (Midhurst, off-LAN)", "all_ok": true } \ No newline at end of file