beads/internal/doltserver/servermode.go
matt wilkie baa9d02457
fix: treat --shared-server as server mode for DoltMode (#2947)
* fix: prevent silent fallback to embedded mode when shared-server is active (GH#2949)

Root cause: ResolveServerMode() and IsDoltServerMode() checked
metadata.json dolt_mode=embedded BEFORE runtime env vars, so stale
persisted metadata silently overrode active shared-server config.

Fixes:
- ResolveServerMode: env vars (BEADS_DOLT_SERVER_MODE, BEADS_DOLT_SHARED_SERVER)
  now checked before metadata.json, preventing stale embedded override
- IsDoltServerMode: now checks BEADS_DOLT_SHARED_SERVER env var (shared-server
  implies server-backed storage)
- warnSharedServerEmbeddedMismatch -> repairSharedServerEmbeddedMismatch:
  auto-repairs stale dolt_mode=embedded in metadata.json instead of just warning
- Added 6 regression tests covering the upgrade path

Closes #2949

Amp-Thread-ID: https://ampcode.com/threads/T-019d4b84-cddd-725a-a3c6-ee7e3631f2aa
Co-authored-by: Amp <amp@ampcode.com>

* fix: treat --shared-server as server mode for metadata.json DoltMode (#2946)

--shared-server sets BEADS_DOLT_SHARED_SERVER for directory resolution but
never set initServerMode, so metadata.json recorded DoltMode as "embedded"
and all subsequent commands used embedded Dolt despite config.yaml having
dolt.shared-server: true.

Also override metadata.json at runtime when dolt.shared-server is set,
so existing installs with stale metadata.json are handled without re-init.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: ensure shared server runs during init and fix isEmbeddedMode check

Two additional fixes for GH#2946:

1. Init auto-starts the shared Dolt server if not already running,
   since ResolveServerMode classifies shared-server as External
   which suppresses the normal auto-start path.

2. isEmbeddedMode() now checks doltserver.IsSharedServerMode() as a
   fallback. Dolt subcommands (status, start, stop) skip DB init in
   PersistentPreRun, so serverMode is never set from metadata.json.
   Without this, "bd dolt status" would still report embedded mode
   even with dolt.shared-server: true in config.yaml.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: apply shared-server override to loadServerModeFromConfig()

Closes the gap flagged in PR review: no-db commands (bd dolt start,
bd dolt status, bd doctor, etc.) go through loadServerModeFromConfig()
which didn't have the shared-server override for stale metadata.json.

This ensures isEmbeddedMode() returns false for all command paths when
dolt.shared-server is true in config.yaml, not just commands that pass
the no-db guard in PersistentPreRun.

GH#2946

Co-authored-by: Amp <amp@ampcode.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019d4f6f-01f8-72d4-b474-f75d7909b8b9

---------

Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-02 11:52:20 -07:00

96 lines
3.2 KiB
Go

package doltserver
import (
"fmt"
"os"
"strings"
"github.com/steveyegge/beads/internal/configfile"
)
// ServerMode describes who owns and manages the dolt sql-server lifecycle.
type ServerMode int
const (
// ServerModeOwned means beads auto-starts and manages the server.
// This is the default for standalone users with no explicit port config.
ServerModeOwned ServerMode = iota
// ServerModeExternal means the user manages the server lifecycle
// (e.g., systemd, Docker, Hosted Dolt, VPS). Beads never starts or
// stops the server. Determined when metadata.json has an explicit
// dolt_server_port or BEADS_DOLT_SHARED_SERVER is set.
ServerModeExternal
// ServerModeEmbedded is the legacy in-process embedded dolt path.
// Determined when metadata.json dolt_mode is "embedded".
ServerModeEmbedded
)
// String returns a human-readable label for the server mode.
func (m ServerMode) String() string {
switch m {
case ServerModeOwned:
return "owned"
case ServerModeExternal:
return "external"
case ServerModeEmbedded:
return "embedded"
default:
return fmt.Sprintf("ServerMode(%d)", int(m))
}
}
// ResolveServerMode determines the server mode from the given beadsDir.
// This is the single source of truth for how the server lifecycle is managed.
//
// Decision logic (checked in order):
// 1. BEADS_DOLT_SERVER_MODE=1 env var -> ServerModeExternal
// 2. BEADS_DOLT_SHARED_SERVER env var is set -> ServerModeExternal
// 3. metadata.json dolt_mode == "embedded" -> ServerModeEmbedded
// 4. metadata.json has explicit dolt_server_port -> ServerModeExternal
// 5. default -> ServerModeOwned
//
// Runtime env vars (1, 2) take precedence over persisted metadata.json
// to prevent stale dolt_mode=embedded from silently overriding an active
// shared-server or server-mode configuration (GH#2949).
//
// The function loads metadata.json only if the file exists, to avoid
// triggering the legacy config.json -> metadata.json migration side effect.
func ResolveServerMode(beadsDir string) ServerMode {
// 1. BEADS_DOLT_SERVER_MODE=1 env var -> external (explicit server mode)
if os.Getenv("BEADS_DOLT_SERVER_MODE") == "1" {
return ServerModeExternal
}
// 2. Shared server mode (env var or config.yaml) -> external.
// Must be checked before metadata.json so that a stale
// dolt_mode=embedded cannot override active shared-server intent.
if IsSharedServerMode() {
return ServerModeExternal
}
var fileCfg *configfile.Config
// Only load config if metadata.json exists (avoids legacy migration side effect)
metadataPath := configfile.ConfigPath(beadsDir)
if _, err := os.Stat(metadataPath); err == nil {
if cfg, loadErr := configfile.Load(beadsDir); loadErr == nil && cfg != nil {
fileCfg = cfg
}
}
// 3. Explicit embedded mode in metadata.json
if fileCfg != nil && strings.ToLower(fileCfg.DoltMode) == configfile.DoltModeEmbedded &&
fileCfg.DoltMode != "" { // empty defaults to embedded in GetDoltMode, but we treat empty as "unset"
return ServerModeEmbedded
}
// 4. Explicit server port in metadata.json -> external
if fileCfg != nil && fileCfg.DoltServerPort > 0 {
return ServerModeExternal
}
// 5. Default: beads owns the server
return ServerModeOwned
}