Skip to content

Use prepared execution configuration sources #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SaladDay merged 1 commit into from
Oct 8, 2026
Merged

Use prepared execution configuration sources #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions services/core/internal/api/session_execution_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
} `json:"agent"`
}
_ = json.Unmarshal(raw, &configuration) // The resolved configuration was already validated.
modelSource := v1.ExecutionSourceSession
if saved != nil && (input.Agent == nil || input.Agent.Model == nil) {
modelSource = v1.ExecutionSourceAgent
}
if input.modelSource != "" {
modelSource = input.modelSource
}
harnessSource := v1.ExecutionSourceDeployment
if _, overridden := input.agentFields["x_agents_core"]; overridden {
if input.Agent != nil && input.Agent.XAgentsCore != nil && input.Agent.XAgentsCore.Harness != "" {
Expand All @@ -50,14 +43,10 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
if configuration.Agent.Core != nil {
native = v1.ResolvedHarnessConfig(configuration.Agent.Core.HarnessConfig)
}
nativeSource := input.harnessConfigSource
if nativeSource == "" {
nativeSource = v1.ExecutionSourceUnknown
}
return v1.SessionExecutionConfiguration{
HarnessConfig: v1.ExecutionHarnessConfigSelection{Value: native, Source: nativeSource},
HarnessConfig: v1.ExecutionHarnessConfigSelection{Value: native, Source: input.harnessConfigSource},
Object: "agent.session.execution_configuration", SchemaVersion: 1,
Model: v1.ExecutionSelection{Value: &configuration.Agent.Model, Source: modelSource},
Model: v1.ExecutionSelection{Value: &configuration.Agent.Model, Source: input.modelSource},
Harness: v1.ExecutionSelection{Value: &engine, Source: harnessSource}, ModelProvider: selection,
}
}
Expand Down
39 changes: 26 additions & 13 deletions services/core/internal/api/session_execution_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,28 @@ import (
"testing"

v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
)

func TestExecutionConfigurationSources(t *testing.T) {
provider := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://saved.example/v1", APIKey: "secret-canary"}
saved := &v1.SavedAgent{SavedAgentConfiguration: v1.SavedAgentConfiguration{Model: "saved-model", XAgentsCore: &v1.SavedAgentCore{Harness: "codex", ModelProvider: provider.SafeView()}}}
for _, tc := range []struct {
name, agent, extension string
saved *v1.SavedAgent
inherited, provider *v1.ModelProviderInput
modelSource, harnessSource, providerSource, status string
name, agent, extension string
saved *v1.SavedAgent
inherited, provider *v1.ModelProviderInput
modelSource, nativeSource, harnessSource, providerSource, status string
}{
{"saved", ``, ``, saved, provider, provider, "agent", "agent", "agent", "available"},
{"model override", `,"agent":{"model":"override"}`, ``, saved, provider, provider, "session", "agent", "agent", "available"},
{"harness override", `,"agent":{"x_agents_core":{"harness":"codex"}}`, ``, saved, provider, provider, "agent", "session", "agent", "available"},
{"harness reset", `,"agent":{"x_agents_core":null}`, ``, saved, provider, provider, "agent", "deployment", "agent", "available"},
{"explicit bundle", ``, `,"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://explicit.example/v1","api_key":"explicit-secret"}}`, saved, nil, provider, "agent", "agent", "session", "available"},
{"provider null inherits", ``, `,"x_agents_core":{"model_provider":null}`, saved, provider, provider, "agent", "agent", "agent", "available"},
{"inline deployment", `,"agent":{"model":"inline"}`, ``, nil, nil, provider, "session", "deployment", "deployment", "available"},
{"inline explicit harness", `,"agent":{"model":"inline","x_agents_core":{"harness":"codex"}}`, ``, nil, nil, nil, "session", "session", "unknown", "unavailable"},
{"saved", ``, ``, saved, provider, provider, "agent", "agent", "agent", "agent", "available"},
{"model override", `,"agent":{"model":"override"}`, ``, saved, provider, provider, "session", "session", "agent", "agent", "available"},
{"harness override", `,"agent":{"x_agents_core":{"harness":"codex"}}`, ``, saved, provider, provider, "agent", "agent", "session", "agent", "available"},
{"harness reset", `,"agent":{"x_agents_core":null}`, ``, saved, provider, provider, "agent", "agent", "deployment", "agent", "available"},
{"explicit bundle", ``, `,"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://explicit.example/v1","api_key":"explicit-secret"}}`, saved, nil, provider, "agent", "session", "agent", "session", "available"},
{"provider null inherits", ``, `,"x_agents_core":{"model_provider":null}`, saved, provider, provider, "agent", "agent", "agent", "agent", "available"},
{"deployment defaults", ``, ``, nil, nil, provider, "deployment", "deployment", "deployment", "deployment", "available"},
{"inline deployment", `,"agent":{"model":"inline"}`, ``, nil, nil, provider, "session", "session", "deployment", "deployment", "available"},
{"inline explicit harness", `,"agent":{"model":"inline","x_agents_core":{"harness":"codex"}}`, ``, nil, nil, nil, "session", "session", "session", "unknown", "unavailable"},
} {
t.Run(tc.name, func(t *testing.T) {
var decoded decodedSessionRequest
Expand All @@ -39,8 +41,19 @@ func TestExecutionConfigurationSources(t *testing.T) {
if err != nil {
t.Fatal(err)
}
deps, fakes := testDependencies(t)
fakes.modelProviders.resolve = func(context.Context, string) (*modelconfiguration.Snapshot, error) {
if tc.provider == nil {
return nil, nil
}
return &modelconfiguration.Snapshot{Provider: tc.provider, Model: "deployment-model"}, nil
}
h := &Handler{Dependencies: deps}
if err := h.prepareSessionModelConfiguration(t.Context(), &input, tc.saved, tc.inherited); err != nil {
t.Fatal(err)
}
p := sessionExecutionProjection(input, tc.saved, tc.inherited, tc.provider, "codex", json.RawMessage(`{"agent":{"model":"resolved"}}`))
if string(p.Model.Source) != tc.modelSource || string(p.Harness.Source) != tc.harnessSource || string(p.ModelProvider.Source) != tc.providerSource || string(p.ModelProvider.Status) != tc.status {
if string(p.Model.Source) != tc.modelSource || string(p.HarnessConfig.Source) != tc.nativeSource || string(p.Harness.Source) != tc.harnessSource || string(p.ModelProvider.Source) != tc.providerSource || string(p.ModelProvider.Status) != tc.status {
t.Fatalf("wrong sources: %#v", p)
}
raw, _ := json.Marshal(p)
Expand Down
Loading