* fix(beads): make an explicit BEADS_DIR authoritative during discovery FindBeadsDir ignored a BEADS_DIR that did not hold project files yet (missing, empty, or uninitialized) and walked up from the current directory instead. PersistentPreRun then rebound BEADS_DIR to whatever ancestor workspace the walk found, so: - `bd init` refused with "already initialized" because of the parent workspace instead of initializing the named directory; - data commands (`bd list`, `bd create`, ...) read and wrote the parent's store. FindBeadsDir now returns "" for such a BEADS_DIR, matching FindDatabasePath, which already refused to fall back. Commands that create a workspace (import/setup default path, bootstrap's fresh-clone synthesis) target the named directory via the new beads.ExplicitBeadsDir helper instead of CWD. Behaviour with BEADS_DIR unset is unchanged. Tests: FindBeadsDir unit cases (missing/empty/non-project BEADS_DIR, initialized BEADS_DIR, unset BEADS_DIR still walks up), and a bd subprocess regression in embedded and proxied-server modes (init under an initialized parent, list refuses, create lands in the new store). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): note that BEADS_DIR at a project root now errors Review follow-up for the explicit-BEADS_DIR fix: call out the behaviour change for BEADS_DIR pointing at a project root (or a not-yet-created .beads), which previously worked only because discovery walked up. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Gas City Adopt-PR <adopt-pr@gascity.local> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
146 lines
5.6 KiB
Go
146 lines
5.6 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/steveyegge/beads/internal/configfile"
|
|
"github.com/steveyegge/beads/internal/storage/dbproxy/proxy"
|
|
)
|
|
|
|
// explicitBeadsDirMode describes how a storage mode's bd subprocesses are
|
|
// initialized and run for the explicit-BEADS_DIR regression tests.
|
|
type explicitBeadsDirMode struct {
|
|
initArgs []string
|
|
env func(home string) []string
|
|
proxied bool
|
|
}
|
|
|
|
// runExplicitBeadsDirBD runs bd in dir with the mode's isolated environment.
|
|
// beadsDir, when non-empty, is passed as an explicit BEADS_DIR.
|
|
func runExplicitBeadsDirBD(t *testing.T, bd string, mode explicitBeadsDirMode, home, dir, beadsDir string, args ...string) (string, string, error) {
|
|
t.Helper()
|
|
cmd := exec.Command(bd, args...)
|
|
cmd.Dir = dir
|
|
env := append(mode.env(home), "XDG_CONFIG_HOME="+filepath.Join(home, ".config"))
|
|
if beadsDir != "" {
|
|
env = append(env, "BEADS_DIR="+beadsDir)
|
|
}
|
|
cmd.Env = env
|
|
var stdout, stderr bytes.Buffer
|
|
cmd.Stdout = &stdout
|
|
cmd.Stderr = &stderr
|
|
err := cmd.Run()
|
|
return stdout.String(), stderr.String(), err
|
|
}
|
|
|
|
// testExplicitBeadsDirIsAuthoritative covers the regression where an explicit
|
|
// BEADS_DIR without project files was ignored during discovery: bd walked up
|
|
// from CWD, bound the parent workspace, and `bd init` then refused ("already
|
|
// initialized") while data commands read and wrote the parent's store.
|
|
func testExplicitBeadsDirIsAuthoritative(t *testing.T, bd string, mode explicitBeadsDirMode) {
|
|
t.Helper()
|
|
home := t.TempDir()
|
|
parent := t.TempDir()
|
|
initGitRepoAt(t, parent)
|
|
parentBeadsDir := filepath.Join(parent, ".beads")
|
|
child := filepath.Join(parent, "child")
|
|
explicit := filepath.Join(child, ".beads")
|
|
if err := os.MkdirAll(child, 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if mode.proxied {
|
|
for _, root := range []string{filepath.Join(parentBeadsDir, "dolt"), filepath.Join(explicit, "dolt")} {
|
|
root := root
|
|
t.Cleanup(func() {
|
|
if _, err := os.Stat(root); err != nil {
|
|
return
|
|
}
|
|
if err := proxy.Shutdown(root); err != nil {
|
|
t.Logf("proxy.Shutdown(%s): %v", root, err)
|
|
}
|
|
})
|
|
shutdownProxyOnInterrupt(t, root)
|
|
}
|
|
}
|
|
|
|
initArgs := append([]string{"init", "--quiet", "--non-interactive", "--skip-agents", "--skip-hooks"}, mode.initArgs...)
|
|
if stdout, stderr, err := runExplicitBeadsDirBD(t, bd, mode, home, parent, "", append(initArgs, "--prefix", "par")...); err != nil {
|
|
t.Fatalf("parent bd init: %v\nstdout:\n%s\nstderr:\n%s", err, stdout, stderr)
|
|
}
|
|
parentID, stderr, err := runExplicitBeadsDirBD(t, bd, mode, home, parent, "", "create", "--silent", "parent issue")
|
|
if err != nil {
|
|
t.Fatalf("parent bd create: %v\nstderr:\n%s", err, stderr)
|
|
}
|
|
parentID = strings.TrimSpace(parentID)
|
|
|
|
// A data command against the uninitialized explicit dir must not fall
|
|
// back to the parent workspace.
|
|
stdout, stderr, err := runExplicitBeadsDirBD(t, bd, mode, home, child, explicit, "list", "--json")
|
|
if err == nil || strings.Contains(stdout, parentID) {
|
|
t.Errorf("bd list with BEADS_DIR=%s (no workspace yet) should fail without reading the parent store; err=%v\nstdout:\n%s\nstderr:\n%s", explicit, err, stdout, stderr)
|
|
} else if !strings.Contains(stderr, "no beads database found") {
|
|
t.Errorf("bd list with an uninitialized BEADS_DIR: want \"no beads database found\", got stderr:\n%s", stderr)
|
|
}
|
|
|
|
// bd init must initialize the explicit dir (existing but empty, as a
|
|
// caller that pre-creates it would leave it), not refuse because of the
|
|
// parent workspace.
|
|
if err := os.MkdirAll(explicit, 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if stdout, stderr, err := runExplicitBeadsDirBD(t, bd, mode, home, child, explicit, append(initArgs, "--prefix", "kid")...); err != nil {
|
|
t.Fatalf("bd init with BEADS_DIR=%s: %v\nstdout:\n%s\nstderr:\n%s", explicit, err, stdout, stderr)
|
|
}
|
|
childCfg, err := configfile.Load(explicit)
|
|
if err != nil || childCfg == nil {
|
|
t.Fatalf("load %s metadata: cfg=%v err=%v", explicit, childCfg, err)
|
|
}
|
|
if childCfg.DoltDatabase != "kid" {
|
|
t.Fatalf("explicit BEADS_DIR dolt_database = %q, want %q", childCfg.DoltDatabase, "kid")
|
|
}
|
|
parentCfg, err := configfile.Load(parentBeadsDir)
|
|
if err != nil || parentCfg == nil || parentCfg.DoltDatabase != "par" {
|
|
t.Fatalf("parent metadata changed: cfg=%+v err=%v", parentCfg, err)
|
|
}
|
|
|
|
// Writes through the explicit dir land in the new workspace only.
|
|
childID, stderr, err := runExplicitBeadsDirBD(t, bd, mode, home, child, explicit, "create", "--silent", "child issue")
|
|
if err != nil {
|
|
t.Fatalf("bd create with BEADS_DIR=%s: %v\nstderr:\n%s", explicit, err, stderr)
|
|
}
|
|
childID = strings.TrimSpace(childID)
|
|
if !strings.HasPrefix(childID, "kid-") {
|
|
t.Fatalf("bd create with BEADS_DIR=%s minted %q, want a kid- ID", explicit, childID)
|
|
}
|
|
parentList, stderr, err := runExplicitBeadsDirBD(t, bd, mode, home, parent, "", "list", "--json")
|
|
if err != nil {
|
|
t.Fatalf("parent bd list: %v\nstderr:\n%s", err, stderr)
|
|
}
|
|
if strings.Contains(parentList, childID) || !strings.Contains(parentList, parentID) {
|
|
t.Fatalf("parent store should hold only %s, got:\n%s", parentID, parentList)
|
|
}
|
|
}
|
|
|
|
func TestEmbeddedInitExplicitBeadsDirIsAuthoritative(t *testing.T) {
|
|
if os.Getenv("BEADS_TEST_EMBEDDED_DOLT") != "1" {
|
|
t.Skip("set BEADS_TEST_EMBEDDED_DOLT=1 to run embedded dolt init tests")
|
|
}
|
|
t.Parallel()
|
|
testExplicitBeadsDirIsAuthoritative(t, buildEmbeddedBD(t), explicitBeadsDirMode{env: bdEnv})
|
|
}
|
|
|
|
func TestProxiedServerInitExplicitBeadsDirIsAuthoritative(t *testing.T) {
|
|
requireProxiedServerEnv(t)
|
|
testExplicitBeadsDirIsAuthoritative(t, buildEmbeddedBD(t), explicitBeadsDirMode{
|
|
initArgs: []string{"--proxied-server"},
|
|
env: bdProxiedEnv,
|
|
proxied: true,
|
|
})
|
|
}
|