Fix Trade Caravan

[keloide]

Summary

Trade Caravan's activated ability Remove two currency counters from ~: Untap target basic land. Activate only during an opponent's upkeep. dropped its timing restriction to Effect::Unimplemented, leaving the ability activatable at any time. parse_activation_during_role_gate handled during an opponent's turn and during your upkeep but had no arm for during an opponent's upkeep. This adds that arm by composing existing building blocks rather than proliferating a new DuringOpponents* restriction sibling.

Implementation method (required)

Method: /engine-implementer (gates applied inline: add-engine-variant existence/parameterization/boundary gate + mandatory final review-impl)

CR references

• CR 503.1 — the upkeep step (new ParsedCondition::IsDuringUpkeep predicate + its evaluator arm).
• CR 102.1 — the active player is the player whose turn it is (opponent scope via Not(IsYourTurn)).
• CR 602.5b — an activated ability's use restriction persists across control changes.

All three grep-verified against docs/MagicCompRules.txt.

Design

Rather than add a DuringOpponentsUpkeep sibling to ActivationRestriction (which already expresses opponent-turn scope via RequiresCondition { Not(IsYourTurn) }, not a dedicated DuringOpponentsTurn variant), the fix composes:

• ParsedCondition::IsDuringUpkeep — a scope-free upkeep-step predicate, orthogonal to every existing ParsedCondition variant (there was no prior phase predicate).
• during an opponent's upkeep → RequiresCondition { And([Not(IsYourTurn), IsDuringUpkeep]) }, reusing the same opponent-turn composition idiom as the existing bare opponent-turn gate.

add-engine-variant gate result for ParsedCondition::IsDuringUpkeep: Stage 1 DOES_NOT_EXIST (no phase predicate in ParsedCondition), Stage 2 EXTEND_OK (orthogonal — not a sibling cluster), Stage 3 WITHIN_SECTION (CR 503, upkeep step).

Verification

• Required checks ran clean, or the exact CI-owned alternative is stated below.

• Gate A output below is for the current committed head.

• Final review-impl below is clean for the current committed head.

• Both anchors cite existing analogous code at the same seam.

• cargo fmt --all — clean.

• cargo clippy -p engine --all-targets -- -D warnings — clean, 0 warnings (full compile; confirms every exhaustive ParsedCondition match is satisfied).

• cargo test -p engine --lib — ok. 17440 passed; 0 failed; 6 ignored.

• cargo test -p engine --test integration — ok. 3676 passed; 0 failed; 2 ignored.

• New tests: activated_ability_opponents_upkeep_restriction_composes_scope_and_step (parser building block, drives production parse(), asserts composed restriction + zero Effect::Unimplemented) and opponents_upkeep_activation_condition_gates_on_step_and_scope (runtime, drives real evaluate_condition across the full turn-scope × step matrix) — both pass.

• cargo coverage / cargo semantic-audit — deferred to CI: both require a full MTGJSON card-data.json export (156 MB+ multi-request per-set fetch) that isn't feasible in this environment (only a test fixture is present locally). Direct evidence instead: the parsed AST for Trade Caravan now contains zero Effect::Unimplemented and the correct RequiresCondition { And([Not(IsYourTurn), IsDuringUpkeep]) } restriction. Since card_face_has_unimplemented_parts (game/coverage.rs) derives supported precisely from the absence of Unimplemented parts, Trade Caravan is now supported: true, gap_count: 0.

Gate A

Gate A PASS head=c5024c97678be3ffdcbac252e235cd8ed145fdab base=ee061e5c7485619644dc6089976b94a1d29a0202

Anchored on

