Drop unsent Harness options and reject prompts without an environment (#468)

Core sends only model, system_prompt, model_provider and harness_config
in agent_options. Delete the adapter keys no Core path produces: codex
override_system_prompt, reasoning_summary, mode, mcp_servers,
enable_features, disable_features, skills and the controls copied into
web_search/model_verbosity; mcode mode, override_system_prompt, skills,
plugins and mcp_servers. Codex reads ExecutionControls directly. The
managed Skill installer, the Runtime capability-download and skill-upload
wrappers, the Runtime capability-context flags and the no-op feature
preference removals go with them.

Dispatch now rejects any other agent_options key, and an execution
preparation with neither or both of local_environment and
disable_execution_environment, with unsupported_configuration before a
factory runs. claude_sdk's own unknown-key branch is unreachable and
removed. agent.ManagedSkillsRoot becomes StateDir, its only remaining
use.

Author: SaladDay

apps/daemon/internal/agent/claudesdk/options.go

@@ -135,8 +135,6 @@ func prepareConfiguration(config Config, req proto.PromptRequestPayload) (startR
 			start.Model = value
 		case "system_prompt":
 			start.SystemPrompt = value
-		default:
-			return fail("unsupported option: " + name)
 		}
 	}
 	if strings.TrimSpace(start.Model) == "" {

apps/daemon/internal/agent/claudesdk/session_test.go

@@ -74,7 +74,7 @@ func TestTextFactoryCompletionAndFailures(t *testing.T) {
 }
 
 func TestTextFactoryRejectsUnsupportedInput(t *testing.T) {
-	for _, kind := range []string{"execution-controls", "tool", "option", "outside"} {
+	for _, kind := range []string{"execution-controls", "tool", "outside"} {
 		t.Run(kind, func(t *testing.T) {
 			root := t.TempDir()
 			t.Setenv("OAC_RUNTIME_HOME", root)
@@ -85,8 +85,6 @@ func TestTextFactoryRejectsUnsupportedInput(t *testing.T) {
 				request.ExecutionControls = &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "low"}
 			case "tool":
 				request.FunctionTools = []proto.FunctionTool{{}}
-			case "option":
-				request.AgentOptions["allowed_tools"] = "anything"
 			case "outside":
 				config.StateDir = filepath.Dir(root)
 			}

apps/daemon/internal/agent/claudesdk/workspace_test.go

@@ -76,7 +76,7 @@ func TestWorkspaceTrustedBindingAndEnvironment(t *testing.T) {
 }
 
 func TestWorkspaceRejectsConflictsBeforeSideEffects(t *testing.T) {
-	for _, name := range []string{"none", "workspace-root", "mcp", "caller-policy", "relative", "missing", "ambient-setting", "duplicate-env", "bad-env"} {
+	for _, name := range []string{"none", "workspace-root", "mcp", "relative", "missing", "ambient-setting", "duplicate-env", "bad-env"} {
 		t.Run(name, func(t *testing.T) {
 			config := workspaceFixture(t)
 			req := workspaceRequest()
@@ -88,8 +88,6 @@ func TestWorkspaceRejectsConflictsBeforeSideEffects(t *testing.T) {
 				req.LocalEnvironment = &proto.LocalEnvironment{ID: "environment", NetworkAccess: "enabled", WorkspaceRoot: config.Workspace.ScratchDir}
 			case "mcp":
 				req.MCPHTTPServers = &[]proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "remote", ServerURL: "https://example.test/mcp"}}
-			case "caller-policy":
-				req.AgentOptions["workspace"] = "override"
 			case "relative":
 				config.Workspace.Directory = "relative"
 			case "missing":

apps/daemon/internal/agent/codex/declaration.go

@@ -51,7 +51,7 @@ func discover(ctx context.Context, options agent.DiscoveryOptions, info proto.Su
 	return discoverWithCheck(ctx, options, info, CheckCLIAvailable)
 }
 func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, info proto.SupportedAgentKind, check func(context.Context, string) (string, error)) *agent.Runtime {
-	runtime := &agent.Runtime{Info: info, Session: Factory, SessionCapabilityContext: true, ExecutorCapabilityContext: true}
+	runtime := &agent.Runtime{Info: info, Session: Factory}
 	ctx, cancel := context.WithTimeout(parent, 15*time.Second)
 	defer cancel()
 	version, err := check(ctx, "")

apps/daemon/internal/agent/codex/declaration_test.go

@@ -15,7 +15,7 @@ func TestMCPRequiredDiscoveryRequiresPinnedNative(t *testing.T) {
 	for _, version := range []string{"codex-cli 0.153.4", "codex-cli 0.153.3", "codex-cli 0.154.0"} {
 		runtime := discoverWithCheck(t.Context(), agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}, Declaration.Info, func(context.Context, string) (string, error) { return version, nil })
 
-		if !runtime.Info.Available || runtime.Executor == nil || (runtime.Preparation != nil) != SupportsLocalEnvironment(version) || !runtime.SessionCapabilityContext || !runtime.ExecutorCapabilityContext {
+		if !runtime.Info.Available || runtime.Executor == nil || (runtime.Preparation != nil) != SupportsLocalEnvironment(version) {
 			t.Fatalf("factories: %+v", runtime)
 		}
 		if runtime.Info.Capabilities.MCPHTTPRequired.IsSupported() != (version == "codex-cli 0.153.4") {

apps/daemon/internal/agent/codex/execution_controls.go

@@ -7,36 +7,18 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func TestExecutionControlsOverrideWithoutMutatingNativeOptions(t *testing.T) {
+func TestExecutionControlsSelectNativeSettings(t *testing.T) {
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-	original := map[string]any{"model": "test-model", "web_search": "live", "model_verbosity": "high"}
-	request := proto.PromptRequestPayload{AgentOptions: original}
-	if got := executionOptions(request); !reflect.DeepEqual(got, original) {
-		t.Fatal("ordinary options changed")
-	}
 	for _, search := range []string{"disabled", "cached", "live"} {
 		for _, verbosity := range []string{"low", "medium", "high"} {
-			request.ExecutionControls = &proto.ExecutionControls{WebSearch: search, TextVerbosity: verbosity}
-			options := executionOptions(request)
-			if options["model"] != "test-model" || original["web_search"] != "live" || original["model_verbosity"] != "high" {
-				t.Fatal("operator options mutated")
-			}
-			plan, err := BuildSessionPlan("run", "state", options)
+			plan, err := BuildSessionPlan("state", map[string]any{"model": "test-model"}, &proto.ExecutionControls{WebSearch: search, TextVerbosity: verbosity})
 			if err != nil {
 				t.Fatal(err)
 			}
-			want := map[string]string{"web_search": `"` + search + `"`, "model_verbosity": `"` + verbosity + `"`}
-			for _, kv := range plan.ExtraConfig {
-				if v, ok := want[kv[0]]; ok {
-					if kv[1] != v {
-						t.Fatal("native control differs", kv)
-					}
-					delete(want, kv[0])
-				}
-			}
 			plan.Cleanup()
-			if len(want) != 0 {
-				t.Fatal("native settings omitted", want)
+			want := [][2]string{{"web_search", `"` + search + `"`}, {"model_verbosity", `"` + verbosity + `"`}}
+			if !reflect.DeepEqual(plan.ExtraConfig, want) {
+				t.Fatalf("config = %v, want %v", plan.ExtraConfig, want)
 			}
 		}
 	}
@@ -48,8 +30,7 @@ func TestExecutionControlsRejectIncompleteOrInvalidValues(t *testing.T) {
 		{}, {WebSearch: "disabled"}, {TextVerbosity: "medium"},
 		{WebSearch: "invalid", TextVerbosity: "medium"}, {WebSearch: "disabled", TextVerbosity: "invalid"},
 	} {
-		options := executionOptions(proto.PromptRequestPayload{ExecutionControls: &controls})
-		if plan, err := BuildSessionPlan("run", "state", options); err == nil {
+		if plan, err := BuildSessionPlan("state", nil, &controls); err == nil {
 			plan.Cleanup()
 			t.Fatal("invalid controls accepted", controls)
 		}

apps/daemon/internal/agent/codex/execution_controls_test.go

@@ -13,10 +13,10 @@ import (
 
 func TestHarnessConfigAppliedWithoutChangingProvider(t *testing.T) {
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-	plan, err := BuildSessionPlan("run", "native-config", map[string]any{
+	plan, err := BuildSessionPlan("native-config", map[string]any{
 		"model": "fixture", "harness_config": map[string]any{"model_reasoning_effort": "high"},
 		"model_provider": map[string]any{"base_url": "https://provider.invalid/v1", "protocol": "responses", "api_key": "test-key"},
-	})
+	}, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -27,7 +27,7 @@ func TestHarnessConfigAppliedWithoutChangingProvider(t *testing.T) {
 }
 
 func TestHarnessConfigConflictFailsBeforePreparation(t *testing.T) {
-	_, err := BuildSessionPlan("run", "", map[string]any{"harness_config": map[string]any{"model_provider": "bypass"}})
+	_, err := BuildSessionPlan("", map[string]any{"harness_config": map[string]any{"model_provider": "bypass"}}, nil)
 	if err != harnessconfig.ErrHarnessConfig {
 		t.Fatalf("configuration must fail before filesystem preparation: %v", err)
 	}

apps/daemon/internal/agent/codex/generation_config.go

@@ -8,17 +8,14 @@ import (
 	"strings"
 )
 
-// mcpServerConfig is the daemon-internal MCP server config flattened
-// from agent_options["mcp_servers"] (rendered by render.TargetCodex /
-// the mcpServers JSON shape). Written into <CODEX_HOME>/config.toml
+// mcpServerConfig is the daemon-internal MCP server config resolved from
+// the request's MCP bindings. Written into <CODEX_HOME>/config.toml
 // before spawning the app-server child.
 type mcpServerConfig struct {
 	Name              string
 	URL               string
-	Headers           map[string]string
 	Command           string
 	Args              []string
-	Env               map[string]string
 	EnabledTools      *[]string
 	Required          bool
 	BearerTokenEnvVar string
@@ -76,7 +73,6 @@ func writeCodexMCPConfig(codexHome string, servers map[string]mcpServerConfig) e
 				}
 				b.WriteString("]\n")
 			}
-			writeMCPHeaderMap(&b, "http_headers", srv.Headers)
 			writeMCPHeaderMap(&b, "env_http_headers", srv.EnvHTTPHeaders)
 			b.WriteByte('\n')
 			continue
@@ -94,22 +90,6 @@ func writeCodexMCPConfig(codexHome string, servers map[string]mcpServerConfig) e
 			}
 			b.WriteString("]\n")
 		}
-		if len(srv.Env) > 0 {
-			envKeys := make([]string, 0, len(srv.Env))
-			for k := range srv.Env {
-				envKeys = append(envKeys, k)
-			}
-			sort.Strings(envKeys)
-			b.WriteString("\n[mcp_servers.")
-			b.WriteString(tomlQuoteString(name))
-			b.WriteString(".env]\n")
-			for _, k := range envKeys {
-				b.WriteString(tomlQuoteString(k))
-				b.WriteString(" = ")
-				b.WriteString(tomlQuoteString(srv.Env[k]))
-				b.WriteByte('\n')
-			}
-		}
 		b.WriteByte('\n')
 	}