/{internal,cmd,.goreleaser,.github}: embedded mode by default

This commit is contained in:
coffeegoddd☕️✨ 2026-03-26 13:34:12 -07:00 • committed by Steve Yegge
commit a35edfd28e
149 changed files with 213 additions and 420 deletions

View file

@ -61,7 +61,7 @@ if [ -x "$CMD_BINARY" ]; then
"$@"
else
echo "Warning: pre-built test binary not found at $CMD_BINARY, falling back to go test"
exec go test -tags embeddeddolt -v -race -count=1 -timeout 20m \
exec go test -v -race -count=1 -timeout 20m \
-run "$RUN_REGEX" \
"$@" \
./cmd/bd/

View file

@ -29,8 +29,13 @@ jobs:
with:
go-version-file: 'go.mod'
- name: Install ICU4C
run: |
sudo apt-get update
sudo apt-get install -y libicu-dev
- name: Build bd
run: CGO_ENABLED=0 go build -o bd ./cmd/bd/
run: go build -o bd ./cmd/bd/
- name: Validate docs against CLI
run: ./scripts/check-doc-flags.sh ./bd
@ -119,11 +124,11 @@ jobs:
gotestsum \
--junitfile junit.xml \
--format testdox \
-- -race -short -coverprofile=coverage.out ./...
-- -race -short -coverprofile=coverage.out -skip '^TestEmbedded' ./...
- name: Test
if: ${{ !matrix.coverage }}
run: go test ${{ matrix.test-flags }} ./...
run: go test ${{ matrix.test-flags }} -skip '^TestEmbedded' ./...
- name: Upload coverage to Codecov
if: matrix.coverage && !cancelled()
@ -142,10 +147,9 @@ jobs:
report_type: test_results
fail_ci_if_error: false
# Embedded Dolt tests - runs the embeddeddolt build tag tests
# These test the in-process Dolt engine (no server required)
# Embedded Dolt tests - test the in-process Dolt engine (no server required)
#
# Split into: build → storage tests + 4 parallel cmd test shards.
# Split into: build → storage tests + parallel cmd test shards.
# Adding new *_embedded_test.go files auto-distributes via hash sharding.
build-embedded:
@ -165,13 +169,13 @@ jobs:
sudo apt-get install -y libicu-dev
- name: Build embedded bd binary
run: go build -tags embeddeddolt -race -o /tmp/bd-embedded-test ./cmd/bd/
run: go build -race -o /tmp/bd-embedded-test ./cmd/bd/
- name: Build embedded storage test binary
run: go test -tags embeddeddolt -race -c -o /tmp/embeddeddolt-test ./internal/storage/embeddeddolt/
run: go test -race -c -o /tmp/embeddeddolt-test ./internal/storage/embeddeddolt/
- name: Build embedded cmd test binary
run: go test -tags embeddeddolt -race -c -o /tmp/bd-cmd-test ./cmd/bd/
run: go test -race -c -o /tmp/bd-cmd-test ./cmd/bd/
- name: Upload binaries
uses: actions/upload-artifact@v7
@ -254,10 +258,9 @@ jobs:
# Windows smoke tests only - full test suite times out (see bd-bmev)
# Linux/macOS run comprehensive tests; Windows just verifies binary works
#
# ICU is NOT required on Windows:
# - go-mysql-server's regex_pure.go (via -tags gms_pure_go) uses Go stdlib regexp
# - go-icu-regex's regex_windows.go also uses Go stdlib regexp (build tag: windows)
# - The only CGO deps on Windows are runtime/cgo and gozstd (bundled C source)
# Windows uses -tags gms_pure_go to avoid the ICU regex dependency.
# go-icu-regex's regex_windows.go also uses Go stdlib regexp (build tag: windows).
# CGO is still required for gozstd (bundled C source) and the embedded dolt engine.
test-windows:
name: Test (Windows - smoke)
runs-on: windows-latest
@ -274,10 +277,8 @@ jobs:
git config --global user.name "CI Bot"
git config --global user.email "ci@beads.test"
- name: Build (no CGO, pure Go)
run: |
$env:CGO_ENABLED="0"
go build -v -tags gms_pure_go -o bd.exe ./cmd/bd
- name: Build (pure Go regex)
run: go build -v -tags gms_pure_go -o bd.exe ./cmd/bd
- name: Smoke test - version
run: ./bd.exe version

