refactor: consolidate agent env vars into config.AgentEnv
Create centralized AgentEnv function as single source of truth for all agent environment variables. All agents now consistently receive: - GT_ROLE, BD_ACTOR, GIT_AUTHOR_NAME (role identity) - GT_ROOT, BEADS_DIR (workspace paths) - GT_RIG, GT_POLECAT/GT_CREW (rig-specific identity) - BEADS_AGENT_NAME, BEADS_NO_DAEMON (beads config) - CLAUDE_CONFIG_DIR (optional account selection) Remove RoleEnvVars in favor of AgentEnvSimple wrapper. Remove IncludeBeadsEnv flag - beads env vars always included. Update all manager and cmd call sites to use AgentEnv. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
julianknutsen
committed by
Steve Yegge
Steve Yegge
parent
52b9a95f98
commit
e999ceb1c1
204
internal/config/env.go
Normal file
204
internal/config/env.go
Normal file
@@ -0,0 +1,204 @@
|
||||
// Package config provides configuration loading and environment variable management.
|
||||
package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// AgentEnvConfig specifies the configuration for generating agent environment variables.
|
||||
// This is the single source of truth for all agent environment configuration.
|
||||
type AgentEnvConfig struct {
|
||||
// Role is the agent role: mayor, deacon, witness, refinery, crew, polecat, boot
|
||||
Role string
|
||||
|
||||
// Rig is the rig name (empty for town-level agents like mayor/deacon)
|
||||
Rig string
|
||||
|
||||
// AgentName is the specific agent name (empty for singletons like witness/refinery)
|
||||
// For polecats, this is the polecat name. For crew, this is the crew member name.
|
||||
AgentName string
|
||||
|
||||
// TownRoot is the root of the Gas Town workspace.
|
||||
// Sets GT_ROOT environment variable.
|
||||
TownRoot string
|
||||
|
||||
// BeadsDir is the resolved BEADS_DIR path.
|
||||
// Callers should use beads.ResolveBeadsDir() to compute this.
|
||||
BeadsDir string
|
||||
|
||||
// RuntimeConfigDir is the optional CLAUDE_CONFIG_DIR path
|
||||
RuntimeConfigDir string
|
||||
|
||||
// BeadsNoDaemon sets BEADS_NO_DAEMON=1 if true
|
||||
// Used for polecats that should bypass the beads daemon
|
||||
BeadsNoDaemon bool
|
||||
}
|
||||
|
||||
// AgentEnv returns all environment variables for an agent based on the config.
|
||||
// This is the single source of truth for agent environment variables.
|
||||
func AgentEnv(cfg AgentEnvConfig) map[string]string {
|
||||
env := make(map[string]string)
|
||||
|
||||
env["GT_ROLE"] = cfg.Role
|
||||
|
||||
// Set role-specific variables
|
||||
switch cfg.Role {
|
||||
case "mayor":
|
||||
env["BD_ACTOR"] = "mayor"
|
||||
env["GIT_AUTHOR_NAME"] = "mayor"
|
||||
|
||||
case "deacon":
|
||||
env["BD_ACTOR"] = "deacon"
|
||||
env["GIT_AUTHOR_NAME"] = "deacon"
|
||||
|
||||
case "boot":
|
||||
env["BD_ACTOR"] = "deacon-boot"
|
||||
env["GIT_AUTHOR_NAME"] = "boot"
|
||||
|
||||
case "witness":
|
||||
env["GT_RIG"] = cfg.Rig
|
||||
env["BD_ACTOR"] = fmt.Sprintf("%s/witness", cfg.Rig)
|
||||
env["GIT_AUTHOR_NAME"] = fmt.Sprintf("%s/witness", cfg.Rig)
|
||||
|
||||
case "refinery":
|
||||
env["GT_RIG"] = cfg.Rig
|
||||
env["BD_ACTOR"] = fmt.Sprintf("%s/refinery", cfg.Rig)
|
||||
env["GIT_AUTHOR_NAME"] = fmt.Sprintf("%s/refinery", cfg.Rig)
|
||||
|
||||
case "polecat":
|
||||
env["GT_RIG"] = cfg.Rig
|
||||
env["GT_POLECAT"] = cfg.AgentName
|
||||
env["BD_ACTOR"] = fmt.Sprintf("%s/polecats/%s", cfg.Rig, cfg.AgentName)
|
||||
env["GIT_AUTHOR_NAME"] = cfg.AgentName
|
||||
|
||||
case "crew":
|
||||
env["GT_RIG"] = cfg.Rig
|
||||
env["GT_CREW"] = cfg.AgentName
|
||||
env["BD_ACTOR"] = fmt.Sprintf("%s/crew/%s", cfg.Rig, cfg.AgentName)
|
||||
env["GIT_AUTHOR_NAME"] = cfg.AgentName
|
||||
}
|
||||
|
||||
env["GT_ROOT"] = cfg.TownRoot
|
||||
env["BEADS_DIR"] = cfg.BeadsDir
|
||||
|
||||
// Set BEADS_AGENT_NAME for polecat/crew (uses same format as BD_ACTOR)
|
||||
if cfg.Role == "polecat" || cfg.Role == "crew" {
|
||||
env["BEADS_AGENT_NAME"] = fmt.Sprintf("%s/%s", cfg.Rig, cfg.AgentName)
|
||||
}
|
||||
|
||||
if cfg.BeadsNoDaemon {
|
||||
env["BEADS_NO_DAEMON"] = "1"
|
||||
}
|
||||
|
||||
// Add optional runtime config directory
|
||||
if cfg.RuntimeConfigDir != "" {
|
||||
env["CLAUDE_CONFIG_DIR"] = cfg.RuntimeConfigDir
|
||||
}
|
||||
|
||||
return env
|
||||
}
|
||||
|
||||
// AgentEnvSimple is a convenience function for simple role-based env var lookup.
|
||||
// Use this when you only need role, rig, and agentName without advanced options.
|
||||
func AgentEnvSimple(role, rig, agentName string) map[string]string {
|
||||
return AgentEnv(AgentEnvConfig{
|
||||
Role: role,
|
||||
Rig: rig,
|
||||
AgentName: agentName,
|
||||
})
|
||||
}
|
||||
|
||||
// ExportPrefix builds an export statement prefix for shell commands.
|
||||
// Returns a string like "export GT_ROLE=mayor BD_ACTOR=mayor && "
|
||||
// The keys are sorted for deterministic output.
|
||||
func ExportPrefix(env map[string]string) string {
|
||||
if len(env) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
// Sort keys for deterministic output
|
||||
keys := make([]string, 0, len(env))
|
||||
for k := range env {
|
||||
keys = append(keys, k)
|
||||
}
|
||||
sort.Strings(keys)
|
||||
|
||||
var parts []string
|
||||
for _, k := range keys {
|
||||
parts = append(parts, fmt.Sprintf("%s=%s", k, env[k]))
|
||||
}
|
||||
|
||||
return "export " + strings.Join(parts, " ") + " && "
|
||||
}
|
||||
|
||||
// BuildStartupCommandWithEnv builds a startup command with the given environment variables.
|
||||
// This combines the export prefix with the agent command and optional prompt.
|
||||
func BuildStartupCommandWithEnv(env map[string]string, agentCmd, prompt string) string {
|
||||
prefix := ExportPrefix(env)
|
||||
|
||||
if prompt != "" {
|
||||
// Include prompt as argument to agent command
|
||||
return fmt.Sprintf("%s%s %q", prefix, agentCmd, prompt)
|
||||
}
|
||||
return prefix + agentCmd
|
||||
}
|
||||
|
||||
// MergeEnv merges multiple environment maps, with later maps taking precedence.
|
||||
func MergeEnv(maps ...map[string]string) map[string]string {
|
||||
result := make(map[string]string)
|
||||
for _, m := range maps {
|
||||
for k, v := range m {
|
||||
result[k] = v
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// FilterEnv returns a new map with only the specified keys.
|
||||
func FilterEnv(env map[string]string, keys ...string) map[string]string {
|
||||
result := make(map[string]string)
|
||||
for _, k := range keys {
|
||||
if v, ok := env[k]; ok {
|
||||
result[k] = v
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// WithoutEnv returns a new map without the specified keys.
|
||||
func WithoutEnv(env map[string]string, keys ...string) map[string]string {
|
||||
result := make(map[string]string)
|
||||
exclude := make(map[string]bool)
|
||||
for _, k := range keys {
|
||||
exclude[k] = true
|
||||
}
|
||||
for k, v := range env {
|
||||
if !exclude[k] {
|
||||
result[k] = v
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// EnvForExecCommand returns os.Environ() with the given env vars appended.
|
||||
// This is useful for setting cmd.Env on exec.Command.
|
||||
func EnvForExecCommand(env map[string]string) []string {
|
||||
result := os.Environ()
|
||||
for k, v := range env {
|
||||
result = append(result, k+"="+v)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// EnvToSlice converts an env map to a slice of "K=V" strings.
|
||||
// Useful for appending to os.Environ() manually.
|
||||
func EnvToSlice(env map[string]string) []string {
|
||||
result := make([]string, 0, len(env))
|
||||
for k, v := range env {
|
||||
result = append(result, k+"="+v)
|
||||
}
|
||||
return result
|
||||
}
|
||||
@@ -1170,45 +1170,6 @@ func BuildStartupCommandWithAgentOverride(envVars map[string]string, rigPath, pr
|
||||
return cmd, nil
|
||||
}
|
||||
|
||||
// RoleEnvVars returns the canonical environment variables for a role.
|
||||
// This is the single source of truth for role identity env vars.
|
||||
// The role parameter should be one of: "mayor", "deacon", "witness", "refinery", "polecat", "crew".
|
||||
// For rig-specific roles, rig must be provided.
|
||||
// For polecat/crew, polecatOrCrew must be the polecat or crew member name.
|
||||
func RoleEnvVars(role, rig, polecatOrCrew string) map[string]string {
|
||||
envVars := map[string]string{
|
||||
"GT_ROLE": role,
|
||||
}
|
||||
|
||||
switch role {
|
||||
case "mayor":
|
||||
envVars["BD_ACTOR"] = "mayor"
|
||||
envVars["GIT_AUTHOR_NAME"] = "mayor"
|
||||
case "deacon":
|
||||
envVars["BD_ACTOR"] = "deacon"
|
||||
envVars["GIT_AUTHOR_NAME"] = "deacon"
|
||||
case "witness":
|
||||
envVars["GT_RIG"] = rig
|
||||
envVars["BD_ACTOR"] = fmt.Sprintf("%s/witness", rig)
|
||||
envVars["GIT_AUTHOR_NAME"] = fmt.Sprintf("%s/witness", rig)
|
||||
case "refinery":
|
||||
envVars["GT_RIG"] = rig
|
||||
envVars["BD_ACTOR"] = fmt.Sprintf("%s/refinery", rig)
|
||||
envVars["GIT_AUTHOR_NAME"] = fmt.Sprintf("%s/refinery", rig)
|
||||
case "polecat":
|
||||
envVars["GT_RIG"] = rig
|
||||
envVars["GT_POLECAT"] = polecatOrCrew
|
||||
envVars["BD_ACTOR"] = fmt.Sprintf("%s/polecats/%s", rig, polecatOrCrew)
|
||||
envVars["GIT_AUTHOR_NAME"] = polecatOrCrew
|
||||
case "crew":
|
||||
envVars["GT_RIG"] = rig
|
||||
envVars["GT_CREW"] = polecatOrCrew
|
||||
envVars["BD_ACTOR"] = fmt.Sprintf("%s/crew/%s", rig, polecatOrCrew)
|
||||
envVars["GIT_AUTHOR_NAME"] = polecatOrCrew
|
||||
}
|
||||
|
||||
return envVars
|
||||
}
|
||||
|
||||
// BuildAgentStartupCommand is a convenience function for starting agent sessions.
|
||||
// It sets standard environment variables (GT_ROLE, BD_ACTOR, GIT_AUTHOR_NAME)
|
||||
@@ -1235,23 +1196,23 @@ func BuildAgentStartupCommandWithAgentOverride(role, bdActor, rigPath, prompt, a
|
||||
// BuildPolecatStartupCommand builds the startup command for a polecat.
|
||||
// Sets GT_ROLE, GT_RIG, GT_POLECAT, BD_ACTOR, and GIT_AUTHOR_NAME.
|
||||
func BuildPolecatStartupCommand(rigName, polecatName, rigPath, prompt string) string {
|
||||
return BuildStartupCommand(RoleEnvVars("polecat", rigName, polecatName), rigPath, prompt)
|
||||
return BuildStartupCommand(AgentEnvSimple("polecat", rigName, polecatName), rigPath, prompt)
|
||||
}
|
||||
|
||||
// BuildPolecatStartupCommandWithAgentOverride is like BuildPolecatStartupCommand, but uses agentOverride if non-empty.
|
||||
func BuildPolecatStartupCommandWithAgentOverride(rigName, polecatName, rigPath, prompt, agentOverride string) (string, error) {
|
||||
return BuildStartupCommandWithAgentOverride(RoleEnvVars("polecat", rigName, polecatName), rigPath, prompt, agentOverride)
|
||||
return BuildStartupCommandWithAgentOverride(AgentEnvSimple("polecat", rigName, polecatName), rigPath, prompt, agentOverride)
|
||||
}
|
||||
|
||||
// BuildCrewStartupCommand builds the startup command for a crew member.
|
||||
// Sets GT_ROLE, GT_RIG, GT_CREW, BD_ACTOR, and GIT_AUTHOR_NAME.
|
||||
func BuildCrewStartupCommand(rigName, crewName, rigPath, prompt string) string {
|
||||
return BuildStartupCommand(RoleEnvVars("crew", rigName, crewName), rigPath, prompt)
|
||||
return BuildStartupCommand(AgentEnvSimple("crew", rigName, crewName), rigPath, prompt)
|
||||
}
|
||||
|
||||
// BuildCrewStartupCommandWithAgentOverride is like BuildCrewStartupCommand, but uses agentOverride if non-empty.
|
||||
func BuildCrewStartupCommandWithAgentOverride(rigName, crewName, rigPath, prompt, agentOverride string) (string, error) {
|
||||
return BuildStartupCommandWithAgentOverride(RoleEnvVars("crew", rigName, crewName), rigPath, prompt, agentOverride)
|
||||
return BuildStartupCommandWithAgentOverride(AgentEnvSimple("crew", rigName, crewName), rigPath, prompt, agentOverride)
|
||||
}
|
||||
|
||||
// ExpectedPaneCommands returns tmux pane command names that indicate the runtime is running.
|
||||
|
||||
Reference in New Issue
Block a user