From 47c33b261016ad783d4b79baebcc424cef61f058 Mon Sep 17 00:00:00 2001
From: Harald Kirschner <hkirschner@microsoft.com>
Date: Mon, 15 Jun 2026 14:24:13 -0700
Subject: [PATCH] Add Codex3PIntegration policy for
 chat.agentHost.codexAgent.enabled (#321476)

Adds an enterprise policy to allow admins to control the Codex agent
provider registration, mirroring the existing Claude3PIntegration policy.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 build/lib/policies/policyData.jsonc               | 15 +++++++++++++++
 .../agentHostStarter.config.contribution.ts       | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/build/lib/policies/policyData.jsonc b/build/lib/policies/policyData.jsonc
index 3d987d4fab3..be756e6567f 100644
--- a/build/lib/policies/policyData.jsonc
+++ b/build/lib/policies/policyData.jsonc
@@ -128,6 +128,21 @@
             "default": "*",
             "included": true
         },
+        {
+            "key": "chat.agentHost.codexAgent.enabled",
+            "name": "Codex3PIntegration",
+            "category": "InteractiveSession",
+            "minimumVersion": "1.126",
+            "localization": {
+                "description": {
+                    "key": "chat.agentHost.codexAgent.enabled.policy",
+                    "value": "Enable Codex Agent sessions in VS Code. Start and resume agentic coding sessions powered by OpenAI Codex SDK directly in the editor. Uses your existing Copilot subscription."
+                }
+            },
+            "type": "boolean",
+            "default": false,
+            "included": true
+        },
         {
             "key": "chat.tools.global.autoApprove",
             "name": "ChatToolsAutoApprove",
diff --git a/src/vs/platform/agentHost/common/agentHostStarter.config.contribution.ts b/src/vs/platform/agentHost/common/agentHostStarter.config.contribution.ts
index 59e5aa57471..71e021adc3d 100644
--- a/src/vs/platform/agentHost/common/agentHostStarter.config.contribution.ts
+++ b/src/vs/platform/agentHost/common/agentHostStarter.config.contribution.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from '../../../nls.js';
+import { PolicyCategory } from '../../../base/common/policy.js';
 import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
 import product from '../../product/common/product.js';
 import { Registry } from '../../registry/common/platform.js';
@@ -54,6 +55,17 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('chat.agentHost.codexAgent.enabled', "When enabled, the agent host registers the Codex provider (subject to the Codex SDK being reachable). Requires `#chat.agentHost.enabled#`. The agent host process must be restarted for changes to take effect."),
 			default: false,
 			tags: ['experimental', 'advanced'],
+			policy: {
+				name: 'Codex3PIntegration',
+				category: PolicyCategory.InteractiveSession,
+				minimumVersion: '1.126',
+				localization: {
+					description: {
+						key: 'chat.agentHost.codexAgent.enabled.policy',
+						value: nls.localize('chat.agentHost.codexAgent.enabled.policy', "Enable Codex Agent sessions in VS Code. Start and resume agentic coding sessions powered by OpenAI Codex SDK directly in the editor. Uses your existing Copilot subscription."),
+					}
+				}
+			}
 		},
 		[AgentHostCodexAgentSdkRootSettingId]: {
 			type: 'string',