View file

@ -59,7 +59,8 @@ builds:
main: ./cmd/bd
binary: bd
env:
- CGO_ENABLED=0
- CGO_ENABLED=1
- CC=/tmp/zigcc/cc-aarch64-linux-android
tags:
- gms_pure_go
goos:
@ -77,7 +78,8 @@ builds:
main: ./cmd/bd
binary: bd
env:
- CGO_ENABLED=0
- CGO_ENABLED=1
- CC=/tmp/zigcc/cc-x86_64-macos
tags:
- gms_pure_go
- netgo
@ -91,12 +93,16 @@ builds:
- -X main.Build={{.ShortCommit}}
- -X main.Commit={{.Commit}}
- -X main.Branch={{.Branch}}
hooks:
post:
- ./scripts/verify-cgo.sh "{{ .Path }}"
- id: bd-darwin-arm64
main: ./cmd/bd
binary: bd
env:
- CGO_ENABLED=0
- CGO_ENABLED=1
- CC=/tmp/zigcc/cc-aarch64-macos
tags:
- gms_pure_go
- netgo
@ -110,6 +116,9 @@ builds:
- -X main.Build={{.ShortCommit}}
- -X main.Commit={{.Commit}}
- -X main.Branch={{.Branch}}
hooks:
post:
- ./scripts/verify-cgo.sh "{{ .Path }}"
- id: bd-windows-amd64
main: ./cmd/bd
@ -168,7 +177,8 @@ builds:
main: ./cmd/bd
binary: bd
env:
- CGO_ENABLED=0
- CGO_ENABLED=1
- CC=/tmp/zigcc/cc-x86_64-freebsd
tags:
- gms_pure_go
goos:

View file

