test(engine): pin the mana-spend commander resolution and Gilanra's spend-filter article (CR 903.3 + CR 106.6) - #5729
Conversation
…pend-filter article (CR 903.3 + CR 106.6) Ports the three regression pins from the parallel #77 checkpoint work (commit 3126701d4a) onto the shipped implementation: - path_of_ancestry_fires_for_a_deck_pool_registered_commander: the filter authority must see a commander known ONLY as a deck-pool registration (no command-zone object materialized). CR 106.6 + CR 903.3. - path_of_ancestry_fires_for_a_commander_an_opponent_controls: CR 903.3 makes the commander designation an attribute of the card retained across zones — owner/registration-scoped, so a STOLEN commander still fires its owner's Path of Ancestry. A controller-keyed scan silently breaks this. - gilanra_mana_value_spend_trigger_survives_the_retype: the spend filter's leading article ('a spell with mana value 6 or greater') must parse; the shared grammar is written for the article-less next-spell phrasing and a bare 'a' would reject the clause, silently gapping a supported card. CR 106.6 + CR 202.3. Both commander witnesses were watched RED under a controller-keyed naive port during the checkpoint work; they pin the deck-pool-first resolution the shipped FilterProp::SharesCreatureTypeWithCommander arm uses. The spend filter is derived from the PARSER inside the test, so the witnesses cannot drift from what the card actually lowers to.
There was a problem hiding this comment.
Code Review
This pull request adds a regression test to ensure that Gilanra's mana-value spend filter is correctly parsed and does not regress. The feedback recommends strengthening the test assertion by replacing a weak string-based check on the debug representation with a robust structural match on the parsed filter properties to verify the comparator and value.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| assert!( | ||
| format!("{filter:?}").contains("Cmc"), | ||
| "the mana-value threshold must survive as a Cmc predicate: {filter:?}" | ||
| ); |
There was a problem hiding this comment.
This assertion is a bit weak for a regression pin. It only checks that the debug representation of the filter contains "Cmc", but doesn't validate the comparator (>=) or the value (6).
To make this test more robust and align with L3. Test adequacy from the style guide, it would be better to use a structural match on the FilterProp::Cmc to ensure the correct values are parsed.
let TargetFilter::Typed(typed_filter) = filter else {
panic!("expected a Typed filter for the mana-spend trigger, got {filter:?}");
};
assert!(
typed_filter.properties.iter().any(|p| matches!(p, FilterProp::Cmc { comparator: Comparator::GE, value: QuantityExpr::Fixed { value: 6 } })),
"the mana-value threshold must survive as a Cmc(GE, 6) predicate: {filter:?}"
);
Parse changes introduced by this PR✓ No card-parse changes detected. |
… parity rows it exposes (CR 603.3b + CR 603.4) (phase-rs#5732) `integration_cards.json` is a cached subset of the card-data export, but it was last FULLY regenerated at b9685cc (phase-rs#5695). Nineteen parser/types PRs merged since then; every fixture touch in between was surgical (phase-rs#5672 +1, phase-rs#5679 +2, phase-rs#5727 2 entries), so the parse values silently drifted. Regenerated from the export at 8c35dc5 (oracle-gen, MTGJSON 5.3.0+20260629). Population (json deep-equality, not line counts — the file is one line): committed 2658 entries -> 2726. 70 added, 2 removed, 44 changed values. Attribution of the 44 changed (causal: exports built at phase-rs#5720 / phase-rs#5717 / phase-rs#5730 and compared, NOT shape-guessing): phase-rs#5723 (P02-U3b shared condition grammar) ...... 3 archive trap, temple of civilization, thaumaton torpedo (all gained the comparator/lhs/rhs/qty/scope condition shape) phase-rs#5721 + phase-rs#5719 (where-X quantity channel + ..... 21 restriction grammar; both merged BEFORE phase-rs#5717 — merge order != PR-number order) bellowsbreath ogre, cryptex, deadly rollick, deflecting swat, desert, dread wanderer, esquire of the king, flesh, fraying sanity, gloomlake verge, great desert hellion, gutterbones, officious interrogation, once upon a time, potioner's trove, ribald shanty, rock jockey, second little pig, shifting woodland, snuff out, starport security phase-rs#5695..phase-rs#5720 no-regen window (bloc) ........... 20 Stale already at phase-rs#5720, so attributable to the 19-PR window above the b9685cc anchor, not to any single PR: alrund god of the cosmos, animal friend, approach of the second sun, cavernous maw, fblthp the lost, from father to son, hour of revelation, increasing vengeance, jodah the unifier, mana reflection, misty salon, puca's eye, ram through, reidane god of the worthy, secrets of the key, sevinne's reclamation, temple of the dead, the dining car, unleash the flux, valgavoth terror eater The 70 added keys are new test-source card references the generator collects; phase-rs#5729 (tests-only) contributed zero parse delta, as expected. Corrected premise: 44 entries are truly stale, not 7. Six of the seven originally reported reproduce; `osteomancer adept` is NOT stale (committed == fresh). The regen turns `ordering_parity_sweep` red, so the gate's evidence rows ship ATOMICALLY with it. Both rows are population entries, not ordering regressions: the sweep skips Unimplemented-bearing triggers, so a card only enters it once its parse binds. great desert hellion -> BATCH_GENUINE_ROWS. Its LTB Draw was Unimplemented until phase-rs#5721/phase-rs#5719 bound Intensity{Source}. Each co-departing Hellion draws off its OWN intensity but discards the SHARED hand, so the second trigger discards the cards the first just drew: with intensities a != b the final hand, graveyard and library differ by order. The members are not identical functions, so commutation genuinely fails and the new prompt is the CR 603.3b choice the legacy serde walk wrongly auto-ordered (CR 603.5: each "may" is chosen on resolution). planar collapse -> DOCUMENTED_OVER_PROMPT (L8-held family). New fixture key. Upkeep ObjectCount(Creature) >= 4 intervening-if x DestroyAll + self-Sacrifice: the first copy's sweep drives the census to 0, so the sibling's CR 603.4 re-check is false and it does nothing. Monotone and self-limiting — identical siblings commute up to relabeling, so the prompt is conservative, fail-closed and rules-correct. Neither row weakens the gate: both are direction-gated over-prompts (an under-prompt is never suppressible), and both are consumed by the ledger's exact-set asserts (over_prompt_hit 18->19, batch_genuine_hit 1->2), so a misclassification still trips the STRICT PROOF-GATE. Verification: engine lib 16481/16481 pass (was 16480 + 1 red); integration 2929/2929 pass. Co-authored-by: matthewevans <matthewevans@users.noreply.github.com>
Ports the three regression pins from the parallel #77 checkpoint work
(commit 3126701d4a) onto the shipped implementation:
authority must see a commander known ONLY as a deck-pool registration
(no command-zone object materialized). CR 106.6 + CR 903.3.
makes the commander designation an attribute of the card retained across
zones — owner/registration-scoped, so a STOLEN commander still fires its
owner's Path of Ancestry. A controller-keyed scan silently breaks this.
leading article ('a spell with mana value 6 or greater') must parse; the
shared grammar is written for the article-less next-spell phrasing and a
bare 'a' would reject the clause, silently gapping a supported card.
CR 106.6 + CR 202.3.
Both commander witnesses were watched RED under a controller-keyed naive
port during the checkpoint work; they pin the deck-pool-first resolution
the shipped FilterProp::SharesCreatureTypeWithCommander arm uses. The
spend filter is derived from the PARSER inside the test, so the witnesses
cannot drift from what the card actually lowers to.