Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

Refactor: Move newControllerFromConfig to shared package internal/cliutil (#242)

anj-s26b49308eb3f
diff --git a/cmd/ax/exec.go b/cmd/ax/exec.go
index befb927..56a1b31 100644
--- a/cmd/ax/exec.go
+++ b/cmd/ax/exec.go
@@ -24,6 +24,7 @@ import (
"syscall"
"github.com/google/ax/cmd/ax/internal"
+ "github.com/google/ax/internal/cliutil"
"github.com/google/ax/internal/controller"
"github.com/google/ax/proto"
"github.com/google/uuid"
@@ -93,7 +94,7 @@ func runExec(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- c, err := newControllerFromConfig(ctx, cfg)
+ c, err := cliutil.NewControllerFromConfig(ctx, cfg)
if err != nil {
return fmt.Errorf("error creating controller: %w", err)
}
diff --git a/cmd/ax/fork.go b/cmd/ax/fork.go
index 99962ab..b121ba7 100644
--- a/cmd/ax/fork.go
+++ b/cmd/ax/fork.go
@@ -17,6 +17,7 @@ package main
import (
"fmt"
+ "github.com/google/ax/internal/cliutil"
"github.com/google/ax/internal/config"
"github.com/google/ax/proto"
"github.com/spf13/cobra"
@@ -58,7 +59,7 @@ func runFork(cmd *cobra.Command, args []string) error {
return fmt.Errorf("error loading config file '%s': %w", forkConfigFile, err)
}
- c, err := newControllerFromConfig(ctx, cfg)
+ c, err := cliutil.NewControllerFromConfig(ctx, cfg)
if err != nil {
return fmt.Errorf("error creating controller: %w", err)
}
diff --git a/cmd/ax/serve.go b/cmd/ax/serve.go
index 5931a52..3d5d1f4 100644
--- a/cmd/ax/serve.go
+++ b/cmd/ax/serve.go
@@ -15,22 +15,15 @@
package main
import (
- "context"
"fmt"
"log"
"os"
"os/signal"
"syscall"
- "time"
- "github.com/google/ax/internal/agent"
- "github.com/google/ax/internal/config"
- "github.com/google/ax/internal/controller"
- "github.com/google/ax/internal/controller/executor"
+ "github.com/google/ax/internal/cliutil"
"github.com/google/ax/internal/server"
- "github.com/google/ax/proto"
"github.com/spf13/cobra"
- "google.golang.org/protobuf/types/known/durationpb"
)
var (
@@ -62,7 +55,7 @@ func runServe(cmd *cobra.Command, args []string) error {
return fmt.Errorf("invalid configuration: %w", err)
}
- c, err := newControllerFromConfig(ctx, cfg)
+ c, err := cliutil.NewControllerFromConfig(ctx, cfg)
if err != nil {
return fmt.Errorf("error creating controller: %w", err)
}
@@ -88,74 +81,3 @@ func runServe(cmd *cobra.Command, args []string) error {
return nil
}
-
-func newControllerFromConfig(ctx context.Context, cfg *config.Config) (*controller.Controller, error) {
- // Create event log builder
- eventLogBuilder := func() (executor.EventLog, error) {
- return executor.OpenSQLiteEventLog(cfg.EventLog.SQLiteConfig.Filename)
- }
-
- // Create planner builder
- plannerBuilder := func(ctx context.Context, r *controller.Registry) (agent.Agent, error) {
- switch cfg.Planner.Type {
- case "antigravity":
- return controller.NewAntigravityPlannerAgent(ctx, r, controller.AntigravityPlannerConfig{
- Endpoint: cfg.Planner.Antigravity.Endpoint,
- })
- case "gemini":
- timeout, err := time.ParseDuration(cfg.Planner.Gemini.Timeout)
- if err != nil {
- return nil, fmt.Errorf("failed to parse duration: %v", err)
- }
- return controller.NewGeminiPlannerAgent(ctx, r, controller.GeminiPlannerConfig{
- GeminiConfig: &proto.GeminiConfig{
- Model: cfg.Planner.Gemini.Model,
- MaxTokens: cfg.Planner.Gemini.MaxTokens,
- Timeout: durationpb.New(timeout),
- SystemPrompt: cfg.Planner.Gemini.SystemPrompt,
- },
- SkillsDir: cfg.Planner.Gemini.SkillsDir,
- })
- default:
- return nil, fmt.Errorf("unknown planner type: %s", cfg.Planner.Type)
- }
- }
-
- // Build controller config
- controllerConfig := controller.Config{
- EventLogBuilder: eventLogBuilder,
- PlannerBuilder: plannerBuilder,
- }
-
- // Create controller
- c, err := controller.New(ctx, controllerConfig)
- if err != nil {
- return nil, err
- }
-
- for _, agentCfg := range cfg.Registry.RemoteAgents {
- if err := c.Registry().RegisterRemote(agentCfg); err != nil {
- return nil, fmt.Errorf("failed to register remote agent %s: %w", agentCfg.ID, err)
- }
- }
-
- for _, agentCfg := range cfg.Registry.KubernetesSandboxAgents {
- if err := c.Registry().RegisterKubernetesSandbox(ctx, agentCfg); err != nil {
- return nil, fmt.Errorf("failed to register kubernetes sandbox agent %s: %w", agentCfg.ID, err)
- }
- }
-
- for _, agentCfg := range cfg.Registry.ColabAgents {
- if err := c.Registry().RegisterColab(agentCfg); err != nil {
- return nil, fmt.Errorf("failed to register colab agent %s: %w", agentCfg.ID, err)
- }
- }
-
- for _, agentCfg := range cfg.Registry.ATEAgents {
- if err := c.Registry().RegisterATE(ctx, cfg.ATE.Endpoint, agentCfg); err != nil {
- return nil, fmt.Errorf("failed to register ATE agent %s: %w", agentCfg.ID, err)
- }
- }
-
- return c, nil
-}
diff --git a/internal/cliutil/cliutil.go b/internal/cliutil/cliutil.go
new file mode 100644
index 0000000..913c66f
--- /dev/null
+++ b/internal/cliutil/cliutil.go
@@ -0,0 +1,108 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cliutil
+
+import (
+ "context"
+ "fmt"
+ "time"
+
+ "github.com/google/ax/internal/agent"
+ "github.com/google/ax/internal/config"
+ "github.com/google/ax/internal/controller"
+ "github.com/google/ax/internal/controller/executor"
+ "github.com/google/ax/proto"
+ "google.golang.org/protobuf/types/known/durationpb"
+)
+
+// NewControllerFromConfig creates a new Controller instance based on the provided configuration.
+func NewControllerFromConfig(ctx context.Context, cfg *config.Config) (*controller.Controller, error) {
+ // Validate planner type early
+ switch cfg.Planner.Type {
+ case "antigravity", "gemini":
+ // valid
+ default:
+ return nil, fmt.Errorf("unknown planner type: %s", cfg.Planner.Type)
+ }
+
+ // Create event log builder
+ eventLogBuilder := func() (executor.EventLog, error) {
+ return executor.OpenSQLiteEventLog(cfg.EventLog.SQLiteConfig.Filename)
+ }
+
+ // Create planner builder
+ plannerBuilder := func(ctx context.Context, r *controller.Registry) (agent.Agent, error) {
+ switch cfg.Planner.Type {
+ case "antigravity":
+ return controller.NewAntigravityPlannerAgent(ctx, r, controller.AntigravityPlannerConfig{
+ Endpoint: cfg.Planner.Antigravity.Endpoint,
+ })
+ case "gemini":
+ timeout, err := time.ParseDuration(cfg.Planner.Gemini.Timeout)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse duration: %v", err)
+ }
+ return controller.NewGeminiPlannerAgent(ctx, r, controller.GeminiPlannerConfig{
+ GeminiConfig: &proto.GeminiConfig{
+ Model: cfg.Planner.Gemini.Model,
+ MaxTokens: cfg.Planner.Gemini.MaxTokens,
+ Timeout: durationpb.New(timeout),
+ SystemPrompt: cfg.Planner.Gemini.SystemPrompt,
+ },
+ SkillsDir: cfg.Planner.Gemini.SkillsDir,
+ })
+ default:
+ return nil, fmt.Errorf("unknown planner type: %s", cfg.Planner.Type)
+ }
+ }
+
+ // Build controller config
+ controllerConfig := controller.Config{
+ EventLogBuilder: eventLogBuilder,
+ PlannerBuilder: plannerBuilder,
+ }
+
+ // Create controller
+ c, err := controller.New(ctx, controllerConfig)
+ if err != nil {
+ return nil, err
+ }
+
+ for _, agentCfg := range cfg.Registry.RemoteAgents {
+ if err := c.Registry().RegisterRemote(agentCfg); err != nil {
+ return nil, fmt.Errorf("failed to register remote agent %s: %w", agentCfg.ID, err)
+ }
+ }
+
+ for _, agentCfg := range cfg.Registry.KubernetesSandboxAgents {
+ if err := c.Registry().RegisterKubernetesSandbox(ctx, agentCfg); err != nil {
+ return nil, fmt.Errorf("failed to register kubernetes sandbox agent %s: %w", agentCfg.ID, err)
+ }
+ }
+
+ for _, agentCfg := range cfg.Registry.ColabAgents {
+ if err := c.Registry().RegisterColab(agentCfg); err != nil {
+ return nil, fmt.Errorf("failed to register colab agent %s: %w", agentCfg.ID, err)
+ }
+ }
+
+ for _, agentCfg := range cfg.Registry.ATEAgents {
+ if err := c.Registry().RegisterATE(ctx, cfg.ATE.Endpoint, agentCfg); err != nil {
+ return nil, fmt.Errorf("failed to register ATE agent %s: %w", agentCfg.ID, err)
+ }
+ }
+
+ return c, nil
+}
diff --git a/internal/cliutil/cliutil_test.go b/internal/cliutil/cliutil_test.go
new file mode 100644
index 0000000..577e612
--- /dev/null
+++ b/internal/cliutil/cliutil_test.go
@@ -0,0 +1,35 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cliutil
+
+import (
+ "context"
+ "testing"
+
+ "github.com/google/ax/internal/config"
+)
+
+func TestNewControllerFromConfig_UnknownPlanner(t *testing.T) {
+ cfg := &config.Config{
+ Planner: config.PlannerConfig{
+ Type: "unknown",
+ },
+ }
+
+ _, err := NewControllerFromConfig(context.Background(), cfg)
+ if err == nil {
+ t.Fatal("expected error for unknown planner type, got nil")
+ }
+}