@ -11,7 +11,7 @@ var adminCmd = &cobra.Command{
GroupID: "advanced",
Short: "Administrative commands for database maintenance",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
if isEmbeddedDolt {
if isEmbeddedMode() {
return fmt.Errorf("'bd admin' is not yet supported in embedded mode")
}
return nil

View file

@ -694,7 +694,7 @@ func runADOSync(cmd *cobra.Command, _ []string) error {
}
// Embedded mode: flush Dolt commit after sync writes.
if isEmbeddedDolt && !adoSyncDryRun && store != nil {
if isEmbeddedMode() && !adoSyncDryRun && store != nil {
if _, commitErr := store.CommitPending(rootCtx, actor); commitErr != nil {
return fmt.Errorf("failed to commit: %w", commitErr)
}

View file

@ -57,7 +57,7 @@ Examples:
}
// Flush Dolt commit for embedded mode
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -112,7 +112,7 @@ func detectBootstrapAction(beadsDir string, cfg *configfile.Config) BootstrapPla
// Check for existing database (path differs between server and embedded mode)
var dbPath string
if isEmbeddedDolt {
if isEmbeddedMode() {
dbPath = filepath.Join(beadsDir, "embeddeddolt")
} else {
dbPath = doltserver.ResolveDoltDir(beadsDir)
@ -177,7 +177,7 @@ func printBootstrapPlan(plan BootstrapPlan) {
switch plan.Action {
case "none":
fmt.Printf("✓ Database already exists: %s\n", plan.BeadsDir)
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Printf(" Nothing to do.\n")
} else {
fmt.Printf(" Nothing to do. Use 'bd doctor' to check health.\n")
@ -332,7 +332,7 @@ func executeJSONLImportAction(ctx context.Context, plan BootstrapPlan, cfg *conf
func executeSyncAction(ctx context.Context, plan BootstrapPlan, cfg *configfile.Config) error {
dbName := cfg.GetDoltDatabase()
if isEmbeddedDolt {
if isEmbeddedMode() {
// Embedded mode: open a connection to the embedded engine and use
// DOLT_CLONE to create the database from the remote URL.
dataDir := filepath.Join(plan.BeadsDir, "embeddeddolt")

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -269,7 +269,7 @@ create, update, show, or close operation).`,
// Embedded mode: flush Dolt commit. DoltStore commits
// inline during CloseIssue so this is only needed for EmbeddedDoltStore.
if isEmbeddedDolt && closedCount > 0 && store != nil {
if isEmbeddedMode() && closedCount > 0 && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -89,7 +89,7 @@ Examples:
}
// Flush Dolt commit for embedded mode
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -140,7 +140,7 @@ Examples:
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt {
if isEmbeddedMode() {
if _, err := store.CommitPending(ctx, author); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -29,6 +29,9 @@ type CommandContext struct {
Verbose bool
Quiet bool
// Storage mode — true when connected to an external dolt sql-server.
ServerMode bool
// Runtime state
Store storage.DoltStorage
RootCtx context.Context

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -706,7 +706,7 @@ var createCmd = &cobra.Command{
// a separate commit. In EmbeddedDoltStore mode, CreateIssue writes
// to the working set without a Dolt commit, so we always commit
// everything together at the end.
if isEmbeddedDolt || postCreateWrites {
if isEmbeddedMode() || postCreateWrites {
commitMsg := fmt.Sprintf("bd: create %s", issue.ID)
if err := store.Commit(ctx, commitMsg); err != nil && !isDoltNothingToCommit(err) {
WarnError("failed to commit: %v", err)

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -100,7 +100,7 @@ Examples:
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && len(args) > 0 && store != nil {
if isEmbeddedMode() && len(args) > 0 && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -216,8 +216,8 @@ Force: Delete and orphan dependents
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && activeStore != nil {
if _, err := activeStore.CommitPending(ctx, actor); err != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}
}
@ -349,7 +349,7 @@ func deleteBatch(_ *cobra.Command, issueIDs []string, force bool, dryRun bool, c
updatedCount := updateTextReferencesInIssues(ctx, issueIDs, connectedIssues)
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}
@ -490,7 +490,7 @@ func deleteBatchFallback(issueIDs []string, force bool, dryRun bool, cascade boo
updatedCount := updateTextReferencesInIssues(ctx, issueIDs, connectedIssues)
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, getActorWithGit()); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -151,7 +151,7 @@ Examples:
// Check for cycles after adding dependency
warnIfCyclesExist(fromStore)
if isEmbeddedDolt && fromStore != nil {
if isEmbeddedMode() && fromStore != nil {
if _, err := fromStore.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}
@ -298,7 +298,7 @@ Examples:
// Check for cycles after adding dependency
warnIfCyclesExist(fromStore)
if isEmbeddedDolt && fromStore != nil {
if isEmbeddedMode() && fromStore != nil {
if _, err := fromStore.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}
@ -493,7 +493,7 @@ var depRemoveCmd = &cobra.Command{
FatalErrorRespectJSON("%v", err)
}
if isEmbeddedDolt && fromStore != nil {
if isEmbeddedMode() && fromStore != nil {
if _, err := fromStore.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -185,7 +185,7 @@ Examples:
bd doctor --migration=post # Validate Dolt migration completed
bd doctor --migration=pre --json # Machine-parseable migration validation`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd doctor' is not yet supported in embedded mode")
os.Exit(1)
}

View file

@ -75,7 +75,7 @@ var doltShowCmd = &cobra.Command{
Use: "show",
Short: "Show current Dolt configuration with connection status",
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt show' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -104,7 +104,7 @@ Examples:
bd dolt set data-dir /home/user/.beads-dolt/myproject`,
Args: cobra.ExactArgs(2),
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt set' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -126,7 +126,7 @@ This verifies that:
Use this before switching to server mode to ensure the server is running.`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt test' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -285,7 +285,7 @@ project path. PID and logs are stored in .beads/.
The server auto-starts transparently when needed, so manual start is rarely
required. Use this command for explicit control or diagnostics.`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt start' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -323,7 +323,7 @@ var doltStopCmd = &cobra.Command{
This sends a graceful shutdown signal. The server will restart automatically
on the next bd command unless auto-start is disabled.`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt stop' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -350,7 +350,7 @@ var doltStatusCmd = &cobra.Command{
Displays whether the server is running, its PID, port, and data directory.`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt status' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -404,7 +404,7 @@ In standalone mode, only dolt sql-server processes using the current
project's Dolt data directory are eligible for cleanup. Other projects'
servers are preserved.`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt killall' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -449,7 +449,7 @@ Stale database prefixes: testdb_*, doctest_*, doctortest_*, beads_pt*, beads_vr*
These waste server memory and can degrade performance under concurrent load.
Use --dry-run to see what would be dropped without actually dropping.`,
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd dolt clean-databases' is not supported in embedded mode (no Dolt server)")
os.Exit(1)
}
@ -658,7 +658,7 @@ var doltRemoteAddCmd = &cobra.Command{
// In embedded mode, SQL and CLI operate on the same directory,
// so the SQL add already wrote the remote config — skip CLI.
cliFailed := false
if !isEmbeddedDolt && cliURL != url {
if !isEmbeddedMode() && cliURL != url {
if err := doltutil.AddCLIRemote(dbPath, name, url); err != nil {
cliFailed = true
// Non-fatal: SQL remote was added successfully
@ -792,7 +792,7 @@ var doltRemoteListCmd = &cobra.Command{
fmt.Printf("\n%s Could not read CLI remotes: %v\n", ui.RenderWarn("⚠"), cliErr)
}
if hasDiscrepancy {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Printf("\n%s Remote discrepancies detected.\n", ui.RenderWarn("⚠"))
} else {
fmt.Printf("\n%s Remote discrepancies detected. Run 'bd doctor --fix' to resolve.\n", ui.RenderWarn("⚠"))
@ -857,7 +857,7 @@ var doltRemoteRemoveCmd = &cobra.Command{
// In embedded mode, SQL and CLI operate on the same directory,
// so the SQL remove already cleared the remote config — skip CLI.
cliRemoveFailed := false
if !isEmbeddedDolt && cliURL != "" {
if !isEmbeddedMode() && cliURL != "" {
if err := doltutil.RemoveCLIRemote(dbPath, name); err != nil {
cliRemoveFailed = true
fmt.Fprintf(os.Stderr, "Warning: SQL remote removed but CLI remote failed: %v\n", err)

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -105,7 +105,7 @@ func runDuplicate(cmd *cobra.Command, args []string) error {
return fmt.Errorf("failed to close duplicate: %w", err)
}
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
return fmt.Errorf("failed to commit: %w", err)
}
@ -173,7 +173,7 @@ func runSupersede(cmd *cobra.Command, args []string) error {
return fmt.Errorf("failed to close superseded issue: %w", err)
}
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
return fmt.Errorf("failed to commit: %w", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -90,7 +90,7 @@ Example:
}
}
}
if isEmbeddedDolt && autoMerge && !dryRun && store != nil {
if isEmbeddedMode() && autoMerge && !dryRun && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -166,9 +166,9 @@ Examples:
}
editSaved = true
// Embedded mode: flush Dolt commit (only for non-routed stores).
if isEmbeddedDolt && !result.Routed {
if _, err := issueStore.CommitPending(ctx, actor); err != nil {
// Embedded mode: flush Dolt commit.
if isEmbeddedMode() {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}
}

View file

@ -121,7 +121,7 @@ var closeEligibleEpicsCmd = &cobra.Command{
}
closedIDs = append(closedIDs, epicStatus.Epic.ID)
}
if isEmbeddedDolt && len(closedIDs) > 0 && store != nil {
if isEmbeddedMode() && len(closedIDs) > 0 && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -9,7 +9,7 @@ import (
// diagHint returns the appropriate diagnostic hint for the current mode.
// In embedded mode, 'bd doctor' is not available so the hint omits it.
func diagHint() string {
if isEmbeddedDolt {
if isEmbeddedMode() {
return "run 'bd init' to create a new database"
}
return "run 'bd doctor' to diagnose, or 'bd init' to create a new database"

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,4 +1,4 @@
//go:build embeddeddolt && cgo
//go:build cgo
package main

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -209,7 +209,7 @@ This is used by 'bd done --phase-complete' to register for gate wake notificatio
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}
@ -311,7 +311,7 @@ Use --reason to provide context for why the gate was resolved.`,
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}
@ -739,7 +739,7 @@ func closeGate(_ interface{}, gateID, reason string) error {
return err
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(rootCtx, actor); err != nil {
return err
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -123,7 +123,7 @@ Examples:
results = append(results, phaseResult{name: "Decay", detail: fmt.Sprintf("%d issues deleted", deleted)})
// Embedded mode: flush Dolt commit after deletes.
if isEmbeddedDolt && deleted > 0 && store != nil {
if isEmbeddedMode() && deleted > 0 && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
WarnError("failed to commit after decay: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -45,10 +45,10 @@ With --stealth: configures per-repository git settings for invisible beads usage
Perfect for personal use without affecting repo collaborators.
To set up a specific AI tool, run: bd setup <claude|cursor|aider|...> --stealth
Beads requires a running dolt sql-server for database operations. If a server is detected
on port 3307 or 3306, it is used automatically. Set connection details with --server-host,
--server-port, and --server-user. Password should be set via BEADS_DOLT_PASSWORD
environment variable.`,
By default, beads uses an embedded Dolt engine (no external server needed).
Pass --server to use an external dolt sql-server instead. In server mode,
set connection details with --server-host, --server-port, and --server-user.
Password should be set via BEADS_DOLT_PASSWORD environment variable.`,
Run: func(cmd *cobra.Command, _ []string) {
prefix, _ := cmd.Flags().GetString("prefix")
quiet, _ := cmd.Flags().GetBool("quiet")
@ -61,7 +61,7 @@ environment variable.`,
fromJSONL, _ := cmd.Flags().GetBool("from-jsonl")
// Dolt server connection flags
backendFlag, _ := cmd.Flags().GetString("backend")
_, _ = cmd.Flags().GetBool("server") // no-op, kept for backward compatibility
initServerMode, _ := cmd.Flags().GetBool("server")
serverHost, _ := cmd.Flags().GetString("server-host")
serverPort, _ := cmd.Flags().GetInt("server-port")
serverUser, _ := cmd.Flags().GetString("server-user")
@ -95,6 +95,16 @@ environment variable.`,
// Dolt is the only supported backend
backend := configfile.BackendDolt
// Also treat BEADS_DOLT_SERVER_MODE=1 env var as --server.
if os.Getenv("BEADS_DOLT_SERVER_MODE") == "1" {
initServerMode = true
}
// Set the global serverMode so isEmbeddedMode() returns the
// correct value for the duration of init (PersistentPreRun
// doesn't run for init, so this is the only place to set it).
serverMode = initServerMode
// Propagate --shared-server flag to env so that IsSharedServerMode(),
// ResolveDoltDir(), and DefaultConfig() all see shared mode immediately
// (before config.yaml exists). Safe: init runs once and exits.
@ -418,8 +428,9 @@ environment variable.`,
BeadsDir: beadsDir,
Database: dbName,
ServerPort: initPort,
ServerMode: initServerMode,
CreateIfMissing: true, // bd init is the only path that should create databases
AutoStart: os.Getenv("BEADS_DOLT_AUTO_START") != "0",
AutoStart: initServerMode && os.Getenv("BEADS_DOLT_AUTO_START") != "0",
}
if serverHost != "" {
doltCfg.ServerHost = serverHost
@ -431,7 +442,7 @@ environment variable.`,
doltCfg.ServerUser = serverUser
}
initLock, err := acquireEmbeddedLock(beadsDir)
initLock, err := acquireEmbeddedLock(beadsDir, initServerMode)
if err != nil {
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
os.Exit(1)
@ -442,7 +453,7 @@ environment variable.`,
// before opening the Dolt server store. Without this, a crashed init
// leaves LOCK files that cause nil pointer dereference in DoltDB.
// Skipped for embedded mode — embedded dolt has its own locking model.
if !isEmbeddedDolt {
if !isEmbeddedMode() {
dolt.CleanStaleNomsLocks(doltserver.ResolveDoltDir(beadsDir))
}
@ -559,7 +570,7 @@ environment variable.`,
}
// Persist the connection mode matching this build.
if isEmbeddedDolt {
if isEmbeddedMode() {
cfg.DoltMode = configfile.DoltModeEmbedded
} else {
cfg.DoltMode = configfile.DoltModeServer
@ -729,7 +740,7 @@ environment variable.`,
// Clean up 0-byte noms LOCK files left behind by the store open/close cycle.
// NOTE: Intentionally skipped for embedded mode. See earlier note.
if !isEmbeddedDolt {
if !isEmbeddedMode() {
dolt.CleanStaleNomsLocks(doltserver.ResolveDoltDir(beadsDir))
}
@ -867,7 +878,7 @@ environment variable.`,
// Clean up LOCK files again — the pre-commit hook may have
// reopened the database and left a new LOCK behind.
// NOTE: Intentionally skipped for embedded mode. See earlier note.
if !isEmbeddedDolt {
if !isEmbeddedMode() {
dolt.CleanStaleNomsLocks(doltserver.ResolveDoltDir(beadsDir))
}
}
@ -895,7 +906,7 @@ environment variable.`,
fmt.Printf("\n%s bd initialized successfully!\n\n", ui.RenderPass("✓"))
}
fmt.Printf(" Backend: %s\n", ui.RenderAccent(backend))
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Printf(" Mode: %s\n", ui.RenderAccent("embedded"))
} else {
host := serverHost
@ -938,7 +949,7 @@ environment variable.`,
// Skipped in embedded mode: diagnostics use dolt.NewFromConfigWithOptions
// which auto-starts a dolt sql-server. Embedded init already validates
// the database via initSchema.
if !isEmbeddedDolt {
if !isEmbeddedMode() {
doctorResult := runInitDiagnostics(cwd)
hasIssues := false
for _, check := range doctorResult.Checks {
@ -980,7 +991,7 @@ func init() {
initCmd.Flags().String("backend", "", "Storage backend (default: dolt). --backend=sqlite prints deprecation notice.")
// Dolt server connection flags
initCmd.Flags().Bool("server", false, "Use server mode (currently the default; embedded mode returning soon)")
initCmd.Flags().Bool("server", false, "Use external dolt sql-server instead of embedded engine")
initCmd.Flags().String("server-host", "", "Dolt server host (default: 127.0.0.1)")
initCmd.Flags().Int("server-port", 0, "Dolt server port (default: 3307)")
initCmd.Flags().String("server-user", "", "Dolt server MySQL user (default: root)")
@ -1063,7 +1074,7 @@ func checkExistingBeadsDataAt(beadsDir string, prefix string) error {
// Embedded mode stores databases under `.beads/embeddeddolt/<db>/`.
// Treat any present embedded DB as "already initialized" (guard against
// accidental re-init / data loss).
if isEmbeddedDolt {
if isEmbeddedMode() {
embeddedRoot := filepath.Join(beadsDir, "embeddeddolt")
entries, err := os.ReadDir(embeddedRoot)
if err != nil {
@ -1364,7 +1375,7 @@ func promptContributorMode() (isContributor bool, err error) {
func verifyMetadata(ctx context.Context, store storage.DoltStorage, key, value string) bool {
if err := store.SetMetadata(ctx, key, value); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to write %s metadata: %v\n", key, err)
if !isEmbeddedDolt {
if !isEmbeddedMode() {
fmt.Fprintf(os.Stderr, " Run 'bd doctor --fix' to repair.\n")
}
return false
@ -1373,7 +1384,7 @@ func verifyMetadata(ctx context.Context, store storage.DoltStorage, key, value s
readBack, err := store.GetMetadata(ctx, key)
if err != nil || readBack != value {
fmt.Fprintf(os.Stderr, "Warning: %s metadata write did not persist (wrote %q, read %q)\n", key, value, readBack)
if !isEmbeddedDolt {
if !isEmbeddedMode() {
fmt.Fprintf(os.Stderr, " Run 'bd doctor --fix' to repair.\n")
}
return false

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (
@ -50,9 +48,9 @@ func buildEmbeddedBD(t *testing.T) string {
name = "bd.exe"
}
embeddedBD = filepath.Join(tmpDir, name)
cmd := exec.Command("go", "build", "-tags", "embeddeddolt", "-o", embeddedBD, ".")
cmd := exec.Command("go", "build", "-o", embeddedBD, ".")
if out, err := cmd.CombinedOutput(); err != nil {
embeddedBDErr = fmt.Errorf("go build -tags embeddeddolt failed: %v\n%s", err, out)
embeddedBDErr = fmt.Errorf("go build failed: %v\n%s", err, out)
}
})
if embeddedBDErr != nil {

View file

@ -161,7 +161,7 @@ func installGitHooks() error {
oldPath := hook.path + ".old"
if err := os.Rename(hook.path, oldPath); err != nil {
fmt.Fprintf(os.Stderr, "%s Failed to chain with existing %s hook: %v\n", ui.RenderWarn("⚠"), hook.name, err)
if !isEmbeddedDolt {
if !isEmbeddedMode() {
fmt.Fprintf(os.Stderr, "You can resolve this with: %s\n", ui.RenderAccent("bd doctor --fix"))
}
continue

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -40,7 +40,7 @@ func processBatchLabelOperation(issueIDs []string, label string, operation strin
}
// Embedded mode: flush Dolt commit. transact() only commits the SQL
// transaction; a Dolt commit is needed separately.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -68,7 +68,7 @@ Examples:
// Check for cycles after adding dependency
warnIfCyclesExist(fromStore)
if isEmbeddedDolt && fromStore != nil {
if isEmbeddedMode() && fromStore != nil {
if _, err := fromStore.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -58,6 +58,7 @@ var (
)
var (
sandboxMode bool
serverMode bool // True when using external dolt sql-server (dolt_mode=server)
readonlyMode bool // Read-only mode: block write operations (for worker sandboxes)
storeIsReadOnly bool // Track if store was opened read-only (for staleness checks)
lockTimeout = 30 * time.Second // Dolt open timeout (fixed default)
@ -591,6 +592,12 @@ var rootCmd = &cobra.Command{
fmt.Fprintf(os.Stderr, "warning: failed to load beads config from %s: %v\n", beadsDir, cfgErr)
}
if cfg != nil {
doltCfg.ServerMode = cfg.IsDoltServerMode()
serverMode = doltCfg.ServerMode
if cmdCtx != nil {
cmdCtx.ServerMode = doltCfg.ServerMode
}
// Always set database name (needed for bootstrap to find
// prefix-based databases like "beads_hq"; see #1669)
doltCfg.Database = cfg.GetDoltDatabase()
@ -626,7 +633,7 @@ var rootCmd = &cobra.Command{
// These prevent the Dolt server from opening databases (SIGSEGV or
// "database is locked"). Safe because we haven't connected yet.
// NOTE: Intentionally skipped for embedded mode.
if !isEmbeddedDolt {
if !isEmbeddedMode() {
if removed, _ := dolt.CleanStaleNomsLocks(doltPath); removed > 0 {
debug.Logf("cleaned %d stale noms LOCK file(s) from %s", removed, doltPath)
}

View file

@ -31,7 +31,7 @@ func handleFreshCloneError(err error) bool {
fmt.Fprintf(os.Stderr, "Error: Database not initialized\n\n")
fmt.Fprintf(os.Stderr, "This appears to be a fresh clone or the database needs initialization.\n")
if !isEmbeddedDolt {
if !isEmbeddedMode() {
fmt.Fprintf(os.Stderr, "\nTo diagnose, run:\n")
fmt.Fprintf(os.Stderr, " bd doctor\n\n")
} else {

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -253,7 +253,7 @@ func handleDoltMetadataUpdate(cfg *configfile.Config, dryRun bool) {
}
// Embedded mode: flush Dolt commit after metadata writes.
if isEmbeddedDolt && (versionUpdated || repoIDSet || cloneIDSet) && store != nil {
if isEmbeddedMode() && (versionUpdated || repoIDSet || cloneIDSet) && store != nil {
if _, err := store.CommitPending(ctx, "migrate"); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to commit: %v\n", err)
}
@ -389,7 +389,7 @@ func handleUpdateRepoID(dryRun bool, autoYes bool) {
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(rootCtx, "migrate"); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to commit: %v\n", err)
}
@ -631,7 +631,7 @@ func handleToSeparateBranch(branch string, dryRun bool) {
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && !dryRun && store != nil {
if isEmbeddedMode() && !dryRun && store != nil {
if _, commitErr := store.CommitPending(rootCtx, "migrate"); commitErr != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to commit: %v\n", commitErr)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -98,7 +98,7 @@ Examples:
}
// Flush Dolt commit for embedded mode
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -70,7 +70,7 @@ Examples:
}
// Flush Dolt commit for embedded mode
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -73,7 +73,7 @@ Examples:
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -202,7 +202,7 @@ EXAMPLES:
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && result.DeletedCount > 0 && store != nil {
if isEmbeddedMode() && result.DeletedCount > 0 && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -56,7 +56,7 @@ Example:
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt {
if isEmbeddedMode() {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -90,7 +90,7 @@ func runRename(cmd *cobra.Command, args []string) error {
fmt.Printf("Renamed %s -> %s\n", ui.RenderWarn(oldID), ui.RenderAccent(newID))
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
return fmt.Errorf("failed to commit: %w", err)
}

View file

@ -121,7 +121,7 @@ NOTE: This is a rare operation. Most users never need this command.`,
if err := repairPrefixes(ctx, store, actor, newPrefix, issues, prefixes, dryRun); err != nil {
FatalError("failed to repair prefixes: %v", err)
}
if isEmbeddedDolt && !dryRun && store != nil {
if isEmbeddedMode() && !dryRun && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}
@ -141,7 +141,7 @@ NOTE: This is a rare operation. Most users never need this command.`,
if err := store.SetConfig(ctx, "issue_prefix", newPrefix); err != nil {
FatalError("failed to update prefix: %v", err)
}
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}
@ -185,7 +185,7 @@ NOTE: This is a rare operation. Most users never need this command.`,
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -67,7 +67,7 @@ This is more explicit than 'bd update --status open' and emits a Reopened event.
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -150,7 +150,7 @@ that came from the removed repository.`,
}
// Embedded mode: flush Dolt commit before output.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
return fmt.Errorf("failed to commit: %w", err)
}
@ -378,7 +378,7 @@ Also triggers Dolt push/pull if a remote is configured.`,
// Manual push available via: bd dolt push
// Embedded mode: flush Dolt commit before output.
if isEmbeddedDolt && totalImported > 0 && store != nil {
if isEmbeddedMode() && totalImported > 0 && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
return fmt.Errorf("failed to commit: %w", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -140,7 +140,7 @@ func runShip(cmd *cobra.Command, args []string) {
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalError("failed to commit: %v", err)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -31,7 +31,7 @@ report the number of rows affected.
WARNING: Direct database access bypasses the storage layer. Use with caution.`,
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if isEmbeddedDolt {
if isEmbeddedMode() {
fmt.Fprintln(os.Stderr, "Error: 'bd sql' is not yet supported in embedded mode")
os.Exit(1)
}

View file

@ -1,5 +1,3 @@
//go:build embeddeddolt
package main
import (

View file

@ -223,7 +223,7 @@ The --reason flag provides context for the event bead (recommended).`,
}
// Embedded mode: flush Dolt commit.
if isEmbeddedDolt && store != nil {
if isEmbeddedMode() && store != nil {
if _, err := store.CommitPending(ctx, actor); err != nil {
FatalErrorRespectJSON("failed to commit: %v", err)
}

Some files were not shown because too many files have changed in this diff Show more