[juaristi22]

Summary

This PR takes the engine-free items of #1095 that María ruled on 29 October (Phase A), and the first re-bump past #1421 (Phase C): policyengine-uk 2.165.1. Main is merged in after #1420 and #1421, and the national and local target surfaces are regenerated on the pinned feed (Chronicle 53815b2). The spine and calibration items (Phase B) move to #1426, each measured in its own arm.

policyengine-uk 2.165.1

The lock moves from 2.164.2, which #1421 brought, to the newest release.

• Other investment income in market, HBAI, net and capital income (2.164.3, Count other investment income in market and HBAI income policyengine-uk#2736; 2.164.4, Count other investment income in capital income, and test it in every income measure policyengine-uk#2746). The build writes it from National Savings and gilt interest on FRS rows and from the SPI's other investment income on SPI rows. The engine already taxed it, and now also counts it in market income, HBAI income, household net income and capital_income. The stages that read those incomes:
  • The LCFS, NEED and NTS stages band recipients on the engine's HBAI income with its deductions added back, so their gross income now counts it, as the surveys' gross incomes do.
  • was_wealth, and was_lisa through its predictors, read household net income against WAS's DVTotinc_bhcR8, whose investment income covers every account and investment WAS asks about, National Savings bonds and gilts included. was_wealth also reads capital_income as a predictor, which now matches the donor's gross income from all financial investments (DVGIINVR8).
  • etb_services reads the engine's HBAI net income, and etb_vat its HBAI gross income less the ETB's direct taxes, against the ETB's disinc. The ETB's original income includes investment income, and its records come from the Household Finances Survey from 2018. Whether that survey's investment income counts National Savings and gilt interest is still to check against its documentation.
• Company car and car fuel benefits (2.165.0, Model the company car and car fuel benefits, with Class 1A NICs policyengine-uk#2750). The build writes none of the nine person inputs, so no one has a company car and both benefits and their Class 1A NICs are zero, as before. The inputs are signed at their default in UK_ENGINE_DEFAULT_INPUTS, for María's signature. The company car PR for the Autumn Budget dashboard supplies six of them.
• Tax-Free Childcare over a smaller UC award (2.165.1, Keep Tax-Free Childcare over a smaller UC award, and take no deductions from awards only a reform creates policyengine-uk#2754). A family that would claim UC keeps Tax-Free Childcare instead when the top-up is worth more than the award. No debt deductions come out of an award only a reform creates. Every new variable is a formula.
• No economic assumption moves. The vendored uprating pins and the bonus-sacrifice anchor change only their version stamps, and no gate digest moves.

Regeneration on feed 53815b2

The national and local references, membership and compile-parity receipts are regenerated on the merged tree, on main's feed pin (Chronicle 53815b2, #1420's re-pin). The vendored resources check against the full artifact unchanged. The local census, the local references, the local parity receipt and the coverage manifest regenerate unchanged.

• National surface: 1,409 active references, up from 1,403, and no row left without a fact (four before). The new rows are the three OBR council tax nation rows (D14e) and SLC's three nation rows (R4). The DfE rows, the R7 windows and obr.council_tax move as described below. SLC's three nation rows differ from the incumbent's devolved metrics only by their uprating to 2025.
• SPI uprating holds catch up with Budget 2026 ISA data, PR B of #1418: ISA subscriptions per adult, the Lifetime ISA anchor, additive ISA income, policyengine-uk 2.164.2 #1421: main's surfaces were generated before Budget 2026 ISA data, PR B of #1418: ISA subscriptions per adult, the Lifetime ISA anchor, additive ISA income, policyengine-uk 2.164.2 #1421 refreshed the HMRC uprating pins with the October EFO, so the regeneration moves 21 SPI holds. The eight self-employment amount band holds go from 1.1176 to 1.1115, as per-capita mixed income from 2023 to 2025 falls from 1.0384 to 1.0327. The 13 dividend holds by income band go from 1.088147 to 1.088151 (OBR per-capita GDP).
• Local surface: 27,168 active references, every status count unchanged. The signed deferrals fall from 94 to 77, as the support-floor deferrals now follow each target's nations.
• A window fix the regeneration found: R7's calendar-2025 window on dfi_ni.bus.passenger_receipts failed to compile, because its selector pins two services and the window counted series only from list-valued source keys. A dimension pinned to several values now names one series per value. The window of the sum is the sum of the windowed series, and a service short of a year, or with no facts at all, refuses the window. No other UK, US or NZ window reference pins several dimension values.
• After the independent reviews: 43c3da74e regenerates the surfaces once more. The national references, membership and parity receipt move only for the three OBR council tax nation rows, now scaled by obr.council_tax's main-residence share, and for the restated DfE and council tax rationales. The local census gives D18a's circularity reason for ONS's small-area income rows, and ce9344c68 gives the local parity receipt's 903 rows of them the same reason.

Targets

• OBR council tax by nation (D14e): the three nation rows are pinned to the UK and held as measured diagnostics. Each takes obr.council_tax's main-residence share (D14f), so the three sum to the bound row and read each nation on its basis.
• Declared geography wins (R8, R9): a selector's declared geography_id is returned before the inferred pin, and the authoring refuses a disagreeing pin.
• SLC devolved repayments (R4): slc.repayments.devolved_total becomes one row per nation. Wales binds. Scotland and Northern Ireland are held out by María's ruling, as their plan thresholds are not modelled. The three rows carry SLC's 2024-25 outturn to 2025 by policyengine-uk's OBR average earnings index, since repayments are a share of earnings above the plan thresholds (María's ruling of 30 October). This replaces the matched-period hold of 29 October, which declared the frame's own year: the solve honours a declared period only at the calibration year, or at the frame's year for a stored column, so it would have refused the Welsh row.
• Calendar-2025 window (R7): Scottish Child Payment, the TFC top-up, Northern Ireland bus receipts and the four SLC England repayment rows.
• Ledger observation_period: a reference can select its facts at a declared period while the target keeps its own. A restamp to another target period moves the observation period by the same number of years (restamp_reference_period), reading it as its match policy does: under the selector's period type for an exact match, and untyped for the default cutoff. A spelling read two ways refuses rather than guess. A row whose observation period cannot move stops the compile and is named. The generators move the contract's observation periods from its base (UK_OBSERVATION_PERIOD_BASE, 2025), which is kept separate from their default period. So the DfE rows read the January census after their model year at any period, including in the childcare fit tool and the UC matrix diagnostic.
• DfE (D5): the eight rows bind the January 2026 census at model year 2025. The three in_year_snapshot holds are retired.
• Window-ratio complement: a numerator can be its denominator less the listed cells; its metadata records that numerator and the formula numerator / denominator.
• OBR council tax (D14f): binds the main-residence share: England's chargeable dwellings less second homes and empty homes, over chargeable dwellings (MHCLG, October 2025, about 0.968). Scotland and Wales take England's share, as a stated approximation.
• Signed exclusions: D3 keeps Scotland's three-plus-children rows out with a corrected reason. D18a signs the MSOA income deferral. D18c keeps Northern Ireland's UC area cells out.

Spine and stage records

• Carry manifest rewrites into the shared Stage/StageRecord producer graph #721: StageRecord carries rewrote, the stage's declared rewrites, in both the plan and the graph builds. The hand-written education_grants carve-out is gone, so Carry manifest rewrites into the shared Stage/StageRecord producer graph #721 can close when this lands.
• Support-floor deferrals follow each target's local-authority scope: the Welsh and Scottish families no longer defer the two English micro-authorities.

Gates

• Zero-weight strata (Adjudicate the UK spine grain at the ingest/calibration seam #688): both SPI-synthetic strata are capped at 0. The June caps of 100,000 counted the retired ten-clone grain, and the national seam ships no zero-weight row.
• Export surface (WS-E spine deferrals: known bugs and signed inconsistencies awaiting their increment #796): the all-zero incapacity_benefit_reported exclusion never matched the pinned reference, so it is dropped. The release boundary still drops the column.
• macro_realism (Swap the microcosm-built UK spine into the national build and retire the incumbent feed #757): not declared, and the battery's policy text records why. The solve binds the income components directly, and the national accounts' household disposable income differs in scope. The release contract refuses a not_applicable entry in this spec vintage.
• Take-up flags at their stages (María's ruling, "do both"): frs_take_up, frs_person_draws and frs_household_draws record their flags' shares at the stage's weights, and childcare_copy_take_up the five childcare flags it re-draws for the copies. Four stage gates hold them to their contract targets, at the terminal gate's bounds until a spine receipt measures them. Three run at the assembled phase. The copies' gate runs at the transferred phase, since its stage runs after the assembled boundary (frs_brma), and a test fails on any assembled-phase stage gate that reads a later stage. A flag whose population rests on one or two source households is flagged unchecked at its stage, never failed (María's ruling of 26 October); the terminal uk_take_up_signal gate, which stays release-blocking, still measures it.
• The battery, spine-part, release-cut and dense digests in microcosm-data's contract move with the manifest.

Disclosure floor of 3 (A1)

María ruled on 29 October to move every UK disclosure floor from ten source households to three, CD171's absolute floor (recorded on #1095). One constant, receipt_counts.UK_DISCLOSURE_FLOOR, now sets it for the stage receipts, the stage-health gates and the report tools. A withheld figure reads "<3", and counts from three to nine read "3-9", rounded record counts included (Vahid's review). The SPI tape's two SN 9422 conditions are unchanged. The high-value-homes support gate and the three tools' SDC defaults move to three as well. Two guard tests fail on a floor of ten left in the UK runtime, the UK spec, the hand-written UK JSON, the UK tools or microcosm-data. One checks the "<10" label. The other checks comparisons, floor-named constants, defaults and keys in any case, and prose, including prose split across lines. Each ten it keeps is named by its phrase. The statistical floors stay, each saying so:

• the zero-support floor;
• the pay concept ratio's ten households: a ratio on fewer is held to its bounds as noise, its receipt says so, and its gate reads it as unmeasured;
• the SPI transport's ten rows for a uniformity distance, whose positive-row count is now rounded like every receipt count;
• the regional renter minimum;
• the private-rent tool's ten-row group rule;
• the SPI coherence tool's floor for medians and quantiles.

Band and rounding edges, the SPI tape's licence terms and history stay too. So do facts that still hold at three: the "fewer than 10" notes on the council tax and SPI rows, the two signed £2m exclusions, and the rules in local_small_cell_rule.json.

Text

Stale tracker text in notes, docstrings and the vendored bus resources' purposes. The Incapacity Benefit leaf note now names the FRS 2024-25. The charter-H2 fixture and the release input coverage manifest follow the stage contract digests.

Not in this PR

• Promotion for the constant-id national line: pointer and certified-loader extension #823's default-load flip moved to its own PR, UK: make the promoted national line the default load (#823) #1432, by Vahid's review: it changes the default UK load for every consumer and depends on nothing here.
• 2.165.1's Tax-Free Childcare choice moves fewer than three source households on the 29 October spine, so it needs no data rule. The childcare refit (Phase B) runs on this lock.
• Ruled on 29 October: obr.sdlt keeps the households' share (the follow-up is in UK: every open data item: uk-data parity, engine locks, the local surface, consumption and high-value homes #1095); no Carer's Allowance stage gate until a caseload target binds; the HBAI check keeps its four statistics; SPI copies take their twin's contributory JSA and ESA only under the permitted-work limit (Phase B). Households' council tax on other property is Households' council tax on second homes and other property (engine and data) #1423.
• Still open: NS9c (explored separately) and the signed spine differences (after the childcare refit). D12b waits for the next calibration-year move, and certification against the promoted cut gets its own PR.
• Needs Chronicle first: Publish Chronicle package IDs in calibration diagnostics targets #661 (package ids in the consumer artifact).
• Overlaps: UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 and the company car PR change the same generated files (uk/gates.json and its digests, the release input coverage manifest, the charter-H2 fixture). The company car PR also locks policyengine-uk and re-pins the feed past chronicle#399. Whichever lands second regenerates them on the newer lock and pin. Both have this branch merged locally as of 4af602d81, and UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426's SPI pay-floor receipt now withholds through UK_DISCLOSURE_FLOOR.
• Phase B moves to UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 (each item measured): PR 2b, the stake level, HICBC opt-outs, the Carer's Allowance stage order, advanced ages, the benefit cap, and the rest of the approved plan.

Tests

• Engine tier on policyengine-uk 2.165.1: every UK engine test passes, run in full locally because CI stops at the first failure. Three needed updates: Tax-Free Childcare's top-up now lives in a shared helper, which still reads the spend the build routes; the company car's list price and capital contributions are person-level stocks that are no one's capital; and the graph build's stage records list each stage's rewrites beside their outputs (Carry manifest rewrites into the shared Stage/StageRecord producer graph #721). CI passed in full at 821e342d1.

• Full engine-free suite at b46be0044 (673 files, in 30-file chunks): 22,969 tests, 233 skipped, counted by --junitxml. Sixteen fail:

  • ten fixed since: the SLC nation rows' declared period (four test_uk_measurement_period tests) and the pins and fixture rows that follow the regenerated surface (six). At 652835c1f, the 60 files that read the regenerated surfaces pass: 3,920 tests, 62 skipped;
  • six only on this machine: four Orrery tests (a missing Node package), test_engine_is_reported_unavailable_without_the_uk_extra (the uk extra is installed here) and test_spawned_workers_score_identically_to_sequential_cli (needs Python 3.14.7; this machine has 3.14.6).

• The "3-9" band (254be6d41): the tests of every rounded_count caller pass: 39 engine-free files (1,384 tests) and 8 engine-tier files (72 tests).

• After the Promotion for the constant-id national line: pointer and certified-loader extension #823 revert (1f46653b6): the 18 files that resolve or load a UK dataset pass, bar the live Hub pointer test, which needs private credentials (CI skips it). Main's version of that test expects the old release naming; UK: make the promoted national line the default load (#823) #1432 fixes it.

• Feed-reading tests on 53815b2 (the 15 feed-gated files, one process each, which CI skips without the feed): 235 tests, two skipped because the Scotland support and the authenticated national artifact are not on this machine. Two tests in test_uk_target_references.py still expected values from before D5 and R7; 02df9df2b moves them to DfE's January 2026 census and the calendar-2025 windows, each value checked against the feed's facts and the committed membership. The two drift checks that regenerate the vendored resources and the target surfaces from the feed were left out: the regeneration wrote those files, and the vendoring check passed in it.

• After Vahid's second review: f83d7a3c2 links the ruling's record from receipt_counts and the changelog, and its tests pass. ddd82aa2f adds a test that a pinned service with no facts refuses the window; the 460 tests of test_ledger_targets.py pass.

• After each of the five independent reviews (c0dd6eae2, 5b693b736, 821e342d1, 0da33d0cd and 4af602d81), the following pass locally:

  • the touched test files;
  • the H2 fixture check and the H2 parity test;
  • the coverage manifest check and the gate digests.

  The fourth and fifth rounds' tests also replay the tool's reasons over both committed parity receipts, starting each row from the classifier's reason, so CI now catches a stale, changed or removed reason. CI passed every job at 0da33d0cd.

• Checks: tools/ci_test_plan.py verify, tools/spec_engine_coverage.py --check, the vendoring check against the full artifact, and ruff on the edited files.

🤖 Generated with Claude Code

[vahid-ahmadi]

@juaristi22 this is an early look at 5a944e449, not a full review, since the body says it isn't ready. It covers must and should items only, and nothing on your own pending list. I'll do a full pass after main merges in and the references regenerate.

1. must: an engine-uk failure the body doesn't list. tests/engine/uk/test_uk_graph.py:84 still asserts set(nonzero_share) == set(stage.outputs). But _graph_stage_records now adds stage.rewrites to shares (Carry manifest rewrites into the shared Stage/StageRecord producer graph #721). So age_tail fails in engine-uk on both Pythons (run 40917095981, at this head). Regenerating won't fix it. The assertion needs set(stage.outputs) | set(stage.rewrites). The body's engine-tier line covers only the charter-H2 parity test, so this one was missed.
2. should: rounded_count now prints exact counts from three to nine (receipt_counts.py:103). The module docstring still says "no exact count that ... narrows a small group by difference". extreme_count and support_band print "3-9" there instead. Printing exact counts just above the floor is where differencing bites. That matters more now that the floor is three rather than ten, CD171's working minimum against secondary disclosure across outputs, as the docstring says. I'd keep "3-9" in rounded_count too. I'm not reopening the ruling. Please link the UK: every open data item: uk-data parity, engine locks, the local surface, consumption and high-value homes #1095 comment that records it from the module and the changelog, and say there that the SN 9422 conditions (HMRC sees SPI-based material ten working days ahead) are unchanged.
3. should: UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 adds new "<10" sites. The SPI pay-floor receipt in UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 hardcodes ten in several places. Whichever of the two lands second should move them onto UK_DISCLOSURE_FLOOR. Otherwise one receipt stays on the old floor without anyone noticing. I've raised it on UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 too.
4. should: ship the Promotion for the constant-id national line: pointer and certified-loader extension #823 default-load flip on its own. Pointing load("uk") at latest-national.json and retiring variant="national" affects every consumer. It doesn't depend on Budget 2026 slower data fixes, PR C of #1418: electricity at the ONS level, pension income by area #1420, Budget 2026 ISA data, PR B of #1418: ISA subscriptions per adult, the Lifetime ISA anchor, additive ISA income, policyengine-uk 2.164.2 #1421 or the regeneration. As its own small PR it could land now, and it wouldn't be held behind this one. The old 823-national-variant-until-promoted.changed.md entry, which describes the opposite state, should go in the same change.

The D14f main-residence share (0.968) is covered on #1423: #1423 (comment).

What I ran. I read the diff at 5a944e449 against its base fddbc7073 and the failing CI logs. I didn't run anything locally. I didn't review the target, gate or ledger changes in detail, and I'll leave those for the full pass.

🤖 Generated with Claude Code

[juaristi22]

Thanks for the fourth review, of 821e342d1. Everything below is at 0da33d0cd. Noted on the engine jobs: 8f7d69204 and bd9839bf2 fixed both failures.

New in the round-3 commits

• 1. Periods under a typed selector: the restamp and the authoring tools now read an observation period under the selector's period_type when it declares one, as the exact-match path does.

  • Under fiscal_year, "2011-12" moves to "2012-13". Under month, or with no type, it moves to "2012-12".
  • "2026-01" spells no fiscal year, so a fiscal-year selector refuses to move it.
  • A target period has to give a four-digit year, so "FY25" refuses rather than moving "2026-01" to "26-01".
  • Tests cover each case.

• 2. The floor guard:

  • A ten is now 10, 10. at the end of a sentence, or 10.0. The guard still skips 10.5, 10% and 10_000.
  • Prose matches across a line break, a comment marker or a string's quotes. That found three wrapped tens:
    • the rent receipt's "fewer than ten". It was stale: the tool already withholds below the floor of three (MIN_SOURCE_HOUSEHOLDS), and its docstring now says so;
    • the pay ratio's "one to nine households", which is a statistical floor;
    • the SPI tape's "at least ten working days" for HMRC's review, which is a licence term.
  • The last two are kept by their exact phrases.
  • {count:>9} and minutes=10 no longer match: the pattern for constants is case-sensitive now and skips MINUTE.

• 3. The base: UK_OBSERVATION_PERIOD_BASE (2025) now holds the contract's base, separate from UK_TARGET_REFERENCE_PERIOD, the generators' default --period. Two tests replace the old one:

  • the contract's observation periods are each the January after the base;
  • for the national and the local references, each reference whose contract target declares an observation period reads the January after its own period, and no other reference declares one.

  So authoring at 2026 gives "2027-01", which passes once the default moves with it, and moving the default leaves the base alone. The changelog now says the period is read under the selector's type.

Round-3 gaps

• Local parity receipt: a new test replays the tool's reason notes over both committed parity receipts. It fails on any reason the tool would now write differently, and changing one of the tool's texts marks its rows stale. The national replay needs the feed, so CI didn't check either receipt's reasons before.
• Contract errors: the local compile's message now says "UK local reference". A test covers that branch with a real fiscal-year reference that can't move.
• Count bounds: a test checks every count up to 20,000. Each printed count's bounds equal the lowest and highest counts that print as it, and putting the 1,000 edge back to v - 50 fails it.
• Graph boundary: UK_SPINE_ASSEMBLED_FINAL_STAGE now lives in uk_runtime/graph.py, which builds the checkpoint node from it. graph_evidence.py, spine_build.py and the stage-gate test import it from there. Each touched module imports on its own in a fresh interpreter.
• Pay ratio: a receipt from before 821e342d1 lacks the flag, so the gate doesn't report its ratio as held. A thin ratio still reads as unmeasured. No change.

The touched test files pass locally, and so do the H2 fixture check, the H2 parity test, the coverage manifest check and the gate digests. CI runs the full tiers.

[juaristi22]

Fifth review of #1422 at 0da33d0cd

This re-reviews 0da33d0cd against my fourth review at 821e342d1. As before:

• one reviewer re-ran each earlier finding;
• a second read the commit for new defects.

Paths are relative to packages/microcosm-build/src/microcosm/build/ unless they start with packages/ or tools/.

Verdict: the round-4 items are fixed, CI is green, and nothing blocks a build. Two of the fixes regress latent cases:

1. under the default match policy, typed selectors now refuse to restamp. My round-4 suggestion pointed there, again;
2. the floor guard's case-sensitive constant pattern drops lowercase floor names.

Round-4 items

#	Status
1. Typed periods	Fixed for exact. A fiscal "2011-12" now moves to "2012-13", and "FY25" refuses. But see 1 below.
2. Floor guard	Fixed. Sentence-final tens, 10.0 and wrapped prose are caught, and the three wrapped tens are real and counted. But see 2 below.
3. Observation base	Fixed. Every mutation I tried fails the new tests, including the old trap with both constants at 2026.
Parity-reason replay	Partly. It runs feed-free in CI and catches changed tool texts and stale ruled reasons. Not caught: rows that keep the classifier's generic text (318 national, 288 local), and a removed national rule. So "fails on any reason the tool would now write differently" overstates it.
Local message	Fixed, but its test pins 1's regression (below).
Count bounds	Fixed. Every edge mutation fails the test.
Graph boundary	Fixed. There is one definition, in uk_runtime/graph.py, with no import cycle, and #1430's head merges with it cleanly.

New in 0da33d0cd

1. Typed restamps now refuse what the default policy reads (ledger_targets.py:4691-4695; target_reference_authoring.py:151).

• Mechanism:
  • The restamp reads the observation period under the selector's type for every policy. Only exact reads it that way.
  • The default latest_not_after, which every committed DfE row uses, reads it untyped as a cutoff (:4766, :4853-4854, :4890).
• Example: an academic_year or fiscal_year selector with observation "2026-01" and the default policy selects AY2025-26 at 2025.
  • Round 4 moved it to "2027-01", which selects AY2026-27.
  • Now it raises "cannot move the period '2026-01' by 1 year(s)". That stops the whole compile (uk_runtime/ledger_targets.py:508-516, :1453-1461) and the generators.
  • A month selector with an annual cutoff fails the same way.
• Cause and fix: my round-4 suggestion didn't distinguish match policies. The fix is to read the period the way the policy that consumes it does: typed for exact; for latest_not_after, typed where the type can read the spelling and untyped otherwise.
• The new local test (test_uk_ledger_targets.py:2812-2846) builds exactly this reference and calls it unmovable, so it pins the regression.
• Impact: latent, since no committed reference has both a typed selector and an observation period.
• Residuals:
  • the int fast path ignores the type (:4727-4728);
  • the constructor still validates the observation period untyped (:356-360), so a valid fiscal "2099-00" is refused;
  • with an untyped exact selector the match falls back to the fact's own type (:5092), so an untyped "2011-12" still restamps to "2012-12". The changelog's "as the exact-match path does" holds only for typed selectors.

2. The floor guard's case-sensitive constant pattern drops lowercase floors (packages/microcosm-build/tests/engine_free/uk/test_uk_receipt_counts.py:225).

• Now missed: rounds 3 and 4 caught lowercase names at the start of a line. This head misses:

  • floor = 10, support_floor=10, and small_cell_floor = 10;
  • sdc_floor = 10 and disclosure_floor: int = 10;
  • row_threshold = 10.

  No live instance is affected.

• Fix: the two false positives the reply credits to case sensitivity go away because of the new lookbehind (:222) and the narrowed key pattern (:218). So IGNORECASE can stay, with the words matched as snake-case tokens, e.g. (?:^|_)(?:min|minimum|floor|sdc|small|threshold)(?:_|\b).

• Docstring claims it doesn't meet:

  • #: comment continuations. One live, harmless wrap sits at uk_runtime/target_weights.py:101-102.
  • Float-, Optional- and Final-annotated defaults.
  • Single-quoted dict keys.

• False positives: fill-character format specs such as {n:0>9} are flagged, though they fail loudly.

• Brittleness: the kept phrases embed indentation and line breaks, so reflowing those comments fails the guard, again loudly.

3. Small: the observation-period tests require each period to be the January after the reference period, and call int() on that period. A fiscal or prefixed observation period, or a string target period like "2025-26", would fail them. That's fine for D5, but it deserves a comment in the test.

Checked and found true

• Typed shifts: every spelling each type can read moves correctly, with its start and range end both shifted. Untyped results are identical to round 4.
• Generators: both use the default --period of 2025 and the base of 2025. The DfE rows at 2024, 2025, 2026 and 2030 give "2025-01", "2026-01", "2027-01" and "2031-01".
• Graph: imports are clean, and the graph's loud failures on a missing boundary are intact.
• Guard: it scans the tree in 1.3 s with no catastrophic backtracking.
• Cross-PR: neither SPI donor savings rebased to SPI's 2023-24 bands (savings follow-up to #1418) #1428 nor UK: company cars from the FRS job table (dashboard #316) #1430 declares observation periods, and the guard flags none of their added lines.
• CI on 0da33d0cd: every job passes.

Disclosure-control items went to the author separately.

🤖 Generated with Claude Code

[juaristi22]

Thanks for the fifth review, of 0da33d0cd. Everything below is at 4af602d81.

New in 0da33d0cd

• 1. Restamps under the default policy: fixed. An observation period is now read as its match policy reads it: under the selector's period_type for exact, and untyped for the latest_not_after cutoff.
  • A fiscal- or academic-year selector's "2026-01" moves to "2027-01" again, and a month selector's "2026" to "2027".
  • The suggested rule for the cutoff, typed wherever the type can read the spelling, still picks wrong for one spelling. Take "2011-12" under the default policy:
    • the cutoff reads it as December 2011, and it reads the facts' own spellings untyped too;
    • under a fiscal-year selector it has to become "2012-13" to keep selecting the year's own fact;
    • under a calendar-year selector it has to become "2012-12".
  • So where the selector's type reads a spelling differently from the cutoff, the restamp now refuses. An untyped exact match refuses "2011-12" the same way, since it reads the period under each fact's own type. A prefixed or four-digit spelling reads one way.
  • The local compile test now uses "FY26". The parser reads it as the year 26, so it can't move under any policy.
  • Residuals:
    • the int path checks the year under the type, so a month type refuses a bare year;
    • the constructor checks an exact period under the selector's type, so a fiscal "2099-00" stands, and an exact fiscal "2026-01" is refused when the reference is built;
    • the changelog and docstrings no longer say "as the exact-match path does". They describe each policy's reading and the two refusals.
• 2. Floor guard: IGNORECASE is back, and the floor words (min, minimum, floor, sdc, small, threshold) are matched as snake-case words of a name.
  • All six missed names match again, and admin_count=10 and minutes=10 still don't.
  • Also caught now:
    • defaults under any annotation without a comma outside its brackets (float, Optional[int], Final);
    • single-quoted keys;
    • #: continuations. That found the wrap in uk_runtime/target_weights.py, which counts homes rather than records, so it's kept.
  • Format specs with a fill character ({n:0>9}) are skipped.
  • Kept phrases now match across any whitespace between their words, so re-indenting no longer fails them. Moving a line break across a comment marker still fails, loudly.
  • The new guard flags none of the lines that UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426, SPI donor savings rebased to SPI's 2023-24 bands (savings follow-up to #1418) #1428 or UK: company cars from the FRS job table (dashboard #316) #1430 add.
• 3. Observation-period tests: a comment now says D5's periods are untyped Januaries after an integer year, and that a fiscal, prefixed or range-spelt period needs its own expectation.

Parity-reason replay: my round-4 reply overstated it.

• The classifier's four reasons now live in one constant, PARITY_DIFFERENCE_REASONS in gates.py, with unchanged texts.
• The test starts each row from its kind's reason, then replays the tool's rules, so a changed classifier text and a removed rule fail too.
  • Removing the PIP rule fails the national receipt.
  • Changing the fixture-only text fails the national receipt too. The local receipt's generic rows are all calibration drift, so a change to that text fails both.

The touched test files pass locally, and each fix fails its tests under mutation. The gate digests, the coverage manifest check and the H2 fixture check pass too. CI runs the full tiers.

[juaristi22]

Sixth review of #1422 at 4af602d81

This re-reviews 4af602d81 against my fifth review at 0da33d0cd. As before:

• one reviewer re-ran each earlier finding;
• a second read the commit for new defects.

Paths are relative to packages/microcosm-build/src/microcosm/build/ unless they start with packages/ or tools/.

Verdict: the round-5 items are fixed, CI is green, and nothing blocks a build. What's left is latent:

1. nothing tests the guard's new name matching;
2. a few period spellings from before 2013;
3. two cross-PR notes.

Once 1 is pinned, this looks ready to me.

Round-5 items

#	Status
1. Restamps by match policy	Fixed. Under the default policy, a fiscal- or academic-year "2026-01" moves to "2027-01" again, and a month selector's "2026" moves to "2027". Exact typed periods are checked at construction. Every committed reference still builds: 1,409 national, 27,168 local, and the NZ, AM, BE and US ones. The 616,875 restamps from 2018 to 2035 all match round 5. Residuals are in 2.
2. Floor guard	Fixed. It now catches lowercase snake-case floors, annotated defaults, single-quoted keys and #: wraps. admin_count=10 and minutes=10 stay quiet, and kept phrases survive re-indenting. But see 1.
3. Observation-period tests	Fixed (the comment).
Parity-reason replay	Fixed. The four texts live in one constant and are byte-identical. A changed classifier text, a removed rule and a stale generic row each fail now.

Remaining

1. Nothing tests the guard's new name matching (packages/microcosm-build/tests/engine_free/uk/test_uk_receipt_counts.py:225-234).

• Why it can regress: the guard scans only the live tree, and there every name-style floor is an upper-case constant that is already kept. So narrowing the pattern again, as 0da33d0cd did, passes CI. Making name upper-case only passes, and so does deleting the annotated-default or the quoted-key alternative.
• Fix: a parametrized self-test of the regex would pin it.
  • It should match support_floor=10, sdc_floor: Final[int] = 10, 'min_rows': 10 and MIN_CELL = 10.
  • It should not match admin_count=10, minutes=10 or {n:0>9}.
• Shapes it now misses that round 5 caught (none of them live):
  • nested or quoted annotations on constants, such as MIN_CELL: Final[Optional[int]] = 10 and 'Final[int]', though the docstring says "annotated or not";
  • glued names such as MINROWS and thresholdRows;
  • comparisons right after a colon, such as lambda r:r<10 and a[i:]<=10.
• False positive: space-fill format specs such as f"{n: >9}" are still flagged, loudly.

2. Period spellings before 2013 or after 2098 (latent; DfE's "2026-01" is unaffected).

• Untyped selectors still move "2011-12" to "2012-12" silently. When the facts are range-spelt, that re-selects FY2011-12. The same happens for "2010-11", "2005-06" and "2000-01". The root cause predates this PR: the cutoff and _period_key read range spellings up to "2011-12" as months (ledger_targets.py:5281-5282).
• Kind change: "2012-13" moved back a year becomes "2011-12", which the cutoff reads as a month.
• Over-strict: typed selectors refuse some spellings that would move correctly, such as "2010-11" +1.
• On the reply's reasoning: every committed fiscal-year fact is an opening-year integer. For those, "2011-12" (a December 2011 cutoff) selects FY2010-11, so "2012-12" is the right move. Refusing is still the safe outcome, given range-spelt facts.
• "FY26": the constructor accepts it as the year 26. So the local test's case compiles as an unsupported row at its authored period, and refuses only when restamped.
• Prefixed periods: an exact typed selector accepts a prefixed period it can never match, such as "AY2026-27" under fiscal_year, while "2026-01" is refused.
• Unnamed rows: the authoring and tool refusals still don't name the row (target_reference_authoring.py:135-156).

3. Cross-PR:

• UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426: the reply says the guard flags none of the lines UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 adds. In fact it flags more than 20 of them: spi_income.py's "<10" returns and < 10 tests, and its "fewer than ten" prose. That's by design, since the label test names UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426, but UK #1095 A/B fixes: the SPI age band (uk-data#628), households' HRAD from Table 8a receipts, and the SPI pay floor (uk-data#629) #1426 will fail both guard tests once this lands.
• SPI donor savings rebased to SPI's 2023-24 bands (savings follow-up to #1418) #1428: its head, now 9f70c71e7, conflicts with this PR at uk/calibration_measure_exclusions.json:80 (the U3 note) and in the contract digests. Resolving the U3 hunk to SPI donor savings rebased to SPI's 2023-24 bands (savings follow-up to #1418) #1428's side fails the guard, because it leaves two prose tens uncovered. So whichever PR lands second needs a hand merge there.

Checked and found true

• Restamps: identical to round 5 for every committed reference, and the constructor accepts every committed reference.
• Tests and texts: the touched tests fail under their mutations, and the parity texts are byte-identical.
• Guard: it scans the tree in under 2 s.
• Merges: the forward merge with UK: company cars from the FRS job table (dashboard #316) #1430 (40968ff53) is clean and its tests pass.
• CI on 4af602d81: every job passes.

Disclosure-control items went to the author separately.

🤖 Generated with Claude Code