* 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>
79 lines
3.2 KiB
Go
79 lines
3.2 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"os"
|
|
"testing"
|
|
)
|
|
|
|
// TestEmbeddedCountIncludeEphemeral covers the plane knob end to end, on the
|
|
// same fixture shape TestEmbeddedCountIncludeInfra uses.
|
|
//
|
|
// It is a SEPARATE file rather than a subtest of that function on purpose:
|
|
// TestEmbeddedCountIncludeInfra pins the existing --include-infra contract and
|
|
// is left byte-for-byte untouched, so a reader can see at a glance that this
|
|
// flag changed nothing it asserts.
|
|
//
|
|
// The distinction being pinned: --include-infra bundles four changes (see
|
|
// issueops.CountRequest.IncludeInfra) and its template exclusion silently drops
|
|
// template rows of the named type. --include-ephemeral admits the plane and
|
|
// nothing else.
|
|
func TestEmbeddedCountIncludeEphemeral(t *testing.T) {
|
|
if os.Getenv("BEADS_TEST_EMBEDDED_DOLT") != "1" {
|
|
t.Skip("set BEADS_TEST_EMBEDDED_DOLT=1 to run embedded dolt integration tests")
|
|
}
|
|
t.Parallel()
|
|
|
|
bd := buildEmbeddedBD(t)
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "ie")
|
|
|
|
// 3 durable tasks (one closed), 2 no_history tasks, 1 ephemeral task.
|
|
bdCreate(t, bd, dir, "durable task one", "--type", "task")
|
|
bdCreate(t, bd, dir, "durable task two", "--type", "task")
|
|
closed := bdCreate(t, bd, dir, "durable task closed", "--type", "task")
|
|
bdClose(t, bd, dir, closed.ID)
|
|
bdCreate(t, bd, dir, "nohistory task one", "--type", "task", "--no-history")
|
|
bdCreate(t, bd, dir, "nohistory task two", "--type", "task", "--no-history")
|
|
bdCreate(t, bd, dir, "ephemeral task", "--type", "task", "--ephemeral")
|
|
|
|
countOf := func(args ...string) int {
|
|
t.Helper()
|
|
m := bdCountJSON(t, bd, dir, args...)
|
|
return int(m["count"].(float64))
|
|
}
|
|
|
|
t.Run("default stays durable-only", func(t *testing.T) {
|
|
if got := countOf("--type", "task"); got != 3 {
|
|
t.Errorf("bd count --type task = %d, want 3 (the default before this change, unchanged)", got)
|
|
}
|
|
})
|
|
|
|
t.Run("include-ephemeral reaches the wisps tier", func(t *testing.T) {
|
|
if got := countOf("--type", "task", "--include-ephemeral"); got != 6 {
|
|
t.Errorf("bd count --type task --include-ephemeral = %d, want 6 "+
|
|
"(3 durable + 2 no_history + 1 ephemeral)", got)
|
|
}
|
|
})
|
|
|
|
t.Run("count and list read the same plane", func(t *testing.T) {
|
|
// The property is that both reach the wisps tier under the flag — NOT
|
|
// that the two numbers are equal. A count includes template rows and a
|
|
// listing does not, with or without this flag (see
|
|
// issueops.CountRequest.IncludeEphemeral), and this fixture has no
|
|
// templates only because it does not need any. Asserting raw equality
|
|
// here would pass by accident and break the day someone adds one.
|
|
durable := len(bdListJSON(t, bd, dir,
|
|
"--type", "task", "--status", "all", "--limit", "0"))
|
|
withPlane := len(bdListJSON(t, bd, dir,
|
|
"--type", "task", "--include-ephemeral", "--status", "all", "--limit", "0"))
|
|
if withPlane-durable != 3 {
|
|
t.Errorf("list gained %d rows from the plane, want 3 (2 no_history + 1 ephemeral)",
|
|
withPlane-durable)
|
|
}
|
|
if got := countOf("--type", "task", "--include-ephemeral") - countOf("--type", "task"); got != 3 {
|
|
t.Errorf("count gained %d rows from the plane, want 3 — count and list "+
|
|
"must admit the same tier even where their totals differ", got)
|
|
}
|
|
})
|
|
}
|