* test(feat): red — canonicalActor collapses the --/__ axes: misses gascity slash identities and widens ActorMatches (bundled with be-vc51 authorize/verify split) (refs be-fh0g) * feat: green — canonicalActor collapses the --/__ axes: misses gascity slash identities and widens ActorMatches (bundled with be-vc51 authorize/verify split) (refs be-fh0g) * docs(identity): correct the five contract surfaces that still document the pre---- collapse rule canonicalActor stopped collapsing an exact "--" run when it started decoding that run to "/", but five places still tell a reader the old rule: a run of ".", "_" or "-" matches any other such run. That is now false for "--", and two of the five are public contract surfaces rather than internal comments -- the OpenAPI description a client reads, and the conformance text a backend implementor is expected to satisfy. Corrected in place, all saying the same thing: an exact "--" run decodes to "/" because that is gascity's session-name encoding of a rig-qualified agent's slash, so "a--b" matches "a/b" and no longer matches "a__b" or "a-b"; longer and mixed runs, "__" included, still collapse. issueops/releaser.go ExpectedAssignee's contract issueops/issueops.go the update-side cross-reference internal/httpapi/spec/openapi.v0.yaml wire contract (source of truth) internal/httpapi/apigen/types.gen.go regenerated via make api-gen backend/conformance/releaser_contract.go cross-backend contract text The conformance limb is annotated rather than re-pinned: the respelling it exercises is "-" -> "_", which this change does not affect, so it stays green either way -- which is exactly why CI could not catch the stale text. Adding a "--" limb there would pin new cross-backend behavior and is a wider change than correcting a contract description. This is the keep-in-sync obligation identity.go records under ga-5ksp5, applied to the documentation half. * docs(changelog): record the --/__ equivalence-class change under [Unreleased] The actor-matching change is user-visible and silent: it moves which stored spellings compare equal for ExpectedAssignee on release and update, and for claim/close/unclaim authorization. "gastown--mayor" starts matching "gastown/mayor" and stops matching "gastown__mayor" and "gastown-mayor". The entry says the widening is the intended fix -- "gastown--mayor" is the agent "mayor" on rig "gastown" while "gastown__mayor" is the dotted alias "gastown.mayor", and matching them was wrong -- and then states the part a reader actually needs to act on: any stored "--" spelling that is NOT a gascity slash encoding changes equivalence class with no error to notice. --------- Co-authored-by: Steve Yegge <steve.yegge@gmail.com>
334 lines
12 KiB
Go
334 lines
12 KiB
Go
package validation
|
|
|
|
import (
|
|
"fmt"
|
|
"slices"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/beads/internal/types"
|
|
)
|
|
|
|
// IssueValidator validates an issue and returns an error if validation fails.
|
|
// Validators can be composed using Chain() for complex validation logic.
|
|
type IssueValidator func(id string, issue *types.Issue) error
|
|
|
|
// Chain composes multiple validators into a single validator.
|
|
// Validators are executed in order and the first error stops the chain.
|
|
func Chain(validators ...IssueValidator) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
for _, v := range validators {
|
|
if err := v(id, issue); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// Exists validates that an issue is not nil.
|
|
func Exists() IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return fmt.Errorf("issue %s not found", id)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// NotTemplate validates that an issue is not a template.
|
|
// Templates are read-only and cannot be modified.
|
|
func NotTemplate() IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return nil // Let Exists() handle nil check if needed
|
|
}
|
|
if issue.IsTemplate {
|
|
return fmt.Errorf("cannot modify template %s: templates are read-only; use 'bd mol pour' to create a work item", id)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// NotPinned validates that an issue is not pinned, by either of the two ways
|
|
// bd expresses a pin: the Pinned boolean column or the pinned status. Returns
|
|
// an error if either trigger fires, unless force is true.
|
|
//
|
|
// Both triggers are load-bearing because consumers disagree on which one they
|
|
// write and read (ga-z3vht). Gas Town pins by status — it enumerates pins with
|
|
// List(ListOptions{Status: StatusPinned}) across 21 sites (hook_check.go,
|
|
// prime_output.go, molecule_step.go, up.go) — while Gas City reads the boolean
|
|
// (compute_awake_set.go). Checking only one strips the other consumer's
|
|
// protection outright, so do not "simplify" either clause away.
|
|
func NotPinned(force bool) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return nil // Let Exists() handle nil check if needed
|
|
}
|
|
if !force && (issue.Pinned || issue.Status == types.StatusPinned) {
|
|
return fmt.Errorf("cannot modify pinned issue %s (use --force to override)", id)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// CanonicalActor normalizes an identity string so two spellings of the same
|
|
// Gas Town identity compare equal. The same identity arrives at bd in more
|
|
// than one spelling depending on which layer produced the string it was
|
|
// handed: a dotted alias like "gastown.mayor" gets its dot replaced wherever
|
|
// a dot is unsafe for that context — "__" in a session name, "_" in a Dolt
|
|
// table/database name, "-" elsewhere — and bd only ever sees the resulting
|
|
// string, never the substitution itself (ga-wzl83). None of ".", "_", "-"
|
|
// carries meaning in an identity string: each is always a positional
|
|
// separator between a rig and a role/agent name, never part of either name.
|
|
// Collapsing a run of them to one canonical separator lets two spellings of
|
|
// the same identity compare equal without weakening comparisons between
|
|
// genuinely different identities, whose non-separator characters still
|
|
// differ (e.g. "gastown.mayor" vs "gastown.dog-3" stay distinct).
|
|
//
|
|
// A run that is the exact two-byte sequence "--" is a second, distinct axis:
|
|
// gascity's session-name encoding (session_name.go) substitutes "--" for a
|
|
// rig-qualified agent's "/" — a DIFFERENT identity from one substituting "_"
|
|
// or "__" for a dotted alias's "." — so it decodes to a literal "/" instead
|
|
// of collapsing into the generic "_" separator (ga-2vy9p2). Any other run,
|
|
// including "__" and longer or mixed runs, still collapses to "_": those
|
|
// keep meaning nothing but "here was some separator". A raw "/" already
|
|
// passes through unchanged (it hits the default case below), which is what
|
|
// makes the "--" decode land on the same canonical form: "gastown/mayor" and
|
|
// "gastown--mayor" both canonicalize to "gastown/mayor", while
|
|
// "gastown--mayor" and "gastown__mayor" no longer collapse to the same
|
|
// value — collapsing them was a real widening: "gastown--mayor" is a
|
|
// rig-qualified agent named "mayor", "gastown__mayor" is a dotted alias
|
|
// "gastown.mayor"; treating them as the same actor was wrong regardless of
|
|
// whether either happens to be held by the same principal today.
|
|
//
|
|
// Byte-scanned rather than rune-scanned so a 2-byte lookahead can detect an
|
|
// exact "--" run: safe because '.', '_', '-' are single-byte ASCII that never
|
|
// appear as a continuation byte of a multi-byte UTF-8 rune, so slicing on
|
|
// them cannot split one.
|
|
//
|
|
// Empty stays empty: an actual absence of an actor must never canonicalize
|
|
// to the same value as a non-empty one, or AssigneeMatches would start
|
|
// accepting an empty actor against an assigned issue.
|
|
func CanonicalActor(s string) string {
|
|
if s == "" {
|
|
return ""
|
|
}
|
|
var b strings.Builder
|
|
b.Grow(len(s))
|
|
i := 0
|
|
for i < len(s) {
|
|
c := s[i]
|
|
if c == '.' || c == '_' || c == '-' {
|
|
j := i
|
|
for j < len(s) && (s[j] == '.' || s[j] == '_' || s[j] == '-') {
|
|
j++
|
|
}
|
|
if s[i:j] == "--" {
|
|
b.WriteByte('/')
|
|
} else {
|
|
b.WriteByte('_')
|
|
}
|
|
i = j
|
|
continue
|
|
}
|
|
b.WriteByte(c)
|
|
i++
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
// ActorMatches reports whether actor has the same authority as assignee:
|
|
// either they're byte-identical, or they canonicalize to the same identity
|
|
// (see CanonicalActor). The byte-identical check is not redundant — it
|
|
// avoids paying canonicalization on the overwhelmingly common exact-match
|
|
// path (ga-5ksp5 gate review, #5438: fixes a garbled doc comment, no
|
|
// behavior change).
|
|
func ActorMatches(assignee, actor string) bool {
|
|
return assignee == actor || CanonicalActor(assignee) == CanonicalActor(actor)
|
|
}
|
|
|
|
// AssigneeMatches validates that the actor has authority to close the issue.
|
|
// Authority means the issue is unassigned or the actor matches the current
|
|
// assignee. Returns an error on mismatch unless force is true.
|
|
//
|
|
// Authority is identity-by-string: actor is compared to assignee under
|
|
// CanonicalActor, so two principals sharing one canonical actor name both
|
|
// pass — including the same principal spelled two different ways by two
|
|
// different layers of Gas Town (ga-wzl83). bd has no identity layer, so this
|
|
// matches the existing semantics of the actor field — the guard removes
|
|
// silent cross-actor closes without adding new identity guarantees.
|
|
//
|
|
// This guards against the silent-success bug where actor A closes a bead that
|
|
// was concurrently re-claimed by actor B: storage accepts the close (id-only
|
|
// WHERE clause), so without this check bd reports "✓ Closed" even though A had
|
|
// no authority over the bead. (be-035)
|
|
func AssigneeMatches(actor string, force bool) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil || force {
|
|
return nil
|
|
}
|
|
if issue.Assignee == "" || ActorMatches(issue.Assignee, actor) {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("cannot close %s: assignee is %q, actor is %q; reclaim or use --force to override", id, issue.Assignee, actor)
|
|
}
|
|
}
|
|
|
|
// AssigneeNotStolen validates that a plain assignee update does not silently
|
|
// overwrite another actor's live claim (bd-98s5c). newAssignee is the value
|
|
// the write would set (may be "" for an unassign — fenced the same way, since
|
|
// stripping a live claim is what bd unclaim refuses without --force).
|
|
//
|
|
// The refusal fires only when every clause holds; each one is load-bearing:
|
|
// - Assignee != "" — unassigned issues are freely
|
|
// assignable.
|
|
// - Assignee doesn't canonicalize to actor — an actor editing its
|
|
// own claim is untouched, under any spelling of its own identity.
|
|
// - Assignee doesn't canonicalize to newAssignee — an idempotent re-assert
|
|
// of the current holder stays a success (retry/replay safety on the
|
|
// proxied path), even when the re-assert names the holder under a
|
|
// different spelling.
|
|
// - Status == in_progress — reassigning an OPEN bead stays frictionless:
|
|
// dispatchers hand-dole open beads and pool-queue takes happen constantly,
|
|
// which is why this cannot reuse the unclaim/close ownership rule verbatim.
|
|
// - holder is not a claim.pools alias — --claim deliberately treats
|
|
// pool-assigned issues as takeable by any actor; without the same
|
|
// carve-out here, --claim and -a would give opposite answers on the same
|
|
// bead. poolAliases is a thunk so call sites don't pay the config read on
|
|
// the overwhelmingly common non-conflicting paths.
|
|
//
|
|
// Like AssigneeMatches, authority is identity-by-string — compared under
|
|
// CanonicalActor rather than verbatim (ga-wzl83), so this removes silent
|
|
// cross-actor takeovers without adding new identity guarantees, and without
|
|
// falsely treating the current holder as a stranger when actor or
|
|
// newAssignee names it under a different layer's spelling of the same
|
|
// identity.
|
|
func AssigneeNotStolen(actor, newAssignee string, poolAliases func() []string, force bool) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil || force {
|
|
return nil
|
|
}
|
|
if issue.Assignee == "" || ActorMatches(issue.Assignee, actor) || ActorMatches(issue.Assignee, newAssignee) {
|
|
return nil
|
|
}
|
|
if issue.Status != types.StatusInProgress {
|
|
return nil
|
|
}
|
|
if poolAliases != nil && slices.Contains(poolAliases(), issue.Assignee) {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("cannot reassign %s: held by %q (in_progress); coordinate with the holder (bd mail %s) — pass --force only if their claim is abandoned (crashed agent, expired lease), or use bd reclaim", id, issue.Assignee, issue.Assignee)
|
|
}
|
|
}
|
|
|
|
// NotClosed validates that an issue is not already closed.
|
|
func NotClosed() IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return nil
|
|
}
|
|
if issue.Status == types.StatusClosed {
|
|
return fmt.Errorf("issue %s is already closed", id)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// NotHooked validates that an issue is not in hooked status.
|
|
func NotHooked(force bool) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return nil
|
|
}
|
|
if !force && issue.Status == types.StatusHooked {
|
|
return fmt.Errorf("cannot modify hooked issue %s (use --force to override)", id)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// HasStatus validates that an issue has one of the allowed statuses.
|
|
func HasStatus(allowed ...types.Status) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return nil
|
|
}
|
|
for _, status := range allowed {
|
|
if issue.Status == status {
|
|
return nil
|
|
}
|
|
}
|
|
return fmt.Errorf("issue %s has status %s, expected one of: %v", id, issue.Status, allowed)
|
|
}
|
|
}
|
|
|
|
// HasType validates that an issue has one of the allowed types.
|
|
func HasType(allowed ...types.IssueType) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil {
|
|
return nil
|
|
}
|
|
for _, t := range allowed {
|
|
if issue.IssueType == t {
|
|
return nil
|
|
}
|
|
}
|
|
return fmt.Errorf("issue %s has type %s, expected one of: %v", id, issue.IssueType, allowed)
|
|
}
|
|
}
|
|
|
|
// EpicHasOpenChildren validates that an epic does not have open children.
|
|
// If the issue is an epic with open children, returns an error unless force is true.
|
|
// Non-epic issues pass through without validation.
|
|
func EpicHasOpenChildren(force bool, openChildCount int) IssueValidator {
|
|
return func(id string, issue *types.Issue) error {
|
|
if issue == nil || force {
|
|
return nil
|
|
}
|
|
if issue.IssueType != types.TypeEpic {
|
|
return nil
|
|
}
|
|
if openChildCount > 0 {
|
|
return fmt.Errorf("epic %s has %d open child issue(s); close children first or use --force to override", id, openChildCount)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// forUpdate returns a validator chain for update operations.
|
|
// Validates: issue exists and is not a template.
|
|
func forUpdate() IssueValidator {
|
|
return Chain(
|
|
Exists(),
|
|
NotTemplate(),
|
|
)
|
|
}
|
|
|
|
// forClose returns a validator chain for close operations.
|
|
// Validates: issue exists, is not a template, and is not pinned (unless force).
|
|
func forClose(force bool) IssueValidator {
|
|
return Chain(
|
|
Exists(),
|
|
NotTemplate(),
|
|
NotPinned(force),
|
|
)
|
|
}
|
|
|
|
// forDelete returns a validator chain for delete operations.
|
|
// Validates: issue exists and is not a template.
|
|
func forDelete() IssueValidator {
|
|
return Chain(
|
|
Exists(),
|
|
NotTemplate(),
|
|
)
|
|
}
|
|
|
|
// forReopen returns a validator chain for reopen operations.
|
|
// Validates: issue exists, is not a template, and is closed.
|
|
func forReopen() IssueValidator {
|
|
return Chain(
|
|
Exists(),
|
|
NotTemplate(),
|
|
HasStatus(types.StatusClosed),
|
|
)
|
|
}
|