* fix(create): let a remote backend mint the --parent child id
`bd create --parent` always called the raw GetNextChildID first, which the
http backend does not serve, so every child create on a remote workspace
refused before writing anything. The Lifecycle role already mints
<parent>.<n> for a create that carries a ParentID and no id of its own, on
every backend and inside the create's own transaction; conformance
RunIssueOperationsCreateUnderAParentMintsTheNextChildID pins it on every leg,
the served one included (and the bd-enterprise postgres leg the MC server
runs). So the create route needs no new capability token: on a registered
Remote backend the client skips the raw reservation and lets the server mint.
The local route keeps its reservation so its Dolt commit staging is
unchanged, and an explicit --id beside --parent is still refused up front.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(mol): molecule reads, auto-close and close --continue over issueops roles
Over the http backend three molecule paths failed, and two of them
silently:
- `bd mol current` / `bd mol progress` without an id answered "no molecules"
because the in_progress listing (a raw SearchIssues shape) and the parent
walk (raw GetDependencyRecordsForIssues) were refused and the refusal was
swallowed; with an id they refused on raw GetMoleculeProgress.
- The molecule auto-close after `bd close` never ran: findParentMolecules
swallowed the same refused edge read into "not part of a molecule".
- `bd close --continue` claimed the next step in a raw RunInTransaction.
The direct route now reads molecules through roleMolStore, which answers
through roles every backend serves: EdgeReader (batched at the wire's 100
anchors) for the parent walk, BatchGetter for the roots (Get per id where a
server does not publish issues.batchGet), Relations for the step rows (full
rows; the raw dependents read over http is getIssue's shallow projection,
which zeroed step assignees) and the progress counts, and Reader.List for the
in_progress/hooked listings. The auto-close closes the root through
Lifecycle.Close, and the --continue claim is one Lifecycle.Update guarded by
ExpectedStatus=open.
No refusal is swallowed any more: findParentMolecules, the molecule finders
and the hooked scan return their errors; `mol current/progress` report them;
the auto-close stays best effort but warns on stderr; AdvanceToNextStep only
moves on to the next ready step when the claim LOST a race (status mismatch,
not claimable, already claimed) and returns anything else. The one heuristic
still skipped is the id-pattern heal in loadDescendants, and only for an
ErrUnsupported backend that cannot express an id-prefix search; other
failures now surface. `mol current`/`mol progress` leave the
types.IssueFilter forbidigo hole, since they no longer build a filter.
gc does not depend on bd's molecule auto-close: it runs its own
(cmd/gc/molecule_autoclose.go, from the bd on_close hook and the
controller's bead-close events). Its worker prompts do run `bd mol current`.
Served e2e (TestE2E_MoleculesOverHTTP): create --parent mints <root>.1/.2,
mol current <id> is non-empty with the full in-progress step, mol progress
counts, close --continue auto-advances, closing the last step auto-closes
the root. `mol current` without an id now refuses out loud on this stack
(asserted: never an empty list); its non-empty assertion is skipped until
S6c (externaldeps reader passthrough) is underneath.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(mol): list molecule candidates with the four wire knobs, drop the S6c skip
On top of S6c the in_progress listing behind 'bd mol current' (no id)
reaches the v0 wire encoder, which refuses ListRequest.IncludeAllTypes.
Ask for templates, gates, infra and ephemeral rows explicitly, which the
wire publishes, and run the 'mol current without an id' served case.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* feat(issueops): one library entry each for molecule auto-close, advance and reads
The molecule rules lived only in cmd/bd, in copies that disagreed: two
auto-close implementations that closed the root through different
library entries outside the step close's transaction, a `close
--continue` claim that set no assignee and could take a step another
agent held on the direct and http routes, and three progress counts.
Every molecule rule now has one implementation in the public issueops
package, composed over three roles every backend serves (BatchGetter,
Relations, EdgeReader): MoleculeRoots, LoadMolecule, AnalyzeMolecule,
ViewMolecule, ReadMoleculeProgress, ActiveMoleculeIDs,
CompletedMolecule. Membership is the parent-child edge.
Auto-close: CloseRequest.AutoCloseMolecule and
CloseBatchRequest.AutoCloseMolecule (opt-in, so gc's own auto-close is
not doubled) close the molecule root a close completed IN THE SAME
TRANSACTION, unforced and guarded on the root revision read there:
storageissueops.CloseCompletedMoleculeInTx on the store backends (the
role bodies bound to the caller's tx, TxMoleculeReader) and
uow.CloseCompletedMoleculeInUOW on the unit of work. It replays on an
idempotent re-close, reports the root on CloseResult/CloseOutcome
.AutoClosedMolecule, and a root its own close policy refuses stays open
and is reported (MoleculeAutoCloseRefusal) without failing the step.
Advance: a new MoleculeStepper role (storage.DoltStorage accessor,
uow.MoleculeStepperSource) whose one implementation,
issueops.NewMoleculeStepper, claims the next ready step through the
Claimer (Lifecycle.Update's Claim for a wisp step): assignee set, a step
another actor holds skipped, never taken.
HTTP: closeIssue/batchCloseIssues carry auto_close_molecule behind the
issues.close.autoCloseMolecule behavior token, and POST
/v0/beads/issues/{id}:advanceMolecule (issues.advanceMolecule) serves
the stepper. Handlers only decode, call the role and encode. The client
sends the member and dials the operation only where advertised; against
an older server it DEGRADES rather than refuses — it runs the same
library rule over its own roles (issueops.CloseCompletedMolecule after
the close, NewMoleculeStepper for the advance), so the outcome is the
same in more round trips. The capability fallbacks that lived in
cmd/bd move into the client: BatchGetter answers one getIssue per id
without issues.batchGet, and EdgeReader splits past the operation's 100
anchors.
Conformance: RunMolecule* on dolt, embedded, uow and http (the http leg
twice: served, and against a server with the tokens struck out).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* refactor(cmd/bd): molecule commands and create --parent through the library entries
`bd close`, `bd close --continue`, `bd mol current`, `bd mol progress`,
`bd ready --mol` and `bd create --parent` now call the one library entry
for each rule on every route (direct, proxied server, remote):
- close (batch, --if-revision, proxied) sets CloseRequest/
CloseBatchRequest.AutoCloseMolecule and only reports what the library
closed in the step close's transaction. autoCloseCompletedMolecule,
autoCloseProxiedCompletedMolecule and closeCompletedMoleculeRoot are
gone, and so is the separate post-close write.
- --continue is the route's MoleculeStepper role: a real claim (the
assignee is set) that skips a step another actor holds. Before, the
direct and http routes flipped the status only and could take it.
AdvanceToNextStep, ClaimStepIfOpen and its two implementations are
gone.
- mol current / mol progress / ready --mol read through
issueops.ViewMolecule, ReadMoleculeProgress, ActiveMoleculeIDs and
LoadMolecule/AnalyzeMolecule over the route's roles. Over http this
fixes the missing step assignee on `ready --mol` (corpus mark
mc-ready-mol). The proxied route's SearchIssues fallback, the role
store, the third progress count and the cmd/bd copy of the readiness
analysis are deleted; only presentation stays here.
- create --parent asks the create role to mint the child id on every
route (the local CLI reservation is gone) and to inherit the parent's
labels (InheritLabelsFromParent) inside the create. The dry-run
preview still shows the labels, and a failed label read there is
reported, not swallowed.
TestProxiedServerMoleculeLifecycleAgreesOnEveryRoute runs one molecule
lifecycle through the real binary on the direct, proxied and remote
(`bd connect` to `bd serve`) routes and requires the same rows and the
same JSON on all three. The served e2e now also pins the held-step skip,
the claimed step's assignee and the full rows of `ready --mol`.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(httpclient): refuse molecule auto-close and advance before dialing an older server
The client used to DEGRADE against a server without
issues.close.autoCloseMolecule / issues.advanceMolecule: it closed the step
without the member and ran a second, client-side copy of the auto-close
(issueops.CloseCompletedMolecule) in its own transactions, and composed the
stepper over its own roles. That kept two executions of each rule alive.
Now the rule runs in ONE place, the server's library: a close or batch close
that sets AutoCloseMolecule, and an Advance, refuse before anything is dialed
with the typed capability error (storage.ErrUnsupported, Capability naming the
token). The composed single-item batch leg now carries the member too.
- issueops.CloseCompletedMolecule (the role-composed form) is gone.
MoleculeRootClose is the one root close request (unforced, the auto-close
reason, the session, guarded on the root revision read), and both
in-transaction bodies (storage issueops CloseCompletedMoleculeInTx, uow
CloseCompletedMoleculeInUOW) build from it.
- MoleculeView.Ready is `bd ready --mol`'s list (every analysis-ready node,
hydrated), so ready --mol and mol current derive from ViewMolecule alone.
Tests: unit pre-dial refusal and member pins (httpclient molecule_test.go),
TestServedMoleculeRefusesAgainstAnOlderServer (step stays open, nothing
claimed) replacing the degraded contract arm.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(cmd/bd): ask for the molecule auto-close only where the route serves it
The refuse-before-dialing client made every `bd close` over http fail
against a server that does not advertise issues.close.autoCloseMolecule
(an older bd serve, or the MC server shape, whose orchestrator owns the
molecule lifecycle): the CLI always set AutoCloseMolecule.
storage.ServesMoleculeAutoClose answers, through every decorator, whether a
store's closes may carry the flag (MoleculeAutoCloseProber, implemented by
httpclient.Store from its handshake; every local backend serves it). The
direct batch close and the --if-revision close set the flag from it; the
proxied route always serves it. Against a silent server the close goes out
without the member and the server's side owns the auto-close.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* test(backend/http): scope the advertised-policy check to reads before the close
The close policy check is the client-side policy's last chance: it runs
before the close request, so only the reads up to that request count. A
read after the close (the old-server molecule notice reads the closed
step's edges) is not the external-dependency policy.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* test(backend/http/corpus): drop the six marks S16 and S19 retire
With the molecule library entries underneath, mol current (with and
without an id, json and text), mol progress and ready --mol read through
issueops.LoadMolecule over the roles, and create --parent lets the server
mint the child id. Those six shapes pass on the reference profile.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(cmd/bd): never silent against a server without the molecule tokens
Against a server that advertises neither issues.close.autoCloseMolecule
nor issues.advanceMolecule (an older bd serve, or one whose orchestrator
owns the molecule lifecycle):
- `bd close --continue` closed the step and only then found the advance
refused, leaving the step closed and the next step unclaimed. It now
asks storage.ServesMoleculeAdvance (a MoleculeAdvanceProber the http
store answers from its handshake; local backends always serve it)
BEFORE the close and refuses up front, saying nothing was closed.
- `bd close` went out without auto_close_molecule and said nothing. When
the closed step belongs to a molecule (issueops.MoleculeRoot), a notice
on stderr now names the molecule and the missing token: its auto-close
is the server's to run. The batch and --if-revision closes both say it.
The served e2e masks both tokens out of the handshake and checks the
up-front refusal (the step stays open) and the notice; the httpclient
unit test pins ServesMoleculeAdvance to the handshake.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* refactor(cmd/bd): mol show through issueops.LoadMolecule on every route
`bd mol show` still loaded the molecule through cmd/bd's
loadTemplateSubgraph (raw GetIssue, GetDependentsWithMetadata and
GetDependencyRecords, plus an id-pattern child probe), while mol current,
mol progress and ready --mol read through the library. It now loads
through issueops.LoadMolecule over the route's molecule roles (the direct
store's, or the proxied provider's), so membership is the parent-child
edge everywhere and the http route reads through roles the server serves.
The served e2e checks mol show's root and step count.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* docs: the molecule auto-close fails the step's close on a non-policy error; stale comments
CloseRequest.AutoCloseMolecule and CloseCompletedMoleculeInTx now say what
changed when the auto-close moved into the close's transaction: a root
close the close policy refuses still leaves the root open and is reported,
but any other failure (a storage error, a lost race on the root's revision)
fails the step's close with it, where the CLI used to close the root
afterwards and only warn.
Stale: the advanceMolecule vocabulary entry said the client composes the
stepper over its own roles when unserved (it refuses before dialing), and
the graph-create collision probe called itself best-effort by transport
(the http GetIssue miss is storage.ErrNotFound like every other store's).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* docs(changelog): the molecule tokens and the S16/S19 behaviours
Entries for issues.close.autoCloseMolecule and issues.advanceMolecule, the
issueops molecule entries, the auto-close inside the step's close (and a
non-policy failure of it failing the close), the real claim behind
close --continue, the molecule reads on every route, the notice and the
up-front --continue refusal against a server without the tokens, and
create --parent / mol reads over http.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(httpclient): regenerate unsupported_gen.go for MoleculeStepper
The PR adds MoleculeStepper() to storage.DoltStorage (200 -> 201
methods). httpclient implements it by hand, but the generated shell's
trailer still counted 200, so
//internal/storage/unsupportedgen:unsupportedgen_test
(TestGeneratedShellIsFresh) failed in Bazel / test and
Bazel / integration, turning CI Gate / Required red.
Regenerated with `go generate ./internal/httpclient`; the only change
is the trailer count (143 of 201 methods generated; 58 left).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix(molecule): auto-close refusals, write skew, close --json, docs
Review fixes for #7513, numbered as in each iteration's review
synthesis.
Iteration 1:
F1: a close guard's refusal of the root (TemplateReadOnlyError,
PinnedError, CloseNotAssigneeError) is an auto-close refusal, like the
close policy's: the root stays open and is reported, and the step's
close stands. Pinned by the new conformance case
RunMoleculeGuardedRootKeepsTheStepClose on dolt, embedded, uow and the
served http client.
F2: two closes that finish a molecule's last two steps in concurrent
transactions each read the other's step as open, so neither closed the
root and both committed. Every auto-close now rewrites the root's
coordination cell before it decides the root (local_metadata
molecule-coordination/v1/<shard>, the dependency coordination idiom and
sharding with a FreshRowLock value), in both twins
(CloseCompletedMoleculesInTx and CloseCompletedMoleculesInUOW). Two
deciders of one root now conflict at commit (1213), and the retry reads
the winner's close and closes the root. This is the synthesis's option
(c), applied through a coordination cell instead of the root row; it
needs no post-commit second transaction and no engine lock. The
deterministic two-transaction regression fails without the touch and
passes with it on dolt and uow; the concurrent-close tests end with the
root closed in every round, reported by exactly one close.
F3: the auto-close checks the root's eligibility before walking any
step, MoleculeStepsClosed stops at the first open step, and a batch
decides each root once and reports it on the first item under it.
F4: ErrVersionMismatch on the root is not a refusal; it fails the
step's close with it. The classifier unit test pins this. A conformance
case cannot stage that race deterministically through the public roles.
F5: storage.ServesMoleculeAdvance answers (bool, error), and bd close
--continue refuses before closing anything when the handshake cannot be
read.
F6: the CHANGELOG and the stepper and batch-closer doc comments say
what the code does.
F7: the unserved-auto-close notice fires only when the close left an
auto-closing molecule with every step closed and its root open
(issueops.CompletedMolecule): again on a re-close, once per root in a
batch, never for a step under an ordinary epic or an unfinished
molecule. Proxied mol show, mol current and mol progress again report a
read unit of work that cannot be opened as itself, not as a molecule
that was not found.
F8: the write-ledger comment says the close is refused before dialing.
The dead FirstClosed/LastClosed guards in mol progress pre-exist on main
and are left as they are.
Iteration 2:
F1: on the proxied route, bd ready --mol reported a read unit
of work it could not open twice: once as itself, then as "molecule
'<id>' not found", which under --json is a second error document on
stdout. It now returns moleculeNotResolved, as mol show, mol current and
mol progress do. TestProxiedReadyMolReportsAnUnopenableReadOnce drives
runMoleculeReady with a provider whose NewUOW fails and wants one Error:
line, or one JSON document; both subtests fail with the old return.
F2: the coordination cell serializes every concurrent close of a step
under an open auto-closing root, not only the closes that finish the
molecule. That is the price of deciding the root in the step's
transaction, so it is documented (TouchMoleculeCoordinationInTx, the
UOW twin, CloseRequest.AutoCloseMolecule, the CHANGELOG) and pinned on
dolt and uow: two sibling closes with a third step still open conflict
(both commit when the touch is removed, on either twin), and a six-step
fan-out closes every step through the store's retry, with the root
closed and reported by exactly one close. The synthesis's alternative,
a post-commit recheck by any close that read a step open, is not taken:
it is a second, best-effort transaction after the step's commit, the
shape this PR exists to remove.
F3: MoleculeRootClose's doc no longer promises that a step reopened
between the completion read and the root close fails the step's close.
The guard is the root's RowVersion, which a step reopen never writes;
the doc now says what the guard covers and that this race goes
undetected (it is inherited from the CLI's old post-commit auto-close).
F4: the user docs describe the auto-close. docs/workflows/molecules.md
replaces "Closing the last child does not close the molecule root"
with which roots close and which stay open, the refusal warning, the
unserved-server note and the --json members, and documents the claiming
--continue and parent-child step membership;
docs/reference/json-schema.md gains a bd close --json section. These
are main-only behaviors on pages pinned to v1.2.2 (docs/cli-docs.pin):
a maintainer call against §1 of
engdocs/decisions/2026-07-17-docs-release-pin.md, as in #6508, #5855,
#5997 and #5092. The auto-close itself shipped in v1.2.2
(cmd/bd/close.go autoCloseCompletedMolecule), so the old sentence was
already wrong at the pin. docs/cli-reference/ is generated from the
pinned release and is not hand-edited; the bd close and bd mol show
help texts carry the same facts and reach it at the next pin bump.
F5: bd close --json reports the auto-close. The entry of a close that
completed a molecule gains auto_closed_molecule (the root it closed) or
molecule_auto_close_refusal (why the root stayed open), the HTTP API's
names, on the direct, proxied and --if-revision routes. The members sit
beside the issue's own rather than wrapping the output in an object the
way --suggest-next does: an object would change the output's shape
exactly when a close completes a molecule and break every consumer that
reads an array, while members leave each entry decoding as the closed
issue, compose with `closed` under the flag objects, and leave a plain
close's bytes unchanged. Pinned on the embedded and proxied tiers
(TestEmbeddedCloseJSONReportsMoleculeAutoClose, TestProxiedServerClose2B
json_reports_*, and both --if-revision replay tests), all red without
the change.
F6: cmd/bd's BeadsTemplateLabel is issueops.MoleculeTemplateLabel, so
the template commands and molecule membership cannot drift apart.
F7: the UOW twin's revision probe says that it writes nothing,
and the BatchCloseRequest.auto_close_molecule spec description has its
verb back (apigen regenerated, no drift).
Iteration 3:
F1: on the unit-of-work route (bd serve, the proxied CLI), a refused
root's molecule_auto_close_refusal and warning carried the use case's
and repository's wrapping ("close <id>: db:
IssueSQLRepository.CloseChecked <id>: ...") around the refusal, where
the tx twin and the docs give the refusal alone. Both twins now report
it through RefusedMoleculeAutoClose, which answers the refusing guard's
or policy's own sentence. RunMoleculeRefusedRootKeepsTheStepClose,
RunMoleculeGuardedRootKeepsTheStepClose and the embedded and proxied
close --json tests want that exact sentence; the uow conformance leg
and the proxied test fail without the unwrap.
F2: the docs no longer promise ErrVersionMismatch for a write to the
root that races its auto-close. The root's read and its revision check
share one transaction snapshot, so that write conflicts with the root
close at commit and the retry decides the root again; the close fails
only if it still conflicts when its retry budget runs out
(MoleculeRootClose, IsMoleculeAutoCloseRefusal,
CloseRequest.AutoCloseMolecule, the tx twin's comment, the CHANGELOG
and the OpenAPI description, apigen regenerated).
F3: TestEmbeddedCloseJSONReportsMoleculeAutoClose moves above
TestEmbeddedCloseConcurrent's doc comment, which documents its own test
again.
F4: bd mol progress counting direct steps while the auto-close counts
every descendant predates this PR; it is left for a follow-up.
F5: cmd/bd's molReader drops GetMoleculeProgress, which nothing called
once mol progress read through issueops.ReadMoleculeProgress.
Agent-Signature: claude-code-claude-opus-5-5-max on behalf of Gas City Adopt-PR
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
539 lines
20 KiB
Go
539 lines
20 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/steveyegge/beads/internal/audit"
|
|
"github.com/steveyegge/beads/internal/storage"
|
|
storeissueops "github.com/steveyegge/beads/internal/storage/issueops"
|
|
"github.com/steveyegge/beads/internal/storage/uow"
|
|
"github.com/steveyegge/beads/internal/types"
|
|
"github.com/steveyegge/beads/internal/ui"
|
|
"github.com/steveyegge/beads/internal/workapi"
|
|
"github.com/steveyegge/beads/issueops"
|
|
)
|
|
|
|
type closeProxiedInput struct {
|
|
force bool
|
|
continueOn bool
|
|
noAuto bool
|
|
suggestNext bool
|
|
claimNext bool
|
|
session string
|
|
jsonOut bool
|
|
}
|
|
|
|
// closeProxiedPreflight is the CLI's own close policy, decided before the
|
|
// batch runs: the template/pin/assignee fence, the epic open-children refusal
|
|
// and machine-checkable gates. None of the three is library policy — they are
|
|
// `bd close`'s, they read the issue and nothing else, and the role has no
|
|
// vocabulary for them — so they stay here and the batch is handed only the
|
|
// items that survived them.
|
|
//
|
|
// errors is indexed by ARGUMENT position, not by item, so a refusal reported
|
|
// here and one reported by the batch still print in the order the caller typed
|
|
// the ids.
|
|
//
|
|
// failureErrors is the same list at the same indices, but carries what a --json
|
|
// consumer reads instead of what a person reads: the TYPED error for an engine
|
|
// refusal, where errors holds closeProxiedRefusal's decorated display line. The
|
|
// direct route makes exactly this split (close.go records res.Err.Error() in
|
|
// closeIDFailure while printing closeDirectRefusal), and keeping the decorated
|
|
// line in the machine-readable field made the same refusal answer differently
|
|
// per route — which is the drift this whole close rewire exists to remove. A
|
|
// policy refusal decided here has no separate display form, so both slots hold
|
|
// the one sentence closeProxiedCheckOne returned.
|
|
type closeProxiedPreflight struct {
|
|
items []issueops.BatchCloseItem
|
|
itemArgs []int
|
|
before map[string]*types.Issue
|
|
errors []string
|
|
failureErrors []string
|
|
}
|
|
|
|
type closeProxiedOutcome struct {
|
|
id string
|
|
before *types.Issue
|
|
after *types.Issue
|
|
closed bool
|
|
auditOld string
|
|
auditReason string
|
|
// autoClosedMol and autoCloseRefusal are what the library's molecule
|
|
// auto-close did inside the batch's transaction for this item.
|
|
autoClosedMol *types.Issue
|
|
autoCloseRefusal string
|
|
}
|
|
|
|
// closeProxiedPostClose is the work `bd close` does AFTER the closes have
|
|
// landed: --suggest-next and --continue. (The molecule auto-close is not here:
|
|
// the library runs it inside the batch's transaction.)
|
|
type closeProxiedPostClose struct {
|
|
unblocked []*types.Issue
|
|
continueResult *ContinueResult
|
|
warnings []string
|
|
}
|
|
|
|
func runCloseProxiedServer(cmd *cobra.Command, ctx context.Context, args []string) error {
|
|
if len(args) == 0 {
|
|
return HandleErrorRespectJSON("no issue ID provided")
|
|
}
|
|
|
|
reasons, updatedArgs, err := resolveCloseReasons(cmd, args)
|
|
if err != nil {
|
|
return HandleErrorRespectJSON("%v", err)
|
|
}
|
|
args = updatedArgs
|
|
if err := validateCloseReasons(reasons); err != nil {
|
|
return HandleErrorRespectJSON("%v", err)
|
|
}
|
|
|
|
in := gatherCloseProxiedInput(cmd)
|
|
|
|
// A8 (beads#4682): a single-id compare-and-swap close bypasses the batch
|
|
// below entirely -- see close_if_revision.go for why BatchCloseItem
|
|
// cannot carry this guard.
|
|
ifRevision, err := parseIfRevisionFlag(cmd)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := requireSingleIfRevisionID(ifRevision, args); err != nil {
|
|
return err
|
|
}
|
|
if ifRevision != nil {
|
|
// The bypass below never looks at these three post-close flags, so
|
|
// honoring them would mean silently dropping what the caller asked
|
|
// for. Refuse instead of guessing, the same way --continue and
|
|
// --suggest-next already refuse a multi-id batch below.
|
|
if in.continueOn || in.suggestNext || in.claimNext {
|
|
return HandleErrorRespectJSON("--if-revision does not support --continue, --suggest-next, or --claim-next")
|
|
}
|
|
return runCloseProxiedIfRevision(ctx, args[0], reasonForCloseIndex(reasons, 0), in.force, in.session, *ifRevision)
|
|
}
|
|
|
|
if in.continueOn && len(args) > 1 {
|
|
return HandleErrorRespectJSON("--continue only works when closing a single issue")
|
|
}
|
|
if in.suggestNext && len(args) > 1 {
|
|
return HandleErrorRespectJSON("--suggest-next only works when closing a single issue")
|
|
}
|
|
|
|
if uowProvider == nil {
|
|
return HandleError("proxied-server UOW provider not initialized")
|
|
}
|
|
|
|
pre, err := closeProxiedRunPreflight(ctx, args, reasons, in)
|
|
if err != nil {
|
|
return HandleErrorRespectJSON("%v", err)
|
|
}
|
|
|
|
// THE BATCH. One request, one transaction, one Dolt commit over N ids —
|
|
// and the request is the only thing that says where the transaction ends,
|
|
// because the role hands out no handle to hold open. The commit message is
|
|
// the role's, and it names what LANDED, which is what this route's own
|
|
// message did: a skipped id stays out of the log.
|
|
var result issueops.CloseBatchResult
|
|
if len(pre.items) > 0 {
|
|
closer, cerr := proxiedBatchCloser()
|
|
if cerr != nil {
|
|
return HandleErrorRespectJSON("%v", cerr)
|
|
}
|
|
result, err = closer.CloseBatch(ctx, issueops.CloseBatchRequest{
|
|
Actor: currentActor(),
|
|
Items: pre.items,
|
|
Session: in.session,
|
|
Force: in.force,
|
|
ClaimNext: closeClaimNextRequest(in.claimNext, in.continueOn),
|
|
// The library closes a molecule root its last step's close
|
|
// completes, inside this batch's transaction.
|
|
AutoCloseMolecule: true,
|
|
})
|
|
if err != nil {
|
|
return HandleErrorRespectJSON("%v", err)
|
|
}
|
|
}
|
|
|
|
outcomes, closeReasons := closeProxiedOutcomes(&pre, result)
|
|
post := closeProxiedRunPostClose(ctx, args, in, outcomes)
|
|
|
|
for _, e := range pre.errors {
|
|
if e != "" {
|
|
fmt.Fprintln(os.Stderr, e)
|
|
}
|
|
}
|
|
failures := closeProxiedFailures(&pre, args)
|
|
for _, w := range post.warnings {
|
|
fmt.Fprintf(os.Stderr, "Warning: %s\n", w)
|
|
}
|
|
|
|
for i, o := range outcomes {
|
|
if o.closed {
|
|
audit.LogFieldChange(o.id, "status", o.auditOld, "closed", currentActor(), o.auditReason)
|
|
}
|
|
if !in.jsonOut {
|
|
fmt.Printf("%s Closed %s: %s\n", ui.RenderPass("✓"), formatFeedbackID(o.after.ID, o.after.Title), closeReasons[i])
|
|
}
|
|
}
|
|
|
|
var claimedNextIssue *types.Issue
|
|
if result.ClaimedNext != nil {
|
|
claimedNextIssue = result.ClaimedNext.Issue
|
|
}
|
|
|
|
for _, o := range outcomes {
|
|
if o.autoCloseRefusal != "" {
|
|
fmt.Fprintf(os.Stderr, "Warning: could not auto-close completed molecule: %s\n", o.autoCloseRefusal)
|
|
}
|
|
}
|
|
|
|
if !in.jsonOut {
|
|
for _, o := range outcomes {
|
|
if o.autoClosedMol != nil {
|
|
fmt.Printf("%s Auto-closed completed molecule %s\n", ui.RenderPass("✓"), formatFeedbackID(o.autoClosedMol.ID, o.autoClosedMol.Title))
|
|
}
|
|
}
|
|
if len(post.unblocked) > 0 {
|
|
fmt.Printf("\nNewly unblocked:\n")
|
|
for _, issue := range post.unblocked {
|
|
fmt.Printf(" • %s (P%d)\n", formatFeedbackID(issue.ID, issue.Title), issue.Priority)
|
|
}
|
|
}
|
|
if post.continueResult != nil {
|
|
PrintContinueResult(post.continueResult)
|
|
}
|
|
if claimedNextIssue != nil {
|
|
fmt.Printf("%s Auto-claimed next ready issue: %s (P%d)\n", ui.RenderPass("✓"), formatFeedbackID(claimedNextIssue.ID, claimedNextIssue.Title), claimedNextIssue.Priority)
|
|
} else if in.claimNext && len(outcomes) > 0 && !in.continueOn {
|
|
fmt.Printf("\n%s No ready issues available to claim.\n", ui.RenderWarn("✨"))
|
|
}
|
|
}
|
|
|
|
if in.jsonOut && len(outcomes) > 0 {
|
|
closedIssues := make([]closedIssueJSON, len(outcomes))
|
|
for i, o := range outcomes {
|
|
closedIssues[i] = newClosedIssueJSON(o.after, o.autoClosedMol, o.autoCloseRefusal)
|
|
}
|
|
switch {
|
|
case len(post.unblocked) > 0:
|
|
_ = outputJSON(map[string]interface{}{"closed": closedIssues, "unblocked": post.unblocked})
|
|
case post.continueResult != nil:
|
|
_ = outputJSON(map[string]interface{}{"closed": closedIssues, "continue": post.continueResult})
|
|
case claimedNextIssue != nil:
|
|
_ = outputJSON(map[string]interface{}{"closed": closedIssues, "claimed": claimedNextIssue})
|
|
default:
|
|
_ = outputJSON(closedIssues)
|
|
}
|
|
}
|
|
|
|
if len(failures) > 0 {
|
|
return reportCloseFailures(failures, len(args), closeClaimedID(claimedNextIssue), in.jsonOut)
|
|
}
|
|
if len(args) > 0 && len(outcomes) == 0 {
|
|
return SilentExit()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func gatherCloseProxiedInput(cmd *cobra.Command) closeProxiedInput {
|
|
in := closeProxiedInput{}
|
|
in.force, _ = cmd.Flags().GetBool("force")
|
|
in.continueOn, _ = cmd.Flags().GetBool("continue")
|
|
in.noAuto, _ = cmd.Flags().GetBool("no-auto")
|
|
in.suggestNext, _ = cmd.Flags().GetBool("suggest-next")
|
|
in.claimNext, _ = cmd.Flags().GetBool("claim-next")
|
|
in.session, _ = cmd.Flags().GetString("session")
|
|
if in.session == "" {
|
|
in.session = os.Getenv("CLAUDE_SESSION_ID")
|
|
}
|
|
in.jsonOut, _ = cmd.Flags().GetBool("json")
|
|
return in
|
|
}
|
|
|
|
// proxiedBatchCloser hands back the guarded close-many surface for the
|
|
// proxied-server provider, through the provider's OWN capability accessor —
|
|
// the same two-step proxiedIssueReader performs, and for the same reason: the
|
|
// accessor is where each layer is added, so a command that reached for the
|
|
// constructor would get an unlayered closer.
|
|
func proxiedBatchCloser() (issueops.BatchCloser, error) {
|
|
if uowProvider == nil {
|
|
return nil, errors.New("proxied-server UOW provider not initialized")
|
|
}
|
|
src, ok := uowProvider.(uow.BatchCloserSource)
|
|
if !ok {
|
|
return nil, fmt.Errorf("proxied-server provider %T does not offer the batch-close surface", uowProvider)
|
|
}
|
|
return src.BatchCloser()
|
|
}
|
|
|
|
// closeProxiedRunPreflight resolves every argument and applies the CLI's own
|
|
// close policy to it, in one read-only unit of work.
|
|
func closeProxiedRunPreflight(ctx context.Context, args, reasons []string, in closeProxiedInput) (closeProxiedPreflight, error) {
|
|
pre := closeProxiedPreflight{
|
|
errors: make([]string, len(args)),
|
|
failureErrors: make([]string, len(args)),
|
|
before: make(map[string]*types.Issue, len(args)),
|
|
}
|
|
_, err := uow.RunTxRead(ctx, uowProvider, func(ctx context.Context, uw uow.UnitOfWork) (struct{}, error) {
|
|
for i, id := range args {
|
|
refusal, current := closeProxiedCheckOne(ctx, uw, id, in)
|
|
if refusal != "" {
|
|
pre.errors[i] = refusal
|
|
// A policy refusal is already the bare sentence, so the human
|
|
// and machine fields agree; only the engine refusals below have
|
|
// a decorated display form to strip.
|
|
pre.failureErrors[i] = refusal
|
|
continue
|
|
}
|
|
pre.before[id] = current
|
|
pre.items = append(pre.items, issueops.BatchCloseItem{IssueID: id, Reason: reasonForCloseIndex(reasons, i)})
|
|
pre.itemArgs = append(pre.itemArgs, i)
|
|
}
|
|
return struct{}{}, nil
|
|
})
|
|
return pre, err
|
|
}
|
|
|
|
// closeProxiedCheckOne returns one id's refusal, or "" and the resolved
|
|
// pre-close issue.
|
|
func closeProxiedCheckOne(ctx context.Context, uw uow.UnitOfWork, id string, in closeProxiedInput) (string, *types.Issue) {
|
|
current, _, err := workapi.GetIssueOrWisp(ctx, workapi.NewUOWDetailSource(uw), id)
|
|
if errors.Is(err, storage.ErrNotFound) {
|
|
return fmt.Sprintf("Issue %s not found", id), nil
|
|
}
|
|
if err != nil {
|
|
return fmt.Sprintf("Error resolving %s: %v", id, err), nil
|
|
}
|
|
|
|
// The close guards' own rule, ahead of gate satisfaction and under the same
|
|
// already-closed skip as closeDirectCheckOne (ga-ktn9pe.4.8); both close
|
|
// paths must agree here (#5217). The role re-applies it inside the close
|
|
// transaction, which stays the authority.
|
|
if current.Status != types.StatusClosed {
|
|
if err := storeissueops.CheckClosable(id, current, currentActor(), in.force); err != nil {
|
|
return err.Error(), nil
|
|
}
|
|
}
|
|
|
|
// The open-children guard is deliberately NOT pre-checked here. It lives in
|
|
// the close transaction, which is the only place it can be race-free, and
|
|
// it answers for every parent rather than only epics — this pre-check was
|
|
// epic-only, so a non-epic parent got a different refusal on this route
|
|
// than on the direct one. closeDirectCheckOne dropped its copy for the same
|
|
// reason; closeProxiedRefusal surfaces the engine's CloseOpenChildrenError
|
|
// unprefixed, so both routes now spell one refusal one way.
|
|
|
|
if !in.force {
|
|
if err := checkGateSatisfaction(current, nil); err != nil {
|
|
return fmt.Sprintf("cannot close %s: %s", id, err), nil
|
|
}
|
|
}
|
|
|
|
return "", current
|
|
}
|
|
|
|
// closeProxiedOutcomes folds the batch's per-item outcomes back onto the
|
|
// argument list: a refusal lands in its argument's own error slot so the
|
|
// stderr report stays in typed order, and the survivors keep the shape the
|
|
// display block has always consumed.
|
|
func closeProxiedOutcomes(pre *closeProxiedPreflight, result issueops.CloseBatchResult) ([]closeProxiedOutcome, []string) {
|
|
var outcomes []closeProxiedOutcome
|
|
var reasons []string
|
|
for j, outcome := range result.Outcomes {
|
|
item := pre.items[j]
|
|
if outcome.Err != nil {
|
|
pre.errors[pre.itemArgs[j]] = closeProxiedRefusal(item.IssueID, outcome.Err)
|
|
// The typed error, not the decorated display line: the --force hint
|
|
// closeProxiedRefusal appends is advice for a human reader, and the
|
|
// id already has its own field. Same split as the direct route.
|
|
pre.failureErrors[pre.itemArgs[j]] = closeProxiedTypedRefusal(outcome.Err)
|
|
continue
|
|
}
|
|
before := pre.before[item.IssueID]
|
|
oldStatus := "open"
|
|
if before != nil && before.Status != "" {
|
|
oldStatus = string(before.Status)
|
|
}
|
|
after := outcome.Issue
|
|
if after != nil {
|
|
// `bd close` has never printed dependency records, on either
|
|
// route: the direct route drops them from the operation's own
|
|
// snapshot for exactly this reason.
|
|
after.Dependencies = nil
|
|
}
|
|
outcomes = append(outcomes, closeProxiedOutcome{
|
|
id: item.IssueID,
|
|
before: before,
|
|
after: after,
|
|
closed: outcome.Changed,
|
|
auditOld: oldStatus,
|
|
auditReason: item.Reason,
|
|
autoClosedMol: outcome.AutoClosedMolecule,
|
|
autoCloseRefusal: outcome.MoleculeAutoCloseRefusal,
|
|
})
|
|
reasons = append(reasons, item.Reason)
|
|
}
|
|
return outcomes, reasons
|
|
}
|
|
|
|
// closeProxiedFailures pairs every refused argument with the id it belongs to,
|
|
// for the machine-readable half of the partial-failure report.
|
|
//
|
|
// Both slices are indexed by ARGUMENT position, so args[i] is the id that earned
|
|
// pre.errors[i], and the failures come back in the order the caller typed the
|
|
// ids. errors decides WHICH arguments failed — it is the slot the stderr print
|
|
// consults too, so the two halves of the report can never disagree about that —
|
|
// while failureErrors supplies the reason, because that is the field where the
|
|
// typed error belongs.
|
|
//
|
|
// Every writer of an errors slot fills its failureErrors twin, so the fallback
|
|
// below is unreachable today. It is here because the cost of getting that wrong
|
|
// is asymmetric: a caller that asked why an id failed is better served by the
|
|
// decorated line than by an empty string, so a future writer that forgets the
|
|
// twin degrades the wording instead of dropping the reason.
|
|
func closeProxiedFailures(pre *closeProxiedPreflight, args []string) []closeIDFailure {
|
|
var failures []closeIDFailure
|
|
for i, e := range pre.errors {
|
|
if e == "" {
|
|
continue
|
|
}
|
|
reason := pre.failureErrors[i]
|
|
if reason == "" {
|
|
reason = e
|
|
}
|
|
failures = append(failures, closeIDFailure{ID: args[i], Error: reason})
|
|
}
|
|
return failures
|
|
}
|
|
|
|
// closeProxiedTypedRefusal is the reason a --json consumer reads for one
|
|
// refused id: the typed error, spelled the way the direct route spells it.
|
|
//
|
|
// Stripping closeProxiedRefusal's decoration is not enough on its own to make
|
|
// the two routes agree, because a refusal reaching this route has also been
|
|
// wrapped by the layers it traveled through — the use case adds "close <id>: "
|
|
// (storage/domain/issue.go) and the SQL repository adds
|
|
// "db: IssueSQLRepository.CloseChecked <id>: " (storage/domain/db/issue.go) —
|
|
// while the direct route hands back the refusal exactly as the engine minted
|
|
// it. So the same blocked id reads
|
|
//
|
|
// cannot close blocked issue: x-1 is blocked by [x-2] (direct)
|
|
// close x-1: db: IssueSQLRepository.CloseChecked x-1: cannot close blocked … (proxied)
|
|
//
|
|
// For the refusal classes the CLI already names by sentinel, we report the
|
|
// outermost error that the sentinel itself explains: that is the sentence the
|
|
// engine wrote, and it is byte-identical to the direct route's. Neither wrap
|
|
// tells a caller anything it does not know — it asked to close that id — and
|
|
// one of them leaks an internal repository type name into an operator-facing
|
|
// field.
|
|
//
|
|
// Anything outside those classes keeps its whole chain. There the wrapping is
|
|
// not noise, it is the only thing that says where an unexpected failure came
|
|
// from, and there is no engine sentence to converge on.
|
|
func closeProxiedTypedRefusal(err error) string {
|
|
if guard, ok := closeGuardRefusal(err); ok {
|
|
return guard
|
|
}
|
|
for _, sentinel := range []error{storage.ErrCloseBlocked, storage.ErrCloseOpenChildren} {
|
|
if !errors.Is(err, sentinel) {
|
|
continue
|
|
}
|
|
// Walk in until the next link IS the bare sentinel: that link's parent
|
|
// is the refusal with its subject filled in ("… x-1 is blocked by
|
|
// [x-2]"), where the sentinel alone would say only "cannot close
|
|
// blocked issue".
|
|
refusal := err
|
|
for {
|
|
next := errors.Unwrap(refusal)
|
|
if next == nil || next == sentinel || !errors.Is(next, sentinel) {
|
|
break
|
|
}
|
|
refusal = next
|
|
}
|
|
return refusal.Error()
|
|
}
|
|
return err.Error()
|
|
}
|
|
|
|
// closeProxiedRefusal spells one item's typed refusal the way this route has
|
|
// always spelled it. The vocabulary is matched with errors.Is rather than by
|
|
// reading the message, which is the point of the outcome carrying a typed
|
|
// error at all.
|
|
func closeProxiedRefusal(id string, err error) string {
|
|
if guard, ok := closeGuardRefusal(err); ok {
|
|
return guard
|
|
}
|
|
switch {
|
|
case errors.Is(err, storage.ErrCloseBlocked):
|
|
return fmt.Sprintf("%v (use --force to override)", err)
|
|
// The open-children refusal is already a complete sentence naming the
|
|
// issue and its count, so it passes through unprefixed — exactly as
|
|
// closeDirectRefusal spells it. Without this arm the two routes answer the
|
|
// same refusal differently, which is the drift this branch exists to
|
|
// remove; it became newly reachable here when the guard moved into the
|
|
// transaction.
|
|
case errors.Is(err, storage.ErrCloseOpenChildren):
|
|
return err.Error()
|
|
case errors.Is(err, storage.ErrNotFound):
|
|
return fmt.Sprintf("Issue %s not found", id)
|
|
default:
|
|
return fmt.Sprintf("Error closing %s: %v", id, err)
|
|
}
|
|
}
|
|
|
|
// closeProxiedRunPostClose runs --suggest-next and --continue once the closes
|
|
// have committed. --suggest-next is a read in a unit of work of its own;
|
|
// --continue is the provider's MoleculeStepper role, which claims in its own
|
|
// transaction exactly as the direct route's does.
|
|
func closeProxiedRunPostClose(ctx context.Context, args []string, in closeProxiedInput, outcomes []closeProxiedOutcome) closeProxiedPostClose {
|
|
var out closeProxiedPostClose
|
|
if len(outcomes) == 0 {
|
|
return out
|
|
}
|
|
|
|
if in.suggestNext && len(args) == 1 {
|
|
_, err := uow.RunTxRead(ctx, uowProvider, func(ctx context.Context, uw uow.UnitOfWork) (struct{}, error) {
|
|
unblocked, warn := closeProxiedSuggestNext(ctx, uw, args[0])
|
|
out.unblocked = unblocked
|
|
if warn != "" {
|
|
out.warnings = append(out.warnings, warn)
|
|
}
|
|
return struct{}{}, nil
|
|
})
|
|
if err != nil {
|
|
out.warnings = append(out.warnings, fmt.Sprintf("post-close work failed: %v", err))
|
|
}
|
|
}
|
|
|
|
if in.continueOn && len(args) == 1 {
|
|
cont, warn := closeProxiedContinue(ctx, args[0], !in.noAuto)
|
|
out.continueResult = cont
|
|
if warn != "" {
|
|
out.warnings = append(out.warnings, warn)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func closeProxiedSuggestNext(ctx context.Context, uw uow.UnitOfWork, closedID string) ([]*types.Issue, string) {
|
|
unblocked, err := uw.IssueUseCase().GetNewlyUnblockedByClose(ctx, closedID)
|
|
if err != nil {
|
|
return nil, fmt.Sprintf("could not compute newly unblocked: %v", err)
|
|
}
|
|
return unblocked, ""
|
|
}
|
|
|
|
func closeProxiedContinue(ctx context.Context, closedID string, autoClaim bool) (*ContinueResult, string) {
|
|
roles, err := proxiedMoleculeRoles()
|
|
if err != nil {
|
|
return nil, fmt.Sprintf("could not advance to next step: %v", err)
|
|
}
|
|
result, err := advanceMolecule(ctx, roles, closedID, autoClaim)
|
|
if err != nil {
|
|
return nil, fmt.Sprintf("could not advance to next step: %v", err)
|
|
}
|
|
return result, ""
|
|
}
|