* fix(configfile): carry graph_mode and graph_* binding through Save Graph-preview builds of bd persist a per-workspace format in metadata.json: "graph_mode": "link" plus graph_scope_url, graph_authority_id, graph_workspace, graph_schema_version and graph_ready, beside an ordinary Dolt backend. configfile.Config had no such fields, so every Save, and Load's config.json -> metadata.json migration, rewrote the file without them, turning a graph workspace's metadata into an ordinary Issue workspace's. Config now carries the marker and the binding as omitempty fields, so a Save round-trips them unchanged and metadata.json written for an ordinary workspace is byte-for-byte what it was. GetGraphMode resolves the marker: absent or "dependency" is the historical default, "link" is recognized, and any other value is an error rather than a fallback to the Issue store. Nothing in this build opens a non-default mode; the CLI refusal follows in the next commit. Ported from the donnabox fork commit deea8d57df (graph_mode.go, graph_mode_test.go and the configfile.go fields), without any graph code. The binding-survives-Save and omitted-from-ordinary-metadata tests are new. Co-authored-by: Donna Box <dbox@boxenllc.com> Agent-Signature: claude-code-claude-opus-5-5-unknown-reasoning on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(cli): refuse graph_mode workspaces before opening them A workspace whose metadata.json declares a graph_mode other than "dependency" holds a graph database behind an ordinary Dolt backend, and nothing else in its metadata says so. bd admitted it like any current workspace: `bd list` ran the Issue schema initialization against the graph database (beads_graph_<id>), `bd init --force` wrote a .gitignore and a .beads/dolt root into it, `bd dolt start` started a server for it, and `bd doctor` reported on it as an Issue store. guardLegacyUpgradeWorkspace, the admission check every store-opening command, store-less command with workspace effects, init, doctor and bootstrap already run before touching a workspace, now refuses such a workspace first, before the legacy classifications that would admit it or report it as a legacy store to migrate. An unknown graph_mode value is refused the same way. The refusal is a typed error naming the workspace and the format, rendered with a hint (as JSON under --json) and exit code 16, ExitUnsupportedWorkspaceFormat, so a wrapper can tell "needs a different bd build" from a generic failure. `bd version`, `bd --version`, `bd help` and completion stay exempt, as they are for legacy workspaces. validateConfiguredBackend refuses the same metadata, which covers the store-open paths that skip command admission (routed writes, cross-repository reads, create --repo). Tests: guard and store-factory unit tests; a subprocess e2e test that show/list/create/context/where/dolt start/doctor/bootstrap/init are refused with exit 16 and leave .beads byte-identical (metadata.json and legacy config.json, link and unknown markers, embedded and server layouts), and that store-less commands still run; an embedded test that an ordinary workspace, with the marker absent or "dependency", still creates and lists issues and keeps the marker through a metadata.json rewrite. The guard hunk and graph_mode_admission_e2e_test.go are ported from the donnabox fork commit deea8d57df; the exit code, rendering, store factory backstop and remaining tests are new. Co-authored-by: Donna Box <dbox@boxenllc.com> Agent-Signature: claude-code-claude-opus-5-5-unknown-reasoning on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(cli): refuse graph workspaces reached outside command admission Command admission refuses a graph_mode workspace a command runs in, but bd also reaches workspaces before or without admission: a create --repo target, the path --db or BEADS_DB names, and the stores the factories open for routed and cross-repository work. On those paths a workspace marked only by a legacy config.json was changed before anything refused it: configfile.Load migrates config.json into metadata.json before the format check sees the loaded metadata, and create --repo initialized such a target as a new workspace. Where the refusal did come, create reported it with exit 1 rather than 16. - checkDiscoveredWorkspaceFormat checks a workspace's metadata as configfile.LoadForDiscovery reads it, which never rewrites it. ensureBeadsDirForPath, the dry-run target open and the four store factories (cgo and nocgo builds) run it before their own load. - resolveBeadsDirForDBPath and findDatabaseInBeadsDir locate a workspace with LoadForDiscovery, so resolving --db, BEADS_DB or a create target no longer migrates it. - bd create renders a refused target as the workspace refusal, exit 16 with its hint, on the initializing and both dry-run paths. A dry run without --parent opens no target, so it now checks a local one before rendering the preview (checkRepoTargetFormat). - bd bootstrap, when discovery finds no workspace, reads each .beads from the working directory up to the repository root without migrating it and refuses one in a format this build cannot open, the way commands without a workspace already do. A .beads marked only by config.json is passed over by discovery, so bootstrap reported "no workspace" there instead of exit 16. The walk now returns its candidates (undiscoveredWorkspaceCandidates) to both checks: handing it the check as a func(string) error made gosec's G702 taint analysis connect BEADS_DIR to every func(string) error that runs git. - backendNameForErrorFraming reads with LoadForDiscovery, and loadDoltBackendConfig, bd dolt status and bd dolt show refuse a graph workspace before their migrating configfile.Load. Admission refuses first on every path that reaches them today; this keeps a new caller from migrating a legacy config.json before the refusal. - The CHANGELOG entry and the configfile comment now claim what holds: a routed read fails without touching a graph workspace but not with code 16, and a Save keeps only the known graph_* fields, with the tags graph-preview builds declare. workspace_gate.go no longer lists the pre-gate discovery reads as migrating. - New e2e rows run create --repo from a workspace and from outside one, create --dry-run with and without --parent, --db, BEADS_DB, init --proxied-server, bootstrap in a workspace nested in a graph one, and the hook shim's bd hooks run pre-commit against every fixture; each refusal must exit 16 and name the format and the hint. bootstrap in a workspace marked only by config.json now refuses like the other commands. The store factory test also runs on a config.json graph workspace, TestWorkspaceMetadataReadersLeaveGraphWorkspaceUnchanged covers the framing, bd dolt loader and diagnostic reads, and TestNocgoStoreFactoriesRefuseGraphWorkspace covers the CGO_ENABLED=0 factories; bazel.yml's pure lane runs it by name (PURE_CMD_BD_TESTS, pinned in scripts/ci_workflow_test.go). Measured with gocyclo/gocognit: every function this changes stays below the PR's worst changed function (guardLegacyUpgradeWorkspaceForInit 29/28, resolveBeadsDirForDBPath 26/36); showDoltConfig is 19/31 (was 18/30) and guardUndiscoveredLegacyWorkspace 3/3 (was 9/12). Agent-Signature: claude-code-claude-opus-5-5-max on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Donna Box <dbox@boxenllc.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Eddie the Engineer <338826946+gascity-eddie[bot]@users.noreply.github.com>
160 lines
6 KiB
Go
160 lines
6 KiB
Go
//go:build !cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/steveyegge/beads/internal/configfile"
|
|
"github.com/steveyegge/beads/internal/storage"
|
|
"github.com/steveyegge/beads/internal/storage/backends"
|
|
"github.com/steveyegge/beads/internal/storage/dbproxy/util"
|
|
"github.com/steveyegge/beads/internal/storage/dolt"
|
|
)
|
|
|
|
func usesSQLServer() bool {
|
|
return true
|
|
}
|
|
|
|
// isEmbeddedMode reports whether the command is using embedded Dolt storage.
|
|
func isEmbeddedMode() bool {
|
|
return false
|
|
}
|
|
|
|
func usesProxiedServer() bool {
|
|
if shouldUseGlobals() {
|
|
return proxiedServerMode
|
|
}
|
|
return cmdCtx != nil && cmdCtx.ProxiedServerMode
|
|
}
|
|
|
|
// newRegisteredBackendStore is the non-CGO twin of the CGO build's registry
|
|
// factory: identical, since the backend registry does not depend on CGO. It
|
|
// exists here too so the root pre-run's registry arm has one activating
|
|
// construction path in both builds.
|
|
func newRegisteredBackendStore(ctx context.Context, name, beadsDir string, readOnly bool) (s storage.DoltStorage, err error) {
|
|
defer func() { s, err = activateVersionedHistoryStore(ctx, s, err) }()
|
|
defer func() { s, err = activateEventsJournalStore(beadsDir, s, err) }()
|
|
backend, ok := backends.Lookup(name)
|
|
if !ok {
|
|
return nil, fmt.Errorf("storage backend %q is not registered", name)
|
|
}
|
|
if readOnly {
|
|
return backend.OpenReadOnly(ctx, beadsDir)
|
|
}
|
|
return backend.Open(ctx, beadsDir)
|
|
}
|
|
|
|
// newDoltStore applies events-journal activation for the same reason its CGO
|
|
// twin does — see the note at the top of events_journal.go.
|
|
func newDoltStore(ctx context.Context, cfg *dolt.Config) (s storage.DoltStorage, err error) {
|
|
defer func() { s, err = activateVersionedHistoryStore(ctx, s, err) }()
|
|
defer func() { s, err = activateEventsJournalStore(cfg.BeadsDir, s, err) }()
|
|
if cfg.ProxiedServer {
|
|
return nil, errProxiedStoreUnrouted()
|
|
}
|
|
if !cfg.ServerMode {
|
|
return nil, fmt.Errorf("%s", nocgoEmbeddedErrMsg)
|
|
}
|
|
return dolt.New(ctx, cfg)
|
|
}
|
|
|
|
// acquireEmbeddedLock returns a no-op lock in non-CGO builds.
|
|
func acquireEmbeddedLock(_ string, _ bool) (util.Unlocker, error) {
|
|
return util.NoopLock{}, nil
|
|
}
|
|
|
|
// newDoltStoreFromConfig creates a SQL-server-backed storage backend from config.
|
|
func newDoltStoreFromConfig(ctx context.Context, beadsDir string) (s storage.DoltStorage, err error) {
|
|
defer func() { s, err = activateVersionedHistoryStore(ctx, s, err) }()
|
|
defer func() { s, err = activateEventsJournalStore(beadsDir, s, err) }()
|
|
if err := checkDiscoveredWorkspaceFormat(beadsDir); err != nil {
|
|
return nil, err
|
|
}
|
|
cfg, err := configfile.Load(beadsDir)
|
|
if err != nil {
|
|
// Name the real cause: without this, a present-but-unloadable
|
|
// metadata.json surfaces as the misleading "embedded requires CGO"
|
|
// message below.
|
|
return nil, fmt.Errorf("load %s: %w", configfile.ConfigPath(beadsDir), err)
|
|
}
|
|
if err := validateConfiguredBackend(cfg, beadsDir); err != nil {
|
|
return nil, err
|
|
}
|
|
cfg = normalizeLoadedConfig(cfg)
|
|
if backend, ok := backends.Lookup(cfg.GetBackend()); ok {
|
|
return backend.Open(ctx, beadsDir)
|
|
}
|
|
if cfg != nil && cfg.IsDoltProxiedServerMode() {
|
|
return nil, errProxiedStoreUnrouted()
|
|
}
|
|
if effectiveServerMode(beadsDir, cfg) {
|
|
return dolt.NewFromConfig(ctx, beadsDir)
|
|
}
|
|
return nil, fmt.Errorf("%s", nocgoEmbeddedErrMsg)
|
|
}
|
|
|
|
// newExistingDoltStoreFromConfig is the non-CGO twin of the CGO build's
|
|
// routed-write factory. That one differs from newDoltStoreFromConfig only by
|
|
// refusing to create a missing EMBEDDED database, and this build has no
|
|
// embedded store; a server-mode open never creates a missing database.
|
|
func newExistingDoltStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
|
return newDoltStoreFromConfig(ctx, beadsDir)
|
|
}
|
|
|
|
// newReadOnlyStoreFromConfig creates a read-only SQL-server-backed storage
|
|
// backend. It does not activate the events journal: the store refuses writes,
|
|
// so there is no mutation for a journal row to accompany (exemption is recorded
|
|
// in the construction guard). The registry arm is the exception the cgo
|
|
// twin, openNonMutatingStoreFromConfig, describes.
|
|
func newReadOnlyStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
|
if err := checkDiscoveredWorkspaceFormat(beadsDir); err != nil {
|
|
return nil, err
|
|
}
|
|
cfg, err := configfile.Load(beadsDir)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("load %s: %w", configfile.ConfigPath(beadsDir), err)
|
|
}
|
|
if err := validateConfiguredBackend(cfg, beadsDir); err != nil {
|
|
return nil, err
|
|
}
|
|
cfg = normalizeLoadedConfig(cfg)
|
|
if backend, ok := backends.Lookup(cfg.GetBackend()); ok {
|
|
return backend.OpenReadOnly(ctx, beadsDir)
|
|
}
|
|
if cfg != nil && cfg.IsDoltProxiedServerMode() {
|
|
return nil, errProxiedStoreUnrouted()
|
|
}
|
|
if effectiveServerMode(beadsDir, cfg) {
|
|
return dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
|
}
|
|
return nil, fmt.Errorf("%s", nocgoEmbeddedErrMsg)
|
|
}
|
|
|
|
// newPreviewStoreFromConfig is the non-CGO twin of the CGO build's preview
|
|
// factory. The two differ only in how they open the EMBEDDED store, and this
|
|
// build has no embedded store at all, so preview and read-only coincide here.
|
|
func newPreviewStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
|
return newReadOnlyStoreFromConfig(ctx, beadsDir)
|
|
}
|
|
|
|
const nocgoEmbeddedErrMsg = `embedded Dolt requires a CGO build, but this bd binary was built with CGO_ENABLED=0.
|
|
|
|
Three options:
|
|
|
|
1. Use the proxied dolt sql-server (no external server, no reinstall):
|
|
bd init --proxied-server
|
|
bd spawns a per-workspace proxy + child dolt sql-server under
|
|
.beads/dolt/ and manages their lifecycle for you.
|
|
|
|
2. Use external server mode (no reinstall needed):
|
|
bd init --server
|
|
Requires a running 'dolt sql-server'. See docs/architecture/dolt.md.
|
|
|
|
3. Reinstall with embedded-mode support:
|
|
brew install beads # macOS / Linux
|
|
npm install -g @beads/bd # any platform with Node
|
|
curl -fsSL https://raw.githubusercontent.com/steveyegge/beads/main/scripts/install.sh | bash
|
|
|
|
See docs/getting-started/installation.md for the full comparison.`
|