Beads had two implementations of most issue verbs: one for the direct route
(the CLI talking to a store it opened itself) and one for the proxied-server
route (the CLI talking through a unit of work over a running Dolt server).
They drifted — different commit messages, different transaction boundaries,
different refusals, occasionally different answers.
Seven role interfaces now live in the leaf package issueops: Lifecycle,
Reader, ReadyClaimer, BatchCloser, DependencyEditor, Commenter and Relations.
Each is reached only through a store accessor, never a constructor, because
the accessor is where the hook and telemetry decorators add their layers.
Three implementations back every role — dolt, embeddeddolt, and the
unit-of-work provider the proxied route uses. Both routes call the same role
for close, dep add/remove/list, comment, ready --claim and update.
A depguard rule (httpapi-domain-boundary) denies internal/storage/domain from
internal/httpapi, so a handler cannot reach uw.IssueUseCase() past the roles
and open a second front door one lint-clean commit at a time.
Behaviour users will notice, all in the CHANGELOG:
- bd close a b c is one Dolt commit, not three, and --claim-next moved
inside that transaction so it fires only when something landed
- the open-children guard moved into the transaction and its hand-rolled
cmd/bd copy is gone, removing a read-then-write window that made
bd close <child> <parent> depend on argument order
- bd dep add --file honours deferred version commit
- embedded bd comment writes the role's message and author
- dep verb commit messages are the role's on the direct route
Wisp-sourced dependency edges are restored. Moving bd dep add onto the role
had pinned an edge's SOURCE to the issues plane, and the two routes did not
even fail alike: direct refused with "issue <id> not found", proxied threw an
fk_dep_issue violation. The comment justifying the pin claimed the issues
plane was "the only one its unit-of-work sibling can reach" — that was false;
domain.DependencyUseCase declared a full set of wisp twins with no production
caller. All three implementations now route per edge by the edge's own
source. A mixed request stays one transaction: parent-child-first ordering
and the whole-graph cycle gate span both planes, and a refusal rolls back
both. Behind the role, three bulk add verbs collapsed into one source-routed
AddDependencies, so no plane-pinned variant is left to reach for by mistake.
Six Provenance fields with no production caller were deleted rather than
wired — CloseRequest, CloseBatchRequest, ClaimNextRequest, AddCommentRequest,
AddDependenciesRequest, RemoveDependencyRequest. Each role already composes an
id-bearing message, so a caller could only restate the default and make it
unreachable from production. Two are not caller-settable even in principle:
CloseBatchCommitMessage names what LANDED and ClaimNextCommitMessage names the
id the claim WON. UpdateRequest and ReopenRequest keep theirs; commit messages
users see are unchanged.
Verified: build, vet and gofmt clean; golangci-lint 0 issues; protocol corpus
byte-identical under BEADS_PROTOCOL_REQUIRE_DOLT=1; all twelve
DependencyEditor conformance wirings green (four contract functions against
each implementation); TestEmbeddedDepAddWispSource runs bd dep add <wisp-id>
at the front door and was demonstrated RED against the pinned routing first.
Three internal/storage/dolt failures reproduce on pristine origin/main.
Known gaps are enumerated in the PR description rather than left to be found:
comment listing is on no role, bd dep tree and bd dep cycles have no role,
bd create and bd reopen are on Lifecycle only on the direct route, per-edge
line attribution is lost in bd dep add --file, multi-store bd close
--claim-next rides only the first store's batch, and the is_blocked staging gap
(bd-2y9ke, predates this change). Seven of the eight role interfaces now have a
shared conformance contract in backend/conformance, run at all three
implementations; main's Claimer, added in parallel by #5334, is the eighth and
has none yet.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
70 lines
2.3 KiB
Go
70 lines
2.3 KiB
Go
package dolt
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/steveyegge/beads/internal/storage"
|
|
storageissueops "github.com/steveyegge/beads/internal/storage/issueops"
|
|
"github.com/steveyegge/beads/internal/types"
|
|
"github.com/steveyegge/beads/internal/workapi"
|
|
"github.com/steveyegge/beads/issueops"
|
|
)
|
|
|
|
// BatchCloser returns the guarded close-many surface for this store.
|
|
func (s *DoltStore) BatchCloser() (issueops.BatchCloser, error) {
|
|
return NewBatchCloser(s)
|
|
}
|
|
|
|
// NewBatchCloser returns a guarded batch closer backed by store.
|
|
func NewBatchCloser(store *DoltStore) (issueops.BatchCloser, error) {
|
|
if store == nil {
|
|
return nil, &storage.ErrUnsupported{Op: "NewBatchCloser", Backend: "nil"}
|
|
}
|
|
return &batchCloser{store: store}, nil
|
|
}
|
|
|
|
type batchCloser struct{ store *DoltStore }
|
|
|
|
// CloseBatch runs every close, and the optional claim, in ONE transaction with
|
|
// one commit. The message is composed inside the body because it names what
|
|
// LANDED, which is not knowable until the last item has been tried.
|
|
func (o *batchCloser) CloseBatch(ctx context.Context, request issueops.CloseBatchRequest) (issueops.CloseBatchResult, error) {
|
|
if err := storageissueops.ValidateCloseBatchRequest(request); err != nil {
|
|
return issueops.CloseBatchResult{}, err
|
|
}
|
|
claimFilter, err := batchClaimFilter(request.ClaimNext)
|
|
if err != nil {
|
|
return issueops.CloseBatchResult{}, err
|
|
}
|
|
|
|
var result issueops.CloseBatchResult
|
|
err = o.store.runIssueOperationTxWithMessage(ctx, func(tx *sql.Tx) (storageissueops.ChangedTables, string, error) {
|
|
attempt, tables, err := storageissueops.ExecuteCloseBatch(ctx, tx, request, claimFilter)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
result = attempt
|
|
return tables, storageissueops.CloseBatchCommitMessage(attempt), nil
|
|
})
|
|
if err != nil {
|
|
return issueops.CloseBatchResult{}, err
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
// batchClaimFilter translates the request's optional claim into the filter the
|
|
// storage layer speaks, through the same builder Reader.Ready and
|
|
// ReadyClaimer.ClaimNext run. Nil in, nil out: no claim was asked for.
|
|
func batchClaimFilter(request *issueops.ReadyRequest) (*types.WorkFilter, error) {
|
|
if request == nil {
|
|
return nil, nil
|
|
}
|
|
filter, err := workapi.BuildReadyFilter(*request)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &filter, nil
|
|
}
|
|
|
|
var _ issueops.BatchCloser = (*batchCloser)(nil)
|