diff options
Diffstat (limited to 'internal/cli')
| -rw-r--r-- | internal/cli/run.go | 18 | ||||
| -rw-r--r-- | internal/cli/serve.go | 21 |
2 files changed, 39 insertions, 0 deletions
diff --git a/internal/cli/run.go b/internal/cli/run.go index 497ba6b..34c3d42 100644 --- a/internal/cli/run.go +++ b/internal/cli/run.go @@ -11,6 +11,7 @@ import ( "github.com/spf13/cobra" "github.com/thepeterstone/claudomator/internal/executor" "github.com/thepeterstone/claudomator/internal/provider/anthropic" + "github.com/thepeterstone/claudomator/internal/provider/google" "github.com/thepeterstone/claudomator/internal/provider/openaicompat" "github.com/thepeterstone/claudomator/internal/storage" "github.com/thepeterstone/claudomator/internal/task" @@ -135,6 +136,23 @@ func runTasks(file string, parallel int, dryRun bool) error { } } + if pc, ok := cfg.Providers["google"]; ok && pc.APIKey != "" && cfg.Runners.GoogleEnabled() { + timeout := time.Duration(0) + if pc.TimeoutSeconds > 0 { + timeout = time.Duration(pc.TimeoutSeconds) * time.Second + } + runners["google"] = &executor.NativeRunner{ + Provider: google.New(pc.APIKey, pc.Endpoint, timeout), + Logger: logger, + LogDir: cfg.LogDir, + DefaultModel: pc.DefaultModel, + // See internal/cli/serve.go: native cloud providers get + // sandbox.DockerSandbox rather than the weaker HostSandbox. + SandboxKind: "docker", + SandboxImage: cfg.SandboxImage, + } + } + pool := executor.NewPool(parallel, runners, store, logger) pool.Classifier = &executor.Classifier{ LLM: localClient, diff --git a/internal/cli/serve.go b/internal/cli/serve.go index 8b6cc6a..57c2cbd 100644 --- a/internal/cli/serve.go +++ b/internal/cli/serve.go @@ -17,6 +17,7 @@ import ( "github.com/thepeterstone/claudomator/internal/executor" "github.com/thepeterstone/claudomator/internal/notify" "github.com/thepeterstone/claudomator/internal/provider/anthropic" + "github.com/thepeterstone/claudomator/internal/provider/google" "github.com/thepeterstone/claudomator/internal/provider/openaicompat" "github.com/thepeterstone/claudomator/internal/storage" "github.com/thepeterstone/claudomator/internal/version" @@ -174,6 +175,26 @@ func serve(addr, basePath string) error { logger.Info("anthropic runner registered", "default_model", pc.DefaultModel, "sandbox", "docker") } + if pc, ok := cfg.Providers["google"]; ok && pc.APIKey != "" && cfg.Runners.GoogleEnabled() { + timeout := time.Duration(0) + if pc.TimeoutSeconds > 0 { + timeout = time.Duration(pc.TimeoutSeconds) * time.Second + } + runners["google"] = &executor.NativeRunner{ + Provider: google.New(pc.APIKey, pc.Endpoint, timeout), + Logger: logger, + LogDir: cfg.LogDir, + DefaultModel: pc.DefaultModel, + // Native cloud providers get real container isolation + // (sandbox.DockerSandbox) rather than HostSandbox's host-side + // path-prefix confinement — same reasoning as the "anthropic" + // runner above. + SandboxKind: "docker", + SandboxImage: cfg.SandboxImage, + } + logger.Info("google runner registered", "default_model", pc.DefaultModel, "sandbox", "docker") + } + pool := executor.NewPool(cfg.MaxConcurrent, runners, store, logger) pool.Classifier = &executor.Classifier{ LLM: localClient, |