* 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>
85 lines
3.5 KiB
Go
85 lines
3.5 KiB
Go
package main
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/steveyegge/beads/internal/configfile"
|
|
)
|
|
|
|
// ExitUnsupportedWorkspaceFormat is the exit code for a command refused
|
|
// because its workspace declares a format this bd build cannot open: a
|
|
// metadata.json graph_mode other than "dependency". Stable so a wrapper can
|
|
// tell "this workspace needs a different bd build" apart from a generic
|
|
// failure (1) without grepping stderr.
|
|
//
|
|
// 16 because 13, 14 and 15 are taken (ExitGuardMismatch, ExitMigrationFrozen,
|
|
// ExitHomeDirRefused). Like ExitHomeDirRefused, it is not part of protocol v0
|
|
// §E3, which freezes 10/11/12/130.
|
|
const ExitUnsupportedWorkspaceFormat = 16
|
|
|
|
// unsupportedWorkspaceFormatError refuses a workspace whose metadata declares
|
|
// a data model other than the Issue store this build opens. Graph-preview
|
|
// builds persist graph_mode "link" plus graph_* binding fields beside an
|
|
// ordinary Dolt backend, so nothing else in the metadata tells this build
|
|
// that the database behind it is not an Issue store; opening it as one would
|
|
// run Issue migrations into it.
|
|
type unsupportedWorkspaceFormatError struct {
|
|
beadsDir string
|
|
graphMode string
|
|
}
|
|
|
|
func (e *unsupportedWorkspaceFormatError) Error() string {
|
|
return fmt.Sprintf("workspace %s uses format graph_mode %q, which this bd build does not support; %s",
|
|
e.beadsDir, e.graphMode, configfile.BackendNotOpenedGuarantee)
|
|
}
|
|
|
|
func (e *unsupportedWorkspaceFormatError) hint() string {
|
|
return fmt.Sprintf("use a bd build that supports graph_mode %q workspaces; leave graph_mode and the graph_* fields in metadata.json unchanged", e.graphMode)
|
|
}
|
|
|
|
// checkWorkspaceFormat refuses metadata whose graph_mode marker names any
|
|
// model but the default. An unknown marker is refused too: it may describe a
|
|
// format newer than this build, so it must never fall back to the Issue store.
|
|
// cfg may be nil (no metadata), which is an ordinary workspace.
|
|
func checkWorkspaceFormat(cfg *configfile.Config, beadsDir string) error {
|
|
if mode, err := cfg.GetGraphMode(); err == nil && mode == configfile.GraphModeDependency {
|
|
return nil
|
|
}
|
|
return &unsupportedWorkspaceFormatError{beadsDir: beadsDir, graphMode: cfg.GraphMode}
|
|
}
|
|
|
|
// checkDiscoveredWorkspaceFormat runs checkWorkspaceFormat on beadsDir's
|
|
// metadata as LoadForDiscovery reads it, which never rewrites the workspace.
|
|
// A path that opens or initializes a workspace without passing through command
|
|
// admission runs it first: configfile.Load would otherwise migrate a legacy
|
|
// config.json into metadata.json before the format check could refuse it.
|
|
// Metadata that does not load is left to the caller's own load to report.
|
|
func checkDiscoveredWorkspaceFormat(beadsDir string) error {
|
|
cfg, err := configfile.LoadForDiscovery(beadsDir)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
return checkWorkspaceFormat(cfg, beadsDir)
|
|
}
|
|
|
|
func isUnsupportedWorkspaceFormat(err error) bool {
|
|
var formatErr *unsupportedWorkspaceFormatError
|
|
return errors.As(err, &formatErr)
|
|
}
|
|
|
|
// handleWorkspaceGuardError renders a workspace admission refusal from
|
|
// guardLegacyUpgradeWorkspace. An unsupported workspace format gets a hint and
|
|
// ExitUnsupportedWorkspaceFormat; every other refusal keeps HandleError's
|
|
// rendering and exit 1.
|
|
func handleWorkspaceGuardError(err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
var formatErr *unsupportedWorkspaceFormatError
|
|
if !errors.As(err, &formatErr) {
|
|
return HandleError("%v", err)
|
|
}
|
|
_ = HandleErrorWithHint(formatErr.Error(), formatErr.hint())
|
|
return &exitError{Code: ExitUnsupportedWorkspaceFormat}
|
|
}
|