• crates/engine/src/parser/oracle.rs:6792 — value(opponents_turn_activation_restriction(), alt((tag("during an opponent's turn"), tag("during an opponents turn")))): the same value(computed_restriction, alt((tag, tag))) during-role arm the new opponent's-upkeep arm mirrors (combinator family, naming, placement).
• crates/engine/src/parser/oracle.rs:6803 — value(ActivationRestriction::DuringYourUpkeep, alt((tag("during your upkeep"), tag("during their upkeep")))): the sibling upkeep-step during-role arm, immediately adjacent, establishing the apostrophe/possessive variant pattern reused verbatim.
• (supporting) crates/engine/src/game/restrictions.rs:1520 ParsedCondition::IsYourTurn => state.active_player == player and restrictions.rs:1066 CastingRestriction::DuringOpponentsUpkeep => state.active_player != player && state.phase == Phase::Upkeep — the evaluator arms the new IsDuringUpkeep => state.phase == Phase::Upkeep arm mirrors.

Final review-impl

Final review-impl PASS head=c5024c97678be3ffdcbac252e235cd8ed145fdab

Claimed parse impact

• Trade Caravan (removed from docs/parser-misparse-backlog.md root cause 28)

🤖 Generated with Claude Code

---

Generated by Claude Code

[github-actions]

Parse changes introduced by this PR · 52 card(s), 40 signature(s) (baseline: main 945a92733f5d)

🟢 Added (2 signatures)

• 2 cards · ➕ replacement/Moved · added: Moved (scope=self, to zone=battlefield)
  • Affected (first 3): Apocalypse Hydra, Bringer of Green Zenith's Twilight
• 2 cards · ➕ ability/replacement_structure · added: replacement_structure
  • Affected (first 3): Henge Walker, Red and Black Legac

🔴 Removed (2 signatures)

• 4 cards · ➖ replacement/Moved · removed: Moved (scope=self, to zone=battlefield)
  • Affected (first 3): Apocalypse Hydra, Bringer of Green Zenith's Twilight, Henge Walker (+1 more)
• 1 card · ➖ ability/ChangeZone · removed: ChangeZone (target=self, to=battlefield)
  • Affected (first 3): Plague Reaver

🟡 Modified fields (21 signatures)

• 5 cards · 🔄 ability/Sacrifice · changed field target: parent target → self
  • Affected (first 3): Contested Game Ball, Daredevil Dragster, Dawn of a New Age (+2 more)
• 5 cards · 🔄 ability/Sacrifice · changed field target: triggering source → self
  • Affected (first 3): Blood Spatter Analysis, Charitable Levy, Decree of Silence (+2 more)
• 4 cards · 🔄 ability/RemoveCounter · changed field target: parent target → self
  • Affected (first 3): Heirloom Mirror, Ludevic's Test Subject, Replicating Ring (+1 more)
• 2 cards · 🔄 ability/ChangeZone · changed field enters_under: ∅ → ScopedPlayer
  • Affected (first 3): Gerrymandering, Thieves' Auction
• 2 cards · 🔄 ability/DealDamage · changed field target: opponent → opponent or opponent controls creature or opponent controls planeswalker
  • Affected (first 3): All Will Be One, Nicol Bolas, God-Pharaoh
• 2 cards · 🔄 ability/Transform · changed field target: self → parent target
  • Affected (first 3): Grasping Shadows, Soulcipher Board
• 1 card · 🔄 ability/Bounce · changed field conditional: instead if (3+ Green spent) → instead if (mana spent to cast (SelfObject, Green mana) ≥ 3)
  • Affected (first 3): Once and Future
• 1 card · 🔄 ability/ChangeZone · changed field enters_under: ∅ → ParentTargetOwner
  • Affected (first 3): Jailbreak
• 1 card · 🔄 ability/DamageAll · changed field conditional: instead if (7+ Red spent) → instead if (mana spent to cast (SelfObject, Red mana) ≥ 7)
  • Affected (first 3): Sundering Stroke
• 1 card · 🔄 ability/DealDamage · changed field conditional: 3+ Red spent → mana spent to cast (SelfObject, Red mana) ≥ 3
  • Affected (first 3): Searing Barrage
• 1 card · 🔄 ability/DealDamage · changed field conditional: instead if (3+ Red spent) → instead if (mana spent to cast (SelfObject, Red mana) ≥ 3)
  • Affected (first 3): Slaying Fire
