feat(changeset): shared batch→changes resolver in core#216
Merged
Conversation
## Summary ### Why? Extension input granularity is inconsistent across the orchestrator pipeline: `conflict.Analyzer` takes orchestrator identity (`entity.Batch`), while `scorer` / `mergechecker` / `changeprovider` / `buildrunner` / `pusher` take controller-resolved `entity.Change`. The split caps what an extension can do — a real `target_overlap` conflict analyzer and a diff-aware heuristic scorer both cannot be written today, because the data they need is neither in the contract nor resolvable by the extension. ### What? Adds `doc/rfc/submitqueue/extension-contract.md` proposing that decision/action extensions accept thin reference entities at their pipeline-stage granularity (`entity.Request` for request-stage, `entity.Batch` / `[]entity.Batch` for batch-stage) and resolve granular content themselves via narrowly-injected `Factory` dependencies, while `storage` / `changestore` / `queueconfig` stay key/value resolution targets. `conflict.Analyzer` is the baseline. The RFC revises the BuildRunner base/head contract (`build-runner.md`) to pass batches rather than change lists. Also encodes the rule in `CLAUDE.md` so new extensions and signature changes follow it, and links the RFC from the RFC index. Documentation only — no code changes.
Add an "Output" column to the verdict table and a principle stating that an output element self-identifies with its input unit (ChangeInfo by URI, Conflict by BatchID); a wrapper entity is added only to aggregate up to a coarser unit. Five of six return contracts are unchanged. pusher is the exception: its input becomes a list of batches, so its result regroups per batch (BatchID-tagged, per-change commit detail underneath). Atomicity stays all-or-nothing, so a per-batch status is intentionally omitted. Also note entity.BatchChanges is kept as the shared resolver's detailed output rather than a controller-assembled value.
Add submitqueue/core/changeset, the single place the orchestrator resolves batch identity into the changes a batch contains — consolidating the batch -> requests -> changes walk that the build, merge, and score controllers each performed privately. Resolver exposes two single-batch fidelities, both keyed per batch so callers with several batches loop and keep the per-batch boundary: ChangesForBatch returns raw changes (URIs only, no change-store read) for the build and merge stages, and DetailedForBatch returns one ChangeInfo per claimed URI with provider details read from the change store, for the score stage and detail-aware analyzers. Ships with a store-backed implementation (depending only on the request and change stores), a programmable in-memory fake, a generated mock, and tests. The package is added unused; extensions adopt it in later branches. entity.BatchChanges is repurposed as DetailedForBatch's output (doc comment only). The mocks make-target gains the new package.
This was referenced Jun 8, 2026
albertywu
approved these changes
Jun 8, 2026
JamyDev
approved these changes
Jun 9, 2026
behinddwalls
added a commit
that referenced
this pull request
Jun 9, 2026
## Summary ### Why? Extension input granularity is inconsistent across the orchestrator pipeline: `conflict.Analyzer` takes orchestrator identity (`entity.Batch`), while `scorer` / `mergechecker` / `changeprovider` / `buildrunner` / `pusher` take controller-resolved `entity.Change`. The split caps what an extension can do — a real `target_overlap` conflict analyzer and a diff-aware heuristic scorer both cannot be written today, because the data they need is neither in the contract nor resolvable by the extension. ### What? Adds `doc/rfc/submitqueue/extension-contract.md` proposing that decision/action extensions accept thin reference entities at their pipeline-stage granularity (`entity.Request` for request-stage, `entity.Batch` / `[]entity.Batch` for batch-stage) and resolve granular content themselves via narrowly-injected `Factory` dependencies, while `storage` / `changestore` / `queueconfig` stay key/value resolution targets. `conflict.Analyzer` is the baseline. The RFC revises the BuildRunner base/head contract (`build-runner.md`) to pass batches rather than change lists. Also encodes the rule in `CLAUDE.md` so new extensions and signature changes follow it, and links the RFC from the RFC index. Documentation only — no code changes. ## Test Plan ## Issues ## Stack 1. @ #214 1. #216 1. #217 1. #218 1. #219 1. #221 1. #222 1. #223 1. #227
Base automatically changed from
preetam/rethink-extension-entity-contracts
to
main
June 9, 2026 22:40
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Add submitqueue/core/changeset, the single place the orchestrator resolves batch identity into the changes a batch contains — consolidating the batch -> requests -> changes walk that the build, merge, and score controllers each performed privately.
Resolver exposes two single-batch fidelities, both keyed per batch so callers with several batches loop and keep the per-batch boundary: ChangesForBatch returns raw changes (URIs only, no change-store read) for the build and merge stages, and DetailedForBatch returns one ChangeInfo per claimed URI with provider details read from the change store, for the score stage and detail-aware analyzers.
Ships with a store-backed implementation (depending only on the request and change stores), a programmable in-memory fake, a generated mock, and tests. The package is added unused; extensions adopt it in later branches. entity.BatchChanges is repurposed as DetailedForBatch's output (doc comment only). The mocks make-target gains the new package.
Test Plan
Issues
Stack