Agent Executor (AX) is Google's open agentic orchestration runtime
Go
refactor: move antigravity configuration to top-level and rename HarnessesConfig to RegistryConfig
Jaana Dogan5ec51983e13d
diff --git a/ax.yaml b/ax.yamlindex 56a980a..af22733 100644--- a/ax.yaml+++ b/ax.yaml@@ -14,7 +14,7 @@# Sample LOCAL configuration for the AX *harness* build (compiled with -tags=harness).# Usage: ax serve --config ax.yaml-# ax exec --config ax.yaml --input "hello" # uses harnesses.default+# ax exec --config ax.yaml --input "hello" # uses default harness (antigravity)version: v1alphaserver:@@ -24,9 +24,9 @@ eventlog:sqlite:filename: "eventlog/log.sqlite"-harnesses:- antigravity:- default: true+antigravity: {}++registry:antigravity-interactions: {}telemetry:diff --git a/cmd/ax/harness.go b/cmd/ax/harness.goindex 493951b..5c3541e 100644--- a/cmd/ax/harness.go+++ b/cmd/ax/harness.go@@ -166,7 +166,7 @@ func runAntigravityInteractionsHarness(ctx context.Context) error {} else if cfg, err := config.LoadFromBytes(data); err != nil {log.Printf("AX_CONFIG_CONTENT: parse failed, using defaults: %v", err)} else {- hc = cfg.Harnesses.AntigravityInteractions+ hc = cfg.Registry.AntigravityInteractions}}agent := hc.Agentdiff --git a/cmd/ax/internal/cliutil/cliutil.go b/cmd/ax/internal/cliutil/cliutil.goindex 7a91f00..296820f 100644--- a/cmd/ax/internal/cliutil/cliutil.go+++ b/cmd/ax/internal/cliutil/cliutil.go@@ -58,7 +58,9 @@ func NewControllerFromConfig(ctx context.Context, cfg *Config) (*controller.Cont// Validate config before local-mode antigravity.New forks the Python// sidecar, so a config error surfaces without spawning a subprocess.- if len(cfg.Harnesses.Substrate) > 0 && !substrateMode {+ // Validate config before local-mode antigravity.New forks the Python+ // sidecar, so a config error surfaces without spawning a subprocess.+ if len(cfg.Registry.Substrate) > 0 && !substrateMode {return nil, fmt.Errorf("custom substrate harnesses require AX_SUBSTRATE=1")}@@ -84,7 +86,10 @@ func NewControllerFromConfig(ctx context.Context, cfg *Config) (*controller.Cont// Built-in Antigravity harness.var antigravityHarness harness.Harnessif !substrateMode {- address := cfg.Harnesses.Antigravity.Endpoint+ address := cfg.Antigravity.Endpoint+ if address == "" {+ address = cfg.Registry.Antigravity.Endpoint+ }if address == "" {address = "127.0.0.1:50053"}@@ -108,14 +113,14 @@ func NewControllerFromConfig(ctx context.Context, cfg *Config) (*controller.Contif err := reg.RegisterHarness(config.AntigravityHarnessID, antigravityHarness); err != nil {return nil, fmt.Errorf("register antigravity harness: %w", err)}- if cfg.Harnesses.Antigravity.Default {+ if cfg.Antigravity.Default || cfg.Registry.Antigravity.Default {defaultHarnessID = config.AntigravityHarnessID}// Built-in Antigravity Interactions harness.var antigravityInteractionsHarness harness.Harnessif !substrateMode {- aiCfg := cfg.Harnesses.AntigravityInteractions+ aiCfg := cfg.Registry.AntigravityInteractionsagent := aiCfg.Agentif agent == "" {agent = antigravityinteractions.DefaultAgent@@ -153,11 +158,11 @@ func NewControllerFromConfig(ctx context.Context, cfg *Config) (*controller.Contif err := reg.RegisterHarness(config.AntigravityInteractionsHarnessID, antigravityInteractionsHarness); err != nil {return nil, fmt.Errorf("register antigravity-interactions harness: %w", err)}- if cfg.Harnesses.AntigravityInteractions.Default {+ if cfg.Registry.AntigravityInteractions.Default {defaultHarnessID = config.AntigravityInteractionsHarnessID}- for _, sc := range cfg.Harnesses.Substrate {+ for _, sc := range cfg.Registry.Substrate {h, err := sc.NewHarness("")if err != nil {return nil, fmt.Errorf("substrate harness %q: %w", sc.ID, err)@@ -170,11 +175,14 @@ func NewControllerFromConfig(ctx context.Context, cfg *Config) (*controller.Cont}}+ // Antigravity is the default harness by default if no other harness set Default: true.+ if defaultHarnessID == "" {+ defaultHarnessID = config.AntigravityHarnessID+ }+// Set the default harness.- if defaultHarnessID != "" {- if err := reg.SetDefaultHarness(defaultHarnessID); err != nil {- return nil, fmt.Errorf("set default harness %q: %w", defaultHarnessID, err)- }+ if err := reg.SetDefaultHarness(defaultHarnessID); err != nil {+ return nil, fmt.Errorf("set default harness %q: %w", defaultHarnessID, err)}return controller.New(ctx, controller.Config{diff --git a/cmd/ax/internal/cliutil/cliutil_test.go b/cmd/ax/internal/cliutil/cliutil_test.goindex 31fe2e7..7b99202 100644--- a/cmd/ax/internal/cliutil/cliutil_test.go+++ b/cmd/ax/internal/cliutil/cliutil_test.go@@ -32,7 +32,7 @@ func TestNewControllerFromConfig_BuiltinSubstrate(t *testing.T) {Filename: filepath.Join(t.TempDir(), "log.sqlite"),},},- Harnesses: config.HarnessesConfig{+ Registry: config.RegistryConfig{Antigravity: config.AntigravityHarnessConfig{Default: true,},@@ -58,7 +58,7 @@ func TestNewControllerFromConfig_InteractionsSubstrate(t *testing.T) {Filename: filepath.Join(t.TempDir(), "log.sqlite"),},},- Harnesses: config.HarnessesConfig{+ Registry: config.RegistryConfig{Antigravity: config.AntigravityHarnessConfig{Default: true},},}@@ -86,7 +86,7 @@ func TestNewControllerFromConfig_CustomHarnessRequiresSubstrateMode(t *testing.TFilename: filepath.Join(t.TempDir(), "log.sqlite"),},},- Harnesses: config.HarnessesConfig{+ Registry: config.RegistryConfig{Substrate: []config.SubstrateHarnessConfig{{ID: "custom", Namespace: "team-ns", Template: "custom-template"},},@@ -111,7 +111,7 @@ func TestNewControllerFromConfig_CustomHarnessInSubstrateMode(t *testing.T) {Filename: filepath.Join(t.TempDir(), "log.sqlite"),},},- Harnesses: config.HarnessesConfig{+ Registry: config.RegistryConfig{Substrate: []config.SubstrateHarnessConfig{{ID: "custom", Namespace: "team-ns", Template: "custom-template"},},diff --git a/internal/config/config.go b/internal/config/config.goindex ec89b8b..d33d916 100644--- a/internal/config/config.go+++ b/internal/config/config.go@@ -44,10 +44,11 @@ const (// Config represents the main configuration for the AX harness server.type Config struct {- Version string `yaml:"version"`- Server ServerConfig `yaml:"server"`- EventLog EventLogConfig `yaml:"eventlog"`- Harnesses HarnessesConfig `yaml:"harnesses,omitempty"`+ Version string `yaml:"version"`+ Server ServerConfig `yaml:"server"`+ EventLog EventLogConfig `yaml:"eventlog"`+ Antigravity AntigravityHarnessConfig `yaml:"antigravity,omitempty"`+ Registry RegistryConfig `yaml:"registry,omitempty"`// Skills sources skills from the Gemini Enterprise Skill Registry into on-disk folders// before the harness starts. It is harness-agnostic: each actor runs exactly// one harness, which consumes the materialized folder(s). Optional; disabled@@ -88,12 +89,12 @@ type EventLogConfig struct {PostgresConfig PostgresConfig `yaml:"postgres,omitempty"`}-// HarnessesConfig groups harnesses to serve by type. There are two categories:+// RegistryConfig groups harnesses to serve by type. There are two categories:// - Built-in harnesses (e.g. Antigravity, AntigravityInteractions) whose// implementation and container image are provided by AX.// - Custom harnesses on substrate whose implementation and container image are// provided by the user via their own ActorTemplate.-type HarnessesConfig struct {+type RegistryConfig struct {Antigravity AntigravityHarnessConfig `yaml:"antigravity,omitempty"`AntigravityInteractions AntigravityInteractionsHarnessConfig `yaml:"antigravity-interactions,omitempty"`Substrate []SubstrateHarnessConfig `yaml:"substrate,omitempty"`@@ -284,14 +285,14 @@ func (c *Config) Validate() error {}var defaultCount int- if c.Harnesses.Antigravity.Default {+ if c.Antigravity.Default || c.Registry.Antigravity.Default {defaultCount++}- if c.Harnesses.AntigravityInteractions.Default {+ if c.Registry.AntigravityInteractions.Default {defaultCount++}- for _, sc := range c.Harnesses.Substrate {+ for _, sc := range c.Registry.Substrate {if sc.ID == "" {return fmt.Errorf("substrate harness id is required")}diff --git a/internal/config/config_test.go b/internal/config/config_test.goindex cdcda58..98a7d2c 100644--- a/internal/config/config_test.go+++ b/internal/config/config_test.go@@ -36,7 +36,7 @@ func TestSubstrateNewHarness(t *testing.T) {// validConfig returns a config that passes Validate, that tests can mutate.func validConfig() *Config {c := DefaultConfig()- c.Harnesses = HarnessesConfig{+ c.Registry = RegistryConfig{Antigravity: AntigravityHarnessConfig{Default: true},Substrate: []SubstrateHarnessConfig{{ID: "custom", Namespace: "team-ns", Template: "custom-template"},@@ -53,7 +53,7 @@ func TestValidate_ValidConfig(t *testing.T) {func TestValidate_CustomIDRequired(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].ID = ""+ c.Registry.Substrate[0].ID = ""err := c.Validate()if err == nil || !strings.Contains(err.Error(), "substrate harness id") {t.Fatalf("Validate() = %v, want substrate id error", err)@@ -62,7 +62,7 @@ func TestValidate_CustomIDRequired(t *testing.T) {func TestValidate_CustomIDReserved(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].ID = "antigravity"+ c.Registry.Substrate[0].ID = "antigravity"err := c.Validate()if err == nil || !strings.Contains(err.Error(), "reserved") {t.Fatalf("Validate() = %v, want reserved id error", err)@@ -71,7 +71,7 @@ func TestValidate_CustomIDReserved(t *testing.T) {func TestValidate_CustomNamespaceRequired(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].Namespace = ""+ c.Registry.Substrate[0].Namespace = ""err := c.Validate()if err == nil || !strings.Contains(err.Error(), "namespace is required") {t.Fatalf("Validate() = %v, want namespace-required error", err)@@ -80,7 +80,7 @@ func TestValidate_CustomNamespaceRequired(t *testing.T) {func TestValidate_CustomNamespaceReserved(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].Namespace = defaultNamespace+ c.Registry.Substrate[0].Namespace = defaultNamespaceerr := c.Validate()if err == nil || !strings.Contains(err.Error(), "reserved") {t.Fatalf("Validate() = %v, want reserved-namespace error", err)@@ -89,7 +89,7 @@ func TestValidate_CustomNamespaceReserved(t *testing.T) {func TestValidate_CustomTemplateRequired(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].Template = ""+ c.Registry.Substrate[0].Template = ""err := c.Validate()if err == nil || !strings.Contains(err.Error(), "template is required") {t.Fatalf("Validate() = %v, want template-required error", err)@@ -98,7 +98,7 @@ func TestValidate_CustomTemplateRequired(t *testing.T) {func TestValidate_MultipleDefaults(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].Default = true+ c.Registry.Substrate[0].Default = trueerr := c.Validate()if err == nil || !strings.Contains(err.Error(), "multiple harnesses marked as default") {t.Fatalf("Validate() = %v, want multiple defaults error", err)@@ -107,7 +107,7 @@ func TestValidate_MultipleDefaults(t *testing.T) {func TestValidate_InteractionsIDReserved(t *testing.T) {c := validConfig()- c.Harnesses.Substrate[0].ID = "antigravity-interactions"+ c.Registry.Substrate[0].ID = "antigravity-interactions"err := c.Validate()if err == nil || !strings.Contains(err.Error(), "reserved") {t.Fatalf("Validate() = %v, want reserved id error", err)@@ -116,7 +116,7 @@ func TestValidate_InteractionsIDReserved(t *testing.T) {func TestValidate_InteractionsValid(t *testing.T) {c := validConfig()- c.Harnesses.AntigravityInteractions = AntigravityInteractionsHarnessConfig{+ c.Registry.AntigravityInteractions = AntigravityInteractionsHarnessConfig{Agent: "projects/p/locations/global/agents/a",}if err := c.Validate(); err != nil {@@ -145,9 +145,7 @@ eventlog:func TestLoadFromBytes(t *testing.T) {cfg, err := LoadFromBytes([]byte(`version: v1alpha-harnesses:- antigravity:- default: true+antigravity: {}`))if err != nil {t.Fatalf("LoadFromBytes: %v", err)@@ -155,9 +153,6 @@ harnesses:if cfg.Version != "v1alpha" {t.Errorf("Version = %q, want %q", cfg.Version, "v1alpha")}- if !cfg.Harnesses.Antigravity.Default {- t.Error("Harnesses.Antigravity.Default = false, want true")- }// setDefaults must run (same as LoadFromFile).if got, want := cfg.Server.Address, ":8494"; got != want {t.Errorf("Server.Address = %q, want default %q", got, want)@@ -166,7 +161,7 @@ harnesses:// TestLoadFromBytes_Invalid returns an error on malformed YAML.func TestLoadFromBytes_Invalid(t *testing.T) {- if _, err := LoadFromBytes([]byte("harnesses: [unterminated")); err == nil {+ if _, err := LoadFromBytes([]byte("registry: [unterminated")); err == nil {t.Fatal("LoadFromBytes(invalid): got nil error, want error")}}diff --git a/manifests/ax.yaml b/manifests/ax.yamlindex 8c243fe..b40a838 100644--- a/manifests/ax.yaml+++ b/manifests/ax.yaml@@ -24,7 +24,7 @@ eventlog:postgres:dsn: ${AX_EVENTLOG_DSN}-harnesses:- antigravity:- default: true+antigravity: {}++registry:antigravity-interactions: {}