• 1 card · 🔄 ability/DealDamage · changed field target: opponent → opponent or battle or planeswalker
  • Affected (first 3): Jeska and Kamahl
• 1 card · 🔄 ability/Draw · changed field conditional: P1P1 counters on self ≥ 1 → P1P1 counters on recipient ≥ 1
  • Affected (first 3): Dual-Sun Technique
• 1 card · 🔄 ability/GainLife · changed field conditional: 3+ White spent → mana spent to cast (SelfObject, White mana) ≥ 3
  • Affected (first 3): Rally for the Throne
• 1 card · 🔄 ability/Mill · changed field conditional: 3+ Black spent → mana spent to cast (SelfObject, Black mana) ≥ 3
  • Affected (first 3): Cauldron's Gift
• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ManaSpentToCast { scope: SelfObject, metric: OfColor { color: Black } } }, comparator:…
  • Affected (first 3): Locthwain Paladin
• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ManaSpentToCast { scope: SelfObject, metric: OfColor { color: Blue } } }, comparator: …
  • Affected (first 3): Vantress Paladin
• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ManaSpentToCast { scope: SelfObject, metric: OfColor { color: Green } } }, comparator:…
  • Affected (first 3): Garenbrig Paladin
• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ManaSpentToCast { scope: SelfObject, metric: OfColor { color: Red } } }, comparator: G…
  • Affected (first 3): Embereth Paladin
• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ManaSpentToCast { scope: SelfObject, metric: OfColor { color: White } } }, comparator:…
  • Affected (first 3): Ardenvale Paladin
• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ObjectCount { filter: Typed(TypedFilter { type_filters: [Land], controller: Some(You),…
  • Affected (first 3): Dust Animus

… 15 more signature(s) (15 card-changes) — showing first 15; see parse-diff.json

🟢 Added (3 signatures)

• 1 card · ➕ ability/change_zone_enters_under_anaphor · added: change_zone_enters_under_anaphor
• 1 card · ➕ ability/change_zone_enters_under_anaphor · added: change_zone_enters_under_anaphor (kind=activated)
• 1 card · ➕ ability/change_zone_enters_under_anaphor · added: change_zone_enters_under_anaphor (targets=0+)

🔴 Removed (3 signatures)

• 1 card · ➖ ability/SearchLibrary · removed: SearchLibrary (find=basic land, targets=0+)
• 1 card · ➖ ability/TargetOnly · removed: TargetOnly (kind=activated, target=opponent)
• 1 card · ➖ ability/activate · removed: activate

🟡 Modified fields (9 signatures)

• 1 card · 🔄 replacement/Moved · changed field condition: ∅ → OnlyIfQuantity { lhs: Ref { qty: ZoneCardCount { zone: Graveyard, card_types: [Instant, Sorcery], filter: None, scope: …
• 1 card · 🔄 trigger/Phase · changed field condition: not (during you's turn) → during each opponent's turn
• 1 card · 🔄 ability/PreventDamage · changed field target: player → player or planeswalker or creature Sliver
• 1 card · 🔄 ability/PutCounter · changed field target: triggering source → self
• 1 card · 🔄 ability/Scry · changed field conditional: 3+ Blue spent → mana spent to cast (SelfObject, Blue mana) ≥ 3
• 1 card · 🔄 ability/Token · changed field conditional: 3+ Black spent → mana spent to cast (SelfObject, Black mana) ≥ 3
• 1 card · 🔄 ability/Token · changed field conditional: 3+ Blue spent → mana spent to cast (SelfObject, Blue mana) ≥ 3
• 1 card · 🔄 ability/grant Vigilance · changed field conditional: 3+ White spent → ∅
• 1 card · 🔄 ability/the · changed field conditional: 3+ Green spent → mana spent to cast (SelfObject, Green mana) ≥ 3

8 card(s) had Oracle-text changes (errata/reprint) — excluded as non-parser.
New cards in head: 26.