[issue-3393][slice-1/6] Repo dimension in the persisted contract...

[james-in-a-box]

Add the load-bearing repo dimension across the two model layers, aligned to the ratified architect design. shared/egg_contracts/models.py (contract layer): add Slice.repo: str | None = None (owner/name; None ⇒ resolved to primary at runtime, NOT in the model) and bump Contract.schemaVersion 1.3→1.4 as a PURE ADDITIVE after-stamp _migrate_schema_version_to_1_4 mirroring _migrate_schema_version_to_1_3 verbatim (guard schemaVersion=="1.3"; idempotent; NO field mutation — Slice.repo stays None on legacy load). The Contract model carries NO repo field and cannot see the pipeline, so absent⇒primary CANNOT be a model migration. orchestrator/models.py (orchestrator layer): add RepoSpec{repo, base_branch} and Pipeline.repos: list[RepoSpec] with a model validator that synthesizes repos=[RepoSpec(repo, base_branch)] from the legacy singleton when absent (and mirrors repos[0] back onto repo/base_branch for legacy readers), a primary_repo property, and a RUNTIME resolver resolve_slice_repo(slice, pipeline) -> slice.repo or pipeline.primary_repo. N=1 pipelines round-trip / behave identically. Chain root: nothing writes Slice.repo until it lands.

Base PR: #3418

What's in this PR

Commits (5):

