refactor(entity): relocate analyzer/checker/pusher result types to entity#227
Open
behinddwalls wants to merge 6 commits into
Open
refactor(entity): relocate analyzer/checker/pusher result types to entity#227behinddwalls wants to merge 6 commits into
behinddwalls wants to merge 6 commits into
Conversation
This was referenced 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
behinddwalls
added a commit
that referenced
this pull request
Jun 9, 2026
## 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 1. #214 1. @ #216 1. #217 1. #218 1. #219 1. #221 1. #222 1. #223 1. #227
behinddwalls
force-pushed
the
preetam/ext/result-entities
branch
from
61b2b1e to
4d6c3eb
Compare
behinddwalls
force-pushed
the
preetam/ext/conflict-target-overlap
branch
from
78c9f9e to
5b18e1b
Compare
behinddwalls
added a commit
that referenced
this pull request
Jun 9, 2026
…lly (#217) ## Summary Change MergeChecker.Check to take the orchestrator's request identity (entity.Request) instead of a controller-pre-resolved entity.Change, per the extension contract. The GitHub implementation and the fake read request.Change themselves; the validate controller hands over the request it already loaded. Output is unchanged (mergechecker.Result). The factory and Config are unchanged — no dependency injection is needed since the checker resolves nothing beyond the change already on the request. ## Test Plan ## Issues ## Stack 1. @ #217 1. #218 1. #219 1. #221 1. #222 1. #223 1. #227
behinddwalls
added a commit
that referenced
this pull request
Jun 10, 2026
…nally (#218) ## Summary Change ChangeProvider.Get to take the orchestrator's request identity (entity.Request) instead of a controller-pre-resolved entity.Change, per the extension contract. The GitHub implementation and the fake read request.Change themselves; the validate controller hands over the request it already loaded. Output is unchanged: one entity.ChangeInfo per URI, each self-identifying by URI. The provider is the external resolver, so it needs no injected dependency — the factory and Config are unchanged. ## Test Plan ## Issues ## Stack 1. #217 1. @ #218 1. #219 1. #221 1. #222 1. #223 1. #227
behinddwalls
added a commit
that referenced
this pull request
Jun 10, 2026
## Summary Change Scorer.Score to take the batch identity (entity.Batch) instead of a controller-pre-resolved entity.BatchChanges, per the extension contract. The score controller drops its private collectBatchChanges walk and just hands the batch to the scorer. The heuristic scorer and the fake gain an injected changeset.Resolver and call DetailedForBatch to resolve the batch's changes themselves; the composite scorer delegates the batch to its children unchanged. The wiring constructs one resolver from the request and change stores and injects it into every scorer it builds. Output is unchanged (a single float64 score per batch). The scorer factory and Config are unchanged — the resolver is injected at construction. ## Test Plan ## Issues ## Stack 1. #217 1. #218 1. @ #219 1. #221 1. #222 1. #223 1. #227
Change BuildRunner.Trigger to take batch identity — base []entity.Batch (the dependency batches) and head entity.Batch (the batch under test) — instead of controller-pre-resolved base/head []entity.Change, per the extension contract. Each implementation (buildkite, githubactions, fake) gains an injected changeset.Resolver and resolves the base and head batches' changes itself; the build controller drops its private collectChanges walk and loads the dependency batches as identity. Status, Cancel, and the build id/status outputs are unchanged. The wiring injects the resolver into the fake build runner; the buildkite/githubactions Params gain a Resolver field. Revises build-runner.md, which had deliberately kept batches out of the boundary — the base/head split survives, expressed as batch identity.
Change Pusher.Push to take ordered []entity.Batch instead of controller-pre-resolved []entity.Change, per the extension contract. The git pusher and the fake gain an injected changeset.Resolver and resolve each batch's changes themselves; the merge controller drops its private collectChanges walk and passes the single batch (the list designs for a future merge-train).
This is the one extension whose output shape also changes: Result now groups outcomes per batch — Result{Batches []BatchOutcome}, where BatchOutcome{BatchID, Outcomes []ChangeOutcome} — so each landed batch stays correlatable, the way conflict.Conflict carries its BatchID. ChangeOutcome (per-change commit detail) is unchanged. No per-batch status: push atomicity stays all-or-nothing across the whole call.
Add submitqueue/extension/conflict/fileoverlap, a conflict.Analyzer that flags two batches as conflicting when they change a common file. It is the first analyzer to use the capability the extension contract unblocks: it takes only batch identity and resolves each batch's changed files itself through an injected changeset.Resolver, derived from each change's provider details. A shared file is the concrete notion of target overlap, so it reports the existing conflict.ConflictTypeTargetOverlap — the type the contract named but for which no implementation could be written against an identity-only batch. No change to the conflict.Analyzer interface. The example wires a file-overlap-queue to it.
…tity
Move the domain-fact data types produced by the conflict, mergechecker, and pusher extensions into entity/submitqueue, leaving each extension with only its behavioral contract (interface, Config, Factory) and sentinels:
- conflict.Conflict / ConflictType -> entity.Conflict / entity.ConflictType
- mergechecker.Result -> entity.MergeResult
- pusher.{Result,BatchOutcome,ChangeOutcome,OutcomeStatus} -> entity.{PushResult,BatchOutcome,ChangeOutcome,OutcomeStatus}
These are domain facts (a dependency-graph reason, a mergeability verdict, the commits a change produced) that the orchestrator may persist or surface. Placing them in entity/ — the universal dependency sink that storage, controllers, and extensions all already import — keeps the contract robust to future persistence without a layering inversion (storage importing a decision extension) or an import migration later. This matches what buildrunner and changeprovider already do with entity.BuildStatus / entity.ChangeInfo. The data shapes are unchanged; only their home is. pusher.ErrConflict stays in the extension (a sentinel error is part of the behavioral contract). The controllers were already type-inference-clean, so only their tests change.
behinddwalls
force-pushed
the
preetam/ext/result-entities
branch
from
4d6c3eb to
dbb50b1
Compare
behinddwalls
force-pushed
the
preetam/ext/conflict-target-overlap
branch
from
5b18e1b to
820bad5
Compare
behinddwalls
added a commit
that referenced
this pull request
Jun 10, 2026
…#221) ## Summary Change BuildRunner.Trigger to take batch identity — base []entity.Batch (the dependency batches) and head entity.Batch (the batch under test) — instead of controller-pre-resolved base/head []entity.Change, per the extension contract. Each implementation (buildkite, githubactions, fake) gains an injected changeset.Resolver and resolves the base and head batches' changes itself; the build controller drops its private collectChanges walk and loads the dependency batches as identity. Status, Cancel, and the build id/status outputs are unchanged. The wiring injects the resolver into the fake build runner; the buildkite/githubactions Params gain a Resolver field. Revises build-runner.md, which had deliberately kept batches out of the boundary — the base/head split survives, expressed as batch identity. ## Test Plan ## Issues ## Stack 1. @ #221 1. #222 1. #223 1. #227
behinddwalls
added a commit
that referenced
this pull request
Jun 10, 2026
## Summary
Change Pusher.Push to take ordered []entity.Batch instead of
controller-pre-resolved []entity.Change, per the extension contract. The
git pusher and the fake gain an injected changeset.Resolver and resolve
each batch's changes themselves; the merge controller drops its private
collectChanges walk and passes the single batch (the list designs for a
future merge-train).
This is the one extension whose output shape also changes: Result now
groups outcomes per batch — Result{Batches []BatchOutcome}, where
BatchOutcome{BatchID, Outcomes []ChangeOutcome} — so each landed batch
stays correlatable, the way conflict.Conflict carries its BatchID.
ChangeOutcome (per-change commit detail) is unchanged. No per-batch
status: push atomicity stays all-or-nothing across the whole call.
## Test Plan
## Issues
## Stack
1. #221
1. @ #222
1. #223
1. #227
behinddwalls
added a commit
that referenced
this pull request
Jun 10, 2026
## Summary Add submitqueue/extension/conflict/targetoverlap, a conflict.Analyzer that flags two batches as conflicting when they change a common file. It is the first analyzer to use the capability the extension contract unblocks: it takes only batch identity and resolves each batch's changed files itself through an injected changeset.Resolver, derived from each change's provider details. ConflictTypeTargetOverlap was already named in the contract but had no implementation that could be written against an identity-only batch — this is that implementation. No change to the conflict.Analyzer interface. The example wires a target-overlap-queue to it. ## Test Plan ## Issues ## Stack 1. #221 1. #222 1. @ #223 1. #227
albertywu
approved these changes
Jun 10, 2026
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
2 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
Move the domain-fact data types produced by the conflict, mergechecker, and pusher extensions into entity/submitqueue, leaving each extension with only its behavioral contract (interface, Config, Factory) and sentinels:
These are domain facts (a dependency-graph reason, a mergeability verdict, the commits a change produced) that the orchestrator may persist or surface. Placing them in entity/ — the universal dependency sink that storage, controllers, and extensions all already import — keeps the contract robust to future persistence without a layering inversion (storage importing a decision extension) or an import migration later. This matches what buildrunner and changeprovider already do with entity.BuildStatus / entity.ChangeInfo. The data shapes are unchanged; only their home is. pusher.ErrConflict stays in the extension (a sentinel error is part of the behavioral contract). The controllers were already type-inference-clean, so only their tests change.
Test Plan
Issues
Stack