Skip to content

refactor(scorer): score entity.Batch, resolve changes internally#219

Merged
behinddwalls merged 4 commits into
mainfrom
preetam/ext/scorer
Jun 10, 2026
Merged

refactor(scorer): score entity.Batch, resolve changes internally#219
behinddwalls merged 4 commits into
mainfrom
preetam/ext/scorer

Conversation

@behinddwalls

@behinddwalls behinddwalls commented Jun 8, 2026

Copy link
Copy Markdown
Collaborator

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. refactor(mergechecker): accept entity.Request, resolve change internally #217
  2. refactor(changeprovider): accept entity.Request, resolve change internally #218
  3. @ refactor(scorer): score entity.Batch, resolve changes internally #219
  4. refactor(buildrunner): trigger on batches, resolve changes internally #221
  5. refactor(pusher): push ordered batches, return per-batch outcomes #222
  6. feat(conflict): target-overlap analyzer using changeset resolver #223
  7. refactor(entity): relocate analyzer/checker/pusher result types to entity #227

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
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.
…nally

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.
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.
@behinddwalls behinddwalls force-pushed the preetam/ext/changeprovider branch from 12f7f11 to 985169f Compare June 9, 2026 23:07
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
Base automatically changed from preetam/ext/changeprovider to main June 10, 2026 01:25
@behinddwalls behinddwalls marked this pull request as ready for review June 10, 2026 01:26
@behinddwalls behinddwalls requested review from a team and sbalabanov as code owners June 10, 2026 01:26
@behinddwalls behinddwalls merged commit 3c7ca0c into main Jun 10, 2026
27 checks passed
@behinddwalls behinddwalls deleted the preetam/ext/scorer branch June 10, 2026 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants