[MaxGhenis]

axiom: n/a (vendors the shared register; no rule or model change)

What this changes

This PR vendors source_conflicts/known-source-conflicts.yaml at TheAxiomFoundation/rulespec-us@ad03b325. That commit merges TheAxiomFoundation/rulespec-us#1908, and it also includes TheAxiomFoundation/rulespec-us#1907. scripts/update_source_conflicts.py --commit ad03b32553749edc6e332b815487a9311ef9ed58 wrote both known-source-conflicts.yaml and pin.yaml.

• rulespec-us#1908 repins the nine implementations marked in Mark nine source conflicts now in the shared register #10441 to eeaf8096, the Mark nine source conflicts now in the shared register #10441 merge commit, and sets cites_entry: true on each. With this pin, test_registered_implementations_carry_their_marker requires those nine markers. I checked this by removing the niit_magi.py marker locally: that test failed (1 failed, 102 passed). Restoring the marker made it pass again.
• rulespec-us#1907 adds oasdi-dual-entitlement-zero-after-age-reduction and oasdi-parent-entitlement-count-interval. It also replaces the proposed record on oasdi-family-maximum-saving-clause with the shipped implementation, and adds four tests and a money case to that entry. All three entries are implemented only in PolicyEngine/microcosm-dynamics. None names a PolicyEngine-US file, and candidates.yaml lists none of them, so no marker or candidate changes here.

The register now has 22 entries (20 before). No entry was removed. No PolicyEngine-US code, parameter or test changes.

Invariants

The guard in policyengine_us/tests/code_health/test_source_conflicts.py checks each of these:

1. The vendored register's sha256 matches pin.yaml.
2. Every marker is well formed and names an entry that lists its file as a PolicyEngine-US implementation.
3. Every cites_entry: true PolicyEngine-US implementation carries its marker. This PR makes this invariant bind on nine files.
4. The guard counts conflict-sounding comments that carry no marker, and the counts must match KNOWN_UNMARKED. This PR leaves that baseline unchanged.
5. No id in candidates.yaml is also a register id.

Verification

• The full guard passed locally against this branch: 103 passed.
• The mutation check above (one marker removed) failed the guard as expected.
• The candidate PRs touch only candidates.yaml and their own changelog fragments, and this PR touches neither. Point the federal and AK-HI source-conflict candidates at their code on main #10350 and Add source-conflict candidates for SSP, Maryland CCS and NY HEAP #10444 have since merged. Point the IN-MT source-conflict candidates at their code on main #10351 and Point the NM-WY source-conflict candidates at their code on main #10352 are still open, and their merge order relative to this PR doesn't matter.
• I trial-merged main at 62454ca, which includes Point the federal and AK-HI source-conflict candidates at their code on main #10350, Support state-specific other additions and subtractions for AL, AR, IA, IN, LA, MS, PA (Phase 3) (#10197) #10354 and Add source-conflict candidates for SSP, Maryland CCS and NY HEAP #10444. The merge is clean, and the guard passes on the merged tree (103 passed). None of those PRs touches the register, the pin, the guard or the nine marked files.

Changelog

changelog.d/source-conflict-register-cites.changed.md

🤖 Generated with Claude Code

[MaxGhenis]

Hand-off to the US hub, at head 62b0b48.

• What it does: vendors the shared register at TheAxiomFoundation/rulespec-us@ad03b325, the merge commit of rulespec-us#1908, which also includes Toggling NYC breaks the app #1907. The nine PolicyEngine-US implementations marked in Mark nine source conflicts now in the shared register #10441 now carry cites_entry: true, so the guard requires those markers. Two Social Security entries implemented in microcosm-dynamics are added. No PolicyEngine-US code, parameter, test or candidate changes.
• Review: an independent review approved this head with one wording nit, now fixed in the description. It checked:
  • the vendored file is byte-identical to upstream, and the sha256 matches pin.yaml;
  • the full register diff matches the description;
  • each of the nine files is unchanged since eeaf809 and carries its one marker at the deciding line;
  • removing any of three markers makes test_registered_implementations_carry_their_marker fail;
  • none of the new entries needs a PolicyEngine-US change or candidate removal.
• Locally: the guard passed (103 tests) at this head. It also passed (103) on a trial merge with main at 62454ca, which includes Point the federal and AK-HI source-conflict candidates at their code on main #10350, Support state-specific other additions and subtractions for AL, AR, IA, IN, LA, MS, PA (Phase 3) (#10197) #10354 and Add source-conflict candidates for SSP, Maryland CCS and NY HEAP #10444. That merge is clean, so the branch stays at the reviewed head.
• CI: started when the PR was marked ready. Pending.
• Depends on: nothing open. Point the IN-MT source-conflict candidates at their code on main #10351 and Point the NM-WY source-conflict candidates at their code on main #10352 edit only candidates.yaml and their own changelog fragments, so either merge order works.
• Follow-ups owed: none from this PR.

[MaxGhenis]

US + core hub merge audit, us#10445 at 62b0b48f6c6e329773416868807b4765818be57c (squash): Vendor the source-conflict register at rulespec-us ad03b325.

• Review: GPT-6.1 Sol (gpt-6.1-sol served), APPROVE_WITH_NITS at 62b0b48 (Subfleet job 20261024-161917-pe-us-10445-r1, ~/reviews/us-hub/source-conflicts/pin-ad03b325/review-r1.md): vendored file byte-identical to rulespec-us ad03b325 (sha256 matches pin.yaml), register diff 20 to 22 entries as described, nine marked files unchanged with markers, three marker mutations caught by the guard (103 passed). Its one P3 (body wording on KNOWN_UNMARKED) was fixed in the body.
• Gates checked live at merge:
  • gh pr checks exits 0;
  • the latest Pull request run at the head concluded success;
  • MERGEABLE;
  • not a draft;
  • no reviewer's latest review requests changes;
  • the semantic-overlap guard;
  • head pinned.
• Impact: None: vendors source_conflicts/known-source-conflicts.yaml and pin.yaml and a changelog fragment; no variable, parameter or test changes, so no model output can move.
• Order: No dependencies; Point the IN-MT source-conflict candidates at their code on main #10351/Point the NM-WY source-conflict candidates at their code on main #10352 touch only candidates.yaml and their changelog fragments (owner's trial merge with main 62454ca: clean, guard 103 passed).
• Axiom: n/a (vendors the shared register; no rule or model change)