diff --git a/go.mod b/go.mod index 826f077cb..67965c23c 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 github.com/pressly/goose/v3 v3.29.0 - github.com/samcharles93/ai-sdk v0.4.0 + github.com/samcharles93/ai-sdk v0.5.0 go.lsp.dev/jsonrpc2 v1.0.1 go.lsp.dev/protocol v1.0.1 go.lsp.dev/uri v1.0.1 diff --git a/go.sum b/go.sum index 865512801..7b921ab0c 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/samcharles93/ai-sdk v0.4.0 h1:MU/0MGU7Oq1wPiIDqncv4jDYTTKVsTqoyk0SzRcGw6M= -github.com/samcharles93/ai-sdk v0.4.0/go.mod h1:u4zrQ9/Q58L5mNEut4bNQ1ks+RCKq71LN5EDz2N/0Zk= +github.com/samcharles93/ai-sdk v0.5.0 h1:Cr/wEeRRubkryuJFYwzHxuHIO2DiCz31BtF9F1FSrjM= +github.com/samcharles93/ai-sdk v0.5.0/go.mod h1:NNkiUZ2qfezDHhmF8zHibKsPgpU8b5jphDQ0n2t1KL0= github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0= diff --git a/internal/agentexec/modelloop/runtime.go b/internal/agentexec/modelloop/runtime.go index d1cb12661..51b63c36d 100644 --- a/internal/agentexec/modelloop/runtime.go +++ b/internal/agentexec/modelloop/runtime.go @@ -1,9 +1,11 @@ package modelloop import ( + "net/http" "strings" "github.com/samcharles93/ai-sdk/runtime" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "github.com/samcharles93/archie-core/internal/config" "github.com/samcharles93/archie-core/internal/domain/agentrun" @@ -20,6 +22,12 @@ func NewRuntime(providers map[string]agentrun.Provider, limits map[string]config // NewRuntimeWithKeys binds host-resolved credentials to one runtime without // exporting them into the process environment or the task protocol. func NewRuntimeWithKeys(providers map[string]agentrun.Provider, limits map[string]config.ModelLimits, keys map[string]string) *runtime.Runtime { + return NewRuntimeOver(nil, providers, limits, keys) +} + +// NewRuntimeOver is NewRuntimeWithKeys with base carrying the provider +// requests, traced; nil means http.DefaultTransport. +func NewRuntimeOver(base http.RoundTripper, providers map[string]agentrun.Provider, limits map[string]config.ModelLimits, keys map[string]string) *runtime.Runtime { if len(providers) == 0 { return nil } @@ -36,7 +44,7 @@ func NewRuntimeWithKeys(providers map[string]agentrun.Provider, limits map[strin } catalog[name] = cfg } - return runtime.NewRuntime(runtime.Config{Providers: catalog}) + return runtime.NewRuntime(runtime.Config{Providers: catalog, HTTPTransport: otelhttp.NewTransport(base)}) } func reasoningModels(provider string, limits map[string]config.ModelLimits) []runtime.ModelConfig { diff --git a/internal/app/agentworker/task_execution.go b/internal/app/agentworker/task_execution.go index 390d49890..7a7f0cec7 100644 --- a/internal/app/agentworker/task_execution.go +++ b/internal/app/agentworker/task_execution.go @@ -6,6 +6,7 @@ import ( "fmt" "io/fs" "log/slog" + "net/http" "os" "path/filepath" "strconv" @@ -149,12 +150,18 @@ type taskDependencies struct { // runs in archie-agent, so the daemon's engine cannot reach it) and set on // every TaskContext; nil means guardrails are disabled. guardrails *tools.GuardrailEngine + // modelTransport carries model requests: the egress proxy transport, or + // nil to go direct. + modelTransport http.RoundTripper } type runnerFactory func(map[string]agentrun.Provider, map[string]config.ModelLimits, *slog.Logger) agentrun.Runner -func newTaskRunner(providers map[string]agentrun.Provider, limits map[string]config.ModelLimits, log *slog.Logger) agentrun.Runner { - return modelloop.NewLoopRunner(modelloop.NewRuntime(providers, limits), log) +// newTaskRunner builds runners whose model requests go over base. +func newTaskRunner(base http.RoundTripper) runnerFactory { + return func(providers map[string]agentrun.Provider, limits map[string]config.ModelLimits, log *slog.Logger) agentrun.Runner { + return modelloop.NewLoopRunner(modelloop.NewRuntimeOver(base, providers, limits, nil), log) + } } // applyToolLimits sets the task's tool policy and allowlist on a @@ -335,7 +342,7 @@ func taskMCPProviders(ctx context.Context, req taskrun.Request, deps taskDepende if req.Harness != nil || len(req.MCPServers) == 0 { return nil, nil } - llm := modelloop.NewRuntime(req.Providers, req.Cfg.ModelLimits) + llm := modelloop.NewRuntimeOver(deps.modelTransport, req.Providers, req.Cfg.ModelLimits, nil) set, err := taskmcp.Start(ctx, req.MCPServers, taskmcp.SamplingHandler(llm, req.Cfg, taskmcp.UsageRecorder(deps.store, req.Task, log)), log, storage.MCPNPMCacheMountDir) if err != nil { log.Warn("mcp providers had errors, continuing with available tools", "err", err) diff --git a/internal/app/agentworker/worker.go b/internal/app/agentworker/worker.go index 608c1284f..a0f3472cc 100644 --- a/internal/app/agentworker/worker.go +++ b/internal/app/agentworker/worker.go @@ -127,14 +127,13 @@ func run(ctx context.Context, settings Settings, log *slog.Logger, dependencies workDir = storage.WorktreeMountDir } + var modelTransport http.RoundTripper if settings.ModelProxy != "" { - transport, err := egress.ModelTransport(settings.ModelProxy, settings.ModelProxyHosts, settings.ModelProxyCA) + var err error + modelTransport, err = egress.ModelTransport(settings.ModelProxy, settings.ModelProxyHosts, settings.ModelProxyCA) if err != nil { return &StartupError{Operation: "model proxy", Err: err} } - // The model SDK builds its clients on the default transport and takes - // no client of its own, so the process-wide default is the seam. - http.DefaultTransport = transport } dependencies.markSafe(ctx, workDir, log) @@ -163,7 +162,7 @@ func run(ctx context.Context, settings Settings, log *slog.Logger, dependencies log.Info("system log publisher attached", "task", taskID) subscription, err := transport.SubscribeTasks(ctx, taskID, func(ctx context.Context, request taskrun.Request) (*taskrun.Response, error) { - return executeTaskRequest(ctx, request, transport, workDir, log, dependencies.steps, dependencies.guardrails) + return executeTaskRequest(ctx, request, transport, workDir, log, dependencies.steps, dependencies.guardrails, modelTransport) }, log) if err != nil { log.Error("taskrun subscribe failed", "err", err) @@ -195,7 +194,7 @@ type taskServiceTransport interface { EventPublisher() agentexec.EventPublisher } -func executeTaskRequest(ctx context.Context, request taskrun.Request, transport taskServiceTransport, workDir string, log *slog.Logger, steps *workflow.Manager, guardrails *tools.GuardrailEngine) (*taskrun.Response, error) { +func executeTaskRequest(ctx context.Context, request taskrun.Request, transport taskServiceTransport, workDir string, log *slog.Logger, steps *workflow.Manager, guardrails *tools.GuardrailEngine, modelTransport http.RoundTripper) (*taskrun.Response, error) { log.Info("running task", "task", request.Task.ID, "repo", request.Repo.FullName(), "issue", request.Task.IssueNumber) dependencies := taskDependencies{ forge: transport.Forger(request.Task.Identity, request.RunCredential, rpcTimeout), @@ -205,8 +204,10 @@ func executeTaskRequest(ctx context.Context, request taskrun.Request, transport events: transport.EventPublisher(), steps: steps, guardrails: guardrails, + + modelTransport: modelTransport, } - response, err := runTask(ctx, request, dependencies, newTaskRunner, workDir, log) + response, err := runTask(ctx, request, dependencies, newTaskRunner(modelTransport), workDir, log) if err != nil { log.Error("task run failed", "task", request.Task.ID, "err", err) return nil, err