diff --git a/.gitignore b/.gitignore index bc49c9eba..e30a43e83 100644 --- a/.gitignore +++ b/.gitignore @@ -116,7 +116,7 @@ bd_test .beads/export-state/ .beads/beads.db -# Gas Town (added by gt) +# Orchestrator (added by gt) .logs/ .beads/ .opencode/ diff --git a/FEDERATION-SETUP.md b/FEDERATION-SETUP.md index b5a48c941..b3e71dcc4 100644 --- a/FEDERATION-SETUP.md +++ b/FEDERATION-SETUP.md @@ -1,7 +1,7 @@ # Federation Setup Guide Federation enables peer-to-peer synchronization of beads databases between -multiple Gas Towns using Dolt remotes. Each town maintains its own database +multiple workspaces using Dolt remotes. Each workspace maintains its own database while sharing work items with configured peers. ## Overview @@ -110,7 +110,7 @@ bd config list | grep federation.peers ### How It Works -1. Each Gas Town has its own Dolt database +1. Each workspace has its own Dolt database 2. `add-peer` registers a Dolt remote (similar to `git remote add`) 3. Push/pull operations sync commits between peers 4. Conflict resolution follows configured strategy diff --git a/NEWSLETTER.md b/NEWSLETTER.md index 01d686269..b6b4eab57 100644 --- a/NEWSLETTER.md +++ b/NEWSLETTER.md @@ -20,7 +20,7 @@ The new `bd context` command complements this with safe-first error guidance: wh ## New Commands and Flags -**`bd done`** is now an alias for `bd close`, and `bd done ` treats the last argument as the close reason. This aligns with Gas Town's vocabulary — agents run `gt done` to finish sessions, and now `bd done` works the same way for beads. +**`bd done`** is now an alias for `bd close`, and `bd done ` treats the last argument as the close reason. This aligns with orchestrator vocabulary — agents run `gt done` to finish sessions, and now `bd done` works the same way for beads. **`bd help --list` and `bd help --doc`** produce machine-readable command listings and full documentation. Useful for generating docs, feeding to agents, or building tooling. diff --git a/cmd/bd/create.go b/cmd/bd/create.go index 9ef2dbf27..434cbf08c 100644 --- a/cmd/bd/create.go +++ b/cmd/bd/create.go @@ -485,8 +485,8 @@ var createCmd = &cobra.Command{ // Validate explicit ID format if provided if explicitID != "" { // Basic format validation for all issue types. - // Note: Gas Town-specific agent ID validation (mayor, polecat, witness, etc.) - // is handled by gastown, not beads core. + // Note: Orchestrator-specific agent ID validation (mayor, polecat, witness, etc.) + // is handled by the orchestrator, not beads core. _, err := validation.ValidateIDFormat(explicitID) if err != nil { FatalError("%v", err) diff --git a/cmd/bd/doctor.go b/cmd/bd/doctor.go index 0f4f740fd..605be4c12 100644 --- a/cmd/bd/doctor.go +++ b/cmd/bd/doctor.go @@ -43,23 +43,23 @@ type doctorResult struct { } var ( - doctorFix bool - doctorYes bool - doctorInteractive bool // per-fix confirmation mode - doctorDryRun bool // preview fixes without applying - doctorOutput string // export diagnostics to file - doctorFixChildParent bool // opt-in fix for child→parent deps - doctorVerbose bool // show detailed output during fixes - perfMode bool - checkHealthMode bool - doctorCheckFlag string // run specific check (e.g., "pollution") - doctorClean bool // for pollution check, delete detected issues - doctorDeep bool // full graph integrity validation - doctorGastown bool // running in gastown multi-workspace mode - gastownDuplicatesThreshold int // duplicate tolerance threshold for gastown mode - doctorServer bool // run server mode health checks - doctorMigration string // migration validation mode: "pre" or "post" - doctorAgent bool // agent-facing diagnostic mode (ZFC-compliant) + doctorFix bool + doctorYes bool + doctorInteractive bool // per-fix confirmation mode + doctorDryRun bool // preview fixes without applying + doctorOutput string // export diagnostics to file + doctorFixChildParent bool // opt-in fix for child→parent deps + doctorVerbose bool // show detailed output during fixes + perfMode bool + checkHealthMode bool + doctorCheckFlag string // run specific check (e.g., "pollution") + doctorClean bool // for pollution check, delete detected issues + doctorDeep bool // full graph integrity validation + doctorOrchestrator bool // running in orchestrator multi-workspace mode + orchestratorDuplicatesThreshold int // duplicate tolerance threshold for orchestrator mode + doctorServer bool // run server mode health checks + doctorMigration string // migration validation mode: "pre" or "post" + doctorAgent bool // agent-facing diagnostic mode (ZFC-compliant) ) // ConfigKeyHintsDoctor is the config key for suppressing doctor hints @@ -205,13 +205,13 @@ Examples: FatalError("failed to resolve path: %v", err) } - // Guardrail: never run mutating bd doctor fix from Gas Town town root. - // Town-level repair must go through `gt doctor --fix` because town roots + // Guardrail: never run mutating bd doctor fix from orchestrator workspace root. + // Town-level repair must go through `gt doctor --fix` because workspace roots // have additional invariants beyond beads-only repos. - if doctorFix && isGasTownTownRoot(absPath) { + if doctorFix && isOrchestratorRoot(absPath) { FatalErrorWithHint( - "refusing to run 'bd doctor --fix' at Gas Town town root", - "Use 'gt doctor --fix' from town root, or run 'bd doctor --fix' inside a specific rig clone (e.g. /mayor/rig)", + "refusing to run 'bd doctor --fix' at orchestrator workspace root", + "Use 'gt doctor --fix' from workspace root, or run 'bd doctor --fix' inside a specific rig clone (e.g. /mayor/rig)", ) } @@ -327,8 +327,8 @@ func init() { doctorCmd.Flags().BoolVar(&doctorDryRun, "dry-run", false, "Preview fixes without making changes") doctorCmd.Flags().BoolVar(&doctorFixChildParent, "fix-child-parent", false, "Remove child→parent dependencies (opt-in)") doctorCmd.Flags().BoolVarP(&doctorVerbose, "verbose", "v", false, "Show all checks (default shows only warnings/errors)") - doctorCmd.Flags().BoolVar(&doctorGastown, "gastown", false, "Running in gastown multi-workspace mode (routes.jsonl is expected, higher duplicate tolerance)") - doctorCmd.Flags().IntVar(&gastownDuplicatesThreshold, "gastown-duplicates-threshold", 1000, "Duplicate tolerance threshold for gastown mode (wisps are ephemeral)") + doctorCmd.Flags().BoolVar(&doctorOrchestrator, "orchestrator", false, "Running in orchestrator multi-workspace mode (routes.jsonl is expected, higher duplicate tolerance)") + doctorCmd.Flags().IntVar(&orchestratorDuplicatesThreshold, "orchestrator-duplicates-threshold", 1000, "Duplicate tolerance threshold for orchestrator mode (wisps are ephemeral)") doctorCmd.Flags().BoolVar(&doctorServer, "server", false, "Run Dolt server mode health checks (connectivity, version, schema)") doctorCmd.Flags().StringVar(&doctorMigration, "migration", "", "Run Dolt migration validation: 'pre' (before migration) or 'post' (after migration)") doctorCmd.Flags().BoolVar(&doctorAgent, "agent", false, "Agent-facing diagnostic mode: rich context for AI agents (ZFC-compliant)") @@ -374,11 +374,11 @@ func runDiagnostics(path string) doctorResult { OverallOK: true, } - // Auto-detect gastown mode: routes.jsonl is only created by gastown workspaces - if !doctorGastown { + // Auto-detect orchestrator mode: routes.jsonl is only created by orchestrator workspaces + if !doctorOrchestrator { routesFile := filepath.Join(path, ".beads", "routes.jsonl") if _, err := os.Stat(routesFile); err == nil { - doctorGastown = true + doctorOrchestrator = true } } @@ -741,7 +741,7 @@ func runDiagnostics(path string) doctorResult { // Don't fail overall check for child→parent deps, just warn // Check 23: Duplicate issues (from bd validate) - duplicatesCheck := convertDoctorCheck(doctor.CheckDuplicateIssues(path, doctorGastown, gastownDuplicatesThreshold)) + duplicatesCheck := convertDoctorCheck(doctor.CheckDuplicateIssues(path, doctorOrchestrator, orchestratorDuplicatesThreshold)) result.Checks = append(result.Checks, duplicatesCheck) // Don't fail overall check for duplicates, just warn @@ -765,7 +765,7 @@ func runDiagnostics(path string) doctorResult { result.Checks = append(result.Checks, persistentMolCheck) // Don't fail overall check for persistent mol issues, just warn - // Check 26c: Legacy merge queue files (gastown mrqueue remnants) + // Check 26c: Legacy merge queue files (orchestrator mrqueue remnants) staleMQFilesCheck := convertDoctorCheck(doctor.CheckStaleMQFiles(path)) result.Checks = append(result.Checks, staleMQFilesCheck) // Don't fail overall check for legacy MQ files, just warn diff --git a/cmd/bd/doctor/artifacts.go b/cmd/bd/doctor/artifacts.go index dc11b076f..642e1fb3b 100644 --- a/cmd/bd/doctor/artifacts.go +++ b/cmd/bd/doctor/artifacts.go @@ -201,7 +201,7 @@ func isRedirectExpectedDir(beadsDir string) bool { return true } - // Check if this is a rig-root .beads/ (e.g., gastown/.beads/) + // Check if this is a rig-root .beads/ (e.g., my-project/.beads/) // that should redirect to mayor/rig/.beads/ // A rig-root .beads has a sibling "mayor/" or "polecats/" directory if hasSibling(parent, "mayor") || hasSibling(parent, "polecats") { diff --git a/cmd/bd/doctor/federation.go b/cmd/bd/doctor/federation.go index b00642a15..e47565a6a 100644 --- a/cmd/bd/doctor/federation.go +++ b/cmd/bd/doctor/federation.go @@ -69,7 +69,7 @@ func CheckFederationRemotesAPI(path string) DoctorCheck { // Check if dolt server is running using doltserver.IsRunning which // correctly resolves PID file paths (in beadsDir, not doltPath) - // and handles Gas Town daemon PID files. + // and handles orchestrator daemon PID files. serverState, _ := doltserver.IsRunning(beadsDir) serverRunning := serverState != nil && serverState.Running diff --git a/cmd/bd/doctor/federation_test.go b/cmd/bd/doctor/federation_test.go index 7207a65ae..067397a63 100644 --- a/cmd/bd/doctor/federation_test.go +++ b/cmd/bd/doctor/federation_test.go @@ -67,7 +67,7 @@ func TestCheckFederationRemotesAPI_NoDoltDatabase(t *testing.T) { } func TestCheckFederationRemotesAPI_ServerNotRunning(t *testing.T) { - // Isolate from Gas Town daemon which would be detected as a running server + // Isolate from orchestrator daemon which would be detected as a running server t.Setenv("GT_ROOT", "") tmpDir := t.TempDir() @@ -149,7 +149,7 @@ func TestDoltServerConfig_HonorsAutoStartOptOut(t *testing.T) { } func TestCheckFederationRemotesAPI_PidFileInBeadsDir(t *testing.T) { - // Isolate from Gas Town daemon which would be detected as a running server + // Isolate from orchestrator daemon which would be detected as a running server t.Setenv("GT_ROOT", "") // Verify the fix: PID file should be looked for in beadsDir, not doltPath. @@ -497,7 +497,7 @@ func TestDoltDatabaseName_FromConfig(t *testing.T) { // returns StatusOK instead of erroring about the remotesapi port. // This is the bug described in GH#2273. func TestCheckFederationRemotesAPI_ServerRunningNoPeers(t *testing.T) { - // Isolate from Gas Town daemon — we'll simulate "server running" via + // Isolate from orchestrator daemon — we'll simulate "server running" via // a standalone PID file pointing at a real dolt process on the host. t.Setenv("GT_ROOT", "") diff --git a/cmd/bd/doctor/maintenance.go b/cmd/bd/doctor/maintenance.go index 3fdcece80..e8d604901 100644 --- a/cmd/bd/doctor/maintenance.go +++ b/cmd/bd/doctor/maintenance.go @@ -255,7 +255,7 @@ func checkPersistentMolIssuesForIssues(issues []*types.Issue) DoctorCheck { } } -// CheckStaleMQFiles detects legacy .beads/mq/*.json files from gastown. +// CheckStaleMQFiles detects legacy .beads/mq/*.json files from the orchestrator. // These files are LOCAL ONLY (not committed) and represent stale merge queue // entries from the old mrqueue implementation. They are safe to delete since // gt done already creates merge-request wisps in beads. @@ -286,7 +286,7 @@ func CheckStaleMQFiles(path string) DoctorCheck { Name: "Legacy MQ Files", Status: StatusWarning, Message: fmt.Sprintf("%d stale .beads/mq/*.json file(s)", len(files)), - Detail: "Legacy gastown merge queue files (local only, safe to delete)", + Detail: "Legacy orchestrator merge queue files (local only, safe to delete)", Fix: "Run 'bd doctor --fix' to delete, or 'rm -rf .beads/mq/'", Category: CategoryMaintenance, } diff --git a/cmd/bd/doctor/multirepo.go b/cmd/bd/doctor/multirepo.go index 2a5a0fb0b..cd1f0cab7 100644 --- a/cmd/bd/doctor/multirepo.go +++ b/cmd/bd/doctor/multirepo.go @@ -190,7 +190,7 @@ func findUnknownTypesInHydratedIssues(repoPath string, multiRepo *config.MultiRe defer func() { _ = store.Close() }() // Collect all known types (core work types + parent custom + all child custom) - // Only core work types are built-in; Gas Town types require types.custom config. + // Only core work types are built-in; orchestrator types require types.custom config. knownTypes := map[string]bool{ "bug": true, "feature": true, "task": true, "epic": true, "chore": true, "decision": true, } diff --git a/cmd/bd/doctor/server.go b/cmd/bd/doctor/server.go index 80eab6e71..51c835246 100644 --- a/cmd/bd/doctor/server.go +++ b/cmd/bd/doctor/server.go @@ -163,8 +163,8 @@ func RunServerHealthChecks(path string) ServerHealthResult { // - testdb_*: BEADS_TEST_MODE=1 FNV hash of temp paths // - doctest_*: doctor test helpers // - doctortest_*: doctor test helpers -// - beads_pt*: gastown patrol_helpers_test.go random prefixes -// - beads_vr*: gastown mail/router_test.go random prefixes +// - beads_pt*: orchestrator patrol_helpers_test.go random prefixes +// - beads_vr*: orchestrator mail/router_test.go random prefixes // - beads_t[0-9a-f]*: protocol test random prefixes (t + 8 hex chars) var staleDatabasePrefixes = []string{ "testdb_", diff --git a/cmd/bd/doctor/validation.go b/cmd/bd/doctor/validation.go index ba2ef3055..dc3ebf465 100644 --- a/cmd/bd/doctor/validation.go +++ b/cmd/bd/doctor/validation.go @@ -114,9 +114,9 @@ func checkOrphanedDependenciesDB(db *sql.DB) DoctorCheck { } // CheckDuplicateIssues detects issues with identical content. -// When gastownMode is true, the threshold parameter defines how many duplicates -// are acceptable before warning (default 1000 for gastown's ephemeral wisps). -func CheckDuplicateIssues(path string, gastownMode bool, gastownThreshold int) DoctorCheck { +// When orchestratorMode is true, the threshold parameter defines how many duplicates +// are acceptable before warning (default 1000 for orchestrator's ephemeral wisps). +func CheckDuplicateIssues(path string, orchestratorMode bool, orchestratorThreshold int) DoctorCheck { // Follow redirect to resolve actual beads directory (bd-tvus fix) beadsDir := resolveBeadsDir(filepath.Join(path, ".beads")) @@ -130,13 +130,13 @@ func CheckDuplicateIssues(path string, gastownMode bool, gastownThreshold int) D } defer func() { _ = store.Close() }() - return checkDuplicateIssuesDB(db, gastownMode, gastownThreshold) + return checkDuplicateIssuesDB(db, orchestratorMode, orchestratorThreshold) } // checkDuplicateIssuesDB is the core logic for CheckDuplicateIssues, operating // on a *sql.DB directly. This enables fast testing with branch-per-test isolation // instead of per-test database creation. -func checkDuplicateIssuesDB(db *sql.DB, gastownMode bool, gastownThreshold int) DoctorCheck { +func checkDuplicateIssuesDB(db *sql.DB, orchestratorMode bool, orchestratorThreshold int) DoctorCheck { // Use SQL aggregation to find duplicates without loading all issues into memory. // The old approach loaded every issue via SearchIssues which was O(n) in both // time and memory — catastrophically slow on large databases (e.g., 23k+ issues @@ -165,8 +165,8 @@ func checkDuplicateIssuesDB(db *sql.DB, gastownMode bool, gastownThreshold int) // Apply threshold based on mode threshold := 0 // Default: any duplicates are warnings - if gastownMode { - threshold = gastownThreshold // Gastown: configurable threshold (default 1000) + if orchestratorMode { + threshold = orchestratorThreshold // Orchestrator: configurable threshold (default 1000) } if totalDuplicates == 0 { @@ -190,8 +190,8 @@ func checkDuplicateIssuesDB(db *sql.DB, gastownMode bool, gastownThreshold int) // Under threshold - OK message := "No duplicate issues" - if gastownMode && totalDuplicates > 0 { - message = fmt.Sprintf("%d duplicate(s) detected (within gastown threshold of %d)", totalDuplicates, threshold) + if orchestratorMode && totalDuplicates > 0 { + message = fmt.Sprintf("%d duplicate(s) detected (within orchestrator threshold of %d)", totalDuplicates, threshold) } return DoctorCheck{ Name: "Duplicate Issues", diff --git a/cmd/bd/doctor/validation_test.go b/cmd/bd/doctor/validation_test.go index 8e1a50d65..3b125165b 100644 --- a/cmd/bd/doctor/validation_test.go +++ b/cmd/bd/doctor/validation_test.go @@ -189,9 +189,9 @@ func TestCheckDuplicateIssues_NoDatabase(t *testing.T) { } } -// TestCheckDuplicateIssues_GastownUnderThreshold verifies that with gastown mode enabled, +// TestCheckDuplicateIssues_OrchestratorUnderThreshold verifies that with orchestrator mode enabled, // duplicates under the threshold are OK. -func TestCheckDuplicateIssues_GastownUnderThreshold(t *testing.T) { +func TestCheckDuplicateIssues_OrchestratorUnderThreshold(t *testing.T) { store := newTestDoltStore(t, "test") ctx := context.Background() @@ -211,17 +211,17 @@ func TestCheckDuplicateIssues_GastownUnderThreshold(t *testing.T) { check := checkDuplicateIssuesDB(store.DB(), true, 1000) if check.Status != StatusOK { - t.Errorf("Status = %q, want %q (under gastown threshold)", check.Status, StatusOK) + t.Errorf("Status = %q, want %q (under orchestrator threshold)", check.Status, StatusOK) t.Logf("Message: %s", check.Message) } - if check.Message != "50 duplicate(s) detected (within gastown threshold of 1000)" { + if check.Message != "50 duplicate(s) detected (within orchestrator threshold of 1000)" { t.Errorf("Message = %q, want message about being within threshold", check.Message) } } -// TestCheckDuplicateIssues_GastownOverThreshold verifies that with gastown mode enabled, +// TestCheckDuplicateIssues_OrchestratorOverThreshold verifies that with orchestrator mode enabled, // duplicates over the threshold still warn. -func TestCheckDuplicateIssues_GastownOverThreshold(t *testing.T) { +func TestCheckDuplicateIssues_OrchestratorOverThreshold(t *testing.T) { store := newTestDoltStore(t, "test") ctx := context.Background() @@ -252,15 +252,15 @@ func TestCheckDuplicateIssues_GastownOverThreshold(t *testing.T) { check := checkDuplicateIssuesDB(db, true, 25) if check.Status != StatusWarning { - t.Errorf("Status = %q, want %q (over gastown threshold)", check.Status, StatusWarning) + t.Errorf("Status = %q, want %q (over orchestrator threshold)", check.Status, StatusWarning) } if check.Message != "50 duplicate issue(s) in 1 group(s)" { t.Errorf("Message = %q, want '50 duplicate issue(s) in 1 group(s)'", check.Message) } } -// TestCheckDuplicateIssues_GastownCustomThreshold verifies custom threshold works. -func TestCheckDuplicateIssues_GastownCustomThreshold(t *testing.T) { +// TestCheckDuplicateIssues_OrchestratorCustomThreshold verifies custom threshold works. +func TestCheckDuplicateIssues_OrchestratorCustomThreshold(t *testing.T) { store := newTestDoltStore(t, "test") ctx := context.Background() @@ -298,9 +298,9 @@ func TestCheckDuplicateIssues_GastownCustomThreshold(t *testing.T) { } } -// TestCheckDuplicateIssues_NonGastownMode verifies that without gastown mode, +// TestCheckDuplicateIssues_NonOrchestratorMode verifies that without orchestrator mode, // any duplicates are warnings (backward compatibility). -func TestCheckDuplicateIssues_NonGastownMode(t *testing.T) { +func TestCheckDuplicateIssues_NonOrchestratorMode(t *testing.T) { store := newTestDoltStore(t, "test") ctx := context.Background() @@ -320,7 +320,7 @@ func TestCheckDuplicateIssues_NonGastownMode(t *testing.T) { check := checkDuplicateIssuesDB(store.DB(), false, 1000) if check.Status != StatusWarning { - t.Errorf("Status = %q, want %q (non-gastown should warn on any duplicates)", check.Status, StatusWarning) + t.Errorf("Status = %q, want %q (non-orchestrator should warn on any duplicates)", check.Status, StatusWarning) } if check.Message != "50 duplicate issue(s) in 1 group(s)" { t.Errorf("Message = %q, want '50 duplicate issue(s) in 1 group(s)'", check.Message) diff --git a/cmd/bd/doctor_gastown_guard.go b/cmd/bd/doctor_gastown_guard.go index 9bcbb2f9c..986f72b3d 100644 --- a/cmd/bd/doctor_gastown_guard.go +++ b/cmd/bd/doctor_gastown_guard.go @@ -5,7 +5,7 @@ import ( "path/filepath" ) -// isGasTownTownRoot returns true when path looks like a Gas Town HQ root. +// isOrchestratorRoot returns true when path looks like an orchestrator workspace root. // // We require both: // 1. mayor/town.json (town identity/config), and @@ -13,7 +13,7 @@ import ( // // This keeps detection strict and avoids blocking normal repos that merely // contain a .beads directory. -func isGasTownTownRoot(path string) bool { +func isOrchestratorRoot(path string) bool { if path == "" { return false } diff --git a/cmd/bd/doctor_gastown_guard_test.go b/cmd/bd/doctor_gastown_guard_test.go index 3f5a193d3..dd7371c6f 100644 --- a/cmd/bd/doctor_gastown_guard_test.go +++ b/cmd/bd/doctor_gastown_guard_test.go @@ -8,7 +8,7 @@ import ( "testing" ) -func TestIsGasTownTownRoot_TrueWhenTownMarkersPresent(t *testing.T) { +func TestIsOrchestratorRoot_TrueWhenMarkersPresent(t *testing.T) { root := t.TempDir() if err := os.MkdirAll(filepath.Join(root, "mayor"), 0750); err != nil { @@ -24,12 +24,12 @@ func TestIsGasTownTownRoot_TrueWhenTownMarkersPresent(t *testing.T) { t.Fatal(err) } - if !isGasTownTownRoot(root) { - t.Fatalf("expected %s to be detected as Gas Town root", root) + if !isOrchestratorRoot(root) { + t.Fatalf("expected %s to be detected as orchestrator root", root) } } -func TestIsGasTownTownRoot_FalseWhenMarkersMissing(t *testing.T) { +func TestIsOrchestratorRoot_FalseWhenMarkersMissing(t *testing.T) { tests := []struct { name string setupTown bool @@ -61,8 +61,8 @@ func TestIsGasTownTownRoot_FalseWhenMarkersMissing(t *testing.T) { } } - if isGasTownTownRoot(root) { - t.Fatalf("expected %s to NOT be detected as Gas Town root", root) + if isOrchestratorRoot(root) { + t.Fatalf("expected %s to NOT be detected as orchestrator root", root) } }) } diff --git a/cmd/bd/doctor_validate.go b/cmd/bd/doctor_validate.go index 5dc56e882..9d25b88bb 100644 --- a/cmd/bd/doctor_validate.go +++ b/cmd/bd/doctor_validate.go @@ -78,7 +78,7 @@ func runValidateCheckInner(path string) bool { // collectValidateChecks runs the four data-integrity checks. func collectValidateChecks(path string) []validateCheckResult { return []validateCheckResult{ - {check: convertDoctorCheck(doctor.CheckDuplicateIssues(path, doctorGastown, gastownDuplicatesThreshold))}, + {check: convertDoctorCheck(doctor.CheckDuplicateIssues(path, doctorOrchestrator, orchestratorDuplicatesThreshold))}, {check: convertDoctorCheck(doctor.CheckOrphanedDependencies(path)), fixable: true}, {check: convertDoctorCheck(doctor.CheckTestPollution(path))}, {check: convertDoctorCheck(doctor.CheckGitConflicts(path))}, diff --git a/cmd/bd/dolt.go b/cmd/bd/dolt.go index 835507b25..21922595d 100644 --- a/cmd/bd/dolt.go +++ b/cmd/bd/dolt.go @@ -372,7 +372,7 @@ var doltKillallCmd = &cobra.Command{ Long: `Find and kill orphan dolt sql-server processes not tracked by the canonical PID file for the current repo's Dolt data directory. -Under Gas Town, the canonical server lives at $GT_ROOT/.beads/. Any other +Under an orchestrator, the canonical server lives at $GT_ROOT/.beads/. Any other dolt sql-server processes using that shared data directory are considered orphans and will be killed. @@ -405,8 +405,8 @@ servers are preserved.`, // - testdb_*: BEADS_TEST_MODE=1 FNV hash of temp paths // - doctest_*: doctor test helpers // - doctortest_*: doctor test helpers -// - beads_pt*: gastown patrol_helpers_test.go random prefixes -// - beads_vr*: gastown mail/router_test.go random prefixes +// - beads_pt*: orchestrator patrol_helpers_test.go random prefixes +// - beads_vr*: orchestrator mail/router_test.go random prefixes // - beads_t[0-9a-f]*: protocol test random prefixes (t + 8 hex chars) var staleDatabasePrefixes = []string{"testdb_", "doctest_", "doctortest_", "beads_pt", "beads_vr", "beads_t"} diff --git a/cmd/bd/dolt_test.go b/cmd/bd/dolt_test.go index f3a2b443a..23f815a90 100644 --- a/cmd/bd/dolt_test.go +++ b/cmd/bd/dolt_test.go @@ -519,7 +519,7 @@ func TestDoltConfigEnvironmentOverrides(t *testing.T) { } func TestDoltServerIsRunning(t *testing.T) { - // Clear GT_ROOT so IsRunning doesn't find the Gas Town daemon's real PID file. + // Clear GT_ROOT so IsRunning doesn't find the orchestrator daemon's real PID file. if old, ok := os.LookupEnv("GT_ROOT"); ok { os.Unsetenv("GT_ROOT") t.Cleanup(func() { os.Setenv("GT_ROOT", old) }) diff --git a/cmd/bd/export_obsidian.go b/cmd/bd/export_obsidian.go index c36d2ccdc..2062a5106 100644 --- a/cmd/bd/export_obsidian.go +++ b/cmd/bd/export_obsidian.go @@ -32,7 +32,7 @@ var obsidianPriority = []string{ } // obsidianTypeTag maps bd issue type to Obsidian tag (core types only) -// Gas Town types are custom types and will use their issue_type value as a tag. +// Custom types (e.g. orchestrator-specific) will use their issue_type value as a tag. var obsidianTypeTag = map[types.IssueType]string{ types.TypeBug: "#Bug", types.TypeFeature: "#Feature", diff --git a/cmd/bd/external_dep_routing_test.go b/cmd/bd/external_dep_routing_test.go index 3d6dea32f..594e45178 100644 --- a/cmd/bd/external_dep_routing_test.go +++ b/cmd/bd/external_dep_routing_test.go @@ -13,7 +13,7 @@ import ( ) // TestResolveExternalDepsViaRouting tests that external dependency references -// (e.g., "external:gastown:gt-42zaq") are resolved via prefix routes to show +// (e.g., "external:other-project:op-42zaq") are resolved via prefix routes to show // the actual issue details from the target database. // // This is the core fix for bd-k0pfm: bd show should resolve cross-database deps. diff --git a/cmd/bd/external_ref_test.go b/cmd/bd/external_ref_test.go index b93655d75..befe0574b 100644 --- a/cmd/bd/external_ref_test.go +++ b/cmd/bd/external_ref_test.go @@ -17,7 +17,7 @@ func TestValidateExternalRef(t *testing.T) { }, { name: "valid with complex capability", - ref: "external:gastown:cross-project-deps", + ref: "external:other-project:cross-project-deps", wantErr: false, }, { @@ -90,7 +90,7 @@ func TestParseExternalRef(t *testing.T) { wantCapability string }{ {"external:beads:mol-run-assignee", "beads", "mol-run-assignee"}, - {"external:gastown:cross-project", "gastown", "cross-project"}, + {"external:other-project:cross-project", "other-project", "cross-project"}, {"external:a:b", "a", "b"}, {"bd-xyz", "", ""}, // not external {"external:", "", ""}, // invalid format diff --git a/cmd/bd/federation.go b/cmd/bd/federation.go index a13cef142..179b56635 100644 --- a/cmd/bd/federation.go +++ b/cmd/bd/federation.go @@ -24,10 +24,10 @@ var ( var federationCmd = &cobra.Command{ Use: "federation", GroupID: "sync", - Short: "Manage peer-to-peer federation with other Gas Towns", + Short: "Manage peer-to-peer federation with other workspaces", Long: `Manage peer-to-peer federation between Dolt-backed beads databases. -Federation enables synchronized issue tracking across multiple Gas Towns, +Federation enables synchronized issue tracking across multiple workspaces, each maintaining their own Dolt database while sharing updates via remotes. Requires the Dolt storage backend.`, diff --git a/cmd/bd/federation_nocgo.go b/cmd/bd/federation_nocgo.go index 567249db3..0d8d0144e 100644 --- a/cmd/bd/federation_nocgo.go +++ b/cmd/bd/federation_nocgo.go @@ -18,7 +18,7 @@ This binary was built without CGO support. To use federation features: 1. Use pre-built binaries from GitHub releases, or 2. Build from source with CGO enabled -Federation enables synchronized issue tracking across multiple Gas Towns, +Federation enables synchronized issue tracking across multiple workspaces, each maintaining their own Dolt database while sharing updates via remotes.`, Run: func(cmd *cobra.Command, args []string) { fmt.Println("Federation requires CGO and Dolt backend.") diff --git a/cmd/bd/gate.go b/cmd/bd/gate.go index ee50151ba..c098b0e33 100644 --- a/cmd/bd/gate.go +++ b/cmd/bd/gate.go @@ -35,7 +35,7 @@ Gate types: gh:pr - Waits for PR merge (Phase 3) bead - Waits for cross-rig bead to close (Phase 4) -For bead gates, await_id format is : (e.g., "gastown:gt-abc123"). +For bead gates, await_id format is : (e.g., "other-project:op-abc123"). Examples: bd gate list # Show all open gates @@ -168,7 +168,7 @@ var gateAddWaiterCmd = &cobra.Command{ Long: `Register an agent as a waiter on a gate bead. When the gate closes, the waiter will receive a wake notification via 'gt gate wake'. -The waiter is typically the polecat's address (e.g., "gastown/polecats/Toast"). +The waiter is typically the worker's address (e.g., "my-project/workers/agent-1"). This is used by 'gt done --phase-complete' to register for gate wake notifications.`, Args: cobra.ExactArgs(2), @@ -727,7 +727,7 @@ func checkTimer(gate *types.Issue, now time.Time) (resolved, escalated bool, rea } // checkBeadGate checks if a cross-rig bead gate is satisfied. -// await_id format: : (e.g., "gastown:gt-abc123") +// await_id format: : (e.g., "other-project:op-abc123") // Returns (satisfied, reason). func checkBeadGate(ctx context.Context, awaitID string) (bool, string) { // Parse await_id format: : diff --git a/cmd/bd/gate_test.go b/cmd/bd/gate_test.go index 0262e7959..a9d64c7dc 100644 --- a/cmd/bd/gate_test.go +++ b/cmd/bd/gate_test.go @@ -75,7 +75,7 @@ func TestCheckBeadGate_InvalidFormat(t *testing.T) { }, { name: "no colon", - awaitID: "gastown-gt-abc", + awaitID: "my-project-mp-abc", wantErr: "invalid await_id format", }, { @@ -85,7 +85,7 @@ func TestCheckBeadGate_InvalidFormat(t *testing.T) { }, { name: "missing bead", - awaitID: "gastown:", + awaitID: "my-project:", wantErr: "await_id missing rig name or bead ID", }, } diff --git a/cmd/bd/init.go b/cmd/bd/init.go index 0514a602c..8fa23a918 100644 --- a/cmd/bd/init.go +++ b/cmd/bd/init.go @@ -37,7 +37,7 @@ Dolt is the default (and only supported) storage backend. The legacy SQLite backend has been removed. Use --backend=sqlite to see migration instructions. Use --database to specify an existing server database name, overriding the -default prefix-based naming. This is useful when an external tool (e.g. gastown) +default prefix-based naming. This is useful when an external tool (e.g. an orchestrator) has already created the database. With --stealth: configures per-repository git settings for invisible beads usage: @@ -360,7 +360,7 @@ environment variable.`, dbName = "beads" } // --database flag overrides all prefix-based naming. This allows callers - // (e.g. gastown) to specify a pre-existing database name, preventing orphan + // (e.g. an orchestrator) to specify a pre-existing database name, preventing orphan // database creation when the database was already created externally. if database != "" { dbName = database diff --git a/cmd/bd/list.go b/cmd/bd/list.go index c31fd0fad..59c5515eb 100644 --- a/cmd/bd/list.go +++ b/cmd/bd/list.go @@ -1029,7 +1029,7 @@ func init() { listCmd.Flags().Bool("ready", false, "Show only ready issues (status=open, excludes hooked/in_progress/blocked/deferred)") // Cross-rig routing: query a different rig's database (bd-rgdjr) - listCmd.Flags().String("rig", "", "Query a different rig's database (e.g., --rig gastown, --rig gt-, --rig gt)") + listCmd.Flags().String("rig", "", "Query a different rig's database (e.g., --rig my-project, --rig gt-, --rig gt)") // Note: --json flag is defined as a persistent flag in main.go, not here rootCmd.AddCommand(listCmd) diff --git a/cmd/bd/mol_current.go b/cmd/bd/mol_current.go index afd8677ad..bd62ceae0 100644 --- a/cmd/bd/mol_current.go +++ b/cmd/bd/mol_current.go @@ -178,7 +178,7 @@ func getMoleculeProgress(ctx context.Context, s storage.DoltStorage, moleculeID // Compute step readiness from within-molecule dependencies. // Uses analyzeMoleculeParallel instead of GetReadyWork because GetReadyWork // excludes ephemeral issues (wisp steps are ephemeral by definition). - // See: https://github.com/steveyegge/gastown/issues/1276 + // See: https://github.com/steveyegge/gastown/issues/1276 (historical reference) analysis := analyzeMoleculeParallel(subgraph) readyIDs := make(map[string]bool) for id, info := range analysis.Steps { diff --git a/cmd/bd/mol_ready_gated_test.go b/cmd/bd/mol_ready_gated_test.go index 608bf3a63..ea739114c 100644 --- a/cmd/bd/mol_ready_gated_test.go +++ b/cmd/bd/mol_ready_gated_test.go @@ -37,7 +37,7 @@ func setupGatedTestDB(t *testing.T) (*dolt.DoltStore, func()) { t.Fatalf("Failed to set issue_prefix: %v", err) } - // Configure Gas Town custom types for test compatibility (bd-find4) + // Configure orchestrator custom types for test compatibility (bd-find4) if err := store.SetConfig(ctx, "types.custom", "molecule,gate,convoy,merge-request,slot,agent,role,rig,event,message"); err != nil { store.Close() os.RemoveAll(tmpDir) diff --git a/cmd/bd/move.go b/cmd/bd/move.go index 56ab92bc7..f34003cac 100644 --- a/cmd/bd/move.go +++ b/cmd/bd/move.go @@ -25,9 +25,9 @@ This command: 3. Closes the source issue with a redirect note The target rig can be specified as: - - A rig name: beads, gastown - - A prefix: bd-, gt- - - A prefix without hyphen: bd, gt + - A rig name: beads, my-project + - A prefix: bd-, mp- + - A prefix without hyphen: bd, mp Dependency handling for cross-rig moves: - Issues that depend ON the moved issue: updated to external refs @@ -36,9 +36,9 @@ Dependency handling for cross-rig moves: Note: Labels are copied. Comments and event history are not transferred. Examples: - bd move hq-c21fj --to beads # Move to beads by rig name - bd move hq-q3tki --to gt- # Move to gastown by prefix - bd move hq-1h2to --to gt # Move to gastown (prefix without hyphen)`, + bd move hq-c21fj --to beads # Move to beads by rig name + bd move hq-q3tki --to mp- # Move to my-project by prefix + bd move hq-1h2to --to mp # Move to my-project (prefix without hyphen)`, Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { CheckReadonly("move") diff --git a/cmd/bd/ready.go b/cmd/bd/ready.go index 2ae3c33bf..2c3399658 100644 --- a/cmd/bd/ready.go +++ b/cmd/bd/ready.go @@ -552,7 +552,7 @@ func init() { readyCmd.Flags().Bool("include-ephemeral", false, "Include ephemeral issues (wisps) in results") readyCmd.Flags().Bool("gated", false, "Find molecules ready for gate-resume dispatch") readyCmd.Flags().StringSlice("exclude-type", nil, "Exclude issue types from results (comma-separated or repeatable, e.g., --exclude-type=convoy,epic)") - readyCmd.Flags().String("rig", "", "Query a different rig's database (e.g., --rig gastown, --rig gt-, --rig gt)") + readyCmd.Flags().String("rig", "", "Query a different rig's database (e.g., --rig my-project, --rig gt-, --rig gt)") // Metadata filtering (GH#1406) readyCmd.Flags().StringArray("metadata-field", nil, "Filter by metadata field (key=value, repeatable)") readyCmd.Flags().String("has-metadata-key", "", "Filter issues that have this metadata key set") diff --git a/cmd/bd/refile.go b/cmd/bd/refile.go index 22c63fa06..da99c9d7d 100644 --- a/cmd/bd/refile.go +++ b/cmd/bd/refile.go @@ -21,14 +21,14 @@ This creates a new issue in the target rig with the same content, then closes the source issue with a reference to the new location. The target rig can be specified as: - - A rig name: beads, gastown - - A prefix: bd-, gt- - - A prefix without hyphen: bd, gt + - A rig name: beads, my-project + - A prefix: bd-, mp- + - A prefix without hyphen: bd, mp Examples: - bd refile bd-8hea gastown # Move to gastown by rig name - bd refile bd-8hea gt- # Move to gastown by prefix - bd refile bd-8hea gt # Move to gastown (prefix without hyphen)`, + bd refile bd-8hea my-project # Move to my-project by rig name + bd refile bd-8hea mp- # Move to my-project by prefix + bd refile bd-8hea mp # Move to my-project (prefix without hyphen)`, Args: cobra.ExactArgs(2), Run: func(cmd *cobra.Command, args []string) { CheckReadonly("refile") diff --git a/cmd/bd/routed.go b/cmd/bd/routed.go index ebf71ec62..82c6a2b00 100644 --- a/cmd/bd/routed.go +++ b/cmd/bd/routed.go @@ -30,7 +30,7 @@ func isNotFoundErr(err error) bool { // beadsDirOverride returns true if BEADS_DIR is explicitly set in the environment. // When set, BEADS_DIR specifies the exact database to use and prefix-based routing // must be skipped. This matches bd list's behavior (which never routes) and the -// contract expected by all gastown callers that set BEADS_DIR (GH#663). +// contract expected by all orchestrator callers that set BEADS_DIR (GH#663). func beadsDirOverride() bool { return os.Getenv("BEADS_DIR") != "" } @@ -288,7 +288,7 @@ func needsRouting(id string) bool { // prefix routes to locate and query the target database. // // GetDependenciesWithMetadata uses a JOIN between dependencies and issues tables, -// so external refs (e.g., "external:gastown:gt-42zaq") that don't exist in the local +// so external refs (e.g., "external:other-project:op-42zaq") that don't exist in the local // issues table are silently dropped. This function fills in those gaps by: // 1. Getting raw dependency records // 2. Filtering for external refs @@ -354,7 +354,7 @@ func resolveExternalDepsViaRouting(ctx context.Context, issueStore storage.DoltS } // resolveBlockedByRefs takes a list of blocker IDs (which may include external refs -// like "external:gastown:gt-42zaq") and resolves them to human-readable strings. +// like "external:other-project:op-42zaq") and resolves them to human-readable strings. // Local IDs pass through unchanged. External refs are resolved via routing to show // the actual issue ID and title from the target database. func resolveBlockedByRefs(ctx context.Context, refs []string) []string { diff --git a/cmd/bd/show.go b/cmd/bd/show.go index f29dda088..687c68010 100644 --- a/cmd/bd/show.go +++ b/cmd/bd/show.go @@ -112,7 +112,7 @@ var showCmd = &cobra.Command{ allDetails := []interface{}{} foundCount := 0 for idx, id := range args { - // Resolve and get issue with routing (e.g., gt-xyz routes to gastown) + // Resolve and get issue with routing (e.g., gt-xyz routes to another rig) result, err := resolveAndGetIssueWithRouting(ctx, store, id) if err != nil { if result != nil { @@ -242,7 +242,7 @@ var showCmd = &cobra.Command{ // Resolve external deps via routing (bd-k0pfm) // GetDependenciesWithMetadata JOINs on issues table, so external refs - // (e.g., "external:gastown:gt-42zaq") are silently dropped. + // (e.g., "external:other-project:gt-42zaq") are silently dropped. // Resolve them via prefix routes and merge into the dep list. if externalDeps, err := resolveExternalDepsViaRouting(ctx, issueStore, issue.ID); err == nil { depsWithMeta = append(depsWithMeta, externalDeps...) diff --git a/cmd/bd/swarm.go b/cmd/bd/swarm.go index 3cc83b1b3..a73b3af4d 100644 --- a/cmd/bd/swarm.go +++ b/cmd/bd/swarm.go @@ -1175,7 +1175,7 @@ Examples: func init() { swarmValidateCmd.Flags().Bool("verbose", false, "Include detailed issue graph in output") - swarmCreateCmd.Flags().String("coordinator", "", "Coordinator address (e.g., gastown/witness)") + swarmCreateCmd.Flags().String("coordinator", "", "Coordinator address (e.g., my-project/witness)") swarmCreateCmd.Flags().Bool("force", false, "Create new swarm even if one already exists") swarmCmd.AddCommand(swarmValidateCmd) diff --git a/cmd/bd/update.go b/cmd/bd/update.go index 9e7fdde8e..a94d124de 100644 --- a/cmd/bd/update.go +++ b/cmd/bd/update.go @@ -294,7 +294,7 @@ create, update, show, or close operation).`, updatedIssues := []*types.Issue{} var firstUpdatedID string // Track first successful update for last-touched for _, id := range args { - // Resolve and get issue with routing (e.g., gt-xyz routes to gastown) + // Resolve and get issue with routing (e.g., gt-xyz routes to another rig) result, err := resolveAndGetIssueWithRouting(ctx, store, id) if err != nil { if result != nil { diff --git a/docs/ADVANCED.md b/docs/ADVANCED.md index 26d72ef4b..5b21e6031 100644 --- a/docs/ADVANCED.md +++ b/docs/ADVANCED.md @@ -312,7 +312,7 @@ Understanding the role of each component: ### RPC Layer (Server Mode) - **Multi-writer access** — Connects to a running Dolt server (`bd dolt start`) for concurrent clients -- **Used in multi-agent setups** — Gas Town and similar environments where multiple agents write simultaneously +- **Used in multi-agent setups** — orchestrator environments where multiple agents write simultaneously - **Not needed for single-user** — embedded mode handles all local operations without a server ### MCP Server (Optional) diff --git a/docs/CLAUDE.md b/docs/CLAUDE.md index f225f4328..10eb92678 100644 --- a/docs/CLAUDE.md +++ b/docs/CLAUDE.md @@ -24,7 +24,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co 3. **CLI Layer** (`cmd/bd/`) - Cobra-based commands (one file per command: `create.go`, `list.go`, etc.) - - Direct database access (embedded mode for standalone, server mode for Gas Town) + - Direct database access (embedded mode for standalone, server mode for orchestrator) - All commands support `--json` for programmatic use - Main entry point in `main.go` diff --git a/docs/COMMUNITY_TOOLS.md b/docs/COMMUNITY_TOOLS.md index 89f08b0d2..c11eadc25 100644 --- a/docs/COMMUNITY_TOOLS.md +++ b/docs/COMMUNITY_TOOLS.md @@ -9,7 +9,7 @@ A curated list of community-built UIs, extensions, and integrations for Beads. R ## Terminal UIs -- **[Mardi Gras](https://github.com/quietpublish/mardi-gras)** - Parade-themed terminal UI with real-time updates, Gas Town agent orchestration, tmux integration, and Claude Code dispatch. Uses `bd list --json`. Built by [@matt-wright86](https://github.com/matt-wright86). (Go) +- **[Mardi Gras](https://github.com/quietpublish/mardi-gras)** - Parade-themed terminal UI with real-time updates, multi-agent orchestration, tmux integration, and Claude Code dispatch. Uses `bd list --json`. Built by [@matt-wright86](https://github.com/matt-wright86). (Go) - **[perles](https://github.com/zjrosen/perles)** - Terminal UI search, dependency and kanban viewer powered by a custom BQL (Beads Query Language). Built by [@zjrosen](https://github.com/zjrosen). (Go) diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 9093c7866..6a1996555 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -233,7 +233,7 @@ output: # Paths can be relative (from cwd) or absolute external_projects: beads: ../beads - gastown: /path/to/gastown + other-project: /path/to/other-project ``` ### Why Two Systems? diff --git a/docs/DOLT-BACKEND.md b/docs/DOLT-BACKEND.md index 5eeec9e26..ef3edb640 100644 --- a/docs/DOLT-BACKEND.md +++ b/docs/DOLT-BACKEND.md @@ -109,12 +109,12 @@ export BEADS_DOLT_SHARED_SERVER=1 ``` Shared server state lives in `~/.beads/shared-server/` and uses port 3308 by default -(avoiding conflict with Gas Town on 3307). Each project's data remains isolated in its +(avoiding conflict with the orchestrator on 3307). Each project's data remains isolated in its own database (named by project prefix). See [DOLT.md](DOLT.md) for details. ## Central Dolt Server (macOS) -If you plan to use Gas Town or manage multiple beads projects from a single +If you plan to use an orchestrator or manage multiple beads projects from a single machine, you can run a central persistent Dolt server instead of per-project embedded instances. @@ -125,10 +125,10 @@ embedded instances. | **Setup** | Zero-config — `bd init` handles everything | One-time server setup required | | **Data location** | `.beads/dolt/` per project | Central directory (e.g. `/opt/homebrew/var/dolt`) | | **Concurrency** | Single writer per project | Multi-writer via MySQL protocol | -| **Use case** | Solo development, single project | Gas Town, multiple projects, multiple agents | +| **Use case** | Solo development, single project | Orchestrator, multiple projects, multiple agents | For single-project solo use, **embedded mode is recommended** — it requires no -setup. Switch to a central server when you need Gas Town or concurrent access. +setup. Switch to a central server when you need an orchestrator or concurrent access. ### Why Not `brew services start dolt`? diff --git a/docs/DOLT.md b/docs/DOLT.md index 88bb98482..c50b597d9 100644 --- a/docs/DOLT.md +++ b/docs/DOLT.md @@ -18,7 +18,7 @@ Beads uses Dolt as its storage backend. Dolt provides a version-controlled SQL d # Embedded mode (single writer, no server — default for standalone) bd init -# Server mode (multi-writer, e.g. Gas Town) +# Server mode (multi-writer, e.g. orchestrator) gt dolt start # Start the Dolt server bd init --server # Initialize with server mode ``` @@ -50,12 +50,12 @@ standalone Beads users. The `bd` binary includes everything; just `bd init` and - Push to GitHub with `bd dolt push` — code and issues in one repo - Zero ops: no server, no ports, no PID files -### Server Mode (Multi-Writer / Gas Town) +### Server Mode (Multi-Writer / Orchestrator) Connects to a running `dolt sql-server` for multi-client access. ```bash -# Start the server (Gas Town) +# Start the server (orchestrator) gt dolt start # Or manually @@ -73,7 +73,7 @@ dolt: Server mode is required for: - Multiple agents writing simultaneously -- Gas Town multi-rig setups +- Orchestrator multi-rig setups - Federation with remote peers ## Federation (Peer-to-Peer Sync) @@ -84,7 +84,7 @@ Federation enables direct sync between Dolt installations without a central hub. ``` ┌─────────────────┐ ┌─────────────────┐ -│ Gas Town A │◄───────►│ Gas Town B │ +│ Workspace A │◄───────►│ Workspace B │ │ dolt sql-server│ sync │ dolt sql-server│ │ :3306 (sql) │ │ :3306 (sql) │ │ :8080 (remote) │ │ :8080 (remote) │ @@ -180,7 +180,7 @@ failed to create database: dial tcp 127.0.0.1:3307: connect: connection refused **Fix:** ```bash -gt dolt start # Gas Town command +gt dolt start # Orchestrator command # Or gt dolt status # Check if running ``` @@ -301,7 +301,7 @@ In **embedded mode** (standalone default), each `bd` write command creates a Dol bd create "New issue" # Creates issue + Dolt commit ``` -In **server mode** (Gas Town), auto-commit defaults to OFF because the server +In **server mode** (orchestrator), auto-commit defaults to OFF because the server manages its own transaction lifecycle. Firing `DOLT_COMMIT` after every write under concurrent load causes 'database is read only' errors. @@ -313,9 +313,9 @@ bd --dolt-auto-commit off create "Issue 2" bd vc commit -m "Batch: created issues" ``` -## Server Management (Gas Town) +## Server Management (Orchestrator) -Gas Town provides integrated Dolt server management: +The orchestrator provides integrated Dolt server management: ```bash gt dolt start # Start server (background) @@ -344,7 +344,7 @@ bd init --prefix myproject --shared-server ``` **Benefits:** -- No port conflicts between projects (single server on port 3308, avoids Gas Town on 3307) +- No port conflicts between projects (single server on port 3308, avoids orchestrator on 3307) - Reduced resource usage (one process instead of many) - Automatic database isolation (each project uses its own database name) @@ -353,7 +353,7 @@ bd init --prefix myproject --shared-server - Dolt data directory: `~/.beads/shared-server/dolt/` - Each project's database is stored as a subdirectory (e.g., `~/.beads/shared-server/dolt/myproject/`) - The file lock mechanism ensures safe concurrent access from multiple projects -- Default port is 3308 (not 3307) to avoid conflict with Gas Town. Override with `BEADS_DOLT_SERVER_PORT` or `dolt.port` in config.yaml +- Default port is 3308 (not 3307) to avoid conflict with the orchestrator. Override with `BEADS_DOLT_SERVER_PORT` or `dolt.port` in config.yaml **Important:** Each project on a shared server **must have a unique prefix** (database name). Two projects with the same prefix share the same database — if this happens accidentally, @@ -368,15 +368,14 @@ bd dolt status bd dolt show ``` -### Data Location (Gas Town) +### Data Location (Orchestrator) ``` /.dolt-data/ ├── hq/ # Town beads (hq-*) -├── gastown/ # Gastown rig (gt-*) +├── my-project/ # Project rig (mp-*) ├── beads/ # Beads rig (bd-*) -├── wyvern/ # Wyvern rig (wy-*) -└── sky/ # Sky rig (sky-*) +└── other-project/ # Other rig (op-*) ``` ## Migration Cleanup diff --git a/docs/INTERNALS.md b/docs/INTERNALS.md index 65cbe5c69..2d6f37a95 100644 --- a/docs/INTERNALS.md +++ b/docs/INTERNALS.md @@ -153,7 +153,7 @@ The FlushManager is designed to work correctly when commands run multiple times ### Server Mode -When running with Dolt server mode (Gas Town), the CLI communicates with the Dolt SQL server for database operations. The FlushManager is NOT used in server mode — the server process has its own flush coordination. +When running with Dolt server mode (orchestrator), the CLI communicates with the Dolt SQL server for database operations. The FlushManager is NOT used in server mode — the server process has its own flush coordination. The server mode check in `PersistentPostRun` ensures FlushManager shutdown only occurs in embedded mode (standalone users). diff --git a/docs/LABELS.md b/docs/LABELS.md index 2cb6d9932..9bcdfc3de 100644 --- a/docs/LABELS.md +++ b/docs/LABELS.md @@ -617,7 +617,7 @@ bd list --label breaking-change --label needs-docs ## Operational State Pattern (Labels as Cache) -For orchestration systems like Gas Town, labels can cache the current operational state of "role beads" (issues representing agents or system components). This enables fast state queries without scanning event history. +For orchestration systems, labels can cache the current operational state of "role beads" (issues representing agents or system components). This enables fast state queries without scanning event history. ### Convention: `:` diff --git a/docs/design/dolt-concurrency.md b/docs/design/dolt-concurrency.md index 301f5ac81..848d2f696 100644 --- a/docs/design/dolt-concurrency.md +++ b/docs/design/dolt-concurrency.md @@ -4,18 +4,18 @@ > **Date**: 2026-02-22 (implemented 2026-02-24) > **Authors**: Steve Yegge, crew max > **Input**: Tim Sehn (Dolt co-founder), DoltHub blog 2026-02-18 -> **Scope**: Beads (primary), Gas Town (operational), Wasteland (federation) +> **Scope**: Beads (primary), orchestrator (operational), Wasteland (federation) --- ## Problem Statement -Beads is the universal data plane for Gas Town. Every agent — polecats, mayor, +Beads is the universal data plane for the orchestrator. Every agent — polecats, mayor, witness, refinery, deacon, crew, dogs — reads and writes beads as their primary means of coordination. The Dolt concurrency model must serve **all** of them, not just polecats. -Gas Town currently uses a **branch-per-worker** strategy for Dolt concurrency +The orchestrator currently uses a **branch-per-worker** strategy for Dolt concurrency (historically called "branch-per-polecat," though the issue affects all agents): workers get their own Dolt branches, write in isolation, and merge to main later. @@ -28,7 +28,7 @@ rate in tests. But the concurrency wins are **illusory** because: cross-agent visibility for dispatching, dependency tracking, and status queries. 2. **Shared state must live on main.** Beads is the coordination layer for the - entire town. Every role — polecats doing work, mayor dispatching, witness + entire orchestrator. Every role — polecats doing work, mayor dispatching, witness monitoring, refinery validating, crew assisting — needs the same view of bead state. Branch isolation is the opposite of what a shared data plane requires. @@ -232,7 +232,7 @@ should use transaction-scoped commits. dead code for the normal write path. Retain for federation use cases (DoltHub remote merge) and standalone Beads. -### What Changes in Gas Town +### What Changes in the Orchestrator #### `gt sling`: Stop Creating Branches @@ -271,7 +271,7 @@ db.SetMaxIdleConns(5) // Keep warm connections db.SetConnMaxLifetime(5 * time.Minute) ``` -The exact numbers depend on the rig's concurrency level. A typical Gas Town +The exact numbers depend on the rig's concurrency level. A typical orchestrator rig with 6 polecats + mayor + witness + refinery + deacon + crew = ~11 concurrent agents, each potentially holding a connection. @@ -320,7 +320,7 @@ This works regardless of branch-per-worker — it's strictly additive safety. - Keep `maybeAutoCommit` as fallback for bare writes - **Test**: Existing concurrent_test.go should still pass -### Phase 2: Remove Branch-Per-Worker (Gas Town) +### Phase 2: Remove Branch-Per-Worker (Orchestrator) Conditional on Phase 1 being stable in production. @@ -351,8 +351,8 @@ The move to all-on-main **simplifies** federation: was hard to reason about when syncing with DoltHub remotes. All-on-main produces a cleaner commit history. -- **Cross-town bead visibility is immediate.** When town A pushes to DoltHub, - town B pulls and sees all beads. No branch reconciliation needed. +- **Cross-rig bead visibility is immediate.** When rig A pushes to DoltHub, + rig B pulls and sees all beads. No branch reconciliation needed. - **Federation transactions.** The same `BEGIN` ... `DOLT_COMMIT` pattern applies to federation sync: pull remote changes, resolve conflicts, commit. @@ -371,7 +371,7 @@ Wisps are `dolt_ignore`-d and never pushed. This is correct: ## Implications for Standalone Beads The `bd` CLI supports both embedded Dolt and server mode. This design -applies to **server mode only** (Gas Town's deployment). Embedded mode +applies to **server mode only** (the orchestrator's deployment). Embedded mode is single-process and doesn't have the multi-connection concurrency concerns described here. @@ -385,13 +385,13 @@ For standalone `bd` with embedded Dolt: Tim's guidance: **hundreds of transactions per second on a single branch.** Our workload: -- Typical Gas Town: 6-12 concurrent agents (all roles combined) +- Typical orchestrator rig: 6-12 concurrent agents (all roles combined) - Write patterns: create/update/close beads, ~1-10 writes per agent per minute - Read patterns: status queries, bead lookups, ~10-100 reads per agent per minute - Total: ~60-120 writes/minute, ~600-1200 reads/minute at peak This is well within Dolt's single-branch capacity. Even at 10x scale (60+ -agents across a large town), we'd hit ~1200 writes/minute = ~20 writes/second, +agents across a large rig), we'd hit ~1200 writes/minute = ~20 writes/second, far below the hundreds-per-second ceiling. ## Open Questions @@ -409,7 +409,7 @@ far below the hundreds-per-second ceiling. (e.g., `WHERE updated_at = ? AND status = ?`) for high-contention fields like `status` and `assignee`? -4. **Existing branch cleanup.** Production Gas Towns have accumulated +4. **Existing branch cleanup.** Production orchestrator rigs have accumulated worker branches. Need a migration script to merge-or-delete these before switching to all-on-main. @@ -429,4 +429,4 @@ far below the hundreds-per-second ceiling. - `gastown/internal/polecat/session_manager.go` — BD_BRANCH injection - `gastown/docs/design/dolt-storage.md` — current architecture doc - `gastown/internal/analysis/bdbranch/` — BD_BRANCH safety analyzer -- Gas Town issue `gt-4j1g7p`: "Remove Dolt branch-per-polecat entirely" (predates this design) +- Orchestrator issue `gt-4j1g7p`: "Remove Dolt branch-per-polecat entirely" (predates this design) diff --git a/docs/messaging.md b/docs/messaging.md index 07ea79c62..63e2b6d91 100644 --- a/docs/messaging.md +++ b/docs/messaging.md @@ -4,7 +4,7 @@ Beads supports messaging as a first-class issue type, enabling inter-agent and h ## Architecture -Mail commands (`bd mail`) delegate to an external mail provider (typically `gt mail` in Gas Town). Beads stores messages as issues with `type: message`, threading via `replies_to` dependencies, and ephemeral lifecycle via the `ephemeral` flag. +Mail commands (`bd mail`) delegate to an external mail provider (typically `gt mail` in an orchestrator). Beads stores messages as issues with `type: message`, threading via `replies_to` dependencies, and ephemeral lifecycle via the `ephemeral` flag. This design separates concerns: - **Beads** = data plane (stores messages as issues) diff --git a/internal/config/config.go b/internal/config/config.go index 6d30a8ee0..ccbe99d43 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -642,7 +642,7 @@ func GetMultiRepoConfig() *MultiRepoConfig { // // external_projects: // beads: ../beads -// gastown: /absolute/path/to/gastown +// other-project: /absolute/path/to/other-project func GetExternalProjects() map[string]string { return GetStringMapString("external_projects") } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index ba99c1d77..355a8ed2f 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -580,8 +580,8 @@ func TestGetExternalProjects(t *testing.T) { // Test with Set Set("external_projects", map[string]string{ - "beads": "../beads", - "gastown": "/absolute/path/to/gastown", + "beads": "../beads", + "other-project": "/absolute/path/to/other-project", }) got = GetExternalProjects() @@ -591,8 +591,8 @@ func TestGetExternalProjects(t *testing.T) { if got["beads"] != "../beads" { t.Errorf("GetExternalProjects()[beads] = %q, want \"../beads\"", got["beads"]) } - if got["gastown"] != "/absolute/path/to/gastown" { - t.Errorf("GetExternalProjects()[gastown] = %q, want \"/absolute/path/to/gastown\"", got["gastown"]) + if got["other-project"] != "/absolute/path/to/other-project" { + t.Errorf("GetExternalProjects()[other-project] = %q, want \"/absolute/path/to/other-project\"", got["other-project"]) } } @@ -604,7 +604,7 @@ func TestGetExternalProjectsFromConfig(t *testing.T) { configContent := ` external_projects: beads: ../beads - gastown: /path/to/gastown + other-project: /path/to/other-project other: ./relative/path ` beadsDir := filepath.Join(tmpDir, ".beads") @@ -634,8 +634,8 @@ external_projects: if got["beads"] != "../beads" { t.Errorf("GetExternalProjects()[beads] = %q, want \"../beads\"", got["beads"]) } - if got["gastown"] != "/path/to/gastown" { - t.Errorf("GetExternalProjects()[gastown] = %q, want \"/path/to/gastown\"", got["gastown"]) + if got["other-project"] != "/path/to/other-project" { + t.Errorf("GetExternalProjects()[other-project] = %q, want \"/path/to/other-project\"", got["other-project"]) } if got["other"] != "./relative/path" { t.Errorf("GetExternalProjects()[other] = %q, want \"./relative/path\"", got["other"]) diff --git a/internal/configfile/configfile.go b/internal/configfile/configfile.go index e7ef2e673..c214e2983 100644 --- a/internal/configfile/configfile.go +++ b/internal/configfile/configfile.go @@ -22,7 +22,7 @@ type Config struct { // Dolt connection mode configuration (bd-dolt.2.2) // "embedded" (default for standalone) runs Dolt in-process. - // "server" connects to an external dolt sql-server (required for Gas Town / multi-writer). + // "server" connects to an external dolt sql-server (required for orchestrator / multi-writer). DoltMode string `json:"dolt_mode,omitempty"` // "embedded" (default) or "server" DoltServerHost string `json:"dolt_server_host,omitempty"` // Server host (default: 127.0.0.1) DoltServerPort int `json:"dolt_server_port,omitempty"` // Server port (default: 3307) @@ -260,7 +260,7 @@ func (c *Config) GetDoltServerHost() string { // Kept for backward compatibility with external consumers. // // GetDoltServerPort returns the Dolt server port. -// Checks BEADS_DOLT_SERVER_PORT env var first, then BEADS_DOLT_PORT (Gas Town sets this), +// Checks BEADS_DOLT_SERVER_PORT env var first, then BEADS_DOLT_PORT (orchestrator sets this), // then config, then default. func (c *Config) GetDoltServerPort() int { if p := os.Getenv("BEADS_DOLT_SERVER_PORT"); p != "" { diff --git a/internal/doltserver/doltserver.go b/internal/doltserver/doltserver.go index 46177372d..7df6a2269 100644 --- a/internal/doltserver/doltserver.go +++ b/internal/doltserver/doltserver.go @@ -39,7 +39,7 @@ import ( const maxEphemeralPortAttempts = 10 // DefaultSharedServerPort is the default port for shared server mode. -// Uses 3308 to avoid conflict with Gas Town which uses 3307. +// Uses 3308 to avoid conflict with the orchestrator which uses 3307. const DefaultSharedServerPort = 3308 // IsSharedServerMode returns true if shared server mode is enabled. @@ -382,7 +382,7 @@ func DefaultConfig(beadsDir string) *Config { // shared server port. In per-project mode, Start() will allocate an // ephemeral port from the OS (GH#2098, GH#2372). if cfg.Port == 0 && IsSharedServerMode() { - cfg.Port = DefaultSharedServerPort // 3308 - avoids Gas Town conflict on 3307 + cfg.Port = DefaultSharedServerPort // 3308 - avoids orchestrator conflict on 3307 } return cfg @@ -472,9 +472,9 @@ func EnsureRunning(beadsDir string) (int, error) { func EnsureRunningDetailed(beadsDir string) (port int, startedByUs bool, err error) { serverDir := resolveServerDir(beadsDir) - // Inform when Gas Town is also running on this machine + // Inform when an orchestrator is also running on this machine if IsSharedServerMode() && os.Getenv("GT_ROOT") != "" { - fmt.Fprintf(os.Stderr, "Info: Gas Town detected (GT_ROOT set). Shared server uses port %d to avoid conflict.\n", DefaultSharedServerPort) + fmt.Fprintf(os.Stderr, "Info: Orchestrator detected (GT_ROOT set). Shared server uses port %d to avoid conflict.\n", DefaultSharedServerPort) } state, err := IsRunning(serverDir) diff --git a/internal/doltserver/doltserver_test.go b/internal/doltserver/doltserver_test.go index a0d132d59..bed73232c 100644 --- a/internal/doltserver/doltserver_test.go +++ b/internal/doltserver/doltserver_test.go @@ -73,11 +73,11 @@ func TestIsRunningNoServer(t *testing.T) { } } -func TestIsRunningChecksDaemonPidUnderGasTown(t *testing.T) { +func TestIsRunningChecksDaemonPidUnderOrchestrator(t *testing.T) { dir := t.TempDir() gtRoot := t.TempDir() - // Set GT_ROOT to simulate Gas Town environment + // Set GT_ROOT to simulate orchestrator environment orig := os.Getenv("GT_ROOT") os.Setenv("GT_ROOT", gtRoot) defer func() { @@ -417,7 +417,7 @@ func TestMaxDoltServers(t *testing.T) { } }() - // CWD must be outside any Gas Town workspace for standalone test + // CWD must be outside any orchestrator workspace for standalone test origWd, err := os.Getwd() if err != nil { t.Fatal(err) @@ -432,7 +432,7 @@ func TestMaxDoltServers(t *testing.T) { } }) - t.Run("gastown_same_as_standalone", func(t *testing.T) { + t.Run("orchestrator_same_as_standalone", func(t *testing.T) { // After daemon removal, GT_ROOT no longer affects maxDoltServers t.Setenv("GT_ROOT", t.TempDir()) @@ -1096,7 +1096,7 @@ func TestDefaultConfig_SharedModeGeneralPortOverrides(t *testing.T) { func TestDefaultSharedServerPort_DiffersFromDefault(t *testing.T) { if DefaultSharedServerPort == configfile.DefaultDoltServerPort { - t.Errorf("DefaultSharedServerPort (%d) must differ from DefaultDoltServerPort (%d) to avoid Gas Town conflict", + t.Errorf("DefaultSharedServerPort (%d) must differ from DefaultDoltServerPort (%d) to avoid orchestrator conflict", DefaultSharedServerPort, configfile.DefaultDoltServerPort) } } diff --git a/internal/routing/routes.go b/internal/routing/routes.go index 0e74bb830..a2045a321 100644 --- a/internal/routing/routes.go +++ b/internal/routing/routes.go @@ -58,7 +58,7 @@ func LoadRoutes(beadsDir string) ([]Route, error) { // LoadTownRoutes loads routes from the town-level routes.jsonl. // It first checks the given beadsDir, then walks up to find the town root -// and loads routes from there. This is useful for multi-rig setups (Gas Town) +// and loads routes from there. This is useful for multi-rig setups (orchestrator workspaces) // where routes.jsonl lives at /.beads/ rather than in individual rig directories. // Returns routes and nil error on success, or nil routes if not in a town or no routes found. func LoadTownRoutes(beadsDir string) ([]Route, error) { @@ -77,7 +77,7 @@ func ExtractPrefix(id string) string { // ExtractProjectFromPath extracts the project name from a route path. // For "beads/mayor/rig", returns "beads". -// For "gastown/crew/max", returns "gastown". +// For "my-project/crew/max", returns "my-project". func ExtractProjectFromPath(path string) string { // Get the first component of the path parts := strings.Split(path, "/") @@ -153,9 +153,9 @@ func lookupRigForgivingWithTown(input, beadsDir string) (Route, string, bool) { // This is used by --rig and --prefix flags to create issues in a different rig. // // The input is forgiving - accepts any of: -// - "beads", "gastown" (rig names) -// - "bd-", "gt-" (exact prefixes) -// - "bd", "gt" (prefixes without hyphen) +// - "beads", "my-project" (rig names) +// - "bd-", "mp-" (exact prefixes) +// - "bd", "mp" (prefixes without hyphen) // // Parameters: // - rigOrPrefix: rig name or prefix in any format @@ -354,7 +354,7 @@ func findTownRoutes(currentBeadsDir string) ([]Route, string) { } return routes, townRoot } - // Fallback to parent dir if not in a town structure (for non-Gas Town repos) + // Fallback to parent dir if not in a town structure (for non-orchestrator repos) if os.Getenv("BD_DEBUG_ROUTING") != "" { fmt.Fprintf(os.Stderr, "[routing] findTownRoutes: found routes in %s, townRoot=%s (fallback to parent dir)\n", currentBeadsDir, filepath.Dir(currentBeadsDir)) } diff --git a/internal/routing/routing_test.go b/internal/routing/routing_test.go index 79f93c623..109b8b670 100644 --- a/internal/routing/routing_test.go +++ b/internal/routing/routing_test.go @@ -123,7 +123,7 @@ func TestExtractProjectFromPath(t *testing.T) { want string }{ {"beads/mayor/rig", "beads"}, - {"gastown/crew/max", "gastown"}, + {"my-project/crew/max", "my-project"}, {"simple", "simple"}, {"", ""}, {"/absolute/path", ""}, // Starts with /, first component is empty @@ -368,7 +368,7 @@ func TestDetectUserRole_UpstreamSameRepoStillMaintainer(t *testing.T) { // Before fix: walking up from /olympus/.beads finds /olympus (WRONG) // After fix: findTownRootFromCWD() walks up from CWD to find mayor/town.json at func TestFindTownRoutes_SymlinkedBeadsDir(t *testing.T) { - // Create temporary directory structure simulating Gas Town: + // Create temporary directory structure simulating an orchestrator workspace: // tmpDir/ // mayor/ // town.json <- town root marker diff --git a/internal/storage/dolt/concurrent_test.go b/internal/storage/dolt/concurrent_test.go index 44d419570..7b97b2892 100644 --- a/internal/storage/dolt/concurrent_test.go +++ b/internal/storage/dolt/concurrent_test.go @@ -1,6 +1,6 @@ // Package dolt provides concurrency tests for embedded Dolt with multiple writers. // -// These tests validate that Gas Town can safely run multiple polecats concurrently, +// These tests validate that an orchestrator can safely run multiple workers concurrently, // all writing to the same Dolt DB for creating issues, updating status, // adding dependencies, and closing issues. package dolt diff --git a/internal/storage/dolt/credentials.go b/internal/storage/dolt/credentials.go index 5439aef85..43abe80d1 100644 --- a/internal/storage/dolt/credentials.go +++ b/internal/storage/dolt/credentials.go @@ -21,7 +21,7 @@ import ( ) // Credential storage and encryption for federation peers. -// Enables SQL user authentication when syncing with peer Gas Towns. +// Enables SQL user authentication when syncing with peer workspaces. // credentialKeyFile is the filename for the random encryption key stored alongside the database. const credentialKeyFile = ".beads-credential-key" //nolint:gosec // G101: not a credential, just a filename diff --git a/internal/storage/dolt/federation.go b/internal/storage/dolt/federation.go index 6454a0bcd..60549b823 100644 --- a/internal/storage/dolt/federation.go +++ b/internal/storage/dolt/federation.go @@ -14,7 +14,7 @@ import ( ) // FederatedStorage implementation for DoltStore -// These methods enable peer-to-peer synchronization between Gas Towns. +// These methods enable peer-to-peer synchronization between workspaces. // PushTo pushes commits to a specific peer remote. // If credentials are stored for this peer, they are used automatically. diff --git a/internal/storage/dolt/open.go b/internal/storage/dolt/open.go index bdb146337..ed222fec9 100644 --- a/internal/storage/dolt/open.go +++ b/internal/storage/dolt/open.go @@ -83,7 +83,7 @@ func NewFromConfigWithOptions(ctx context.Context, beadsDir string, cfg *Config) // Enable auto-start for standalone users (similar to main.go's auto-start // handling), with additional support for BEADS_TEST_MODE and a config.yaml // fallback for library consumers that never call config.Initialize(). - // Disabled under Gas Town (which manages its own server), by explicit config, + // Disabled under orchestrator (which manages its own server), by explicit config, // or in test mode (tests manage their own server lifecycle via testdoltserver). // Note: cfg.ReadOnly refers to the store's read-only mode, not the server — // the server must be running regardless of whether the store is read-only. diff --git a/internal/storage/dolt/schema.go b/internal/storage/dolt/schema.go index 03060e036..00e317e16 100644 --- a/internal/storage/dolt/schema.go +++ b/internal/storage/dolt/schema.go @@ -223,7 +223,7 @@ CREATE TABLE IF NOT EXISTS interactions ( ); -- Federation peers table (for SQL user authentication) --- Stores credentials for peer-to-peer Dolt remotes between Gas Towns +-- Stores credentials for peer-to-peer Dolt remotes between workspaces CREATE TABLE IF NOT EXISTS federation_peers ( name VARCHAR(255) PRIMARY KEY, remote_url VARCHAR(1024) NOT NULL, diff --git a/internal/storage/dolt/store.go b/internal/storage/dolt/store.go index 512d60ca0..c10373ac3 100644 --- a/internal/storage/dolt/store.go +++ b/internal/storage/dolt/store.go @@ -219,7 +219,7 @@ type Config struct { // AutoStart enables transparent server auto-start when connection fails. // When true and the host is localhost, bd will start a dolt sql-server - // automatically if one isn't running. Disabled under Gas Town (GT_ROOT set). + // automatically if one isn't running. Disabled under orchestrator (GT_ROOT set). AutoStart bool // MaxOpenConns overrides the connection pool size (0 = default 10). @@ -618,7 +618,7 @@ func applyConfigDefaults(cfg *Config) { // BEADS_TEST_MODE guard > metadata config > default. // CRITICAL: BEADS_TEST_MODE=1 forces port 1 (immediate fail) if the resolved port // is the production port (DefaultSQLPort). This prevents test databases from leaking - // onto production even when the port env var is set to 3307 by Gas Town's beads module. + // onto production even when the port env var is set to 3307 by the orchestrator's beads module. // Only an explicit non-production port (e.g., 43211 for a test server) // overrides test mode — that's a deliberate test server assignment. envPort := os.Getenv("BEADS_DOLT_SERVER_PORT") @@ -1067,7 +1067,7 @@ func openServerConnection(ctx context.Context, cfg *Config) (*sql.DB, string, er _ = db.Close() // Check for connection refused - server likely not running if strings.Contains(errLower, "connection refused") || strings.Contains(errLower, "connect: connection refused") { - return nil, "", fmt.Errorf("failed to connect to Dolt server at %s:%d: %w\n\nThe Dolt server may not be running. Try:\n bd dolt start # Start a local server\n gt dolt start # If using Gas Town", + return nil, "", fmt.Errorf("failed to connect to Dolt server at %s:%d: %w\n\nThe Dolt server may not be running. Try:\n bd dolt start # Start a local server\n gt dolt start # If using an orchestrator", cfg.ServerHost, cfg.ServerPort, err) } return nil, "", fmt.Errorf("failed to create database: %w", err) diff --git a/internal/storage/dolt/store_unit_test.go b/internal/storage/dolt/store_unit_test.go index 197f6c430..d205acb1a 100644 --- a/internal/storage/dolt/store_unit_test.go +++ b/internal/storage/dolt/store_unit_test.go @@ -256,7 +256,7 @@ func TestApplyConfigDefaults_TestModeWithPort(t *testing.T) { // TestApplyConfigDefaults_TestModeBlocksProdPort verifies that BEADS_TEST_MODE=1 // forces port 1 even when BEADS_DOLT_PORT is explicitly set to the production port. -// This is the fix for Clown Show #14: Gas Town's beads module injects +// This is the fix for Clown Show #14: The orchestrator's beads module injects // BEADS_DOLT_PORT=3307 from metadata.json, bypassing the test mode guard. func TestApplyConfigDefaults_TestModeBlocksProdPort(t *testing.T) { origTestMode := os.Getenv("BEADS_TEST_MODE") @@ -287,7 +287,7 @@ func TestApplyConfigDefaults_TestModeBlocksProdPort(t *testing.T) { // TestApplyConfigDefaults_EnvOverridesConfig verifies that BEADS_DOLT_PORT // overrides a port already set by metadata.json, even outside test mode. -// This is the fix for hq-27t (test pollution): callers like Gas Town set +// This is the fix for hq-27t (test pollution): callers like the orchestrator set // BEADS_DOLT_PORT to route bd to a test server instead of production. func TestApplyConfigDefaults_EnvOverridesConfig(t *testing.T) { origTestMode := os.Getenv("BEADS_TEST_MODE") diff --git a/internal/storage/versioned.go b/internal/storage/versioned.go index 0155dd4f3..2a56b9306 100644 --- a/internal/storage/versioned.go +++ b/internal/storage/versioned.go @@ -47,7 +47,7 @@ type SyncStatus struct { } // FederationPeer represents a remote peer with authentication credentials. -// Used for peer-to-peer Dolt remotes between Gas Towns with SQL user auth. +// Used for peer-to-peer Dolt remotes between workspaces with SQL user auth. type FederationPeer struct { Name string // Unique name for this peer (used as remote name) RemoteURL string // Dolt remote URL (e.g., http://host:port/org/db) diff --git a/internal/types/types.go b/internal/types/types.go index dcae53b6f..8d110b8e5 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -373,15 +373,15 @@ const ( ) // TypeEvent is a system-internal type used by set-state for audit trail beads. -// Originally a Gas Town type, promoted to built-in internal type. It is not a +// Originally an orchestrator type, promoted to built-in internal type. It is not a // core work type (not in IsValid) but is accepted by IsValidWithCustom / // ValidateWithCustom and treated as built-in for hydration trust (GH#1356). const TypeEvent IssueType = "event" -// Note: Gas Town types (molecule, gate, convoy, merge-request, slot, agent, role, rig) +// Note: Orchestrator types (molecule, gate, convoy, merge-request, slot, agent, role, rig) // were removed from beads core. They are now purely custom types with no built-in constants. // Use string literals like types.IssueType("molecule") if needed, and configure types.custom. -// (event was also a Gas Town type but was promoted to a built-in internal type above.) +// (event was also an orchestrator type but was promoted to a built-in internal type above.) // (message was re-promoted to built-in for inter-agent communication — GH#1347.) // IsValid checks if the issue type is a core work type. diff --git a/internal/types/types_test.go b/internal/types/types_test.go index d9bca437e..e76badbdf 100644 --- a/internal/types/types_test.go +++ b/internal/types/types_test.go @@ -513,7 +513,7 @@ func TestIssueTypeIsValid(t *testing.T) { {TypeMessage, true}, // Molecule is now a core type (used by swarm create) {IssueType("molecule"), true}, - // Gas Town types are now custom types (not built-in) + // Orchestrator types are now custom types (not built-in) {IssueType("merge-request"), false}, {IssueType("gate"), false}, {IssueType("agent"), false}, @@ -611,7 +611,7 @@ func TestIssueTypeRequiredSections(t *testing.T) { {TypeDecision, 3, "## Decision"}, {TypeChore, 0, ""}, {TypeMessage, 0, ""}, - // Gas Town types are now custom and have no required sections + // Orchestrator types are now custom and have no required sections {IssueType("molecule"), 0, ""}, {IssueType("gate"), 0, ""}, {TypeEvent, 0, ""}, diff --git a/internal/ui/styles.go b/internal/ui/styles.go index 493b61048..1321b723c 100644 --- a/internal/ui/styles.go +++ b/internal/ui/styles.go @@ -139,7 +139,7 @@ var ( Light: "", // standard text color Dark: "", } - // Note: Gas Town-specific types (agent, role, rig) have been removed. + // Note: Orchestrator-specific types (agent, role, rig) have been removed. // Use labels (gt:agent, gt:role, gt:rig) with custom styling if needed. // === Issue ID Color === @@ -188,7 +188,7 @@ var ( TypeTaskStyle = lipgloss.NewStyle().Foreground(ColorTypeTask) TypeEpicStyle = lipgloss.NewStyle().Foreground(ColorTypeEpic) TypeChoreStyle = lipgloss.NewStyle().Foreground(ColorTypeChore) - // Note: Gas Town-specific type styles (agent, role, rig) have been removed. + // Note: Orchestrator-specific type styles (agent, role, rig) have been removed. ) // CategoryStyle for section headers - bold with accent color @@ -426,7 +426,7 @@ func RenderPriorityCompact(priority int) string { // RenderType renders an issue type with semantic styling // bugs and epics get color; all other types use standard text -// Note: Gas Town-specific types (agent, role, rig) now fall through to default +// Note: Orchestrator-specific types (agent, role, rig) now fall through to default func RenderType(issueType string) string { switch issueType { case "bug": diff --git a/internal/ui/styles_test.go b/internal/ui/styles_test.go index 4beda3a92..271861066 100644 --- a/internal/ui/styles_test.go +++ b/internal/ui/styles_test.go @@ -98,7 +98,7 @@ func TestRenderTypeVariants(t *testing.T) { {"task", TypeTaskStyle.Render("task")}, {"epic", TypeEpicStyle.Render("epic")}, {"chore", TypeChoreStyle.Render("chore")}, - // Gas Town types (agent, role, rig) have been removed - they now fall through to default + // Orchestrator types (agent, role, rig) have been removed - they now fall through to default {"agent", "agent"}, // Falls through to default (no styling) {"role", "role"}, // Falls through to default (no styling) {"rig", "rig"}, // Falls through to default (no styling) diff --git a/internal/validation/bead_test.go b/internal/validation/bead_test.go index 4a8827c9b..e1026f98f 100644 --- a/internal/validation/bead_test.go +++ b/internal/validation/bead_test.go @@ -219,7 +219,7 @@ func TestParseIssueType(t *testing.T) { {"chore type", "chore", types.TypeChore, false, ""}, // Molecule is now a core type (used by swarm create) {"molecule type", "molecule", types.TypeMolecule, false, ""}, - // Gas Town types require types.custom configuration (invalid without config) + // Orchestrator types require types.custom configuration (invalid without config) {"merge-request type", "merge-request", types.TypeTask, true, "invalid issue type"}, {"gate type", "gate", types.TypeTask, true, "invalid issue type"}, {"event type", "event", types.TypeTask, true, "invalid issue type"}, @@ -305,7 +305,7 @@ func TestValidatePrefixWithAllowed(t *testing.T) { {"mismatched with force", "foo", "bd", "", true, false}, {"mismatched without force", "foo", "bd", "", false, true}, - // Multi-prefix cases (Gas Town use case) + // Multi-prefix cases (multi-rig use case) {"allowed prefix gt", "gt", "hq", "gt,hmc", false, false}, {"allowed prefix hmc", "hmc", "hq", "gt,hmc", false, false}, {"primary prefix still works", "hq", "hq", "gt,hmc", false, false}, diff --git a/scripts/release.sh b/scripts/release.sh index 80994efb6..347415979 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -7,7 +7,7 @@ set -euo pipefail # # WHY A MOLECULE INSTEAD OF A SCRIPT? # -# Gas Town uses molecules (not scripts) for multi-step workflows because: +# Orchestrators use molecules (not scripts) for multi-step workflows because: # # 1. LEDGER: Each step is a timestamped entry in your work history. # Your CV accumulates from completed work. Batch scripts are invisible. @@ -22,7 +22,7 @@ set -euo pipefail # Clean phase handoffs without busy-waiting. # # Read more: -# - Gas Town docs: PRIMING.md (see "The Batch-Closure Heresy") +# - Orchestrator docs: PRIMING.md (see "The Batch-Closure Heresy") # - HOP docs: CONTEXT.md (see "The Mission" and "MEOW Stack") # # THE RELEASE MOLECULE @@ -138,7 +138,7 @@ if [ "$DRY_RUN" = true ]; then echo " • Observable via bd activity --follow" echo " • Gates wait for CI without polling" echo "" - echo "Read: Gas Town docs → PRIMING.md → 'The Batch-Closure Heresy'" + echo "Read: Orchestrator docs → PRIMING.md → 'The Batch-Closure Heresy'" exit 0 fi diff --git a/scripts/repro-dolt-hang/INCIDENT-REPORT.md b/scripts/repro-dolt-hang/INCIDENT-REPORT.md index 05c916a4e..45dc59514 100644 --- a/scripts/repro-dolt-hang/INCIDENT-REPORT.md +++ b/scripts/repro-dolt-hang/INCIDENT-REPORT.md @@ -3,7 +3,7 @@ **Date:** 2026-02-23 **Dolt Version:** 1.82.2 (now upgraded to 1.82.4) **Platform:** macOS Darwin 25.3.0, arm64 -**Reporter:** Steve Yegge (Gas Town / beads project) +**Reporter:** Steve Yegge (multi-agent workspace / beads project) ## Summary @@ -14,7 +14,7 @@ force-killing the Dolt server and all ~15 stuck bd/gt processes to recover. ## Environment -Gas Town is a multi-agent workspace where ~20 Claude Code agents run +The workspace is a multi-agent environment where ~20 Claude Code agents run concurrently, each issuing `bd` (beads CLI) commands that connect to a shared Dolt SQL server. @@ -32,7 +32,7 @@ listener: ### Databases -The shared server hosts ~15 databases (beads, gastown, hq, wyvern, sky, plus +The shared server hosts ~15 databases (beads, hq, plus project-specific and test databases from automated test runs). ### Client Connection Pattern (pre-fix)