diff --git a/apps/server/src/provider/CodexManagedRuntime.test.ts b/apps/server/src/provider/CodexManagedRuntime.test.ts
index 8f8408bdaee1f..b5322785a6b63 100644
--- a/apps/server/src/provider/CodexManagedRuntime.test.ts
+++ b/apps/server/src/provider/CodexManagedRuntime.test.ts
@@ -121,7 +121,7 @@ it.live.each(
             assert.equal(runtime.homeLayout.mode, "direct");
           } else {
             assert.include(effective.config.homePath, instanceId);
-            assert.include(effective.config.homePath, "userdata/providers/codex");
+            assert.include(effective.config.homePath, path.join("userdata", "providers", "codex"));
             assert.equal(runtime.homeLayout.mode, "authOverlay");
             assert.equal(
               yield* fs.readLink(path.join(effective.config.homePath, "sessions")),
@@ -197,6 +197,7 @@ it.live.each(
           assert.include(args, "features.api_key_model_discovery=true");
           assert.include(args, "features.multi_agent=false");
           assert.include(args, "features.multi_agent_v2=false");
+          assert.include(args, "agents.enabled=false");
           assert.notInclude(effective.config.launchArgs, "model_catalog_json");
           assert.notInclude(effective.config.launchArgs, "x-openai-chatpass-test");
           assert.include(provider, "supports_websockets=false");
diff --git a/apps/server/src/provider/CodexManagedRuntime.ts b/apps/server/src/provider/CodexManagedRuntime.ts
index 3704c919c2791..b2e663e837d8b 100644
--- a/apps/server/src/provider/CodexManagedRuntime.ts
+++ b/apps/server/src/provider/CodexManagedRuntime.ts
@@ -27,6 +27,8 @@ const managedCodexLaunchArgs = (command: string, args: ReadonlyArray<string>) =>
     "features.api_key_model_discovery=true",
     "features.multi_agent=false",
     "features.multi_agent_v2=false",
+    // The model catalog can enable native agents independently of the feature flags.
+    "agents.enabled=false",
   ]
     .map((value) => `-c ${JSON.stringify(value)}`)
     .join(" ");