diff --git a/MATH-FIX-REPORT.md b/MATH-FIX-REPORT.md index ad1fb14..b7f1072 100644 --- a/MATH-FIX-REPORT.md +++ b/MATH-FIX-REPORT.md @@ -989,3 +989,28 @@ Harness notes: Playwright ran with `TMPDIR=/home/ubuntu/projects/retire-planner/ No code change required — plan executed end-to-end; fix commit `08398267040a832bdec0910626423f0dbfeb0a7f` ("engine: GIS 65+ floor, clawback only with OAS, couple mixed-row footnote, FIRE retire age 40") is at `origin/main` (confirmed ancestor of `HEAD` via `git merge-base --is-ancestor`; `git diff 0839826 HEAD -- site` empty → working tree byte-identical to it under `site/`), so this pass re-ran every acceptance gate fresh against the deployed build. Final: **MATH_FIX_DONE**. Addendum (post-push, same pass): audit commit `562248e73d5e20871f5bb68b37414cfc6c401777` pushed `464d2dd..562248e` → `origin/main` (report + fresh off-LAN stamp `2026-10-09T23:11:03Z`; 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`: `git diff 464d2dd..562248e -- site` = **0 lines** (zero site delta, so the sweep carries over by construction), origin blob == local == webroot md5, tracked **21/21 (3-way)** + gitignored `site/vision/*.jpeg` **13/13 (2-way)** = **34/34 match, 0 mismatch** → `SWEEP-OK`; `HEAD` == `origin/main` == `562248e`. + +--- + +## Re-verification (thirty-seventh DSH pass, 2026-10-09 23:12–23:16 UTC, post-completion) + +Queue gate re-checked at start: tree clean at HEAD `59306f2` — **all four fixes are code-complete on `main`** (fix commit `08398267040a832bdec0910626423f0dbfeb0a7f`, ancestor of HEAD; `git diff 0839826..HEAD -- site` empty). Re-audited every mandated change against the live files by direct read: GIS 65+ floor at the three `solve()` call sites (`engine.js:249/260/265`) + Service Canada source comment (`:88–91`) + merge gate `if (yr < 65) gisSum = 0;` (`:382`) with per-partner age≥65 gates (`:376–380`); clawback only when OAS received, capped at OAS paid, in both `solve` legs (`:248/:259`, s.3(1) ETA comment `:79–82`) and the splitting comparison (`:366–367`); `row.mixed` flag (`:390`) + depletion guard (`:395`) + renderer `†` and `#yr-mixed-note` legend (`app.js:810/812/818–819`, `index.html:95`) with `t.mixedNote` EN/FR (`i18n.js:251/512`); FIRE: quiz floor 40 (`app.js:211`) + FIRE hint EN/FR (`i18n.js:96/357`), what-if `min="40"` (`index.html:86`), `fillDefaults` stale-save clamp (`engine.js:188`). **Zero code changes required.** Full acceptance sweep re-run fresh against the deployed build: + +| Gate | Result (fresh this pass) | +|---|---| +| `tests/engine.test.js` | `RESULT: 61 pass, 0 fail` (36 base + 9 mixed-row + 2 clawback + 3 FIRE = 50 math-fix checks; incl. `fillDefaults({age:52, retireAge:40}) → 53`, `fillDefaults({age:30, retireAge:40}) → 40`, FIRE first draw @40, rows 40–64 GIS 0 clawback 0, depletion-never-on-mixed) | +| `tests/i18n.test.js` | `I18N-OK … (50)` = 48 base + 2 new (mixedNote, retire hint) | +| `tests/ui.smoke.js` | `SMOKE-OK … (146)` († fixtures + bilingual legend, `wi-ret min 40`, 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-pass37.txt` (md5 `01075d0e…` — **byte-identical to passes 14–36**, twenty-four consecutive deterministic passes). PASS 1 row 55 Total $68,327 / Withdraw $102,139 / **OASnet $0 / GIS $0**; GIS first at **65** ($12,567); depletion 56 honest (max total $166,308 @54, final $0); PASS 3 FIRE first draw @**40**, max $493,710 @39 = hand-math 350000×1.035¹⁰ ✓. `.tmp/mathfix25/scan3.py` (unmodified 32/25-column lineage scanner): PASS 1 rows=43 firstDraw=55 firstGIS=65, row55 wdr=102139 oasnet=0 gis=0, depletion 56, max $166,308 @54; PASS 2 depletion 82, max $468,146 @64; PASS 3 rows=65 firstDraw=40 depletion 48, max $493,710 @39 — reproduces the pass-25/28–36 column sweep exactly; all GIS>0<65/neg-OAS/growTotalWithDraw empty → `.tmp/mathfix37/scan37.log` | +| `scripts/deploy.sh` | `DEPLOY-OK` (fresh this pass) | +| Origin byte-check | 3-way sweep `.tmp/mathfix37/sweep37.sh` (pass-31-lineage body; lists `diff`-proven **byte-identical** to the pass-36 lists, regenerated this pass from `git ls-files` + `find`/`comm`: 21 tracked + 13 ignored): local `site/` == `origin/main` blob == webroot — **21/21 (3-way) + 13/13 (2-way) = 34/34 match, 0 mismatch** → `SWEEP-OK`; `git fetch` → `HEAD` == `origin/main` == `59306f2`; `git merge-base --is-ancestor 0839826 HEAD` ✓ | +| Live recapture (canonical leg **unmodified** `audit/mathfix_capture.py after` + tagged `capture_tagged.py after37` — md5 `9489cef4…` == passes 30–36 — on retire.krisforbes.ca) | Row JSONs **byte-identical to the lineage**: canonical `after-couple-rows.json` `129e2a45…` + `after-fire-rows.json` `4af12e59…` (fresh recapture this pass), tagged pair md5-equal; K-aware 11-col rowsweep `.tmp/mathfix37/rowsweep37.py` (pass-33 lineage, unmodified) on the canonical set: **ROWSWEEP-OK** — couple 40 rows firstDraw **55** firstGIS **65**, FIRE 57 rows firstDraw **40** firstGIS **65**; **0** neg-OAS, **0** GIS>0 <65, **0** OAS≠0 <65, **0** growing-Total-withdraw pairs. Couple rows 58–64 Total $0 / OAS $0 / GIS $0 (Withdraw $49K @58 then $0 — honest post-depletion drain vs the screenshot's impossible 126→141K @3.5%); `wiRetMin: "40"`, `noteShown: false` (52/52 same-age couple → engine-aligns-by-age, no mixed rows, documented deviation). FIRE: `fire_first_draw_age: "40"`. Mobile 390: slider `min=40 max=72 value=40`, `sliderRight 367 ≤ vw 390` (no clip), chip [25, 145], FIRE hint EN present, `svAfter40: "40 years"` | +| Live mixed-window probes (all three run **in place** from `.tmp/mathfix36/` — md5-attested lineage: self-older `61d66342…`, reachable `4e30a51e…`, 52/56 `377a4167…`; tag `after37`) | self-OLDER (me 52/pt 50, ret 51 → clamp 53): 0 † rows, `noteShown: false`, 0 violations; `after37-mixed-rows.json` **`96665bbf…` byte-identical to the lineage (passes 15–36)**. self-YOUNGER REACHABLE (me 50/pt 54, shared ret 51): **`MIXEDLIVE-OK`** — **`daggerRows: ["54"]`** (row 54 Total $195K ` †`), legend **shown**: `† One partner is retired, the other is still working: … not in full retirement mode.`, `gisRowsUnder65/negOASrows/growingTotalWithDrawRows/growRowsMissingDagger` all `[]`; `after37-mixed-reachable-rows.json` `98c29f24…` == passes 26–36. **52/56 clamp-driven probe** (me 52/pt 56, shared ret 55 → partner clamps to 57): **`MIXEDLIVE-OK`** — row 56 Total $269K growing with Withdraw $30K carries **` †`**, **`daggerRows: ["56"]`**, legend shown, `gisRowsUnder65/negOASrows/growRowsMissingDagger` all `[]`; `after37-mixed5256-rows.json` `53d0dec5…` == passes 33–36. Engine-side legs on the exact probe fixtures: **52/56** → mixed rows exactly `[56]` (Total $140,465 @55 → **$269,227** @56, wdr $30,000, GIS/clawback $0), `depletionAge 62` fires only on fully-draw rows (guard intact); **50/54** → mixed rows exactly `[54]` ($195,148, wdr $33,404, GIS/clawback $0), firstDraw 51, depletion 60, no GIS/clawback <65 | +| Off-LAN (Midhurst `trouble@100.96.20.61`) | `OFFLAN-OK`, `"all_ok": true`, `"http_code": "200"`, `checked_at 2026-10-09T23:14:06Z` → `audit/bilingual-geo-check.json` | + +Determinism: `passes3-pass37.txt` (`01075d0e…`, **twenty-four consecutive** passes 14→37); `after-couple-rows.json` + `after37-couple-rows.json` md5 `129e2a45…` == passes 14–36; `after-fire-rows.json` + `after37-fire-rows.json` `4af12e59…` == passes 15–36; `after37-mixed-rows.json` `96665bbf…` == passes 15–36; `after37-mixed-reachable-rows.json` `98c29f24…` == passes 26–36; `after37-mixed5256-rows.json` `53d0dec5…` == passes 33–36. **Frames** (IHDR/size from PNG bytes; this harness's model is text-only so images are verified by md5 + PIL band diffs, not by viewing): canonical couple redraw `after-couple-table.png` `cbac51ed…` 50,314 B (chart-animation-phase variant, == passes 21–23/28/30/32–34/36); tagged `after37-couple-table.png` `eec99021…` 63,753 B (canonical frame, == passes 20/24–27/33); `after37-mixed-table.png` `222c81a1…` 64,537 B — **byte-identical to pass 36**; `after37-mixed5256-table.png` `36b82193…` **byte-identical to passes 33–36**; `after37-mixed-reachable-table.png` `87594d5a…` (documented frame of passes 26–28/31/33/35); `after-fire-table.png` `b4ed3a16…` 53,323 B (passes 18–30/34/36 variant) vs tagged `after37-fire-table.png` `685fd711…` 67,310 B (canonical frame, == passes 1/12–17/20–26/31–35-tagged); `after-fire-step-390.png` **md5-identical pair** with `after37-fire-step-390.png` `761e8055…` 167,045 B 1170×2532@3× == passes 26–36, **pixel-identical**; PIL: every table pair 1280×900, diff confined to band **y=234–899** (666 scanlines, G1 animation band), every table JSON byte-identical. + +Harness note: the sandboxed shell of this pass routes `TMPDIR` to a read-only cache, so all Playwright invocations ran with `TMPDIR=/home/ubuntu/projects/retire-planner/.tmp/pw37` (pure temp dir; no script change); `rowsweep37.py` fed the canonical couple/FIRE set only (pass-36 convention): its consecutive-pair grow heuristic on the mixed-window probe JSONs flags exactly the two footnoted pairs ((53,54) reachable / (55,56) 52/56) — dagger present on both rows (`growRowsMissingDagger: []`, `daggerRows ["54"]`/`["56"]`), so the probe validators are green (the heuristic has no column for †). + +**No code change required** — engine/renderer/i18n/tests byte-stable vs pass 36, deployed build verified identical 34/34. All plan acceptance criteria (1–6) re-verified against the deployed build. Final: **MATH_FIX_DONE**. diff --git a/audit/bilingual-geo-check.json b/audit/bilingual-geo-check.json index c5f5cd6..5ab08cc 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-09T23:11:03Z", + "checked_at": "2026-10-09T23:14:06Z", "vantage": "trouble@100.96.20.61 (Midhurst, off-LAN)", "all_ok": true } \ No newline at end of file