• Persist BRC history for slice-1 (Slice PRs are missing analysis/plan docs and all BRC history; need a 'context' PR for refine+plan phases plus per-slice BRC in each slice PR #2548)
• Slice-1 (Feature: multi-repo pipelines — coordinated PRs across repositories in one pipeline #3393): mirror schemaVersion 1.4 default into contract.schema.json
• test(Feature: multi-repo pipelines — coordinated PRs across repositories in one pipeline #3393): realign stale schemaVersion pins to 1.4 (slice-1, task-1-3)
• test(Feature: multi-repo pipelines — coordinated PRs across repositories in one pipeline #3393): slice-1 repo-dimension tests (task-1-3)
• Slice-1 (Feature: multi-repo pipelines — coordinated PRs across repositories in one pipeline #3393): repo dimension in contract & pipeline schema

.egg-state/brc-history/3393-implement-slice-1.json | 5250 ++++++++++++++++++++++++++++++++++++++++
 .egg-state/brc-history/3393-implement-slice-1.md   | 5081 ++++++++++++++++++++++++++++++++++++++
 .egg/schemas/contract.schema.json                  |    2 +-
 orchestrator/models.py                             |  119 +-
 orchestrator/tests/test_models.py                  |  155 ++
 shared/egg_contracts/models.py                     |   62 +-
 shared/egg_contracts/tests/test_models.py          |  238 ++
 tests/shared/egg_contracts/test_models.py          |    9 +-
 tests/shared/egg_contracts/test_pr_metadata.py     |   89 +-
 9 files changed, 10960 insertions(+), 45 deletions(-)

This slice

Repo dimension in the persisted contract & pipeline schema (migration)

Files affected:

• shared/egg_contracts/models.py
• orchestrator/models.py
• shared/egg_contracts/tests/test_models.py
• orchestrator/tests/test_models.py

Tasks (3) + acceptance criteria

• task-1-1: In shared/egg_contracts/models.py (CONTRACT layer only): (a) add repo: str | None = None to the Slice model, owner/name-shaped, documented as "exactly one repo per slice; None ⇒ resolved to the pipeline's primary repo at RUNTIME (see resolve_slice_repo), NOT filled by the model." (b) Bump Contract.schemaVersion "1.3"→"1.4" by adding _migrate_schema_version_to_1_4 as a PURE ADDITIVE after-stamp that mirrors _migrate_schema_version_to_1_3 (models.py:1049-1069) VERBATIM: guard if self.schemaVersion == "1.3": self.schemaVersion = "1.4", idempotent, NO field mutation — Slice.repo stays None on a legacy load. Update the schemaVersion field docstring (:844-862) to note the new additive stamp. CRITICAL (per risk_analyst R1 / architect aeb3528): the Contract model has NO repo field and cannot see the orchestrator Pipeline, so the validator MUST NOT try to populate Slice.repo and MUST NOT reference any pipeline repo. The absent⇒primary default and the pipeline repo LIST are BOTH orchestrator concerns (TASK-1-2), NOT the contract. Do NOT persist a repo list onto the Contract — the repo list lives only on the orchestrator Pipeline. Preserve every existing field and migration branch byte-for-byte.
  • Acceptance criteria: - Slice.repo exists (str | None, default None), documented as "None ⇒ primary repo resolved at runtime, not by the model". - Contract.schemaVersion is "1.4"; _migrate_schema_version_to_1_4 is a pure additive stamp mirroring the 1.3 precedent (guarded on "1.3", idempotent, no field mutation); Slice.repo stays None when a 1.3 contract is loaded. - The contract migration does NOT populate Slice.repo and does NOT reference any pipeline/primary repo; no repo LIST is added to the Contract. - The four existing migration branches are untouched; N=1 contracts serialize/deserialize with no observable change.
• task-1-2: In orchestrator/models.py (ORCHESTRATOR layer): (a) add a RepoSpec model carrying repo: str (owner/name) and base_branch: str | None. (b) add Pipeline.repos: list[RepoSpec] (default_factory=list) and a model validator that, when repos is absent but the legacy singleton Pipeline.repo (models.py:1131) is set, SYNTHESIZES repos=[RepoSpec(repo=repo, base_branch=base_branch)] (back-compat), and mirrors repos[0] back onto the legacy repo/base_branch scalars so legacy readers keep working until slice 3 rewires them. (c) add a primary_repo property returning repos[0].repo — the INTENTIONAL primary accessor for naming/defaulting, explicitly NOT one of the three repos[0] collapse sites removed in slice 3 (those collapse the agent-facing repo set to a single repo; this exposes a named primary while keeping the full list available). (d) add the RUNTIME resolver resolve_slice_repo(slice, pipeline) -> slice.repo if slice.repo else pipeline.primary_repo — this is where absent-Slice.repo⇒primary lives (it takes the pipeline as a second input, which the contract model cannot). Nothing may assume len(repos) ∈ {1, 2}.
  • Acceptance criteria: - RepoSpec{repo, base_branch} and Pipeline.repos: list[RepoSpec] exist; the validator synthesizes repos from a legacy singleton and mirrors repos[0] back onto repo/base_branch. - primary_repo returns repos[0].repo; no two-repo or primary+secondary shape is baked in; nothing assumes len(repos)∈{1,2}. - resolve_slice_repo(slice, pipeline) returns slice.repo when set else pipeline.primary_repo — the absent⇒primary default lives HERE, not in the contract migration. - No behavioral change for N=1 pipelines; the three collapse sites are untouched (removed in slice 3).
• task-1-3: Add tests covering the two-layer slice-1 design. In shared/egg_contracts/tests/test_models.py (CONTRACT layer): (a) a fresh 1.4 contract accepts and round-trips Slice.repo; (b) loading a persisted 1.3 contract leaves each slice's repo as None and bumps schemaVersion to "1.4" (pure additive stamp — assert NO repo is filled by the model); (c) the 1.4 stamp is idempotent and the four pre-existing migration branches still fire for their versions (no regression). In orchestrator/tests (ORCHESTRATOR layer — nearest existing pipeline-model test module): (d) resolve_slice_repo(slice, pipeline) returns slice.repo when set and pipeline.primary_repo when slice.repo is None; (e) a legacy singleton Pipeline.repo synthesizes a one-element repos list and mirrors back onto repo/base_branch; (f) primary_repo == repos[0].repo; (g) N=1 behavior is identical.
  • Acceptance criteria: - Contract-layer tests assert the additive 1.3→1.4 stamp with Slice.repo staying None on legacy load (no model-filled repo), idempotency, and the four prior branches intact. - Orchestrator-layer tests assert resolve_slice_repo (set⇒slice.repo, None⇒primary), legacy singleton⇒one-element repos + mirror-back, and primary_repo==repos[0].repo. - N=1 back-compat asserted at both layers. - make test (narrowed) and make test-all green.

Stack

• Position: slice 1 of 6 in pipeline issue-3393
• Base PR: Multi-repo pipelines: coordinated PRs across repositories (#3393) #3418
• Stacked on top of egg/issue-3393/work

[james-in-a-box]

Contract Verification — PR #3422 (issue-3393, slice-1/6)

Verdict: Approve (post-merge verification record — this PR is already merged into main).

Verified the two-layer repo-dimension implementation against the slice-1 contract tasks. All three tasks and every acceptance criterion are objectively satisfied.

task-1-1 — Contract layer (shared/egg_contracts/models.py) ✅

• Slice.repo: str | None = Field(default=None, …) added, owner/name-shaped, documented exactly as "None ⇒ resolved to the pipeline's primary repo at RUNTIME (see resolve_slice_repo), NOT filled in by the model." (models.py:438)
• Contract.schemaVersion default bumped 1.3→1.4; _migrate_schema_version_to_1_4 is a pure additive after-stamp mirroring _migrate_schema_version_to_1_3 verbatim — mode="after", guarded on if self.schemaVersion == "1.3", idempotent, no field mutation. schemaVersion field docstring updated to note the new stamp.
• The migration does not populate Slice.repo and does not reference any pipeline/primary repo; no repo list is added to Contract. Confirmed by test_1_3_load_leaves_every_slice_repo_none.
• Four pre-existing migration branches untouched. TestPriorMigrationBranchesStillFire + TestFullMigrationChainComposes green.

task-1-2 — Orchestrator layer (orchestrator/models.py) ✅

• RepoSpec{repo, base_branch} added; Pipeline.repos: list[RepoSpec] with default_factory=list.
• _sync_repos_and_legacy_singleton (mode="after") synthesizes repos=[RepoSpec(repo, base_branch)] from the legacy singleton when absent, and mirrors repos[0] back onto repo/base_branch. Repo-less (local-mode) pipelines left untouched.
• primary_repo property returns repos[0].repo (with a self.repo belt-and-braces fallback). No primary+secondary shape baked in; nothing assumes len(repos) ∈ {1, 2} — test_arbitrary_repo_count_supported confirms.
• resolve_slice_repo(slice, pipeline) returns slice.repo if slice.repo else pipeline.primary_repo — the absent⇒primary default lives here, not in the contract migration.
• N=1 behavior unchanged; the three repos[0] collapse sites are correctly deferred to slice 3 (not in this diff).

task-1-3 — Tests (both layers) ✅

• New shared/egg_contracts/tests/test_models.py (23 tests): Slice.repo round-trip, additive 1.3→1.4 stamp leaving repo None, idempotency + version-exact guarding (no future-version downgrade), all four prior branches firing.
• orchestrator/tests/test_models.py extended: RepoSpec, synth-from-singleton + mirror-back (idempotent), arbitrary repo count, primary_repo == repos[0].repo, resolve_slice_repo set/None, N=1 back-compat.
• gap-1 (schema/model lockstep) resolved in commit 797a590: .egg/schemas/contract.schema.json schemaVersion.default bumped 1.3→1.4; the lockstep guard test_schema_default_schemaversion_tracks_model passes.

Test execution (targeted, per review policy — full make test left to CI)

• shared/egg_contracts/tests/test_models.py: 23 passed
• orchestrator/tests/test_models.py: 124 passed
• tests/shared/egg_contracts/test_models.py + test_pr_metadata.py (stale-pin realignment): 113 passed
• schema/model lockstep guard: passed

Notes for human reviewer

• The contract's top-level acceptance_criteria list is empty and per-task criteria are free-text (no ac-N IDs), so there are no criterion IDs to mark via verify-criterion; the orchestrator endpoint was also unreachable during this run. Verification was performed directly against the diff and by running the targeted suites.
• The two large .egg-state/brc-history/3393-implement-slice-1.{json,md} files are pipeline-state persistence (commit "Persist BRC history for slice-1 (#2548)"), not orphaned product code — expected machinery, not a contract violation.

No contract violations found. Implementation matches the ratified two-layer design (risk_analyst R1 / architect aeb3528).

— Authored by egg

[james-in-a-box]

egg contract-verification completed. View run logs