* feat(count): --include-ephemeral, the plane knob `bd count` never had `bd count` can admit the wisps table only through `--include-infra`, which makes four changes at once. This adds the flag that makes just the first one, mirroring the `--include-ephemeral` that `bd list` gained in #6098. ## Why the plane is unreachable on its own The write path routes on STORAGE CLASS, not type — dolt's `useWispsTable` is `Ephemeral || NoHistory || WispType != "" || IsInfraType`. So a `no_history` task lives in the wisps TABLE while remaining ordinary durable work, and a default `bd count` never sees it. Recovering it today means `--include-infra`, which this repo's own doc calls "FOUR changes at once and not one": it admits the plane, drops the infra-type exclusions, changes the template treatment, and reconciles cardinality with `bd list --all`. Its template exclusion then silently drops template rows of the named type — so a caller who wanted the plane trades one silent undercount for another. `ListRequest.IncludeEphemeral` has been the narrow answer on the listing side since #5476, and #6098 gave it a CLI flag. `CountRequest` had no equivalent field at all. This is the missing half of that pair. ## The change - `issueops.CountRequest.IncludeEphemeral` — the plane knob alone: exactly the first of `IncludeInfra`'s four changes, with none of the other three. - `internal/workapi/count.go` — one line, `} else if !in.IncludeEphemeral {`. - `cmd/bd/count.go` — flag registration, matching `bd list`'s wording. - `internal/httpapi` — `include_ephemeral` on `countIssues`, in the spec; the generated `types.gen.go` is `make api-gen` output, not hand-edited. Unset, the count is durable-plane only: the historical answer, unchanged. Every default is untouched. It does NOT promise a count and a listing agree. They already differ on TEMPLATES without this flag and still do with it — a count includes template rows unless `IncludeInfra` excludes them, a listing excludes them unless `IncludeTemplates` admits them. That predates this and is unchanged by it; only `IncludeInfra` sets out to reconcile cardinality, and it pays with three changes beyond the plane. ## Verification ok github.com/steveyegge/beads/internal/workapi ok github.com/steveyegge/beads/internal/httpapi ok github.com/steveyegge/beads/issueops --- PASS: TestEmbeddedCountIncludeEphemeral (39.71s) --- PASS: TestCountIncludeInfraFlagShape --- PASS: TestParseCountRequestCarriesEveryFilterFlag `TestEmbeddedCountIncludeEphemeral` was run with `BEADS_TEST_EMBEDDED_DOLT=1` and really executed — 39.71s, not a skip. The default fast tier would have skipped it and reported `ok`. `make api-gen` reproduces `types.gen.go` byte-for-byte from the spec hunk, so the two cannot drift apart in review. `go build ./...`, `go vet` and `gofmt` clean. Claude-Session: https://claude.ai/code/session_01X1jMLQTSrCwtzFRS1xeUC6 * count: reframe the comments for this repo, not the fork they came from Review on #6240 (bee-ghosttrack): five comment blocks were written from the fork's point of view and become false once merged here — "belongs upstream", "the half that still has to go upstream", "the fork's old wide default", and "upstream's default" meaning the current default. Find-and-replace, as asked: the reasoning is kept, only the frame of reference changes. "upstream's default" -> "the default before this change"; the bd list sibling "landed in #6098"; the infra-type divergence is "pinned, not fixed, here" with the reason; the embedded test's fork-maintenance history is replaced by what it actually pins. No code changes. * build(bazel): list the two test files this PR adds in their go_test srcs Maintainer review fixes for #6240, review iteration 1. The synthesis and the quality scorecard both returned approve with no required changes; this commit takes the one minor whose subject is the PR's own added files. Taken: - Change Impact / Blast Radius (minor, gate impact minor). The PR adds cmd/bd/count_include_ephemeral_embedded_test.go and internal/workapi/count_skipwisps_test.go, but neither was listed in its package's explicit go_test srcs, so the PR's own assertions were invisible to `bazel test`. Both rows are now listed. Gazelle's verdict, not a hand-guess: `make bazel-sync` was run (bazel 9.2.0 is available here) and it produced exactly these two entries. Its full output also rewrote 12 other BUILD.bazel files -- pre-existing base drift from other PRs' files, plus dep/select churn -- which is out of scope for this PR, so the generated result was reverted and only the two rows this PR is responsible for were re-applied, at the slots gazelle chose. Both srcs lists remain sorted with no duplicates (cmd/bd bd_test 637 entries, internal/workapi workapi_test 24 entries). The cgo build tag on count_include_ephemeral_embedded_test.go does not exempt it: the repo lists tag-gated *_embedded_test.go files anyway (99 of the 101 in cmd/bd are listed, and the sampled ones are simultaneously listed and tagged). Declined: - Test Evidence Quality (nit, gate impact none). The filing lane itself marked it optional and explicitly said not to gate on it, and its own reasoning holds: internal/storage/dolt/counts.go and internal/storage/embeddeddolt/counts.go both delegate to the same issueops.CountIssuesInTx, differing only in transaction acquisition. Validation: go build ./... and CGO_ENABLED=1 go vet on cmd/bd, internal/workapi and issueops all clean; go test ./internal/workapi/ ./issueops/ ok. No production code changed -- the commit is two generated-list rows. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Gas City Adopt-PR <adopt-pr@gascity.local> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
143 lines
5.3 KiB
Go
143 lines
5.3 KiB
Go
package workapi
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/beads/internal/types"
|
|
"github.com/steveyegge/beads/internal/utils"
|
|
"github.com/steveyegge/beads/issueops"
|
|
)
|
|
|
|
// countGroupColumns is the closed set issueops.CountByGroupRequest.GroupBy
|
|
// promises, mapped to what the storage seam calls each dimension. It exists so
|
|
// an unknown value is refused HERE, as ErrValidation, rather than reaching
|
|
// storage and coming back as an unclassifiable "unsupported groupBy" string.
|
|
var countGroupColumns = map[issueops.CountGroup]string{
|
|
issueops.CountGroupStatus: "status",
|
|
issueops.CountGroupPriority: "priority",
|
|
issueops.CountGroupType: "type",
|
|
issueops.CountGroupAssignee: "assignee",
|
|
issueops.CountGroupLabel: "label",
|
|
}
|
|
|
|
// ValidateCountGroup resolves a grouping dimension to the name the storage
|
|
// seam takes, refusing anything outside the published set with ErrValidation.
|
|
func ValidateCountGroup(group issueops.CountGroup) (string, error) {
|
|
column, ok := countGroupColumns[group]
|
|
if !ok {
|
|
return "", fmt.Errorf("invalid group '%s'. Valid values: status, priority, type, assignee, label%.0w",
|
|
group, issueops.ErrValidation)
|
|
}
|
|
return column, nil
|
|
}
|
|
|
|
// BuildCountFilter turns a count request into the storage-level filter: the
|
|
// single definition of what `bd count` means, which every implementation of
|
|
// issueops.Counter builds through.
|
|
//
|
|
// It is a SEPARATE builder rather than a call into BuildListFilter with the
|
|
// paging fields blanked out, because the two commands disagree about the
|
|
// default answer: a listing hides closed, pinned, template and gate rows, and a
|
|
// count hides none of them. The one place they must agree is --include-infra,
|
|
// pinned by a golden-style test comparing this builder's output against
|
|
// BuildListFilter's for the same request (count_test.go, GH#4387).
|
|
//
|
|
// cfg supplies the workspace's infra vocabulary and is only read under
|
|
// IncludeInfra; a zero ListConfig falls back to the default infra set.
|
|
func BuildCountFilter(in issueops.CountRequest, cfg ListConfig) (types.IssueFilter, error) {
|
|
filter := types.IssueFilter{
|
|
TitleSearch: in.TitleSearch,
|
|
TitleContains: in.TitleContains,
|
|
DescriptionContains: in.DescContains,
|
|
NotesContains: in.NotesContains,
|
|
CreatedAfter: in.CreatedAfter,
|
|
CreatedBefore: in.CreatedBefore,
|
|
UpdatedAfter: in.UpdatedAfter,
|
|
UpdatedBefore: in.UpdatedBefore,
|
|
ClosedAfter: in.ClosedAfter,
|
|
ClosedBefore: in.ClosedBefore,
|
|
EmptyDescription: in.EmptyDesc,
|
|
NoAssignee: in.NoAssignee,
|
|
NoLabels: in.NoLabels,
|
|
Priority: in.Priority,
|
|
PriorityMin: in.PriorityMin,
|
|
PriorityMax: in.PriorityMax,
|
|
}
|
|
if len(in.MetadataFields) > 0 {
|
|
filter.MetadataFields = in.MetadataFields
|
|
}
|
|
if in.HasMetadataKey != "" {
|
|
filter.HasMetadataKey = in.HasMetadataKey
|
|
}
|
|
if err := ValidateMetadataFilters(in.MetadataFields, in.HasMetadataKey); err != nil {
|
|
return types.IssueFilter{}, err
|
|
}
|
|
|
|
// Status and IssueType are taken as written. Neither is validated against
|
|
// the workspace vocabulary: issueops.CountRequest promises an unrecognized
|
|
// name matches nothing rather than failing.
|
|
if in.Status != "" && in.Status != "all" {
|
|
status := types.Status(in.Status)
|
|
filter.Status = &status
|
|
}
|
|
if in.IssueType != "" {
|
|
issueType := types.IssueType(in.IssueType)
|
|
filter.IssueType = &issueType
|
|
}
|
|
if in.Assignee != "" {
|
|
assignee := in.Assignee
|
|
filter.Assignee = &assignee
|
|
}
|
|
|
|
// NormalizeLabels allocates its own slice, so the caller's Labels and
|
|
// LabelsAny are read and never written — the snapshot promise on
|
|
// issueops.Counter.
|
|
if labels := utils.NormalizeLabels(in.Labels); len(labels) > 0 {
|
|
filter.Labels = labels
|
|
}
|
|
if labelsAny := utils.NormalizeLabels(in.LabelsAny); len(labelsAny) > 0 {
|
|
filter.LabelsAny = labelsAny
|
|
}
|
|
if ids := utils.NormalizeLabels(strings.Split(in.IDFilter, ",")); len(ids) > 0 {
|
|
filter.IDs = ids
|
|
}
|
|
|
|
if in.IncludeInfra {
|
|
applyCountIncludeInfra(&filter, in.IssueType, cfg)
|
|
} else if !in.IncludeEphemeral {
|
|
filter.SkipWisps = true
|
|
}
|
|
return filter, nil
|
|
}
|
|
|
|
// applyCountIncludeInfra switches the count filter to the wisps-inclusive mode
|
|
// of `bd list --include-infra` (GH#4387). It mirrors the BuildListFilter
|
|
// defaults that determine list's cardinality so that, for any filter set,
|
|
// `bd count --include-infra <filters>` returns exactly the number of rows
|
|
// `bd list --include-infra <filters> --all` materializes:
|
|
//
|
|
// - the wisps table is merged in (SkipWisps=false), picking up no_history
|
|
// beads and ephemeral wisps, like list's merge path;
|
|
// - template molecules are excluded (list's default);
|
|
// - gate beads are excluded unless requested via --type gate;
|
|
// - counting an infra type (agent/role/message, or the store-configured set)
|
|
// routes to the ephemeral wisps tier, like list's infra-type listing.
|
|
//
|
|
// A count without IncludeInfra never calls this and keeps its historical
|
|
// durable-only semantics.
|
|
func applyCountIncludeInfra(filter *types.IssueFilter, issueType string, cfg ListConfig) {
|
|
filter.SkipWisps = false
|
|
|
|
isTemplate := false
|
|
filter.IsTemplate = &isTemplate
|
|
|
|
if issueType != "gate" {
|
|
filter.ExcludeTypes = append(filter.ExcludeTypes, "gate")
|
|
}
|
|
|
|
if issueType != "" && cfg.IsInfra(issueType) {
|
|
ephemeral := true
|
|
filter.Ephemeral = &ephemeral
|
|
}
|
|
}
|