diff options
Diffstat (limited to 'internal/cli/serve.go')
| -rw-r--r-- | internal/cli/serve.go | 63 |
1 files changed, 23 insertions, 40 deletions
diff --git a/internal/cli/serve.go b/internal/cli/serve.go index 57c2cbd..656ee66 100644 --- a/internal/cli/serve.go +++ b/internal/cli/serve.go @@ -16,9 +16,8 @@ import ( "github.com/thepeterstone/claudomator/internal/config" "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/scheduler" "github.com/thepeterstone/claudomator/internal/storage" "github.com/thepeterstone/claudomator/internal/version" ) @@ -156,44 +155,10 @@ func serve(addr, basePath string) error { logger.Info("local runner registered", "endpoint", cfg.LocalModel.Endpoint, "model", cfg.LocalModel.Model) } - if pc, ok := cfg.Providers["anthropic"]; ok && pc.APIKey != "" && cfg.Runners.AnthropicEnabled() { - timeout := time.Duration(0) - if pc.TimeoutSeconds > 0 { - timeout = time.Duration(pc.TimeoutSeconds) * time.Second - } - runners["anthropic"] = &executor.NativeRunner{ - Provider: anthropic.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. - SandboxKind: "docker", - SandboxImage: cfg.SandboxImage, - } - 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") - } + // Native cloud providers (anthropic/google's own wire formats, plus + // groq/openrouter/openai via the OpenAI-compatible adapter) — see + // internal/cli/cloudrunners.go. + registerCloudRunners(runners, cfg, logger, cfg.LogDir) pool := executor.NewPool(cfg.MaxConcurrent, runners, store, logger) pool.Classifier = &executor.Classifier{ @@ -282,6 +247,24 @@ func serve(addr, basePath string) error { srv.SetContext(ctx) srv.StartHub() + // Retry-then-escalate scheduler for role-typed tasks (internal/role, + // internal/scheduler). Only `serve` runs this background loop — the + // one-shot `run` command has no long-lived process to host it in. + sch := &scheduler.Scheduler{ + Store: store, + Pool: pool, + Logger: logger, + } + if accountant != nil { + // Only assign when non-nil: a nil *budget.Accountant boxed into the + // scheduler.BudgetGate interface would be a non-nil interface value + // whose methods panic on the nil receiver — same reason pool.Budget + // above is only ever assigned inside the `if accountant configured` + // branch, never unconditionally. + sch.Budget = accountant + } + go sch.Run(ctx, cfg.Scheduler.PollInterval()) + httpSrv := &http.Server{ Addr: addr, Handler: srv.Handler(), |