Skip to content

feat(conflict): target-overlap analyzer using changeset resolver#223

Merged
behinddwalls merged 4 commits into
mainfrom
preetam/ext/conflict-target-overlap
Jun 10, 2026
Merged

feat(conflict): target-overlap analyzer using changeset resolver#223
behinddwalls merged 4 commits into
mainfrom
preetam/ext/conflict-target-overlap

Conversation

@behinddwalls

@behinddwalls behinddwalls commented Jun 8, 2026

Copy link
Copy Markdown
Collaborator

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

@albertywu albertywu Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this implementation be called fileoverlap? Since it seems to be detecting overlapping files, not targets. And targetoverlap a separate implementation that uses tango?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like calude generated and published PR without me getting a change to review..but yes, it should be fileoverlap

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed the package to fileoverlap — it detects overlapping changed files and reports ConflictTypeTargetOverlap (a shared file being the concrete notion of target overlap). A tango/build-target analyzer can land later as a separate targetoverlap implementation.

@behinddwalls behinddwalls force-pushed the preetam/ext/conflict-target-overlap branch from f468e2c to 78c9f9e Compare June 9, 2026 17:48
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 behinddwalls force-pushed the preetam/ext/conflict-target-overlap branch from 78c9f9e to 5b18e1b 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
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.
@behinddwalls behinddwalls force-pushed the preetam/ext/conflict-target-overlap branch from 5b18e1b to 820bad5 Compare June 10, 2026 01:42
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
Base automatically changed from preetam/ext/pusher to main June 10, 2026 03:36
@behinddwalls behinddwalls marked this pull request as ready for review June 10, 2026 03:36
@behinddwalls behinddwalls requested a review from sbalabanov as a code owner June 10, 2026 03:36
@behinddwalls behinddwalls requested review from a team as code owners June 10, 2026 03:36
@behinddwalls behinddwalls merged commit ead06a1 into main Jun 10, 2026
27 checks passed
@behinddwalls behinddwalls deleted the preetam/ext/conflict-target-overlap branch June 10, 2026 03:42
@behinddwalls behinddwalls deployed to stack-rebase June 10, 2026 03:43 — with GitHub Actions Active
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.

2 participants