diff --git a/.agents/skills/update-codex-sdk/SKILL.md b/.agents/skills/update-codex-sdk/SKILL.md
new file mode 100644
index 00000000000000..91f729fd6094fd
--- /dev/null
+++ b/.agents/skills/update-codex-sdk/SKILL.md
@@ -0,0 +1,88 @@
+---
+name: update-codex-sdk
+description: Update VS Code's bundled @openai/codex dependency to a version available from the private VS Code npm feed, regenerate its protocol client, run the relevant tests, and verify the Codex Agent Host in a launched Code OSS window. Use for bundled Codex SDK/CLI version bumps in the VS Code repository.
+---
+
+# Update the bundled Codex SDK
+
+The public npm `latest` version is not necessarily installable in VS Code CI. The Azure pipeline uses the private `vscode` feed, where CFS normally quarantines new third-party package versions for seven days. Select a version from that feed before changing files.
+
+## Select a CI-available version
+
+Run the helper from the repository root:
+
+```bash
+node --experimental-strip-types .agents/skills/update-codex-sdk/scripts/latest-private-version.ts
+```
+
+It obtains an Azure DevOps access token from the signed-in Azure CLI, queries the same feed used by `build/azure-pipelines/dependencies-check.yml`, and reports the newest stable release for which the root package and every platform binary alias declared by that release are present. It never prints the token. If Azure CLI authentication is missing or expired, ask the user to authenticate rather than falling back to the public registry.
+
+To check a user-requested version explicitly:
+
+```bash
+node --experimental-strip-types .agents/skills/update-codex-sdk/scripts/latest-private-version.ts --version 0.149.1
+```
+
+Use `--raw` when only the latest complete version string is needed. Do not change the repository or global npm registry merely to probe availability.
+
+## Update every pin
+
+Set `CODEX_VERSION` to the selected exact version. Keep committed lockfile URLs on `https://registry.npmjs.org/`; the private feed determines CI eligibility but is not written into source lockfiles.
+
+```bash
+CODEX_VERSION=0.149.1
+npm install --save-dev --save-exact --ignore-scripts --registry=https://registry.npmjs.org "@openai/codex@$CODEX_VERSION"
+npm --prefix build/agent-sdk/agents/codex install --save-exact --package-lock-only --ignore-scripts --registry=https://registry.npmjs.org "@openai/codex@$CODEX_VERSION"
+```
+
+Use `apply_patch` to set `build/codex/codex-version.txt` to the same version, then regenerate the vendored app-server client:
+
+```bash
+npm run codex:gen-protocol
+```
+
+The expected version-bearing files are:
+
+- `package.json` and `package-lock.json`
+- `build/agent-sdk/agents/codex/package.json` and `package-lock.json`
+- `build/codex/codex-version.txt`
+- `src/vs/platform/agentHost/node/codex/protocol/generated/**`
+
+Never hand-edit generated protocol files. Review their diff, then make the smallest necessary handwritten Agent Host or test changes for protocol additions or type changes. Confirm both package manifests use exact versions and that no private-feed URL entered either lockfile.
+
+## Validate
+
+Run the established checks from the repository root:
+
+```bash
+npm run codex:check-protocol
+npm run compile
+./scripts/test.sh --grep codex
+(cd build && npm run test)
+npm run test-agent-host-e2e -- --jobs 2
+npm run hygiene
+```
+
+The Agent Host E2E run exercises the bundled provider SDKs in replay mode. If a Codex SDK change causes replay misses or stale fixtures, read `.github/skills/agent-host-e2e-tests/SKILL.md` before deciding whether to re-record; never weaken or silently skip a failing test.
+
+## Verify a real Codex Agent Host session
+
+After the build and tests pass, read and use `.agents/skills/launch/SKILL.md` to launch an isolated **Agents window** for this checkout. Take a fresh Playwright snapshot, explicitly start a Codex-backed session, and give it a deterministic tool-use task such as:
+
+```text
+Run node -p "require('@openai/codex/package.json').version" in this workspace. If it prints <VERSION>, reply exactly CODEX_SDK_<VERSION_WITH_UNDERSCORES>_OK.
+```
+
+Success requires all of the following, not merely a window that opened:
+
+- the selected provider is Codex;
+- the session invokes the command through the Agent Host and completes;
+- the reported version matches every pin;
+- the exact sentinel appears in the completed response;
+- the Agent Host log shows no startup crash or protocol error.
+
+Save the observed sentinel and test totals for the final report or pull-request description. Follow the launch skill's cleanup steps when finished.
+
+## Deliver
+
+Inspect the complete diff for unrelated changes, secrets, private registry URLs, and generated-file drift. Preserve unrelated user work. Commit, push, or create/update a pull request only when the user has authorized those actions; include the private-feed-selected version and validation evidence in the description.
diff --git a/.agents/skills/update-codex-sdk/agents/openai.yaml b/.agents/skills/update-codex-sdk/agents/openai.yaml
new file mode 100644
index 00000000000000..0f9f0004847a7d
--- /dev/null
+++ b/.agents/skills/update-codex-sdk/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Update Codex SDK"
+  short_description: "Update and verify VS Code's bundled Codex SDK"
+  default_prompt: "Use $update-codex-sdk to update VS Code to the newest private-feed-available Codex SDK and verify it end to end."
diff --git a/.agents/skills/update-codex-sdk/scripts/latest-private-version.ts b/.agents/skills/update-codex-sdk/scripts/latest-private-version.ts
new file mode 100644
index 00000000000000..2efa1a1e47838d
--- /dev/null
+++ b/.agents/skills/update-codex-sdk/scripts/latest-private-version.ts
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { spawnSync } from 'node:child_process';
+
+const feedUrl = 'https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry';
+const azureDevOpsResource = '499b84ac-1321-427f-aa17-267ca6975798';
+const codexAliasPrefix = 'npm:@openai/codex@';
+
+type OutputFormat = 'text' | 'raw' | 'json';
+
+interface Options {
+	format: OutputFormat;
+	requestedVersion: string | undefined;
+}
+
+interface CodexVersionMetadata {
+	optionalDependencies?: Record<string, string>;
+}
+
+interface CodexPackument {
+	versions: Record<string, CodexVersionMetadata>;
+}
+
+function usage(): void {
+	console.error('Usage: node --experimental-strip-types latest-private-version.ts [--raw | --json] [--version <x.y.z>]');
+}
+
+function fail(message: string): never {
+	console.error(`Error: ${message}`);
+	process.exit(1);
+}
+
+function parseArgs(args: string[]): Options {
+	let format: OutputFormat = 'text';
+	let requestedVersion: string | undefined;
+
+	for (let index = 0; index < args.length; index++) {
+		const arg = args[index];
+		if (arg === '--raw') {
+			format = 'raw';
+		} else if (arg === '--json') {
+			format = 'json';
+		} else if (arg === '--version') {
+			requestedVersion = args[++index];
+			if (!requestedVersion) {
+				usage();
+				process.exit(2);
+			}
+		} else {
+			usage();
+			process.exit(2);
+		}
+	}
+
+	if (requestedVersion && !/^\d+\.\d+\.\d+$/.test(requestedVersion)) {
+		fail(`--version must be a stable x.y.z version, got ${requestedVersion}`);
+	}
+
+	return { format, requestedVersion };
+}
+
+function getAccessToken(): string {
+	const azureCli = process.platform === 'win32' ? 'az.cmd' : 'az';
+	const result = spawnSync(azureCli, [
+		'account',
+		'get-access-token',
+		'--resource',
+		azureDevOpsResource,
+		'--query',
+		'accessToken',
+		'--output',
+		'tsv',
+	], { encoding: 'utf8' });
+
+	if (result.error) {
+		fail(`could not run Azure CLI (${result.error.message}). Install it and sign in to the monacotools organization.`);
+	}
+	if (result.status !== 0) {
+		const detail = result.stderr?.trim();
+		fail(`Azure CLI could not obtain an Azure DevOps token${detail ? `: ${detail}` : ''}`);
+	}
+
+	const token = result.stdout?.trim();
+	if (!token) {
+		fail('Azure CLI returned an empty Azure DevOps token. Sign in and try again.');
+	}
+	return token;
+}
+
+function parseStableVersion(version: string): number[] | undefined {
+	const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version);
+	return match ? match.slice(1).map(Number) : undefined;
+}
+
+function compareVersions(left: string, right: string): number {
+	const leftParts = parseStableVersion(left);
+	const rightParts = parseStableVersion(right);
+	if (!leftParts || !rightParts) {
+		throw new Error('compareVersions only accepts stable versions');
+	}
+	for (let index = 0; index < 3; index++) {
+		const difference = leftParts[index] - rightParts[index];
+		if (difference !== 0) {
+			return difference;
+		}
+	}
+	return 0;
+}
+
+function binaryVersions(packument: CodexPackument, version: string): string[] {
+	const optionalDependencies = packument.versions[version]?.optionalDependencies;
+	if (!optionalDependencies || typeof optionalDependencies !== 'object') {
+		return [];
+	}
+
+	return Object.values(optionalDependencies)
+		.filter(value => typeof value === 'string' && value.startsWith(codexAliasPrefix))
+		.map(value => value.slice(codexAliasPrefix.length));
+}
+
+function requiredVersions(packument: CodexPackument, version: string): string[] {
+	return [version, ...binaryVersions(packument, version)];
+}
+
+const { format, requestedVersion } = parseArgs(process.argv.slice(2));
+const accessToken = getAccessToken();
+const response = await fetch(`${feedUrl}/@openai%2Fcodex`, {
+	headers: { Authorization: `Bearer ${accessToken}` },
+});
+
+if (!response.ok) {
+	fail(`private VS Code feed returned HTTP ${response.status} ${response.statusText}`);
+}
+
+const packument = await response.json() as CodexPackument;
+if (!packument || typeof packument !== 'object' || !packument.versions || typeof packument.versions !== 'object') {
+	fail('private VS Code feed returned an unexpected @openai/codex response');
+}
+
+const availableVersions = new Set(Object.keys(packument.versions));
+const completeStableVersions = [...availableVersions]
+	.filter(version => parseStableVersion(version))
+	.filter(version => binaryVersions(packument, version).length > 0)
+	.filter(version => requiredVersions(packument, version).every(required => availableVersions.has(required)))
+	.sort(compareVersions);
+
+const latestVersion = completeStableVersions.at(-1);
+if (!latestVersion) {
+	fail('the private VS Code feed contains no stable Codex release with all platform binaries');
+}
+
+const checkedVersion = requestedVersion ?? latestVersion;
+if (requestedVersion && availableVersions.has(requestedVersion) && binaryVersions(packument, requestedVersion).length === 0) {
+	fail(`Codex ${requestedVersion} metadata declares no platform binary aliases, so its availability cannot be verified`);
+}
+const missingVersions = requiredVersions(packument, checkedVersion).filter(version => !availableVersions.has(version));
+const result = {
+	feed: feedUrl,
+	latestVersion,
+	checkedVersion,
+	available: missingVersions.length === 0,
+	missingVersions,
+};
+
+if (format === 'json') {
+	console.log(JSON.stringify(result, undefined, 2));
+} else if (format === 'raw') {
+	console.log(latestVersion);
+} else if (requestedVersion) {
+	if (result.available) {
+		console.log(`Codex ${requestedVersion} is fully available from the private VS Code feed.`);
+	} else {
+		console.log(`Codex ${requestedVersion} is not fully available from the private VS Code feed.`);
+		console.log(`Missing: ${missingVersions.join(', ')}`);
+		console.log(`Latest fully available stable version: ${latestVersion}`);
+	}
+} else {
+	console.log(`Latest Codex stable fully available from the private VS Code feed: ${latestVersion}`);
+}
+
+if (requestedVersion && !result.available) {
+	process.exitCode = 1;
+}
diff --git a/build/agent-sdk/agents/codex/package-lock.json b/build/agent-sdk/agents/codex/package-lock.json
index ff50a7f3f52f0e..d388b51c07343f 100644
--- a/build/agent-sdk/agents/codex/package-lock.json
+++ b/build/agent-sdk/agents/codex/package-lock.json
@@ -6,13 +6,13 @@
 		"": {
 			"name": "agent-sdk-codex",
 			"dependencies": {
-				"@openai/codex": "0.146.0"
+				"@openai/codex": "0.149.1"
 			}
 		},
 		"node_modules/@openai/codex": {
-			"version": "0.146.0",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0.tgz",
-			"integrity": "sha512-yG3sPWNda/2YAIQIDq9MrrjoCTIQ7rxYM5IasrG3VBcuhCLTkgeg/JzqmJq1V98RE4MJ5jCxDXXQlOjrditFRw==",
+			"version": "0.149.1",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1.tgz",
+			"integrity": "sha512-6q5pbcpFbJbqOpkubSDBwXmktQ55aD8eUzGzBF1zASob2DjwhBKDSNGtdZKalfrNJUdTDTPDMmzCXEXs5tMBYA==",
 			"license": "Apache-2.0",
 			"bin": {
 				"codex": "bin/codex.js"
@@ -21,19 +21,19 @@
 				"node": ">=16"
 			},
 			"optionalDependencies": {
-				"@openai/codex-darwin-arm64": "npm:@openai/codex@0.146.0-darwin-arm64",
-				"@openai/codex-darwin-x64": "npm:@openai/codex@0.146.0-darwin-x64",
-				"@openai/codex-linux-arm64": "npm:@openai/codex@0.146.0-linux-arm64",
-				"@openai/codex-linux-x64": "npm:@openai/codex@0.146.0-linux-x64",
-				"@openai/codex-win32-arm64": "npm:@openai/codex@0.146.0-win32-arm64",
-				"@openai/codex-win32-x64": "npm:@openai/codex@0.146.0-win32-x64"
+				"@openai/codex-darwin-arm64": "npm:@openai/codex@0.149.1-darwin-arm64",
+				"@openai/codex-darwin-x64": "npm:@openai/codex@0.149.1-darwin-x64",
+				"@openai/codex-linux-arm64": "npm:@openai/codex@0.149.1-linux-arm64",
+				"@openai/codex-linux-x64": "npm:@openai/codex@0.149.1-linux-x64",
+				"@openai/codex-win32-arm64": "npm:@openai/codex@0.149.1-win32-arm64",
+				"@openai/codex-win32-x64": "npm:@openai/codex@0.149.1-win32-x64"
 			}
 		},
 		"node_modules/@openai/codex-darwin-arm64": {
 			"name": "@openai/codex",
-			"version": "0.146.0-darwin-arm64",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-darwin-arm64.tgz",
-			"integrity": "sha512-nb61yX4r5L6Z0dlC4o3u0GAK1YCd4TUvjaB382bajDoh84V+uv2hTBIVZ++fgXWV9yoeuNrNnNcn7GoTGOe2Tg==",
+			"version": "0.149.1-darwin-arm64",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-darwin-arm64.tgz",
+			"integrity": "sha512-6X84kTCbnTgPIJ2EdcPsrvwS0Wxsqpa+bCswGmRf4BjhcQ5nPMnBC6yCAaCMj+vrbXQHj+L6sa9FaR4QkmA1qw==",
 			"cpu": [
 				"arm64"
 			],
@@ -48,9 +48,9 @@
 		},
 		"node_modules/@openai/codex-darwin-x64": {
 			"name": "@openai/codex",
-			"version": "0.146.0-darwin-x64",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-darwin-x64.tgz",
-			"integrity": "sha512-hTQR5jy/ObfTf1MDnuJCZJAe+SljKE8DDwQWN6lDFgjsPhMQz852U2tILt8Ei+G5GkQSzemHYKl2AYPwW0Y5xw==",
+			"version": "0.149.1-darwin-x64",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-darwin-x64.tgz",
+			"integrity": "sha512-MfLBQLfcElJL9tvj6y45qVHHMGSXCPnQOixuD3/Zq0g1BW/eFizkrGLdn48cFpc+l8cK+gt5nYG5pQYwVs6g4A==",
 			"cpu": [
 				"x64"
 			],
@@ -65,9 +65,9 @@
 		},
 		"node_modules/@openai/codex-linux-arm64": {
 			"name": "@openai/codex",
-			"version": "0.146.0-linux-arm64",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-linux-arm64.tgz",
-			"integrity": "sha512-qiYDxkkEFnXG7joadJW6Q+XcgyDXCpGdpa9nk/c+i0gEomur1j7bHvx12NfWWCF/y8Tqri6ay+FLuC2MjdehtA==",
+			"version": "0.149.1-linux-arm64",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-linux-arm64.tgz",
+			"integrity": "sha512-OqxUfZ1TVvHd18zHPKK/8ZRlpk8Vy11mg5CMHaLxNWldTbwVImDKtSLWT+m8m4NM5Sz4PbjtZMrVT/RfpBW/mQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -82,9 +82,9 @@
 		},
 		"node_modules/@openai/codex-linux-x64": {
 			"name": "@openai/codex",
-			"version": "0.146.0-linux-x64",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-linux-x64.tgz",
-			"integrity": "sha512-fswvyGprAPCMiOEue/7MKMk7pCjh9kZIJfJX5i9atmfnmGYbYCcUhZsEH9LEP0+0t5xyPqDbfNXY7NSxIVuXxA==",
+			"version": "0.149.1-linux-x64",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-linux-x64.tgz",
+			"integrity": "sha512-Of5fGYgr7tAMsyj6vhXb4/RM/UoA3Zq8BLegUBDC09UNy1XTLGYP/2XD+UX8z3qh0NDwxYdCjFIWdDNijKZggQ==",
 			"cpu": [
 				"x64"
 			],
@@ -99,9 +99,9 @@
 		},
 		"node_modules/@openai/codex-win32-arm64": {
 			"name": "@openai/codex",
-			"version": "0.146.0-win32-arm64",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-win32-arm64.tgz",
-			"integrity": "sha512-EW6zdjDe+SLX2Iw+xymJ5+Pz2+DGexdstfFHXh4Ub+TfJsQPiMjGfZfNaoWgdJ2FsqSIzVKu2+G0KCMGYz2W8g==",
+			"version": "0.149.1-win32-arm64",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-win32-arm64.tgz",
+			"integrity": "sha512-5K0DmOKGK9Bos627p8sK8ATHjovPK0sDyT6h9Cb+4v+5CW5SGw1HLgjGxoLfJ8g3cg6mtg/pRCXXo2L/j71UVA==",
 			"cpu": [
 				"arm64"
 			],
@@ -116,9 +116,9 @@
 		},
 		"node_modules/@openai/codex-win32-x64": {
 			"name": "@openai/codex",
-			"version": "0.146.0-win32-x64",
-			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-win32-x64.tgz",
-			"integrity": "sha512-b3lxMYeR0+IhstNo4JjX1P9cPc1xwVcCVkPd1lD1wpWPJ0SBhpIkPczwbu3ZRkJcdyl342+rgyf4DUrbZLdrGA==",
+			"version": "0.149.1-win32-x64",
+			"resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-win32-x64.tgz",
+			"integrity": "sha512-G3QXGAg7nyyhqOeooAMUekBCeHd8a1QByhKcVAFyzNBaI06t6Ft7nsF+1SzFS0spuIdU4YyMi5YD26ukADBQUQ==",
 			"cpu": [
 				"x64"
 			],
diff --git a/build/agent-sdk/agents/codex/package.json b/build/agent-sdk/agents/codex/package.json
index d969514721f712..46bcebaf4548b5 100644
--- a/build/agent-sdk/agents/codex/package.json
+++ b/build/agent-sdk/agents/codex/package.json
@@ -3,6 +3,6 @@
 	"private": true,
 	"comment": "Pinned dependency set for the build/agent-sdk codex tarball. The package-lock.json alongside is the source of truth for transitive deps — produce.ts runs `npm ci` against this directory to get byte-deterministic output across pipeline runs.",
 	"dependencies": {
-		"@openai/codex": "0.146.0"
+		"@openai/codex": "0.149.1"
 	}
 }
diff --git a/build/codex/codex-version.txt b/build/codex/codex-version.txt
index ea147deb509d74..65138dac80096d 100644
--- a/build/codex/codex-version.txt
+++ b/build/codex/codex-version.txt
@@ -1 +1 @@
-0.146.0
+0.149.1
diff --git a/package-lock.json b/package-lock.json
index 470dab9e6c812d..6705f4a27b5e49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -84,7 +84,7 @@
       "devDependencies": {
         "@anthropic-ai/claude-agent-sdk": "0.3.239",
         "@eslint/compat": "^2.1.0",
-        "@openai/codex": "0.146.0",
+        "@openai/codex": "0.149.1",
         "@playwright/cli": "^0.1.9",
         "@playwright/test": "^1.61.1",
         "@stylistic/eslint-plugin": "^5.10.0",
@@ -2526,9 +2526,9 @@
       }
     },
     "node_modules/@openai/codex": {
-      "version": "0.146.0",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0.tgz",
-      "integrity": "sha512-yG3sPWNda/2YAIQIDq9MrrjoCTIQ7rxYM5IasrG3VBcuhCLTkgeg/JzqmJq1V98RE4MJ5jCxDXXQlOjrditFRw==",
+      "version": "0.149.1",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1.tgz",
+      "integrity": "sha512-6q5pbcpFbJbqOpkubSDBwXmktQ55aD8eUzGzBF1zASob2DjwhBKDSNGtdZKalfrNJUdTDTPDMmzCXEXs5tMBYA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -2538,19 +2538,19 @@
         "node": ">=16"
       },
       "optionalDependencies": {
-        "@openai/codex-darwin-arm64": "npm:@openai/codex@0.146.0-darwin-arm64",
-        "@openai/codex-darwin-x64": "npm:@openai/codex@0.146.0-darwin-x64",
-        "@openai/codex-linux-arm64": "npm:@openai/codex@0.146.0-linux-arm64",
-        "@openai/codex-linux-x64": "npm:@openai/codex@0.146.0-linux-x64",
-        "@openai/codex-win32-arm64": "npm:@openai/codex@0.146.0-win32-arm64",
-        "@openai/codex-win32-x64": "npm:@openai/codex@0.146.0-win32-x64"
+        "@openai/codex-darwin-arm64": "npm:@openai/codex@0.149.1-darwin-arm64",
+        "@openai/codex-darwin-x64": "npm:@openai/codex@0.149.1-darwin-x64",
+        "@openai/codex-linux-arm64": "npm:@openai/codex@0.149.1-linux-arm64",
+        "@openai/codex-linux-x64": "npm:@openai/codex@0.149.1-linux-x64",
+        "@openai/codex-win32-arm64": "npm:@openai/codex@0.149.1-win32-arm64",
+        "@openai/codex-win32-x64": "npm:@openai/codex@0.149.1-win32-x64"
       }
     },
     "node_modules/@openai/codex-darwin-arm64": {
       "name": "@openai/codex",
-      "version": "0.146.0-darwin-arm64",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-darwin-arm64.tgz",
-      "integrity": "sha512-nb61yX4r5L6Z0dlC4o3u0GAK1YCd4TUvjaB382bajDoh84V+uv2hTBIVZ++fgXWV9yoeuNrNnNcn7GoTGOe2Tg==",
+      "version": "0.149.1-darwin-arm64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-darwin-arm64.tgz",
+      "integrity": "sha512-6X84kTCbnTgPIJ2EdcPsrvwS0Wxsqpa+bCswGmRf4BjhcQ5nPMnBC6yCAaCMj+vrbXQHj+L6sa9FaR4QkmA1qw==",
       "cpu": [
         "arm64"
       ],
@@ -2566,9 +2566,9 @@
     },
     "node_modules/@openai/codex-darwin-x64": {
       "name": "@openai/codex",
-      "version": "0.146.0-darwin-x64",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-darwin-x64.tgz",
-      "integrity": "sha512-hTQR5jy/ObfTf1MDnuJCZJAe+SljKE8DDwQWN6lDFgjsPhMQz852U2tILt8Ei+G5GkQSzemHYKl2AYPwW0Y5xw==",
+      "version": "0.149.1-darwin-x64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-darwin-x64.tgz",
+      "integrity": "sha512-MfLBQLfcElJL9tvj6y45qVHHMGSXCPnQOixuD3/Zq0g1BW/eFizkrGLdn48cFpc+l8cK+gt5nYG5pQYwVs6g4A==",
       "cpu": [
         "x64"
       ],
@@ -2584,9 +2584,9 @@
     },
     "node_modules/@openai/codex-linux-arm64": {
       "name": "@openai/codex",
-      "version": "0.146.0-linux-arm64",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-linux-arm64.tgz",
-      "integrity": "sha512-qiYDxkkEFnXG7joadJW6Q+XcgyDXCpGdpa9nk/c+i0gEomur1j7bHvx12NfWWCF/y8Tqri6ay+FLuC2MjdehtA==",
+      "version": "0.149.1-linux-arm64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-linux-arm64.tgz",
+      "integrity": "sha512-OqxUfZ1TVvHd18zHPKK/8ZRlpk8Vy11mg5CMHaLxNWldTbwVImDKtSLWT+m8m4NM5Sz4PbjtZMrVT/RfpBW/mQ==",
       "cpu": [
         "arm64"
       ],
@@ -2602,9 +2602,9 @@
     },
     "node_modules/@openai/codex-linux-x64": {
       "name": "@openai/codex",
-      "version": "0.146.0-linux-x64",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-linux-x64.tgz",
-      "integrity": "sha512-fswvyGprAPCMiOEue/7MKMk7pCjh9kZIJfJX5i9atmfnmGYbYCcUhZsEH9LEP0+0t5xyPqDbfNXY7NSxIVuXxA==",
+      "version": "0.149.1-linux-x64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-linux-x64.tgz",
+      "integrity": "sha512-Of5fGYgr7tAMsyj6vhXb4/RM/UoA3Zq8BLegUBDC09UNy1XTLGYP/2XD+UX8z3qh0NDwxYdCjFIWdDNijKZggQ==",
       "cpu": [
         "x64"
       ],
@@ -2620,9 +2620,9 @@
     },
     "node_modules/@openai/codex-win32-arm64": {
       "name": "@openai/codex",
-      "version": "0.146.0-win32-arm64",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-win32-arm64.tgz",
-      "integrity": "sha512-EW6zdjDe+SLX2Iw+xymJ5+Pz2+DGexdstfFHXh4Ub+TfJsQPiMjGfZfNaoWgdJ2FsqSIzVKu2+G0KCMGYz2W8g==",
+      "version": "0.149.1-win32-arm64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-win32-arm64.tgz",
+      "integrity": "sha512-5K0DmOKGK9Bos627p8sK8ATHjovPK0sDyT6h9Cb+4v+5CW5SGw1HLgjGxoLfJ8g3cg6mtg/pRCXXo2L/j71UVA==",
       "cpu": [
         "arm64"
       ],
@@ -2638,9 +2638,9 @@
     },
     "node_modules/@openai/codex-win32-x64": {
       "name": "@openai/codex",
-      "version": "0.146.0-win32-x64",
-      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.146.0-win32-x64.tgz",
-      "integrity": "sha512-b3lxMYeR0+IhstNo4JjX1P9cPc1xwVcCVkPd1lD1wpWPJ0SBhpIkPczwbu3ZRkJcdyl342+rgyf4DUrbZLdrGA==",
+      "version": "0.149.1-win32-x64",
+      "resolved": "https://registry.npmjs.org/@openai/codex/-/codex-0.149.1-win32-x64.tgz",
+      "integrity": "sha512-G3QXGAg7nyyhqOeooAMUekBCeHd8a1QByhKcVAFyzNBaI06t6Ft7nsF+1SzFS0spuIdU4YyMi5YD26ukADBQUQ==",
       "cpu": [
         "x64"
       ],
diff --git a/package.json b/package.json
index 0e1cb64f4ba8eb..1f7f302ef53301 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.137.0",
-  "distro": "5c03086397d13f66eb8c46dc97043a91d9e97c9f",
+  "distro": "e89f2ac3aa7f31b63c96b60b1c598aaf7e8bc076",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -173,7 +173,7 @@
   "devDependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.239",
     "@eslint/compat": "^2.1.0",
-    "@openai/codex": "0.146.0",
+    "@openai/codex": "0.149.1",
     "@playwright/cli": "^0.1.9",
     "@playwright/test": "^1.61.1",
     "@stylistic/eslint-plugin": "^5.10.0",
diff --git a/src/vs/base/common/oauth.ts b/src/vs/base/common/oauth.ts
index 3e4d6133360a9e..c7d284ea11e89f 100644
--- a/src/vs/base/common/oauth.ts
+++ b/src/vs/base/common/oauth.ts
@@ -811,6 +811,9 @@ export interface IAuthorizationJWTClaims {
 	 */
 	roles?: string[];
 
+	/** Entra ID tenant id; absent on non-Entra tokens. Distinguishes work/school from personal accounts. */
+	tid?: string;
+
 	/**
 	 * OPTIONAL. Handles optional claims that are not explicitly defined in the standard.
 	 */
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 43e145eb3b7331..caa0b4ab95c027 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -148,6 +148,7 @@ export interface IProductConfiguration {
 		readonly resourceUrlTemplate: string;
 		readonly nlsBaseUrl: string;
 		readonly accessSKUs?: string[];
+		readonly accessScopes?: string[];
 	};
 
 	readonly agentSdks?: { readonly [packageId: string]: IAgentSdkProductConfig };
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
index f0790e419d8cad..f76dae223c336d 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
@@ -46,6 +46,10 @@ export class DiffEditorEditors extends Disposable {
 
 	public readonly isFocused;
 
+	public getContentHeight(): number {
+		return Math.max(this.modified.getContentHeight(), this.original.getContentHeight());
+	}
+
 	constructor(
 		private readonly originalEditorElement: HTMLElement,
 		private readonly modifiedEditorElement: HTMLElement,
@@ -123,10 +127,9 @@ export class DiffEditorEditors extends Disposable {
 
 		this._register(editor.onDidContentSizeChange(e => {
 			const width = this.original.getContentWidth() + this.modified.getContentWidth() + OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH;
-			const height = Math.max(this.modified.getContentHeight(), this.original.getContentHeight());
 
 			this._onDidContentSizeChange.fire({
-				contentHeight: height,
+				contentHeight: this.getContentHeight(),
 				contentWidth: width,
 				contentHeightChanged: e.contentHeightChanged,
 				contentWidthChanged: e.contentWidthChanged
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
index ed159f6f7bec6c..b7c03c8ba4c9b9 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
@@ -436,7 +436,7 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
 	}
 
 	public getContentHeight() {
-		return this._editors.modified.getContentHeight();
+		return this._editors.getContentHeight();
 	}
 
 	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorConstructionOptions>, editorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/compressedVirtualizedScrollView.ts b/src/vs/editor/browser/widget/multiDiffEditor/compressedVirtualizedScrollView.ts
index 8c0962fafd670a..62cb71909387db 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/compressedVirtualizedScrollView.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/compressedVirtualizedScrollView.ts
@@ -7,6 +7,7 @@ import { Dimension, getWindow, h, scheduleAtNextAnimationFrame } from '../../../
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
 import { findFirstMax } from '../../../../base/common/arraysFind.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorun, globalTransaction, IObservable, ITransaction, observableFromEvent, observableSignal, observableValue } from '../../../../base/common/observable.js';
@@ -15,6 +16,8 @@ import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
 import { ObservableElementSizeObserver } from '../diffEditor/utils.js';
 import { asLayoutRevision, computeCompressedVirtualizedScrollHeight, computeCompressedVirtualizedScrollLayout, computeItemRanges, createAnchoredSizeEditBatch, ICompressedVirtualizedScrollLayout, ILogicalPosition, ISizeEdit, LayoutRevision, mapLogicalPosition } from './compressedVirtualizedScrollLayout.js';
 
+const scrollDirectionRetentionDurationMs = 100;
+
 export interface ICompressedVirtualizedScrollItem {
 	readonly size: IObservable<number>;
 	readonly maxScroll: IObservable<{ readonly maxScroll: number }>;
@@ -66,6 +69,8 @@ export class CompressedVirtualizedScrollView<TItem extends ICompressedVirtualize
 	private _previousItemHeights: readonly number[] | undefined;
 	private _previousItemGap = 0;
 	private _lastScrollTop = 0;
+	private _lastScrollDirection: 'up' | 'down' | undefined;
+	private readonly _clearScrollDirection = this._register(new RunOnceScheduler(() => this._lastScrollDirection = undefined, scrollDirectionRetentionDurationMs));
 	private _isUpdating = false;
 	private _pendingAnchor: {
 		readonly position: ILogicalPosition;
@@ -234,6 +239,10 @@ export class CompressedVirtualizedScrollView<TItem extends ICompressedVirtualize
 		try {
 			let targetScrollTop = requestedScrollTop;
 			const scrollDelta = requestedScrollTop - this._lastScrollTop;
+			if (scrollDelta !== 0) {
+				this._lastScrollDirection = scrollDelta < 0 ? 'up' : 'down';
+				this._clearScrollDirection.schedule();
+			}
 			const previousItemHeights = this._previousItemHeights;
 			const geometryChanged = previousItemHeights !== undefined
 				&& (itemGap !== this._previousItemGap || !arrayEquals(previousItemHeights, itemHeights));
@@ -248,10 +257,9 @@ export class CompressedVirtualizedScrollView<TItem extends ICompressedVirtualize
 				const oldLogicalScrollHeight = computeCompressedVirtualizedScrollHeight(previousItemHeights, this._previousItemGap);
 				const oldLogicalViewportTop = requestedScrollTop - this._leadingScrollSlack;
 				const pendingAnchor = this._pendingAnchor;
-				const futureScrollTop = this._scrollable.getFutureScrollPosition().scrollTop;
-				const isActivelyScrollingUp = this._scrollable.hasPendingScrollAnimation() && futureScrollTop < requestedScrollTop;
-				const defaultAnchorViewportOffset = isActivelyScrollingUp ? height : 0;
-				const anchorKind = pendingAnchor?.item ? 'item' : pendingAnchor ? 'logical' : isActivelyScrollingUp ? 'viewportBottom' : 'viewportTop';
+				const isScrollingUp = this._lastScrollDirection === 'up';
+				const defaultAnchorViewportOffset = isScrollingUp ? height : 0;
+				const anchorKind = pendingAnchor?.item ? 'item' : pendingAnchor ? 'logical' : isScrollingUp ? 'viewportBottom' : 'viewportTop';
 				const anchorOffset = pendingAnchor?.position.offset ?? Math.max(0, Math.min(oldLogicalViewportTop + defaultAnchorViewportOffset, oldLogicalScrollHeight));
 				const anchorViewportOffset = pendingAnchor?.viewportOffset ?? anchorOffset - oldLogicalViewportTop;
 				const fromRevision = this._revision;
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
index 8fae956deb92de..e9dae9d5e96f3c 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
@@ -259,7 +259,11 @@ export class DiffEditorItemTemplate extends VirtualizedItemTemplate<DocumentDiff
 		try {
 			this.setItem(item, context.initialSize);
 		} catch (error) {
-			this._bindingContext = undefined;
+			try {
+				this.setItem(undefined);
+			} finally {
+				this._bindingContext = undefined;
+			}
 			throw error;
 		}
 		return new DiffEditorItemBinding(item, this);
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/virtualizedItemManager.ts b/src/vs/editor/browser/widget/multiDiffEditor/virtualizedItemManager.ts
index c8144a96cade1f..ee0733f89a4650 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/virtualizedItemManager.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/virtualizedItemManager.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, IObservable, ITransaction, mapObservableArrayCached, observableValue, transaction } from '../../../../base/common/observable.js';
@@ -131,6 +131,7 @@ export class ManagedVirtualizedItem<TItem, TBinding extends IVirtualizedItemBind
 	private readonly _templateReference = observableValue<IReference<TTemplate> | undefined>(this, undefined);
 	private readonly _isHidden = observableValue(this, false);
 	private _lastRender: { renderedRange: OffsetRange; scrollOffset: number; width: number; renderedViewport: OffsetRange; context: ICompressedVirtualizedScrollItemContext | undefined } | undefined;
+	private _didRenderFail = false;
 	readonly template = derived(this, reader => this._templateReference.read(reader)?.object);
 	readonly binding = derived(this, reader => this.template.read(reader)?.currentBinding.read(reader));
 	readonly size;
@@ -157,6 +158,18 @@ export class ManagedVirtualizedItem<TItem, TBinding extends IVirtualizedItemBind
 	render(renderedRange: OffsetRange, scrollOffset: number, width: number, renderedViewport: OffsetRange, context?: ICompressedVirtualizedScrollItemContext): void {
 		this._lastRender = { renderedRange, scrollOffset, width, renderedViewport, context };
 		this._isHidden.set(false, undefined);
+		if (this._didRenderFail) {
+			return;
+		}
+		try {
+			this._render(renderedRange, scrollOffset, width, renderedViewport, context);
+		} catch (error) {
+			this._didRenderFail = true;
+			onUnexpectedError(error);
+		}
+	}
+
+	private _render(renderedRange: OffsetRange, scrollOffset: number, width: number, renderedViewport: OffsetRange, context?: ICompressedVirtualizedScrollItemContext): void {
 		let binding = this.binding.get();
 		if (!binding) {
 			const templateReference = this._manager.acquire(this.item);
@@ -165,25 +178,31 @@ export class ManagedVirtualizedItem<TItem, TBinding extends IVirtualizedItemBind
 				templateReference.dispose();
 				throw new BugIndicatingError('Virtualized template pool returned a bound template');
 			}
-			const newBinding = template.bind(this.item, {
-				initialSize: this.size.get(),
-				runWithScrollAnchor: (getItemOffset, update) => {
-					if (!context) {
-						throw new BugIndicatingError('Cannot preserve a virtualized item scroll anchor without a render context');
-					}
-					context.runWithScrollAnchor(getItemOffset, update);
-				},
-			});
-			if (newBinding.item !== this.item || template.currentBinding.get() !== newBinding) {
-				newBinding.dispose();
+			let newBinding: TBinding | undefined;
+			try {
+				newBinding = template.bind(this.item, {
+					initialSize: this.size.get(),
+					runWithScrollAnchor: (getItemOffset, update) => {
+						if (!context) {
+							throw new BugIndicatingError('Cannot preserve a virtualized item scroll anchor without a render context');
+						}
+						context.runWithScrollAnchor(getItemOffset, update);
+					},
+				});
+				if (newBinding.item !== this.item || template.currentBinding.get() !== newBinding) {
+					throw new BugIndicatingError('Virtualized template returned a binding for a different item');
+				}
+				const validatedBinding = newBinding;
+				transaction(tx => {
+					this._delegate.onDidBind?.(validatedBinding, tx);
+					this._templateReference.set(templateReference, tx);
+				});
+			} catch (error) {
+				(template.currentBinding.get() ?? newBinding)?.dispose();
 				templateReference.dispose();
-				throw new BugIndicatingError('Virtualized template returned a binding for a different item');
+				throw error;
 			}
 			binding = newBinding;
-			transaction(tx => {
-				this._templateReference.set(templateReference, tx);
-				this._delegate.onDidBind?.(newBinding, tx);
-			});
 		}
 		binding.render(renderedRange, scrollOffset, width, renderedViewport);
 	}
@@ -199,6 +218,7 @@ export class ManagedVirtualizedItem<TItem, TBinding extends IVirtualizedItemBind
 		}
 		const lastRender = this._lastRender;
 		this._clearBinding();
+		this._didRenderFail = false;
 		this.render(lastRender.renderedRange, lastRender.scrollOffset, lastRender.width, lastRender.renderedViewport, lastRender.context);
 	}
 
diff --git a/src/vs/editor/test/browser/widget/compressedVirtualizedScrollLayout.test.ts b/src/vs/editor/test/browser/widget/compressedVirtualizedScrollLayout.test.ts
index 77fb1611f4f60c..4279a9b0c9e596 100644
--- a/src/vs/editor/test/browser/widget/compressedVirtualizedScrollLayout.test.ts
+++ b/src/vs/editor/test/browser/widget/compressedVirtualizedScrollLayout.test.ts
@@ -5,6 +5,7 @@
 
 import assert from 'assert';
 import { Dimension } from '../../../../base/browser/dom.js';
+import { timeout } from '../../../../base/common/async.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { constObservable, IObservable, ITransaction, observableValue, transaction } from '../../../../base/common/observable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
@@ -507,13 +508,13 @@ suite('CompressedVirtualizedScrollLayout', () => {
 		});
 	});
 
-	test('uses the viewport bottom only while actively scrolling up', () => {
+	test('anchors geometry edits based on recent scroll direction', async () => {
 		const container = document.createElement('div');
 		document.body.appendChild(container);
 		disposables.add(toDisposable(() => container.remove()));
 
 		const itemA = new TestCompressedScrollItem(500);
-		const itemB = new TestCompressedScrollItem(500);
+		const itemB = new TestCompressedScrollItem(1000);
 		const view = disposables.add(new CompressedVirtualizedScrollView(
 			container,
 			constObservable(new Dimension(800, 400)),
@@ -522,32 +523,66 @@ suite('CompressedVirtualizedScrollLayout', () => {
 		));
 		container.appendChild(view.domNode);
 		view.setScrollPosition({ scrollTop: 600 });
-		view.setScrollPosition({ scrollTop: 500 }, true);
-
-		itemA.setSize(700);
-		const whileScrolling = view.layout.get();
-		itemB.setSize(40);
-		const afterScrolling = view.layout.get();
+		itemA.onNextRender = () => itemA.setSize(40);
+		view.setScrollPosition({ scrollTop: 499 });
+
+		const afterShrinkWhileScrollingUp = view.layout.get();
+		const afterShrinkEdit = view.lastGeometryEdit.get();
+		itemA.setSize(500);
+		const afterRestoreWhileScrollingUp = view.layout.get();
+		const afterRestoreEdit = view.lastGeometryEdit.get();
+		await timeout(60);
+		view.setScrollPosition({ scrollTop: 498 });
+		await timeout(60);
+		itemA.setSize(600);
+		const afterGrowthWithinRetentionPeriod = view.layout.get();
+		const afterGrowthWithinRetentionPeriodEdit = view.lastGeometryEdit.get();
+		await timeout(50);
+		itemB.setSize(900);
+		const afterChangeAfterScrollingEnded = view.layout.get();
+		const afterChangeAfterScrollingEndedEdit = view.lastGeometryEdit.get();
 
 		assert.deepStrictEqual({
-			whileScrolling: {
-				scrollTop: whileScrolling.scrollTop,
-				viewportBottom: whileScrolling.contentViewport.endExclusive,
-				itemBOffsetAtViewportBottom: whileScrolling.contentViewport.endExclusive - whileScrolling.items[1].contentRange.start,
+			afterShrinkWhileScrollingUp: {
+				scrollTop: afterShrinkWhileScrollingUp.scrollTop,
+				itemBOffsetAtViewportBottom: afterShrinkWhileScrollingUp.contentViewport.endExclusive - afterShrinkWhileScrollingUp.items[1].contentRange.start,
+				anchorKind: afterShrinkEdit?.anchorKind,
+			},
+			afterRestoreWhileScrollingUp: {
+				scrollTop: afterRestoreWhileScrollingUp.scrollTop,
+				itemBOffsetAtViewportBottom: afterRestoreWhileScrollingUp.contentViewport.endExclusive - afterRestoreWhileScrollingUp.items[1].contentRange.start,
+				anchorKind: afterRestoreEdit?.anchorKind,
+			},
+			afterGrowthWithinRetentionPeriod: {
+				scrollTop: afterGrowthWithinRetentionPeriod.scrollTop,
+				itemBOffsetAtViewportBottom: afterGrowthWithinRetentionPeriod.contentViewport.endExclusive - afterGrowthWithinRetentionPeriod.items[1].contentRange.start,
+				anchorKind: afterGrowthWithinRetentionPeriodEdit?.anchorKind,
 			},
-			afterScrolling: {
-				scrollTop: afterScrolling.scrollTop,
-				itemBOffsetAtViewportTop: afterScrolling.contentViewport.start - afterScrolling.items[1].contentRange.start,
+			afterChangeAfterScrollingEnded: {
+				scrollTop: afterChangeAfterScrollingEnded.scrollTop,
+				itemBOffsetAtViewportTop: afterChangeAfterScrollingEnded.contentViewport.start - afterChangeAfterScrollingEnded.items[1].contentRange.start,
+				anchorKind: afterChangeAfterScrollingEndedEdit?.anchorKind,
 			},
 		}, {
-			whileScrolling: {
-				scrollTop: 800,
-				viewportBottom: 1200,
-				itemBOffsetAtViewportBottom: 500,
+			afterShrinkWhileScrollingUp: {
+				scrollTop: 39,
+				itemBOffsetAtViewportBottom: 399,
+				anchorKind: 'viewportBottom',
+			},
+			afterRestoreWhileScrollingUp: {
+				scrollTop: 499,
+				itemBOffsetAtViewportBottom: 399,
+				anchorKind: 'viewportBottom',
+			},
+			afterGrowthWithinRetentionPeriod: {
+				scrollTop: 598,
+				itemBOffsetAtViewportBottom: 398,
+				anchorKind: 'viewportBottom',
 			},
-			afterScrolling: {
-				scrollTop: 700,
-				itemBOffsetAtViewportTop: 0,
+			afterChangeAfterScrollingEnded: {
+				scrollTop: 598,
+				itemBOffsetAtViewportTop: -2,
+				anchorKind: 'viewportTop',
 			},
 		});
 	});
@@ -557,6 +592,7 @@ class TestCompressedScrollItem implements ICompressedVirtualizedScrollItem {
 	readonly size;
 	readonly maxScroll: IObservable<{ readonly maxScroll: number }> = constObservable({ maxScroll: 0 });
 	renderContext: ICompressedVirtualizedScrollItemContext | undefined;
+	onNextRender: (() => void) | undefined;
 
 	constructor(contentHeight: number) {
 		this.size = observableValue(this, contentHeight);
@@ -572,6 +608,9 @@ class TestCompressedScrollItem implements ICompressedVirtualizedScrollItem {
 
 	render(_renderedRange: OffsetRange, _scrollOffset: number, _width: number, _renderedViewport: OffsetRange, context: ICompressedVirtualizedScrollItemContext): void {
 		this.renderContext = context;
+		const onNextRender = this.onNextRender;
+		this.onNextRender = undefined;
+		onNextRender?.();
 	}
 
 	hide(): void { }
diff --git a/src/vs/editor/test/browser/widget/multiDiffEditorWidget.test.ts b/src/vs/editor/test/browser/widget/multiDiffEditorWidget.test.ts
index 25c4b41b6cbc8a..2479bbf4be99c0 100644
--- a/src/vs/editor/test/browser/widget/multiDiffEditorWidget.test.ts
+++ b/src/vs/editor/test/browser/widget/multiDiffEditorWidget.test.ts
@@ -115,6 +115,78 @@ suite('MultiDiffEditorWidget', () => {
 		}
 	});
 
+	test('uses the taller side while binding a deleted file', async () => {
+		const services = new ServiceCollection();
+		services.set(IAccessibilitySignalService, new class extends mock<IAccessibilitySignalService>() { }());
+		services.set(IActionViewItemService, new NullActionViewItemService());
+		services.set(IEditorProgressService, new class extends mock<IEditorProgressService>() { }());
+		services.set(IDiffProviderFactoryService, new TestDiffProviderFactoryService());
+		services.set(IStorageService, disposables.add(new InMemoryStorageService()));
+		services.set(IMenuService, new class extends mock<IMenuService>() {
+			override createMenu(): IMenu {
+				return new class extends mock<IMenu>() {
+					override readonly onDidChange = Event.None;
+					override getActions() { return []; }
+					override dispose(): void { }
+				}();
+			}
+		}());
+		const instantiationService = createCodeEditorServices(disposables, services);
+
+		const originalUri = URI.parse('inmemory://original/deleted.js');
+		const originalContent = Array.from({ length: 64 }, (_, index) => `line ${index}`).join('\n');
+		const original = disposables.add(instantiateTextModel(instantiationService, originalContent, undefined, undefined, originalUri));
+		const documentItem = RefCounted.createOfNonDisposable<IDocumentDiffItem>({
+			original,
+			modified: undefined,
+			options: { accessibilitySupport: 'off' },
+		}, { dispose() { } });
+		const model: IMultiDiffEditorModel = {
+			documents: ValueWithChangeEvent.const([documentItem]),
+		};
+
+		const container = document.createElement('div');
+		const widget = instantiationService.createInstance(
+			MultiDiffEditorWidget,
+			container,
+			{} satisfies IWorkbenchUIElementFactory,
+			undefined,
+		);
+		widget.layout(new Dimension(800, 600));
+		const viewModel = widget.createViewModel(model);
+		await waitForState(viewModel.items, items => items.length === 1);
+		await waitForState(viewModel.items.get()[0].diffEditorViewModel.isDiffUpToDate, value => value);
+
+		const observedHeights: number[] = [];
+		const observer = autorun(reader => {
+			const item = widget.getLayoutDebugState().read(reader).items[0];
+			if (item?.hasTemplate) {
+				observedHeights.push(item.verticalState.contentHeight);
+			}
+		});
+		try {
+			widget.setViewModel(viewModel);
+			widget.reveal({ original: originalUri, modified: undefined }, { highlight: false });
+			await waitForState(widget.getLayoutDebugState(), state => state.items[0]?.hasTemplate);
+			const item = widget.getLayoutDebugState().get().items[0];
+			const expectedHeight = widget.getActiveControl()!.getOriginalEditor().getContentHeight() + 40;
+
+			assert.deepStrictEqual({
+				minimumObservedHeight: Math.min(...observedHeights),
+				finalHeight: item.verticalState.contentHeight,
+			}, {
+				minimumObservedHeight: expectedHeight,
+				finalHeight: expectedHeight,
+			});
+		} finally {
+			observer.dispose();
+			widget.setViewModel(undefined);
+			viewModel.dispose();
+			widget.dispose();
+			documentItem.dispose();
+		}
+	});
+
 	test('preserves expanded height when a collapsed template is recycled', async () => {
 		const services = new ServiceCollection();
 		services.set(IAccessibilitySignalService, new class extends mock<IAccessibilitySignalService>() { }());
diff --git a/src/vs/editor/test/browser/widget/virtualizedItemManager.test.ts b/src/vs/editor/test/browser/widget/virtualizedItemManager.test.ts
index 9db5ce1d15979a..0955d2f5e108e1 100644
--- a/src/vs/editor/test/browser/widget/virtualizedItemManager.test.ts
+++ b/src/vs/editor/test/browser/widget/virtualizedItemManager.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
+import { errorHandler, setUnexpectedErrorHandler } from '../../../../base/common/errors.js';
 import { constObservable, IObservable, observableValue } from '../../../../base/common/observable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
@@ -80,6 +81,44 @@ suite('VirtualizedItemManager', () => {
 
 		assert.deepStrictEqual(createdTemplateIds, ['text', 'image']);
 	});
+
+	test('isolates a failed binding without changing cached layout state', () => {
+		const itemA = new TestItem('a', 100);
+		const itemB = new TestItem('b', 200);
+		const bindingAttempts: string[] = [];
+		const errors: string[] = [];
+		const manager = disposables.add(new VirtualizedItemManager<TestItem, TestBinding, TestTemplate>(constObservable([itemA, itemB]), createContext(), {
+			getId: item => item.id,
+			getTemplateId: () => 'test',
+			getUnboundSize: item => item.size,
+			createTemplate: () => new TestTemplate(bindingAttempts, 'a'),
+		}));
+		const originalErrorHandler = errorHandler.getUnexpectedErrorHandler();
+		setUnexpectedErrorHandler(error => errors.push(error.message));
+		try {
+			const [virtualA, virtualB] = manager.virtualizedItems.get();
+			const range = new OffsetRange(0, 100);
+			virtualA.render(range, 0, 800, range);
+			virtualA.render(range, 0, 800, range);
+			virtualB.render(range, 0, 800, range);
+
+			assert.deepStrictEqual({
+				bindingAttempts,
+				errors,
+				virtualABinding: virtualA.binding.get(),
+				virtualASize: virtualA.size.get(),
+				virtualBBindingItem: virtualB.binding.get()?.item.id,
+			}, {
+				bindingAttempts: ['a', 'b'],
+				errors: ['Failed to bind a'],
+				virtualABinding: undefined,
+				virtualASize: 100,
+				virtualBBindingItem: 'b',
+			});
+		} finally {
+			setUnexpectedErrorHandler(originalErrorHandler);
+		}
+	});
 });
 
 class TestItem {
@@ -122,7 +161,18 @@ class TestBinding extends VirtualizedItemBinding<TestItem> {
 }
 
 class TestTemplate extends VirtualizedItemTemplate<TestItem, TestBinding> {
+	constructor(
+		private readonly _bindingAttempts?: string[],
+		private readonly _itemToFail?: string,
+	) {
+		super();
+	}
+
 	protected createBinding(item: TestItem, _context: IVirtualizedItemBindingContext): TestBinding {
+		this._bindingAttempts?.push(item.id);
+		if (item.id === this._itemToFail) {
+			throw new Error(`Failed to bind ${item.id}`);
+		}
 		return new TestBinding(item, this);
 	}
 
diff --git a/src/vs/platform/agentHost/browser/agentHostProtocolClient.ts b/src/vs/platform/agentHost/browser/agentHostProtocolClient.ts
index 398c837bc265f3..d79e11e400d225 100644
--- a/src/vs/platform/agentHost/browser/agentHostProtocolClient.ts
+++ b/src/vs/platform/agentHost/browser/agentHostProtocolClient.ts
@@ -18,7 +18,7 @@ import { FileSystemProviderErrorCode, toFileSystemProviderErrorCode } from '../.
 import { ConfigurationTarget, ConfigurationTargetToString, IConfigurationService } from '../../configuration/common/configuration.js';
 import { AgentSession, IAgentCreateChatRequestOptions, IAgentCreateSessionConfig, IAgentResolveSessionConfigParams, IAgentSessionConfigCompletionsParams, IAgentSessionMetadata, AuthenticateParams, AuthenticateResult, IMcpNotification } from '../common/agent.js';
 import { AGENT_HOST_DEBUG_LOGS_CHUNK_BYTES, AGENT_HOST_DEBUG_LOGS_MAX_ENTRIES, IAgentConnection, IAgentHostManagedSettingsDiagnostics, IAgentHostNetworkDiagnosticsInfo, IAgentHostNetworkFetchResult, type AgentHostDebugLogsArtifactKind, type IAgentHostDebugLogsArtifact, type IAgentHostDebugLogsChunk } from '../common/agentService.js';
-import { CollectAgentHostDebugLogsExtensionMethod, GetAgentHostSessionStateFileExtensionMethod, ReadAgentHostDebugLogsChunkExtensionMethod, supportsAgentHostChatStateFile, type IAgentHostExtensionCommandMap, type IAgentHostExtensionInitializeResult } from '../common/agentHostExtensionProtocol.js';
+import { ClaimAgentHostDetachedWorktreeExtensionMethod, CollectAgentHostDebugLogsExtensionMethod, CreateAgentHostDetachedWorktreeExtensionMethod, DeleteAgentHostDetachedWorktreeExtensionMethod, GetAgentHostSessionStateFileExtensionMethod, ReadAgentHostDebugLogsChunkExtensionMethod, ReconcileAgentHostDetachedWorktreesExtensionMethod, SetAgentHostDetachedWorktreeArchivedExtensionMethod, supportsAgentHostChatStateFile, type IAgentHostExtensionCommandMap, type IAgentHostExtensionInitializeResult } from '../common/agentHostExtensionProtocol.js';
 import { AMBIENT_AGENT_HOST_AUTHORITY } from '../common/agentHostConnectionsService.js';
 import { createRemoteWatchHandle, type IRemoteWatchHandle } from '../common/agentHostFileSystemProvider.js';
 import { AgentSubscriptionManager, type IActiveSubscriptionInfo, type IAgentSubscription } from '../common/state/agentSubscription.js';
@@ -1139,6 +1139,36 @@ export class AgentHostProtocolClient extends Disposable implements IAgentConnect
 		return promise;
 	}
 
+	async createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }> {
+		const result = await this._sendExtensionRequest(CreateAgentHostDetachedWorktreeExtensionMethod, {
+			session: session.toString(),
+			prompt,
+		});
+		if (!result) {
+			throw new Error('Agent Host does not support detached worktrees.');
+		}
+		return { handle: result.handle, worktree: URI.parse(result.resource) };
+	}
+
+	async setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void> {
+		await this._sendExtensionRequest(SetAgentHostDetachedWorktreeArchivedExtensionMethod, {
+			handle,
+			archived,
+		});
+	}
+
+	async claimDetachedWorktree(handle: string): Promise<void> {
+		await this._sendExtensionRequest(ClaimAgentHostDetachedWorktreeExtensionMethod, { handle });
+	}
+
+	async deleteDetachedWorktree(handle: string): Promise<void> {
+		await this._sendExtensionRequest(DeleteAgentHostDetachedWorktreeExtensionMethod, { handle });
+	}
+
+	async reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+		await this._sendExtensionRequest(ReconcileAgentHostDetachedWorktreesExtensionMethod, { scope, activeHandles: [...activeHandles] });
+	}
+
 	async resolveSessionConfig(params: IAgentResolveSessionConfigParams): Promise<ResolveSessionConfigResult> {
 		return this._sendRequest('resolveSessionConfig', {
 			channel: ROOT_STATE_URI,
diff --git a/src/vs/platform/agentHost/browser/nullAgentHostService.ts b/src/vs/platform/agentHost/browser/nullAgentHostService.ts
index 49869e700610bd..cd602b445a446e 100644
--- a/src/vs/platform/agentHost/browser/nullAgentHostService.ts
+++ b/src/vs/platform/agentHost/browser/nullAgentHostService.ts
@@ -61,6 +61,11 @@ export class NullAgentHostService implements IAgentHostService {
 	async readDebugLogsChunk(_resource: URI, _position: number): Promise<IAgentHostDebugLogsChunk> { return notSupported(); }
 	async listSessions(): Promise<IAgentSessionMetadata[]> { return []; }
 	async createSession(_config?: IAgentCreateSessionConfig): Promise<URI> { return notSupported(); }
+	async createDetachedWorktree(_session: URI, _prompt: string): Promise<{ handle: string; worktree: URI }> { return notSupported(); }
+	async claimDetachedWorktree(_handle: string): Promise<void> { return notSupported(); }
+	async setDetachedWorktreeArchived(_handle: string, _archived: boolean): Promise<void> { return notSupported(); }
+	async deleteDetachedWorktree(_handle: string): Promise<void> { return notSupported(); }
+	async reconcileDetachedWorktrees(_scope: string, _activeHandles: readonly string[]): Promise<void> { return notSupported(); }
 	async resolveSessionConfig(_params: IAgentResolveSessionConfigParams): Promise<ResolveSessionConfigResult> { return notSupported(); }
 	async sessionConfigCompletions(_params: IAgentSessionConfigCompletionsParams): Promise<SessionConfigCompletionsResult> { return notSupported(); }
 	async completions(_params: CompletionsParams): Promise<CompletionsResult> { return { items: [] }; }
diff --git a/src/vs/platform/agentHost/common/agentHostExtensionProtocol.ts b/src/vs/platform/agentHost/common/agentHostExtensionProtocol.ts
index e9a3263ddcc56a..5279b0c1ac8591 100644
--- a/src/vs/platform/agentHost/common/agentHostExtensionProtocol.ts
+++ b/src/vs/platform/agentHost/common/agentHostExtensionProtocol.ts
@@ -9,12 +9,19 @@ import type { InitializeResult } from './state/protocol/common/commands.js';
 
 export const CollectAgentHostDebugLogsExtensionMethod = 'vscode/collectAgentHostDebugLogs';
 export const GetAgentHostSessionStateFileExtensionMethod = 'vscode/getAgentHostSessionStateFile';
+export const CreateAgentHostDetachedWorktreeExtensionMethod = 'vscode/createAgentHostDetachedWorktree';
+export const ClaimAgentHostDetachedWorktreeExtensionMethod = 'vscode/claimAgentHostDetachedWorktree';
+export const DeleteAgentHostDetachedWorktreeExtensionMethod = 'vscode/deleteAgentHostDetachedWorktree';
+export const ReconcileAgentHostDetachedWorktreesExtensionMethod = 'vscode/reconcileAgentHostDetachedWorktrees';
 export const ReadAgentHostDebugLogsChunkExtensionMethod = 'vscode/readAgentHostDebugLogsChunk';
+export const SetAgentHostDetachedWorktreeArchivedExtensionMethod = 'vscode/setAgentHostDetachedWorktreeArchived';
 
 const AgentHostChatStateFileCapabilityMetaKey = 'vscode.getAgentHostSessionStateFile.chat';
+const AgentHostDetachedWorktreeCapabilityMetaKey = 'vscode.detachedWorktrees';
 
 export interface IAgentHostExtensionInitializeResultMeta extends Record<string, unknown> {
 	readonly [AgentHostChatStateFileCapabilityMetaKey]?: true;
+	readonly [AgentHostDetachedWorktreeCapabilityMetaKey]?: true;
 }
 
 export interface IAgentHostExtensionInitializeResult extends InitializeResult {
@@ -22,7 +29,10 @@ export interface IAgentHostExtensionInitializeResult extends InitializeResult {
 }
 
 export function getAgentHostExtensionInitializeResultMeta(): IAgentHostExtensionInitializeResultMeta {
-	return { [AgentHostChatStateFileCapabilityMetaKey]: true };
+	return {
+		[AgentHostChatStateFileCapabilityMetaKey]: true,
+		[AgentHostDetachedWorktreeCapabilityMetaKey]: true,
+	};
 }
 
 export function supportsAgentHostChatStateFile(result: IAgentHostExtensionInitializeResult | undefined): boolean {
@@ -30,6 +40,11 @@ export function supportsAgentHostChatStateFile(result: IAgentHostExtensionInitia
 	return meta?.[AgentHostChatStateFileCapabilityMetaKey] === true;
 }
 
+export function supportsAgentHostDetachedWorktrees(result: IAgentHostExtensionInitializeResult | undefined): boolean {
+	const meta = result?._meta;
+	return meta?.[AgentHostDetachedWorktreeCapabilityMetaKey] === true;
+}
+
 export const collectAgentHostDebugLogsParamsValidator = vObj({
 	session: vOptionalProp(vString()),
 	chat: vOptionalProp(vString()),
@@ -47,6 +62,26 @@ export interface IAgentHostExtensionCommandMap {
 		params: { session: string; chat?: string };
 		result: { resource?: string };
 	};
+	[CreateAgentHostDetachedWorktreeExtensionMethod]: {
+		params: { session: string; prompt: string };
+		result: { handle: string; resource: string };
+	};
+	[ClaimAgentHostDetachedWorktreeExtensionMethod]: {
+		params: { handle: string };
+		result: void;
+	};
+	[SetAgentHostDetachedWorktreeArchivedExtensionMethod]: {
+		params: { handle: string; archived: boolean };
+		result: void;
+	};
+	[DeleteAgentHostDetachedWorktreeExtensionMethod]: {
+		params: { handle: string };
+		result: void;
+	};
+	[ReconcileAgentHostDetachedWorktreesExtensionMethod]: {
+		params: { scope: string; activeHandles: string[] };
+		result: void;
+	};
 	[CollectAgentHostDebugLogsExtensionMethod]: {
 		params: CollectAgentHostDebugLogsParams;
 		result: { kind: AgentHostDebugLogsArtifactKind; resource: string; providerLogsIncluded: boolean; size: number; uncompressedSize: number; entries: readonly { path: string; size: number }[] };
diff --git a/src/vs/platform/agentHost/common/agentService.ts b/src/vs/platform/agentHost/common/agentService.ts
index faaffbd8d81b5a..1a612f35d36bcc 100644
--- a/src/vs/platform/agentHost/common/agentService.ts
+++ b/src/vs/platform/agentHost/common/agentService.ts
@@ -775,6 +775,11 @@ export interface IAgentHostManagementService {
 	 * `createChat` (`title` and `model`).
 	 */
 	createChatWithExtensions(session: URI, chat: URI, options: IAgentCreateChatRequestOptions): Promise<void>;
+	createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }>;
+	setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void>;
+	claimDetachedWorktree(handle: string): Promise<void>;
+	deleteDetachedWorktree(handle: string): Promise<void>;
+	reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void>;
 	shutdown(): Promise<void>;
 	getNetworkDiagnosticsInfo(): Promise<IAgentHostNetworkDiagnosticsInfo>;
 	getManagedSettingsDiagnostics(): Promise<readonly IAgentHostManagedSettingsDiagnostics[]>;
@@ -813,6 +818,11 @@ export interface IAgentService {
 	listSessions(): Promise<IAgentSessionMetadata[]>;
 
 	createSession(config?: IAgentCreateSessionConfig): Promise<URI>;
+	createDetachedWorktree?(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }>;
+	claimDetachedWorktree?(handle: string): Promise<void>;
+	setDetachedWorktreeArchived?(handle: string, archived: boolean): Promise<void>;
+	deleteDetachedWorktree?(handle: string): Promise<void>;
+	reconcileDetachedWorktrees?(scope: string, activeHandles: readonly string[]): Promise<void>;
 
 	/**
 	 * Create an additional chat within an existing session. Spins up the
@@ -1114,6 +1124,11 @@ export interface IAgentConnection {
 	authenticate(params: AuthenticateParams): Promise<AuthenticateResult>;
 	listSessions(): Promise<IAgentSessionMetadata[]>;
 	createSession(config?: IAgentCreateSessionConfig): Promise<URI>;
+	createDetachedWorktree?(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }>;
+	claimDetachedWorktree?(handle: string): Promise<void>;
+	setDetachedWorktreeArchived?(handle: string, archived: boolean): Promise<void>;
+	deleteDetachedWorktree?(handle: string): Promise<void>;
+	reconcileDetachedWorktrees?(scope: string, activeHandles: readonly string[]): Promise<void>;
 	resolveSessionConfig(params: IAgentResolveSessionConfigParams): Promise<ResolveSessionConfigResult>;
 	sessionConfigCompletions(params: IAgentSessionConfigCompletionsParams): Promise<SessionConfigCompletionsResult>;
 	completions(params: CompletionsParams): Promise<CompletionsResult>;
diff --git a/src/vs/platform/agentHost/common/meta/agentDevContainerWorktreeMeta.ts b/src/vs/platform/agentHost/common/meta/agentDevContainerWorktreeMeta.ts
new file mode 100644
index 00000000000000..0e986144b50933
--- /dev/null
+++ b/src/vs/platform/agentHost/common/meta/agentDevContainerWorktreeMeta.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const AH_META_DEV_CONTAINER_WORKTREE_DB_KEY = 'vscode.devContainerWorktree';
+export const DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX = 'devcontainer-worktree-';
+
+export interface IAgentDevContainerWorktreeMetadata {
+	readonly version: 1;
+	readonly handle: string;
+}
+
+export function isAgentDevContainerWorktreeHandle(value: unknown): value is string {
+	return typeof value === 'string' && /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
+}
+
+export function withAgentDevContainerWorktreeMetadata(metadata: Record<string, unknown> | undefined, handle: string): Record<string, unknown> {
+	return {
+		...metadata,
+		[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: { version: 1, handle } satisfies IAgentDevContainerWorktreeMetadata,
+	};
+}
+
+export function readAgentDevContainerWorktreeMetadata(metadata: Record<string, unknown> | undefined): IAgentDevContainerWorktreeMetadata | undefined {
+	const value = metadata?.[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY];
+	if (!value || typeof value !== 'object') {
+		return undefined;
+	}
+	const candidate = value as Partial<IAgentDevContainerWorktreeMetadata>;
+	return candidate.version === 1 && isAgentDevContainerWorktreeHandle(candidate.handle)
+		? { version: 1, handle: candidate.handle }
+		: undefined;
+}
diff --git a/src/vs/platform/agentHost/common/sessionDataService.ts b/src/vs/platform/agentHost/common/sessionDataService.ts
index 6e050039e5660f..73db21fa94ae78 100644
--- a/src/vs/platform/agentHost/common/sessionDataService.ts
+++ b/src/vs/platform/agentHost/common/sessionDataService.ts
@@ -401,6 +401,7 @@ export interface ISessionDataService {
 	 * Equivalent to {@link getSessionDataDir} but without requiring a full URI.
 	 */
 	getSessionDataDirById(sessionId: string): URI;
+	listSessionDataIds?(prefix: string): Promise<readonly string[]>;
 
 	/**
 	 * Opens (or creates) a per-session SQLite database. The database file is
diff --git a/src/vs/platform/agentHost/electron-browser/localAgentHostService.ts b/src/vs/platform/agentHost/electron-browser/localAgentHostService.ts
index 12fcbe87ee0889..6127aa0573c359 100644
--- a/src/vs/platform/agentHost/electron-browser/localAgentHostService.ts
+++ b/src/vs/platform/agentHost/electron-browser/localAgentHostService.ts
@@ -420,6 +420,26 @@ export class LocalAgentHostServiceClient extends Disposable implements IAgentHos
 		return this._requireClient().createSession(config);
 	}
 
+	createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }> {
+		return this._getManagementService().createDetachedWorktree(session, prompt);
+	}
+
+	setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void> {
+		return this._getManagementService().setDetachedWorktreeArchived(handle, archived);
+	}
+
+	claimDetachedWorktree(handle: string): Promise<void> {
+		return this._getManagementService().claimDetachedWorktree(handle);
+	}
+
+	deleteDetachedWorktree(handle: string): Promise<void> {
+		return this._getManagementService().deleteDetachedWorktree(handle);
+	}
+
+	reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+		return this._getManagementService().reconcileDetachedWorktrees(scope, activeHandles);
+	}
+
 	resolveSessionConfig(params: IAgentResolveSessionConfigParams): Promise<ResolveSessionConfigResult> {
 		return this._requireClient().resolveSessionConfig(params);
 	}
diff --git a/src/vs/platform/agentHost/node/agentHostManagementService.ts b/src/vs/platform/agentHost/node/agentHostManagementService.ts
index ed784620408f31..599cfa88a7bc15 100644
--- a/src/vs/platform/agentHost/node/agentHostManagementService.ts
+++ b/src/vs/platform/agentHost/node/agentHostManagementService.ts
@@ -37,6 +37,41 @@ export class AgentHostManagementService implements IAgentHostManagementService {
 		return this._runMutation(() => this._agentService.createChat(session, chat, options));
 	}
 
+	createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }> {
+		if (!this._agentService.createDetachedWorktree) {
+			throw new Error('Agent Host detached worktrees are unavailable');
+		}
+		return this._runMutation(() => this._agentService.createDetachedWorktree!(session, prompt));
+	}
+
+	setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void> {
+		if (!this._agentService.setDetachedWorktreeArchived) {
+			throw new Error('Agent Host detached worktrees are unavailable');
+		}
+		return this._runMutation(() => this._agentService.setDetachedWorktreeArchived!(handle, archived));
+	}
+
+	claimDetachedWorktree(handle: string): Promise<void> {
+		if (!this._agentService.claimDetachedWorktree) {
+			throw new Error('Agent Host detached worktrees are unavailable');
+		}
+		return this._runMutation(() => this._agentService.claimDetachedWorktree!(handle));
+	}
+
+	deleteDetachedWorktree(handle: string): Promise<void> {
+		if (!this._agentService.deleteDetachedWorktree) {
+			throw new Error('Agent Host detached worktrees are unavailable');
+		}
+		return this._runMutation(() => this._agentService.deleteDetachedWorktree!(handle));
+	}
+
+	reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+		if (!this._agentService.reconcileDetachedWorktrees) {
+			throw new Error('Agent Host detached worktrees are unavailable');
+		}
+		return this._runMutation(() => this._agentService.reconcileDetachedWorktrees!(scope, activeHandles));
+	}
+
 	shutdown(): Promise<void> {
 		if (!this._shutdownPromise) {
 			this._shuttingDown = true;
diff --git a/src/vs/platform/agentHost/node/agentService.ts b/src/vs/platform/agentHost/node/agentService.ts
index 99b387f4b5fdc6..e31e50b2c90982 100644
--- a/src/vs/platform/agentHost/node/agentService.ts
+++ b/src/vs/platform/agentHost/node/agentService.ts
@@ -44,6 +44,7 @@ import { readEphemeralSessionMeta, withEphemeralSessionMeta } from '../common/me
 import { IAgentMessageDelegationMeta, toAgentMessageDelegationMeta } from '../common/meta/agentMessageDelegationMeta.js';
 import { toAgentMergeMessageMeta } from '../common/meta/agentMergeMessageMeta.js';
 import { readChatSurfaceMeta, withChatSurfaceMeta } from '../common/meta/agentChatSurfaceMeta.js';
+import { AH_META_DEV_CONTAINER_WORKTREE_DB_KEY, readAgentDevContainerWorktreeMetadata, withAgentDevContainerWorktreeMetadata } from '../common/meta/agentDevContainerWorktreeMeta.js';
 import { AgentConfigurationService, getEffectiveWorkingDirectories } from './agentConfigurationService.js';
 import { IAgentHostTerminalManager } from './agentHostTerminalManager.js';
 import { ISessionDbUriFields, parseSessionDbUri } from '../common/sessionDbUri.js';
@@ -1241,6 +1242,7 @@ export class AgentService extends Disposable implements IAgentService {
 			...(model !== undefined ? { model } : {}),
 			...(config !== undefined ? { config } : {}),
 			...(isolation === 'folder' || isolation === 'worktree' ? { isolation } : {}),
+			...(session.project ? { project: URI.parse(session.project.uri) } : {}),
 		};
 	}
 
@@ -2173,8 +2175,8 @@ export class AgentService extends Disposable implements IAgentService {
 					const sessionStr = s.session.toString();
 					const changesetKeys = this._changesetCoordinator.getListMetadataKeys(sessionStr);
 					const metadataKeys: Record<string, true> = changesetKeys
-						? { customTitle: true, [AH_META_IS_READ_DB_KEY]: true, [AH_META_IS_ARCHIVED_DB_KEY]: true, [AH_META_IS_DONE_DB_KEY]: true, [AH_META_CREATED_BY_SESSION_DB_KEY]: true, [AH_META_WORKSPACELESS_DB_KEY]: true, [AH_META_EHCLI_ADOPTED_DB_KEY]: true, [AH_META_EHCLI_LAST_TURN_DB_KEY]: true, [SESSION_META_MULTI_ROOT_KEY]: true, [SESSION_META_FOLDER_PICKER_KEY]: true, [SESSION_ARTIFACTS_KEY]: true, [CHAT_BACKING_METADATA_KEY]: true, [WORKTREE_META_REPOSITORY_ROOT]: true, ...GIT_DB_METADATA_KEYS, ...changesetKeys }
-						: { customTitle: true, [AH_META_IS_READ_DB_KEY]: true, [AH_META_IS_ARCHIVED_DB_KEY]: true, [AH_META_IS_DONE_DB_KEY]: true, [AH_META_CREATED_BY_SESSION_DB_KEY]: true, [AH_META_WORKSPACELESS_DB_KEY]: true, [AH_META_EHCLI_ADOPTED_DB_KEY]: true, [AH_META_EHCLI_LAST_TURN_DB_KEY]: true, [SESSION_META_MULTI_ROOT_KEY]: true, [SESSION_META_FOLDER_PICKER_KEY]: true, [SESSION_ARTIFACTS_KEY]: true, [CHAT_BACKING_METADATA_KEY]: true, [WORKTREE_META_REPOSITORY_ROOT]: true, ...GIT_DB_METADATA_KEYS };
+						? { customTitle: true, [AH_META_IS_READ_DB_KEY]: true, [AH_META_IS_ARCHIVED_DB_KEY]: true, [AH_META_IS_DONE_DB_KEY]: true, [AH_META_CREATED_BY_SESSION_DB_KEY]: true, [AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: true, [AH_META_WORKSPACELESS_DB_KEY]: true, [AH_META_EHCLI_ADOPTED_DB_KEY]: true, [AH_META_EHCLI_LAST_TURN_DB_KEY]: true, [SESSION_META_MULTI_ROOT_KEY]: true, [SESSION_META_FOLDER_PICKER_KEY]: true, [SESSION_ARTIFACTS_KEY]: true, [CHAT_BACKING_METADATA_KEY]: true, [WORKTREE_META_REPOSITORY_ROOT]: true, ...GIT_DB_METADATA_KEYS, ...changesetKeys }
+						: { customTitle: true, [AH_META_IS_READ_DB_KEY]: true, [AH_META_IS_ARCHIVED_DB_KEY]: true, [AH_META_IS_DONE_DB_KEY]: true, [AH_META_CREATED_BY_SESSION_DB_KEY]: true, [AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: true, [AH_META_WORKSPACELESS_DB_KEY]: true, [AH_META_EHCLI_ADOPTED_DB_KEY]: true, [AH_META_EHCLI_LAST_TURN_DB_KEY]: true, [SESSION_META_MULTI_ROOT_KEY]: true, [SESSION_META_FOLDER_PICKER_KEY]: true, [SESSION_ARTIFACTS_KEY]: true, [CHAT_BACKING_METADATA_KEY]: true, [WORKTREE_META_REPOSITORY_ROOT]: true, ...GIT_DB_METADATA_KEYS };
 					const m = await ref.object.getMetadataObject(metadataKeys);
 					// This session is an internal peer-chat backing (e.g. a
 					// Claude peer chat's SDK session, enumerated by the agent's
@@ -2200,6 +2202,18 @@ export class AgentService extends Disposable implements IAgentService {
 					if (creationReference) {
 						updated = { ...updated, _meta: withSessionCreationReference(updated._meta, creationReference) };
 					}
+					if (m[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]) {
+						try {
+							const metadata = readAgentDevContainerWorktreeMetadata({
+								[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: JSON.parse(m[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]),
+							});
+							if (metadata) {
+								updated = { ...updated, _meta: withAgentDevContainerWorktreeMetadata(updated._meta, metadata.handle) };
+							}
+						} catch (err) {
+							this._logService.warn(`[AgentService][listSessions] Failed to parse Dev Container worktree metadata for ${s.session}`, err);
+						}
+					}
 					if (m[META_GIT_STATE]) {
 						try {
 							const gitState = JSON.parse(m[META_GIT_STATE]) as ISessionGitState;
@@ -2788,11 +2802,17 @@ export class AgentService extends Disposable implements IAgentService {
 		const isIdleProvisional = created.provisional === true && !config?.importConversation;
 		this._logService.trace(`[AgentService] createSession: initialization complete`);
 		const creationReference = readSessionCreationReference(config?._meta);
-		if (creationReference && !isEphemeral) {
+		const devContainerWorktree = readAgentDevContainerWorktreeMetadata(config?._meta);
+		if ((creationReference || devContainerWorktree) && !isEphemeral) {
 			try {
-				await persistSessionMetadataValues(this._sessionDataService, session.toString(), {
-					[AH_META_CREATED_BY_SESSION_DB_KEY]: JSON.stringify(creationReference),
-				});
+				const metadata: Record<string, string> = {};
+				if (creationReference) {
+					metadata[AH_META_CREATED_BY_SESSION_DB_KEY] = JSON.stringify(creationReference);
+				}
+				if (devContainerWorktree) {
+					metadata[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY] = JSON.stringify(devContainerWorktree);
+				}
+				await persistSessionMetadataValues(this._sessionDataService, session.toString(), metadata);
 			} catch (err) {
 				await this._rollbackProviderSession(provider, session);
 				throw err;
@@ -2984,6 +3004,51 @@ export class AgentService extends Disposable implements IAgentService {
 		return session;
 	}
 
+	async createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }> {
+		const sessionChannel = session.toString();
+		const state = this._stateManager.getSessionState(sessionChannel);
+		if (state?.lifecycle !== SessionLifecycle.Creating) {
+			throw new Error(`Cannot create detached worktree for non-creating session: ${sessionChannel}`);
+		}
+
+		const sessionId = AgentSession.id(session);
+		if (!this._worktree.isWorkingDirectoryPending(sessionId)) {
+			throw new Error(`Session is not configured for worktree isolation: ${sessionChannel}`);
+		}
+
+		const workingDirectories = this._configurationService.getEffectiveWorkingDirectories(sessionChannel);
+		const workingDirectory = workingDirectories?.[0] ? URI.parse(workingDirectories[0]) : undefined;
+		if (!workingDirectory) {
+			throw new Error(`Cannot create detached worktree without a working directory: ${sessionChannel}`);
+		}
+
+		return this._worktree.createDetachedWorktree({
+			workingDirectory,
+			config: this._configurationService.getSessionConfigValues(sessionChannel),
+			prompt,
+			githubToken: this._authService.getAuthToken({
+				resource: this._gitHubEndpointService.getCopilotResource().resource,
+				scopes: this._gitHubEndpointService.getCopilotResource().scopes_supported,
+			}),
+		});
+	}
+
+	setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void> {
+		return this._worktree.setDetachedWorktreeArchived(handle, archived);
+	}
+
+	claimDetachedWorktree(handle: string): Promise<void> {
+		return this._worktree.claimDetachedWorktree(handle);
+	}
+
+	deleteDetachedWorktree(handle: string): Promise<void> {
+		return this._worktree.deleteDetachedWorktree(handle);
+	}
+
+	reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+		return this._worktree.reconcileDetachedWorktrees(scope, activeHandles);
+	}
+
 	async createChat(session: URI, chat: URI, options?: IAgentCreateChatRequestOptions): Promise<void> {
 		const sessionKey = session.toString();
 		const provider = this._providerService.getProviderForSession(session);
@@ -3544,6 +3609,8 @@ export class AgentService extends Disposable implements IAgentService {
 		_meta = withSessionExternal(_meta, false);
 		const creationReference = readSessionCreationReference(config?._meta);
 		_meta = creationReference ? withSessionCreationReference(_meta, creationReference) : _meta;
+		const devContainerWorktree = readAgentDevContainerWorktreeMetadata(config?._meta);
+		_meta = devContainerWorktree ? withAgentDevContainerWorktreeMetadata(_meta, devContainerWorktree.handle) : _meta;
 		_meta = !config?.workingDirectories
 			? withSessionWorkspaceless(_meta, true)
 			: _meta;
@@ -5406,6 +5473,7 @@ export class AgentService extends Disposable implements IAgentService {
 							[AH_META_EHCLI_ADOPTED_DB_KEY]: true,
 							[AH_META_EHCLI_LAST_TURN_DB_KEY]: true,
 							[AH_META_CREATED_BY_SESSION_DB_KEY]: true,
+							[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: true,
 							[SESSION_META_MULTI_ROOT_KEY]: true,
 							[SESSION_ARTIFACTS_KEY]: true,
 							[SESSION_META_FOLDER_PICKER_KEY]: true,
@@ -5476,6 +5544,18 @@ export class AgentService extends Disposable implements IAgentService {
 						if (creationReference) {
 							sessionMetadata = withSessionCreationReference(sessionMetadata, creationReference);
 						}
+						if (m[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]) {
+							try {
+								const metadata = readAgentDevContainerWorktreeMetadata({
+									[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: JSON.parse(m[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]),
+								});
+								if (metadata) {
+									sessionMetadata = withAgentDevContainerWorktreeMetadata(sessionMetadata, metadata.handle);
+								}
+							} catch (err) {
+								this._logService.warn(`[AgentService] Failed to parse Dev Container worktree metadata for ${sessionStr}: ${toErrorMessage(err)}`);
+							}
+						}
 						sessionMetadata = withSessionMultiRootMetadata(sessionMetadata, parseSessionMultiRootMetadata(m[SESSION_META_MULTI_ROOT_KEY]));
 						sessionMetadata = withSessionArtifacts(sessionMetadata, this._readPersistedArtifacts(m[SESSION_ARTIFACTS_KEY], sessionStr, '[AgentService]'));
 						sessionMetadata = withSessionFolderPickerDecision(sessionMetadata, parseSessionFolderPickerDecision(m[SESSION_META_FOLDER_PICKER_KEY]));
diff --git a/src/vs/platform/agentHost/node/codex/codexAgent.ts b/src/vs/platform/agentHost/node/codex/codexAgent.ts
index b2b7c61c777fea..57903ac5ea637d 100644
--- a/src/vs/platform/agentHost/node/codex/codexAgent.ts
+++ b/src/vs/platform/agentHost/node/codex/codexAgent.ts
@@ -1971,14 +1971,11 @@ export class CodexAgent extends Disposable implements IAgent {
 			}
 			// Codex talks to every model through the `vscode-proxy` custom model
 			// provider with `wire_api="responses"` (see CodexProxyService), so it
-			// can only drive models that expose Copilot CAPI's OpenAI-shaped
-			// Responses endpoint. Filter the catalog to those advertising
-			// `/responses` in `supported_endpoints` (this drops Anthropic
-			// `/v1/messages` and chat-completions-only models, which codex cannot
-			// use). The chosen id is forwarded straight through; CAPI remains the
-			// authority on what the token may actually use.
+			// can only drive picker-eligible models that expose Copilot CAPI's
+			// OpenAI-shaped Responses endpoint. The chosen id is forwarded straight
+			// through; CAPI remains the authority on what the token may actually use.
 			const models = all
-				.filter(m => m.supported_endpoints?.includes(CODEX_RESPONSES_ENDPOINT))
+				.filter(m => m.model_picker_enabled && m.supported_endpoints?.includes(CODEX_RESPONSES_ENDPOINT))
 				.sort((a, b) => Number(b.is_chat_default) - Number(a.is_chat_default))
 				.map((m): IAgentModelInfo => ({
 					provider: CODEX_AGENT_PROVIDER_ID,
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/AbsolutePathBuf.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/AbsolutePathBuf.ts
index 3e0b9046150a57..69955ac03974e6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/AbsolutePathBuf.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/AbsolutePathBuf.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/AgentMessageInputContent.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/AgentMessageInputContent.ts
index 9dcee3cbb2c821..fb2897a799ac76 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/AgentMessageInputContent.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/AgentMessageInputContent.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/AgentPath.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/AgentPath.ts
index 9893ae835b031f..371a11a3765aac 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/AgentPath.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/AgentPath.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalParams.ts
index fc7b1725e68492..e5bbdfd835823e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalResponse.ts
index 8f66d151617ead..9e1b62b45f4ee1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ApplyPatchApprovalResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/AuthMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/AuthMode.ts
index 3470616da82974..93ed1ab1f494dc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/AuthMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/AuthMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/AutoCompactTokenLimitScope.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/AutoCompactTokenLimitScope.ts
index cb552e9d1dacd1..70998b05a24f4c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/AutoCompactTokenLimitScope.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/AutoCompactTokenLimitScope.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ClientInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ClientInfo.ts
index 2ad303cb4890b4..15cd028f7a1ba8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ClientInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ClientInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ClientNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ClientNotification.ts
index 1a65eeba4005a2..1f8975859189c4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ClientNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ClientNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ClientRequest.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ClientRequest.ts
index a43a2e4cdd963b..ec94bd67929024 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ClientRequest.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ClientRequest.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -18,6 +18,8 @@ import type { RequestId } from "./RequestId.js";
 import type { AppsInstalledParams } from "./v2/AppsInstalledParams.js";
 import type { AppsListParams } from "./v2/AppsListParams.js";
 import type { AppsReadParams } from "./v2/AppsReadParams.js";
+import type { BedrockDiscoverParams } from "./v2/BedrockDiscoverParams.js";
+import type { BedrockSetupParams } from "./v2/BedrockSetupParams.js";
 import type { CancelLoginAccountParams } from "./v2/CancelLoginAccountParams.js";
 import type { CollaborationModeListParams } from "./v2/CollaborationModeListParams.js";
 import type { CommandExecParams } from "./v2/CommandExecParams.js";
@@ -47,6 +49,7 @@ import type { FsUnwatchParams } from "./v2/FsUnwatchParams.js";
 import type { FsWatchParams } from "./v2/FsWatchParams.js";
 import type { FsWriteFileParams } from "./v2/FsWriteFileParams.js";
 import type { GetAccountParams } from "./v2/GetAccountParams.js";
+import type { GetAccountTokenUsageParams } from "./v2/GetAccountTokenUsageParams.js";
 import type { HooksListParams } from "./v2/HooksListParams.js";
 import type { ListMcpServerStatusParams } from "./v2/ListMcpServerStatusParams.js";
 import type { LoginAccountParams } from "./v2/LoginAccountParams.js";
@@ -64,6 +67,7 @@ import type { PluginInstallParams } from "./v2/PluginInstallParams.js";
 import type { PluginInstalledParams } from "./v2/PluginInstalledParams.js";
 import type { PluginListParams } from "./v2/PluginListParams.js";
 import type { PluginReadParams } from "./v2/PluginReadParams.js";
+import type { PluginSearchParams } from "./v2/PluginSearchParams.js";
 import type { PluginShareCheckoutParams } from "./v2/PluginShareCheckoutParams.js";
 import type { PluginShareDeleteParams } from "./v2/PluginShareDeleteParams.js";
 import type { PluginShareListParams } from "./v2/PluginShareListParams.js";
@@ -75,6 +79,13 @@ import type { ProcessKillParams } from "./v2/ProcessKillParams.js";
 import type { ProcessResizePtyParams } from "./v2/ProcessResizePtyParams.js";
 import type { ProcessSpawnParams } from "./v2/ProcessSpawnParams.js";
 import type { ProcessWriteStdinParams } from "./v2/ProcessWriteStdinParams.js";
+import type { ProjectCreateParams } from "./v2/ProjectCreateParams.js";
+import type { ProjectDeleteParams } from "./v2/ProjectDeleteParams.js";
+import type { ProjectImportParams } from "./v2/ProjectImportParams.js";
+import type { ProjectListParams } from "./v2/ProjectListParams.js";
+import type { ProjectMoveParams } from "./v2/ProjectMoveParams.js";
+import type { ProjectReadParams } from "./v2/ProjectReadParams.js";
+import type { ProjectUpdateParams } from "./v2/ProjectUpdateParams.js";
 import type { RemoteControlClientsListParams } from "./v2/RemoteControlClientsListParams.js";
 import type { RemoteControlClientsRevokeParams } from "./v2/RemoteControlClientsRevokeParams.js";
 import type { RemoteControlDisableParams } from "./v2/RemoteControlDisableParams.js";
@@ -83,6 +94,7 @@ import type { RemoteControlPairingStartParams } from "./v2/RemoteControlPairingS
 import type { RemoteControlPairingStatusParams } from "./v2/RemoteControlPairingStatusParams.js";
 import type { ReviewStartParams } from "./v2/ReviewStartParams.js";
 import type { SendAddCreditsNudgeEmailParams } from "./v2/SendAddCreditsNudgeEmailParams.js";
+import type { ServerDiagnosticsParams } from "./v2/ServerDiagnosticsParams.js";
 import type { SkillsConfigWriteParams } from "./v2/SkillsConfigWriteParams.js";
 import type { SkillsExtraRootsSetParams } from "./v2/SkillsExtraRootsSetParams.js";
 import type { SkillsListParams } from "./v2/SkillsListParams.js";
@@ -105,6 +117,12 @@ import type { ThreadListParams } from "./v2/ThreadListParams.js";
 import type { ThreadLoadedListParams } from "./v2/ThreadLoadedListParams.js";
 import type { ThreadMemoryModeSetParams } from "./v2/ThreadMemoryModeSetParams.js";
 import type { ThreadMetadataUpdateParams } from "./v2/ThreadMetadataUpdateParams.js";
+import type { ThreadQueueAddParams } from "./v2/ThreadQueueAddParams.js";
+import type { ThreadQueueDeleteParams } from "./v2/ThreadQueueDeleteParams.js";
+import type { ThreadQueueListParams } from "./v2/ThreadQueueListParams.js";
+import type { ThreadQueueReorderParams } from "./v2/ThreadQueueReorderParams.js";
+import type { ThreadQueueStartParams } from "./v2/ThreadQueueStartParams.js";
+import type { ThreadQueueUpdateParams } from "./v2/ThreadQueueUpdateParams.js";
 import type { ThreadReadParams } from "./v2/ThreadReadParams.js";
 import type { ThreadRealtimeAppendAudioParams } from "./v2/ThreadRealtimeAppendAudioParams.js";
 import type { ThreadRealtimeAppendSpeechParams } from "./v2/ThreadRealtimeAppendSpeechParams.js";
@@ -113,9 +131,15 @@ import type { ThreadRealtimeListVoicesParams } from "./v2/ThreadRealtimeListVoic
 import type { ThreadRealtimeStartParams } from "./v2/ThreadRealtimeStartParams.js";
 import type { ThreadRealtimeStopParams } from "./v2/ThreadRealtimeStopParams.js";
 import type { ThreadResumeParams } from "./v2/ThreadResumeParams.js";
+import type { ThreadRevertParams } from "./v2/ThreadRevertParams.js";
 import type { ThreadRollbackParams } from "./v2/ThreadRollbackParams.js";
 import type { ThreadSearchOccurrencesParams } from "./v2/ThreadSearchOccurrencesParams.js";
 import type { ThreadSearchParams } from "./v2/ThreadSearchParams.js";
+import type { ThreadSectionCreateParams } from "./v2/ThreadSectionCreateParams.js";
+import type { ThreadSectionDeleteParams } from "./v2/ThreadSectionDeleteParams.js";
+import type { ThreadSectionListParams } from "./v2/ThreadSectionListParams.js";
+import type { ThreadSectionMoveParams } from "./v2/ThreadSectionMoveParams.js";
+import type { ThreadSectionUpdateParams } from "./v2/ThreadSectionUpdateParams.js";
 import type { ThreadSetNameParams } from "./v2/ThreadSetNameParams.js";
 import type { ThreadSettingsUpdateParams } from "./v2/ThreadSettingsUpdateParams.js";
 import type { ThreadShellCommandParams } from "./v2/ThreadShellCommandParams.js";
@@ -131,4 +155,4 @@ import type { WindowsSandboxSetupStartParams } from "./v2/WindowsSandboxSetupSta
 /**
  * Request from the client to the server.
  */
-export type ClientRequest = { "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/delete", id: RequestId, params: ThreadDeleteParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/increment_elicitation", id: RequestId, params: ThreadIncrementElicitationParams, } | { "method": "thread/decrement_elicitation", id: RequestId, params: ThreadDecrementElicitationParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/goal/set", id: RequestId, params: ThreadGoalSetParams, } | { "method": "thread/goal/get", id: RequestId, params: ThreadGoalGetParams, } | { "method": "thread/goal/clear", id: RequestId, params: ThreadGoalClearParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/settings/update", id: RequestId, params: ThreadSettingsUpdateParams, } | { "method": "thread/memoryMode/set", id: RequestId, params: ThreadMemoryModeSetParams, } | { "method": "memory/reset", id: RequestId, params: undefined, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/shellCommand", id: RequestId, params: ThreadShellCommandParams, } | { "method": "thread/approveGuardianDeniedAction", id: RequestId, params: ThreadApproveGuardianDeniedActionParams, } | { "method": "thread/backgroundTerminals/clean", id: RequestId, params: ThreadBackgroundTerminalsCleanParams, } | { "method": "thread/backgroundTerminals/list", id: RequestId, params: ThreadBackgroundTerminalsListParams, } | { "method": "thread/backgroundTerminals/terminate", id: RequestId, params: ThreadBackgroundTerminalsTerminateParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/search", id: RequestId, params: ThreadSearchParams, } | { "method": "thread/searchOccurrences", id: RequestId, params: ThreadSearchOccurrencesParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "thread/turns/list", id: RequestId, params: ThreadTurnsListParams, } | { "method": "thread/items/list", id: RequestId, params: ThreadItemsListParams, } | { "method": "thread/inject_items", id: RequestId, params: ThreadInjectItemsParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "skills/extraRoots/set", id: RequestId, params: SkillsExtraRootsSetParams, } | { "method": "hooks/list", id: RequestId, params: HooksListParams, } | { "method": "marketplace/add", id: RequestId, params: MarketplaceAddParams, } | { "method": "marketplace/remove", id: RequestId, params: MarketplaceRemoveParams, } | { "method": "marketplace/upgrade", id: RequestId, params: MarketplaceUpgradeParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "plugin/installed", id: RequestId, params: PluginInstalledParams, } | { "method": "plugin/read", id: RequestId, params: PluginReadParams, } | { "method": "plugin/skill/read", id: RequestId, params: PluginSkillReadParams, } | { "method": "plugin/share/save", id: RequestId, params: PluginShareSaveParams, } | { "method": "plugin/share/updateTargets", id: RequestId, params: PluginShareUpdateTargetsParams, } | { "method": "plugin/share/list", id: RequestId, params: PluginShareListParams, } | { "method": "plugin/share/checkout", id: RequestId, params: PluginShareCheckoutParams, } | { "method": "plugin/share/delete", id: RequestId, params: PluginShareDeleteParams, } | { "method": "app/read", id: RequestId, params: AppsReadParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "app/installed", id: RequestId, params: AppsInstalledParams, } | { "method": "fs/readFile", id: RequestId, params: FsReadFileParams, } | { "method": "fs/writeFile", id: RequestId, params: FsWriteFileParams, } | { "method": "fs/createDirectory", id: RequestId, params: FsCreateDirectoryParams, } | { "method": "fs/getMetadata", id: RequestId, params: FsGetMetadataParams, } | { "method": "fs/readDirectory", id: RequestId, params: FsReadDirectoryParams, } | { "method": "fs/remove", id: RequestId, params: FsRemoveParams, } | { "method": "fs/copy", id: RequestId, params: FsCopyParams, } | { "method": "fs/watch", id: RequestId, params: FsWatchParams, } | { "method": "fs/unwatch", id: RequestId, params: FsUnwatchParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "thread/realtime/start", id: RequestId, params: ThreadRealtimeStartParams, } | { "method": "thread/realtime/appendAudio", id: RequestId, params: ThreadRealtimeAppendAudioParams, } | { "method": "thread/realtime/appendText", id: RequestId, params: ThreadRealtimeAppendTextParams, } | { "method": "thread/realtime/appendSpeech", id: RequestId, params: ThreadRealtimeAppendSpeechParams, } | { "method": "thread/realtime/stop", id: RequestId, params: ThreadRealtimeStopParams, } | { "method": "thread/realtime/listVoices", id: RequestId, params: ThreadRealtimeListVoicesParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "modelProvider/capabilities/read", id: RequestId, params: ModelProviderCapabilitiesReadParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "permissionProfile/list", id: RequestId, params: PermissionProfileListParams, } | { "method": "experimentalFeature/enablement/set", id: RequestId, params: ExperimentalFeatureEnablementSetParams, } | { "method": "remoteControl/enable", id: RequestId, params: RemoteControlEnableParams | null, } | { "method": "remoteControl/disable", id: RequestId, params: RemoteControlDisableParams | null, } | { "method": "remoteControl/status/read", id: RequestId, params: undefined, } | { "method": "remoteControl/pairing/start", id: RequestId, params: RemoteControlPairingStartParams, } | { "method": "remoteControl/pairing/status", id: RequestId, params: RemoteControlPairingStatusParams, } | { "method": "remoteControl/client/list", id: RequestId, params: RemoteControlClientsListParams, } | { "method": "remoteControl/client/revoke", id: RequestId, params: RemoteControlClientsRevokeParams, } | { "method": "collaborationMode/list", id: RequestId, params: CollaborationModeListParams, } | { "method": "mock/experimentalMethod", id: RequestId, params: MockExperimentalMethodParams, } | { "method": "environment/add", id: RequestId, params: EnvironmentAddParams, } | { "method": "environment/info", id: RequestId, params: EnvironmentInfoParams, } | { "method": "environment/status", id: RequestId, params: EnvironmentStatusParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "mcpServer/resource/read", id: RequestId, params: McpResourceReadParams, } | { "method": "mcpServer/tool/call", id: RequestId, params: McpServerToolCallParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "windowsSandbox/readiness", id: RequestId, params: undefined, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "account/rateLimitResetCredit/consume", id: RequestId, params: ConsumeAccountRateLimitResetCreditParams, } | { "method": "account/usage/read", id: RequestId, params: undefined, } | { "method": "account/workspaceMessages/read", id: RequestId, params: undefined, } | { "method": "account/sendAddCreditsNudgeEmail", id: RequestId, params: SendAddCreditsNudgeEmailParams, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "process/spawn", id: RequestId, params: ProcessSpawnParams, } | { "method": "process/writeStdin", id: RequestId, params: ProcessWriteStdinParams, } | { "method": "process/kill", id: RequestId, params: ProcessKillParams, } | { "method": "process/resizePty", id: RequestId, params: ProcessResizePtyParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "externalAgentConfig/import/recordHistory", id: RequestId, params: ExternalAgentConfigImportHistoryRecordParams, } | { "method": "externalAgentConfig/import/readHistories", id: RequestId, params: undefined, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, } | { "method": "fuzzyFileSearch/sessionStart", id: RequestId, params: FuzzyFileSearchSessionStartParams, } | { "method": "fuzzyFileSearch/sessionUpdate", id: RequestId, params: FuzzyFileSearchSessionUpdateParams, } | { "method": "fuzzyFileSearch/sessionStop", id: RequestId, params: FuzzyFileSearchSessionStopParams, };
+export type ClientRequest = { "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "server/diagnostics", id: RequestId, params: ServerDiagnosticsParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/delete", id: RequestId, params: ThreadDeleteParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/increment_elicitation", id: RequestId, params: ThreadIncrementElicitationParams, } | { "method": "thread/decrement_elicitation", id: RequestId, params: ThreadDecrementElicitationParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/goal/set", id: RequestId, params: ThreadGoalSetParams, } | { "method": "thread/goal/get", id: RequestId, params: ThreadGoalGetParams, } | { "method": "thread/goal/clear", id: RequestId, params: ThreadGoalClearParams, } | { "method": "thread/queue/add", id: RequestId, params: ThreadQueueAddParams, } | { "method": "thread/queue/list", id: RequestId, params: ThreadQueueListParams, } | { "method": "thread/queue/update", id: RequestId, params: ThreadQueueUpdateParams, } | { "method": "thread/queue/delete", id: RequestId, params: ThreadQueueDeleteParams, } | { "method": "thread/queue/reorder", id: RequestId, params: ThreadQueueReorderParams, } | { "method": "thread/queue/start", id: RequestId, params: ThreadQueueStartParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/section/move", id: RequestId, params: ThreadSectionMoveParams, } | { "method": "thread/settings/update", id: RequestId, params: ThreadSettingsUpdateParams, } | { "method": "thread/memoryMode/set", id: RequestId, params: ThreadMemoryModeSetParams, } | { "method": "memory/reset", id: RequestId, params: undefined, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/shellCommand", id: RequestId, params: ThreadShellCommandParams, } | { "method": "thread/approveGuardianDeniedAction", id: RequestId, params: ThreadApproveGuardianDeniedActionParams, } | { "method": "thread/backgroundTerminals/clean", id: RequestId, params: ThreadBackgroundTerminalsCleanParams, } | { "method": "thread/backgroundTerminals/list", id: RequestId, params: ThreadBackgroundTerminalsListParams, } | { "method": "thread/backgroundTerminals/terminate", id: RequestId, params: ThreadBackgroundTerminalsTerminateParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/revert", id: RequestId, params: ThreadRevertParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "project/list", id: RequestId, params: ProjectListParams, } | { "method": "project/read", id: RequestId, params: ProjectReadParams, } | { "method": "project/create", id: RequestId, params: ProjectCreateParams, } | { "method": "project/import", id: RequestId, params: ProjectImportParams, } | { "method": "project/update", id: RequestId, params: ProjectUpdateParams, } | { "method": "project/move", id: RequestId, params: ProjectMoveParams, } | { "method": "project/delete", id: RequestId, params: ProjectDeleteParams, } | { "method": "threadSection/list", id: RequestId, params: ThreadSectionListParams, } | { "method": "threadSection/create", id: RequestId, params: ThreadSectionCreateParams, } | { "method": "threadSection/update", id: RequestId, params: ThreadSectionUpdateParams, } | { "method": "threadSection/delete", id: RequestId, params: ThreadSectionDeleteParams, } | { "method": "thread/search", id: RequestId, params: ThreadSearchParams, } | { "method": "thread/searchOccurrences", id: RequestId, params: ThreadSearchOccurrencesParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "thread/turns/list", id: RequestId, params: ThreadTurnsListParams, } | { "method": "thread/items/list", id: RequestId, params: ThreadItemsListParams, } | { "method": "thread/inject_items", id: RequestId, params: ThreadInjectItemsParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "skills/extraRoots/set", id: RequestId, params: SkillsExtraRootsSetParams, } | { "method": "hooks/list", id: RequestId, params: HooksListParams, } | { "method": "marketplace/add", id: RequestId, params: MarketplaceAddParams, } | { "method": "marketplace/remove", id: RequestId, params: MarketplaceRemoveParams, } | { "method": "marketplace/upgrade", id: RequestId, params: MarketplaceUpgradeParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "plugin/search", id: RequestId, params: PluginSearchParams, } | { "method": "plugin/installed", id: RequestId, params: PluginInstalledParams, } | { "method": "plugin/read", id: RequestId, params: PluginReadParams, } | { "method": "plugin/skill/read", id: RequestId, params: PluginSkillReadParams, } | { "method": "plugin/share/save", id: RequestId, params: PluginShareSaveParams, } | { "method": "plugin/share/updateTargets", id: RequestId, params: PluginShareUpdateTargetsParams, } | { "method": "plugin/share/list", id: RequestId, params: PluginShareListParams, } | { "method": "plugin/share/checkout", id: RequestId, params: PluginShareCheckoutParams, } | { "method": "plugin/share/delete", id: RequestId, params: PluginShareDeleteParams, } | { "method": "app/read", id: RequestId, params: AppsReadParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "app/installed", id: RequestId, params: AppsInstalledParams, } | { "method": "fs/readFile", id: RequestId, params: FsReadFileParams, } | { "method": "fs/writeFile", id: RequestId, params: FsWriteFileParams, } | { "method": "fs/createDirectory", id: RequestId, params: FsCreateDirectoryParams, } | { "method": "fs/getMetadata", id: RequestId, params: FsGetMetadataParams, } | { "method": "fs/readDirectory", id: RequestId, params: FsReadDirectoryParams, } | { "method": "fs/remove", id: RequestId, params: FsRemoveParams, } | { "method": "fs/copy", id: RequestId, params: FsCopyParams, } | { "method": "fs/watch", id: RequestId, params: FsWatchParams, } | { "method": "fs/unwatch", id: RequestId, params: FsUnwatchParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "thread/realtime/start", id: RequestId, params: ThreadRealtimeStartParams, } | { "method": "thread/realtime/appendAudio", id: RequestId, params: ThreadRealtimeAppendAudioParams, } | { "method": "thread/realtime/appendText", id: RequestId, params: ThreadRealtimeAppendTextParams, } | { "method": "thread/realtime/appendSpeech", id: RequestId, params: ThreadRealtimeAppendSpeechParams, } | { "method": "thread/realtime/stop", id: RequestId, params: ThreadRealtimeStopParams, } | { "method": "thread/realtime/listVoices", id: RequestId, params: ThreadRealtimeListVoicesParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "modelProvider/capabilities/read", id: RequestId, params: ModelProviderCapabilitiesReadParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "permissionProfile/list", id: RequestId, params: PermissionProfileListParams, } | { "method": "experimentalFeature/enablement/set", id: RequestId, params: ExperimentalFeatureEnablementSetParams, } | { "method": "remoteControl/enable", id: RequestId, params: RemoteControlEnableParams | null, } | { "method": "remoteControl/disable", id: RequestId, params: RemoteControlDisableParams | null, } | { "method": "remoteControl/status/read", id: RequestId, params: undefined, } | { "method": "remoteControl/pairing/start", id: RequestId, params: RemoteControlPairingStartParams, } | { "method": "remoteControl/pairing/status", id: RequestId, params: RemoteControlPairingStatusParams, } | { "method": "remoteControl/client/list", id: RequestId, params: RemoteControlClientsListParams, } | { "method": "remoteControl/client/revoke", id: RequestId, params: RemoteControlClientsRevokeParams, } | { "method": "collaborationMode/list", id: RequestId, params: CollaborationModeListParams, } | { "method": "mock/experimentalMethod", id: RequestId, params: MockExperimentalMethodParams, } | { "method": "environment/add", id: RequestId, params: EnvironmentAddParams, } | { "method": "environment/info", id: RequestId, params: EnvironmentInfoParams, } | { "method": "environment/status", id: RequestId, params: EnvironmentStatusParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "mcpServer/resource/read", id: RequestId, params: McpResourceReadParams, } | { "method": "mcpServer/tool/call", id: RequestId, params: McpServerToolCallParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "windowsSandbox/readiness", id: RequestId, params: undefined, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/bedrock/discover", id: RequestId, params: BedrockDiscoverParams, } | { "method": "account/bedrock/setup", id: RequestId, params: BedrockSetupParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "account/rateLimitResetCredit/consume", id: RequestId, params: ConsumeAccountRateLimitResetCreditParams, } | { "method": "account/usage/read", id: RequestId, params?: GetAccountTokenUsageParams | undefined, } | { "method": "account/workspaceMessages/read", id: RequestId, params: undefined, } | { "method": "account/sendAddCreditsNudgeEmail", id: RequestId, params: SendAddCreditsNudgeEmailParams, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "process/spawn", id: RequestId, params: ProcessSpawnParams, } | { "method": "process/writeStdin", id: RequestId, params: ProcessWriteStdinParams, } | { "method": "process/kill", id: RequestId, params: ProcessKillParams, } | { "method": "process/resizePty", id: RequestId, params: ProcessResizePtyParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "externalAgentConfig/import/recordHistory", id: RequestId, params: ExternalAgentConfigImportHistoryRecordParams, } | { "method": "externalAgentConfig/import/readHistories", id: RequestId, params: undefined, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, } | { "method": "fuzzyFileSearch/sessionStart", id: RequestId, params: FuzzyFileSearchSessionStartParams, } | { "method": "fuzzyFileSearch/sessionUpdate", id: RequestId, params: FuzzyFileSearchSessionUpdateParams, } | { "method": "fuzzyFileSearch/sessionStop", id: RequestId, params: FuzzyFileSearchSessionStopParams, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/CodexResponseHandoffMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/CodexResponseHandoffMode.ts
index 3f59763530708a..daead253c7eea7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/CodexResponseHandoffMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/CodexResponseHandoffMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/CollaborationMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/CollaborationMode.ts
index f36f2d9606d52c..f5b9e2fa6c3d33 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/CollaborationMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/CollaborationMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ContentItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ContentItem.ts
index b0b7140eb6ebbd..6ffd23e3ffe871 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ContentItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ContentItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationGitInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationGitInfo.ts
index c316de5a26aa8b..f12ec47c5865be 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationGitInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationGitInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationSummary.ts
index 58371dedcd4f81..5ddf12b2f02293 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationTextRole.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationTextRole.ts
index ad67d8b62c83ce..a0af4fe81dca94 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationTextRole.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ConversationTextRole.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalParams.ts
index cc80b42272d200..c5d48a1f8993b5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalResponse.ts
index b733fd3a1f57f0..15543160054195 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ExecCommandApprovalResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ExecPolicyAmendment.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ExecPolicyAmendment.ts
index 1c0232734287f3..ee56f381f64b81 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ExecPolicyAmendment.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ExecPolicyAmendment.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FileChange.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FileChange.ts
index 4f637b076d4833..627e5c4ead5999 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FileChange.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FileChange.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ForcedLoginMethod.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ForcedLoginMethod.ts
index 18348d0f340269..b435329f1d7aff 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ForcedLoginMethod.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ForcedLoginMethod.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputBody.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputBody.ts
index cde285ba6c2be3..53c452a5e15687 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputBody.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputBody.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputContentItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputContentItem.ts
index e81189ab7d8ffb..bdec63f236f683 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputContentItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FunctionCallOutputContentItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchMatchType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchMatchType.ts
index 7d60650f8cefc3..2c55f61f149619 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchMatchType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchMatchType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchParams.ts
index 0f9b2185b0e90a..5ed7ad638adb4c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResponse.ts
index 8df6a503696b90..aed34da7132f50 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResult.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResult.ts
index aee17abd47bdc2..23605293d37dd6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResult.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchResult.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionCompletedNotification.ts
index a4b41ee8fa7f1d..896e6ab29b7f35 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartParams.ts
index d9a62b35189eff..540230f859978e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartResponse.ts
index 7571c76b3d57ac..308e9155861b77 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopParams.ts
index f59ea1b806fec5..5a4e8bb5b4cbc8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopResponse.ts
index c99cc500e8c472..be86345bd38f9f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionStopResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateParams.ts
index 01c8b71c658003..6b85828f90e0ff 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateResponse.ts
index 4f935b99b3301c..fafbeaa793ffab 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdateResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdatedNotification.ts
index 53900f690f7628..b161cc71e6abe0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/FuzzyFileSearchSessionUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusParams.ts
index 7e7308e3770469..9e0acd7d190e86 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusResponse.ts
index 6a33e9dba26637..79629bf2e924c3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GetAuthStatusResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryParams.ts
index 787b640fef6302..495ccef38a7ea9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryResponse.ts
index e2a33759628477..d95c3268ad9f71 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GetConversationSummaryResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteParams.ts
index c2578f42c46280..03f43527ae7369 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteResponse.ts
index d1606672885a41..e9c31ced5b5caa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GitDiffToRemoteResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/GitSha.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/GitSha.ts
index 731c3a86e9ea07..3deabd643d66a7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/GitSha.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/GitSha.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ImageDetail.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ImageDetail.ts
index 9e257cf8ee8527..30e3d9052b0a67 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ImageDetail.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ImageDetail.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationFailure.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationFailure.ts
new file mode 100644
index 00000000000000..512e17413c06da
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationFailure.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: ImageGenerationFailure.ts
+
+export type ImageGenerationFailure = { "type": "usageLimitExceeded", limitId: string, resetsAt: number | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationItem.ts
index f3b77ef49dc2ab..1fa3295876602b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ImageGenerationItem.ts
@@ -1,11 +1,12 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: ImageGenerationItem.ts
 
 import type { AbsolutePathBuf } from "./AbsolutePathBuf.js";
+import type { ImageGenerationFailure } from "./ImageGenerationFailure.js";
 
-export type ImageGenerationItem = { id: string, status: string, revisedPrompt: string | null, result: string, savedPath?: AbsolutePathBuf, };
+export type ImageGenerationItem = { id: string, status: string, revisedPrompt: string | null, result: string, transparentBackground?: boolean, failure: ImageGenerationFailure | null, savedPath?: AbsolutePathBuf, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeCapabilities.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeCapabilities.ts
index 2d2e06df434cb9..600f91350fb1e9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeCapabilities.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeCapabilities.ts
@@ -1,11 +1,13 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: InitializeCapabilities.ts
 
+import type { JsonValue } from "./serde_json/JsonValue.js";
+
 /**
  * Client-declared capabilities negotiated during initialize.
  */
@@ -19,7 +21,9 @@ export type InitializeCapabilities = {
 	 */
 	requestAttestation: boolean,
 	/**
-	 * Allow downstream MCP servers to request OpenAI extended form elicitations.
+	 * Legacy opt-in for the `openai/form` MCP extension.
+	 *
+	 * New clients should declare `openai/form` in [`Self::extensions`].
 	 */
 	mcpServerOpenaiFormElicitation?: boolean,
 	/**
@@ -27,4 +31,8 @@ export type InitializeCapabilities = {
 	 * connection (for example `thread/started`).
 	 */
 	optOutNotificationMethods?: Array<string> | null,
+	/**
+	 * MCP extension settings declared by the app-server client.
+	 */
+	extensions?: { [key in string]?: JsonValue } | null,
 };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeParams.ts
index a434624aeee64c..15509e904cf8b7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeResponse.ts
index fde61268815b24..8c3c5a3563611b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/InitializeResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/InputModality.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/InputModality.ts
index 533f2a8944213a..2b0bfdf1a4eaf9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/InputModality.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/InputModality.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/InternalChatMessageMetadataPassthrough.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/InternalChatMessageMetadataPassthrough.ts
index d129406e13b006..ba7d5d475330c4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/InternalChatMessageMetadataPassthrough.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/InternalChatMessageMetadataPassthrough.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/InternalSessionSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/InternalSessionSource.ts
index cc3f2b434bb00d..9edc3fd9256fec 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/InternalSessionSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/InternalSessionSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/LegacyAppPathString.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/LegacyAppPathString.ts
index 96d8ff24a61489..95eeeee703226f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/LegacyAppPathString.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/LegacyAppPathString.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellAction.ts
index d244d0373a7378..2967889ec151fd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellExecAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellExecAction.ts
index 342ffb209ac183..a12bc7d6779e06 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellExecAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellExecAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellStatus.ts
index 2cc4e9fddd17aa..d4ee165bd6f1b4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/LocalShellStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/McpServerInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/McpServerInfo.ts
index 9d2ce10f895877..b57203fe4dab7b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/McpServerInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/McpServerInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/MessagePhase.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/MessagePhase.ts
index 45df3464781580..0a3c239f86c6ce 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/MessagePhase.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/MessagePhase.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ModeKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ModeKind.ts
index d18526322814f0..d80bf338dc008a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ModeKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ModeKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/MultiAgentMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/MultiAgentMode.ts
index ec108616368d6c..168985f9f02678 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/MultiAgentMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/MultiAgentMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyAmendment.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyAmendment.ts
index da6691f0ebd3d8..56adc91b78392f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyAmendment.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyAmendment.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyRuleAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyRuleAction.ts
index 3d0767a9e31406..b2800f8115d573 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyRuleAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/NetworkPolicyRuleAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ParsedCommand.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ParsedCommand.ts
index e56fb01ff75182..9f357454658136 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ParsedCommand.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ParsedCommand.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/PathUri.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/PathUri.ts
index 7e8882b7830d9f..e0b647d19f457c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/PathUri.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/PathUri.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -22,9 +22,10 @@
  *
  * Like [VS Code resources], path operations use `/` URI separators on every
  * host. Lexical path operations preserve a URL authority without interpreting
- * Windows drive or UNC roots from path text. Native path normalization,
- * filesystem aliases, symlinks, case sensitivity, and Unicode normalization
- * are not resolved.
+ * Windows drive or UNC roots from path text. Windows path equality and hashing
+ * ignore ASCII case, while POSIX paths remain case-sensitive. Native path
+ * normalization, filesystem aliases, symlinks, and Unicode normalization are
+ * not resolved.
  *
  * Serde represents a `PathUri` as its canonical URI string. Deserialization
  * accepts only valid `file:` URI strings. These strings round-trip through
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/Personality.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/Personality.ts
index 5d97a1de3aaa83..64486b81f6ab39 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/Personality.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/Personality.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/PlanType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/PlanType.ts
index 94582a3226e9d1..dda4f1e3579e10 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/PlanType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/PlanType.ts
@@ -1,9 +1,9 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: PlanType.ts
 
-export type PlanType = "free" | "go" | "plus" | "pro" | "prolite" | "team" | "self_serve_business_usage_based" | "business" | "ent26" | "enterprise_cbp_usage_based" | "enterprise" | "edu" | "unknown";
+export type PlanType = "free" | "go" | "plus" | "pro" | "prolite" | "team" | "self_serve_business_prolite" | "self_serve_business_usage_based" | "business" | "ent26" | "enterprise_cbp_automation" | "enterprise_cbp_usage_based" | "enterprise" | "edu" | "edu_plus" | "edu_pro" | "unknown";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeConversationVersion.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeConversationVersion.ts
index b1d325fe4135bc..9767909296617d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeConversationVersion.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeConversationVersion.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeOutputModality.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeOutputModality.ts
index c359d7a24c1588..f7b4587ec3031b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeOutputModality.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeOutputModality.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoice.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoice.ts
index 2ff7bd8e4d15dc..1ad590064b3a77 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoice.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoice.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoicesList.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoicesList.ts
index 6bc9c6a8285e26..5c369c0f29d30d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoicesList.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/RealtimeVoicesList.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningEffort.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningEffort.ts
index 0a2424c86f2834..f1fdc559770a4c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningEffort.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningEffort.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemContent.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemContent.ts
index 86c3c632b9a955..1e0313bbcfc6a0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemContent.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemContent.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemReasoningSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemReasoningSummary.ts
index dc8e0220a591b4..6a084c0999b54c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemReasoningSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningItemReasoningSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningSummary.ts
index 38e99680469a6f..f6b71a477e0267 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ReasoningSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/RequestId.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/RequestId.ts
index 897291dde74cd5..1d12869fd4e8bd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/RequestId.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/RequestId.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/Resource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/Resource.ts
index 5e7cbf50c581fb..bf8db70143833f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/Resource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/Resource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceContent.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceContent.ts
index 4f6da54c34ee31..806f2b08d0b529 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceContent.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceContent.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceTemplate.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceTemplate.ts
index 8e3f7b61f15beb..3941925641872e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceTemplate.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ResourceTemplate.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItem.ts
index aa8798bbbb7abd..6544281f11fbb2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -28,4 +28,4 @@ export type ResponseItem = { "type": "message", id?: ResponseItemId, role: strin
 	 * Set when using the Responses API.
 	 */
 	call_id: string | null, status: LocalShellStatus, action: LocalShellAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough,
-} | { "type": "function_call", id?: ResponseItemId, name: string, namespace?: string, arguments: string, call_id: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_call", id?: ResponseItemId, call_id: string | null, status?: string, execution: string, arguments: unknown, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "function_call_output", id?: ResponseItemId, call_id: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call", id?: ResponseItemId, status?: string, call_id: string, name: string, namespace?: string, input: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call_output", id?: ResponseItemId, call_id: string, name?: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_output", id?: ResponseItemId, call_id: string | null, status: string, execution: string, tools: unknown[], internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "web_search_call", id?: ResponseItemId, status?: string, action?: WebSearchAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "image_generation_call", id?: ResponseItemId, status: string, revised_prompt?: string, result: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "compaction", id?: ResponseItemId, encrypted_content: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "compaction_trigger", } | { "type": "context_compaction", id?: ResponseItemId, encrypted_content?: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "other" };
+} | { "type": "function_call", id?: ResponseItemId, name: string, namespace?: string, arguments: string, encrypted_function_args?: Array<string>, call_id: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_call", id?: ResponseItemId, call_id: string | null, status?: string, execution: string, arguments: unknown, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "function_call_output", id?: ResponseItemId, call_id: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call", id?: ResponseItemId, status?: string, call_id: string, name: string, namespace?: string, input: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call_output", id?: ResponseItemId, call_id: string, name?: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_output", id?: ResponseItemId, call_id: string | null, status: string, execution: string, tools: unknown[], internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "web_search_call", id?: ResponseItemId, status?: string, action?: WebSearchAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "image_generation_call", id?: ResponseItemId, status: string, revised_prompt?: string, result: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "compaction", id?: ResponseItemId, encrypted_content: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "compaction_trigger", } | { "type": "context_compaction", id?: ResponseItemId, encrypted_content?: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "other" };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItemId.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItemId.ts
index 11a42ce25154f9..f8c98dc13854d8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItemId.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ResponseItemId.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ReviewDecision.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ReviewDecision.ts
index 4fe107a47a770a..53f481b3d0f4e0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ReviewDecision.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ReviewDecision.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -12,4 +12,4 @@ import type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment.js";
 /**
  * User's decision in response to an ExecApprovalRequest.
  */
-export type ReviewDecision = "approved" | { "approved_execpolicy_amendment": { proposed_execpolicy_amendment: ExecPolicyAmendment, } } | "approved_for_session" | { "network_policy_amendment": { network_policy_amendment: NetworkPolicyAmendment, } } | { "denied": { rejection: string, } } | "timed_out" | "abort";
+export type ReviewDecision = "approved" | { "approved_execpolicy_amendment": { proposed_execpolicy_amendment: ExecPolicyAmendment, } } | "approved_for_session" | "approved_mcp_policy_amendment" | { "network_policy_amendment": { network_policy_amendment: NetworkPolicyAmendment, } } | { "denied": { rejection: string, } } | "timed_out" | "abort";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotification.ts
index 55b2d5677ebf21..fd64958df2f72e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -41,6 +41,7 @@ import type { ModelVerificationNotification } from "./v2/ModelVerificationNotifi
 import type { PlanDeltaNotification } from "./v2/PlanDeltaNotification.js";
 import type { ProcessExitedNotification } from "./v2/ProcessExitedNotification.js";
 import type { ProcessOutputDeltaNotification } from "./v2/ProcessOutputDeltaNotification.js";
+import type { ProjectChangedNotification } from "./v2/ProjectChangedNotification.js";
 import type { RawResponseCompletedNotification } from "./v2/RawResponseCompletedNotification.js";
 import type { RawResponseItemCompletedNotification } from "./v2/RawResponseItemCompletedNotification.js";
 import type { ReasoningSummaryPartAddedNotification } from "./v2/ReasoningSummaryPartAddedNotification.js";
@@ -49,6 +50,7 @@ import type { ReasoningTextDeltaNotification } from "./v2/ReasoningTextDeltaNoti
 import type { RemoteControlStatusChangedNotification } from "./v2/RemoteControlStatusChangedNotification.js";
 import type { ServerRequestResolvedNotification } from "./v2/ServerRequestResolvedNotification.js";
 import type { SkillsChangedNotification } from "./v2/SkillsChangedNotification.js";
+import type { StrictReviewRequiredNotification } from "./v2/StrictReviewRequiredNotification.js";
 import type { TerminalInteractionNotification } from "./v2/TerminalInteractionNotification.js";
 import type { ThreadArchivedNotification } from "./v2/ThreadArchivedNotification.js";
 import type { ThreadClosedNotification } from "./v2/ThreadClosedNotification.js";
@@ -56,6 +58,8 @@ import type { ThreadDeletedNotification } from "./v2/ThreadDeletedNotification.j
 import type { ThreadGoalClearedNotification } from "./v2/ThreadGoalClearedNotification.js";
 import type { ThreadGoalUpdatedNotification } from "./v2/ThreadGoalUpdatedNotification.js";
 import type { ThreadNameUpdatedNotification } from "./v2/ThreadNameUpdatedNotification.js";
+import type { ThreadProjectUpdatedNotification } from "./v2/ThreadProjectUpdatedNotification.js";
+import type { ThreadQueueChangedNotification } from "./v2/ThreadQueueChangedNotification.js";
 import type { ThreadRealtimeClosedNotification } from "./v2/ThreadRealtimeClosedNotification.js";
 import type { ThreadRealtimeErrorNotification } from "./v2/ThreadRealtimeErrorNotification.js";
 import type { ThreadRealtimeItemAddedNotification } from "./v2/ThreadRealtimeItemAddedNotification.js";
@@ -64,6 +68,7 @@ import type { ThreadRealtimeSdpNotification } from "./v2/ThreadRealtimeSdpNotifi
 import type { ThreadRealtimeStartedNotification } from "./v2/ThreadRealtimeStartedNotification.js";
 import type { ThreadRealtimeTranscriptDeltaNotification } from "./v2/ThreadRealtimeTranscriptDeltaNotification.js";
 import type { ThreadRealtimeTranscriptDoneNotification } from "./v2/ThreadRealtimeTranscriptDoneNotification.js";
+import type { ThreadRevertedNotification } from "./v2/ThreadRevertedNotification.js";
 import type { ThreadSettingsUpdatedNotification } from "./v2/ThreadSettingsUpdatedNotification.js";
 import type { ThreadStartedNotification } from "./v2/ThreadStartedNotification.js";
 import type { ThreadStatusChangedNotification } from "./v2/ThreadStatusChangedNotification.js";
@@ -81,4 +86,4 @@ import type { WindowsWorldWritableWarningNotification } from "./v2/WindowsWorldW
 /**
  * Notification sent from the server to the client.
  */
-export type ServerNotification = { "method": "error", "params": ErrorNotification } | { "method": "thread/started", "params": ThreadStartedNotification } | { "method": "thread/status/changed", "params": ThreadStatusChangedNotification } | { "method": "thread/archived", "params": ThreadArchivedNotification } | { "method": "thread/deleted", "params": ThreadDeletedNotification } | { "method": "thread/unarchived", "params": ThreadUnarchivedNotification } | { "method": "thread/closed", "params": ThreadClosedNotification } | { "method": "skills/changed", "params": SkillsChangedNotification } | { "method": "thread/name/updated", "params": ThreadNameUpdatedNotification } | { "method": "thread/goal/updated", "params": ThreadGoalUpdatedNotification } | { "method": "thread/goal/cleared", "params": ThreadGoalClearedNotification } | { "method": "thread/environment/connected", "params": EnvironmentConnectionNotification } | { "method": "thread/environment/disconnected", "params": EnvironmentConnectionNotification } | { "method": "thread/settings/updated", "params": ThreadSettingsUpdatedNotification } | { "method": "thread/tokenUsage/updated", "params": ThreadTokenUsageUpdatedNotification } | { "method": "turn/started", "params": TurnStartedNotification } | { "method": "hook/started", "params": HookStartedNotification } | { "method": "turn/completed", "params": TurnCompletedNotification } | { "method": "hook/completed", "params": HookCompletedNotification } | { "method": "turn/diff/updated", "params": TurnDiffUpdatedNotification } | { "method": "turn/plan/updated", "params": TurnPlanUpdatedNotification } | { "method": "item/started", "params": ItemStartedNotification } | { "method": "item/autoApprovalReview/started", "params": ItemGuardianApprovalReviewStartedNotification } | { "method": "item/autoApprovalReview/completed", "params": ItemGuardianApprovalReviewCompletedNotification } | { "method": "item/completed", "params": ItemCompletedNotification } | { "method": "rawResponseItem/completed", "params": RawResponseItemCompletedNotification } | { "method": "rawResponse/completed", "params": RawResponseCompletedNotification } | { "method": "item/agentMessage/delta", "params": AgentMessageDeltaNotification } | { "method": "item/plan/delta", "params": PlanDeltaNotification } | { "method": "command/exec/outputDelta", "params": CommandExecOutputDeltaNotification } | { "method": "process/outputDelta", "params": ProcessOutputDeltaNotification } | { "method": "process/exited", "params": ProcessExitedNotification } | { "method": "item/commandExecution/outputDelta", "params": CommandExecutionOutputDeltaNotification } | { "method": "item/commandExecution/terminalInteraction", "params": TerminalInteractionNotification } | { "method": "item/fileChange/outputDelta", "params": FileChangeOutputDeltaNotification } | { "method": "item/fileChange/patchUpdated", "params": FileChangePatchUpdatedNotification } | { "method": "serverRequest/resolved", "params": ServerRequestResolvedNotification } | { "method": "item/mcpToolCall/progress", "params": McpToolCallProgressNotification } | { "method": "mcpServer/oauthLogin/completed", "params": McpServerOauthLoginCompletedNotification } | { "method": "mcpServer/startupStatus/updated", "params": McpServerStatusUpdatedNotification } | { "method": "account/updated", "params": AccountUpdatedNotification } | { "method": "account/rateLimits/updated", "params": AccountRateLimitsUpdatedNotification } | { "method": "app/list/updated", "params": AppListUpdatedNotification } | { "method": "remoteControl/status/changed", "params": RemoteControlStatusChangedNotification } | { "method": "externalAgentConfig/import/progress", "params": ExternalAgentConfigImportProgressNotification } | { "method": "externalAgentConfig/import/completed", "params": ExternalAgentConfigImportCompletedNotification } | { "method": "fs/changed", "params": FsChangedNotification } | { "method": "item/reasoning/summaryTextDelta", "params": ReasoningSummaryTextDeltaNotification } | { "method": "item/reasoning/summaryPartAdded", "params": ReasoningSummaryPartAddedNotification } | { "method": "item/reasoning/textDelta", "params": ReasoningTextDeltaNotification } | { "method": "thread/compacted", "params": ContextCompactedNotification } | { "method": "model/rerouted", "params": ModelReroutedNotification } | { "method": "model/verification", "params": ModelVerificationNotification } | { "method": "turn/moderationMetadata", "params": TurnModerationMetadataNotification } | { "method": "model/safetyBuffering/updated", "params": ModelSafetyBufferingUpdatedNotification } | { "method": "warning", "params": WarningNotification } | { "method": "guardianWarning", "params": GuardianWarningNotification } | { "method": "deprecationNotice", "params": DeprecationNoticeNotification } | { "method": "configWarning", "params": ConfigWarningNotification } | { "method": "fuzzyFileSearch/sessionUpdated", "params": FuzzyFileSearchSessionUpdatedNotification } | { "method": "fuzzyFileSearch/sessionCompleted", "params": FuzzyFileSearchSessionCompletedNotification } | { "method": "thread/realtime/started", "params": ThreadRealtimeStartedNotification } | { "method": "thread/realtime/itemAdded", "params": ThreadRealtimeItemAddedNotification } | { "method": "thread/realtime/transcript/delta", "params": ThreadRealtimeTranscriptDeltaNotification } | { "method": "thread/realtime/transcript/done", "params": ThreadRealtimeTranscriptDoneNotification } | { "method": "thread/realtime/outputAudio/delta", "params": ThreadRealtimeOutputAudioDeltaNotification } | { "method": "thread/realtime/sdp", "params": ThreadRealtimeSdpNotification } | { "method": "thread/realtime/error", "params": ThreadRealtimeErrorNotification } | { "method": "thread/realtime/closed", "params": ThreadRealtimeClosedNotification } | { "method": "windows/worldWritableWarning", "params": WindowsWorldWritableWarningNotification } | { "method": "windowsSandbox/setupCompleted", "params": WindowsSandboxSetupCompletedNotification } | { "method": "account/login/completed", "params": AccountLoginCompletedNotification };
+export type ServerNotification = { "method": "error", "params": ErrorNotification } | { "method": "thread/started", "params": ThreadStartedNotification } | { "method": "thread/status/changed", "params": ThreadStatusChangedNotification } | { "method": "thread/archived", "params": ThreadArchivedNotification } | { "method": "thread/deleted", "params": ThreadDeletedNotification } | { "method": "thread/unarchived", "params": ThreadUnarchivedNotification } | { "method": "thread/closed", "params": ThreadClosedNotification } | { "method": "thread/reverted", "params": ThreadRevertedNotification } | { "method": "skills/changed", "params": SkillsChangedNotification } | { "method": "thread/name/updated", "params": ThreadNameUpdatedNotification } | { "method": "thread/goal/updated", "params": ThreadGoalUpdatedNotification } | { "method": "thread/goal/cleared", "params": ThreadGoalClearedNotification } | { "method": "thread/queue/changed", "params": ThreadQueueChangedNotification } | { "method": "project/changed", "params": ProjectChangedNotification } | { "method": "thread/project/updated", "params": ThreadProjectUpdatedNotification } | { "method": "thread/environment/connected", "params": EnvironmentConnectionNotification } | { "method": "thread/environment/disconnected", "params": EnvironmentConnectionNotification } | { "method": "thread/settings/updated", "params": ThreadSettingsUpdatedNotification } | { "method": "thread/tokenUsage/updated", "params": ThreadTokenUsageUpdatedNotification } | { "method": "turn/started", "params": TurnStartedNotification } | { "method": "hook/started", "params": HookStartedNotification } | { "method": "turn/completed", "params": TurnCompletedNotification } | { "method": "hook/completed", "params": HookCompletedNotification } | { "method": "turn/diff/updated", "params": TurnDiffUpdatedNotification } | { "method": "turn/plan/updated", "params": TurnPlanUpdatedNotification } | { "method": "item/started", "params": ItemStartedNotification } | { "method": "item/autoApprovalReview/started", "params": ItemGuardianApprovalReviewStartedNotification } | { "method": "item/autoApprovalReview/completed", "params": ItemGuardianApprovalReviewCompletedNotification } | { "method": "autoApprovalReview/strictReviewRequired", "params": StrictReviewRequiredNotification } | { "method": "item/completed", "params": ItemCompletedNotification } | { "method": "rawResponseItem/completed", "params": RawResponseItemCompletedNotification } | { "method": "rawResponse/completed", "params": RawResponseCompletedNotification } | { "method": "item/agentMessage/delta", "params": AgentMessageDeltaNotification } | { "method": "item/plan/delta", "params": PlanDeltaNotification } | { "method": "command/exec/outputDelta", "params": CommandExecOutputDeltaNotification } | { "method": "process/outputDelta", "params": ProcessOutputDeltaNotification } | { "method": "process/exited", "params": ProcessExitedNotification } | { "method": "item/commandExecution/outputDelta", "params": CommandExecutionOutputDeltaNotification } | { "method": "item/commandExecution/terminalInteraction", "params": TerminalInteractionNotification } | { "method": "item/fileChange/outputDelta", "params": FileChangeOutputDeltaNotification } | { "method": "item/fileChange/patchUpdated", "params": FileChangePatchUpdatedNotification } | { "method": "serverRequest/resolved", "params": ServerRequestResolvedNotification } | { "method": "item/mcpToolCall/progress", "params": McpToolCallProgressNotification } | { "method": "mcpServer/oauthLogin/completed", "params": McpServerOauthLoginCompletedNotification } | { "method": "mcpServer/startupStatus/updated", "params": McpServerStatusUpdatedNotification } | { "method": "account/updated", "params": AccountUpdatedNotification } | { "method": "account/rateLimits/updated", "params": AccountRateLimitsUpdatedNotification } | { "method": "app/list/updated", "params": AppListUpdatedNotification } | { "method": "remoteControl/status/changed", "params": RemoteControlStatusChangedNotification } | { "method": "externalAgentConfig/import/progress", "params": ExternalAgentConfigImportProgressNotification } | { "method": "externalAgentConfig/import/completed", "params": ExternalAgentConfigImportCompletedNotification } | { "method": "fs/changed", "params": FsChangedNotification } | { "method": "item/reasoning/summaryTextDelta", "params": ReasoningSummaryTextDeltaNotification } | { "method": "item/reasoning/summaryPartAdded", "params": ReasoningSummaryPartAddedNotification } | { "method": "item/reasoning/textDelta", "params": ReasoningTextDeltaNotification } | { "method": "thread/compacted", "params": ContextCompactedNotification } | { "method": "model/rerouted", "params": ModelReroutedNotification } | { "method": "model/verification", "params": ModelVerificationNotification } | { "method": "turn/moderationMetadata", "params": TurnModerationMetadataNotification } | { "method": "model/safetyBuffering/updated", "params": ModelSafetyBufferingUpdatedNotification } | { "method": "warning", "params": WarningNotification } | { "method": "guardianWarning", "params": GuardianWarningNotification } | { "method": "deprecationNotice", "params": DeprecationNoticeNotification } | { "method": "configWarning", "params": ConfigWarningNotification } | { "method": "fuzzyFileSearch/sessionUpdated", "params": FuzzyFileSearchSessionUpdatedNotification } | { "method": "fuzzyFileSearch/sessionCompleted", "params": FuzzyFileSearchSessionCompletedNotification } | { "method": "thread/realtime/started", "params": ThreadRealtimeStartedNotification } | { "method": "thread/realtime/itemAdded", "params": ThreadRealtimeItemAddedNotification } | { "method": "thread/realtime/transcript/delta", "params": ThreadRealtimeTranscriptDeltaNotification } | { "method": "thread/realtime/transcript/done", "params": ThreadRealtimeTranscriptDoneNotification } | { "method": "thread/realtime/outputAudio/delta", "params": ThreadRealtimeOutputAudioDeltaNotification } | { "method": "thread/realtime/sdp", "params": ThreadRealtimeSdpNotification } | { "method": "thread/realtime/error", "params": ThreadRealtimeErrorNotification } | { "method": "thread/realtime/closed", "params": ThreadRealtimeClosedNotification } | { "method": "windows/worldWritableWarning", "params": WindowsWorldWritableWarningNotification } | { "method": "windowsSandbox/setupCompleted", "params": WindowsSandboxSetupCompletedNotification } | { "method": "account/login/completed", "params": AccountLoginCompletedNotification };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotificationEnvelope.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotificationEnvelope.ts
index 0e875e1ff87e1c..df7781d23e4d0c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotificationEnvelope.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ServerNotificationEnvelope.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -41,6 +41,7 @@ import type { ModelVerificationNotification } from "./v2/ModelVerificationNotifi
 import type { PlanDeltaNotification } from "./v2/PlanDeltaNotification.js";
 import type { ProcessExitedNotification } from "./v2/ProcessExitedNotification.js";
 import type { ProcessOutputDeltaNotification } from "./v2/ProcessOutputDeltaNotification.js";
+import type { ProjectChangedNotification } from "./v2/ProjectChangedNotification.js";
 import type { RawResponseCompletedNotification } from "./v2/RawResponseCompletedNotification.js";
 import type { RawResponseItemCompletedNotification } from "./v2/RawResponseItemCompletedNotification.js";
 import type { ReasoningSummaryPartAddedNotification } from "./v2/ReasoningSummaryPartAddedNotification.js";
@@ -49,6 +50,7 @@ import type { ReasoningTextDeltaNotification } from "./v2/ReasoningTextDeltaNoti
 import type { RemoteControlStatusChangedNotification } from "./v2/RemoteControlStatusChangedNotification.js";
 import type { ServerRequestResolvedNotification } from "./v2/ServerRequestResolvedNotification.js";
 import type { SkillsChangedNotification } from "./v2/SkillsChangedNotification.js";
+import type { StrictReviewRequiredNotification } from "./v2/StrictReviewRequiredNotification.js";
 import type { TerminalInteractionNotification } from "./v2/TerminalInteractionNotification.js";
 import type { ThreadArchivedNotification } from "./v2/ThreadArchivedNotification.js";
 import type { ThreadClosedNotification } from "./v2/ThreadClosedNotification.js";
@@ -56,6 +58,8 @@ import type { ThreadDeletedNotification } from "./v2/ThreadDeletedNotification.j
 import type { ThreadGoalClearedNotification } from "./v2/ThreadGoalClearedNotification.js";
 import type { ThreadGoalUpdatedNotification } from "./v2/ThreadGoalUpdatedNotification.js";
 import type { ThreadNameUpdatedNotification } from "./v2/ThreadNameUpdatedNotification.js";
+import type { ThreadProjectUpdatedNotification } from "./v2/ThreadProjectUpdatedNotification.js";
+import type { ThreadQueueChangedNotification } from "./v2/ThreadQueueChangedNotification.js";
 import type { ThreadRealtimeClosedNotification } from "./v2/ThreadRealtimeClosedNotification.js";
 import type { ThreadRealtimeErrorNotification } from "./v2/ThreadRealtimeErrorNotification.js";
 import type { ThreadRealtimeItemAddedNotification } from "./v2/ThreadRealtimeItemAddedNotification.js";
@@ -64,6 +68,7 @@ import type { ThreadRealtimeSdpNotification } from "./v2/ThreadRealtimeSdpNotifi
 import type { ThreadRealtimeStartedNotification } from "./v2/ThreadRealtimeStartedNotification.js";
 import type { ThreadRealtimeTranscriptDeltaNotification } from "./v2/ThreadRealtimeTranscriptDeltaNotification.js";
 import type { ThreadRealtimeTranscriptDoneNotification } from "./v2/ThreadRealtimeTranscriptDoneNotification.js";
+import type { ThreadRevertedNotification } from "./v2/ThreadRevertedNotification.js";
 import type { ThreadSettingsUpdatedNotification } from "./v2/ThreadSettingsUpdatedNotification.js";
 import type { ThreadStartedNotification } from "./v2/ThreadStartedNotification.js";
 import type { ThreadStatusChangedNotification } from "./v2/ThreadStatusChangedNotification.js";
@@ -92,4 +97,4 @@ export type ServerNotificationEnvelope = {
 	 * versions. Current app-server versions always populate it.
 	 */
 	emittedAtMs?: number,
-} & ({ "method": "error", "params": ErrorNotification } | { "method": "thread/started", "params": ThreadStartedNotification } | { "method": "thread/status/changed", "params": ThreadStatusChangedNotification } | { "method": "thread/archived", "params": ThreadArchivedNotification } | { "method": "thread/deleted", "params": ThreadDeletedNotification } | { "method": "thread/unarchived", "params": ThreadUnarchivedNotification } | { "method": "thread/closed", "params": ThreadClosedNotification } | { "method": "skills/changed", "params": SkillsChangedNotification } | { "method": "thread/name/updated", "params": ThreadNameUpdatedNotification } | { "method": "thread/goal/updated", "params": ThreadGoalUpdatedNotification } | { "method": "thread/goal/cleared", "params": ThreadGoalClearedNotification } | { "method": "thread/environment/connected", "params": EnvironmentConnectionNotification } | { "method": "thread/environment/disconnected", "params": EnvironmentConnectionNotification } | { "method": "thread/settings/updated", "params": ThreadSettingsUpdatedNotification } | { "method": "thread/tokenUsage/updated", "params": ThreadTokenUsageUpdatedNotification } | { "method": "turn/started", "params": TurnStartedNotification } | { "method": "hook/started", "params": HookStartedNotification } | { "method": "turn/completed", "params": TurnCompletedNotification } | { "method": "hook/completed", "params": HookCompletedNotification } | { "method": "turn/diff/updated", "params": TurnDiffUpdatedNotification } | { "method": "turn/plan/updated", "params": TurnPlanUpdatedNotification } | { "method": "item/started", "params": ItemStartedNotification } | { "method": "item/autoApprovalReview/started", "params": ItemGuardianApprovalReviewStartedNotification } | { "method": "item/autoApprovalReview/completed", "params": ItemGuardianApprovalReviewCompletedNotification } | { "method": "item/completed", "params": ItemCompletedNotification } | { "method": "rawResponseItem/completed", "params": RawResponseItemCompletedNotification } | { "method": "rawResponse/completed", "params": RawResponseCompletedNotification } | { "method": "item/agentMessage/delta", "params": AgentMessageDeltaNotification } | { "method": "item/plan/delta", "params": PlanDeltaNotification } | { "method": "command/exec/outputDelta", "params": CommandExecOutputDeltaNotification } | { "method": "process/outputDelta", "params": ProcessOutputDeltaNotification } | { "method": "process/exited", "params": ProcessExitedNotification } | { "method": "item/commandExecution/outputDelta", "params": CommandExecutionOutputDeltaNotification } | { "method": "item/commandExecution/terminalInteraction", "params": TerminalInteractionNotification } | { "method": "item/fileChange/outputDelta", "params": FileChangeOutputDeltaNotification } | { "method": "item/fileChange/patchUpdated", "params": FileChangePatchUpdatedNotification } | { "method": "serverRequest/resolved", "params": ServerRequestResolvedNotification } | { "method": "item/mcpToolCall/progress", "params": McpToolCallProgressNotification } | { "method": "mcpServer/oauthLogin/completed", "params": McpServerOauthLoginCompletedNotification } | { "method": "mcpServer/startupStatus/updated", "params": McpServerStatusUpdatedNotification } | { "method": "account/updated", "params": AccountUpdatedNotification } | { "method": "account/rateLimits/updated", "params": AccountRateLimitsUpdatedNotification } | { "method": "app/list/updated", "params": AppListUpdatedNotification } | { "method": "remoteControl/status/changed", "params": RemoteControlStatusChangedNotification } | { "method": "externalAgentConfig/import/progress", "params": ExternalAgentConfigImportProgressNotification } | { "method": "externalAgentConfig/import/completed", "params": ExternalAgentConfigImportCompletedNotification } | { "method": "fs/changed", "params": FsChangedNotification } | { "method": "item/reasoning/summaryTextDelta", "params": ReasoningSummaryTextDeltaNotification } | { "method": "item/reasoning/summaryPartAdded", "params": ReasoningSummaryPartAddedNotification } | { "method": "item/reasoning/textDelta", "params": ReasoningTextDeltaNotification } | { "method": "thread/compacted", "params": ContextCompactedNotification } | { "method": "model/rerouted", "params": ModelReroutedNotification } | { "method": "model/verification", "params": ModelVerificationNotification } | { "method": "turn/moderationMetadata", "params": TurnModerationMetadataNotification } | { "method": "model/safetyBuffering/updated", "params": ModelSafetyBufferingUpdatedNotification } | { "method": "warning", "params": WarningNotification } | { "method": "guardianWarning", "params": GuardianWarningNotification } | { "method": "deprecationNotice", "params": DeprecationNoticeNotification } | { "method": "configWarning", "params": ConfigWarningNotification } | { "method": "fuzzyFileSearch/sessionUpdated", "params": FuzzyFileSearchSessionUpdatedNotification } | { "method": "fuzzyFileSearch/sessionCompleted", "params": FuzzyFileSearchSessionCompletedNotification } | { "method": "thread/realtime/started", "params": ThreadRealtimeStartedNotification } | { "method": "thread/realtime/itemAdded", "params": ThreadRealtimeItemAddedNotification } | { "method": "thread/realtime/transcript/delta", "params": ThreadRealtimeTranscriptDeltaNotification } | { "method": "thread/realtime/transcript/done", "params": ThreadRealtimeTranscriptDoneNotification } | { "method": "thread/realtime/outputAudio/delta", "params": ThreadRealtimeOutputAudioDeltaNotification } | { "method": "thread/realtime/sdp", "params": ThreadRealtimeSdpNotification } | { "method": "thread/realtime/error", "params": ThreadRealtimeErrorNotification } | { "method": "thread/realtime/closed", "params": ThreadRealtimeClosedNotification } | { "method": "windows/worldWritableWarning", "params": WindowsWorldWritableWarningNotification } | { "method": "windowsSandbox/setupCompleted", "params": WindowsSandboxSetupCompletedNotification } | { "method": "account/login/completed", "params": AccountLoginCompletedNotification });
+} & ({ "method": "error", "params": ErrorNotification } | { "method": "thread/started", "params": ThreadStartedNotification } | { "method": "thread/status/changed", "params": ThreadStatusChangedNotification } | { "method": "thread/archived", "params": ThreadArchivedNotification } | { "method": "thread/deleted", "params": ThreadDeletedNotification } | { "method": "thread/unarchived", "params": ThreadUnarchivedNotification } | { "method": "thread/closed", "params": ThreadClosedNotification } | { "method": "thread/reverted", "params": ThreadRevertedNotification } | { "method": "skills/changed", "params": SkillsChangedNotification } | { "method": "thread/name/updated", "params": ThreadNameUpdatedNotification } | { "method": "thread/goal/updated", "params": ThreadGoalUpdatedNotification } | { "method": "thread/goal/cleared", "params": ThreadGoalClearedNotification } | { "method": "thread/queue/changed", "params": ThreadQueueChangedNotification } | { "method": "project/changed", "params": ProjectChangedNotification } | { "method": "thread/project/updated", "params": ThreadProjectUpdatedNotification } | { "method": "thread/environment/connected", "params": EnvironmentConnectionNotification } | { "method": "thread/environment/disconnected", "params": EnvironmentConnectionNotification } | { "method": "thread/settings/updated", "params": ThreadSettingsUpdatedNotification } | { "method": "thread/tokenUsage/updated", "params": ThreadTokenUsageUpdatedNotification } | { "method": "turn/started", "params": TurnStartedNotification } | { "method": "hook/started", "params": HookStartedNotification } | { "method": "turn/completed", "params": TurnCompletedNotification } | { "method": "hook/completed", "params": HookCompletedNotification } | { "method": "turn/diff/updated", "params": TurnDiffUpdatedNotification } | { "method": "turn/plan/updated", "params": TurnPlanUpdatedNotification } | { "method": "item/started", "params": ItemStartedNotification } | { "method": "item/autoApprovalReview/started", "params": ItemGuardianApprovalReviewStartedNotification } | { "method": "item/autoApprovalReview/completed", "params": ItemGuardianApprovalReviewCompletedNotification } | { "method": "autoApprovalReview/strictReviewRequired", "params": StrictReviewRequiredNotification } | { "method": "item/completed", "params": ItemCompletedNotification } | { "method": "rawResponseItem/completed", "params": RawResponseItemCompletedNotification } | { "method": "rawResponse/completed", "params": RawResponseCompletedNotification } | { "method": "item/agentMessage/delta", "params": AgentMessageDeltaNotification } | { "method": "item/plan/delta", "params": PlanDeltaNotification } | { "method": "command/exec/outputDelta", "params": CommandExecOutputDeltaNotification } | { "method": "process/outputDelta", "params": ProcessOutputDeltaNotification } | { "method": "process/exited", "params": ProcessExitedNotification } | { "method": "item/commandExecution/outputDelta", "params": CommandExecutionOutputDeltaNotification } | { "method": "item/commandExecution/terminalInteraction", "params": TerminalInteractionNotification } | { "method": "item/fileChange/outputDelta", "params": FileChangeOutputDeltaNotification } | { "method": "item/fileChange/patchUpdated", "params": FileChangePatchUpdatedNotification } | { "method": "serverRequest/resolved", "params": ServerRequestResolvedNotification } | { "method": "item/mcpToolCall/progress", "params": McpToolCallProgressNotification } | { "method": "mcpServer/oauthLogin/completed", "params": McpServerOauthLoginCompletedNotification } | { "method": "mcpServer/startupStatus/updated", "params": McpServerStatusUpdatedNotification } | { "method": "account/updated", "params": AccountUpdatedNotification } | { "method": "account/rateLimits/updated", "params": AccountRateLimitsUpdatedNotification } | { "method": "app/list/updated", "params": AppListUpdatedNotification } | { "method": "remoteControl/status/changed", "params": RemoteControlStatusChangedNotification } | { "method": "externalAgentConfig/import/progress", "params": ExternalAgentConfigImportProgressNotification } | { "method": "externalAgentConfig/import/completed", "params": ExternalAgentConfigImportCompletedNotification } | { "method": "fs/changed", "params": FsChangedNotification } | { "method": "item/reasoning/summaryTextDelta", "params": ReasoningSummaryTextDeltaNotification } | { "method": "item/reasoning/summaryPartAdded", "params": ReasoningSummaryPartAddedNotification } | { "method": "item/reasoning/textDelta", "params": ReasoningTextDeltaNotification } | { "method": "thread/compacted", "params": ContextCompactedNotification } | { "method": "model/rerouted", "params": ModelReroutedNotification } | { "method": "model/verification", "params": ModelVerificationNotification } | { "method": "turn/moderationMetadata", "params": TurnModerationMetadataNotification } | { "method": "model/safetyBuffering/updated", "params": ModelSafetyBufferingUpdatedNotification } | { "method": "warning", "params": WarningNotification } | { "method": "guardianWarning", "params": GuardianWarningNotification } | { "method": "deprecationNotice", "params": DeprecationNoticeNotification } | { "method": "configWarning", "params": ConfigWarningNotification } | { "method": "fuzzyFileSearch/sessionUpdated", "params": FuzzyFileSearchSessionUpdatedNotification } | { "method": "fuzzyFileSearch/sessionCompleted", "params": FuzzyFileSearchSessionCompletedNotification } | { "method": "thread/realtime/started", "params": ThreadRealtimeStartedNotification } | { "method": "thread/realtime/itemAdded", "params": ThreadRealtimeItemAddedNotification } | { "method": "thread/realtime/transcript/delta", "params": ThreadRealtimeTranscriptDeltaNotification } | { "method": "thread/realtime/transcript/done", "params": ThreadRealtimeTranscriptDoneNotification } | { "method": "thread/realtime/outputAudio/delta", "params": ThreadRealtimeOutputAudioDeltaNotification } | { "method": "thread/realtime/sdp", "params": ThreadRealtimeSdpNotification } | { "method": "thread/realtime/error", "params": ThreadRealtimeErrorNotification } | { "method": "thread/realtime/closed", "params": ThreadRealtimeClosedNotification } | { "method": "windows/worldWritableWarning", "params": WindowsWorldWritableWarningNotification } | { "method": "windowsSandbox/setupCompleted", "params": WindowsSandboxSetupCompletedNotification } | { "method": "account/login/completed", "params": AccountLoginCompletedNotification });
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ServerRequest.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ServerRequest.ts
index 2b05e25f8b625c..e829ae5e895115 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ServerRequest.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ServerRequest.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/SessionSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/SessionSource.ts
index 6108cb3a259044..3eb549c4b12e5f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/SessionSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/SessionSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/Settings.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/Settings.ts
index f4997bc02651cf..f8e0f9dbf36e45 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/Settings.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/Settings.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/SleepItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/SleepItem.ts
index 12e5dadbaa99a5..a32e562766876d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/SleepItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/SleepItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/SubAgentSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/SubAgentSource.ts
index 1a9228bf46e406..2c13e85e34d3cc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/SubAgentSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/SubAgentSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadId.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadId.ts
index 07dbe871149db1..8d435750b8643f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadId.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadId.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadMemoryMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadMemoryMode.ts
index afc631389b20a1..a1f9cec32c5bd1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadMemoryMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/ThreadMemoryMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/Tool.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/Tool.ts
index 30e94ea85de873..7603cfdb81e752 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/Tool.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/Tool.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/Verbosity.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/Verbosity.ts
index 6dc446b05966b2..233cfcac481268 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/Verbosity.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/Verbosity.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchAction.ts
index d1e58da43e6835..839a31b959c6d2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchContextSize.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchContextSize.ts
index 3ae7cd017af7b1..2205a554b3ff29 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchContextSize.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchContextSize.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchItem.ts
index 373395794e9784..26b8997b94f40a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchLocation.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchLocation.ts
index 2e673e2ad1a588..1697ed7fe74a9b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchLocation.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchLocation.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchMode.ts
index fb1a6dbbd8b268..1f41ffaed5af8a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchToolConfig.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchToolConfig.ts
index e16b8695e4879d..568264d76094f3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchToolConfig.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/WebSearchToolConfig.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/index.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/index.ts
index 6386b8269044af..2595a15da98cc2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/index.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/index.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -49,6 +49,7 @@ export type { GitDiffToRemoteParams } from "./GitDiffToRemoteParams.js";
 export type { GitDiffToRemoteResponse } from "./GitDiffToRemoteResponse.js";
 export type { GitSha } from "./GitSha.js";
 export type { ImageDetail } from "./ImageDetail.js";
+export type { ImageGenerationFailure } from "./ImageGenerationFailure.js";
 export type { ImageGenerationItem } from "./ImageGenerationItem.js";
 export type { InitializeCapabilities } from "./InitializeCapabilities.js";
 export type { InitializeParams } from "./InitializeParams.js";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/serde_json/JsonValue.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/serde_json/JsonValue.ts
index 4eb048cb03be81..93a60631e4c304 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/serde_json/JsonValue.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/serde_json/JsonValue.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Account.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Account.ts
index 3e2f340757d897..849791b8cd8ab5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Account.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Account.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountLoginCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountLoginCompletedNotification.ts
index 1ece0db0bfa729..0eb695a02a85c6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountLoginCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountLoginCompletedNotification.ts
@@ -1,9 +1,11 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/AccountLoginCompletedNotification.ts
 
-export type AccountLoginCompletedNotification = { loginId: string | null, success: boolean, error: string | null, };
+import type { DesktopOnboardingEntrypoint } from "./DesktopOnboardingEntrypoint.js";
+
+export type AccountLoginCompletedNotification = { loginId: string | null, success: boolean, error: string | null, onboardingEntrypoint: DesktopOnboardingEntrypoint | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountRateLimitsUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountRateLimitsUpdatedNotification.ts
index 336a959e24e666..bad74ce3893ab3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountRateLimitsUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountRateLimitsUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageDailyBucket.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageDailyBucket.ts
index 5913a61066ef37..56f58184b3b4a6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageDailyBucket.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageDailyBucket.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageSummary.ts
index 0bdaa47c5be8d1..54045eb152be54 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountTokenUsageSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountUpdatedNotification.ts
index 7372fa0c0c8813..4e2585d0586f4e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AccountUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ActivePermissionProfile.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ActivePermissionProfile.ts
index cc866be5a6fafc..d1331790f52a3c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ActivePermissionProfile.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ActivePermissionProfile.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeCreditType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeCreditType.ts
index 5441cac43c868b..b591aa405bfa2b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeCreditType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeCreditType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeEmailStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeEmailStatus.ts
index 6f7b3c68da0d17..258a622740c0c5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeEmailStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AddCreditsNudgeEmailStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextEntry.ts
index 24402f2e933f69..d855e51a84ed77 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextKind.ts
index 072ddf73022ab3..3a1213ca7b59ae 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalContextKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalFileSystemPermissions.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalFileSystemPermissions.ts
index 4f45fb8006217c..bfb7adc8d91c82 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalFileSystemPermissions.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalFileSystemPermissions.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalNetworkPermissions.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalNetworkPermissions.ts
index a7fede04ed3529..97dda6a153522f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalNetworkPermissions.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalNetworkPermissions.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalPermissionProfile.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalPermissionProfile.ts
index dc7b38af32dd21..a920c6e1dcf3f6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalPermissionProfile.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AdditionalPermissionProfile.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDelivery.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDelivery.ts
new file mode 100644
index 00000000000000..f4b3559cdfa310
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDelivery.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/AgentMessageDelivery.ts
+
+export type AgentMessageDelivery = "async";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDeltaNotification.ts
index be5980fadc8198..dedf5c9d62206a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AgentMessageDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AnalyticsConfig.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AnalyticsConfig.ts
index d8868e214ccfbb..1b0d117f95899a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AnalyticsConfig.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AnalyticsConfig.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppBranding.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppBranding.ts
index d4b69ecfd2583d..a019e95db38c43 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppBranding.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppBranding.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppInfo.ts
index d11738986146af..5c51ce881950e2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppListUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppListUpdatedNotification.ts
index 74fcd653e9b87d..29b207ae8f2879 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppListUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppListUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppMetadata.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppMetadata.ts
index 648a6f69b12bdd..f3edbb57a512d2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppMetadata.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppMetadata.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppReview.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppReview.ts
index a1c1cbbb75a5ec..0d28f51647fa0e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppReview.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppReview.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppScreenshot.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppScreenshot.ts
index 167a6b02e7dfdc..2f78bb9a2a0933 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppScreenshot.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppScreenshot.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppSummary.ts
index d64cad00f24421..c4acdf6504fa79 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateSummary.ts
index 721d777fda8f04..4d58984d715764 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateUnavailableReason.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateUnavailableReason.ts
index d2f894da9a6c06..10da7caa445ce8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateUnavailableReason.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppTemplateUnavailableReason.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolApproval.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolApproval.ts
index b8e795d3254b9a..fcc6151e0595a0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolApproval.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolApproval.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolSummary.ts
index 915eab87a7a5ea..e9aa31ed0af476 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolsConfig.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolsConfig.ts
index b459d08ca96196..a11efaa4b9f75f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolsConfig.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppToolsConfig.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ApprovalsReviewer.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ApprovalsReviewer.ts
index bce009a3f6dbb9..9f07af22cffacd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ApprovalsReviewer.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ApprovalsReviewer.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsConfig.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsConfig.ts
index 8b96f68a27fd8d..9e538aaf903eaf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsConfig.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsConfig.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsDefaultConfig.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsDefaultConfig.ts
index 6556000f94caa4..e87c8be0745c45 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsDefaultConfig.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsDefaultConfig.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledParams.ts
index 546b8b3dd4160b..22c89db56d3317 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledResponse.ts
index 92d632bc5eb621..d39e5957427193 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsInstalledResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListParams.ts
index bfc6416e3809f4..6d2a2ae199b7ee 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListResponse.ts
index 4b37dfe3175d06..aac48956eae3fa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadParams.ts
index 506090f14d4472..51d0b7d14bbe48 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -15,6 +15,10 @@ export type AppsReadParams = {
 	 * preserving their first-request order.
 	 */
 	appIds: Array<string>,
+	/**
+	 * Optional loaded thread id used to evaluate effective app configuration.
+	 */
+	threadId?: string | null,
 	/**
 	 * When true, include display-only public tool summaries in the returned metadata.
 	 */
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadResponse.ts
index c258449aaebaec..510b7d31bf3661 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AppsReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AskForApproval.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AskForApproval.ts
index 0001d04368976d..027aa2e0021c78 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AskForApproval.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AskForApproval.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateParams.ts
index a2d07b9f73453a..412d52e4bb734d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateResponse.ts
index 3d47794c5c183d..24991e1a4ed52e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AttestationGenerateResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewDecisionSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewDecisionSource.ts
index 7ae5e2292e6ee6..b2890e1d36ca8a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewDecisionSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewDecisionSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewRequirements.ts
new file mode 100644
index 00000000000000..446e7d7baf2e3a
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AutoReviewRequirements.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/AutoReviewRequirements.ts
+
+export type AutoReviewRequirements = { requiredOnModels: Array<string> | null, ignoreRules: Array<string> | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AwsCredentialType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AwsCredentialType.ts
new file mode 100644
index 00000000000000..833417d1b2dcc8
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/AwsCredentialType.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/AwsCredentialType.ts
+
+export type AwsCredentialType = "accessKeys" | "bedrockApiKey";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockAwsProfile.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockAwsProfile.ts
new file mode 100644
index 00000000000000..e0170dd71c9cb4
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockAwsProfile.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/BedrockAwsProfile.ts
+
+export type BedrockAwsProfile = { name: string, region: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockDiscoverParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockDiscoverParams.ts
new file mode 100644
index 00000000000000..6c9a8a22ab087c
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockDiscoverParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/BedrockDiscoverParams.ts
+
+export type BedrockDiscoverParams = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockDiscoverResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockDiscoverResponse.ts
new file mode 100644
index 00000000000000..af4c9caa8c4f2e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockDiscoverResponse.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/BedrockDiscoverResponse.ts
+
+import type { BedrockAwsProfile } from "./BedrockAwsProfile.js";
+import type { BedrockEnvironmentCredential } from "./BedrockEnvironmentCredential.js";
+
+export type BedrockDiscoverResponse = { profiles: Array<BedrockAwsProfile>, environmentCredentials: Array<BedrockEnvironmentCredential>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockEnvironmentCredential.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockEnvironmentCredential.ts
new file mode 100644
index 00000000000000..3043c5f82262ab
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockEnvironmentCredential.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/BedrockEnvironmentCredential.ts
+
+import type { AwsCredentialType } from "./AwsCredentialType.js";
+
+export type BedrockEnvironmentCredential = { type: AwsCredentialType, region: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockSetupParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockSetupParams.ts
new file mode 100644
index 00000000000000..379d54136e4d1e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockSetupParams.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/BedrockSetupParams.ts
+
+import type { AwsCredentialType } from "./AwsCredentialType.js";
+
+export type BedrockSetupParams = { "type": "profile", profile: string, region: string, } | { "type": "environment", credentialType: AwsCredentialType, region: string, } | { "type": "accessKeys", accessKeyId: string, secretAccessKey: string, sessionToken?: string | null, region: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockSetupResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockSetupResponse.ts
new file mode 100644
index 00000000000000..42baf8811ca5ca
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BedrockSetupResponse.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/BedrockSetupResponse.ts
+
+export type BedrockSetupResponse = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BrowserUseRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BrowserUseRequirements.ts
index e32f307a551831..da5365b20efb6b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BrowserUseRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/BrowserUseRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ByteRange.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ByteRange.ts
index 8b7d1b3c2a7b63..c8e7bf998c31a7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ByteRange.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ByteRange.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountParams.ts
index 297d14d10c32c0..6a68200014a98f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountResponse.ts
index 6872683d20ac0e..4e45c0357e23ee 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountStatus.ts
index 2c190ca85f990e..9645e312f0d11d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CancelLoginAccountStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CapabilityRootLocation.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CapabilityRootLocation.ts
index ac82c3ff79ba42..2b5fd4fc6ba02c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CapabilityRootLocation.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CapabilityRootLocation.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshParams.ts
index b4723757e2f596..4335a241cf3df7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshReason.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshReason.ts
index a841c97b568861..a7c84685929bd1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshReason.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshReason.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshResponse.ts
index e5de022008320e..54d1c522acb629 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ChatgptAuthTokensRefreshResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CliAuthCredentialsStoreMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CliAuthCredentialsStoreMode.ts
new file mode 100644
index 00000000000000..092c65ba8649f7
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CliAuthCredentialsStoreMode.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/CliAuthCredentialsStoreMode.ts
+
+export type CliAuthCredentialsStoreMode = "file" | "keyring" | "auto" | "ephemeral";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CodexErrorInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CodexErrorInfo.ts
index e90e3333e445dc..244cf372b99f90 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CodexErrorInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CodexErrorInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -14,4 +14,4 @@ import type { NonSteerableTurnKind } from "./NonSteerableTurnKind.js";
  * When an upstream HTTP status is available (for example, from the Responses API or a provider),
  * it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.
  */
-export type CodexErrorInfo = "contextWindowExceeded" | "sessionBudgetExceeded" | "usageLimitExceeded" | "serverOverloaded" | "cyberPolicy" | { "httpConnectionFailed": { httpStatusCode: number | null, } } | { "responseStreamConnectionFailed": { httpStatusCode: number | null, } } | "internalServerError" | "unauthorized" | "badRequest" | "threadRollbackFailed" | "sandboxError" | { "responseStreamDisconnected": { httpStatusCode: number | null, } } | { "responseTooManyFailedAttempts": { httpStatusCode: number | null, } } | { "activeTurnNotSteerable": { turnKind: NonSteerableTurnKind, } } | "other";
+export type CodexErrorInfo = "contextWindowExceeded" | "sessionBudgetExceeded" | "usageLimitExceeded" | "serverOverloaded" | "cyberPolicy" | "misalignmentPolicyViolation" | { "httpConnectionFailed": { httpStatusCode: number | null, } } | { "responseStreamConnectionFailed": { httpStatusCode: number | null, } } | "internalServerError" | "unauthorized" | "badRequest" | "threadRollbackFailed" | "sandboxError" | { "responseStreamDisconnected": { httpStatusCode: number | null, } } | { "responseTooManyFailedAttempts": { httpStatusCode: number | null, } } | { "activeTurnNotSteerable": { turnKind: NonSteerableTurnKind, } } | "other";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentState.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentState.ts
index 3f7f3bd67ab767..239f7a88dcb1ec 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentState.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentState.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentStatus.ts
index a6d5e850809218..708538e7e35a64 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentTool.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentTool.ts
index 072ba245ef5e9f..83d0f7a67327bd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentTool.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentTool.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentToolCallStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentToolCallStatus.ts
index 80a5755e94657c..d9989daf4ce267 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentToolCallStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollabAgentToolCallStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListParams.ts
index 7cca252461e6b3..5cab65daaf4c38 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListResponse.ts
index 5923ae11503a4a..f55a3052ad1095 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeMask.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeMask.ts
index 925a80bbc7f5a1..95eb684f5ddfc4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeMask.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CollaborationModeMask.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandAction.ts
index ca68089f1bafd3..c43c8ff72f72dc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandAction.ts
@@ -1,11 +1,11 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/CommandAction.ts
 
-import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
+import type { LegacyAppPathString } from "../LegacyAppPathString.js";
 
-export type CommandAction = { "type": "read", command: string, name: string, path: AbsolutePathBuf, } | { "type": "listFiles", command: string, path: string | null, } | { "type": "search", command: string, query: string | null, path: string | null, } | { "type": "unknown", command: string, };
+export type CommandAction = { "type": "read", command: string, name: string, path: LegacyAppPathString, } | { "type": "listFiles", command: string, path: string | null, } | { "type": "search", command: string, query: string | null, path: string | null, } | { "type": "unknown", command: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputDeltaNotification.ts
index 4da2f7c9d88096..78fa8828894b06 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputStream.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputStream.ts
index 855ec690cf45d2..c4bd2ff476b918 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputStream.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecOutputStream.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecParams.ts
index 303af4c890a419..7342fa3a0fd60b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeParams.ts
index 7fe3e0d0fc776b..60a766bf832428 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeResponse.ts
index 87f8ef0a84b456..a62a5bd2e45baf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResizeResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResponse.ts
index 770e77d812dc46..d1bdcd8e4670df 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminalSize.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminalSize.ts
index d4857ac41d3b36..d7d9245207c740 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminalSize.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminalSize.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateParams.ts
index 03cd4f2dc4674a..e6ebced9ca1848 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateResponse.ts
index c86ba0ca594bb1..1f227c9fe147fa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecTerminateResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteParams.ts
index 02bc28e163f267..99ea407ec34d9a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteResponse.ts
index 8a5e12813f1384..48be84edd107f3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecWriteResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionApprovalDecision.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionApprovalDecision.ts
index 389a460b7d60b9..65b9eb9ccca9ba 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionApprovalDecision.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionApprovalDecision.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionOutputDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionOutputDeltaNotification.ts
index dbfb74ba73faa9..53b190d58585b7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionOutputDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionOutputDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalParams.ts
index f353e4244c6f0a..a45e9bca3df2ac 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalResponse.ts
index b422f18d44711b..2a580ec68c2ec8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionRequestApprovalResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionSource.ts
index f730e26876787b..d2923318dac52d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionStatus.ts
index 9ff3d40d9c4778..14fb1acea3e911 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandExecutionStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandMigration.ts
index 6ed9b246982066..9296c4709024ab 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CommandMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ComputerUseRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ComputerUseRequirements.ts
index 5e415eceb4b3a0..d946705976c7c0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ComputerUseRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ComputerUseRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Config.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Config.ts
index c0b809f4473e12..06b70978820f73 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Config.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Config.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigBatchWriteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigBatchWriteParams.ts
index 2107e74cf514a5..af0e1679992d6b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigBatchWriteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigBatchWriteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigEdit.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigEdit.ts
index bd957809929cdc..cbfe19d7b09930 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigEdit.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigEdit.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayer.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayer.ts
index eb9ba4eef5e8cb..f9366c465c621b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayer.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayer.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerMetadata.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerMetadata.ts
index b929b1f82b57d2..f8e49b06a847b8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerMetadata.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerMetadata.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerSource.ts
index fc7bc33cdff973..691fc550f48d40 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigLayerSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,7 +8,13 @@
 
 import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
 
-export type ConfigLayerSource = { "type": "mdm", domain: string, key: string, } | {
+export type ConfigLayerSource = {
+	"type": "packagedDefaults",
+	/**
+	 * Path to the packaged default configuration file.
+	 */
+	file: AbsolutePathBuf,
+} | { "type": "mdm", domain: string, key: string, } | {
 	"type": "system",
 	/**
 	 * This is the path to the system config.toml file, though it is not
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadParams.ts
index 12366153718cf7..7826be68d02806 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadResponse.ts
index 4778989a312f7b..c931744e07e999 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirements.ts
index 43c02cb8017ca1..9905dce7d2dae3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -10,7 +10,9 @@ import type { PathUri } from "../PathUri.js";
 import type { WebSearchMode } from "../WebSearchMode.js";
 import type { ApprovalsReviewer } from "./ApprovalsReviewer.js";
 import type { AskForApproval } from "./AskForApproval.js";
+import type { AutoReviewRequirements } from "./AutoReviewRequirements.js";
 import type { BrowserUseRequirements } from "./BrowserUseRequirements.js";
+import type { CliAuthCredentialsStoreMode } from "./CliAuthCredentialsStoreMode.js";
 import type { ComputerUseRequirements } from "./ComputerUseRequirements.js";
 import type { FeedbackRequirements } from "./FeedbackRequirements.js";
 import type { ManagedHooksRequirements } from "./ManagedHooksRequirements.js";
@@ -20,4 +22,4 @@ import type { ResidencyRequirement } from "./ResidencyRequirement.js";
 import type { SandboxMode } from "./SandboxMode.js";
 import type { WindowsSandboxSetupMode } from "./WindowsSandboxSetupMode.js";
 
-export type ConfigRequirements = { allowedApprovalPolicies: Array<AskForApproval> | null, allowedApprovalsReviewers: Array<ApprovalsReviewer> | null, allowedSandboxModes: Array<SandboxMode> | null, allowedWindowsSandboxImplementations: Array<WindowsSandboxSetupMode> | null, allowedPermissionProfiles: { [key in string]?: boolean } | null, defaultPermissions: string | null, allowedWebSearchModes: Array<WebSearchMode> | null, allowManagedHooksOnly: boolean | null, allowAppshots: boolean | null, allowRemoteControl: boolean | null, computerUse: ComputerUseRequirements | null, browserUse: BrowserUseRequirements | null, featureRequirements: { [key in string]?: boolean } | null, hooks: ManagedHooksRequirements | null, enforceResidency: ResidencyRequirement | null, network: NetworkRequirements | null, models: ModelsRequirements | null, sqliteHome: PathUri | null, logDir: PathUri | null, modelCatalogJson: PathUri | null, checkForUpdateOnStartup: boolean | null, allowLoginShell: boolean | null, feedback: FeedbackRequirements | null, windowsSandboxPrivateDesktop: boolean | null, };
+export type ConfigRequirements = { cliAuthCredentialsStore: CliAuthCredentialsStoreMode | null, chatgptBaseUrl: string | null, allowedApprovalPolicies: Array<AskForApproval> | null, allowedApprovalsReviewers: Array<ApprovalsReviewer> | null, allowedSandboxModes: Array<SandboxMode> | null, allowedWindowsSandboxImplementations: Array<WindowsSandboxSetupMode> | null, allowedPermissionProfiles: { [key in string]?: boolean } | null, defaultPermissions: string | null, allowedWebSearchModes: Array<WebSearchMode> | null, allowManagedHooksOnly: boolean | null, allowAppshots: boolean | null, allowRemoteControl: boolean | null, computerUse: ComputerUseRequirements | null, browserUse: BrowserUseRequirements | null, featureRequirements: { [key in string]?: boolean } | null, hooks: ManagedHooksRequirements | null, enforceResidency: ResidencyRequirement | null, network: NetworkRequirements | null, autoReview: AutoReviewRequirements | null, models: ModelsRequirements | null, sqliteHome: PathUri | null, logDir: PathUri | null, modelCatalogJson: PathUri | null, checkForUpdateOnStartup: boolean | null, allowLoginShell: boolean | null, feedback: FeedbackRequirements | null, windowsSandboxPrivateDesktop: boolean | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirementsReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirementsReadResponse.ts
index d1ad28cca942fd..65e8a1a30703c1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirementsReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigRequirementsReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigValueWriteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigValueWriteParams.ts
index c77fd54b6f207e..55d5251ad798e6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigValueWriteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigValueWriteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWarningNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWarningNotification.ts
index b4503e607fcaca..cf83642009f26b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWarningNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWarningNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWriteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWriteResponse.ts
index ab1f3c261673d5..485414279fbe3d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWriteResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfigWriteResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookHandler.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookHandler.ts
index 25212a0f5f6b63..93a8458be48bee 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookHandler.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookHandler.ts
@@ -1,11 +1,13 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ConfiguredHookHandler.ts
 
+import type { JsonValue } from "../serde_json/JsonValue.js";
+
 export type ConfiguredHookHandler = {
 	"type": "command", command: string, commandWindows: string | null, timeoutSec: bigint | null, async: boolean, statusMessage: string | null,
 	/**
@@ -15,4 +17,4 @@ export type ConfiguredHookHandler = {
 	 * metadata.
 	 */
 	additionalContextLimit: number | null,
-} | { "type": "prompt", } | { "type": "agent", };
+} | { "type": "mcp_tool", server: string, tool: string, input: { [key in string]?: JsonValue }, timeoutSec: bigint | null, statusMessage: string | null, } | { "type": "prompt", } | { "type": "agent", };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookMatcherGroup.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookMatcherGroup.ts
index ae2f82986602aa..889807564b39aa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookMatcherGroup.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConfiguredHookMatcherGroup.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConnectorMetadata.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConnectorMetadata.ts
index 033a829a509e56..b06814f069c518 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConnectorMetadata.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConnectorMetadata.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditOutcome.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditOutcome.ts
index edc7147789d066..ef7990dc8c0ca1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditOutcome.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditOutcome.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditParams.ts
index be56f8ed96d1c0..1b9850156fc717 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditResponse.ts
index 80589a6c1106cb..fff651a87f8210 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ConsumeAccountRateLimitResetCreditResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ContextCompactedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ContextCompactedNotification.ts
index 188802a8714f66..79d8cafdd94cca 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ContextCompactedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ContextCompactedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CreditsSnapshot.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CreditsSnapshot.ts
index aa14953c8cb906..d2ab582b0c70af 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CreditsSnapshot.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CreditsSnapshot.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadParams.ts
index 026317245c7ce0..5457ec80dc2781 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadResponse.ts
index 60b75755deb252..308eaad6bc3155 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/CurrentTimeReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DeprecationNoticeNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DeprecationNoticeNotification.ts
index ea6514888ecc10..93734df428cc7a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DeprecationNoticeNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DeprecationNoticeNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DesktopOnboardingEntrypoint.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DesktopOnboardingEntrypoint.ts
new file mode 100644
index 00000000000000..0f33baf3ba6262
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DesktopOnboardingEntrypoint.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/DesktopOnboardingEntrypoint.ts
+
+export type DesktopOnboardingEntrypoint = "life_sciences";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallOutputContentItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallOutputContentItem.ts
index 7150a11f902d13..7197af3f8d21af 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallOutputContentItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallOutputContentItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallParams.ts
index fd4deb07aceba0..7fd9865bbeb2d5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallResponse.ts
index 404e75d1bfdd07..84dd8324dbc61a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallStatus.ts
index 7f5a629d3f1f1a..752ca5c506b5dc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolCallStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolFunctionSpec.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolFunctionSpec.ts
index d3919df02d5b28..d6b99cd5d3efbb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolFunctionSpec.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolFunctionSpec.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceSpec.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceSpec.ts
index 72681823c01b20..780b0ceda90c5b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceSpec.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceSpec.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceTool.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceTool.ts
index f79ef67d5584f0..4eff7203aeb27a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceTool.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolNamespaceTool.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolSpec.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolSpec.ts
index 159be456815485..4de280841a8e92 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolSpec.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/DynamicToolSpec.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddParams.ts
index 2c11335ec1c47a..b7df4e41672d5f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddResponse.ts
index 5dd0e46d604664..a9c69c0d7a6d10 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentAddResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentConnectionNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentConnectionNotification.ts
index 67b4d595932bcb..f6da37bc268080 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentConnectionNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentConnectionNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoParams.ts
index 65a904cfa36d3c..98c1323c3bbc85 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoResponse.ts
index 617d7d9e5ae52f..02365636d2d9fb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentInfoResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentShellInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentShellInfo.ts
index 53b16d00a35a91..492ab21620c43d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentShellInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentShellInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusKind.ts
index bc57fbd59126b7..e519a9d37efa5a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusParams.ts
index 4a3f3a06010aea..03f2adaec7de5c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusResponse.ts
index 68bb3f93a86df2..3d50a759112118 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/EnvironmentStatusResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ErrorNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ErrorNotification.ts
index 5a4acd22149fe7..f05fab8b355355 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ErrorNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ErrorNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExecPolicyAmendment.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExecPolicyAmendment.ts
index e91f6e9b1c6850..fe841d5dd84783 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExecPolicyAmendment.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExecPolicyAmendment.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeature.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeature.ts
index c0b7f83332923c..0cd43f999379a2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeature.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeature.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetParams.ts
index f456d8dd374776..626fca2caf4d4b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetResponse.ts
index 55a028aa250ae0..c0bb13a8e6a2cf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureEnablementSetResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListParams.ts
index 78d94983d194e6..f171a7c38f9c12 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListResponse.ts
index 37306be5d3a6ff..45b869804e44c3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureStage.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureStage.ts
index 088c64524f0624..2e44bc85d2f5e4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureStage.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExperimentalFeatureStage.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectParams.ts
index 05e211b5b15554..b03014076d5369 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectResponse.ts
index 3d47644b725058..9db09bee21eaf9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigDetectResponse.ts
@@ -1,11 +1,12 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ExternalAgentConfigDetectResponse.ts
 
 import type { ExternalAgentConfigMigrationItem } from "./ExternalAgentConfigMigrationItem.js";
+import type { ExternalAgentDetectedConnectorCandidate } from "./ExternalAgentDetectedConnectorCandidate.js";
 
-export type ExternalAgentConfigDetectResponse = { items: Array<ExternalAgentConfigMigrationItem>, };
+export type ExternalAgentConfigDetectResponse = { items: Array<ExternalAgentConfigMigrationItem>, connectors: Array<ExternalAgentDetectedConnectorCandidate>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportCompletedNotification.ts
index cd667251c51233..9043bcdb38a01f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoriesReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoriesReadResponse.ts
index 02465b0a720af1..0ce104407c3171 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoriesReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoriesReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistory.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistory.ts
index ac9c95dcad2784..95197f0926a2ab 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistory.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistory.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordParams.ts
index 9c5f88ad1817b4..a160c86ea9582f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordParams.ts
@@ -1,12 +1,12 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ExternalAgentConfigImportHistoryRecordParams.ts
 
-import type { ExternalAgentConfigImportTypeResult } from "./ExternalAgentConfigImportTypeResult.js";
+import type { ExternalAgentConfigImportHistoryRecordTypeResultParams } from "./ExternalAgentConfigImportHistoryRecordTypeResultParams.js";
 
 export type ExternalAgentConfigImportHistoryRecordParams = {
 	/**
@@ -16,5 +16,5 @@ export type ExternalAgentConfigImportHistoryRecordParams = {
 	/**
 	 * Completed results grouped by imported item type.
 	 */
-	itemTypeResults: Array<ExternalAgentConfigImportTypeResult>,
+	itemTypeResults: Array<ExternalAgentConfigImportHistoryRecordTypeResultParams>,
 };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordResponse.ts
index 3432c17115fdd5..0299f7587b295f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordSuccessParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordSuccessParams.ts
new file mode 100644
index 00000000000000..aba6b5657b0f8d
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordSuccessParams.ts
@@ -0,0 +1,17 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ExternalAgentConfigImportHistoryRecordSuccessParams.ts
+
+import type { ExternalAgentConfigMigrationItemType } from "./ExternalAgentConfigMigrationItemType.js";
+
+export type ExternalAgentConfigImportHistoryRecordSuccessParams = {
+	itemType: ExternalAgentConfigMigrationItemType, cwd: string | null, source: string | null, target: string | null,
+	/**
+	 * Original title for an imported session, when available.
+	 */
+	title?: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordTypeResultParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordTypeResultParams.ts
new file mode 100644
index 00000000000000..d75253c09868e6
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportHistoryRecordTypeResultParams.ts
@@ -0,0 +1,13 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ExternalAgentConfigImportHistoryRecordTypeResultParams.ts
+
+import type { ExternalAgentConfigImportHistoryRecordSuccessParams } from "./ExternalAgentConfigImportHistoryRecordSuccessParams.js";
+import type { ExternalAgentConfigImportItemTypeFailure } from "./ExternalAgentConfigImportItemTypeFailure.js";
+import type { ExternalAgentConfigMigrationItemType } from "./ExternalAgentConfigMigrationItemType.js";
+
+export type ExternalAgentConfigImportHistoryRecordTypeResultParams = { itemType: ExternalAgentConfigMigrationItemType, successes: Array<ExternalAgentConfigImportHistoryRecordSuccessParams>, failures: Array<ExternalAgentConfigImportItemTypeFailure>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeFailure.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeFailure.ts
index fbe098a506fcb0..bcb6b9c66f79b4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeFailure.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeFailure.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeSuccess.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeSuccess.ts
index 4b21fbc902fbc7..eeb01421da7f02 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeSuccess.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportItemTypeSuccess.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,4 +8,10 @@
 
 import type { ExternalAgentConfigMigrationItemType } from "./ExternalAgentConfigMigrationItemType.js";
 
-export type ExternalAgentConfigImportItemTypeSuccess = { itemType: ExternalAgentConfigMigrationItemType, cwd: string | null, source: string | null, target: string | null, };
+export type ExternalAgentConfigImportItemTypeSuccess = {
+	itemType: ExternalAgentConfigMigrationItemType, cwd: string | null, source: string | null, target: string | null,
+	/**
+	 * Original title for an imported session; null for other item types.
+	 */
+	title: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportParams.ts
index d2bb49ecc81c8e..7aa54b1bdeb751 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportProgressNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportProgressNotification.ts
index d45f7bc7468216..829112eaf3b51c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportProgressNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportProgressNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportResponse.ts
index f45f0a8ade19a5..6726aa40baa4d9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportTypeResult.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportTypeResult.ts
index 23378a00e29bcb..63fd273c32122e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportTypeResult.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigImportTypeResult.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItem.ts
index 0800b42c38a758..41658b475f4db9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItemType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItemType.ts
index 24dbb8359659e8..2552006708092a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItemType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentConfigMigrationItemType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentDetectedConnectorCandidate.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentDetectedConnectorCandidate.ts
new file mode 100644
index 00000000000000..324a71803e82ec
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentDetectedConnectorCandidate.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ExternalAgentDetectedConnectorCandidate.ts
+
+import type { ExternalAgentDetectedConnectorSource } from "./ExternalAgentDetectedConnectorSource.js";
+
+export type ExternalAgentDetectedConnectorCandidate = { name: string, sessionCount: number, source: ExternalAgentDetectedConnectorSource, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentDetectedConnectorSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentDetectedConnectorSource.ts
new file mode 100644
index 00000000000000..62549bb11db775
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentDetectedConnectorSource.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ExternalAgentDetectedConnectorSource.ts
+
+export type ExternalAgentDetectedConnectorSource = "remoteMcpServersConfig" | "sessionToolUse";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorCandidate.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorCandidate.ts
index d8fc1c855f8745..6c9078988eaecc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorCandidate.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorCandidate.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorSource.ts
index ebaac4496c1fb7..e9bd32cc0428e1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ExternalAgentImportedConnectorSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackRequirements.ts
index 2086d34683030d..9b94a4605fe966 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadParams.ts
index 974b60b8f4094c..28f37dc09b9930 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadResponse.ts
index 5775618eb3ad57..5a06b677b6767a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FeedbackUploadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeApprovalDecision.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeApprovalDecision.ts
index 0fe4d7cc789a8c..bf76971375c43d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeApprovalDecision.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeApprovalDecision.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeOutputDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeOutputDeltaNotification.ts
index 552495bb682b5e..7370e541f7e2f8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeOutputDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeOutputDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangePatchUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangePatchUpdatedNotification.ts
index 75b5de66a06a48..79824d2404cf25 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangePatchUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangePatchUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalParams.ts
index dac82c3bf2719d..249bf04eed42b1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalResponse.ts
index 12cda1993bb218..2b90999794def7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileChangeRequestApprovalResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemAccessMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemAccessMode.ts
index efefc8f6abf62b..f72e42e895937b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemAccessMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemAccessMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemPath.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemPath.ts
index c0e7a77c023601..aa24578c6abe4e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemPath.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemPath.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSandboxEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSandboxEntry.ts
index 3b2386161bdba0..5f4b16668bd12a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSandboxEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSandboxEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSpecialPath.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSpecialPath.ts
index aaca9b6dbde270..e537627a704463 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSpecialPath.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileSystemSpecialPath.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileUpdateChange.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileUpdateChange.ts
index 62b9aa1d4692a2..634cc9990671a4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileUpdateChange.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FileUpdateChange.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ForcedChatgptWorkspaceIds.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ForcedChatgptWorkspaceIds.ts
index 8c9888698e74b7..2001ebb0f78a15 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ForcedChatgptWorkspaceIds.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ForcedChatgptWorkspaceIds.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsChangedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsChangedNotification.ts
index 186be26b32b5aa..316fd6ebb93a5f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsChangedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsChangedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyParams.ts
index b3518534a2a7e1..a0a79bcb5877be 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyResponse.ts
index daef489321975c..621aec506bbcaf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCopyResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryParams.ts
index e951be07126391..a0cf98597c9d93 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryResponse.ts
index 27be50f9e2e24e..409a31d29524c5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsCreateDirectoryResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataParams.ts
index 487f8e12c5b29b..5c934013633259 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataResponse.ts
index b2cb63548bc13d..f271cabb5bc0b0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsGetMetadataResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryEntry.ts
index fe4018d63097d8..78296f006cc8a0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryParams.ts
index 74073724aa53c3..cb6a9b82888793 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryResponse.ts
index 56be819c01f931..413b1f1cfc075f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadDirectoryResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileParams.ts
index abcf708cd75bd7..a456d0f117b7d9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileResponse.ts
index 8c3abaf2ac5f6d..5ad65a6e827297 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsReadFileResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveParams.ts
index 06fbe83e4cec55..db37c56542317d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveResponse.ts
index 2a2e6159fe8559..14d8bab55dd5f0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsRemoveResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchParams.ts
index ad3d1fc7973073..b1e28177a9efa6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchResponse.ts
index 52095d4a4050d1..6b0c8036e1d9a6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsUnwatchResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchParams.ts
index 0ac5733cfbc6e7..c49b8388b2a319 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchResponse.ts
index 5171caefdeabfe..9dc9ffed0bc894 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWatchResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileParams.ts
index 8193fc5b9c3f6e..ab98c731edd711 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileResponse.ts
index 32d45bb0326397..9bfebb2afad3eb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/FsWriteFileResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountParams.ts
index ebec8b81911ec5..de879015e552af 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountRateLimitsResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountRateLimitsResponse.ts
index f28c7b928a7972..e72de595c180c9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountRateLimitsResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountRateLimitsResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountResponse.ts
index 02bd06edfc6033..10f9537a1ac60f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageParams.ts
new file mode 100644
index 00000000000000..9c881b80cb6c73
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageParams.ts
@@ -0,0 +1,14 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/GetAccountTokenUsageParams.ts
+
+export type GetAccountTokenUsageParams = {
+	/**
+	 * When present, read estimated usage for this thread instead of account-wide token activity.
+	 */
+	threadId?: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageResponse.ts
index dc71caed30a55a..4137df83acf7e8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetAccountTokenUsageResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,5 +8,12 @@
 
 import type { AccountTokenUsageDailyBucket } from "./AccountTokenUsageDailyBucket.js";
 import type { AccountTokenUsageSummary } from "./AccountTokenUsageSummary.js";
+import type { ThreadUsage } from "./ThreadUsage.js";
 
-export type GetAccountTokenUsageResponse = { summary: AccountTokenUsageSummary, dailyUsageBuckets: Array<AccountTokenUsageDailyBucket> | null, };
+export type GetAccountTokenUsageResponse = {
+	summary: AccountTokenUsageSummary, dailyUsageBuckets: Array<AccountTokenUsageDailyBucket> | null,
+	/**
+	 * Estimated usage when a thread was requested and its billing route is available.
+	 */
+	threadUsage?: ThreadUsage | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetWorkspaceMessagesResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetWorkspaceMessagesResponse.ts
index 49f40273784329..1958cdd7822fef 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetWorkspaceMessagesResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GetWorkspaceMessagesResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GitInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GitInfo.ts
index 8a812d1182d691..c2839beef3ad9b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GitInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GitInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GrantedPermissionProfile.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GrantedPermissionProfile.ts
index d985650a361b65..24b4f660c209b8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GrantedPermissionProfile.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GrantedPermissionProfile.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReview.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReview.ts
index 77ac81ca3771a1..b0051707fb40d8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReview.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReview.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewAction.ts
index 38cd2e031d3b4c..64db1f7cc5485c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewStatus.ts
index 40d439ba629fe6..977a56eda94fea 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianApprovalReviewStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianCommandSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianCommandSource.ts
index 417b36a9c7f3b8..1062d74030ad6a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianCommandSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianCommandSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianRiskLevel.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianRiskLevel.ts
index 3d99dded48fc41..bfb935683ba40c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianRiskLevel.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianRiskLevel.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianUserAuthorization.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianUserAuthorization.ts
index e43a76270cca7a..c08e08739ee1a7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianUserAuthorization.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianUserAuthorization.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianWarningNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianWarningNotification.ts
index 7d7cf2cc5fdbe4..e963ffae6725ce 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianWarningNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/GuardianWarningNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookCompletedNotification.ts
index 45a8709664157d..e977326ef54296 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookErrorInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookErrorInfo.ts
index 0cc2d7ca416982..cbfba6e19f7e9d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookErrorInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookErrorInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookEventName.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookEventName.ts
index 3ecd8fea56721a..73378cb7680b02 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookEventName.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookEventName.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookExecutionMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookExecutionMode.ts
index 51a0a91bf601dd..c0f45d59182468 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookExecutionMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookExecutionMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookHandlerType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookHandlerType.ts
index e3c6affe71d5e9..b902a58e362832 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookHandlerType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookHandlerType.ts
@@ -1,9 +1,9 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/HookHandlerType.ts
 
-export type HookHandlerType = "command" | "prompt" | "agent";
+export type HookHandlerType = "command" | "mcpTool" | "prompt" | "agent";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMetadata.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMetadata.ts
index 1b29634dada026..bb1f4265d34247 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMetadata.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMetadata.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,15 +8,14 @@
 
 import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
 import type { HookEventName } from "./HookEventName.js";
-import type { HookHandlerType } from "./HookHandlerType.js";
 import type { HookSource } from "./HookSource.js";
 import type { HookTrustStatus } from "./HookTrustStatus.js";
 
 export type HookMetadata = {
-	key: string, eventName: HookEventName, handlerType: HookHandlerType, matcher: string | null, command: string | null, timeoutSec: bigint, statusMessage: string | null,
+	key: string, eventName: HookEventName, matcher: string | null, timeoutSec: bigint, statusMessage: string | null,
 	/**
 	 * Configured `additionalContext` spill threshold.
 	 * `null` uses 2,500 tokens; `0` disables spilling.
 	 */
 	additionalContextLimit: number | null, sourcePath: AbsolutePathBuf, source: HookSource, pluginId: string | null, displayOrder: bigint, enabled: boolean, isManaged: boolean, currentHash: string, trustStatus: HookTrustStatus,
-};
+} & ({ "handlerType": "command", command: string, async: boolean, } | { "handlerType": "mcpTool", server: string, tool: string, } | { "handlerType": "prompt", } | { "handlerType": "agent", });
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMigration.ts
index ce5471ceaaab17..9a7e4c28002dd7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntry.ts
index e2b839dfad92f6..85d19d73fd3f61 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntryKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntryKind.ts
index 18a6d4b8e97396..e0a1c53a6ac269 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntryKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookOutputEntryKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookPromptFragment.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookPromptFragment.ts
index d6a7362cd7ca6a..2392e1b39dde42 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookPromptFragment.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookPromptFragment.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunStatus.ts
index e1e7544dda6bac..a19c0131f54ba9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunSummary.ts
index 04ed5769551ffc..9541bcdab99122 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookRunSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookScope.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookScope.ts
index 8071f77b3589d5..f709e0a9b6547b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookScope.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookScope.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookSource.ts
index ae53ab6b92c824..a4f9c4e7575f6a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookStartedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookStartedNotification.ts
index 71df7b0b67ef75..e14e17afead0e0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookStartedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookStartedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookTrustStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookTrustStatus.ts
index c11250f3a774ca..ef28319502b396 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookTrustStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HookTrustStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListEntry.ts
index e4d7723c51371f..29322cb67ed340 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListParams.ts
index cbd9e0902baa59..86c84a2f69094a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListResponse.ts
index 5249d10fa64a04..45c349446256a3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/HooksListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/InstalledApp.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/InstalledApp.ts
index 3f36b588359bc3..253a1d2f725663 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/InstalledApp.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/InstalledApp.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemCompletedNotification.ts
index c8622f3f0de93a..c49425abad9a3c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewCompletedNotification.ts
index 0d363ebd869113..c334eb53cadb70 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewStartedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewStartedNotification.ts
index 98af56f5cdd315..a354be5aa81ebc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewStartedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemGuardianApprovalReviewStartedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemStartedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemStartedNotification.ts
index 176a0fc2c5f2a3..2b35eaed0302ba 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemStartedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ItemStartedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusParams.ts
index c8f94e55c8b91d..2883335d7f0f37 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusResponse.ts
index 2411d4a0def6c8..ea856dfc47c8bf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ListMcpServerStatusResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountParams.ts
index c7fc3e5136c673..12e40501a71055 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountResponse.ts
index afe31e3f72f6e2..c67f4ee342c28c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAccountResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAppBrand.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAppBrand.ts
index 8ec56c54bb1617..da708753764ebe 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAppBrand.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LoginAppBrand.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LogoutAccountResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LogoutAccountResponse.ts
index b4d00bd64e8bbe..0441e7b1fc03d9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LogoutAccountResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/LogoutAccountResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ManagedHooksRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ManagedHooksRequirements.ts
index 8bcc85a7b824da..eaa94873ee7509 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ManagedHooksRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ManagedHooksRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddParams.ts
index 3d898a2ed015a8..0c77416956073a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddResponse.ts
index 0718ddabfa6524..b01c0c18eaaf49 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceAddResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceInterface.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceInterface.ts
index 883825682d3926..396221ce27d523 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceInterface.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceInterface.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceLoadErrorInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceLoadErrorInfo.ts
index f884b2dd60059b..eb953b262b666a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceLoadErrorInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceLoadErrorInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveParams.ts
index ae6925edf6463e..8f2b7d8d19f92f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveResponse.ts
index 09b1bbcbf204b7..defd5e623a8c12 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceRemoveResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeErrorInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeErrorInfo.ts
index a99d052afe4cd6..c5954811309911 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeErrorInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeErrorInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeParams.ts
index 210d19d7d84546..5a54a6fe37e8ac 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeResponse.ts
index 330dfca682610f..adeb80316add62 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MarketplaceUpgradeResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpAuthStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpAuthStatus.ts
index c9f6eb2bcc8f34..54eba0967c630e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpAuthStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpAuthStatus.ts
@@ -1,9 +1,9 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/McpAuthStatus.ts
 
-export type McpAuthStatus = "unsupported" | "notLoggedIn" | "bearerToken" | "oAuth";
+export type McpAuthStatus = "unknown" | "unsupported" | "notLoggedIn" | "bearerToken" | "oAuth";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationArrayType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationArrayType.ts
index 72a9cff7924bf0..64475f1c5bc74d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationArrayType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationArrayType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanSchema.ts
index 42ec36a5e3cc0b..4d7423686ced79 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanType.ts
index cb4ade9f5f8e19..64fe0cc06d283c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationBooleanType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationConstOption.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationConstOption.ts
index 0d7a562d452c6a..927df023b6b66e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationConstOption.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationConstOption.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationEnumSchema.ts
index 549ac4fe3492a9..e1a96e2f102b2f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationLegacyTitledEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationLegacyTitledEnumSchema.ts
index 3916c3f690c8d4..24c7961cd62fe7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationLegacyTitledEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationLegacyTitledEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationMultiSelectEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationMultiSelectEnumSchema.ts
index 20dc6d62b36966..7740f7cc3cb897 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationMultiSelectEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationMultiSelectEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberSchema.ts
index 95c5337374be65..2018e9a496514d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberType.ts
index e580bb2ff43265..1bc2b53cd22744 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationNumberType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationObjectType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationObjectType.ts
index 7fefb1b4d1bc64..c3d938237309ea 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationObjectType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationObjectType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationPrimitiveSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationPrimitiveSchema.ts
index 3e008b564dff6f..398f4fc93a20c1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationPrimitiveSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationPrimitiveSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSchema.ts
index 3ede03ad5f4805..c94b891c4dc00f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSingleSelectEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSingleSelectEnumSchema.ts
index 883d10ec56e645..50f73c30f6bd79 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSingleSelectEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationSingleSelectEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringFormat.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringFormat.ts
index 64c4de247545ab..24885e638ef5e7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringFormat.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringFormat.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringSchema.ts
index ff3dcac2a904ac..ad6fd12e6a8711 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringType.ts
index e9d8a46edf02c4..3b308e0a4a09cc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationStringType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledEnumItems.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledEnumItems.ts
index 78060464f5106b..feb41b79116549 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledEnumItems.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledEnumItems.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledMultiSelectEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledMultiSelectEnumSchema.ts
index f08881d729efe4..72528899854189 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledMultiSelectEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledMultiSelectEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledSingleSelectEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledSingleSelectEnumSchema.ts
index a1f6bee6b3639b..45ce673e3434a7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledSingleSelectEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationTitledSingleSelectEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledEnumItems.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledEnumItems.ts
index 35f69ffba26740..e915093742e5b4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledEnumItems.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledEnumItems.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledMultiSelectEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledMultiSelectEnumSchema.ts
index 71609001428a37..5fa93ffe3ee913 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledMultiSelectEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledMultiSelectEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledSingleSelectEnumSchema.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledSingleSelectEnumSchema.ts
index 92ac2f2c260515..ebb114cb29b83f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledSingleSelectEnumSchema.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpElicitationUntitledSingleSelectEnumSchema.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadParams.ts
index 0a4f9c27e38d25..3e0a6245c47ebf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadParams.ts
@@ -1,9 +1,15 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/McpResourceReadParams.ts
 
-export type McpResourceReadParams = { threadId?: string | null, server: string, uri: string, };
+export type McpResourceReadParams = {
+	threadId?: string | null,
+	/**
+	 * Originating MCP tool call used to select the resource's app.
+	 */
+	originCallId?: string | null, server: string, uri: string, connectorId?: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadResponse.ts
index 7fa37e1956147d..df737910ec3c3c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpResourceReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,4 +8,10 @@
 
 import type { ResourceContent } from "../ResourceContent.js";
 
-export type McpResourceReadResponse = { contents: Array<ResourceContent>, };
+export type McpResourceReadResponse = {
+	contents: Array<ResourceContent>,
+	/**
+	 * Originating call when the server applied app-specific resource scoping.
+	 */
+	originCallId: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationAction.ts
index 23734a30ba0cf4..fd23de63d03e7b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestParams.ts
index 3665a351f5e6d1..9480d0602fee19 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestResponse.ts
index 7c7c57cdb40a6e..dea5432295f9ff 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerElicitationRequestResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerMigration.ts
index ee602874e671f0..3da7d41ccf4dea 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthClientRegistration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthClientRegistration.ts
new file mode 100644
index 00000000000000..fbfea3eeefacc5
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthClientRegistration.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/McpServerOauthClientRegistration.ts
+
+export type McpServerOauthClientRegistration = "auto" | "cimd" | "dcr";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginCompletedNotification.ts
index 6891bdbc70cea8..eafad848947b56 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginParams.ts
index 536e362800f7e2..8cd601bbe75c8f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginParams.ts
@@ -1,9 +1,17 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/McpServerOauthLoginParams.ts
 
-export type McpServerOauthLoginParams = { name: string, threadId?: string | null, scopes?: Array<string> | null, timeoutSecs?: bigint | null, };
+import type { McpServerOauthClientRegistration } from "./McpServerOauthClientRegistration.js";
+
+export type McpServerOauthLoginParams = {
+	name: string, threadId?: string | null,
+	/**
+	 * Registration strategy for this login only; omission selects automatic discovery.
+	 */
+	clientRegistration?: McpServerOauthClientRegistration | null, scopes?: Array<string> | null, timeoutSecs?: bigint | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginResponse.ts
index a8995334339a2c..54ebfd4521ef0b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerOauthLoginResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerRefreshResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerRefreshResponse.ts
index ce75e0c77e485b..6f5f807e785b56 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerRefreshResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerRefreshResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupFailureReason.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupFailureReason.ts
index 9b761c4f4ed13a..25802e434af781 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupFailureReason.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupFailureReason.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupState.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupState.ts
index 0e22340b10f9ac..cd995cc4ae6d39 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupState.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStartupState.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatus.ts
index 3d5c4a3127baf5..6ec4812ed19974 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -12,4 +12,4 @@ import type { ResourceTemplate } from "../ResourceTemplate.js";
 import type { Tool } from "../Tool.js";
 import type { McpAuthStatus } from "./McpAuthStatus.js";
 
-export type McpServerStatus = { name: string, serverInfo: McpServerInfo | null, tools: { [key in string]?: Tool }, resources: Array<Resource>, resourceTemplates: Array<ResourceTemplate>, authStatus: McpAuthStatus, };
+export type McpServerStatus = { name: string, pluginId: string | null, serverInfo: McpServerInfo | null, tools: { [key in string]?: Tool }, resources: Array<Resource>, resourceTemplates: Array<ResourceTemplate>, authStatus: McpAuthStatus, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusDetail.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusDetail.ts
index 6d268d9509f782..18e58e806fbbf1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusDetail.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusDetail.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusUpdatedNotification.ts
index da51eb01347780..73adab45345590 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerStatusUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallParams.ts
index c4ea54a0a9c810..73e753570d8f0d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallResponse.ts
index f2ffb52f8cbf0a..54178b671126d0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpServerToolCallResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallAppContext.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallAppContext.ts
index 02a59a2c7ebdad..45610d14fc8479 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallAppContext.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallAppContext.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallError.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallError.ts
index d90c16f3390085..3aed059ad6a174 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallError.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallError.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallProgressNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallProgressNotification.ts
index 9f06d6358b1278..e75621cd5f5fe4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallProgressNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallProgressNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallResult.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallResult.ts
index e8a96f352614a2..12d277f41e57f5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallResult.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallResult.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallStatus.ts
index ce92175c8aedf3..2aa1d7894db4aa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/McpToolCallStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitation.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitation.ts
index 90ce6ef13babf1..2be4e7169abff9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitation.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitation.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitationEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitationEntry.ts
index b43e73a96a69c7..70c1360223c006 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitationEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryCitationEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryResetResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryResetResponse.ts
index 1711a1a6118a9d..4e99be790d484b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryResetResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MemoryResetResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MergeStrategy.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MergeStrategy.ts
index 76a0b76dd07ff0..71f958d8ecd426 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MergeStrategy.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MergeStrategy.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MigrationDetails.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MigrationDetails.ts
index 2b62a0d3f01bb1..001f86e41b9786 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MigrationDetails.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MigrationDetails.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodParams.ts
index 122865d93e25ea..b8417a3bfffb5c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodResponse.ts
index abdb79b0feb1b8..8d408a37d6bbff 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MockExperimentalMethodResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Model.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Model.ts
index 87d48bdd52801e..8a6a0cecc420c3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Model.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Model.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -11,10 +11,15 @@ import type { ReasoningEffort } from "../ReasoningEffort.js";
 import type { ModelAvailabilityNux } from "./ModelAvailabilityNux.js";
 import type { ModelServiceTier } from "./ModelServiceTier.js";
 import type { ModelUpgradeInfo } from "./ModelUpgradeInfo.js";
+import type { MultiAgentVersion } from "./MultiAgentVersion.js";
 import type { ReasoningEffortOption } from "./ReasoningEffortOption.js";
 
 export type Model = {
-	id: string, model: string, upgrade: string | null, upgradeInfo: ModelUpgradeInfo | null, availabilityNux: ModelAvailabilityNux | null, displayName: string, description: string, hidden: boolean, supportedReasoningEfforts: Array<ReasoningEffortOption>, defaultReasoningEffort: ReasoningEffort, inputModalities: Array<InputModality>, supportsPersonality: boolean,
+	id: string, model: string, upgrade: string | null, upgradeInfo: ModelUpgradeInfo | null, availabilityNux: ModelAvailabilityNux | null, displayName: string, description: string, modelSpecialty: string | null, hidden: boolean, supportedReasoningEfforts: Array<ReasoningEffortOption>, defaultReasoningEffort: ReasoningEffort, inputModalities: Array<InputModality>, supportsPersonality: boolean,
+	/**
+	 * Multi-agent runtime declared by this model, when available.
+	 */
+	multiAgentVersion: MultiAgentVersion | null,
 	/**
 	 * Deprecated: use `serviceTiers` instead.
 	 */
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelAvailabilityNux.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelAvailabilityNux.ts
index 6d9a11d7f8fc74..1e9e5984719dbf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelAvailabilityNux.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelAvailabilityNux.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListParams.ts
index a01373ee097e1c..f38808f0d734ab 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListResponse.ts
index a3944d2a75eaae..ff8262a5fdb0f0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadParams.ts
index 8a0bb9b4a9c493..5323a09926d281 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadResponse.ts
index 2632e6b03fbd4f..accddb6d6070aa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelProviderCapabilitiesReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelRerouteReason.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelRerouteReason.ts
index 91d597b31f82f7..83c570a77832e0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelRerouteReason.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelRerouteReason.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelReroutedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelReroutedNotification.ts
index 0e4f51d12cf9ab..4ad9e3480eb3cc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelReroutedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelReroutedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelSafetyBufferingUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelSafetyBufferingUpdatedNotification.ts
index f7dc321b15a535..fef1f2495d1c46 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelSafetyBufferingUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelSafetyBufferingUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelServiceTier.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelServiceTier.ts
index fe93c7f1fcaeda..65ff3c234725b6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelServiceTier.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelServiceTier.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelUpgradeInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelUpgradeInfo.ts
index 94d192b588e595..5d04f801274b1f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelUpgradeInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelUpgradeInfo.ts
@@ -1,9 +1,15 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ModelUpgradeInfo.ts
 
-export type ModelUpgradeInfo = { model: string, upgradeCopy: string | null, modelLink: string | null, migrationMarkdown: string | null, };
+export type ModelUpgradeInfo = {
+	model: string, upgradeCopy: string | null, modelLink: string | null, migrationMarkdown: string | null,
+	/**
+	 * Informational Unix timestamp for this upgrade's scheduled retirement, if known.
+	 */
+	retirementAt: number | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerification.ts
index 458ea19faec5c7..214d1559ef0476 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerificationNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerificationNotification.ts
index 4d34dd87ac40c3..d7b661e06b04ad 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerificationNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelVerificationNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelsRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelsRequirements.ts
index e8ca76cebda0cd..fe1889ef65be72 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelsRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ModelsRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MultiAgentVersion.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MultiAgentVersion.ts
new file mode 100644
index 00000000000000..62f22c5d055996
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/MultiAgentVersion.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/MultiAgentVersion.ts
+
+/**
+ * Multi-agent runtime supported by a model.
+ */
+export type MultiAgentVersion = "disabled" | "v1" | "v2";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkAccess.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkAccess.ts
index 69fda2aeaa58d3..b885e3220f1b0e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkAccess.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkAccess.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalContext.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalContext.ts
index ef4e4fefdb6976..42caa7d6007fe7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalContext.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalContext.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalProtocol.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalProtocol.ts
index 0cb750039270a8..75d33a2f4f065f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalProtocol.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkApprovalProtocol.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkDomainPermission.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkDomainPermission.ts
index 4a05ce3b7d7aee..409c80d50bcb05 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkDomainPermission.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkDomainPermission.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyAmendment.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyAmendment.ts
index 0ef621b98fe662..24d0ac8942bb8d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyAmendment.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyAmendment.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyRuleAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyRuleAction.ts
index 84a59f100a267e..cdc56c589215f4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyRuleAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkPolicyRuleAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkRequirements.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkRequirements.ts
index 54d7511d5b1da3..a392320dcbdc6f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkRequirements.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkRequirements.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkUnixSocketPermission.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkUnixSocketPermission.ts
index b1ff430c044aab..433377d646fc1a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkUnixSocketPermission.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NetworkUnixSocketPermission.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NewThreadModelDefaults.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NewThreadModelDefaults.ts
index 42f322837474aa..4d6c60d5483661 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NewThreadModelDefaults.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NewThreadModelDefaults.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NonSteerableTurnKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NonSteerableTurnKind.ts
index b2952a8f650101..7284cb30824ec8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NonSteerableTurnKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/NonSteerableTurnKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/OverriddenMetadata.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/OverriddenMetadata.ts
index 0464265612a53c..cf4c0ed291c5de 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/OverriddenMetadata.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/OverriddenMetadata.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchApplyStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchApplyStatus.ts
index 347d7c2448903b..b98050cf589759 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchApplyStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchApplyStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchChangeKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchChangeKind.ts
index fdd6e5add89489..27e8d8aab5a969 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchChangeKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PatchChangeKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionGrantScope.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionGrantScope.ts
index 55f3584957f4e8..715c90dbfe11f5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionGrantScope.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionGrantScope.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListParams.ts
index ae0abf2192034b..3ecad15c273fd1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListResponse.ts
index 3a14536ac774f3..d2b585377c03c6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileSummary.ts
index a1dd151d07aab3..85a8ed1de924f5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionProfileSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalParams.ts
index 5962aa27d7464e..09817cd760fc36 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalResponse.ts
index 6ff30d2b41c70a..d7d00d1e63e99b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PermissionsRequestApprovalResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PlanDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PlanDeltaNotification.ts
index b766504a49f397..174d2fd497d419 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PlanDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PlanDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAuthPolicy.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAuthPolicy.ts
index 9f17cfcc2a280d..3bb90ab3c126be 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAuthPolicy.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAuthPolicy.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAvailability.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAvailability.ts
index 77239057292f92..c8c12e6b8d5e33 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAvailability.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginAvailability.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDetail.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDetail.ts
index 3c07d2c2124c50..cf1245ec4f0255 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDetail.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDetail.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDisabledReason.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDisabledReason.ts
new file mode 100644
index 00000000000000..9f7443323c780e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginDisabledReason.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/PluginDisabledReason.ts
+
+export type PluginDisabledReason = "disabled_by_admin" | "plan_not_eligible" | "required_app_unavailable" | "unknown";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginHookSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginHookSummary.ts
index 08f61a3d709df9..9ad000a8e85a5a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginHookSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginHookSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallParams.ts
index 42ca9e386d6be6..b1433a33762738 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,4 +8,10 @@
 
 import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
 
-export type PluginInstallParams = { marketplacePath?: AbsolutePathBuf | null, remoteMarketplaceName?: string | null, pluginName: string, };
+export type PluginInstallParams = {
+	marketplacePath?: AbsolutePathBuf | null, remoteMarketplaceName?: string | null,
+	/**
+	 * Client-generated identifier used to correlate one installation attempt.
+	 */
+	installAttemptId?: string | null, pluginName: string,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicy.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicy.ts
index 7deee5344e9162..d3583b9e1a395e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicy.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicy.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicySource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicySource.ts
index a6bd1296b05f83..010d6c868ba24f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicySource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallPolicySource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallResponse.ts
index 557b731a03fbff..58366c20bf341a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstallResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledParams.ts
index 5cd8e60d9b64e4..20ad44b1fb2e89 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledResponse.ts
index 2a600f1165ef8b..c22cd721683a8d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInstalledResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInterface.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInterface.ts
index af7b5c697df24b..9905bb7edef91a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInterface.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginInterface.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListMarketplaceKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListMarketplaceKind.ts
index 097a7c42ac5735..33c61e5ef3810f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListMarketplaceKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListMarketplaceKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListParams.ts
index 4608d4b4c45638..91abbbbe434b60 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListResponse.ts
index e18815df3b9108..fb4b1034d51481 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginMarketplaceEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginMarketplaceEntry.ts
index 188f75d99f402b..610f18f84e3226 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginMarketplaceEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginMarketplaceEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadParams.ts
index 71b3de0fa47449..2eae1bbe790336 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadResponse.ts
index ab3802984b7817..09409e4be9bd4e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchParams.ts
new file mode 100644
index 00000000000000..e6969dd7cee7ee
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchParams.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/PluginSearchParams.ts
+
+import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
+import type { PluginSearchScope } from "./PluginSearchScope.js";
+
+export type PluginSearchParams = { searchTerm: string, scope?: PluginSearchScope | null, cwds?: Array<AbsolutePathBuf> | null, cursor?: string | null, limit?: number | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchResponse.ts
new file mode 100644
index 00000000000000..19fbc6d1232f48
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/PluginSearchResponse.ts
+
+import type { PluginSearchResult } from "./PluginSearchResult.js";
+
+export type PluginSearchResponse = { data: Array<PluginSearchResult>, nextCursor: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchResult.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchResult.ts
new file mode 100644
index 00000000000000..c30d15918b5902
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchResult.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/PluginSearchResult.ts
+
+import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
+import type { PluginSummary } from "./PluginSummary.js";
+
+export type PluginSearchResult = { plugin: PluginSummary, marketplaceName: string, marketplacePath: AbsolutePathBuf | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchScope.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchScope.ts
new file mode 100644
index 00000000000000..17e545b40ed2b6
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSearchScope.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/PluginSearchScope.ts
+
+export type PluginSearchScope = "global" | "workspace" | "personal";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutParams.ts
index 0d05972447218d..a51c421b69d411 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutResponse.ts
index d692569c2bc1d2..dfa6f7fbea3f5c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareCheckoutResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareContext.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareContext.ts
index a88fb5d81f3d7d..10cb26da27c75b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareContext.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareContext.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteParams.ts
index 0e15f9a41bc2a2..41df63ef2ac15f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteResponse.ts
index af50ca47c93702..8368990923c4ef 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDeleteResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDiscoverability.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDiscoverability.ts
index 61b369766d83f3..09a3bebb53b334 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDiscoverability.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareDiscoverability.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListItem.ts
index 3f2e8bbbc9924b..085892b641b167 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListParams.ts
index 5e9f16fd68fdef..580939bec0cdf1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListResponse.ts
index 7f1e198df65b46..9b0ea022f167a6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipal.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipal.ts
index aea6dfa7bec95b..de089a201a3b19 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipal.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipal.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalRole.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalRole.ts
index 4bb6443a05600c..31a2891c6dee44 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalRole.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalRole.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalType.ts
index ac34dc26a0384b..473e85ac42f551 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSharePrincipalType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveParams.ts
index c8e922eb372d59..e2cf9a2ef136f4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveResponse.ts
index c2245e62ef26c2..73dc3a535eff92 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareSaveResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTarget.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTarget.ts
index a1da7646d55a14..f43a857c104791 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTarget.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTarget.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTargetRole.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTargetRole.ts
index 926fc68be65d81..1716ef584d96c7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTargetRole.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareTargetRole.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateDiscoverability.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateDiscoverability.ts
index 484ed388d3a8df..28c607396b2be8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateDiscoverability.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateDiscoverability.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsParams.ts
index 81982bac5bc1a5..5ec5b27f4d8f9b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsResponse.ts
index c94e564605cd73..80fae043e20e4c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginShareUpdateTargetsResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadParams.ts
index 88e01373d1ea1e..bb73191b263d8a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadResponse.ts
index 1e260b0112501e..ceb5eed18392ff 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSkillReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSource.ts
index fe861142fb7857..d9d3ba8902e707 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSummary.ts
index 00caa9b013674f..3e4e12fa46b857 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -8,6 +8,7 @@
 
 import type { PluginAuthPolicy } from "./PluginAuthPolicy.js";
 import type { PluginAvailability } from "./PluginAvailability.js";
+import type { PluginDisabledReason } from "./PluginDisabledReason.js";
 import type { PluginInstallPolicy } from "./PluginInstallPolicy.js";
 import type { PluginInstallPolicySource } from "./PluginInstallPolicySource.js";
 import type { PluginInterface } from "./PluginInterface.js";
@@ -31,9 +32,21 @@ export type PluginSummary = {
 	/**
 	 * Remote sharing context associated with this plugin when available.
 	 */
-	shareContext: PluginShareContext | null, source: PluginSource, installed: boolean, enabled: boolean, installPolicy: PluginInstallPolicy, installPolicySource: PluginInstallPolicySource | null, mustShowInstallationInterstitial: boolean | null, authPolicy: PluginAuthPolicy,
+	shareContext: PluginShareContext | null, source: PluginSource, installed: boolean,
+	/**
+	 * Unix timestamp in seconds when the remote plugin was installed, when available.
+	 */
+	installedAt: number | null, enabled: boolean, installPolicy: PluginInstallPolicy, installPolicySource: PluginInstallPolicySource | null, mustShowInstallationInterstitial: boolean | null, authPolicy: PluginAuthPolicy,
 	/**
 	 * Availability state for installing and using the plugin.
 	 */
-	availability: PluginAvailability, interface: PluginInterface | null, keywords: Array<string>,
+	availability: PluginAvailability,
+	/**
+	 * Why the remote plugin is unavailable, when provided by plugin-service.
+	 */
+	disabledReason: PluginDisabledReason | null,
+	/**
+	 * Raw plugin-service plan identifiers eligible to install the plugin.
+	 */
+	eligiblePlanTypes: Array<string> | null, interface: PluginInterface | null, keywords: Array<string>,
 };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallParams.ts
index f25f36fc62904c..ca51afb2302df4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallResponse.ts
index 8f051f2ac1432c..9034eacc282aaf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginUninstallResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginsMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginsMigration.ts
index a34991a455bc77..1508690f7332f6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginsMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/PluginsMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessExitedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessExitedNotification.ts
index 88f91e515ff1c7..c6f82172a4d618 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessExitedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessExitedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillParams.ts
index d71e87fa919c55..3dbebfa035cf4c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillResponse.ts
index b1f02b66dcadbc..b99f1907625ae8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessKillResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputDeltaNotification.ts
index d83c0209484b4c..0db5c7c563d451 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputStream.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputStream.ts
index d3a9b99fb9b800..19f097159d48ed 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputStream.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessOutputStream.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyParams.ts
index b74d01cd21e1d8..ebf574661499fe 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyResponse.ts
index 4134db25c8d21b..64a456191188d4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessResizePtyResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnParams.ts
index bd36af8f2935f4..c3566e1eed2f23 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnResponse.ts
index a2297d29087ed7..6d840d1540b455 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessSpawnResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessTerminalSize.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessTerminalSize.ts
index cafae95777f0cf..6d064e0e3d4feb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessTerminalSize.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessTerminalSize.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinParams.ts
index 681cfd04da618e..8a02480dc46492 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinResponse.ts
index eee0811abd0452..d365ccf7bd7ac4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProcessWriteStdinResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Project.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Project.ts
new file mode 100644
index 00000000000000..f5f500c1111adf
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Project.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/Project.ts
+
+import type { ProjectRoot } from "./ProjectRoot.js";
+
+export type Project = { id: string, name: string, roots: Array<ProjectRoot>, metadata: { [key in string]?: string }, position: number, createdAt: number, updatedAt: number, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectChangeType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectChangeType.ts
new file mode 100644
index 00000000000000..d0deab97f81364
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectChangeType.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectChangeType.ts
+
+export type ProjectChangeType = "created" | "updated" | "deleted";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectChangedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectChangedNotification.ts
new file mode 100644
index 00000000000000..a100a17cf2d1ca
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectChangedNotification.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectChangedNotification.ts
+
+import type { ProjectChangeType } from "./ProjectChangeType.js";
+
+export type ProjectChangedNotification = { projectId: string, changeType: ProjectChangeType, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectCreateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectCreateParams.ts
new file mode 100644
index 00000000000000..a59b8d4a6879ec
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectCreateParams.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectCreateParams.ts
+
+import type { ProjectRoot } from "./ProjectRoot.js";
+
+export type ProjectCreateParams = { name: string, roots: Array<ProjectRoot>, metadata?: { [key in string]?: string } | null, idempotencyKey: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectCreateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectCreateResponse.ts
new file mode 100644
index 00000000000000..481a3ef5c1309d
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectCreateResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectCreateResponse.ts
+
+import type { Project } from "./Project.js";
+
+export type ProjectCreateResponse = { project: Project, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectDeleteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectDeleteParams.ts
new file mode 100644
index 00000000000000..eb17a46b29b1d2
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectDeleteParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectDeleteParams.ts
+
+export type ProjectDeleteParams = { projectId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectDeleteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectDeleteResponse.ts
new file mode 100644
index 00000000000000..885de90641b87e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectDeleteResponse.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectDeleteResponse.ts
+
+export type ProjectDeleteResponse = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectImportParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectImportParams.ts
new file mode 100644
index 00000000000000..ebdb8b02bd86ee
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectImportParams.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectImportParams.ts
+
+import type { ProjectRoot } from "./ProjectRoot.js";
+
+export type ProjectImportParams = { name: string, roots: Array<ProjectRoot>, metadata?: { [key in string]?: string } | null, threads?: Array<string> | null, idempotencyKey: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectImportResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectImportResponse.ts
new file mode 100644
index 00000000000000..ca91df0aaff8d2
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectImportResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectImportResponse.ts
+
+import type { Project } from "./Project.js";
+
+export type ProjectImportResponse = { project: Project, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectListParams.ts
new file mode 100644
index 00000000000000..e73d7ebcc75f73
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectListParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectListParams.ts
+
+export type ProjectListParams = { cursor?: string | null, limit?: number | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectListResponse.ts
new file mode 100644
index 00000000000000..3dc30cc909e91d
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectListResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectListResponse.ts
+
+import type { Project } from "./Project.js";
+
+export type ProjectListResponse = { data: Array<Project>, nextCursor: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectMoveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectMoveParams.ts
new file mode 100644
index 00000000000000..8f53755a4a1056
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectMoveParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectMoveParams.ts
+
+export type ProjectMoveParams = { projectId: string, beforeProjectId?: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectMoveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectMoveResponse.ts
new file mode 100644
index 00000000000000..56aec33edb02c1
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectMoveResponse.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectMoveResponse.ts
+
+export type ProjectMoveResponse = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectReadParams.ts
new file mode 100644
index 00000000000000..6f5518f30ef7b4
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectReadParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectReadParams.ts
+
+export type ProjectReadParams = { projectId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectReadResponse.ts
new file mode 100644
index 00000000000000..a937ef114dff18
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectReadResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectReadResponse.ts
+
+import type { Project } from "./Project.js";
+
+export type ProjectReadResponse = { project: Project, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectRoot.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectRoot.ts
new file mode 100644
index 00000000000000..74c9ef3f506718
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectRoot.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectRoot.ts
+
+import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
+
+export type ProjectRoot = { path: AbsolutePathBuf, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectUpdateParams.ts
new file mode 100644
index 00000000000000..2fc46e2b9c9e7a
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectUpdateParams.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectUpdateParams.ts
+
+import type { ProjectRoot } from "./ProjectRoot.js";
+
+export type ProjectUpdateParams = { projectId: string, name?: string | null, roots?: Array<ProjectRoot> | null, metadata?: { [key in string]?: string } | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectUpdateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectUpdateResponse.ts
new file mode 100644
index 00000000000000..c4de738e75ce68
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ProjectUpdateResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ProjectUpdateResponse.ts
+
+import type { Project } from "./Project.js";
+
+export type ProjectUpdateResponse = { project: Project, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/QueuedSubmission.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/QueuedSubmission.ts
new file mode 100644
index 00000000000000..0babb47f72cf37
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/QueuedSubmission.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/QueuedSubmission.ts
+
+import type { UserInput } from "./UserInput.js";
+
+export type QueuedSubmission = { id: string, input: Array<UserInput>, clientUserMessageId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitReachedType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitReachedType.ts
index c3684691a9eb9d..c979c80656e344 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitReachedType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitReachedType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCredit.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCredit.ts
index 819c5dbae7f835..013fb229ad323a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCredit.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCredit.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditStatus.ts
index 148efe72d6a611..e57d1f17ef20aa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditsSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditsSummary.ts
index 4674bb59c9c42e..cfc9d439ea1e56 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditsSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetCreditsSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetType.ts
index a1440f83ea8bc9..f1baa8fa76d70a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitResetType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitSnapshot.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitSnapshot.ts
index 04f9edbfdfbc24..01f9547d501b59 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitSnapshot.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitSnapshot.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitWindow.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitWindow.ts
index 7c6923dd074df0..c0a644152d9a5b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitWindow.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RateLimitWindow.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseCompletedNotification.ts
index a2c20742272ddb..f007c204bda368 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseItemCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseItemCompletedNotification.ts
index 99ba01a97219e0..4c70ad0e12cd84 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseItemCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RawResponseItemCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningEffortOption.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningEffortOption.ts
index b8aa0a768547a4..9bf5ca27873c5b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningEffortOption.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningEffortOption.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryPartAddedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryPartAddedNotification.ts
index 767a83d4d7aeca..a7760bdc4a966c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryPartAddedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryPartAddedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryTextDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryTextDeltaNotification.ts
index f41d23e6cce4e1..5a4b53fd2de7af 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryTextDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningSummaryTextDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningTextDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningTextDeltaNotification.ts
index f1b27a9a29c154..78ad4b9715c0ad 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningTextDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReasoningTextDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClient.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClient.ts
index 51eaff4adefddb..ffd2836130a62a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClient.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClient.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListOrder.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListOrder.ts
index 4e38766d887d69..ef759f19085325 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListOrder.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListOrder.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListParams.ts
index 9d1d3a09054a95..acf5a0232e8205 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListResponse.ts
index f7309732f540cd..5474730f19755f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeParams.ts
index 17d537af0be83d..4672c8b858a437 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeResponse.ts
index ee05ce19e65a05..050aeedc80410c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlClientsRevokeResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlConnectionStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlConnectionStatus.ts
index fea9f9a29820eb..8890d053893fe1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlConnectionStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlConnectionStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableParams.ts
index 45811c9280c5cb..8ef25e13070087 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableResponse.ts
index 41b7ad2b15d96f..a74ac6846c974d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlDisableResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableParams.ts
index 1133ada8919b34..920783120e27e6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableResponse.ts
index a383d31e3578b0..a0c61244bf4e13 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlEnableResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartParams.ts
index 50cb70c52aeac3..e061b00d50614e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartResponse.ts
index c0e2087eb8aecc..c92967b849de46 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusParams.ts
index 8201f5e5f3a639..ff635cc60ce965 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusResponse.ts
index e577a1d59edc8b..e456d0619cb22c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlPairingStatusResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusChangedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusChangedNotification.ts
index 1cc777ac28a583..532dedfe1c27b4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusChangedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusChangedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusReadResponse.ts
index 53f8b2d79623d8..b3922011b2cf4b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RemoteControlStatusReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RequestPermissionProfile.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RequestPermissionProfile.ts
index 04ba92ed04b9f2..5ababb521f3dd3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RequestPermissionProfile.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/RequestPermissionProfile.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ResidencyRequirement.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ResidencyRequirement.ts
index 5bd01d12182a09..4cd7cb512173a6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ResidencyRequirement.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ResidencyRequirement.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewDelivery.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewDelivery.ts
index e804267f16b218..55d0b4e156ea0a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewDelivery.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewDelivery.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartParams.ts
index 37246e0a77479f..d45103974d279e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartResponse.ts
index 55fe0c92e73e2d..a841b8956d9ed9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewTarget.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewTarget.ts
index 50b2ebc1cba4bc..8ae69fd6a2656d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewTarget.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ReviewTarget.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxMode.ts
index 02209444ce6fcf..8e878562e6e40e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxPolicy.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxPolicy.ts
index 408032732b875d..391c216d0ddabd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxPolicy.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxPolicy.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxWorkspaceWrite.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxWorkspaceWrite.ts
index 3fdf5dea2c9b56..9c5848a4493ad5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxWorkspaceWrite.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SandboxWorkspaceWrite.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSchedule.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSchedule.ts
index 67ab714000a0a7..3bd5f3e98ed217 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSchedule.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSchedule.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSummary.ts
index ecd36f98bf30d0..db78a6ab157583 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskWeekday.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskWeekday.ts
index 2b939734817b17..3a0e8f228db5dd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskWeekday.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ScheduledTaskWeekday.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SelectedCapabilityRoot.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SelectedCapabilityRoot.ts
index c92036b70c1b84..4d482275461a63 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SelectedCapabilityRoot.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SelectedCapabilityRoot.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailParams.ts
index 187b8d158f2694..1bfa5345a704a3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailResponse.ts
index d73c70870ec088..4d4c158aea771b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SendAddCreditsNudgeEmailResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsGauge.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsGauge.ts
new file mode 100644
index 00000000000000..d95dbc02098535
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsGauge.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ServerDiagnosticsGauge.ts
+
+export type ServerDiagnosticsGauge = { name: string, value: number, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsParams.ts
new file mode 100644
index 00000000000000..6deb877ad11740
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ServerDiagnosticsParams.ts
+
+export type ServerDiagnosticsParams = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsProcess.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsProcess.ts
new file mode 100644
index 00000000000000..a4aca5b219d152
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsProcess.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ServerDiagnosticsProcess.ts
+
+export type ServerDiagnosticsProcess = { id: number, residentMemoryBytes: number | null, physicalFootprintBytes: number | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsResponse.ts
new file mode 100644
index 00000000000000..3d6d53d5ea5483
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerDiagnosticsResponse.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ServerDiagnosticsResponse.ts
+
+import type { ServerDiagnosticsGauge } from "./ServerDiagnosticsGauge.js";
+import type { ServerDiagnosticsProcess } from "./ServerDiagnosticsProcess.js";
+
+export type ServerDiagnosticsResponse = { process: ServerDiagnosticsProcess, gauges: Array<ServerDiagnosticsGauge>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerRequestResolvedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerRequestResolvedNotification.ts
index 45b5b59863d38b..95c3916f437383 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerRequestResolvedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ServerRequestResolvedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionMigration.ts
index 555b1b2cd89b7e..f15539278b0414 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionSource.ts
index ea996147b60c5c..7bbf138fa0b172 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SessionSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillDependencies.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillDependencies.ts
index ec2657c27c02c2..489e4154d74586 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillDependencies.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillDependencies.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillErrorInfo.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillErrorInfo.ts
index faf015c98eb108..bd201a65918db5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillErrorInfo.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillErrorInfo.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillInterface.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillInterface.ts
index 04a61eb9e2859b..e5a3b624d18c3a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillInterface.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillInterface.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMetadata.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMetadata.ts
index 30f22177fe01ca..09df88529f9b58 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMetadata.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMetadata.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMigration.ts
index 9d75592ce8b8e1..62be92cbecbbd1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillScope.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillScope.ts
index edc700a18e6b4c..3ddb9d0137b818 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillScope.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillScope.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillSummary.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillSummary.ts
index 04e47efbeb9928..45bf4f7416192e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillSummary.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillSummary.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillToolDependency.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillToolDependency.ts
index ca9b144b9c0010..3fe11d77babd8e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillToolDependency.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillToolDependency.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsChangedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsChangedNotification.ts
index ce1a6cbf7962ad..48a723bfa0167d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsChangedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsChangedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteParams.ts
index 76614c854f1927..92a6e2714704ec 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteResponse.ts
index fc51fe807c2ffc..0e405947a40cf0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsConfigWriteResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetParams.ts
index eaa9d7c8a015b4..6713903d02dc59 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetResponse.ts
index 90dce3c2f72984..ea000518d8f0c5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsExtraRootsSetResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListEntry.ts
index 909763d1035759..fcfc1786055408 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListParams.ts
index a6c35749d5d4f0..584ef70548147f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListResponse.ts
index 5a4084bf8c3d16..1117d6bd42e0cd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SkillsListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SortDirection.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SortDirection.ts
index 2ef529e82d7d2a..c733e34eadd9f3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SortDirection.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SortDirection.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SpendControlLimitSnapshot.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SpendControlLimitSnapshot.ts
index 4c0e51198ee08b..f08180a5eccfb1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SpendControlLimitSnapshot.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SpendControlLimitSnapshot.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/StrictReviewRequiredNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/StrictReviewRequiredNotification.ts
new file mode 100644
index 00000000000000..815a699de59d3d
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/StrictReviewRequiredNotification.ts
@@ -0,0 +1,15 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/StrictReviewRequiredNotification.ts
+
+export type StrictReviewRequiredNotification = {
+	threadId: string, turnId: string,
+	/**
+	 * Unix timestamp (in milliseconds) when this review started.
+	 */
+	startedAtMs: number,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubAgentActivityKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubAgentActivityKind.ts
index de8916760df171..e7f884696b3008 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubAgentActivityKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubAgentActivityKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubagentMigration.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubagentMigration.ts
index b863f2cd80c7e0..0aa5754c00b8ae 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubagentMigration.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/SubagentMigration.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TerminalInteractionNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TerminalInteractionNotification.ts
index c668edecadf259..5a6345c7005793 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TerminalInteractionNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TerminalInteractionNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextElement.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextElement.ts
index 544110f60037a9..90c81ecfcfe1c7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextElement.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextElement.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextPosition.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextPosition.ts
index 0383592328304a..a860a0d1421ea1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextPosition.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextPosition.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextRange.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextRange.ts
index 728baad72290c9..fb967679ef52f6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextRange.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TextRange.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Thread.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Thread.ts
index b802667b082239..238799ec33dbe1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Thread.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Thread.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -11,6 +11,7 @@ import type { GitInfo } from "./GitInfo.js";
 import type { SessionSource } from "./SessionSource.js";
 import type { ThreadExtra } from "./ThreadExtra.js";
 import type { ThreadHistoryMode } from "./ThreadHistoryMode.js";
+import type { ThreadSection } from "./ThreadSection.js";
 import type { ThreadSource } from "./ThreadSource.js";
 import type { ThreadStatus } from "./ThreadStatus.js";
 import type { Turn } from "./Turn.js";
@@ -45,9 +46,17 @@ export type Thread = {
 	 */
 	ephemeral: boolean,
 	/**
-	 * Whether the thread has been pinned by the user.
+	 * The independently persisted section selected for this thread, if any.
 	 */
-	isPinned: boolean,
+	section: ThreadSection | null,
+	/**
+	 * Unix timestamp in seconds when the thread entered its current section.
+	 */
+	sectionEnteredAt: number | null,
+	/**
+	 * Canonical project assignment owned by app-server, if any.
+	 */
+	projectId: string | null,
 	/**
 	 * Persisted thread history contract selected when this thread was created.
 	 */
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadActiveFlag.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadActiveFlag.ts
index a33e7d197ce536..a43935aaa805b9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadActiveFlag.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadActiveFlag.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionParams.ts
index c611964f5fe562..7b662bc49fc603 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionResponse.ts
index f0e2e530cb6c12..860af8e2b48d91 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadApproveGuardianDeniedActionResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveParams.ts
index 6168dc42fe9b92..7914a6029e08d2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveResponse.ts
index 44eebf532e4e2d..9db4412a275f10 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchiveResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchivedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchivedNotification.ts
index 697f62b2e77b37..43df20b066173a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchivedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadArchivedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminal.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminal.ts
index 0f108387815500..4d25722bb43376 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminal.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminal.ts
@@ -1,11 +1,11 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ThreadBackgroundTerminal.ts
 
-import type { AbsolutePathBuf } from "../AbsolutePathBuf.js";
+import type { LegacyAppPathString } from "../LegacyAppPathString.js";
 
-export type ThreadBackgroundTerminal = { itemId: string, processId: string, command: string, cwd: AbsolutePathBuf, osPid: number | null, cpuPercent: number | null, rssKb: bigint | null, };
+export type ThreadBackgroundTerminal = { itemId: string, processId: string, command: string, cwd: LegacyAppPathString, osPid: number | null, cpuPercent: number | null, rssKb: bigint | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanParams.ts
index ee0030c2a8b1bb..92aabcc39290af 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanResponse.ts
index 337d6dbeabf4f1..2c4ab32388ca95 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsCleanResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListParams.ts
index 3dc76da6b065d6..d8c3a99c4df4bc 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListResponse.ts
index 1cdf320ad52a29..3c76b890a79dc4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateParams.ts
index 4d49571b1f251f..8849133a83aa71 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateResponse.ts
index 6ce892bb78b65b..203ca80e999cf0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadBackgroundTerminalsTerminateResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadClosedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadClosedNotification.ts
index 54cd671fb2c4a4..65a0047f9e37a9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadClosedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadClosedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartParams.ts
index f50fdc63b6b318..9a7784185ba74a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartResponse.ts
index 6d4d7eba6a0859..34589ca9fb3e7a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadCompactStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationParams.ts
index 8ae9f7a711763b..6f693ad77997f7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationResponse.ts
index 0e2d0d7b96dc5b..f59992cc1a3083 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDecrementElicitationResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteParams.ts
index d4e476ac64b243..9ab2b69e19e4b0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteResponse.ts
index d27cfd9b30299b..4ef7bd51e34af0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeleteResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeletedNotification.ts
index 656d424a63f201..c416f2b980e772 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadDeletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadExtra.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadExtra.ts
index 6f6caeb474f0df..170a494518c919 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadExtra.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadExtra.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkParams.ts
index 25c2e9816f5476..b849fcb3e5659f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkResponse.ts
index 11b3b473e6bd95..79d1095cda9bb4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadForkResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoal.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoal.ts
index ee391e3db12c79..be1734f8686c75 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoal.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoal.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearParams.ts
index b583649b4afe03..0e4b96408147aa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearResponse.ts
index 1a77feb5fdba32..909657983bca73 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearedNotification.ts
index e323f89a139b4b..dbd8ad49f993d7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalClearedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetParams.ts
index f8eda462d09418..a9ee13cccfaa10 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetResponse.ts
index 4b2ead8567cec7..714f1154c6aecb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalGetResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetParams.ts
index 6cb248ac0e7471..75a1c945bcb9a3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetResponse.ts
index 353f1a7db2766e..d24a56886ceedf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalSetResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalStatus.ts
index 84d23e61d6a6c6..2bad33edfc6f4a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalUpdatedNotification.ts
index 242c76aaab44f3..09b00d83a47b04 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadGoalUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadHistoryMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadHistoryMode.ts
index bcc7739b971272..dcda35cea5931c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadHistoryMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadHistoryMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationParams.ts
index 70780ef457aa00..66d1096063806e 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationResponse.ts
index ad8279b632dfc0..2c7153ae73629d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadIncrementElicitationResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsParams.ts
index 0e49c3dec3bc1a..2a9ee6963e073b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsResponse.ts
index b1aeadc96cd5ff..87afdcc8291fe7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadInjectItemsResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItem.ts
index 125505a417f2f0..842b3314eb9ed9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -13,6 +13,7 @@ import type { ReasoningEffort } from "../ReasoningEffort.js";
 import type { SleepItem } from "../SleepItem.js";
 import type { WebSearchItem } from "../WebSearchItem.js";
 import type { JsonValue } from "../serde_json/JsonValue.js";
+import type { AgentMessageDelivery } from "./AgentMessageDelivery.js";
 import type { CollabAgentState } from "./CollabAgentState.js";
 import type { CollabAgentTool } from "./CollabAgentTool.js";
 import type { CollabAgentToolCallStatus } from "./CollabAgentToolCallStatus.js";
@@ -32,7 +33,7 @@ import type { PatchApplyStatus } from "./PatchApplyStatus.js";
 import type { SubAgentActivityKind } from "./SubAgentActivityKind.js";
 import type { UserInput } from "./UserInput.js";
 
-export type ThreadItem = { "type": "userMessage", id: string, clientId: string | null, content: Array<UserInput>, } | { "type": "hookPrompt", id: string, fragments: Array<HookPromptFragment>, } | { "type": "agentMessage", id: string, text: string, phase: MessagePhase | null, memoryCitation: MemoryCitation | null, } | { "type": "plan", id: string, text: string, } | { "type": "reasoning", id: string, summary: Array<string>, content: Array<string>, } | {
+export type ThreadItem = { "type": "userMessage", id: string, clientId: string | null, content: Array<UserInput>, } | { "type": "hookPrompt", id: string, fragments: Array<HookPromptFragment>, } | { "type": "agentMessage", id: string, text: string, phase: MessagePhase | null, memoryCitation: MemoryCitation | null, delivery: AgentMessageDelivery | null, } | { "type": "plan", id: string, text: string, } | { "type": "reasoning", id: string, summary: Array<string>, content: Array<string>, } | {
 	"type": "commandExecution", id: string,
 	/**
 	 * Trusted first-party plugin id when this command resolves to one plugin script.
@@ -77,7 +78,7 @@ export type ThreadItem = { "type": "userMessage", id: string, clientId: string |
 	/**
 	 * Deprecated: use `appContext.resourceUri` instead.
 	 */
-	mcpAppResourceUri?: string, pluginId: string | null, result: McpToolCallResult | null, error: McpToolCallError | null,
+	mcpAppResourceUri?: string, pluginId: string | null, readOnlyHint: boolean | null, result: McpToolCallResult | null, error: McpToolCallError | null,
 	/**
 	 * The duration of the MCP tool call in milliseconds.
 	 */
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemEntry.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemEntry.ts
index 921d07675a0724..9dda5a702375a3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemEntry.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemEntry.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListParams.ts
index 829361700e87c6..7dec5c7f3d3e2c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListResponse.ts
index f0ec7e73ff6698..ef184c0de279db 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadItemsListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListParams.ts
index cbf51dc7b6da26..b1d63cf7e06ee0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -43,9 +43,15 @@ export type ThreadListParams = {
 	 */
 	archived?: boolean | null,
 	/**
-	 * Optional pinned filter; when set, only threads matching this value are returned.
+	 * Omit to include every section, set to `null` for unsectioned threads,
+	 * or provide a section ID to return only threads in that section.
 	 */
-	isPinned?: boolean | null,
+	sectionId?: string | null,
+	/**
+	 * Omit to include every project, set to null for unassigned threads,
+	 * or provide a project ID to return only threads in that project.
+	 */
+	projectId?: string | null,
 	/**
 	 * Optional cwd filter or filters; when set, only threads whose session cwd
 	 * exactly matches one of these paths are returned.
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListResponse.ts
index dd2ac925f4573a..067b90e1e7bf4b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListParams.ts
index ca43712772c442..6600d312dc4166 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListResponse.ts
index 5a12ef17851107..2468fe45b77960 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadLoadedListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetParams.ts
index 611cf69c242b71..1917057d233777 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetResponse.ts
index 2713c3d09d99e1..7799639587eb87 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMemoryModeSetResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataGitInfoUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataGitInfoUpdateParams.ts
index bacd7ed2fdbcfe..9eed83976daae3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataGitInfoUpdateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataGitInfoUpdateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateParams.ts
index f2501cc19d5c1f..a810f303a1a192 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -10,14 +10,15 @@ import type { ThreadMetadataGitInfoUpdateParams } from "./ThreadMetadataGitInfoU
 
 export type ThreadMetadataUpdateParams = {
 	threadId: string,
+	/**
+	 * Omit to leave the project unchanged, use an empty string to clear it,
+	 * or provide an existing project ID to assign it.
+	 */
+	projectId?: string | null,
 	/**
 	 * Patch the stored Git metadata for this thread.
 	 * Omit a field to leave it unchanged, set it to `null` to clear it, or
 	 * provide a string to replace the stored value.
 	 */
 	gitInfo?: ThreadMetadataGitInfoUpdateParams | null,
-	/**
-	 * Patch whether this thread is pinned. Omit to leave the stored value unchanged.
-	 */
-	isPinned?: boolean | null,
 };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateResponse.ts
index 62ba53e922f5dd..d46991764d93a9 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadMetadataUpdateResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadNameUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadNameUpdatedNotification.ts
index 852a8a4bc5aeb9..910acd733a9592 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadNameUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadNameUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadProjectUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadProjectUpdatedNotification.ts
new file mode 100644
index 00000000000000..8b0ae6f57c7866
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadProjectUpdatedNotification.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadProjectUpdatedNotification.ts
+
+export type ThreadProjectUpdatedNotification = { threadId: string, projectId: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueAddParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueAddParams.ts
new file mode 100644
index 00000000000000..ca32a55de0c11b
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueAddParams.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueAddParams.ts
+
+import type { UserInput } from "./UserInput.js";
+
+export type ThreadQueueAddParams = { threadId: string, input: Array<UserInput>, clientUserMessageId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueAddResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueAddResponse.ts
new file mode 100644
index 00000000000000..0f4428c9c3ed63
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueAddResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueAddResponse.ts
+
+import type { QueuedSubmission } from "./QueuedSubmission.js";
+
+export type ThreadQueueAddResponse = { queuedSubmission: QueuedSubmission, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueChangedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueChangedNotification.ts
new file mode 100644
index 00000000000000..3706017e9abea9
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueChangedNotification.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueChangedNotification.ts
+
+export type ThreadQueueChangedNotification = { threadId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueDeleteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueDeleteParams.ts
new file mode 100644
index 00000000000000..116889807f18f5
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueDeleteParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueDeleteParams.ts
+
+export type ThreadQueueDeleteParams = { threadId: string, queuedSubmissionId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueDeleteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueDeleteResponse.ts
new file mode 100644
index 00000000000000..cbafa56eca5cac
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueDeleteResponse.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueDeleteResponse.ts
+
+export type ThreadQueueDeleteResponse = { deleted: boolean, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueListParams.ts
new file mode 100644
index 00000000000000..d34b57c66f8472
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueListParams.ts
@@ -0,0 +1,19 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueListParams.ts
+
+export type ThreadQueueListParams = {
+	threadId: string,
+	/**
+	 * Opaque pagination cursor returned by a previous call.
+	 */
+	cursor?: string | null,
+	/**
+	 * Optional page size; defaults to the standard thread-list page size.
+	 */
+	limit?: number | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueListResponse.ts
new file mode 100644
index 00000000000000..cad21ee5563509
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueListResponse.ts
@@ -0,0 +1,17 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueListResponse.ts
+
+import type { QueuedSubmission } from "./QueuedSubmission.js";
+
+export type ThreadQueueListResponse = {
+	data: Array<QueuedSubmission>,
+	/**
+	 * Opaque cursor for the next page, or `null` when no submissions remain.
+	 */
+	nextCursor: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueReorderParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueReorderParams.ts
new file mode 100644
index 00000000000000..1dd205568c330d
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueReorderParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueReorderParams.ts
+
+export type ThreadQueueReorderParams = { threadId: string, queuedSubmissionIds: Array<string>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueReorderResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueReorderResponse.ts
new file mode 100644
index 00000000000000..aa2e723ea16858
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueReorderResponse.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueReorderResponse.ts
+
+export type ThreadQueueReorderResponse = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueStartParams.ts
new file mode 100644
index 00000000000000..f33a537c8d8c35
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueStartParams.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueStartParams.ts
+
+export type ThreadQueueStartParams = { threadId: string, queuedSubmissionId?: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueStartResponse.ts
new file mode 100644
index 00000000000000..00b5617933c539
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueStartResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueStartResponse.ts
+
+import type { Turn } from "./Turn.js";
+
+export type ThreadQueueStartResponse = { turn: Turn, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueUpdateParams.ts
new file mode 100644
index 00000000000000..a8924df6720a22
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueUpdateParams.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueUpdateParams.ts
+
+import type { UserInput } from "./UserInput.js";
+
+export type ThreadQueueUpdateParams = { threadId: string, queuedSubmissionId: string, input: Array<UserInput>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueUpdateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueUpdateResponse.ts
new file mode 100644
index 00000000000000..e7c46a84e8f763
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadQueueUpdateResponse.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadQueueUpdateResponse.ts
+
+import type { QueuedSubmission } from "./QueuedSubmission.js";
+
+export type ThreadQueueUpdateResponse = { queuedSubmission: QueuedSubmission, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadParams.ts
index c891a5b0b4062c..f74b35f7556e70 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadResponse.ts
index 6fbf9e57222467..cb0ad797903282 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadReadResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioParams.ts
index 05820cffbdfcd6..4a6c5c37e0978b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioResponse.ts
index 4106b2a980ff51..6ce456c7f3c3f2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendAudioResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechParams.ts
index 608467945d6657..80487c83a731be 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechResponse.ts
index 85e4748d1c4c3e..509723fd99c122 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendSpeechResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextParams.ts
index 16d99ea6a1af87..c28e5482b80a16 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextResponse.ts
index c4e0ef905febb8..db803f6009753c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAppendTextResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAudioChunk.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAudioChunk.ts
index 478279da735010..bcc2113206a3b2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAudioChunk.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeAudioChunk.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeClosedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeClosedNotification.ts
index 2d26bb4240b4af..728a78017caae6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeClosedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeClosedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeErrorNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeErrorNotification.ts
index 552132a520edd1..40ebd29074baf8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeErrorNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeErrorNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeInitialItem.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeInitialItem.ts
index 6b61f51fdbfc99..275eaad4212319 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeInitialItem.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeInitialItem.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeItemAddedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeItemAddedNotification.ts
index f4983a844ff52a..7c699b8260ba88 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeItemAddedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeItemAddedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesParams.ts
index e85f3fd627e89e..bd856824e4615d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesResponse.ts
index b0fd78384a2cbe..f0ec65b78aaf85 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeListVoicesResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeOutputAudioDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeOutputAudioDeltaNotification.ts
index 4d8baf7b1ca934..afda7fc1323cc0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeOutputAudioDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeOutputAudioDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeSdpNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeSdpNotification.ts
index e05c915b27fbde..970b5cdda65dd8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeSdpNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeSdpNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartParams.ts
index 7731898ecccf5c..a2dd3a80bad456 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -23,6 +23,11 @@ export type ThreadRealtimeStartParams = {
 	 * them automatically. Defaults to false.
 	 */
 	clientManagedHandoffs?: boolean | null,
+	/**
+	 * Controls whether a realtime V3 delegation produces an acknowledgement filler.
+	 * Omitted values preserve the Realtime API's default behavior.
+	 */
+	delegationAckFiller?: boolean | null,
 	/**
 	 * Routes any transcript tail remaining at session end through Codex. Defaults to false.
 	 * TODO: Remove this rollout knob once transcript-tail flushing is always enabled.
@@ -64,7 +69,15 @@ export type ThreadRealtimeStartParams = {
 	 * This is only supported by realtime V3 and is sent during session startup. Requests are
 	 * limited to 128 items and 8,192 estimated text tokens in total.
 	 */
-	initialItems?: Array<ThreadRealtimeInitialItem> | null, prompt?: string | null | null, realtimeSessionId?: string | null, transport?: ThreadRealtimeStartTransport | null,
+	initialItems?: Array<ThreadRealtimeInitialItem> | null,
+	/**
+	 * Developer instructions given to the backing Codex model when this realtime session starts.
+	 */
+	realtimeStartInstructions?: string | null,
+	/**
+	 * Developer instructions given to the backing Codex model when this realtime session ends.
+	 */
+	realtimeEndInstructions?: string | null, prompt?: string | null | null, realtimeSessionId?: string | null, transport?: ThreadRealtimeStartTransport | null,
 	/**
 	 * Overrides the configured realtime protocol version for this session only.
 	 */
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartResponse.ts
index 2747409654f25d..0fa597fcfb3a73 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartTransport.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartTransport.ts
index 9b7ec15d2a07cb..5ec1357d4054ae 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartTransport.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartTransport.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartedNotification.ts
index 415a33661ec529..d3a1849b90b4f3 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStartedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopParams.ts
index f6baba5550fac5..b07b5f6f45f7b4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopResponse.ts
index 7b60c52cc720f2..42d45301193adb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeStopResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDeltaNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDeltaNotification.ts
index 03c5678a0442ec..71f233f07dd30a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDeltaNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDeltaNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDoneNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDoneNotification.ts
index 19a11e443e67d6..0e0df03993b0ea 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDoneNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRealtimeTranscriptDoneNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeInitialTurnsPageParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeInitialTurnsPageParams.ts
index 8c105b29d1bb26..9a6e4a52a9bdd5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeInitialTurnsPageParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeInitialTurnsPageParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeParams.ts
index 1aabfcec2e9061..825008d3c68e6a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeResponse.ts
index 7977b5b0d5c8ec..35aabbe4a96315 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadResumeResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -51,17 +51,17 @@ export type ThreadResumeResponse = {
 	 */
 	initialTurnsPage: TurnsPage | null,
 	/**
-	 * Opaque head cursor for hydrating paginated turns backwards.
+	 * Opaque cursor for hydrating paginated turns backwards.
 	 *
 	 * Pass this as `cursor` to `thread/turns/list` with
-	 * `sortDirection: "desc"`. The first page includes the cursor's head turn.
+	 * `sortDirection: "desc"`. The first page includes the turn identified by the cursor.
 	 */
 	turnsBackwardsCursor: string | null,
 	/**
-	 * Opaque head cursor for hydrating paginated items backwards.
+	 * Opaque cursor for hydrating paginated items backwards.
 	 *
 	 * Pass this as `cursor` to `thread/items/list` with
-	 * `sortDirection: "desc"`. The first page includes the cursor's head item.
+	 * `sortDirection: "desc"`. The first page includes the item identified by the cursor.
 	 */
 	itemsBackwardsCursor: string | null,
 };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertParams.ts
new file mode 100644
index 00000000000000..a585aa35313f65
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertParams.ts
@@ -0,0 +1,20 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadRevertParams.ts
+
+/**
+ * Replace a paginated thread's durable history with the prefix before one turn.
+ *
+ * This only changes persisted conversation history. It does not revert local file changes.
+ */
+export type ThreadRevertParams = {
+	threadId: string,
+	/**
+	 * Turn excluded from the replacement history, together with every later turn.
+	 */
+	beforeTurnId: string,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertResponse.ts
new file mode 100644
index 00000000000000..1e4b9345c27694
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertResponse.ts
@@ -0,0 +1,31 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadRevertResponse.ts
+
+import type { Thread } from "./Thread.js";
+
+export type ThreadRevertResponse = {
+	/**
+	 * Updated loaded thread metadata. `turns` is always empty; hydrate retained history through
+	 * `thread/turns/list`.
+	 */
+	thread: Thread,
+	/**
+	 * Opaque cursor for hydrating paginated turns backwards.
+	 *
+	 * Pass this as `cursor` to `thread/turns/list` with
+	 * `sortDirection: "desc"`. The first page includes the turn identified by the cursor.
+	 */
+	turnsBackwardsCursor: string | null,
+	/**
+	 * Opaque cursor for hydrating paginated items backwards.
+	 *
+	 * Pass this as `cursor` to `thread/items/list` with
+	 * `sortDirection: "desc"`. The first page includes the item identified by the cursor.
+	 */
+	itemsBackwardsCursor: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertedNotification.ts
new file mode 100644
index 00000000000000..da2934ca3fcf3a
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRevertedNotification.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadRevertedNotification.ts
+
+export type ThreadRevertedNotification = { threadId: string, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackParams.ts
index 1ece6f63e30404..4010ba6e2052e5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackResponse.ts
index ee9b92f2fdad1c..e866e903eeb963 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadRollbackResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrence.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrence.ts
index 8ac83ae437c47d..688dc511230e31 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrence.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrence.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesParams.ts
index c02ba91dbffec2..3206f4a34a1a61 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesResponse.ts
index 08c0cb0d4bbab1..0543a035433fce 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchOccurrencesResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchParams.ts
index 82a9f2fae3bc3d..d12c25871c570a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchParams.ts
@@ -1,13 +1,13 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ThreadSearchParams.ts
 
 import type { SortDirection } from "./SortDirection.js";
-import type { ThreadSortKey } from "./ThreadSortKey.js";
+import type { ThreadSearchSortKey } from "./ThreadSearchSortKey.js";
 import type { ThreadSourceKind } from "./ThreadSourceKind.js";
 
 export type ThreadSearchParams = {
@@ -22,7 +22,7 @@ export type ThreadSearchParams = {
 	/**
 	 * Optional sort key; defaults to created_at.
 	 */
-	sortKey?: ThreadSortKey | null,
+	sortKey?: ThreadSearchSortKey | null,
 	/**
 	 * Optional sort direction; defaults to descending (newest first).
 	 */
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResponse.ts
index 6980c389f48d90..0cd9e06f873d92 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResult.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResult.ts
index d3de468d10931c..3212a073ccbc0c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResult.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchResult.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchSortKey.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchSortKey.ts
new file mode 100644
index 00000000000000..a289caba881acf
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchSortKey.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSearchSortKey.ts
+
+export type ThreadSearchSortKey = "created_at" | "updated_at" | "recency_at";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchTextRange.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchTextRange.ts
index 346f753b59ccc8..fb757474d36833 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchTextRange.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSearchTextRange.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSection.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSection.ts
new file mode 100644
index 00000000000000..af8290d2401f3e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSection.ts
@@ -0,0 +1,27 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSection.ts
+
+import type { ThreadSectionAppearance } from "./ThreadSectionAppearance.js";
+
+/**
+ * An independently persisted, user-visible thread section.
+ */
+export type ThreadSection = {
+	/**
+	 * Opaque UUIDv7 identity that remains stable when the section is renamed.
+	 */
+	id: string,
+	/**
+	 * The current user-visible section name.
+	 */
+	name: string,
+	/**
+	 * Optional appearance synchronized across clients.
+	 */
+	appearance: ThreadSectionAppearance | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionAppearance.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionAppearance.ts
new file mode 100644
index 00000000000000..98b092fa2ae02b
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionAppearance.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionAppearance.ts
+
+/**
+ * Extensible visual presentation for a custom thread section.
+ */
+export type ThreadSectionAppearance = { icon: string | null, color: string | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionCreateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionCreateParams.ts
new file mode 100644
index 00000000000000..18f4f6683403ee
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionCreateParams.ts
@@ -0,0 +1,19 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionCreateParams.ts
+
+import type { ThreadSectionAppearance } from "./ThreadSectionAppearance.js";
+
+/**
+ * Parameters for creating an independently persisted thread section.
+ */
+export type ThreadSectionCreateParams = {
+	/**
+	 * The user-visible name of the section.
+	 */
+	name: string, appearance?: ThreadSectionAppearance | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionCreateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionCreateResponse.ts
new file mode 100644
index 00000000000000..68ecb8a1f7e86e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionCreateResponse.ts
@@ -0,0 +1,14 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionCreateResponse.ts
+
+import type { ThreadSection } from "./ThreadSection.js";
+
+/**
+ * The independently persisted section created by the server.
+ */
+export type ThreadSectionCreateResponse = { section: ThreadSection, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionDeleteParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionDeleteParams.ts
new file mode 100644
index 00000000000000..dbd15e1ae42625
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionDeleteParams.ts
@@ -0,0 +1,17 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionDeleteParams.ts
+
+/**
+ * Parameters for deleting an independently persisted thread section.
+ */
+export type ThreadSectionDeleteParams = {
+	/**
+	 * The stable, server-generated identity of the section to delete.
+	 */
+	sectionId: string,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionDeleteResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionDeleteResponse.ts
new file mode 100644
index 00000000000000..fc2e8b63df63b4
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionDeleteResponse.ts
@@ -0,0 +1,12 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionDeleteResponse.ts
+
+/**
+ * Successful deletion does not return additional section data.
+ */
+export type ThreadSectionDeleteResponse = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionListParams.ts
new file mode 100644
index 00000000000000..a7802bf322fbc4
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionListParams.ts
@@ -0,0 +1,21 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionListParams.ts
+
+/**
+ * Parameters for listing independently persisted thread sections.
+ */
+export type ThreadSectionListParams = {
+	/**
+	 * Opaque pagination cursor returned by a previous call.
+	 */
+	cursor?: string | null,
+	/**
+	 * Maximum number of sections to return.
+	 */
+	limit?: number | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionListResponse.ts
new file mode 100644
index 00000000000000..c710d81a65c3b9
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionListResponse.ts
@@ -0,0 +1,20 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionListResponse.ts
+
+import type { ThreadSection } from "./ThreadSection.js";
+
+/**
+ * One page of independently persisted thread sections.
+ */
+export type ThreadSectionListResponse = {
+	data: Array<ThreadSection>,
+	/**
+	 * Opaque cursor for the next page, or `null` when no sections remain.
+	 */
+	nextCursor: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionMoveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionMoveParams.ts
new file mode 100644
index 00000000000000..24d1e962e36f7f
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionMoveParams.ts
@@ -0,0 +1,25 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionMoveParams.ts
+
+/**
+ * Parameters for moving a thread within a server-owned section ordering.
+ */
+export type ThreadSectionMoveParams = {
+	/**
+	 * Thread to move into, within, or out of a section.
+	 */
+	threadId: string,
+	/**
+	 * Destination section, or `null` to remove the thread from its section.
+	 */
+	sectionId: string | null,
+	/**
+	 * Existing thread to insert before; omission or null appends to the section.
+	 */
+	beforeThreadId?: string | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionMoveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionMoveResponse.ts
new file mode 100644
index 00000000000000..a80b95e01689cf
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionMoveResponse.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionMoveResponse.ts
+
+export type ThreadSectionMoveResponse = Record<string, never>;
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionUpdateParams.ts
new file mode 100644
index 00000000000000..3c017fe277bc3c
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionUpdateParams.ts
@@ -0,0 +1,27 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionUpdateParams.ts
+
+import type { ThreadSectionAppearance } from "./ThreadSectionAppearance.js";
+
+/**
+ * Parameters for updating an independently persisted thread section.
+ */
+export type ThreadSectionUpdateParams = {
+	/**
+	 * The stable, server-generated identity of the section to update.
+	 */
+	sectionId: string,
+	/**
+	 * The updated user-visible name of the section.
+	 */
+	name: string,
+	/**
+	 * Omit to preserve appearance, use `null` to clear it, or provide a replacement.
+	 */
+	appearance?: ThreadSectionAppearance | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionUpdateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionUpdateResponse.ts
new file mode 100644
index 00000000000000..735bc3c51e012e
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSectionUpdateResponse.ts
@@ -0,0 +1,14 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadSectionUpdateResponse.ts
+
+import type { ThreadSection } from "./ThreadSection.js";
+
+/**
+ * The independently persisted section after its name is updated.
+ */
+export type ThreadSectionUpdateResponse = { section: ThreadSection, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameParams.ts
index 9acc78788a6f72..732790e5812945 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameResponse.ts
index 9fcf2ebdd869d8..cfa7f1e581129b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSetNameResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettings.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettings.ts
index b9794b4416ea64..fcf1a92e135bf4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettings.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettings.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateParams.ts
index 4f977c51c397d6..d14e65a5477b46 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateResponse.ts
index d36b7556fc8786..cbb4ee5340e707 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdateResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdatedNotification.ts
index 02794ed1035ce7..0ed54805ead97f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSettingsUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandParams.ts
index 03a79b4e69db76..678f879fcf8ac0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandResponse.ts
index 9c70f693d6b3bc..63c80b2b97fbd5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadShellCommandResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSortKey.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSortKey.ts
index a04fb9e8fa5d07..d5f72f77a6e5da 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSortKey.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSortKey.ts
@@ -1,9 +1,9 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
 // Source file: v2/ThreadSortKey.ts
 
-export type ThreadSortKey = "created_at" | "updated_at" | "recency_at";
+export type ThreadSortKey = "created_at" | "updated_at" | "recency_at" | "section_position";
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSource.ts
index 18e944a94553a0..e66014960f2db5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSourceKind.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSourceKind.ts
index 9bd916cc002756..617c90ebb10978 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSourceKind.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadSourceKind.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartParams.ts
index 6e1ad4af53941e..7c3f10c1a029ae 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -52,6 +52,11 @@ export type ThreadStartParams = {
 	 * Optional client-supplied analytics source classification for this thread.
 	 */
 	threadSource?: ThreadSource | null,
+	/**
+	 * Optional project identity for this new thread. Durable threads persist
+	 * the assignment; ephemeral threads expose it only in live responses.
+	 */
+	projectId?: string | null,
 	/**
 	 * Optional sticky environments for this thread.
 	 *
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartResponse.ts
index 4f3225191ac812..e6d5b98f471122 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartSource.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartSource.ts
index 9c53455d7f08b8..fb848b2932ad42 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartSource.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartSource.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartedNotification.ts
index 177b5da47d4a18..e98c977b0ff5aa 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStartedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatus.ts
index 93ee6283f7b069..2902f171b08e92 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatusChangedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatusChangedNotification.ts
index ac9b41e33a526e..85b0a6c2b51fee 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatusChangedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadStatusChangedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsage.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsage.ts
index ddfcff601d8d05..02a4e171d2b003 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsage.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsage.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsageUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsageUpdatedNotification.ts
index 9c8444f92e964b..897285caf9a186 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsageUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTokenUsageUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListParams.ts
index ce8ab724dedb49..22960d0c1f739a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListResponse.ts
index 361de261ad5bdf..6ffdd88c3a2b20 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadTurnsListResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveParams.ts
index c64c1f1f27333c..aef58d6fcdbcfd 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveResponse.ts
index 8a8e86e6f78c78..9241f7bdb5a66c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchiveResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchivedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchivedNotification.ts
index 7b8843ae096205..a6fe31fe2edb12 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchivedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnarchivedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeParams.ts
index 6cdd590a77bd75..bdd2423d738927 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeResponse.ts
index 62b37433dde919..46eed8ddd4ff41 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeStatus.ts
index 7991f8f4fdbbe0..9732a081ae4666 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUnsubscribeStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUsage.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUsage.ts
new file mode 100644
index 00000000000000..a821c861e5055b
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUsage.ts
@@ -0,0 +1,11 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadUsage.ts
+
+import type { ThreadUsageBreakdownGroup } from "./ThreadUsageBreakdownGroup.js";
+
+export type ThreadUsage = { threadId: string, estimatedUsageCreditsMicros: bigint, estimatedUsageUsdMicros: bigint | null, groups: Array<ThreadUsageBreakdownGroup>, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUsageBreakdownGroup.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUsageBreakdownGroup.ts
new file mode 100644
index 00000000000000..b837ba3e5013cc
--- /dev/null
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ThreadUsageBreakdownGroup.ts
@@ -0,0 +1,9 @@
+// AUTOGENERATED - do not edit.
+// Source: `codex app-server generate-ts --experimental`
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
+// Modified by VS Code to rewrite imports and apply repository formatting.
+// See README.md in this directory for provenance and licensing notes.
+// Regenerate: npm run codex:gen-protocol
+// Source file: v2/ThreadUsageBreakdownGroup.ts
+
+export type ThreadUsageBreakdownGroup = { model: string | null, reasoningEffort: string | null, speed: string | null, estimatedUsageCreditsMicros: bigint, netNewInputTokens: bigint | null, cachedInputTokens: bigint | null, inputTokens: bigint | null, outputTokens: bigint | null, totalTokens: bigint | null, };
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TokenUsageBreakdown.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TokenUsageBreakdown.ts
index 4e779b25d086f2..e2422f919e33f6 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TokenUsageBreakdown.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TokenUsageBreakdown.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputAnswer.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputAnswer.ts
index e3ff613feb7e48..b4f67719c5c0bb 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputAnswer.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputAnswer.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputOption.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputOption.ts
index 5819ff800c85d0..0134d496fed55b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputOption.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputOption.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputParams.ts
index 249b221b643626..ec9d5d648e39b8 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -11,4 +11,10 @@ import type { ToolRequestUserInputQuestion } from "./ToolRequestUserInputQuestio
 /**
  * EXPERIMENTAL. Params sent with a request_user_input event.
  */
-export type ToolRequestUserInputParams = { threadId: string, turnId: string, itemId: string, questions: Array<ToolRequestUserInputQuestion>, autoResolutionMs: number | null, };
+export type ToolRequestUserInputParams = {
+	threadId: string, turnId: string, itemId: string, questions: Array<ToolRequestUserInputQuestion>, isBlocking: boolean,
+	/**
+	 * @deprecated Use `isBlocking` to decide whether the request should block.
+	 */
+	autoResolutionMs: number | null,
+};
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputQuestion.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputQuestion.ts
index a3236ccd3a027a..daf95f818e7942 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputQuestion.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputQuestion.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputResponse.ts
index e68ccbb35da34c..6a8cb5de835ae1 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolRequestUserInputResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolsV2.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolsV2.ts
index 497099c5486cc7..408b5206be4911 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolsV2.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/ToolsV2.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Turn.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Turn.ts
index 7d56718798fd79..95b4aaaa855e9f 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Turn.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/Turn.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnCompletedNotification.ts
index 1a62723c4a93fe..da776c067173e7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnDiffUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnDiffUpdatedNotification.ts
index 1ae18275b89768..4991cae2c707a7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnDiffUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnDiffUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnEnvironmentParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnEnvironmentParams.ts
index 2dde8e48a2073a..7cc52d91d2a96b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnEnvironmentParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnEnvironmentParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnError.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnError.ts
index 675f87c861ad33..9935d8c4cbf507 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnError.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnError.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptParams.ts
index 5f3b9bdb52d83a..6ec6eacf1adab4 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptResponse.ts
index 8a0e0489a1bc3a..d8dff024694ed5 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnInterruptResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnItemsView.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnItemsView.ts
index 6f8f027846dc22..92f3852c3d8b9b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnItemsView.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnItemsView.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnModerationMetadataNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnModerationMetadataNotification.ts
index f2404519fa4baa..0346e13bd6535b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnModerationMetadataNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnModerationMetadataNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStep.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStep.ts
index 191f388d9c5a55..6563331589ed53 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStep.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStep.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStepStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStepStatus.ts
index 690196e62559a0..ae3fc43eeb2e17 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStepStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanStepStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanUpdatedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanUpdatedNotification.ts
index eadefe6c1ddb99..85e69e650ef511 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanUpdatedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnPlanUpdatedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartParams.ts
index ebb5776f88fb5a..a506373f1cb249 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartResponse.ts
index de2a2eff53f173..2cccb29becc86c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartedNotification.ts
index b50a7a58fcb385..e053d42fed5e84 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStartedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStatus.ts
index ef5a3f85e88ad2..84f6fd840c3a96 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerParams.ts
index 926fc210d1829b..0905f323a77f7d 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerResponse.ts
index 92f7c62fae0429..9c76c87cbeb42a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnSteerResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnsPage.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnsPage.ts
index 307f39559952f0..443be8ce56a2c0 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnsPage.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/TurnsPage.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/UserInput.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/UserInput.ts
index 53697f773fc37a..248206571f45d2 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/UserInput.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/UserInput.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WarningNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WarningNotification.ts
index 30ec3f95f4c464..2441ac2f546d9c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WarningNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WarningNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WebSearchAction.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WebSearchAction.ts
index 05df2359d57676..2ea6924f59fc88 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WebSearchAction.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WebSearchAction.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadiness.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadiness.ts
index ccbad60ce0814a..4f3c76da0b6d3b 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadiness.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadiness.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadinessResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadinessResponse.ts
index d97e15d17e9ddb..db7a5ca25a236c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadinessResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxReadinessResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupCompletedNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupCompletedNotification.ts
index bf2631fa912d62..d0638bdf02abaf 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupCompletedNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupCompletedNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupMode.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupMode.ts
index 418458fd3fcc79..c1920a13f5c93a 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupMode.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupMode.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartParams.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartParams.ts
index 827531b05c88f0..ff532bff4aae77 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartParams.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartParams.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartResponse.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartResponse.ts
index 1af5f14ffce66d..e70d781ac71672 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartResponse.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsSandboxSetupStartResponse.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsWorldWritableWarningNotification.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsWorldWritableWarningNotification.ts
index aefd6e5fbd37c6..6003aef64bdc37 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsWorldWritableWarningNotification.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WindowsWorldWritableWarningNotification.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessage.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessage.ts
index b288175509c956..b3399d485befc7 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessage.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessage.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessageType.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessageType.ts
index 911e13c9d0a117..99141ce592cd7c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessageType.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WorkspaceMessageType.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WriteStatus.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WriteStatus.ts
index 2ccd10c308e8a6..5d1b21b8ceac77 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WriteStatus.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/WriteStatus.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
diff --git a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/index.ts b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/index.ts
index bf66deabb87ce2..a7754df00fdc8c 100644
--- a/src/vs/platform/agentHost/node/codex/protocol/generated/v2/index.ts
+++ b/src/vs/platform/agentHost/node/codex/protocol/generated/v2/index.ts
@@ -1,6 +1,6 @@
 // AUTOGENERATED - do not edit.
 // Source: `codex app-server generate-ts --experimental`
-// Generated from @openai/codex 0.146.0, licensed Apache-2.0.
+// Generated from @openai/codex 0.149.1, licensed Apache-2.0.
 // Modified by VS Code to rewrite imports and apply repository formatting.
 // See README.md in this directory for provenance and licensing notes.
 // Regenerate: npm run codex:gen-protocol
@@ -20,6 +20,7 @@ export type { AdditionalContextKind } from "./AdditionalContextKind.js";
 export type { AdditionalFileSystemPermissions } from "./AdditionalFileSystemPermissions.js";
 export type { AdditionalNetworkPermissions } from "./AdditionalNetworkPermissions.js";
 export type { AdditionalPermissionProfile } from "./AdditionalPermissionProfile.js";
+export type { AgentMessageDelivery } from "./AgentMessageDelivery.js";
 export type { AgentMessageDeltaNotification } from "./AgentMessageDeltaNotification.js";
 export type { AnalyticsConfig } from "./AnalyticsConfig.js";
 export type { AppBranding } from "./AppBranding.js";
@@ -47,6 +48,14 @@ export type { AskForApproval } from "./AskForApproval.js";
 export type { AttestationGenerateParams } from "./AttestationGenerateParams.js";
 export type { AttestationGenerateResponse } from "./AttestationGenerateResponse.js";
 export type { AutoReviewDecisionSource } from "./AutoReviewDecisionSource.js";
+export type { AutoReviewRequirements } from "./AutoReviewRequirements.js";
+export type { AwsCredentialType } from "./AwsCredentialType.js";
+export type { BedrockAwsProfile } from "./BedrockAwsProfile.js";
+export type { BedrockDiscoverParams } from "./BedrockDiscoverParams.js";
+export type { BedrockDiscoverResponse } from "./BedrockDiscoverResponse.js";
+export type { BedrockEnvironmentCredential } from "./BedrockEnvironmentCredential.js";
+export type { BedrockSetupParams } from "./BedrockSetupParams.js";
+export type { BedrockSetupResponse } from "./BedrockSetupResponse.js";
 export type { BrowserUseRequirements } from "./BrowserUseRequirements.js";
 export type { ByteRange } from "./ByteRange.js";
 export type { CancelLoginAccountParams } from "./CancelLoginAccountParams.js";
@@ -56,6 +65,7 @@ export type { CapabilityRootLocation } from "./CapabilityRootLocation.js";
 export type { ChatgptAuthTokensRefreshParams } from "./ChatgptAuthTokensRefreshParams.js";
 export type { ChatgptAuthTokensRefreshReason } from "./ChatgptAuthTokensRefreshReason.js";
 export type { ChatgptAuthTokensRefreshResponse } from "./ChatgptAuthTokensRefreshResponse.js";
+export type { CliAuthCredentialsStoreMode } from "./CliAuthCredentialsStoreMode.js";
 export type { CodexErrorInfo } from "./CodexErrorInfo.js";
 export type { CollabAgentState } from "./CollabAgentState.js";
 export type { CollabAgentStatus } from "./CollabAgentStatus.js";
@@ -108,6 +118,7 @@ export type { CreditsSnapshot } from "./CreditsSnapshot.js";
 export type { CurrentTimeReadParams } from "./CurrentTimeReadParams.js";
 export type { CurrentTimeReadResponse } from "./CurrentTimeReadResponse.js";
 export type { DeprecationNoticeNotification } from "./DeprecationNoticeNotification.js";
+export type { DesktopOnboardingEntrypoint } from "./DesktopOnboardingEntrypoint.js";
 export type { DynamicToolCallOutputContentItem } from "./DynamicToolCallOutputContentItem.js";
 export type { DynamicToolCallParams } from "./DynamicToolCallParams.js";
 export type { DynamicToolCallResponse } from "./DynamicToolCallResponse.js";
@@ -140,6 +151,8 @@ export type { ExternalAgentConfigImportHistoriesReadResponse } from "./ExternalA
 export type { ExternalAgentConfigImportHistory } from "./ExternalAgentConfigImportHistory.js";
 export type { ExternalAgentConfigImportHistoryRecordParams } from "./ExternalAgentConfigImportHistoryRecordParams.js";
 export type { ExternalAgentConfigImportHistoryRecordResponse } from "./ExternalAgentConfigImportHistoryRecordResponse.js";
+export type { ExternalAgentConfigImportHistoryRecordSuccessParams } from "./ExternalAgentConfigImportHistoryRecordSuccessParams.js";
+export type { ExternalAgentConfigImportHistoryRecordTypeResultParams } from "./ExternalAgentConfigImportHistoryRecordTypeResultParams.js";
 export type { ExternalAgentConfigImportItemTypeFailure } from "./ExternalAgentConfigImportItemTypeFailure.js";
 export type { ExternalAgentConfigImportItemTypeSuccess } from "./ExternalAgentConfigImportItemTypeSuccess.js";
 export type { ExternalAgentConfigImportParams } from "./ExternalAgentConfigImportParams.js";
@@ -148,6 +161,8 @@ export type { ExternalAgentConfigImportResponse } from "./ExternalAgentConfigImp
 export type { ExternalAgentConfigImportTypeResult } from "./ExternalAgentConfigImportTypeResult.js";
 export type { ExternalAgentConfigMigrationItem } from "./ExternalAgentConfigMigrationItem.js";
 export type { ExternalAgentConfigMigrationItemType } from "./ExternalAgentConfigMigrationItemType.js";
+export type { ExternalAgentDetectedConnectorCandidate } from "./ExternalAgentDetectedConnectorCandidate.js";
+export type { ExternalAgentDetectedConnectorSource } from "./ExternalAgentDetectedConnectorSource.js";
 export type { ExternalAgentImportedConnectorCandidate } from "./ExternalAgentImportedConnectorCandidate.js";
 export type { ExternalAgentImportedConnectorSource } from "./ExternalAgentImportedConnectorSource.js";
 export type { FeedbackRequirements } from "./FeedbackRequirements.js";
@@ -187,6 +202,7 @@ export type { FsWriteFileResponse } from "./FsWriteFileResponse.js";
 export type { GetAccountParams } from "./GetAccountParams.js";
 export type { GetAccountRateLimitsResponse } from "./GetAccountRateLimitsResponse.js";
 export type { GetAccountResponse } from "./GetAccountResponse.js";
+export type { GetAccountTokenUsageParams } from "./GetAccountTokenUsageParams.js";
 export type { GetAccountTokenUsageResponse } from "./GetAccountTokenUsageResponse.js";
 export type { GetWorkspaceMessagesResponse } from "./GetWorkspaceMessagesResponse.js";
 export type { GitInfo } from "./GitInfo.js";
@@ -267,6 +283,7 @@ export type { McpServerElicitationAction } from "./McpServerElicitationAction.js
 export type { McpServerElicitationRequestParams } from "./McpServerElicitationRequestParams.js";
 export type { McpServerElicitationRequestResponse } from "./McpServerElicitationRequestResponse.js";
 export type { McpServerMigration } from "./McpServerMigration.js";
+export type { McpServerOauthClientRegistration } from "./McpServerOauthClientRegistration.js";
 export type { McpServerOauthLoginCompletedNotification } from "./McpServerOauthLoginCompletedNotification.js";
 export type { McpServerOauthLoginParams } from "./McpServerOauthLoginParams.js";
 export type { McpServerOauthLoginResponse } from "./McpServerOauthLoginResponse.js";
@@ -304,6 +321,7 @@ export type { ModelUpgradeInfo } from "./ModelUpgradeInfo.js";
 export type { ModelVerification } from "./ModelVerification.js";
 export type { ModelVerificationNotification } from "./ModelVerificationNotification.js";
 export type { ModelsRequirements } from "./ModelsRequirements.js";
+export type { MultiAgentVersion } from "./MultiAgentVersion.js";
 export type { NetworkAccess } from "./NetworkAccess.js";
 export type { NetworkApprovalContext } from "./NetworkApprovalContext.js";
 export type { NetworkApprovalProtocol } from "./NetworkApprovalProtocol.js";
@@ -327,6 +345,7 @@ export type { PlanDeltaNotification } from "./PlanDeltaNotification.js";
 export type { PluginAuthPolicy } from "./PluginAuthPolicy.js";
 export type { PluginAvailability } from "./PluginAvailability.js";
 export type { PluginDetail } from "./PluginDetail.js";
+export type { PluginDisabledReason } from "./PluginDisabledReason.js";
 export type { PluginHookSummary } from "./PluginHookSummary.js";
 export type { PluginInstallParams } from "./PluginInstallParams.js";
 export type { PluginInstallPolicy } from "./PluginInstallPolicy.js";
@@ -341,6 +360,10 @@ export type { PluginListResponse } from "./PluginListResponse.js";
 export type { PluginMarketplaceEntry } from "./PluginMarketplaceEntry.js";
 export type { PluginReadParams } from "./PluginReadParams.js";
 export type { PluginReadResponse } from "./PluginReadResponse.js";
+export type { PluginSearchParams } from "./PluginSearchParams.js";
+export type { PluginSearchResponse } from "./PluginSearchResponse.js";
+export type { PluginSearchResult } from "./PluginSearchResult.js";
+export type { PluginSearchScope } from "./PluginSearchScope.js";
 export type { PluginShareCheckoutParams } from "./PluginShareCheckoutParams.js";
 export type { PluginShareCheckoutResponse } from "./PluginShareCheckoutResponse.js";
 export type { PluginShareContext } from "./PluginShareContext.js";
@@ -379,6 +402,25 @@ export type { ProcessSpawnResponse } from "./ProcessSpawnResponse.js";
 export type { ProcessTerminalSize } from "./ProcessTerminalSize.js";
 export type { ProcessWriteStdinParams } from "./ProcessWriteStdinParams.js";
 export type { ProcessWriteStdinResponse } from "./ProcessWriteStdinResponse.js";
+export type { Project } from "./Project.js";
+export type { ProjectChangeType } from "./ProjectChangeType.js";
+export type { ProjectChangedNotification } from "./ProjectChangedNotification.js";
+export type { ProjectCreateParams } from "./ProjectCreateParams.js";
+export type { ProjectCreateResponse } from "./ProjectCreateResponse.js";
+export type { ProjectDeleteParams } from "./ProjectDeleteParams.js";
+export type { ProjectDeleteResponse } from "./ProjectDeleteResponse.js";
+export type { ProjectImportParams } from "./ProjectImportParams.js";
+export type { ProjectImportResponse } from "./ProjectImportResponse.js";
+export type { ProjectListParams } from "./ProjectListParams.js";
+export type { ProjectListResponse } from "./ProjectListResponse.js";
+export type { ProjectMoveParams } from "./ProjectMoveParams.js";
+export type { ProjectMoveResponse } from "./ProjectMoveResponse.js";
+export type { ProjectReadParams } from "./ProjectReadParams.js";
+export type { ProjectReadResponse } from "./ProjectReadResponse.js";
+export type { ProjectRoot } from "./ProjectRoot.js";
+export type { ProjectUpdateParams } from "./ProjectUpdateParams.js";
+export type { ProjectUpdateResponse } from "./ProjectUpdateResponse.js";
+export type { QueuedSubmission } from "./QueuedSubmission.js";
 export type { RateLimitReachedType } from "./RateLimitReachedType.js";
 export type { RateLimitResetCredit } from "./RateLimitResetCredit.js";
 export type { RateLimitResetCreditStatus } from "./RateLimitResetCreditStatus.js";
@@ -424,6 +466,10 @@ export type { ScheduledTaskWeekday } from "./ScheduledTaskWeekday.js";
 export type { SelectedCapabilityRoot } from "./SelectedCapabilityRoot.js";
 export type { SendAddCreditsNudgeEmailParams } from "./SendAddCreditsNudgeEmailParams.js";
 export type { SendAddCreditsNudgeEmailResponse } from "./SendAddCreditsNudgeEmailResponse.js";
+export type { ServerDiagnosticsGauge } from "./ServerDiagnosticsGauge.js";
+export type { ServerDiagnosticsParams } from "./ServerDiagnosticsParams.js";
+export type { ServerDiagnosticsProcess } from "./ServerDiagnosticsProcess.js";
+export type { ServerDiagnosticsResponse } from "./ServerDiagnosticsResponse.js";
 export type { ServerRequestResolvedNotification } from "./ServerRequestResolvedNotification.js";
 export type { SessionMigration } from "./SessionMigration.js";
 export type { SessionSource } from "./SessionSource.js";
@@ -445,6 +491,7 @@ export type { SkillsListParams } from "./SkillsListParams.js";
 export type { SkillsListResponse } from "./SkillsListResponse.js";
 export type { SortDirection } from "./SortDirection.js";
 export type { SpendControlLimitSnapshot } from "./SpendControlLimitSnapshot.js";
+export type { StrictReviewRequiredNotification } from "./StrictReviewRequiredNotification.js";
 export type { SubAgentActivityKind } from "./SubAgentActivityKind.js";
 export type { SubagentMigration } from "./SubagentMigration.js";
 export type { TerminalInteractionNotification } from "./TerminalInteractionNotification.js";
@@ -505,6 +552,20 @@ export type { ThreadMetadataGitInfoUpdateParams } from "./ThreadMetadataGitInfoU
 export type { ThreadMetadataUpdateParams } from "./ThreadMetadataUpdateParams.js";
 export type { ThreadMetadataUpdateResponse } from "./ThreadMetadataUpdateResponse.js";
 export type { ThreadNameUpdatedNotification } from "./ThreadNameUpdatedNotification.js";
+export type { ThreadProjectUpdatedNotification } from "./ThreadProjectUpdatedNotification.js";
+export type { ThreadQueueAddParams } from "./ThreadQueueAddParams.js";
+export type { ThreadQueueAddResponse } from "./ThreadQueueAddResponse.js";
+export type { ThreadQueueChangedNotification } from "./ThreadQueueChangedNotification.js";
+export type { ThreadQueueDeleteParams } from "./ThreadQueueDeleteParams.js";
+export type { ThreadQueueDeleteResponse } from "./ThreadQueueDeleteResponse.js";
+export type { ThreadQueueListParams } from "./ThreadQueueListParams.js";
+export type { ThreadQueueListResponse } from "./ThreadQueueListResponse.js";
+export type { ThreadQueueReorderParams } from "./ThreadQueueReorderParams.js";
+export type { ThreadQueueReorderResponse } from "./ThreadQueueReorderResponse.js";
+export type { ThreadQueueStartParams } from "./ThreadQueueStartParams.js";
+export type { ThreadQueueStartResponse } from "./ThreadQueueStartResponse.js";
+export type { ThreadQueueUpdateParams } from "./ThreadQueueUpdateParams.js";
+export type { ThreadQueueUpdateResponse } from "./ThreadQueueUpdateResponse.js";
 export type { ThreadReadParams } from "./ThreadReadParams.js";
 export type { ThreadReadResponse } from "./ThreadReadResponse.js";
 export type { ThreadRealtimeAppendAudioParams } from "./ThreadRealtimeAppendAudioParams.js";
@@ -533,6 +594,9 @@ export type { ThreadRealtimeTranscriptDoneNotification } from "./ThreadRealtimeT
 export type { ThreadResumeInitialTurnsPageParams } from "./ThreadResumeInitialTurnsPageParams.js";
 export type { ThreadResumeParams } from "./ThreadResumeParams.js";
 export type { ThreadResumeResponse } from "./ThreadResumeResponse.js";
+export type { ThreadRevertParams } from "./ThreadRevertParams.js";
+export type { ThreadRevertResponse } from "./ThreadRevertResponse.js";
+export type { ThreadRevertedNotification } from "./ThreadRevertedNotification.js";
 export type { ThreadRollbackParams } from "./ThreadRollbackParams.js";
 export type { ThreadRollbackResponse } from "./ThreadRollbackResponse.js";
 export type { ThreadSearchOccurrence } from "./ThreadSearchOccurrence.js";
@@ -541,7 +605,20 @@ export type { ThreadSearchOccurrencesResponse } from "./ThreadSearchOccurrencesR
 export type { ThreadSearchParams } from "./ThreadSearchParams.js";
 export type { ThreadSearchResponse } from "./ThreadSearchResponse.js";
 export type { ThreadSearchResult } from "./ThreadSearchResult.js";
+export type { ThreadSearchSortKey } from "./ThreadSearchSortKey.js";
 export type { ThreadSearchTextRange } from "./ThreadSearchTextRange.js";
+export type { ThreadSection } from "./ThreadSection.js";
+export type { ThreadSectionAppearance } from "./ThreadSectionAppearance.js";
+export type { ThreadSectionCreateParams } from "./ThreadSectionCreateParams.js";
+export type { ThreadSectionCreateResponse } from "./ThreadSectionCreateResponse.js";
+export type { ThreadSectionDeleteParams } from "./ThreadSectionDeleteParams.js";
+export type { ThreadSectionDeleteResponse } from "./ThreadSectionDeleteResponse.js";
+export type { ThreadSectionListParams } from "./ThreadSectionListParams.js";
+export type { ThreadSectionListResponse } from "./ThreadSectionListResponse.js";
+export type { ThreadSectionMoveParams } from "./ThreadSectionMoveParams.js";
+export type { ThreadSectionMoveResponse } from "./ThreadSectionMoveResponse.js";
+export type { ThreadSectionUpdateParams } from "./ThreadSectionUpdateParams.js";
+export type { ThreadSectionUpdateResponse } from "./ThreadSectionUpdateResponse.js";
 export type { ThreadSetNameParams } from "./ThreadSetNameParams.js";
 export type { ThreadSetNameResponse } from "./ThreadSetNameResponse.js";
 export type { ThreadSettings } from "./ThreadSettings.js";
@@ -569,6 +646,8 @@ export type { ThreadUnarchivedNotification } from "./ThreadUnarchivedNotificatio
 export type { ThreadUnsubscribeParams } from "./ThreadUnsubscribeParams.js";
 export type { ThreadUnsubscribeResponse } from "./ThreadUnsubscribeResponse.js";
 export type { ThreadUnsubscribeStatus } from "./ThreadUnsubscribeStatus.js";
+export type { ThreadUsage } from "./ThreadUsage.js";
+export type { ThreadUsageBreakdownGroup } from "./ThreadUsageBreakdownGroup.js";
 export type { TokenUsageBreakdown } from "./TokenUsageBreakdown.js";
 export type { ToolRequestUserInputAnswer } from "./ToolRequestUserInputAnswer.js";
 export type { ToolRequestUserInputOption } from "./ToolRequestUserInputOption.js";
diff --git a/src/vs/platform/agentHost/node/copilot/copilotAgent.ts b/src/vs/platform/agentHost/node/copilot/copilotAgent.ts
index 357da2d57ed8b9..842ef94b3f7a64 100644
--- a/src/vs/platform/agentHost/node/copilot/copilotAgent.ts
+++ b/src/vs/platform/agentHost/node/copilot/copilotAgent.ts
@@ -137,8 +137,9 @@ export async function getCopilotManagedSettingsDiagnostics(
 	signal: AbortSignal,
 	timeoutMs = COPILOT_MANAGED_SETTINGS_QUERY_TIMEOUT_MS,
 	proxy: string | undefined = undefined,
+	noProxy: string | undefined = undefined,
 ): Promise<{ account?: string; resolved: ManagedSettingsResolvedData }> {
-	const request = invokeWithProxyEnvironment(proxy, () => runtimeSdk.getManagedSettings({
+	const request = invokeWithTemporaryProxyEnvironment(proxy, noProxy, () => runtimeSdk.getManagedSettings({
 		...(token ? { authInfo: { type: 'token', host, token } as const, token } : {}),
 		signal,
 	}));
@@ -149,20 +150,32 @@ export async function getCopilotManagedSettingsDiagnostics(
 	return result;
 }
 
-function invokeWithProxyEnvironment<T>(proxy: string | undefined, invoke: () => Promise<T>): Promise<T> {
-	if (!proxy) {
+function invokeWithTemporaryProxyEnvironment<T>(proxy: string | undefined, noProxy: string | undefined, invoke: () => T): T {
+	if (!proxy && !noProxy) {
 		return invoke();
 	}
-	const previousValues = COPILOT_PROXY_SET_ENV_KEYS.map(key => process.env[key]);
-	for (const key of COPILOT_PROXY_SET_ENV_KEYS) {
-		process.env[key] = proxy;
+	const keys = [
+		...(proxy ? COPILOT_PROXY_ENV_KEYS : []),
+		...(noProxy ? COPILOT_NO_PROXY_ENV_KEYS : []),
+	];
+	const previousValues = keys.map(key => process.env[key]);
+	for (const key of keys) {
+		delete process.env[key];
+	}
+	if (proxy) {
+		for (const key of COPILOT_PROXY_SET_ENV_KEYS) {
+			process.env[key] = proxy;
+		}
+	}
+	if (noProxy) {
+		process.env['NO_PROXY'] = noProxy;
 	}
 	try {
 		// The SDK snapshots process.env while constructing the native request.
 		return invoke();
 	} finally {
-		for (let index = 0; index < COPILOT_PROXY_SET_ENV_KEYS.length; index++) {
-			const key = COPILOT_PROXY_SET_ENV_KEYS[index];
+		for (let index = 0; index < keys.length; index++) {
+			const key = keys[index];
 			const value = previousValues[index];
 			if (value === undefined) {
 				delete process.env[key];
@@ -186,9 +199,10 @@ function isCopilotConnectionClosedError(error: unknown): boolean {
 }
 
 /**
- * Proxy env vars that indicate the environment already configures a proxy.
+ * Proxy env vars recognized by the Copilot runtime.
  */
 const COPILOT_PROXY_ENV_KEYS = ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy', 'ALL_PROXY', 'all_proxy'] as const;
+const COPILOT_NO_PROXY_ENV_KEYS = ['no_proxy', 'NO_PROXY'] as const;
 /**
  * Proxy env vars we set when injecting the resolved CAPI proxy.
  */
@@ -798,6 +812,7 @@ export class CopilotAgent extends Disposable implements IAgent {
 	private _proxyRefresh: Promise<void> | undefined;
 	private _proxyResolutionGeneration = 0;
 	private _appliedProxy: string | undefined;
+	private _appliedNoProxy: string | undefined;
 	private _appliedProxyKerberosSpn: string | undefined;
 	/**
 	 * Reasons for a client restart that is parked until every chat is idle. See
@@ -1355,6 +1370,7 @@ export class CopilotAgent extends Disposable implements IAgent {
 				AbortSignal.timeout(COPILOT_MANAGED_SETTINGS_DIAGNOSTICS_TIMEOUT_MS),
 				COPILOT_MANAGED_SETTINGS_QUERY_TIMEOUT_MS,
 				proxy,
+				this._readNoProxy(process.env),
 			);
 		})();
 		const result = await raceTimeout(diagnostics, COPILOT_MANAGED_SETTINGS_DIAGNOSTICS_TIMEOUT_MS);
@@ -2030,12 +2046,11 @@ export class CopilotAgent extends Disposable implements IAgent {
 
 			// Build a clean env for the CLI subprocess, stripping Electron/VS Code vars
 			// that can interfere with the Node.js process the SDK spawns.
-			const env = createCopilotCliEnvironment();
+			const env = this._createCopilotCliEnvironment();
 			// Family aliases are host-side (prompt and tool-profile routing) and
 			// deliberately never reach the runtime; an ambient value here would
 			// re-introduce a process-wide alias for every session behind its back.
 			delete env['COPILOT_MODEL_FAMILY'];
-			this._applyProxyEnv(env);
 			setCopilotBuiltinGitHubMcpEnvironment(env, startupConfig.githubMcpServer);
 
 			// On Linux the MXC bubblewrap sandbox backend does not forward a PTY into
@@ -4846,23 +4861,50 @@ export class CopilotAgent extends Disposable implements IAgent {
 		return spn || undefined;
 	}
 
-	private _applyProxyEnv(env: Record<string, string | undefined>): void {
-		const proxy = this._isSystemProxyEnabled() ? this._resolvedProxy : undefined;
+	private _readNoProxy(env: Record<string, string | undefined>): string | undefined {
+		const configuredNoProxy = (this._configurationService.getRootValue(agentHostProxyConfigSchema, AgentHostProxyConfigKey.NoProxy) ?? [])
+			.map(value => value.trim())
+			.filter(Boolean)
+			.join(',');
+		return configuredNoProxy || (env['no_proxy'] || env['NO_PROXY'] || '').trim() || undefined;
+	}
+
+	private _readConfiguredProxy(): string | undefined {
+		return this._configurationService.getRootValue(agentHostProxyConfigSchema, AgentHostProxyConfigKey.Proxy)?.trim() || undefined;
+	}
+
+	private _createCopilotCliEnvironment(): Record<string, string | undefined> {
+		const proxy = this._readConfiguredProxy() ?? (this._isSystemProxyEnabled() ? this._resolvedProxy : undefined);
 		this._appliedProxy = proxy;
+		const noProxy = this._readNoProxy(process.env);
+		this._appliedNoProxy = noProxy;
+		const omittedKeys = [
+			...(proxy ? COPILOT_PROXY_ENV_KEYS : []),
+			...(noProxy ? COPILOT_NO_PROXY_ENV_KEYS : []),
+		];
+		const env = createCopilotCliEnvironment(process.env, omittedKeys);
 		if (proxy) {
 			for (const key of COPILOT_PROXY_SET_ENV_KEYS) {
 				env[key] = proxy;
 			}
 			this._logService.info('[Copilot] Resolved CAPI proxy and forwarded HTTP_PROXY/HTTPS_PROXY to Copilot SDK');
 		}
-		const kerberosSpn = this._readKerberosSpn(env);
+		if (noProxy) {
+			env['NO_PROXY'] = noProxy;
+		}
+		const kerberosSpn = this._readKerberosSpn(process.env);
 		this._appliedProxyKerberosSpn = kerberosSpn;
 		if (kerberosSpn && !env['COPILOT_PROXY_KERBEROS_SPN']) {
 			env['COPILOT_PROXY_KERBEROS_SPN'] = kerberosSpn;
 		}
+		return env;
 	}
 
 	private async _resolveProxyForSdk(env: Record<string, string | undefined> = process.env): Promise<string | undefined> {
+		const configuredProxy = this._readConfiguredProxy();
+		if (configuredProxy) {
+			return configuredProxy;
+		}
 		if (!this._isSystemProxyEnabled()) {
 			return undefined;
 		}
@@ -4898,9 +4940,10 @@ export class CopilotAgent extends Disposable implements IAgent {
 				return;
 			}
 			this._resolvedProxy = proxy;
-			const effectiveProxy = this._isSystemProxyEnabled() ? proxy : undefined;
+			const effectiveProxy = this._readConfiguredProxy() ?? (this._isSystemProxyEnabled() ? proxy : undefined);
+			const effectiveNoProxy = this._readNoProxy(process.env);
 			const effectiveKerberosSpn = this._readKerberosSpn(process.env);
-			if (effectiveProxy === this._appliedProxy && effectiveKerberosSpn === this._appliedProxyKerberosSpn) {
+			if (effectiveProxy === this._appliedProxy && effectiveNoProxy === this._appliedNoProxy && effectiveKerberosSpn === this._appliedProxyKerberosSpn) {
 				return;
 			}
 			if (this._clientStarting) {
@@ -4912,7 +4955,7 @@ export class CopilotAgent extends Disposable implements IAgent {
 				// A newer proxy resolution (or the client start we just awaited)
 				// may have already superseded this one; re-check both so we don't
 				// restart based on a stale comparison.
-				if (generation !== this._proxyResolutionGeneration || (effectiveProxy === this._appliedProxy && effectiveKerberosSpn === this._appliedProxyKerberosSpn)) {
+				if (generation !== this._proxyResolutionGeneration || (effectiveProxy === this._appliedProxy && effectiveNoProxy === this._appliedNoProxy && effectiveKerberosSpn === this._appliedProxyKerberosSpn)) {
 					return;
 				}
 			}
@@ -4920,6 +4963,9 @@ export class CopilotAgent extends Disposable implements IAgent {
 			if (effectiveProxy !== this._appliedProxy) {
 				changes.push(`proxy ${this._appliedProxy ?? '(none)'} -> ${effectiveProxy ?? '(none)'}`);
 			}
+			if (effectiveNoProxy !== this._appliedNoProxy) {
+				changes.push('NO_PROXY changed');
+			}
 			if (effectiveKerberosSpn !== this._appliedProxyKerberosSpn) {
 				changes.push('Kerberos SPN changed');
 			}
diff --git a/src/vs/platform/agentHost/node/copilot/copilotCliEnvironment.ts b/src/vs/platform/agentHost/node/copilot/copilotCliEnvironment.ts
index bf7bb75fc78474..14d7b38cce05cb 100644
--- a/src/vs/platform/agentHost/node/copilot/copilotCliEnvironment.ts
+++ b/src/vs/platform/agentHost/node/copilot/copilotCliEnvironment.ts
@@ -4,9 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AiAgentEnvValue, AiAgentEnvVar } from '../../../chat/common/aiAgentEnv.js';
+import { isWindows } from '../../../../base/common/platform.js';
 
-export function createCopilotCliEnvironment(environment: NodeJS.ProcessEnv = process.env): Record<string, string | undefined> {
-	const env: Record<string, string | undefined> = Object.assign({}, environment, { ELECTRON_RUN_AS_NODE: '1' });
+export function createCopilotCliEnvironment(environment: NodeJS.ProcessEnv = process.env, omittedKeys: readonly string[] = []): Record<string, string | undefined> {
+	const normalizedOmittedKeys = new Set(omittedKeys.map(key => isWindows ? key.toLowerCase() : key));
+	const env: Record<string, string | undefined> = {};
+	for (const [key, value] of Object.entries(environment)) {
+		if (!normalizedOmittedKeys.has(isWindows ? key.toLowerCase() : key)) {
+			env[key] = value;
+		}
+	}
+	env['ELECTRON_RUN_AS_NODE'] = '1';
 	delete env['NODE_OPTIONS'];
 	delete env['VSCODE_INSPECTOR_OPTIONS'];
 	delete env['VSCODE_ESM_ENTRYPOINT'];
diff --git a/src/vs/platform/agentHost/node/devContainerAgentHostService.ts b/src/vs/platform/agentHost/node/devContainerAgentHostService.ts
index 6a0bd0d8b17057..ba324285429240 100644
--- a/src/vs/platform/agentHost/node/devContainerAgentHostService.ts
+++ b/src/vs/platform/agentHost/node/devContainerAgentHostService.ts
@@ -371,13 +371,20 @@ export class DevContainerAgentHostMainService extends Disposable implements IDev
 		return this._nativeRequire;
 	}
 
-	protected _resolveShellEnvironment(): Promise<typeof process.env> {
-		this._shellEnvironment ??= getResolvedShellEnv(
+	protected _resolveUserShellEnvironment(): Promise<typeof process.env> {
+		return getResolvedShellEnv(
 			this._configurationService,
 			this._logService,
 			{ ...this._environmentService.args, 'force-user-env': true },
 			process.env,
 		);
+	}
+
+	protected _resolveShellEnvironment(): Promise<typeof process.env> {
+		this._shellEnvironment ??= this._resolveUserShellEnvironment().catch(error => {
+			this._logService.error(`${LOG_PREFIX} Unable to resolve shell environment; using inherited environment`, error);
+			return process.env;
+		});
 		return this._shellEnvironment;
 	}
 
diff --git a/src/vs/platform/agentHost/node/protocolServerHandler.ts b/src/vs/platform/agentHost/node/protocolServerHandler.ts
index 3bfa94f8ad6f0c..bb8aed912d53fd 100644
--- a/src/vs/platform/agentHost/node/protocolServerHandler.ts
+++ b/src/vs/platform/agentHost/node/protocolServerHandler.ts
@@ -20,7 +20,8 @@ import { AgentHostClientConnectionKind, AgentHostLaunchKind, AgentHostTransportK
 import { AgentSession, type IAgentCreateChatRequestOptions, type IMcpNotification } from '../common/agent.js';
 import { isManagedSettingsPermissions } from '../common/agentHostManagedSettings.js';
 import { type IAgentService } from '../common/agentService.js';
-import { collectAgentHostDebugLogsParamsValidator, CollectAgentHostDebugLogsExtensionMethod, getAgentHostExtensionInitializeResultMeta, GetAgentHostSessionStateFileExtensionMethod, ReadAgentHostDebugLogsChunkExtensionMethod, type IAgentHostExtensionInitializeResult } from '../common/agentHostExtensionProtocol.js';
+import { ClaimAgentHostDetachedWorktreeExtensionMethod, collectAgentHostDebugLogsParamsValidator, CollectAgentHostDebugLogsExtensionMethod, CreateAgentHostDetachedWorktreeExtensionMethod, DeleteAgentHostDetachedWorktreeExtensionMethod, getAgentHostExtensionInitializeResultMeta, GetAgentHostSessionStateFileExtensionMethod, ReadAgentHostDebugLogsChunkExtensionMethod, ReconcileAgentHostDetachedWorktreesExtensionMethod, SetAgentHostDetachedWorktreeArchivedExtensionMethod, type IAgentHostExtensionInitializeResult } from '../common/agentHostExtensionProtocol.js';
+import { isAgentDevContainerWorktreeHandle } from '../common/meta/agentDevContainerWorktreeMeta.js';
 import { isActionEnvelopeRelevantToSubscriptionUris } from '../common/state/agentSubscription.js';
 import { ChatSourceKind } from '../common/state/protocol/channels-chat/commands.js';
 import type { CommandMap } from '../common/state/protocol/messages.js';
@@ -1799,6 +1800,95 @@ export class ProtocolServerHandler extends Disposable implements IAgentHostClien
 				}
 				return this._agentService.getSessionStateFile(session, chat).then(resource => ({ resource: resource?.toString() }));
 			}
+			case CreateAgentHostDetachedWorktreeExtensionMethod: {
+				if (!this._agentService.createDetachedWorktree) {
+					return undefined;
+				}
+				if (!isParamsObject(params)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'params must be an object'));
+				}
+				const sessionParam = params['session'];
+				const prompt = params['prompt'];
+				if (typeof sessionParam !== 'string') {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'session must be a URI string'));
+				}
+				if (typeof prompt !== 'string') {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'prompt must be a string'));
+				}
+				let session: URI;
+				try {
+					session = URI.parse(sessionParam, true);
+				} catch {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'session must be a valid URI string'));
+				}
+				if (!AgentSession.provider(session)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'session must be a valid Agent Session URI'));
+				}
+				return this._agentService.createDetachedWorktree(session, prompt).then(result => ({
+					handle: result.handle,
+					resource: result.worktree.toString(),
+				}));
+			}
+			case SetAgentHostDetachedWorktreeArchivedExtensionMethod: {
+				if (!this._agentService.setDetachedWorktreeArchived) {
+					return undefined;
+				}
+				if (!isParamsObject(params)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'params must be an object'));
+				}
+				const handle = params['handle'];
+				const archived = params['archived'];
+				if (!isAgentDevContainerWorktreeHandle(handle)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'handle must be a valid worktree handle'));
+				}
+				if (typeof archived !== 'boolean') {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'archived must be a boolean'));
+				}
+				return this._agentService.setDetachedWorktreeArchived(handle, archived);
+			}
+			case ClaimAgentHostDetachedWorktreeExtensionMethod: {
+				if (!this._agentService.claimDetachedWorktree) {
+					return undefined;
+				}
+				if (!isParamsObject(params)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'params must be an object'));
+				}
+				const handle = params['handle'];
+				if (!isAgentDevContainerWorktreeHandle(handle)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'handle must be a valid worktree handle'));
+				}
+				return this._agentService.claimDetachedWorktree(handle);
+			}
+			case DeleteAgentHostDetachedWorktreeExtensionMethod: {
+				if (!this._agentService.deleteDetachedWorktree) {
+					return undefined;
+				}
+				if (!isParamsObject(params)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'params must be an object'));
+				}
+				const handle = params['handle'];
+				if (!isAgentDevContainerWorktreeHandle(handle)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'handle must be a valid worktree handle'));
+				}
+				return this._agentService.deleteDetachedWorktree(handle);
+			}
+			case ReconcileAgentHostDetachedWorktreesExtensionMethod: {
+				if (!this._agentService.reconcileDetachedWorktrees) {
+					return undefined;
+				}
+				if (!isParamsObject(params)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'params must be an object'));
+				}
+				const scope = params['scope'];
+				const activeHandles = params['activeHandles'];
+				if (typeof scope !== 'string' || !scope) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'scope must be a non-empty string'));
+				}
+				if (!Array.isArray(activeHandles) || !activeHandles.every(isAgentDevContainerWorktreeHandle)) {
+					return Promise.reject(new ProtocolError(JsonRpcErrorCodes.InvalidParams, 'activeHandles must contain valid worktree handles'));
+				}
+				return this._agentService.reconcileDetachedWorktrees(scope, activeHandles);
+			}
 			case CollectAgentHostDebugLogsExtensionMethod: {
 				if (!this._agentService.collectDebugLogs) {
 					return undefined;
diff --git a/src/vs/platform/agentHost/node/sessionDataService.ts b/src/vs/platform/agentHost/node/sessionDataService.ts
index 9bcbe19c29e4ba..42269284685ed9 100644
--- a/src/vs/platform/agentHost/node/sessionDataService.ts
+++ b/src/vs/platform/agentHost/node/sessionDataService.ts
@@ -9,6 +9,7 @@ import { Emitter, Event } from '../../../base/common/event.js';
 import { IFileService } from '../../files/common/files.js';
 import { ILogService } from '../../log/common/log.js';
 import { AgentSession } from '../common/agent.js';
+import { DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX } from '../common/meta/agentDevContainerWorktreeMeta.js';
 import { ISessionDatabase, ISessionDataService, IWillDeleteSessionDataEvent, SESSION_DB_FILENAME } from '../common/sessionDataService.js';
 import { SessionDatabase } from './sessionDatabase.js';
 
@@ -162,7 +163,7 @@ export class SessionDataService implements ISessionDataService {
 					continue;
 				}
 				const name = child.name;
-				if (!knownSessionIds.has(name)) {
+				if (!knownSessionIds.has(name) && !name.startsWith(DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX)) {
 					this._logService.trace(`[SessionDataService] Cleaning up orphaned session data: ${name}`);
 					deletions.push(
 						this._fileService.del(child.resource, { recursive: true }).catch(err => {
@@ -178,6 +179,14 @@ export class SessionDataService implements ISessionDataService {
 		}
 	}
 
+	async listSessionDataIds(prefix: string): Promise<readonly string[]> {
+		if (!await this._fileService.exists(this._basePath)) {
+			return [];
+		}
+		const stat = await this._fileService.resolve(this._basePath);
+		return stat.children?.filter(child => child.isDirectory && child.name.startsWith(prefix)).map(child => child.name) ?? [];
+	}
+
 	async whenIdle(): Promise<void> {
 		// Each `SessionDatabase.whenIdle()` already loops internally until
 		// that DB is quiescent, so the outer loop only needs to handle the
diff --git a/src/vs/platform/agentHost/node/shared/sessionServerTools.ts b/src/vs/platform/agentHost/node/shared/sessionServerTools.ts
index c37b09af7c4a55..e3a13d572d71b2 100644
--- a/src/vs/platform/agentHost/node/shared/sessionServerTools.ts
+++ b/src/vs/platform/agentHost/node/shared/sessionServerTools.ts
@@ -240,6 +240,7 @@ export interface ISessionCreationDefaults {
 	readonly model?: ModelSelection;
 	readonly config?: Record<string, unknown>;
 	readonly isolation?: 'folder' | 'worktree';
+	readonly project?: URI;
 }
 
 /** Point-in-time snapshot of a chat's conversation, read from the host state. */
@@ -747,11 +748,14 @@ export async function applyCreateSessionTool(accessor: ISessionServerToolAccesso
 	const provider = args.model?.provider ?? defaults?.provider;
 	const inheritsSourceProvider = provider !== undefined && provider === defaults?.provider;
 	const inheritedProviderConfig = inheritsSourceProvider ? defaults?.config : undefined;
-	const configValues = inheritedProviderConfig === undefined && defaults?.isolation === undefined
+	const isolation = defaults?.project !== undefined && isEqual(defaults.project, args.workspace)
+		? defaults.isolation
+		: 'worktree';
+	const configValues = inheritedProviderConfig === undefined && isolation === undefined
 		? undefined
 		: {
 			...inheritedProviderConfig,
-			...(defaults?.isolation !== undefined ? { [SessionConfigKey.Isolation]: defaults.isolation } : {}),
+			...(isolation !== undefined ? { [SessionConfigKey.Isolation]: isolation } : {}),
 		};
 	const config: IAgentCreateSessionConfig = {
 		workingDirectories: args.workspace ? [args.workspace] : undefined,
diff --git a/src/vs/platform/agentHost/node/shared/worktreeIsolation.ts b/src/vs/platform/agentHost/node/shared/worktreeIsolation.ts
index dd8606fde0d439..d630fe630746d5 100644
--- a/src/vs/platform/agentHost/node/shared/worktreeIsolation.ts
+++ b/src/vs/platform/agentHost/node/shared/worktreeIsolation.ts
@@ -10,7 +10,7 @@ import { appendEscapedMarkdownInlineCode } from '../../../../base/common/htmlCon
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { basename } from '../../../../base/common/path.js';
-import { isEqual } from '../../../../base/common/resources.js';
+import { getComparisonKey, isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { localize } from '../../../../nls.js';
@@ -22,6 +22,7 @@ import { AgentSystemNotificationKind, AgentSystemNotificationSeverity, toAgentSy
 import { ISchemaProperty, schemaProperty } from '../../common/agentHostSchema.js';
 import { ISessionDataService } from '../../common/sessionDataService.js';
 import { SessionConfigKey } from '../../common/sessionConfigKeys.js';
+import { DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX, isAgentDevContainerWorktreeHandle } from '../../common/meta/agentDevContainerWorktreeMeta.js';
 import { getWorktreesRoot } from '../../common/worktreePaths.js';
 import { AH_META_IS_ARCHIVED_DB_KEY, AH_META_IS_DONE_DB_KEY, ResponsePart, ResponsePartKind, Turn } from '../../common/state/sessionState.js';
 import { AGENT_BRANCH_PREFIX, IAgentBranchNameGenerator } from './agentBranchNameGenerator.js';
@@ -50,6 +51,11 @@ export interface IAgentHostWorktreeIsolation extends IAgentHostWorktreePendingSt
 	clearPending(sessionId: string): void;
 	getResolvedWorktree(sessionId: string): URI | undefined;
 	resolveOnFirstSend(request: IResolveWorkingDirectoryRequest): Promise<URI | undefined>;
+	createDetachedWorktree(request: Omit<IResolveWorkingDirectoryRequest, 'sessionUri' | 'sessionId'>): Promise<{ handle: string; worktree: URI }>;
+	claimDetachedWorktree(handle: string): Promise<void>;
+	setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void>;
+	deleteDetachedWorktree(handle: string): Promise<void>;
+	reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void>;
 	resolveIsolationConfig(request: IResolveIsolationConfigRequest): Promise<IIsolationConfigContribution | undefined>;
 	branchCompletions(workingDirectory: URI | undefined, query?: string): Promise<{ items: { value: string; label: string }[] }>;
 	takePendingAnnouncement(sessionId: string): string | undefined;
@@ -80,10 +86,21 @@ const WORKTREE_META_BRANCH = 'copilot.worktree.branchName';
 const WORKTREE_META_PATH = 'copilot.worktree.path';
 export const WORKTREE_META_REPOSITORY_ROOT = 'copilot.worktree.repositoryRoot';
 const WORKTREE_META_CREATION_FAILURE = 'copilot.worktree.creationFailure';
+const DETACHED_WORKTREE_OWNER_SCHEME = 'vscode-agent-host-worktree';
+const DETACHED_WORKTREE_SCOPE = 'vscode.devContainerWorktree.scope';
+const DETACHED_WORKTREE_CREATED_AT = 'vscode.devContainerWorktree.createdAt';
+const DETACHED_WORKTREE_CLAIMED = 'vscode.devContainerWorktree.claimed';
+const DETACHED_WORKTREE_LAST_SEEN_AT = 'vscode.devContainerWorktree.lastSeenAt';
+const DETACHED_WORKTREE_DELETION_PENDING = 'vscode.devContainerWorktree.deletionPending';
+const DETACHED_WORKTREE_RECONCILE_GRACE_MS = 24 * 60 * 60 * 1000;
 // TODO@roblourens: Remove after ~November 2026, when pre-July 2026 sessions no longer need their worktree path/root reconstructed from this legacy key.
 const LEGACY_WORKTREE_META_WORKING_DIRECTORY = 'copilot.workingDirectory';
 const MAX_WORKTREE_FAILURE_DIAGNOSTIC_LENGTH = 200;
 
+function detachedWorktreeRecordUri(handle: string): URI {
+	return URI.from({ scheme: DETACHED_WORKTREE_OWNER_SCHEME, path: `/${DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX}${handle}` });
+}
+
 /** Thrown when a persisted session working directory is missing and cannot be repaired. */
 export class SessionWorkingDirectoryMissingError extends Error {
 	constructor(readonly workingDirectory: URI, readonly reason?: string) {
@@ -350,6 +367,7 @@ export interface IResolveWorkingDirectoryRequest {
 	 * activity once resolution settles.
 	 */
 	readonly onProgress?: (activity: string) => void;
+	readonly onWillCreate?: (metadata: { readonly repositoryRoot: URI; readonly worktreePath: URI; readonly baseBranch: string | undefined; readonly branchName: string }) => Promise<void>;
 }
 
 /**
@@ -420,6 +438,8 @@ export class WorktreeIsolation extends Disposable implements IAgentHostWorktreeI
 		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
+		void this._cleanupUnclaimedDetachedWorktrees().catch(error =>
+			this._logService.warn(`[${this._logLabel}] Failed to clean up unclaimed detached worktrees: ${errorMessage(error)}`));
 	}
 
 	/**
@@ -471,6 +491,217 @@ export class WorktreeIsolation extends Disposable implements IAgentHostWorktreeI
 		});
 	}
 
+	async createDetachedWorktree(request: Omit<IResolveWorkingDirectoryRequest, 'sessionUri' | 'sessionId'>): Promise<{ handle: string; worktree: URI }> {
+		const handle = generateUuid();
+		const record = detachedWorktreeRecordUri(handle);
+		const createdAtRef = this._sessionDataService.openDatabase(record);
+		try {
+			await createdAtRef.object.setMetadataValues({
+				[DETACHED_WORKTREE_CREATED_AT]: String(Date.now()),
+				[DETACHED_WORKTREE_CLAIMED]: 'false',
+			});
+		} finally {
+			createdAtRef.dispose();
+		}
+		let worktree: URI | undefined;
+		try {
+			worktree = await this.resolveWorkingDirectory({
+				...request,
+				sessionUri: record,
+				sessionId: handle,
+				onWillCreate: async metadata => {
+					await this._writeWorktreeMetadata(record, metadata);
+					const ref = this._sessionDataService.openDatabase(record);
+					try {
+						await ref.object.setMetadata(DETACHED_WORKTREE_SCOPE, getComparisonKey(metadata.worktreePath));
+					} finally {
+						ref.dispose();
+					}
+				},
+			});
+		} catch (error) {
+			const metadata = await this.readWorktreeMetadata(record).catch(() => undefined);
+			if (metadata?.repositoryRoot && metadata.worktreePath) {
+				try {
+					await this.removeSessionWorktree(handle, { repositoryRoot: metadata.repositoryRoot, worktree: metadata.worktreePath });
+					await this._sessionDataService.deleteSessionData(record);
+				} catch {
+					// Keep the record so startup reconciliation can retry cleanup.
+				}
+			} else {
+				await this._sessionDataService.deleteSessionData(record);
+			}
+			throw error;
+		}
+		if (!worktree || (request.workingDirectory && isEqual(worktree, request.workingDirectory))) {
+			await this._sessionDataService.deleteSessionData(record);
+			throw new Error('Failed to create detached worktree.');
+		}
+		const metadata = await this.readWorktreeMetadata(record);
+		if (!metadata?.repositoryRoot || !metadata.worktreePath) {
+			const materialized = this._materializedWorktrees.get(handle);
+			await this.removeSessionWorktree(handle, materialized);
+			await this._sessionDataService.deleteSessionData(record);
+			throw new Error('Failed to persist detached worktree metadata.');
+		}
+		this.takePendingAnnouncement(handle);
+		return { handle, worktree };
+	}
+
+	async claimDetachedWorktree(handle: string): Promise<void> {
+		const record = detachedWorktreeRecordUri(handle);
+		const ref = await this._sessionDataService.tryOpenDatabase(record);
+		if (!ref) {
+			throw new Error(`Unknown detached worktree handle: ${handle}`);
+		}
+		try {
+			await ref.object.setMetadataValues({
+				[DETACHED_WORKTREE_CLAIMED]: 'true',
+				[DETACHED_WORKTREE_LAST_SEEN_AT]: String(Date.now()),
+			});
+		} finally {
+			ref.dispose();
+		}
+	}
+
+	async setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void> {
+		const record = detachedWorktreeRecordUri(handle);
+		const ref = await this._sessionDataService.tryOpenDatabase(record);
+		if (!ref) {
+			this._logService.info(`[${this._logLabel}:${handle}] Detached worktree record is unavailable; skipping ${archived ? 'archive' : 'unarchive'} cleanup`);
+			return;
+		}
+		try {
+			await ref.object.setMetadata(AH_META_IS_ARCHIVED_DB_KEY, archived ? 'true' : '');
+		} finally {
+			ref.dispose();
+		}
+		if (archived) {
+			await this.cleanupWorktreeOnArchive(record, handle);
+		} else {
+			await this.recreateWorktreeOnUnarchive(record, handle);
+		}
+	}
+
+	async deleteDetachedWorktree(handle: string): Promise<void> {
+		const record = detachedWorktreeRecordUri(handle);
+		return this._sequencer.queue(handle, async () => {
+			const ref = await this._sessionDataService.tryOpenDatabase(record);
+			if (!ref) {
+				return;
+			}
+			ref.dispose();
+			const deletionRef = this._sessionDataService.openDatabase(record);
+			try {
+				await deletionRef.object.setMetadata(DETACHED_WORKTREE_DELETION_PENDING, 'true');
+			} finally {
+				deletionRef.dispose();
+			}
+			const retry = this._worktreeDeletionRetries.get(handle);
+			const materialized = this._materializedWorktrees.get(handle);
+			const metadata = retry || materialized ? undefined : await this._readWorktreeMetadata(record);
+			const worktree = retry ?? materialized ?? (metadata?.worktreePath && metadata.repositoryRoot
+				? { repositoryRoot: metadata.repositoryRoot, worktree: metadata.worktreePath }
+				: undefined);
+			await this._removeSessionWorktree(handle, worktree);
+			await this._sessionDataService.deleteSessionData(record);
+		});
+	}
+
+	async reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+		await this._reconcileDetachedWorktrees(scope, new Set(activeHandles), false);
+	}
+
+	private async _cleanupUnclaimedDetachedWorktrees(): Promise<void> {
+		await this._reconcileDetachedWorktrees(undefined, new Set(), true);
+	}
+
+	private async _reconcileDetachedWorktrees(scope: string | undefined, activeHandles: ReadonlySet<string>, unclaimedOnly: boolean): Promise<void> {
+		const dataIds = await this._sessionDataService.listSessionDataIds?.(DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX) ?? [];
+		for (const dataId of dataIds) {
+			const handle = dataId.substring(DEV_CONTAINER_WORKTREE_DATA_ID_PREFIX.length);
+			if (!isAgentDevContainerWorktreeHandle(handle)) {
+				continue;
+			}
+			const record = detachedWorktreeRecordUri(handle);
+			await this._sequencer.queue(handle, async () => {
+				const ref = await this._sessionDataService.tryOpenDatabase(record);
+				if (!ref) {
+					return;
+				}
+				let recordScope: string | undefined;
+				let createdAt = Number.NaN;
+				let lastSeenAt = Number.NaN;
+				let claimed = false;
+				let deletionPending = false;
+				try {
+					const metadata = await ref.object.getMetadataObject({
+						[DETACHED_WORKTREE_SCOPE]: true,
+						[DETACHED_WORKTREE_CREATED_AT]: true,
+						[DETACHED_WORKTREE_CLAIMED]: true,
+						[DETACHED_WORKTREE_LAST_SEEN_AT]: true,
+						[DETACHED_WORKTREE_DELETION_PENDING]: true,
+					});
+					recordScope = metadata[DETACHED_WORKTREE_SCOPE];
+					createdAt = Number(metadata[DETACHED_WORKTREE_CREATED_AT]);
+					claimed = metadata[DETACHED_WORKTREE_CLAIMED] === 'true';
+					lastSeenAt = Number(metadata[DETACHED_WORKTREE_LAST_SEEN_AT]);
+					deletionPending = metadata[DETACHED_WORKTREE_DELETION_PENDING] === 'true';
+				} finally {
+					ref.dispose();
+				}
+				if (!unclaimedOnly && recordScope === scope && activeHandles.has(handle)) {
+					const activeRef = this._sessionDataService.openDatabase(record);
+					try {
+						await activeRef.object.setMetadata(DETACHED_WORKTREE_LAST_SEEN_AT, String(Date.now()));
+					} finally {
+						activeRef.dispose();
+					}
+					return;
+				}
+				const referenceTime = claimed ? lastSeenAt : createdAt;
+				const withinGracePeriod = Number.isFinite(referenceTime) && Date.now() - referenceTime < DETACHED_WORKTREE_RECONCILE_GRACE_MS;
+				if ((unclaimedOnly ? claimed && !deletionPending : recordScope !== scope) || (!deletionPending && withinGracePeriod)) {
+					return;
+				}
+				const metadata = await this._readWorktreeMetadata(record);
+				if (!metadata?.repositoryRoot || !metadata.worktreePath) {
+					await this._sessionDataService.deleteSessionData(record);
+					return;
+				}
+				if (deletionPending) {
+					try {
+						await this._removeSessionWorktree(handle, { repositoryRoot: metadata.repositoryRoot, worktree: metadata.worktreePath });
+						await this._sessionDataService.deleteSessionData(record);
+					} catch (error) {
+						this._logService.warn(`[${this._logLabel}:${handle}] Failed to retry detached worktree deletion for '${metadata.worktreePath.fsPath}': ${errorMessage(error)}`);
+					}
+					return;
+				}
+				try {
+					await fs.access(metadata.worktreePath.fsPath);
+				} catch {
+					this._materializedWorktrees.delete(handle);
+					this._worktreeDeletionRetries.delete(handle);
+					await this._sessionDataService.deleteSessionData(record);
+					return;
+				}
+				const dirty = await this._gitService.hasUncommittedChanges(metadata.worktreePath).catch(() => true);
+				if (dirty) {
+					return;
+				}
+				try {
+					await this._gitService.removeWorktree(metadata.repositoryRoot, metadata.worktreePath);
+					this._materializedWorktrees.delete(handle);
+					this._worktreeDeletionRetries.delete(handle);
+					await this._sessionDataService.deleteSessionData(record);
+				} catch (error) {
+					this._logService.warn(`[${this._logLabel}:${handle}] Failed to clean up detached worktree '${metadata.worktreePath.fsPath}': ${errorMessage(error)}`);
+				}
+			});
+		}
+	}
+
 	/**
 	 * Builds the `isolation` / `branch` schema contribution for
 	 * `resolveSessionConfig`. When {@link IResolveIsolationConfigRequest.workingDirectory}
@@ -678,6 +909,7 @@ export class WorktreeIsolation extends Disposable implements IAgentHostWorktreeI
 
 			await fs.mkdir(worktreesRoot.fsPath, { recursive: true });
 			const worktreePath = URI.joinPath(worktreesRoot, getWorktreeName(newBranchName ?? selectedBranch, worktreeBranchPrefix));
+			await request.onWillCreate?.({ repositoryRoot, worktreePath, baseBranch, branchName: newBranchName ?? selectedBranch });
 
 			await withPercentProgress(WorktreeCreationPhase.CheckingOut, onProgress, progress =>
 				this._gitService.addWorktree(repositoryRoot, {
@@ -1225,6 +1457,11 @@ export class NullAgentHostWorktreeIsolation implements IAgentHostWorktreeIsolati
 	clearPending(_sessionId: string): void { }
 	getResolvedWorktree(_sessionId: string): URI | undefined { return undefined; }
 	async resolveOnFirstSend(_request: IResolveWorkingDirectoryRequest): Promise<URI | undefined> { return undefined; }
+	async createDetachedWorktree(_request: Omit<IResolveWorkingDirectoryRequest, 'sessionUri' | 'sessionId'>): Promise<{ handle: string; worktree: URI }> { throw new Error('Worktree isolation is not supported.'); }
+	async claimDetachedWorktree(_handle: string): Promise<void> { }
+	async setDetachedWorktreeArchived(_handle: string, _archived: boolean): Promise<void> { }
+	async deleteDetachedWorktree(_handle: string): Promise<void> { }
+	async reconcileDetachedWorktrees(_scope: string, _activeHandles: readonly string[]): Promise<void> { }
 	async resolveIsolationConfig(_request: IResolveIsolationConfigRequest): Promise<IIsolationConfigContribution | undefined> { return undefined; }
 	async branchCompletions(_workingDirectory: URI | undefined, _query?: string): Promise<{ items: { value: string; label: string }[] }> { return { items: [] }; }
 	async resolveWorkingDirectoryForResume(_sessionUri: URI, _sessionId: string, workingDirectory: URI): Promise<URI> { return workingDirectory; }
diff --git a/src/vs/platform/agentHost/test/node/agentService.test.ts b/src/vs/platform/agentHost/test/node/agentService.test.ts
index 6e5c73db309cf0..51b6b71d55ac2f 100644
--- a/src/vs/platform/agentHost/test/node/agentService.test.ts
+++ b/src/vs/platform/agentHost/test/node/agentService.test.ts
@@ -7284,6 +7284,44 @@ suite('AgentService (node dispatcher)', () => {
 		});
 	});
 
+	suite('management', () => {
+
+		test('routes detached worktree lifecycle operations outside the local data-plane protocol', async () => {
+			const session = AgentSession.uri('copilot', 'detached-worktree');
+			const worktree = URI.file('/workspace.worktrees/detached-worktree');
+			const calls: string[] = [];
+			service.createDetachedWorktree = async (actualSession, prompt) => {
+				calls.push(`create:${actualSession.toString()}:${prompt}`);
+				return { handle: 'handle', worktree };
+			};
+			service.setDetachedWorktreeArchived = async (handle, archived) => { calls.push(`archive:${handle}:${archived}`); };
+			service.claimDetachedWorktree = async handle => { calls.push(`claim:${handle}`); };
+			service.deleteDetachedWorktree = async handle => { calls.push(`delete:${handle}`); };
+			service.reconcileDetachedWorktrees = async (scope, activeHandles) => { calls.push(`reconcile:${scope}:${activeHandles.join(',')}`); };
+			const managementService = new AgentHostManagementService(service, {} as IConnectionTrackerService, async () => { }, nullSessionDataService, new NullLogService());
+
+			const created = await managementService.createDetachedWorktree(session, 'prepare');
+			await managementService.setDetachedWorktreeArchived(created.handle, true);
+			await managementService.claimDetachedWorktree(created.handle);
+			await managementService.reconcileDetachedWorktrees('scope', [created.handle]);
+			await managementService.deleteDetachedWorktree(created.handle);
+
+			assert.deepStrictEqual({
+				created: { handle: created.handle, worktree: created.worktree.toString() },
+				calls,
+			}, {
+				created: { handle: 'handle', worktree: worktree.toString() },
+				calls: [
+					`create:${session.toString()}:prepare`,
+					'archive:handle:true',
+					'claim:handle',
+					'reconcile:scope:handle',
+					'delete:handle',
+				],
+			});
+		});
+	});
+
 	// ---- shutdown -------------------------------------------------------
 
 	suite('shutdown', () => {
@@ -9857,6 +9895,7 @@ suite('AgentService (node dispatcher)', () => {
 				workingDirectories: [URI.file('/repo')],
 				_meta: {
 					...withChatSurfaceMeta(withEphemeralSessionMeta(undefined, true), { surface: 'editorInline', languageId: 'typescript', targetUri: 'file:///repo/inline.ts' }),
+					'vscode.devContainerWorktree': { version: 1, handle: '00000000-0000-4000-8000-000000000001' },
 					// Session `_meta` is a whitelist, so an unrecognized slot must not survive.
 					'vscode.chat.unknownFutureSlot': { hello: 'world' },
 				},
@@ -9867,10 +9906,12 @@ suite('AgentService (node dispatcher)', () => {
 				ephemeral: readEphemeralSessionMeta(state ?? {}).isEphemeral,
 				surface: readChatSurfaceMeta(state ?? {}),
 				unknownSlot: state?._meta?.['vscode.chat.unknownFutureSlot'],
+				devContainerWorktree: state?._meta?.['vscode.devContainerWorktree'],
 			}, {
 				ephemeral: true,
 				surface: { surface: 'editorInline', languageId: 'typescript', targetUri: 'file:///repo/inline.ts' },
 				unknownSlot: undefined,
+				devContainerWorktree: { version: 1, handle: '00000000-0000-4000-8000-000000000001' },
 			});
 		});
 
@@ -11633,7 +11674,7 @@ suite('AgentService (node dispatcher)', () => {
 			});
 		});
 
-		test('session creation tools inherit the calling chat model, session permissions, and host isolation', async () => {
+		test('session creation tools inherit the calling chat model and permissions and isolate a different project', async () => {
 			class ServerToolAgent extends MockAgent {
 				readonly createSessionConfigs: (IAgentCreateSessionConfig | undefined)[] = [];
 				readonly createChatOptions: (IAgentCreateChatOptions | undefined)[] = [];
@@ -11770,7 +11811,7 @@ suite('AgentService (node dispatcher)', () => {
 				chatOptions: agent.createChatOptions.at(-1),
 			}, {
 				sourceModelBeforeCreation: { id: 'source-model' },
-				createdIsolation: 'folder',
+				createdIsolation: 'worktree',
 				downgradedIsolation: 'folder',
 				delegation: {
 					sourceSession: sourceSession.toString(),
@@ -11877,6 +11918,7 @@ suite('AgentService (node dispatcher)', () => {
 				[SessionConfigKey.Mode]: 'interactive',
 				[ClaudeSessionConfigKey.PermissionMode]: 'acceptEdits',
 				[CodexSessionConfigKey.PermissionsPreset]: 'read-only',
+				[SessionConfigKey.Isolation]: 'worktree',
 			});
 		});
 
@@ -14183,10 +14225,15 @@ suite('AgentService (node dispatcher)', () => {
 			const localService = disposables.add(createTestAgentService(new NullLogService(), fileService, sessionDataService, { _serviceBrand: undefined } as IProductService, createNoopGitService()));
 			registerTestAgentProvider(localService, localAgent);
 
-			const session = await localService.createSession({ provider: 'copilot', config: { autoApprove: 'autoApprove' } });
+			const session = await localService.createSession({
+				provider: 'copilot',
+				config: { autoApprove: 'autoApprove' },
+				_meta: { 'vscode.devContainerWorktree': { version: 1, handle: '00000000-0000-4000-8000-000000000001' } },
+			});
 
 			// Wait for the fire-and-forget persistence to flush
 			await new Promise(r => setTimeout(r, 50));
+			const listed = await localService.listSessions();
 
 			// Simulate a server restart: drop the in-memory state
 			getStateManager(localService).removeSession(session.toString());
@@ -14199,7 +14246,15 @@ suite('AgentService (node dispatcher)', () => {
 
 			const state = getStateManager(localService).getSessionState(session.toString());
 			assert.ok(state);
-			assert.deepStrictEqual(state!.config?.values, { autoApprove: 'autoApprove' });
+			assert.deepStrictEqual({
+				config: state!.config?.values,
+				listedDevContainerWorktree: listed[0]?._meta?.['vscode.devContainerWorktree'],
+				devContainerWorktree: state!._meta?.['vscode.devContainerWorktree'],
+			}, {
+				config: { autoApprove: 'autoApprove' },
+				listedDevContainerWorktree: { version: 1, handle: '00000000-0000-4000-8000-000000000001' },
+				devContainerWorktree: { version: 1, handle: '00000000-0000-4000-8000-000000000001' },
+			});
 		});
 
 		test('restoreSession ignores malformed persisted configValues', async () => {
@@ -14530,6 +14585,125 @@ suite('AgentService (node dispatcher)', () => {
 			});
 		});
 
+		test('createDetachedWorktree outlives the source draft and is deleted by handle', async () => {
+			const sourceDir = URI.file(mkdtempSync(`${tmpdir()}/agent-worktree-prepare-`));
+			disposables.add(toDisposable(() => {
+				rmSync(sourceDir.fsPath, { recursive: true, force: true });
+				rmSync(getWorktreesRoot(sourceDir).fsPath, { recursive: true, force: true });
+			}));
+			const { service: sessionDataService, database } = createPerSessionDataService();
+			const gitService = createNoopGitService();
+			gitService.getRepositoryRoot = async () => sourceDir;
+			gitService.getDefaultBranch = async () => ({ name: 'main', startPoint: 'main' });
+			let addWorktreeCalls = 0;
+			let removeWorktreeCalls = 0;
+			gitService.addWorktree = async () => { addWorktreeCalls++; };
+			gitService.removeWorktree = async () => { removeWorktreeCalls++; };
+			const localService = disposables.add(createTestAgentService(new NullLogService(), fileService, sessionDataService, { _serviceBrand: undefined } as IProductService, gitService));
+			const isolation = disposables.add(new WorktreeIsolation(
+				{ _serviceBrand: undefined, generateBranchName: async () => 'agents/prepared' },
+				gitService,
+				sessionDataService,
+				new NullLogService(),
+			));
+			setTestAgentHostWorktreeIsolation(localService, isolation);
+
+			const session = AgentSession.uri('copilot', 'worktree-prepare');
+			const sessionResource = session.toString();
+			getStateManager(localService).createSession({
+				resource: sessionResource,
+				provider: 'copilot',
+				title: '',
+				status: SessionStatus.Idle,
+				createdAt: new Date().toISOString(),
+				modifiedAt: new Date().toISOString(),
+				workingDirectories: [sourceDir.toString()],
+			});
+			getStateManager(localService).setSessionConfig(sessionResource, {
+				schema: { type: 'object', properties: {} },
+				values: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			});
+			isolation.notePending(AgentSession.id(session));
+
+			const created = await localService.createDetachedWorktree(session, 'Fix the issue');
+			const detachedOwner = URI.from({ scheme: 'vscode-agent-host-worktree', path: `/devcontainer-worktree-${created.handle}` });
+			const branchName = await database(detachedOwner).getMetadata('copilot.worktree.branchName');
+			await localService.disposeSession(session);
+			const removalsAfterSourceDispose = removeWorktreeCalls;
+			await localService.deleteDetachedWorktree(created.handle);
+
+			assert.deepStrictEqual({
+				worktree: created.worktree.toString(),
+				handleIsUuid: /^[0-9a-f-]{36}$/.test(created.handle),
+				addWorktreeCalls,
+				pending: isolation.isWorkingDirectoryPending(AgentSession.id(session)),
+				removalsAfterSourceDispose,
+				removeWorktreeCalls,
+				branchName,
+			}, {
+				worktree: URI.joinPath(getWorktreesRoot(sourceDir), 'prepared').toString(),
+				handleIsUuid: true,
+				addWorktreeCalls: 1,
+				pending: false,
+				removalsAfterSourceDispose: 0,
+				removeWorktreeCalls: 1,
+				branchName: 'agents/prepared',
+			});
+		});
+
+		test('createDetachedWorktree can retry after worktree creation fails', async () => {
+			const sourceDir = URI.file(mkdtempSync(`${tmpdir()}/agent-worktree-prepare-retry-`));
+			disposables.add(toDisposable(() => {
+				rmSync(sourceDir.fsPath, { recursive: true, force: true });
+				rmSync(getWorktreesRoot(sourceDir).fsPath, { recursive: true, force: true });
+			}));
+			const sessionDataService = createSessionDataService(new TestSessionDatabase());
+			const gitService = createNoopGitService();
+			gitService.getRepositoryRoot = async () => sourceDir;
+			gitService.getDefaultBranch = async () => ({ name: 'main', startPoint: 'main' });
+			let addWorktreeCalls = 0;
+			gitService.addWorktree = async () => {
+				addWorktreeCalls++;
+				if (addWorktreeCalls === 1) {
+					throw new Error('transient git failure');
+				}
+			};
+			const localService = disposables.add(createTestAgentService(new NullLogService(), fileService, sessionDataService, { _serviceBrand: undefined } as IProductService, gitService));
+			const isolation = disposables.add(new WorktreeIsolation(
+				{ _serviceBrand: undefined, generateBranchName: async () => 'agents/retry' },
+				gitService,
+				sessionDataService,
+				new NullLogService(),
+			));
+			setTestAgentHostWorktreeIsolation(localService, isolation);
+			const session = AgentSession.uri('copilot', 'worktree-prepare-retry');
+			getStateManager(localService).createSession({
+				resource: session.toString(),
+				provider: 'copilot',
+				title: '',
+				status: SessionStatus.Idle,
+				createdAt: new Date().toISOString(),
+				modifiedAt: new Date().toISOString(),
+				workingDirectories: [sourceDir.toString()],
+			});
+			getStateManager(localService).setSessionConfig(session.toString(), {
+				schema: { type: 'object', properties: {} },
+				values: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			});
+			isolation.notePending(AgentSession.id(session));
+
+			await assert.rejects(localService.createDetachedWorktree(session, 'Fix the issue'), /transient git failure/);
+			const retried = await localService.createDetachedWorktree(session, 'Fix the issue');
+
+			assert.deepStrictEqual({
+				retried: retried.worktree.toString(),
+				addWorktreeCalls,
+			}, {
+				retried: URI.joinPath(getWorktreesRoot(sourceDir), 'retry').toString(),
+				addWorktreeCalls: 2,
+			});
+		});
+
 		test('first-send worktree fallback warns when no repository root is resolved', async () => {
 			const sourceDir = URI.file('/source/repo');
 			const database = new TestSessionDatabase();
diff --git a/src/vs/platform/agentHost/test/node/codex/codexCreateChat.test.ts b/src/vs/platform/agentHost/test/node/codex/codexCreateChat.test.ts
index 3cf0a8b7e6898c..e9756d5ceb5bb2 100644
--- a/src/vs/platform/agentHost/test/node/codex/codexCreateChat.test.ts
+++ b/src/vs/platform/agentHost/test/node/codex/codexCreateChat.test.ts
@@ -176,7 +176,7 @@ function createSessionDatabaseReference(database: ISessionDatabase) {
 }
 
 async function createAgent(disposables: Pick<DisposableStore, 'add'>, options: ICreateAgentOptions = {}): Promise<CodexAgent> {
-	const models = [{ id: 'gpt-test', name: 'GPT Test', supported_endpoints: ['/responses'] }] as CCAModel[];
+	const models = [{ id: 'gpt-test', name: 'GPT Test', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 	const instantiationService = new TestInstantiationService();
 	const logService = new NullLogService();
 	const fileService = disposables.add(new FileService(logService));
diff --git a/src/vs/platform/agentHost/test/node/codex/codexCustomizations.test.ts b/src/vs/platform/agentHost/test/node/codex/codexCustomizations.test.ts
index 33e23256fc7495..da3dcb9487e29f 100644
--- a/src/vs/platform/agentHost/test/node/codex/codexCustomizations.test.ts
+++ b/src/vs/platform/agentHost/test/node/codex/codexCustomizations.test.ts
@@ -35,7 +35,7 @@ suite('codexCustomizations', () => {
 		({ data: entries.map(e => ({ cwd: e.cwd, skills: e.skills, errors: [] })) });
 
 	const hook = (key: string, eventName: HookMetadata['eventName'], sourcePath: string, displayOrder = 0, enabled = true): HookMetadata =>
-		({ key, eventName, handlerType: 'command', matcher: null, command: 'echo hi', timeoutSec: 5n, statusMessage: null, additionalContextLimit: null, sourcePath, source: 'project', pluginId: null, displayOrder: BigInt(displayOrder), enabled, isManaged: false, currentHash: 'h', trustStatus: 'trusted' });
+		({ key, eventName, handlerType: 'command', matcher: null, command: 'echo hi', async: false, timeoutSec: 5n, statusMessage: null, additionalContextLimit: null, sourcePath, source: 'project', pluginId: null, displayOrder: BigInt(displayOrder), enabled, isManaged: false, currentHash: 'h', trustStatus: 'trusted' });
 
 	test('discovers workspace agents without client-pushed local customizations', async () => {
 		const fileService = disposables.add(new FileService(new NullLogService()));
diff --git a/src/vs/platform/agentHost/test/node/codex/codexMapAppServerEvents.test.ts b/src/vs/platform/agentHost/test/node/codex/codexMapAppServerEvents.test.ts
index b8160f83a6224f..9bdee45db918c0 100644
--- a/src/vs/platform/agentHost/test/node/codex/codexMapAppServerEvents.test.ts
+++ b/src/vs/platform/agentHost/test/node/codex/codexMapAppServerEvents.test.ts
@@ -131,7 +131,7 @@ suite('codexMapAppServerEvents', () => {
 	test('item/started for agentMessage seeds a markdown part', () => {
 		const state = createCodexSessionMapState();
 		const actions = mapItemStarted(state, {
-			item: { type: 'agentMessage', id: 'item_x', text: '', phase: null, memoryCitation: null },
+			item: { type: 'agentMessage', id: 'item_x', text: '', phase: null, memoryCitation: null, delivery: null },
 			threadId: 'thr_1',
 			turnId: 'turn_a',
 			startedAtMs: 0,
@@ -161,7 +161,7 @@ suite('codexMapAppServerEvents', () => {
 	test('item/agentMessage/delta emits ChatDelta for known itemId', () => {
 		const state = createCodexSessionMapState();
 		mapItemStarted(state, {
-			item: { type: 'agentMessage', id: 'item_x', text: '', phase: null, memoryCitation: null },
+			item: { type: 'agentMessage', id: 'item_x', text: '', phase: null, memoryCitation: null, delivery: null },
 			threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0,
 		});
 		const partId = state.itemToPartId.get('item_x')!;
@@ -295,12 +295,12 @@ suite('codexMapAppServerEvents', () => {
 	test('item/completed for agentMessage clears the mapping', () => {
 		const state = createCodexSessionMapState();
 		mapItemStarted(state, {
-			item: { type: 'agentMessage', id: 'item_x', text: '', phase: null, memoryCitation: null },
+			item: { type: 'agentMessage', id: 'item_x', text: '', phase: null, memoryCitation: null, delivery: null },
 			threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0,
 		});
 		assert.strictEqual(state.itemToPartId.size, 1);
 		mapItemCompleted(state, {
-			item: { type: 'agentMessage', id: 'item_x', text: 'final', phase: null, memoryCitation: null },
+			item: { type: 'agentMessage', id: 'item_x', text: 'final', phase: null, memoryCitation: null, delivery: null },
 			threadId: 'thr_1', turnId: 'turn_a', completedAtMs: 0,
 		});
 		assert.strictEqual(state.itemToPartId.size, 0);
@@ -309,11 +309,11 @@ suite('codexMapAppServerEvents', () => {
 	test('second agentMessage in a turn is seeded with a leading block separator', () => {
 		const state = createCodexSessionMapState();
 		const first = mapItemStarted(state, {
-			item: { type: 'agentMessage', id: 'm1', text: 'Consolidating the recommendation and tradeoffs.', phase: null, memoryCitation: null },
+			item: { type: 'agentMessage', id: 'm1', text: 'Consolidating the recommendation and tradeoffs.', phase: null, memoryCitation: null, delivery: null },
 			threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0,
 		});
 		const second = mapItemStarted(state, {
-			item: { type: 'agentMessage', id: 'm2', text: '## Conclusion', phase: null, memoryCitation: null },
+			item: { type: 'agentMessage', id: 'm2', text: '## Conclusion', phase: null, memoryCitation: null, delivery: null },
 			threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0,
 		});
 		assert.deepStrictEqual({
@@ -327,11 +327,11 @@ suite('codexMapAppServerEvents', () => {
 
 	test('agentMessage block separator counter resets per turn', () => {
 		const state = createCodexSessionMapState();
-		mapItemStarted(state, { item: { type: 'agentMessage', id: 'm1', text: 'a', phase: null, memoryCitation: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 });
-		mapItemStarted(state, { item: { type: 'agentMessage', id: 'm2', text: 'b', phase: null, memoryCitation: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 });
+		mapItemStarted(state, { item: { type: 'agentMessage', id: 'm1', text: 'a', phase: null, memoryCitation: null, delivery: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 });
+		mapItemStarted(state, { item: { type: 'agentMessage', id: 'm2', text: 'b', phase: null, memoryCitation: null, delivery: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 });
 		// A new turn resets the counter, so its first agentMessage is unseeded.
 		resetCodexTurnMapState(state);
-		const firstOfNextTurn = mapItemStarted(state, { item: { type: 'agentMessage', id: 'm3', text: 'c', phase: null, memoryCitation: null }, threadId: 'thr_1', turnId: 'turn_b', startedAtMs: 0 });
+		const firstOfNextTurn = mapItemStarted(state, { item: { type: 'agentMessage', id: 'm3', text: 'c', phase: null, memoryCitation: null, delivery: null }, threadId: 'thr_1', turnId: 'turn_b', startedAtMs: 0 });
 		assert.strictEqual(markdownPartContent(firstOfNextTurn[0]), 'c');
 	});
 
@@ -356,9 +356,9 @@ suite('codexMapAppServerEvents', () => {
 			turn: { id: 'turn_a', items: [], itemsView: { type: 'full' } as never, status: 'inProgress' as never, error: null, startedAt: null, completedAt: null, durationMs: null },
 		}, 'prompt'));
 		// Preamble message, then the final-answer message; two distinct items.
-		apply(mapItemStarted(state, { item: { type: 'agentMessage', id: 'm1', text: '', phase: null, memoryCitation: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 }));
+		apply(mapItemStarted(state, { item: { type: 'agentMessage', id: 'm1', text: '', phase: null, memoryCitation: null, delivery: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 }));
 		apply(mapAgentMessageDelta(state, { threadId: 'thr_1', turnId: 'turn_a', itemId: 'm1', delta: 'Consolidating the recommendation and tradeoffs.' }));
-		apply(mapItemStarted(state, { item: { type: 'agentMessage', id: 'm2', text: '', phase: null, memoryCitation: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 }));
+		apply(mapItemStarted(state, { item: { type: 'agentMessage', id: 'm2', text: '', phase: null, memoryCitation: null, delivery: null }, threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0 }));
 		apply(mapAgentMessageDelta(state, { threadId: 'thr_1', turnId: 'turn_a', itemId: 'm2', delta: '## Conclusion\n\nDone.' }));
 
 		// Adjacent markdown parts are coalesced by plain concatenation, so the
@@ -673,12 +673,12 @@ suite('codexMapAppServerEvents', () => {
 	test('imageGeneration item maps to an image tool call lifecycle', () => {
 		const state = createCodexSessionMapState();
 		const startActions = mapItemStarted(state, {
-			item: { type: 'imageGeneration', id: 'image_1', status: 'in_progress', revisedPrompt: null, result: '' },
+			item: { type: 'imageGeneration', id: 'image_1', status: 'in_progress', revisedPrompt: null, result: '', failure: null },
 			threadId: 'thr_1', turnId: 'turn_a', startedAtMs: 0,
 		});
 		const toolCallId = state.itemToToolCall.get('image_1')!.toolCallId;
 		const completeActions = mapItemCompleted(state, {
-			item: { type: 'imageGeneration', id: 'image_1', status: 'completed', revisedPrompt: 'A watercolor fox', result: 'aW1hZ2U=' },
+			item: { type: 'imageGeneration', id: 'image_1', status: 'completed', revisedPrompt: 'A watercolor fox', result: 'aW1hZ2U=', failure: null },
 			threadId: 'thr_1', turnId: 'turn_a', completedAtMs: 0,
 		});
 		assert.deepStrictEqual({
diff --git a/src/vs/platform/agentHost/test/node/codex/codexMcpServers.test.ts b/src/vs/platform/agentHost/test/node/codex/codexMcpServers.test.ts
index 5399d0b8157949..a5bfcf9687f262 100644
--- a/src/vs/platform/agentHost/test/node/codex/codexMcpServers.test.ts
+++ b/src/vs/platform/agentHost/test/node/codex/codexMcpServers.test.ts
@@ -20,6 +20,7 @@ suite('codexMcpServers', () => {
 
 	const status = (name: string, tools: Tool[]): CodexMcpServerStatus => ({
 		name,
+		pluginId: null,
 		serverInfo: null,
 		tools: Object.fromEntries(tools.map(t => [t.name, t])),
 		resources: [{ name: `${name}-res`, uri: `mem://${name}/r` }],
diff --git a/src/vs/platform/agentHost/test/node/codex/codexModelRefresh.test.ts b/src/vs/platform/agentHost/test/node/codex/codexModelRefresh.test.ts
index fd6aa282c0897e..8555b28c3f71d8 100644
--- a/src/vs/platform/agentHost/test/node/codex/codexModelRefresh.test.ts
+++ b/src/vs/platform/agentHost/test/node/codex/codexModelRefresh.test.ts
@@ -208,7 +208,7 @@ suite('CodexAgent model refresh', () => {
 	});
 
 	test('restored model waits for an authentication refresh queued behind activation', async () => {
-		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', supported_endpoints: ['/responses'] }] as CCAModel[];
+		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 		const firstRefreshStarted = new DeferredPromise<void>();
 		const releaseFirstRefresh = new DeferredPromise<void>();
 		const authenticatedRefreshStarted = new DeferredPromise<void>();
@@ -260,7 +260,7 @@ suite('CodexAgent model refresh', () => {
 	});
 
 	test('model resolution starts discovery when the catalog is empty', async () => {
-		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', supported_endpoints: ['/responses'] }] as CCAModel[];
+		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 		const agent = createAgent(disposables, async () => copilotModels);
 		agent['_githubToken'] = 'token';
 		agent['_isSdkResolvableWithoutDownload'] = async () => false;
@@ -299,7 +299,7 @@ suite('CodexAgent model refresh', () => {
 	});
 
 	test('queues a fresh model refresh when Codex activates during an ambient refresh', async () => {
-		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', supported_endpoints: ['/responses'] }] as CCAModel[];
+		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 		const ambientRefreshStarted = new DeferredPromise<void>();
 		const ambientCodexRefreshFinished = new DeferredPromise<void>();
 		const releaseAmbientRefresh = new DeferredPromise<void>();
@@ -836,6 +836,22 @@ suite('CodexAgent model refresh', () => {
 		});
 	});
 
+	test('does not publish Copilot models disabled for the model picker', async () => {
+		const models = [
+			{ id: 'picker-enabled', name: 'Picker Enabled', model_picker_enabled: true, supported_endpoints: ['/responses'] },
+			{ id: 'picker-disabled', name: 'Picker Disabled', model_picker_enabled: false, supported_endpoints: ['/responses'] },
+		] as CCAModel[];
+		const agent = createAgent(disposables, async () => models);
+		agent['_isSdkResolvableWithoutDownload'] = async () => false;
+
+		await agent.authenticate(agent.getProtectedResources()[0].resource, 'token');
+		await agent.refreshModels();
+
+		assert.deepStrictEqual(agent.models.get().map(model => model.id), [
+			toCodexModelSelectionId('vscode-proxy', 'picker-enabled'),
+		]);
+	});
+
 	test('waits for an app-server already starting when signed-out use becomes enabled', async () => {
 		const agent = createAgent(disposables, async () => [], {});
 		const connection = createChatGPTConnection();
@@ -857,7 +873,7 @@ suite('CodexAgent model refresh', () => {
 	});
 
 	test('publishes no ChatGPT models when the app server reports no account', async () => {
-		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', supported_endpoints: ['/responses'] }] as CCAModel[];
+		const copilotModels = [{ id: 'copilot-model', name: 'Copilot Model', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 		const agent = createAgent(disposables, async () => copilotModels, { [AgentHostConfigKey.AllowSignedOutWhenUsable]: true });
 		agent['_githubToken'] = 'token';
 		agent['_connection'] = createChatGPTConnection(null) as never;
@@ -895,7 +911,7 @@ suite('CodexAgent model refresh', () => {
 
 	test('keeps the last known-good models when a periodic refresh fails', async () => {
 		let shouldFail = false;
-		const models = [{ id: 'gpt-5.5', name: 'GPT-5.5', supported_endpoints: ['/responses'] }] as CCAModel[];
+		const models = [{ id: 'gpt-5.5', name: 'GPT-5.5', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 		const agent = createAgent(disposables, async () => {
 			if (shouldFail) {
 				throw new Error('transient failure');
@@ -915,7 +931,7 @@ suite('CodexAgent model refresh', () => {
 
 	test('retries Copilot model discovery after a transient authentication refresh failure', async () => {
 		let attempts = 0;
-		const models = [{ id: 'gpt-5.5', name: 'GPT-5.5', supported_endpoints: ['/responses'] }] as CCAModel[];
+		const models = [{ id: 'gpt-5.5', name: 'GPT-5.5', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 		const agent = createAgent(disposables, async () => {
 			attempts++;
 			if (attempts === 1) {
@@ -991,7 +1007,7 @@ suite('CodexAgent model refresh', () => {
 	});
 
 	test('omits the thinking level when a Copilot model advertises no reasoning efforts', async () => {
-		const model = { id: 'gpt-5.5', name: 'GPT-5.5', supported_endpoints: ['/responses'] } as CCAModel;
+		const model = { id: 'gpt-5.5', name: 'GPT-5.5', model_picker_enabled: true, supported_endpoints: ['/responses'] } as CCAModel;
 		const agent = createAgent(disposables, async () => [model]);
 
 		await agent.authenticate(agent.getProtectedResources()[0].resource, 'token');
diff --git a/src/vs/platform/agentHost/test/node/codex/codexPrewarmEviction.test.ts b/src/vs/platform/agentHost/test/node/codex/codexPrewarmEviction.test.ts
index 9812801c16de85..92947217be4463 100644
--- a/src/vs/platform/agentHost/test/node/codex/codexPrewarmEviction.test.ts
+++ b/src/vs/platform/agentHost/test/node/codex/codexPrewarmEviction.test.ts
@@ -197,7 +197,7 @@ class TestCodexConfigurationService extends AgentConfigurationService {
 }
 
 async function createAgent(disposables: Pick<DisposableStore, 'add'>, options: ICreateAgentOptions = {}): Promise<CodexAgent> {
-	const models = [{ id: 'gpt-test', name: 'GPT Test', supported_endpoints: ['/responses'] }] as CCAModel[];
+	const models = [{ id: 'gpt-test', name: 'GPT Test', model_picker_enabled: true, supported_endpoints: ['/responses'] }] as CCAModel[];
 	const instantiationService = new TestInstantiationService();
 	const logService = new TestCodexLogService();
 	const fileService = disposables.add(new TestCodexFileService(logService));
diff --git a/src/vs/platform/agentHost/test/node/copilotAgent.test.ts b/src/vs/platform/agentHost/test/node/copilotAgent.test.ts
index d59ded3036bc46..0eb2f4a4954760 100644
--- a/src/vs/platform/agentHost/test/node/copilotAgent.test.ts
+++ b/src/vs/platform/agentHost/test/node/copilotAgent.test.ts
@@ -72,6 +72,7 @@ import { IAgentHostGitHubEndpointService } from '../../node/agentHostGitHubEndpo
 import { createTestGitHubEndpointService } from './testGitHubEndpointService.js';
 import { createNoopCustomizationEnablementService } from './testCustomizationEnablementService.js';
 import { CopilotAgentSession } from '../../node/copilot/copilotAgentSession.js';
+import { createCopilotCliEnvironment } from '../../node/copilot/copilotCliEnvironment.js';
 import { AgentBranchNameGenerator, getAgentBranchNameHintFromMessage, normalizeAgentBranchName } from '../../node/shared/agentBranchNameGenerator.js';
 import type { CopilotSessionLaunchPlan, IActiveClientSnapshot } from '../../node/copilot/copilotSessionLauncher.js';
 import { ShellManager } from '../../node/copilot/copilotShellTools.js';
@@ -1878,17 +1879,31 @@ suite('CopilotAgent', () => {
 				proxyEnvironment = {
 					HTTP_PROXY: process.env['HTTP_PROXY'],
 					HTTPS_PROXY: process.env['HTTPS_PROXY'],
+					http_proxy: process.env['http_proxy'],
+					https_proxy: process.env['https_proxy'],
+					ALL_PROXY: process.env['ALL_PROXY'],
+					all_proxy: process.env['all_proxy'],
+					NO_PROXY: process.env['NO_PROXY'],
+					no_proxy: process.env['no_proxy'],
 				};
 				return { resolved: { source: 'none' as const, serverManaged: false, deviceManaged: false, clientManaged: false, failClosed: false, bypassPermissionsDisabled: false, managedKeys: [] } };
 			},
 		};
 		const signal = new AbortController().signal;
+		const proxy = 'http://proxy.example.com:8080';
+		const noProxy = '127.0.0.1,localhost';
 		const before = {
 			HTTP_PROXY: process.env['HTTP_PROXY'],
 			HTTPS_PROXY: process.env['HTTPS_PROXY'],
+			http_proxy: process.env['http_proxy'],
+			https_proxy: process.env['https_proxy'],
+			ALL_PROXY: process.env['ALL_PROXY'],
+			all_proxy: process.env['all_proxy'],
+			NO_PROXY: process.env['NO_PROXY'],
+			no_proxy: process.env['no_proxy'],
 		};
 
-		await getCopilotManagedSettingsDiagnostics(runtimeSdk, 'token', 'https://github.example.com', signal, 3500, 'http://proxy.example.com:8080');
+		await getCopilotManagedSettingsDiagnostics(runtimeSdk, 'token', 'https://github.example.com', signal, 3500, proxy, noProxy);
 
 		assert.deepStrictEqual({
 			authInfo: receivedInput?.authInfo,
@@ -1898,14 +1913,26 @@ suite('CopilotAgent', () => {
 			environmentRestored: {
 				HTTP_PROXY: process.env['HTTP_PROXY'],
 				HTTPS_PROXY: process.env['HTTPS_PROXY'],
+				http_proxy: process.env['http_proxy'],
+				https_proxy: process.env['https_proxy'],
+				ALL_PROXY: process.env['ALL_PROXY'],
+				all_proxy: process.env['all_proxy'],
+				NO_PROXY: process.env['NO_PROXY'],
+				no_proxy: process.env['no_proxy'],
 			},
 		}, {
 			authInfo: { type: 'token', host: 'https://github.example.com', token: 'token' },
 			token: 'token',
 			signalForwarded: true,
 			proxyEnvironment: {
-				HTTP_PROXY: 'http://proxy.example.com:8080',
-				HTTPS_PROXY: 'http://proxy.example.com:8080',
+				HTTP_PROXY: proxy,
+				HTTPS_PROXY: proxy,
+				http_proxy: process.platform === 'win32' ? proxy : undefined,
+				https_proxy: process.platform === 'win32' ? proxy : undefined,
+				ALL_PROXY: undefined,
+				all_proxy: undefined,
+				NO_PROXY: noProxy,
+				no_proxy: process.platform === 'win32' ? noProxy : undefined,
 			},
 			environmentRestored: before,
 		});
@@ -3536,6 +3563,120 @@ suite('CopilotAgent', () => {
 			}
 		});
 
+		test('preserves proxy environment variables without a configured proxy', async () => {
+			const proxyResolver = new TestProxyResolver();
+			const { agent } = createTestAgentContext(disposables, { proxyResolver });
+			const proxyState = agent as unknown as {
+				_resolvedProxy: string | undefined;
+				_resolveProxyForSdk(env: Record<string, string | undefined>): Promise<string | undefined>;
+			};
+			const env = {
+				HTTP_PROXY: 'http://uppercase-http.example:8080',
+				HTTPS_PROXY: 'http://uppercase-https.example:8080',
+				http_proxy: 'http://lowercase-http.example:8080',
+				https_proxy: 'http://lowercase-https.example:8080',
+				ALL_PROXY: 'http://uppercase-all.example:8080',
+				all_proxy: 'http://lowercase-all.example:8080',
+			};
+			const expectedEnv = { ...env };
+			try {
+				proxyState._resolvedProxy = await proxyState._resolveProxyForSdk(env);
+
+				assert.deepStrictEqual({
+					env,
+					resolvedProxy: proxyState._resolvedProxy,
+					resolveProxyCalls: proxyResolver.resolveProxyCalls,
+				}, {
+					env: expectedEnv,
+					resolvedProxy: undefined,
+					resolveProxyCalls: 0,
+				});
+			} finally {
+				await disposeAgent(agent);
+			}
+		});
+
+		test('prefers the configured proxy over proxy environment variables', async () => {
+			const client = new TestCopilotClient([]);
+			const configuredProxy = 'http://configured-proxy.example:8080';
+			const proxyResolver = new TestProxyResolver();
+			const { agent } = createTestAgentContext(disposables, {
+				copilotClient: client,
+				proxyResolver,
+				rootConfig: {
+					[AgentHostProxyConfigKey.Proxy]: ` ${configuredProxy} `,
+					[AgentHostSystemProxyEnabledConfigKey]: false,
+				},
+			});
+			const proxyState = agent as unknown as {
+				_resolveProxyForSdk(env: Record<string, string | undefined>): Promise<string | undefined>;
+			};
+			const env = {
+				HTTP_PROXY: 'http://uppercase-http.example:8080',
+				HTTPS_PROXY: 'http://uppercase-https.example:8080',
+				http_proxy: 'http://lowercase-http.example:8080',
+				https_proxy: 'http://lowercase-https.example:8080',
+				ALL_PROXY: 'http://uppercase-all.example:8080',
+				all_proxy: 'http://lowercase-all.example:8080',
+			};
+			const expectedEnv = { ...env };
+			try {
+				const resolvedProxy = await proxyState._resolveProxyForSdk(env);
+				await agent.listChatsToMigrate();
+				const createdEnv = getCreatedClientOptions(agent).at(-1)?.env;
+
+				assert.deepStrictEqual({
+					resolvedProxy,
+					env,
+					createdProxyEnv: {
+						HTTP_PROXY: createdEnv?.['HTTP_PROXY'],
+						HTTPS_PROXY: createdEnv?.['HTTPS_PROXY'],
+						http_proxy: createdEnv?.['http_proxy'],
+						https_proxy: createdEnv?.['https_proxy'],
+						ALL_PROXY: createdEnv?.['ALL_PROXY'],
+						all_proxy: createdEnv?.['all_proxy'],
+					},
+					resolveProxyCalls: proxyResolver.resolveProxyCalls,
+				}, {
+					resolvedProxy: configuredProxy,
+					env: expectedEnv,
+					createdProxyEnv: {
+						HTTP_PROXY: configuredProxy,
+						HTTPS_PROXY: configuredProxy,
+						http_proxy: undefined,
+						https_proxy: undefined,
+						ALL_PROXY: undefined,
+						all_proxy: undefined,
+					},
+					resolveProxyCalls: 0,
+				});
+			} finally {
+				await disposeAgent(agent);
+			}
+		});
+
+		(process.platform === 'win32' ? test : test.skip)('omits environment keys case-insensitively on Windows', () => {
+			const env = createCopilotCliEnvironment({
+				Http_Proxy: 'http://proxy.example:8080',
+				No_Proxy: 'localhost',
+				Mixed_Case: 'preserved',
+			}, ['HTTP_PROXY', 'NO_PROXY']);
+
+			assert.deepStrictEqual({
+				HTTP_PROXY: env['HTTP_PROXY'],
+				NO_PROXY: env['NO_PROXY'],
+				Http_Proxy: env['Http_Proxy'],
+				No_Proxy: env['No_Proxy'],
+				Mixed_Case: env['Mixed_Case'],
+			}, {
+				HTTP_PROXY: undefined,
+				NO_PROXY: undefined,
+				Http_Proxy: undefined,
+				No_Proxy: undefined,
+				Mixed_Case: 'preserved',
+			});
+		});
+
 		test('does not block client startup on system proxy resolution', async () => {
 			const client = new TestCopilotClient([]);
 			const proxyResolver = new TestProxyResolver();
@@ -3653,7 +3794,11 @@ suite('CopilotAgent', () => {
 			const client = new TestCopilotClient([]);
 			const proxyResolver = new TestProxyResolver();
 			proxyResolver.resolvedProxy = 'http://system-proxy.example:8080';
-			const { agent } = createTestAgentContext(disposables, { copilotClient: client, proxyResolver });
+			const { agent } = createTestAgentContext(disposables, {
+				copilotClient: client,
+				proxyResolver,
+				rootConfig: { [AgentHostProxyConfigKey.NoProxy]: [' 127.0.0.1 ', '', 'localhost'] },
+			});
 			try {
 				disposables.add(proxyResolver.register('test', {
 					resolveProxy: async () => undefined,
@@ -3668,11 +3813,15 @@ suite('CopilotAgent', () => {
 					resolveProxyCalls: proxyResolver.resolveProxyCalls,
 					httpProxy: getCreatedClientOptions(agent).at(-1)?.env?.['HTTP_PROXY'],
 					httpsProxy: getCreatedClientOptions(agent).at(-1)?.env?.['HTTPS_PROXY'],
+					noProxy: getCreatedClientOptions(agent).at(-1)?.env?.['NO_PROXY'],
+					lowercaseNoProxy: getCreatedClientOptions(agent).at(-1)?.env?.['no_proxy'],
 				}, {
 					startCallCount: 1,
 					resolveProxyCalls: 2,
 					httpProxy: proxyResolver.resolvedProxy,
 					httpsProxy: proxyResolver.resolvedProxy,
+					noProxy: '127.0.0.1,localhost',
+					lowercaseNoProxy: undefined,
 				});
 			} finally {
 				await disposeAgent(agent);
@@ -3801,6 +3950,39 @@ suite('CopilotAgent', () => {
 			}
 		});
 
+		test('restarts the Copilot runtime when the no-proxy configuration changes', async () => {
+			const client = new TestCopilotClient([]);
+			const proxyResolver = new TestProxyResolver();
+			const { agent, configurationService } = createTestAgentContext(disposables, {
+				copilotClient: client,
+				proxyResolver,
+				rootConfig: { [AgentHostProxyConfigKey.NoProxy]: ['localhost'] },
+			});
+			try {
+				await agent.listChatsToMigrate();
+				configurationService.updateRootConfig({ [AgentHostProxyConfigKey.NoProxy]: ['127.0.0.1', 'localhost'] });
+				proxyResolver.fireConfigurationChange();
+				for (let i = 0; i < 20 && client.stopCallCount < 1; i++) {
+					await timeout(0);
+				}
+				await agent.listChatsToMigrate();
+
+				assert.deepStrictEqual({
+					startCallCount: client.startCallCount,
+					stopCallCount: client.stopCallCount,
+					noProxy: getCreatedClientOptions(agent).at(-1)?.env?.['NO_PROXY'],
+					lowercaseNoProxy: getCreatedClientOptions(agent).at(-1)?.env?.['no_proxy'],
+				}, {
+					startCallCount: 2,
+					stopCallCount: 1,
+					noProxy: '127.0.0.1,localhost',
+					lowercaseNoProxy: undefined,
+				});
+			} finally {
+				await disposeAgent(agent);
+			}
+		});
+
 		test('forwards the configured Kerberos proxy SPN to the Copilot runtime', async () => {
 			const client = new TestCopilotClient([]);
 			const kerberosSpn = 'HTTP/proxy.example';
@@ -6993,8 +7175,7 @@ suite('CopilotAgent', () => {
 				await new Promise(r => setTimeout(r, 50));
 
 				const updatesWithChildren = actions
-					.filter(a => a.type === ActionType.SessionCustomizationUpdated)
-					.filter((a): a is Extract<SessionAction, { type: ActionType.SessionCustomizationUpdated }> => true)
+					.filter((a): a is Extract<SessionAction, { type: ActionType.SessionCustomizationUpdated }> => a.type === ActionType.SessionCustomizationUpdated)
 					.filter(a => (a.customization as PluginCustomization).children !== undefined);
 
 				assert.strictEqual(updatesWithChildren.length > 0, true, 'expected SessionCustomizationUpdated to carry parsed children');
@@ -8643,7 +8824,7 @@ suite('CopilotAgent', () => {
 					}
 					return false;
 				},
-				respondToUserInputRequest(requestId: string, response: unknown): boolean {
+				respondToUserInputRequest(requestId: string, _response: unknown): boolean {
 					if (options?.inputOwner === requestId) {
 						events.push(`input:${requestId}`);
 						return true;
diff --git a/src/vs/platform/agentHost/test/node/devContainerAgentHostService.test.ts b/src/vs/platform/agentHost/test/node/devContainerAgentHostService.test.ts
index 71bf4bded878ec..65711f1e35263f 100644
--- a/src/vs/platform/agentHost/test/node/devContainerAgentHostService.test.ts
+++ b/src/vs/platform/agentHost/test/node/devContainerAgentHostService.test.ts
@@ -38,6 +38,7 @@ class TestDevContainerAgentHostMainService extends DevContainerAgentHostMainServ
 	constructor(
 		private readonly _libc = '',
 		private readonly _forceCliInstall = false,
+		private readonly _shellEnvironmentError?: Error,
 	) {
 		super(
 			new NullLogService(),
@@ -54,10 +55,17 @@ class TestDevContainerAgentHostMainService extends DevContainerAgentHostMainServ
 		);
 	}
 
-	protected override _resolveShellEnvironment(): Promise<typeof process.env> {
+	protected override _resolveUserShellEnvironment(): Promise<typeof process.env> {
+		if (this._shellEnvironmentError) {
+			return Promise.reject(this._shellEnvironmentError);
+		}
 		return Promise.resolve(process.env);
 	}
 
+	resolveShellEnvironment(): Promise<typeof process.env> {
+		return this._resolveShellEnvironment();
+	}
+
 	protected override _runDevContainer(connectionId: string, args: readonly string[]): Promise<{ stdout: string; stderr: string; code: number }> {
 		assert.deepStrictEqual(args, ['up', '--workspace-folder', '/workspace']);
 		this._reportOutput(connectionId, 'Starting Dev Container\n');
@@ -148,6 +156,12 @@ suite('Dev Container Agent Host Main Service', () => {
 		});
 	});
 
+	test('uses the inherited environment when shell environment resolution fails', async () => {
+		const service = store.add(new TestDevContainerAgentHostMainService('', false, new Error('shell environment timeout')));
+
+		assert.strictEqual(await service.resolveShellEnvironment(), process.env);
+	});
+
 	test('reuses a standalone endpoint and exposes its relay', async () => {
 		const service = store.add(new TestDevContainerAgentHostMainService());
 		const output: string[] = [];
diff --git a/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts b/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts
index 0511df6e9c71e3..c9ac211b8829a9 100644
--- a/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts
+++ b/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts
@@ -151,6 +151,11 @@ class MockAgentService implements IAgentService {
 	readonly createSessionConfigs: (IAgentCreateSessionConfig | undefined)[] = [];
 	managedSettingsDiagnostics: readonly IAgentHostManagedSettingsDiagnostics[] = [];
 	readonly getSessionStateFileCalls: { session: string; chat: string | undefined }[] = [];
+	readonly createDetachedWorktreeCalls: { session: string; prompt: string }[] = [];
+	readonly setDetachedWorktreeArchivedCalls: { handle: string; archived: boolean }[] = [];
+	readonly deleteDetachedWorktreeCalls: string[] = [];
+	readonly claimDetachedWorktreeCalls: string[] = [];
+	readonly reconcileDetachedWorktreesCalls: { scope: string; activeHandles: readonly string[] }[] = [];
 	readonly collectDebugLogsCalls: { session: string | undefined; chat: string | undefined; kind: 'archive' | 'directory' }[] = [];
 	shutdownCalls = 0;
 	createSessionBarrier: DeferredPromise<void> | undefined;
@@ -254,6 +259,18 @@ class MockAgentService implements IAgentService {
 		this.getSessionStateFileCalls.push({ session: session.toString(), chat: chat?.toString() });
 		return URI.file('/state/sdk-session/events.jsonl');
 	}
+	async createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }> {
+		this.createDetachedWorktreeCalls.push({ session: session.toString(), prompt });
+		return { handle: '00000000-0000-4000-8000-000000000001', worktree: URI.file('/workspace.worktrees/prepared') };
+	}
+	async setDetachedWorktreeArchived(handle: string, archived: boolean): Promise<void> {
+		this.setDetachedWorktreeArchivedCalls.push({ handle, archived });
+	}
+	async deleteDetachedWorktree(handle: string): Promise<void> { this.deleteDetachedWorktreeCalls.push(handle); }
+	async claimDetachedWorktree(handle: string): Promise<void> { this.claimDetachedWorktreeCalls.push(handle); }
+	async reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+		this.reconcileDetachedWorktreesCalls.push({ scope, activeHandles });
+	}
 	async collectDebugLogs(session: URI | undefined, kind: 'archive' | 'directory', chat?: URI) {
 		this.collectDebugLogsCalls.push({ session: session?.toString(), chat: chat?.toString(), kind });
 		return { kind, resource: URI.file('/tmp/agent-host-debug.zip'), providerLogsIncluded: true, size: 1024, uncompressedSize: 2048, entries: [{ path: 'agenthost.log', size: 2048 }] };
@@ -427,7 +444,10 @@ suite('ProtocolServerHandler', () => {
 		}, {
 			protocolVersion: PROTOCOL_VERSION,
 			serverSeq: stateManager.serverSeq,
-			meta: { 'vscode.getAgentHostSessionStateFile.chat': true },
+			meta: {
+				'vscode.detachedWorktrees': true,
+				'vscode.getAgentHostSessionStateFile.chat': true,
+			},
 		});
 	});
 
@@ -788,6 +808,103 @@ suite('ProtocolServerHandler', () => {
 		});
 	});
 
+	test('creates a detached worktree through the extension request', async () => {
+		const transport = connectClient('client-prepare-worktree');
+		transport.sent.length = 0;
+		const responsePromise = waitForResponse(transport, 20);
+
+		transport.simulateMessage(request(20, 'vscode/createAgentHostDetachedWorktree', {
+			session: 'copilotcli:/session-1',
+			prompt: 'Fix the issue',
+		}));
+
+		assert.deepStrictEqual({
+			response: await responsePromise,
+			calls: agentService.createDetachedWorktreeCalls,
+		}, {
+			response: {
+				jsonrpc: '2.0',
+				id: 20,
+				result: { handle: '00000000-0000-4000-8000-000000000001', resource: 'file:///workspace.worktrees/prepared' },
+			},
+			calls: [{ session: 'copilotcli:/session-1', prompt: 'Fix the issue' }],
+		});
+	});
+
+	test('updates a detached worktree archive state through the extension request', async () => {
+		const transport = connectClient('client-archive-prepared-worktree');
+		transport.sent.length = 0;
+		const responsePromise = waitForResponse(transport, 21);
+
+		transport.simulateMessage(request(21, 'vscode/setAgentHostDetachedWorktreeArchived', {
+			handle: '00000000-0000-4000-8000-000000000001',
+			archived: true,
+		}));
+
+		assert.deepStrictEqual({
+			response: await responsePromise,
+			calls: agentService.setDetachedWorktreeArchivedCalls,
+		}, {
+			response: { jsonrpc: '2.0', id: 21, result: null },
+			calls: [{ handle: '00000000-0000-4000-8000-000000000001', archived: true }],
+		});
+	});
+
+	test('claims a detached worktree through the extension request', async () => {
+		const transport = connectClient('client-claim-detached-worktree');
+		transport.sent.length = 0;
+		const responsePromise = waitForResponse(transport, 24);
+		const handle = '00000000-0000-4000-8000-000000000001';
+
+		transport.simulateMessage(request(24, 'vscode/claimAgentHostDetachedWorktree', { handle }));
+
+		assert.deepStrictEqual({
+			response: await responsePromise,
+			calls: agentService.claimDetachedWorktreeCalls,
+		}, {
+			response: { jsonrpc: '2.0', id: 24, result: null },
+			calls: [handle],
+		});
+	});
+
+	test('deletes a detached worktree through the extension request', async () => {
+		const transport = connectClient('client-delete-detached-worktree');
+		transport.sent.length = 0;
+		const responsePromise = waitForResponse(transport, 22);
+
+		transport.simulateMessage(request(22, 'vscode/deleteAgentHostDetachedWorktree', {
+			handle: '00000000-0000-4000-8000-000000000001',
+		}));
+
+		assert.deepStrictEqual({
+			response: await responsePromise,
+			calls: agentService.deleteDetachedWorktreeCalls,
+		}, {
+			response: { jsonrpc: '2.0', id: 22, result: null },
+			calls: ['00000000-0000-4000-8000-000000000001'],
+		});
+	});
+
+	test('reconciles detached worktrees through the extension request', async () => {
+		const transport = connectClient('client-reconcile-detached-worktrees');
+		transport.sent.length = 0;
+		const responsePromise = waitForResponse(transport, 23);
+		const activeHandles = ['00000000-0000-4000-8000-000000000001'];
+
+		transport.simulateMessage(request(23, 'vscode/reconcileAgentHostDetachedWorktrees', {
+			scope: 'file:///workspace',
+			activeHandles,
+		}));
+
+		assert.deepStrictEqual({
+			response: await responsePromise,
+			calls: agentService.reconcileDetachedWorktreesCalls,
+		}, {
+			response: { jsonrpc: '2.0', id: 23, result: null },
+			calls: [{ scope: 'file:///workspace', activeHandles }],
+		});
+	});
+
 	test('rejects a debug-log chat belonging to another session', async () => {
 		const transport = connectClient('client-debug-logs-wrong-chat');
 		transport.sent.length = 0;
diff --git a/src/vs/platform/agentHost/test/node/sessionDataService.test.ts b/src/vs/platform/agentHost/test/node/sessionDataService.test.ts
index 5ef110fc8db945..bbb8e9a14cb30d 100644
--- a/src/vs/platform/agentHost/test/node/sessionDataService.test.ts
+++ b/src/vs/platform/agentHost/test/node/sessionDataService.test.ts
@@ -78,6 +78,7 @@ suite('SessionDataService', () => {
 		await fileService.createFolder(URI.joinPath(baseDir, 'keep-2'));
 		await fileService.createFolder(URI.joinPath(baseDir, 'orphan-1'));
 		await fileService.createFolder(URI.joinPath(baseDir, 'orphan-2'));
+		await fileService.createFolder(URI.joinPath(baseDir, 'devcontainer-worktree-detached'));
 
 		await service.cleanupOrphanedData(new Set(['keep-1', 'keep-2']));
 
@@ -85,6 +86,8 @@ suite('SessionDataService', () => {
 		assert.ok(await fileService.exists(URI.joinPath(baseDir, 'keep-2')));
 		assert.ok(!(await fileService.exists(URI.joinPath(baseDir, 'orphan-1'))));
 		assert.ok(!(await fileService.exists(URI.joinPath(baseDir, 'orphan-2'))));
+		assert.ok(await fileService.exists(URI.joinPath(baseDir, 'devcontainer-worktree-detached')));
+		assert.deepStrictEqual(await service.listSessionDataIds('devcontainer-worktree-'), ['devcontainer-worktree-detached']);
 	});
 
 	test('cleanupOrphanedData is a no-op when base directory does not exist', async () => {
diff --git a/src/vs/platform/agentHost/test/node/sessionServerTools.test.ts b/src/vs/platform/agentHost/test/node/sessionServerTools.test.ts
index 501a3b7dcd0058..6f4d8c1357fd5d 100644
--- a/src/vs/platform/agentHost/test/node/sessionServerTools.test.ts
+++ b/src/vs/platform/agentHost/test/node/sessionServerTools.test.ts
@@ -614,6 +614,7 @@ suite('SessionServerTools', () => {
 				chat: buildDefaultChatUri('copilot:/caller'),
 				turnId: 'turn-1',
 			},
+			config: { [SessionConfigKey.Isolation]: 'worktree' },
 		});
 		assert.strictEqual(prompted?.prompt, 'do it');
 		assert.strictEqual(prompted?.chat.toString(), buildDefaultChatUri(URI.parse('copilot:/new')));
@@ -667,7 +668,7 @@ suite('SessionServerTools', () => {
 		store.dispose();
 	});
 
-	test('create_session inherits the calling chat model, permission config, and isolation', async () => {
+	test('create_session inherits the calling chat model, permission config, and isolation for the same project', async () => {
 		const source = URI.parse(buildChatUri('copilot:/caller', 'peer'));
 		let creationSource: URI | undefined;
 		let created: IAgentCreateSessionConfig | undefined;
@@ -682,6 +683,7 @@ suite('SessionServerTools', () => {
 						permissions: { allow: ['shell'], deny: ['write'] },
 					},
 					isolation: 'folder',
+					project: workspace,
 				};
 			},
 			onCreate: config => { created = config; },
@@ -715,6 +717,41 @@ suite('SessionServerTools', () => {
 		store.dispose();
 	});
 
+	test('create_session uses worktree isolation when the source project differs or is workspace-less', async () => {
+		const created: (IAgentCreateSessionConfig | undefined)[] = [];
+		const sourceProject = URI.file('/workspace/source');
+		let project: URI | undefined = sourceProject;
+		const accessor = createAccessor({
+			getCreationDefaults: () => ({ provider: 'copilot', isolation: 'folder', project }),
+			onCreate: config => { created.push(config); },
+		});
+
+		await applyCreateSessionTool(accessor, { relationship: 'independent', workspace: workspace.toString(), prompt: 'different project', title: 'Different Project' }, URI.parse('copilot:/source'));
+		project = undefined;
+		await applyCreateSessionTool(accessor, { relationship: 'independent', workspace: workspace.toString(), prompt: 'quick chat', title: 'Quick Chat Task' }, URI.parse('copilot:/quick-chat'));
+
+		assert.deepStrictEqual(created.map(createConfigSnapshot), [
+			{
+				workingDirectories: [workspace],
+				provider: 'copilot',
+				createdBySession: {
+					session: 'copilot:/source',
+					chat: 'copilot:/source',
+				},
+				config: { [SessionConfigKey.Isolation]: 'worktree' },
+			},
+			{
+				workingDirectories: [workspace],
+				provider: 'copilot',
+				createdBySession: {
+					session: 'copilot:/quick-chat',
+					chat: 'copilot:/quick-chat',
+				},
+				config: { [SessionConfigKey.Isolation]: 'worktree' },
+			},
+		]);
+	});
+
 	test('create_session inherits the calling provider when its model is the provider default', async () => {
 		let created: IAgentCreateSessionConfig | undefined;
 		const accessor = createAccessor({
@@ -734,15 +771,18 @@ suite('SessionServerTools', () => {
 				session: 'claude:/source',
 				chat: 'claude:/source',
 			},
-			config: { permissionMode: 'acceptEdits' },
+			config: {
+				permissionMode: 'acceptEdits',
+				[SessionConfigKey.Isolation]: 'worktree',
+			},
 		});
 	});
 
-	test('create_session inherits worktree isolation', async () => {
+	test('create_session inherits worktree isolation for the same project', async () => {
 		const gitWorkspace = URI.file('/workspace/git-repository');
 		let created: IAgentCreateSessionConfig | undefined;
 		const accessor = createAccessor({
-			getCreationDefaults: () => ({ provider: 'copilot', isolation: 'worktree' }),
+			getCreationDefaults: () => ({ provider: 'copilot', isolation: 'worktree', project: gitWorkspace }),
 			onCreate: config => { created = config; },
 		});
 
@@ -775,7 +815,7 @@ suite('SessionServerTools', () => {
 				project: { uri: remoteProject, displayName: 'Remote App' },
 			}],
 			getModels: () => [claudeModel],
-			getCreationDefaults: () => ({ provider: 'copilot', model: { id: 'gpt-4o' }, config: { autoApprove: 'autoApprove' }, isolation: 'folder' }),
+			getCreationDefaults: () => ({ provider: 'copilot', model: { id: 'gpt-4o' }, config: { autoApprove: 'autoApprove' }, isolation: 'folder', project: remoteProject }),
 			onCreate: config => { created = config; },
 		});
 
diff --git a/src/vs/platform/agentHost/test/node/shared/worktreeIsolation.test.ts b/src/vs/platform/agentHost/test/node/shared/worktreeIsolation.test.ts
index f4049ce781b46a..5a40399edfd6e1 100644
--- a/src/vs/platform/agentHost/test/node/shared/worktreeIsolation.test.ts
+++ b/src/vs/platform/agentHost/test/node/shared/worktreeIsolation.test.ts
@@ -9,7 +9,7 @@ import { tmpdir } from 'os';
 import { timeout } from '../../../../../base/common/async.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { join } from '../../../../../base/common/path.js';
-import { basename } from '../../../../../base/common/resources.js';
+import { basename, getComparisonKey } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { NullLogService } from '../../../../log/common/log.js';
@@ -20,6 +20,7 @@ import { AgentBranchNameGenerator, IAgentBranchNameGenerator } from '../../../no
 import { ICopilotApiService } from '../../../node/shared/copilotApiService.js';
 import { buildWorktreeFailureNotification, normalizeWorktreeFailureDiagnostic, NullAgentHostWorktreeIsolation, SessionWorkingDirectoryMissingError, WorktreeIsolation, getWorktreeName, getWorktreesRoot } from '../../../node/shared/worktreeIsolation.js';
 import { TestSessionDatabase, createNoopGitService, createSessionDataService } from '../../common/sessionTestHelpers.js';
+import type { ISessionDataService } from '../../../common/sessionDataService.js';
 
 function createNullCopilotApiService(): ICopilotApiService {
 	return {
@@ -119,7 +120,7 @@ suite('WorktreeIsolation', () => {
 		};
 	}
 
-	function createIsolation(disposableStore: Pick<DisposableStore, 'add'>, options?: { readonly branchNameGenerator?: IAgentBranchNameGenerator; readonly gitService?: IAgentHostGitService }): WorktreeIsolation {
+	function createIsolation(disposableStore: Pick<DisposableStore, 'add'>, options?: { readonly branchNameGenerator?: IAgentBranchNameGenerator; readonly gitService?: IAgentHostGitService; readonly sessionDataService?: ISessionDataService }): WorktreeIsolation {
 		const branchNameGenerator = options?.branchNameGenerator ?? {
 			_serviceBrand: undefined,
 			generateBranchName: async () => branchName,
@@ -127,11 +128,30 @@ suite('WorktreeIsolation', () => {
 		return disposableStore.add(new WorktreeIsolation(
 			branchNameGenerator,
 			options?.gitService ?? createGitService(),
-			createSessionDataService(db),
+			options?.sessionDataService ?? createSessionDataService(db),
 			new NullLogService(),
 		));
 	}
 
+	function createTrackedSessionDataService(): { readonly service: ISessionDataService; readonly dataIds: Set<string> } {
+		const dataIds = new Set<string>();
+		const base = createSessionDataService(db);
+		return {
+			dataIds,
+			service: {
+				...base,
+				openDatabase: resource => {
+					dataIds.add(resource.path.substring(1));
+					return base.openDatabase(resource);
+				},
+				listSessionDataIds: async prefix => [...dataIds].filter(id => id.startsWith(prefix)),
+				deleteSessionData: async resource => {
+					dataIds.delete(resource.path.substring(1));
+				},
+			},
+		};
+	}
+
 	setup(() => {
 		repoRoot = URI.file(mkdtempSync(join(tmpdir(), 'wt-iso-')));
 		worktreesRoot = getWorktreesRoot(repoRoot);
@@ -310,6 +330,158 @@ suite('WorktreeIsolation', () => {
 		});
 	});
 
+	test('detached worktree lifecycle is addressed by an opaque handle', async () => {
+		const isolation = createIsolation(disposables);
+		const created = await isolation.createDetachedWorktree({
+			workingDirectory: repoRoot,
+			config: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			prompt: 'do a thing',
+		});
+		await isolation.claimDetachedWorktree(created.handle);
+
+		await isolation.setDetachedWorktreeArchived(created.handle, true);
+		const existsAfterArchive = existsSync(created.worktree.fsPath);
+		await isolation.setDetachedWorktreeArchived(created.handle, false);
+		const existsAfterUnarchive = existsSync(created.worktree.fsPath);
+		await isolation.deleteDetachedWorktree(created.handle);
+
+		assert.deepStrictEqual({
+			handleIsUuid: /^[0-9a-f-]{36}$/.test(created.handle),
+			worktree: created.worktree.toString(),
+			existsAfterArchive,
+			existsAfterUnarchive,
+			addExistingCalls: addExistingCalls.map(call => ({ worktree: call.worktree.toString(), branchName: call.branchName })),
+			removeCalls: removeCalls.map(call => ({ worktree: call.worktree.toString(), force: call.force })),
+		}, {
+			handleIsUuid: true,
+			worktree: URI.joinPath(worktreesRoot, getWorktreeName(branchName)).toString(),
+			existsAfterArchive: false,
+			existsAfterUnarchive: true,
+			addExistingCalls: [{ worktree: created.worktree.toString(), branchName }],
+			removeCalls: [
+				{ worktree: created.worktree.toString(), force: true },
+				{ worktree: created.worktree.toString(), force: true },
+			],
+		});
+	});
+
+	test('missing detached worktree records do not block remote session lifecycle', async () => {
+		const sessionDataService = {
+			...createSessionDataService(),
+			tryOpenDatabase: async () => undefined,
+		};
+		const isolation = disposables.add(new WorktreeIsolation(
+			{ _serviceBrand: undefined, generateBranchName: async () => branchName },
+			createGitService(),
+			sessionDataService,
+			new NullLogService(),
+		));
+
+		await assert.doesNotReject(isolation.setDetachedWorktreeArchived('00000000-0000-4000-8000-000000000001', true));
+		await assert.doesNotReject(isolation.deleteDetachedWorktree('00000000-0000-4000-8000-000000000001'));
+	});
+
+	test('reconcileDetachedWorktrees prunes only old clean records missing from the remote scope', async () => {
+		const { service: sessionDataService, dataIds } = createTrackedSessionDataService();
+		const isolation = createIsolation(disposables, { sessionDataService });
+		const created = await isolation.createDetachedWorktree({
+			workingDirectory: repoRoot,
+			config: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			prompt: 'do a thing',
+		});
+		await isolation.claimDetachedWorktree(created.handle);
+		const scope = getComparisonKey(created.worktree);
+		await db.setMetadata('vscode.devContainerWorktree.createdAt', '0');
+
+		await isolation.reconcileDetachedWorktrees(scope, [created.handle]);
+		await isolation.reconcileDetachedWorktrees('file:///another-repository', []);
+		const beforeMissing = [...removeCalls];
+		await db.setMetadata('vscode.devContainerWorktree.lastSeenAt', '0');
+		await isolation.reconcileDetachedWorktrees(scope, []);
+
+		assert.deepStrictEqual({
+			beforeMissing,
+			removeCalls: removeCalls.map(call => ({ worktree: call.worktree.toString(), force: call.force })),
+			dataIds: [...dataIds],
+		}, {
+			beforeMissing: [],
+			removeCalls: [{ worktree: created.worktree.toString(), force: false }],
+			dataIds: [],
+		});
+	});
+
+	test('old unclaimed detached worktrees are reclaimed after restart', async () => {
+		const { service: sessionDataService, dataIds } = createTrackedSessionDataService();
+		const first = createIsolation(disposables, { sessionDataService });
+		const created = await first.createDetachedWorktree({
+			workingDirectory: repoRoot,
+			config: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			prompt: 'do a thing',
+		});
+		await db.setMetadata('vscode.devContainerWorktree.createdAt', '0');
+
+		createIsolation(disposables, { sessionDataService });
+		await timeout(20);
+
+		assert.deepStrictEqual({
+			removeCalls: removeCalls.map(call => ({ worktree: call.worktree.toString(), force: call.force })),
+			dataIds: [...dataIds],
+		}, {
+			removeCalls: [{ worktree: created.worktree.toString(), force: false }],
+			dataIds: [],
+		});
+	});
+
+	test('failed detached worktree deletions are retried after restart', async () => {
+		const { service: sessionDataService, dataIds } = createTrackedSessionDataService();
+		const gitService = createGitService();
+		let deletionAttempts = 0;
+		gitService.removeWorktree = async (_root, worktree, options) => {
+			removeCalls.push({ worktree, force: options?.force === true });
+			deletionAttempts++;
+			if (deletionAttempts === 1) {
+				throw new Error('transient removal failure');
+			}
+			rmSync(worktree.fsPath, { recursive: true, force: true });
+		};
+		const first = createIsolation(disposables, { gitService, sessionDataService });
+		const created = await first.createDetachedWorktree({
+			workingDirectory: repoRoot,
+			config: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			prompt: 'do a thing',
+		});
+		await first.claimDetachedWorktree(created.handle);
+		await assert.rejects(first.deleteDetachedWorktree(created.handle), /transient removal failure/);
+
+		createIsolation(disposables, { gitService, sessionDataService });
+		await timeout(20);
+
+		assert.deepStrictEqual({
+			deletionAttempts,
+			dataIds: [...dataIds],
+		}, {
+			deletionAttempts: 2,
+			dataIds: [],
+		});
+	});
+
+	test('reconcileDetachedWorktrees drops records whose worktree directory is already gone', async () => {
+		const { service: sessionDataService, dataIds } = createTrackedSessionDataService();
+		const isolation = createIsolation(disposables, { sessionDataService });
+		const created = await isolation.createDetachedWorktree({
+			workingDirectory: repoRoot,
+			config: { [SessionConfigKey.Isolation]: 'worktree', [SessionConfigKey.Branch]: 'main' },
+			prompt: 'do a thing',
+		});
+		await isolation.claimDetachedWorktree(created.handle);
+		await db.setMetadata('vscode.devContainerWorktree.lastSeenAt', '0');
+		rmSync(created.worktree.fsPath, { recursive: true, force: true });
+
+		await isolation.reconcileDetachedWorktrees(getComparisonKey(created.worktree), []);
+
+		assert.deepStrictEqual({ dataIds: [...dataIds], removeCalls }, { dataIds: [], removeCalls: [] });
+	});
+
 	test('resolveWorkingDirectory creates from the primary worktree while copying include files from the selected checkout', async () => {
 		const checkoutRoot = URI.joinPath(repoRoot, 'linked-checkout');
 		const gitService = createGitService();
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
index cef5e2af703b2f..02fc94c325c9d3 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
@@ -98,3 +98,5 @@ export function getExtensionGalleryManifestResourceUri(manifest: IExtensionGalle
 }
 
 export const ExtensionGalleryServiceUrlConfigKey = 'extensions.gallery.serviceUrl';
+
+export const ExtensionGalleryAuthProviderConfigKey = 'extensions.gallery.authProvider';
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 7b0415e4d192aa..52729ea66ab07e 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -21,6 +21,7 @@ import { IExtensionGalleryManifest } from './extensionGalleryManifest.js';
 
 export const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 export const EXTENSION_IDENTIFIER_REGEX = new RegExp(EXTENSION_IDENTIFIER_PATTERN);
+export const EXTENSION_PUBLISHER_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 export const WEB_EXTENSION_TAG = '__web_extension';
 export const LANGUAGE_MODEL_CHAT_PROVIDER_EXTENSION_TAG = 'language-models';
 export const EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT = 'skipWalkthrough';
@@ -754,7 +755,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 				},
 				additionalProperties: false,
 				patternProperties: {
-					'([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
+					[EXTENSION_IDENTIFIER_PATTERN]: {
 						anyOf: [
 							{
 								type: ['boolean', 'string'],
@@ -775,7 +776,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 							},
 						]
 					},
-					'([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
+					[EXTENSION_PUBLISHER_IDENTIFIER_PATTERN]: {
 						type: ['boolean', 'string'],
 						enum: [true, false, 'stable'],
 						description: localize('extension.publisher.allow.description', "Allow or disallow all extensions from the publisher."),
diff --git a/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts b/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts
index 4c26d81b859ef3..571e1b0cd2e068 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
-import { EXTENSION_IDENTIFIER_PATTERN } from '../../common/extensionManagement.js';
+import { EXTENSION_IDENTIFIER_PATTERN, EXTENSION_PUBLISHER_IDENTIFIER_PATTERN } from '../../common/extensionManagement.js';
 import { ExtensionKey } from '../../common/extensionManagementUtil.js';
 import { TargetPlatform } from '../../../extensions/common/extensions.js';
 
@@ -32,6 +32,18 @@ suite('Extension Identifier Pattern', () => {
 		assert.strictEqual(false, regEx.test('publisher._name'));
 	});
 
+	test('extension identifier pattern and publisher identifier pattern are mutually exclusive (#327194)', () => {
+		// Unanchored patterns let a compound key match both, failing array values against the publisher-only schema.
+		const extensionIdRegEx = new RegExp(EXTENSION_IDENTIFIER_PATTERN);
+		const publisherRegEx = new RegExp(EXTENSION_PUBLISHER_IDENTIFIER_PATTERN);
+
+		assert.strictEqual(extensionIdRegEx.test('ms-vscode.cpptools'), true);
+		assert.strictEqual(publisherRegEx.test('ms-vscode.cpptools'), false);
+
+		assert.strictEqual(extensionIdRegEx.test('ms-vscode'), false);
+		assert.strictEqual(publisherRegEx.test('ms-vscode'), true);
+	});
+
 	test('extension key', () => {
 		assert.strictEqual(new ExtensionKey({ id: 'pub.extension-name' }, '1.0.1').toString(), 'pub.extension-name-1.0.1');
 		assert.strictEqual(new ExtensionKey({ id: 'pub.extension-name' }, '1.0.1', TargetPlatform.UNDEFINED).toString(), 'pub.extension-name-1.0.1');
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index af9aa6e24857fa..61af373dcd5ed2 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -252,6 +252,7 @@ export interface IExtensionContributions {
 export interface IExtensionCapabilities {
 	readonly virtualWorkspaces?: ExtensionVirtualWorkspaceSupport;
 	readonly untrustedWorkspaces?: ExtensionUntrustedWorkspaceSupport;
+	readonly agentsWindow?: { readonly supported: boolean };
 }
 
 
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index d21141972c39c9..bfc17bad459a48 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -15,6 +15,9 @@ const _allApiProposals = {
 	agentSessionsWorkspace: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.agentSessionsWorkspace.d.ts',
 	},
+	agentsWindowActivation: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.agentsWindowActivation.d.ts',
+	},
 	agentsWindowConfiguration: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.agentsWindowConfiguration.d.ts',
 	},
diff --git a/src/vs/sessions/SESSIONS.md b/src/vs/sessions/SESSIONS.md
index b69f3d8bdb7424..69a62db57d14b7 100644
--- a/src/vs/sessions/SESSIONS.md
+++ b/src/vs/sessions/SESSIONS.md
@@ -135,7 +135,7 @@ A provider that supersedes sessions from another provider may implement `resolve
 
 ### Drafts
 
-`createNewSession` and `createQuickChat` return untitled drafts. A draft remains `Untitled` while its first request is prepared; `isNewSessionRequestInProgress` separately lets the UI present that activity without treating the session as committed. A draft enters the committed catalog when its first request is sent. The management service owns the currently presented draft; the provider owns its backend resources. `deleteNewSession` disposes an abandoned draft.
+`createNewSession` and `createQuickChat` return untitled drafts. A draft remains `Untitled` while its first request is prepared; `isNewSessionRequestInProgress` separately lets the UI present that activity without treating the session as committed. Draft preparation receives the first query so a provider can materialize query-dependent execution state before replacing the draft. A draft enters the committed catalog when its first request is sent. The management service owns the currently presented draft; the provider owns its backend resources. `deleteNewSession` disposes an abandoned draft.
 
 ### Operations
 
diff --git a/src/vs/sessions/browser/parts/chatGroupView.ts b/src/vs/sessions/browser/parts/chatGroupView.ts
index cb8ee42c6098c9..8f8bf7ba88f817 100644
--- a/src/vs/sessions/browser/parts/chatGroupView.ts
+++ b/src/vs/sessions/browser/parts/chatGroupView.ts
@@ -267,6 +267,9 @@ export class ChatGroupView extends Disposable implements ISerializableView {
 		}
 		this._sessionVisible = visible;
 		this._currentView.value?.setVisible(visible);
+		if (visible) {
+			this._layoutChildren();
+		}
 	}
 
 	submitInput(): Promise<boolean> {
@@ -296,7 +299,7 @@ export class ChatGroupView extends Disposable implements ISerializableView {
 	}
 
 	private _layoutChildren(): void {
-		if (!this._lastLayout) {
+		if (!this._lastLayout || !this._sessionVisible) {
 			return;
 		}
 		const { width, height, top, left } = this._lastLayout;
diff --git a/src/vs/sessions/browser/parts/media/chatCompositeBar.css b/src/vs/sessions/browser/parts/media/chatCompositeBar.css
index 689855e1bb90ae..c4f5d2bc3fb3b1 100644
--- a/src/vs/sessions/browser/parts/media/chatCompositeBar.css
+++ b/src/vs/sessions/browser/parts/media/chatCompositeBar.css
@@ -248,6 +248,16 @@
 	max-width: var(--chat-tab-max-width);
 }
 
+/* Keep keyboard focus on the rounded fill; high-contrast styling is provided by the shared tab styles. */
+.monaco-workbench .session-chat-tabs-bar .chat-composite-bar-tab:focus {
+	outline: none;
+}
+
+.monaco-workbench:not(:is(.hc-black, .hc-light)) .session-chat-tabs-bar .chat-composite-bar-tab:focus-visible > .chat-composite-bar-tab-fill {
+	outline: var(--vscode-strokeThickness) solid var(--vscode-focusBorder);
+	outline-offset: calc(-1 * var(--vscode-strokeThickness));
+}
+
 .session-chat-tabs-bar .chat-composite-bar-tab-fill {
 	display: block;
 	pointer-events: none;
diff --git a/src/vs/sessions/browser/parts/sessionsPart.ts b/src/vs/sessions/browser/parts/sessionsPart.ts
index 6d8ad9b0ceb92a..d1c0c890c7bff7 100644
--- a/src/vs/sessions/browser/parts/sessionsPart.ts
+++ b/src/vs/sessions/browser/parts/sessionsPart.ts
@@ -82,6 +82,13 @@ export class SessionsPart extends Part {
 	 */
 	private _isPartVisible = true;
 
+	/** Whether the workbench permits the mounted session views to render. */
+	private _contentVisible = true;
+
+	private get _sessionViewsVisible(): boolean {
+		return this._isPartVisible && this._contentVisible;
+	}
+
 	get preferredHeight(): number | undefined {
 		return this.layoutService.mainContainerDimension.height * 0.4;
 	}
@@ -339,7 +346,7 @@ export class SessionsPart extends Part {
 	private _createSlot(): IGridSlot {
 		const disposables = new DisposableStore();
 		const view = disposables.add(this.instantiationService.createInstance(SessionView));
-		view.setPartVisible(this._isPartVisible);
+		view.setPartVisible(this._sessionViewsVisible);
 		const slot: IGridSlot = { view, disposables, boundSessionId: undefined };
 		// Promote a visible session to the active session when its view receives
 		// focus or is clicked. Pointer-down covers clicks on non-focusable chrome
@@ -382,13 +389,27 @@ export class SessionsPart extends Part {
 		this._gridWidget?.style({ separatorBorder: this._gridSeparatorBorder });
 	}
 
+	setContentVisible(visible: boolean): void {
+		if (this._contentVisible === visible) {
+			return;
+		}
+
+		this._contentVisible = visible;
+		this._updateSessionViewsVisibility();
+	}
+
+	private _updateSessionViewsVisibility(): void {
+		const visible = this._sessionViewsVisible;
+		for (const slot of this._slots) {
+			slot.view.setPartVisible(visible);
+		}
+	}
+
 	override setVisible(visible: boolean): void {
 		if (this._isPartVisible !== visible) {
 			// Update before `super`, whose event re-enters this method.
 			this._isPartVisible = visible;
-			for (const slot of this._slots) {
-				slot.view.setPartVisible(visible);
-			}
+			this._updateSessionViewsVisibility();
 		}
 
 		super.setVisible(visible);
diff --git a/src/vs/sessions/browser/parts/sessionsParts.ts b/src/vs/sessions/browser/parts/sessionsParts.ts
index fbae54ae67e3fd..39791dd3ee5b90 100644
--- a/src/vs/sessions/browser/parts/sessionsParts.ts
+++ b/src/vs/sessions/browser/parts/sessionsParts.ts
@@ -54,6 +54,10 @@ export class SessionsParts extends Disposable implements ISessionsPartService {
 		this._mainPart.updateVisibleSessions(visible, active);
 	}
 
+	setContentVisible(visible: boolean): void {
+		this._mainPart.setContentVisible(visible);
+	}
+
 	toggleMaximizeSession(session: IActiveSession | undefined): void {
 		if (!session) {
 			this._mainPart.toggleMaximizeSession(undefined);
diff --git a/src/vs/sessions/browser/workbench.ts b/src/vs/sessions/browser/workbench.ts
index 27158096898604..228d91f26e6708 100644
--- a/src/vs/sessions/browser/workbench.ts
+++ b/src/vs/sessions/browser/workbench.ts
@@ -2526,11 +2526,14 @@ export class Workbench extends Disposable implements IAgentWorkbenchLayoutServic
 			};
 		}
 
+		// Suspend chat content before any custom view transition can trigger layout.
+		this.sessionsPartService.setContentVisible(false);
 		this.customViewGridPartService.setView(descriptor);
 		this.partVisibility.customViewGrid = visible;
 		this._customViewVisibleKey.set(visible);
 
 		if (!this.workbenchGrid) {
+			this.sessionsPartService.setContentVisible(!visible);
 			return; // still starting up; the grid descriptor picks this state up
 		}
 
@@ -2550,6 +2553,7 @@ export class Workbench extends Disposable implements IAgentWorkbenchLayoutServic
 				}
 			});
 		} finally {
+			this.sessionsPartService.setContentVisible(!visible);
 			this._applyingCustomViewGridVisibility = false;
 		}
 
diff --git a/src/vs/sessions/common/devContainerAgentHostService.ts b/src/vs/sessions/common/devContainerAgentHostService.ts
index c10098465ac62f..483bec42cc0ec7 100644
--- a/src/vs/sessions/common/devContainerAgentHostService.ts
+++ b/src/vs/sessions/common/devContainerAgentHostService.ts
@@ -9,9 +9,12 @@ import { URI } from '../../base/common/uri.js';
 import { IProtocolTransport } from '../../platform/agentHost/common/state/sessionTransport.js';
 import { createDecorator } from '../../platform/instantiation/common/instantiation.js';
 
-/** Hidden setting that enables Dev Container Agent Host sessions. */
+/** Experimental setting that enables Dev Container Agent Host sessions. */
 export const DevContainerAgentHostEnabledSettingId = 'chat.agentHost.devContainer.enabled';
 
+/** Hidden experimental setting that enables combining Dev Container execution with a new worktree. */
+export const DevContainerWorktreeEnabledSettingId = 'chat.agentHost.devContainer.worktree.enabled';
+
 /** Agent Host transport and workspace mapping produced by a Dev Container connector. */
 export interface IDevContainerAgentHostConnection {
 	/**
diff --git a/src/vs/sessions/contrib/editor/browser/media/editorHeader.css b/src/vs/sessions/contrib/editor/browser/media/editorHeader.css
index c713bd21ae35e8..6cb4d3ac65e254 100644
--- a/src/vs/sessions/contrib/editor/browser/media/editorHeader.css
+++ b/src/vs/sessions/contrib/editor/browser/media/editorHeader.css
@@ -24,7 +24,7 @@
 	width: 100%;
 	min-height: 29px;
 	overflow: hidden;
-	padding: var(--vscode-spacing-size20, 2px) var(--vscode-spacing-size40, 4px) var(--vscode-spacing-size20, 2px) var(--vscode-spacing-size80, 8px);
+	padding: var(--vscode-spacing-size20, 2px) var(--vscode-spacing-size40, 4px);
 }
 
 .agent-sessions-workbench.dock-detail-panel .part.editor .editor-group-header-actions {
diff --git a/src/vs/sessions/contrib/layout/browser/singlePane/singlePaneExistingSessionStrategy.ts b/src/vs/sessions/contrib/layout/browser/singlePane/singlePaneExistingSessionStrategy.ts
index d387b436ae1cee..ddabd6460666b3 100644
--- a/src/vs/sessions/contrib/layout/browser/singlePane/singlePaneExistingSessionStrategy.ts
+++ b/src/vs/sessions/contrib/layout/browser/singlePane/singlePaneExistingSessionStrategy.ts
@@ -11,7 +11,7 @@ import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun, IReader, observableFromEvent } from '../../../../../base/common/observable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { localize2 } from '../../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { AuxiliaryBarVisibleContext, IsAuxiliaryWindowContext, IsSessionsWindowContext, IsTopRightEditorGroupContext, MainEditorAreaVisibleContext } from '../../../../../workbench/common/contextkeys.js';
@@ -20,7 +20,6 @@ import { EditorInput } from '../../../../../workbench/common/editor/editorInput.
 import { IEditorGroupsService } from '../../../../../workbench/services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../../../workbench/services/editor/common/editorService.js';
 import { Parts } from '../../../../../workbench/services/layout/browser/layoutService.js';
-import { Menus } from '../../../../browser/menus.js';
 import { IAgentWorkbenchLayoutService } from '../../../../browser/workbench.js';
 import { HasDockedDetailsContext, SinglePaneLayoutEnabledContext } from '../../../../common/contextkeys.js';
 import { ISessionsService } from '../../../../services/sessions/browser/sessionsService.js';
@@ -448,7 +447,7 @@ export class SinglePaneExistingSessionStrategy extends SinglePaneLayoutStrategy
 							SinglePaneLayoutEnabledContext)
 					},
 					menu: {
-						id: Menus.SessionsEditorHeaderLayout,
+						id: MenuId.EditorTitleLayout,
 						group: 'navigation',
 						order: singlePaneHeaderToggleDetailsOrder,
 						// Not every tab type has a detail panel to show/hide (e.g. browser and
diff --git a/src/vs/sessions/contrib/layout/test/browser/desktopSessionLayoutController.test.ts b/src/vs/sessions/contrib/layout/test/browser/desktopSessionLayoutController.test.ts
index 0f9776b969993f..44f8119702192d 100644
--- a/src/vs/sessions/contrib/layout/test/browser/desktopSessionLayoutController.test.ts
+++ b/src/vs/sessions/contrib/layout/test/browser/desktopSessionLayoutController.test.ts
@@ -12,7 +12,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { isIMenuItem, MenuRegistry } from '../../../../../platform/actions/common/actions.js';
+import { isIMenuItem, MenuId, MenuRegistry } from '../../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
 import { MainEditorAreaVisibleContext } from '../../../../../workbench/common/contextkeys.js';
 import { StorageScope, WillSaveStateReason } from '../../../../../platform/storage/common/storage.js';
@@ -20,7 +20,6 @@ import { Parts } from '../../../../../workbench/services/layout/browser/layoutSe
 import { ViewContainerLocation } from '../../../../../workbench/common/views.js';
 import { ISessionFileChange, SessionStatus } from '../../../../services/sessions/common/session.js';
 import { SinglePaneChangesTabAvailableContext, SinglePaneChangesTabMissingContext, HasDockedDetailsContext, SinglePaneFilesTabAvailableContext, SinglePaneFilesTabMissingContext } from '../../../../common/contextkeys.js';
-import { Menus } from '../../../../browser/menus.js';
 import { BrowserEditorInput } from '../../../../../workbench/contrib/browserView/common/browserEditorInput.js';
 import { FileEditorInput } from '../../../../../workbench/contrib/files/browser/editors/fileEditorInput.js';
 import { MultiDiffEditorInput } from '../../../../../workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js';
@@ -2480,10 +2479,10 @@ suite('LayoutController (desktop)', () => {
 		});
 	});
 
-	test('[D7 single-pane] contributes Toggle Details in the trailing editor header group', () => {
+	test('[D7 single-pane] contributes Toggle Details with the editor title layout actions', () => {
 		createSinglePaneController();
 
-		const items = MenuRegistry.getMenuItems(Menus.SessionsEditorHeaderLayout)
+		const items = MenuRegistry.getMenuItems(MenuId.EditorTitleLayout)
 			.filter(isIMenuItem)
 			.filter(item => item.command.id === TOGGLE_DETAILS_COMMAND_ID);
 
diff --git a/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.ts b/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.ts
index 63d6829065226e..194dd3ab455e3c 100644
--- a/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.ts
+++ b/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.ts
@@ -39,6 +39,7 @@ import { IChatInputPickerResponsiveState } from '../../../../../workbench/contri
 import { IViewsService } from '../../../../../workbench/services/views/common/viewsService.js';
 import { IAgentWorkbenchLayoutService } from '../../../../browser/workbench.js';
 import { Menus } from '../../../../browser/menus.js';
+import { DevContainerWorktreeEnabledSettingId } from '../../../../common/devContainerAgentHostService.js';
 import { SessionProviderIdContext, IsPhoneLayoutContext, IsQuickChatSessionContext } from '../../../../common/contextkeys.js';
 import { IWorkbenchLayoutService } from '../../../../../workbench/services/layout/browser/layoutService.js';
 import { reportNewChatPickerClosed } from '../../../chat/browser/newChatPickerTelemetry.js';
@@ -397,6 +398,11 @@ export class AgentHostSessionConfigPicker extends Disposable {
 			this._renderConfigPickers();
 		}));
 		this._watchProviders(this._sessionsProvidersService.getProviders());
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(DevContainerWorktreeEnabledSettingId)) {
+				this._renderConfigPickers();
+			}
+		}));
 
 		// Re-render when the layout crosses the phone breakpoint so the
 		// isolation control swaps between the desktop checkbox and the
@@ -518,7 +524,7 @@ export class AgentHostSessionConfigPicker extends Disposable {
 			const isReadOnly = this._isReadOnlyChip(property, schema, isNewSession);
 			// Isolation renders as a Worktree checkbox on desktop; the phone layout keeps the chip for the unified repo sheet.
 			if (property === SessionConfigKey.Isolation && this._shouldRenderIsolationAsCheckbox(schema)) {
-				this._renderIsolationCheckbox(session.sessionId, schema, value, isReadOnly, !isReadOnly && isLoading);
+				this._renderIsolationCheckbox(provider, session.sessionId, schema, value, isReadOnly, !isReadOnly && isLoading);
 				renderedIsolationCheckbox = true;
 				continue;
 			}
@@ -556,7 +562,9 @@ export class AgentHostSessionConfigPicker extends Disposable {
 		if (isPhoneLayout(this._layoutService)) {
 			this._devContainerCheckbox.clear();
 		} else if (provider.isDevContainerAvailable?.(session.sessionId) && provider.isDevContainerEnabled && provider.setDevContainerEnabled) {
-			this._renderDevContainerCheckbox(provider, session.sessionId);
+			const isolationSchema = resolvedConfig.schema.properties[SessionConfigKey.Isolation];
+			const isolation = resolvedConfig.values[SessionConfigKey.Isolation] ?? isolationSchema?.default;
+			this._renderDevContainerCheckbox(provider, session.sessionId, isolation === 'worktree');
 		} else {
 			this._devContainerCheckbox.clear();
 		}
@@ -709,10 +717,16 @@ export class AgentHostSessionConfigPicker extends Disposable {
 			&& schema.enum.includes('folder');
 	}
 
-	private _renderIsolationCheckbox(sessionId: string, schema: SessionConfigPropertySchema, value: unknown | undefined, isReadOnly: boolean, isLoading: boolean): void {
+	private _renderIsolationCheckbox(provider: IAgentHostSessionsProvider, sessionId: string, schema: SessionConfigPropertySchema, value: unknown | undefined, isReadOnly: boolean, isLoading: boolean): void {
 		const label = localize('agentHostSessionConfig.isolation.worktree', "New Worktree");
 		const worktreeIndex = schema.enum?.indexOf('worktree') ?? -1;
-		const tooltip = (worktreeIndex >= 0 ? schema.enumDescriptions?.[worktreeIndex] : undefined) ?? schema.description ?? schema.title;
+		const checked = value === 'worktree';
+		const combinationDisabled = !this._isDevContainerWorktreeEnabled()
+			&& provider.isDevContainerEnabled?.(sessionId) === true
+			&& !checked;
+		const tooltip = combinationDisabled
+			? localize('agentHostSessionConfig.isolation.devContainerDisabled', "New Worktree cannot be combined with Dev Container execution.")
+			: (worktreeIndex >= 0 ? schema.enumDescriptions?.[worktreeIndex] : undefined) ?? schema.description ?? schema.title;
 
 		let control = this._isolationCheckbox.value;
 		if (!control || control.sessionId !== sessionId) {
@@ -727,11 +741,13 @@ export class AgentHostSessionConfigPicker extends Disposable {
 			this._isolationCheckbox.value = control;
 			this._container?.prepend(control.slot);
 		}
-		control.update(value === 'worktree', isReadOnly, isLoading, tooltip);
+		control.update(checked, isReadOnly || combinationDisabled, isLoading, tooltip);
 	}
 
-	private _renderDevContainerCheckbox(provider: IAgentHostSessionsProvider, sessionId: string): void {
+	private _renderDevContainerCheckbox(provider: IAgentHostSessionsProvider, sessionId: string, worktreeSelected: boolean): void {
 		const label = localize('agentHostSessionConfig.devContainer', "Dev Container");
+		const checked = provider.isDevContainerEnabled?.(sessionId) === true;
+		const combinationDisabled = !this._isDevContainerWorktreeEnabled() && worktreeSelected && !checked;
 		let control = this._devContainerCheckbox.value;
 		if (!control || control.sessionId !== sessionId) {
 			control = new ConfigCheckboxControl(
@@ -749,7 +765,18 @@ export class AgentHostSessionConfigPicker extends Disposable {
 		} else {
 			this._container?.prepend(control.slot);
 		}
-		control.update(provider.isDevContainerEnabled?.(sessionId) === true, false, false, undefined);
+		control.update(
+			checked,
+			combinationDisabled,
+			false,
+			combinationDisabled
+				? localize('agentHostSessionConfig.devContainer.worktreeDisabled', "Dev Container execution cannot be combined with New Worktree.")
+				: undefined,
+		);
+	}
+
+	private _isDevContainerWorktreeEnabled(): boolean {
+		return this._configurationService.getValue<boolean>(DevContainerWorktreeEnabledSettingId) === true;
 	}
 
 	private _applyIsolationValue(sessionId: string, checked: boolean): void {
diff --git a/src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts b/src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts
index 9daabb56c9480e..54f2cfbc117593 100644
--- a/src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts
+++ b/src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts
@@ -28,6 +28,7 @@ import { parseGitHubIssueUrl } from '../../../../../platform/agentHost/common/gi
 import { getEffectiveAgents } from '../../../../../platform/agentHost/common/customAgents.js';
 import { KNOWN_MODE_VALUES, SessionConfigKey } from '../../../../../platform/agentHost/common/sessionConfigKeys.js';
 import { migrateLegacyAutopilotConfig } from '../../../../../platform/agentHost/common/agentHostSchema.js';
+import { readAgentDevContainerWorktreeMetadata, withAgentDevContainerWorktreeMetadata, type IAgentDevContainerWorktreeMetadata } from '../../../../../platform/agentHost/common/meta/agentDevContainerWorktreeMeta.js';
 import type { IAgentSubscription } from '../../../../../platform/agentHost/common/state/agentSubscription.js';
 import { ResolveSessionConfigResult, type SessionConfigPropertySchema } from '../../../../../platform/agentHost/common/state/protocol/commands.js';
 import { AgentCustomization, ChangesSummary, ChatInteractivity as ProtocolChatInteractivity, ChatOriginKind as ProtocolChatOriginKind, type ClientPluginCustomization, Customization, CustomizationEnablementKind, CustomizationType, type CustomizationEnablement, ModelSelection, SessionStatus as ProtocolSessionStatus, RootConfigState, RootState, type SessionActiveClient, SessionState, SessionSummary, type Changeset } from '../../../../../platform/agentHost/common/state/protocol/state.js';
@@ -206,6 +207,7 @@ interface ISerializedSessionMetadata {
 	readonly external?: boolean;
 	readonly multiRoot?: ISessionMultiRootMetadata;
 	readonly createdBySession?: IProtocolSessionCreationReference;
+	readonly devContainerWorktree?: IAgentDevContainerWorktreeMetadata;
 }
 
 /**
@@ -230,6 +232,7 @@ function serializeMetadata(meta: IAgentSessionMetadata): ISerializedSessionMetad
 		external: readSessionExternal(meta._meta) || undefined,
 		multiRoot: readSessionMultiRootMetadata(meta._meta),
 		createdBySession: readSessionCreationReference(meta._meta),
+		devContainerWorktree: readAgentDevContainerWorktreeMetadata(meta._meta),
 	};
 }
 
@@ -242,6 +245,9 @@ function deserializeMetadata(raw: ISerializedSessionMetadata): IAgentSessionMeta
 		if (raw.createdBySession) {
 			_meta = withSessionCreationReference(_meta, raw.createdBySession);
 		}
+		if (raw.devContainerWorktree) {
+			_meta = withAgentDevContainerWorktreeMetadata(_meta, raw.devContainerWorktree.handle);
+		}
 		return {
 			session: URI.parse(raw.session),
 			startTime: raw.startTime,
@@ -1973,6 +1979,7 @@ class NewSession extends Disposable {
 
 	private readonly _activeClientScope: IAgentCustomizationScope;
 	private readonly _initialMetadata: Record<string, unknown> | undefined;
+	get initialMetadata(): Record<string, unknown> | undefined { return this._initialMetadata; }
 
 	private readonly _logService: ILogService;
 	private readonly _providerId: string;
@@ -2667,26 +2674,51 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 		if (!rawId) {
 			return undefined;
 		}
+
 		return this._sessionCache.get(rawId)?.backendUri ?? this._newSessions.get(sessionId)?.backendUri;
 	}
 
+	protected _hasSession(sessionId: string): boolean {
+		const rawId = this._rawIdFromChatId(sessionId);
+		return !!rawId && this._sessionCache.has(rawId);
+	}
+
 	/**
 	 * Dispose every in-flight new session, firing each one's `disposeSession`
 	 * sentinel so the eagerly-created backend records are freed. Used when the
 	 * connection drops and the composed-but-unsent drafts can no longer commit.
 	 */
 	protected _disposeAllNewSessions(): void {
+		for (const sessionId of this._newSessions.keys()) {
+			this._onNewSessionAbandoned(sessionId, 'providerDisposed');
+		}
 		this._newSessions.clearAndDisposeAll();
 		this._onDidChangeDraftSessions.fire();
 	}
 
 	deleteNewSession(sessionId: string): void {
 		if (this._newSessions.has(sessionId)) {
+			this._onNewSessionAbandoned(sessionId, 'discarded');
 			this._newSessions.deleteAndDispose(sessionId);
 			this._onDidChangeDraftSessions.fire();
 		}
 	}
 
+	protected _onNewSessionAbandoned(_sessionId: string, _reason: 'discarded' | 'sendFailed' | 'providerDisposed'): void { }
+
+	protected _getSessionMetadata(sessionId: string): Record<string, unknown> | undefined {
+		const draft = this._newSessions.get(sessionId);
+		if (draft) {
+			return draft.initialMetadata;
+		}
+		const rawId = this._rawIdFromChatId(sessionId);
+		return rawId ? this._metaByRawId.get(rawId)?._meta : undefined;
+	}
+
+	protected _getSessionMetadataByRawId(rawId: string): Record<string, unknown> | undefined {
+		return this._metaByRawId.get(rawId)?._meta;
+	}
+
 	/** Full resolved config (schema + values) for running sessions, keyed by session ID. */
 	protected readonly _runningSessionConfigs = new Map<string, ResolveSessionConfigResult>();
 	private readonly _runningSessionConfigResolveSeq = new Map<string, number>();
@@ -3833,6 +3865,7 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 
 	clearSessionConfig(sessionId: string): void {
 		if (this._newSessions.has(sessionId)) {
+			this._onNewSessionAbandoned(sessionId, 'discarded');
 			this._newSessions.deleteAndDispose(sessionId);
 			this._onDidChangeDraftSessions.fire();
 		}
@@ -4212,16 +4245,17 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 	 * Skips the local flip when disconnected: showing a session as archived when
 	 * the change can never be recorded is worse than appearing not to archive.
 	 */
-	private _setSessionArchived(sessionId: string, isArchived: boolean): void {
+	protected _setSessionArchived(sessionId: string, isArchived: boolean): boolean {
 		const rawId = this._rawIdFromChatId(sessionId);
 		const cached = rawId ? this._sessionCache.get(rawId) : undefined;
 		const connection = this.connection;
 		if (!cached || !rawId || !connection) {
-			return;
+			return false;
 		}
 		cached.isArchived.set(isArchived, undefined);
 		this._onDidChangeSessions.fire({ added: [], removed: [], changed: [cached] });
 		connection.dispatch(cached.backendUri.toString(), { type: ActionType.SessionIsArchivedChanged as const, isArchived });
+		return true;
 	}
 
 	async setSessionReadState(sessionId: string, isRead: boolean): Promise<void> {
@@ -4794,6 +4828,7 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 		// than risking a double-dispose race on transient failures.
 		newSession.graduate();
 		if (this._newSessions.get(newSession.sessionId) === newSession) {
+			this._onNewSessionAbandoned(newSession.sessionId, 'sendFailed');
 			this._newSessions.deleteAndDispose(newSession.sessionId);
 			this._onDidChangeDraftSessions.fire();
 		}
@@ -5465,6 +5500,7 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 					removed.push(cached);
 				}
 			}
+			this._onHostReconciledSessions(new Set(this._sessionCache.keys()));
 
 			if (added.length > 0 || removed.length > 0 || changed.length > 0) {
 				this._onDidChangeSessions.fire({ added, removed, changed });
@@ -5499,6 +5535,9 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 	/** Raw ids the host listed, reported before eviction runs so subclasses can retire protections. */
 	protected _onHostListedSessions(_rawIds: ReadonlySet<string>): void { }
 
+	/** Raw ids retained after authoritative-list eviction and partial-provider guards have applied. */
+	protected _onHostReconciledSessions(_rawIds: ReadonlySet<string>): void { }
+
 	/**
 	 * Arm a backoff retry of {@link _refreshSessions}. Used after a failed
 	 * refresh so a transient startup failure self-heals without requiring an
@@ -5684,6 +5723,7 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 
 	private _handleSessionRemoved(session: URI | string): void {
 		const rawId = AgentSession.id(session);
+		this._onBackendSessionRemoved(rawId);
 		const cached = this._removeCachedSession(rawId);
 		if (cached) {
 			this._onDidChangeSessionsFromNotifications.fire({ added: [], removed: [cached], changed: [] });
@@ -5692,6 +5732,8 @@ export abstract class BaseAgentHostSessionsProvider extends Disposable implement
 		this._syncActiveClient();
 	}
 
+	protected _onBackendSessionRemoved(_rawId: string): void { }
+
 	private _removeCachedSession(rawId: string, expected?: AgentHostSessionAdapter): AgentHostSessionAdapter | undefined {
 		const cached = this._sessionCache.get(rawId);
 		if (expected && cached && cached !== expected) {
diff --git a/src/vs/sessions/contrib/providers/agentHost/browser/localAgentHostSessionsProvider.ts b/src/vs/sessions/contrib/providers/agentHost/browser/localAgentHostSessionsProvider.ts
index 587d98b7b76c0a..5d4104446ed63e 100644
--- a/src/vs/sessions/contrib/providers/agentHost/browser/localAgentHostSessionsProvider.ts
+++ b/src/vs/sessions/contrib/providers/agentHost/browser/localAgentHostSessionsProvider.ts
@@ -19,6 +19,9 @@ import { localize } from '../../../../../nls.js';
 import { type AgentHostUriMapper, LOCAL_AGENT_HOST_AUTHORITY, toAgentHostContentUri, toAgentHostUri } from '../../../../../platform/agentHost/common/agentHostUri.js';
 import { AgentSession, type IAgentSessionMetadata } from '../../../../../platform/agentHost/common/agent.js';
 import { affectsAgentHostProviderPreference, IAgentConnection, IAgentHostService, shouldSurfaceLocalAgentHostProvider } from '../../../../../platform/agentHost/common/agentService.js';
+import { supportsAgentHostDetachedWorktrees } from '../../../../../platform/agentHost/common/agentHostExtensionProtocol.js';
+import { withAgentDevContainerWorktreeMetadata } from '../../../../../platform/agentHost/common/meta/agentDevContainerWorktreeMeta.js';
+import { SessionConfigKey } from '../../../../../platform/agentHost/common/sessionConfigKeys.js';
 import { workspacelessScratchDir } from '../../../../../platform/agentHost/common/workspacelessScratchDir.js';
 import type { AgentCustomization, ISessionGitState } from '../../../../../platform/agentHost/common/state/sessionState.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -338,7 +341,7 @@ export class LocalAgentHostSessionsProvider extends BaseAgentHostSessionsProvide
 		);
 	}
 
-	async prepareNewSession(sessionId: string, token: CancellationToken): Promise<IPreparedNewSession> {
+	async prepareNewSession(sessionId: string, token: CancellationToken, query: string): Promise<IPreparedNewSession> {
 		const draft = this._getNewSession(sessionId);
 		if (!draft) {
 			throw new Error(`Cannot prepare unknown new session '${sessionId}'.`);
@@ -362,7 +365,37 @@ export class LocalAgentHostSessionsProvider extends BaseAgentHostSessionsProvide
 			throw new CancellationError();
 		}
 		await this._waitForSessionConfigResolution(this, sessionId, token);
-		const target = await this._devContainerAgentHostService.connect(sourceWorkspace, token);
+		const sourceConfig = this.getSessionConfig(sessionId);
+		let devContainerWorkspace = sourceWorkspace;
+		let detachedWorktree: { readonly handle: string; readonly worktree: URI } | undefined;
+		if (sourceConfig?.values[SessionConfigKey.Isolation] === 'worktree') {
+			await draft.waitForEagerCreate();
+			const connection = this.connection;
+			if (!supportsAgentHostDetachedWorktrees(connection.initializeResult.get()) || !connection.createDetachedWorktree || !connection.claimDetachedWorktree || !connection.deleteDetachedWorktree) {
+				throw new Error(localize('devContainerAgentHost.worktreePreparationUnsupported', "The local Agent Host does not support preparing a worktree for a Dev Container."));
+			}
+			detachedWorktree = await connection.createDetachedWorktree(draft.backendUri, query);
+			try {
+				if (token.isCancellationRequested) {
+					throw new CancellationError();
+				}
+				devContainerWorkspace = detachedWorktree.worktree;
+				await this._workspaceTrustManagementService.setUrisTrust([detachedWorktree.worktree], true);
+			} catch (error) {
+				await this._deleteDetachedWorktreeOnRollback(detachedWorktree.handle);
+				throw error;
+			}
+		}
+
+		let target: Awaited<ReturnType<IDevContainerAgentHostService['connect']>>;
+		try {
+			target = await this._devContainerAgentHostService.connect(devContainerWorkspace, token);
+		} catch (error) {
+			if (detachedWorktree) {
+				await this._deleteDetachedWorktreeOnRollback(detachedWorktree.handle);
+			}
+			throw error;
+		}
 		let deleteReplacement: (() => void) | undefined;
 		try {
 			await this._workspaceTrustManagementService.setUrisTrust([target.workspaceUri], true);
@@ -377,14 +410,30 @@ export class LocalAgentHostSessionsProvider extends BaseAgentHostSessionsProvide
 				throw new Error(localize('devContainerAgentHost.noAgents', "The Dev Container Agent Host did not advertise any agents."));
 			}
 
-			const replacement = targetProvider.createNewSession(target.workspaceUri, targetSessionType.id);
+			const replacement = targetProvider.createNewSession(target.workspaceUri, targetSessionType.id, {
+				metadata: detachedWorktree
+					? withAgentDevContainerWorktreeMetadata(undefined, detachedWorktree.handle)
+					: undefined,
+			});
 			const discardReplacement = () => targetProvider.deleteNewSession(replacement.sessionId);
 			deleteReplacement = discardReplacement;
+			if (detachedWorktree) {
+				if (!this.connection.claimDetachedWorktree) {
+					throw new Error(localize('devContainerAgentHost.worktreeClaimUnsupported', "The local Agent Host does not support claiming a prepared Dev Container worktree."));
+				}
+				await this.connection.claimDetachedWorktree(detachedWorktree.handle);
+			}
 			await this._waitForSessionConfigResolution(targetProvider, replacement.sessionId, token);
-			const sourceConfig = this.getSessionConfig(sessionId);
+			if (detachedWorktree) {
+				await targetProvider.setSessionConfigValue(replacement.sessionId, SessionConfigKey.Isolation, 'folder');
+				await this._waitForSessionConfigResolution(targetProvider, replacement.sessionId, token);
+			}
 			const targetConfig = targetProvider.getSessionConfig(replacement.sessionId);
 			if (sourceConfig) {
 				for (const [property, value] of Object.entries(sourceConfig.values)) {
+					if (detachedWorktree && property === SessionConfigKey.Isolation) {
+						continue;
+					}
 					const targetProperty = targetConfig?.schema.properties[property];
 					if (!targetProperty || targetProperty.readOnly) {
 						continue;
@@ -422,6 +471,9 @@ export class LocalAgentHostSessionsProvider extends BaseAgentHostSessionsProvide
 				discard: async () => {
 					try {
 						discardReplacement();
+						if (detachedWorktree) {
+							await this._deleteDetachedWorktreeOnRollback(detachedWorktree.handle);
+						}
 					} finally {
 						await target.release();
 					}
@@ -429,7 +481,14 @@ export class LocalAgentHostSessionsProvider extends BaseAgentHostSessionsProvide
 			};
 		} catch (error) {
 			try {
-				deleteReplacement?.();
+				if (deleteReplacement) {
+					deleteReplacement();
+					if (detachedWorktree) {
+						await this._deleteDetachedWorktreeOnRollback(detachedWorktree.handle);
+					}
+				} else if (detachedWorktree) {
+					await this._deleteDetachedWorktreeOnRollback(detachedWorktree.handle);
+				}
 			} finally {
 				await target.release();
 			}
@@ -437,6 +496,14 @@ export class LocalAgentHostSessionsProvider extends BaseAgentHostSessionsProvide
 		}
 	}
 
+	private async _deleteDetachedWorktreeOnRollback(handle: string): Promise<void> {
+		try {
+			await this.connection.deleteDetachedWorktree?.(handle);
+		} catch (error) {
+			this._logService.error(`[${this.id}] Failed to delete detached Dev Container worktree '${handle}' during rollback.`, error);
+		}
+	}
+
 	private async _waitForSessionConfigResolution(provider: IAgentHostSessionsProvider, sessionId: string, token: CancellationToken): Promise<void> {
 		while (provider.isSessionConfigResolving(sessionId).get()) {
 			await raceCancellationError(
diff --git a/src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts b/src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts
index c1a039b0e4a217..0384d32808dfc3 100644
--- a/src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts
+++ b/src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts
@@ -17,6 +17,7 @@ import { IActionWidgetService } from '../../../../../../../platform/actionWidget
 import { SessionConfigKey } from '../../../../../../../platform/agentHost/common/sessionConfigKeys.js';
 import { ResolveSessionConfigResult, SessionConfigPropertySchema, SessionConfigValueItem } from '../../../../../../../platform/agentHost/common/state/protocol/commands.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../../../../platform/dialogs/common/dialogs.js';
 import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
@@ -29,6 +30,7 @@ import { IViewsService } from '../../../../../../../workbench/services/views/com
 import { IAgentWorkbenchLayoutService } from '../../../../../../browser/workbench.js';
 import { Menus } from '../../../../../../browser/menus.js';
 import { IAgentHostSessionsProvider, LOCAL_AGENT_HOST_PROVIDER_ID } from '../../../../../../common/agentHostSessionsProvider.js';
+import { DevContainerWorktreeEnabledSettingId } from '../../../../../../common/devContainerAgentHostService.js';
 import { ISessionChangesService } from '../../../../../../contrib/changes/browser/sessionChangesService.js';
 import { CHANGES_VIEW_ID } from '../../../../../../contrib/changes/common/changes.js';
 import { ISessionsProvidersService } from '../../../../../../services/sessions/browser/sessionsProvidersService.js';
@@ -151,7 +153,10 @@ class FakeProvider implements Pick<IAgentHostSessionsProvider, 'id' | 'onDidChan
 	async getSessionConfigCompletions(): Promise<readonly SessionConfigValueItem[]> { return this.completions; }
 	isDevContainerAvailable(): boolean { return this.devContainerAvailable; }
 	isDevContainerEnabled(): boolean { return this.devContainerEnabled; }
-	setDevContainerEnabled(_sessionId: string, enabled: boolean): void { this.devContainerEnabled = enabled; }
+	setDevContainerEnabled(_sessionId: string, enabled: boolean): void {
+		this.devContainerEnabled = enabled;
+		this._emitter.fire(SESSION_ID);
+	}
 
 	/** Swap the config + resolving flag and pulse, as the real provider does. */
 	set(config: ResolveSessionConfigResult, resolving: boolean): void {
@@ -204,7 +209,7 @@ class CapturingActionWidgetHolder {
 	readonly events: string[] = [];
 }
 
-function setupServices(store: Pick<ReturnType<typeof ensureNoDisposablesAreLeakedInTestSuite>, 'add'>) {
+function setupServices(store: Pick<ReturnType<typeof ensureNoDisposablesAreLeakedInTestSuite>, 'add'>, options?: { devContainerWorktreeEnabled?: boolean }) {
 	const emitter = store.add(new Emitter<string>());
 	const provider = new FakeProvider(emitter);
 	const actionWidget = new CapturingActionWidgetHolder();
@@ -220,7 +225,9 @@ function setupServices(store: Pick<ReturnType<typeof ensureNoDisposablesAreLeake
 	} as Partial<IActionWidgetService> as IActionWidgetService);
 	instantiationService.stub(IHoverService, { setupDelayedHover: () => ({ dispose: () => { } }) } as Partial<IHoverService> as IHoverService);
 	instantiationService.stub(ITelemetryService, NullTelemetryService);
-	instantiationService.stub(IConfigurationService, new (class extends mock<IConfigurationService>() { })());
+	instantiationService.stub(IConfigurationService, new TestConfigurationService({
+		[DevContainerWorktreeEnabledSettingId]: options?.devContainerWorktreeEnabled ?? false,
+	}));
 	instantiationService.stub(IDialogService, new (class extends mock<IDialogService>() { })());
 	instantiationService.stub(IStorageService, new (class extends mock<IStorageService>() { })());
 	instantiationService.stub(IContextKeyService, new (class extends mock<IContextKeyService>() {
@@ -579,7 +586,7 @@ suite('Agent Host Session Config Picker', () => {
 	});
 
 	test('renders Dev Container before the Worktree and Branch controls and updates the draft', () => {
-		const services = setupServices(store);
+		const services = setupServices(store, { devContainerWorktreeEnabled: true });
 		const { provider } = services;
 		const { container } = renderPicker(store, services);
 
@@ -604,6 +611,53 @@ suite('Agent Host Session Config Picker', () => {
 		});
 	});
 
+	test('disables Dev Container while New Worktree is selected when the combination is disabled', () => {
+		const services = setupServices(store);
+		const { provider } = services;
+		const { container } = renderPicker(store, services);
+		const devContainer = devContainerSlot(container)!;
+
+		devContainer.querySelector<HTMLElement>('.action-label')!.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+
+		assert.deepStrictEqual({
+			devContainerDisabled: devContainer.classList.contains('disabled'),
+			devContainerAriaDisabled: devContainer.querySelector('.monaco-checkbox')?.getAttribute('aria-disabled'),
+			devContainerEnabled: provider.devContainerEnabled,
+			worktreeDisabled: isolationSlot(container)!.classList.contains('disabled'),
+		}, {
+			devContainerDisabled: true,
+			devContainerAriaDisabled: 'true',
+			devContainerEnabled: false,
+			worktreeDisabled: false,
+		});
+	});
+
+	test('disables New Worktree while Dev Container is selected when the combination is disabled', () => {
+		const services = setupServices(store);
+		services.provider.config = makeRepoConfig('main', 'folder');
+		const { provider } = services;
+		const { container } = renderPicker(store, services);
+		const devContainer = devContainerSlot(container)!;
+
+		devContainer.querySelector<HTMLElement>('.action-label')!.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+		const worktree = isolationSlot(container)!;
+		worktree.querySelector<HTMLElement>('.action-label')!.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+
+		assert.deepStrictEqual({
+			devContainerChecked: devContainer.querySelector('.monaco-checkbox')?.getAttribute('aria-checked'),
+			devContainerDisabled: devContainer.classList.contains('disabled'),
+			worktreeDisabled: worktree.classList.contains('disabled'),
+			worktreeAriaDisabled: worktree.querySelector('.monaco-checkbox')?.getAttribute('aria-disabled'),
+			setSessionConfigValueCalls: provider.setSessionConfigValueCalls,
+		}, {
+			devContainerChecked: 'true',
+			devContainerDisabled: false,
+			worktreeDisabled: true,
+			worktreeAriaDisabled: 'true',
+			setSessionConfigValueCalls: 0,
+		});
+	});
+
 	test('does not render Dev Container when the draft workspace is unavailable', () => {
 		const services = setupServices(store);
 		services.provider.devContainerAvailable = false;
diff --git a/src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts b/src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts
index 2609e1288555af..fbcba7d4676a6b 100644
--- a/src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts
+++ b/src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts
@@ -41,7 +41,7 @@ import { IChatSessionsService, isIChatSessionFileChange2 } from '../../../../../
 import { ChatModeKind } from '../../../../../../workbench/contrib/chat/common/constants.js';
 import { ILanguageModelsService, type ILanguageModelChatMetadata } from '../../../../../../workbench/contrib/chat/common/languageModels.js';
 import type { IChatModel, IChatModelInputState, IInputModel } from '../../../../../../workbench/contrib/chat/common/model/chatModel.js';
-import { ISessionChangeEvent, ISessionsProvider } from '../../../../../services/sessions/common/sessionsProvider.js';
+import { ISessionChangeEvent, ISessionsProvider, type ISessionsProviderCreateSessionOptions } from '../../../../../services/sessions/common/sessionsProvider.js';
 import { ChatInteractivity, ChatModelSource, ChatOriginKind, getChatCapabilities, ISession, SessionStatus, TURN_CHANGES_CHANGESET_ID } from '../../../../../services/sessions/common/session.js';
 import { IActiveSession, WorkspaceNotTrustedError } from '../../../../../services/sessions/common/sessionsManagement.js';
 import { ISessionsService } from '../../../../../services/sessions/browser/sessionsService.js';
@@ -92,6 +92,7 @@ class MockAgentHostService extends mock<IAgentHostService>() {
 		protocolVersion: '1',
 		serverSeq: 0,
 		snapshots: [],
+		_meta: { 'vscode.detachedWorktrees': true as const },
 	});
 
 	override readonly clientId = 'test-local-client';
@@ -104,6 +105,10 @@ class MockAgentHostService extends mock<IAgentHostService>() {
 	public resolveSessionConfigResult: ResolveSessionConfigResult = { schema: { type: 'object', properties: {} }, values: { isolation: 'worktree' } };
 	public resolveSessionConfigRequests: { config?: Record<string, unknown> }[] = [];
 	public resolveSessionConfigBarrier: DeferredPromise<void> | undefined;
+	public preparedSessionWorktree = URI.file('/home/user/project.worktrees/prepared');
+	public createDetachedWorktreeCalls: { session: URI; prompt: string }[] = [];
+	public claimedDetachedWorktrees: string[] = [];
+	public deletedDetachedWorktrees: string[] = [];
 	get rootStateListenerCount(): number { return this._rootStateListenerCount; }
 
 	private readonly _authenticationPending: ISettableObservable<boolean> = observableValue('authenticationPending', false);
@@ -215,6 +220,13 @@ class MockAgentHostService extends mock<IAgentHostService>() {
 		return uri;
 	}
 
+	override async createDetachedWorktree(session: URI, prompt: string): Promise<{ handle: string; worktree: URI }> {
+		this.createDetachedWorktreeCalls.push({ session, prompt });
+		return { handle: '00000000-0000-4000-8000-000000000001', worktree: this.preparedSessionWorktree };
+	}
+	override async deleteDetachedWorktree(handle: string): Promise<void> { this.deletedDetachedWorktrees.push(handle); }
+	override async claimDetachedWorktree(handle: string): Promise<void> { this.claimedDetachedWorktrees.push(handle); }
+
 	override async resolveSessionConfig(request: { config?: Record<string, unknown> }): Promise<ResolveSessionConfigResult> {
 		this.resolveSessionConfigRequests.push(request);
 		await this.resolveSessionConfigBarrier?.p;
@@ -3333,7 +3345,7 @@ suite('LocalAgentHostSessionsProvider', () => {
 		provider.setDevContainerEnabled(session.sessionId, true);
 
 		await assert.rejects(
-			provider.prepareNewSession(session.sessionId, CancellationToken.None),
+			provider.prepareNewSession(session.sessionId, CancellationToken.None, 'hello'),
 			WorkspaceNotTrustedError,
 		);
 		assert.strictEqual(connectCalls, 0);
@@ -3355,17 +3367,27 @@ suite('LocalAgentHostSessionsProvider', () => {
 		}();
 		const provider = createProvider(disposables, agentHost, undefined, {
 			devContainerAgentHostService,
-			setUrisTrust: async () => { throw setupError; },
+			setUrisTrust: async uris => {
+				if (uris.some(uri => uri.toString() === remoteWorkspace.toString())) {
+					throw setupError;
+				}
+			},
 		});
 		const session = provider.createNewSession(URI.file('/home/user/project'), provider.sessionTypes[0].id);
 		await timeout(0);
 		provider.setDevContainerEnabled(session.sessionId, true);
 
 		await assert.rejects(
-			provider.prepareNewSession(session.sessionId, CancellationToken.None),
+			provider.prepareNewSession(session.sessionId, CancellationToken.None, 'hello'),
 			error => error === setupError,
 		);
-		assert.strictEqual(releaseCalls, 1);
+		assert.deepStrictEqual({
+			releaseCalls,
+			deletedDetachedWorktrees: agentHost.deletedDetachedWorktrees,
+		}, {
+			releaseCalls: 1,
+			deletedDetachedWorktrees: ['00000000-0000-4000-8000-000000000001'],
+		});
 	});
 
 	test('prepareNewSession routes an enabled Dev Container draft to the connected provider', async () => {
@@ -3373,11 +3395,12 @@ suite('LocalAgentHostSessionsProvider', () => {
 			schema: {
 				type: 'object',
 				properties: {
+					isolation: { type: 'string', title: 'Isolation' },
 					mode: { type: 'string', title: 'Mode' },
 					localOnly: { type: 'string', title: 'Local Only' },
 				},
 			},
-			values: { mode: 'interactive', localOnly: 'value' },
+			values: { isolation: 'worktree', mode: 'interactive', localOnly: 'value' },
 		};
 		const remoteWorkspace = URI.parse('agent-host://devcontainer/workspaces/project');
 		const targetProviderId = 'agenthost-devcontainer';
@@ -3391,6 +3414,7 @@ suite('LocalAgentHostSessionsProvider', () => {
 		const targetModelId = 'agent-host-devcontainer-copilotcli:gpt-5';
 		const selectedTargetModels: [string, URI, string, ChatModelSource][] = [];
 		const selectedTargetAgents: [string, string, string][] = [];
+		let targetMetadata: Record<string, unknown> | undefined;
 		const sourceAgentUri = 'file:///home/user/project/.github/agents/reviewer.agent.md';
 		const targetAgent: AgentCustomization = {
 			type: CustomizationType.Agent,
@@ -3405,8 +3429,9 @@ suite('LocalAgentHostSessionsProvider', () => {
 				assert.ok(state.provider);
 				return [...state.provider.sessionTypes];
 			}
-			override createNewSession(workspaceUri: URI): ISession {
+			override createNewSession(workspaceUri: URI, _sessionTypeId: string, options?: ISessionsProviderCreateSessionOptions): ISession {
 				assert.strictEqual(workspaceUri.toString(), remoteWorkspace.toString());
+				targetMetadata = options?.metadata;
 				assert.ok(state.replacement);
 				return state.replacement;
 			}
@@ -3422,6 +3447,7 @@ suite('LocalAgentHostSessionsProvider', () => {
 					schema: {
 						type: 'object',
 						properties: {
+							isolation: { type: 'string', title: 'Isolation' },
 							mode: { type: 'string', title: 'Mode' },
 						},
 					},
@@ -3486,6 +3512,7 @@ suite('LocalAgentHostSessionsProvider', () => {
 		});
 		state.provider = provider;
 		const source = provider.createNewSession(URI.file('/home/user/project'), provider.sessionTypes[0].id);
+		const sourceBackendSession = AgentSession.uri(provider.sessionTypes[0].id, AgentSession.id(source.resource));
 		await waitForSessionConfig(provider, source.sessionId, config => config?.values.mode === 'interactive');
 		await timeout(0);
 		const replacementResource = URI.parse('remote-devcontainer-copilot:///replacement');
@@ -3503,7 +3530,8 @@ suite('LocalAgentHostSessionsProvider', () => {
 		provider.setModel(source.sessionId, source.mainChat.get().resource, sourceModelId, ChatModelSource.Chosen);
 		provider.setAgent(source.sessionId, { uri: sourceAgentUri, name: 'Reviewer' });
 		provider.setDevContainerEnabled(source.sessionId, true);
-		const prepared = await provider.prepareNewSession(source.sessionId, CancellationToken.None);
+		const prepared = await provider.prepareNewSession(source.sessionId, CancellationToken.None, 'Fix the issue');
+		provider.deleteNewSession(source.sessionId);
 		await prepared.discard?.();
 
 		assert.deepStrictEqual({
@@ -3514,20 +3542,35 @@ suite('LocalAgentHostSessionsProvider', () => {
 			transferredConfig,
 			selectedTargetModels,
 			selectedTargetAgents,
+			createdWorktree: agentHost.createDetachedWorktreeCalls.map(call => ({ session: call.session.toString(), prompt: call.prompt })),
+			targetMetadata,
+			claimedDetachedWorktrees: agentHost.claimedDetachedWorktrees,
+			ownerDisposed: agentHost.disposedSessions.map(uri => uri.toString()),
+			deletedDetachedWorktrees: agentHost.deletedDetachedWorktrees,
 			deletedTargetDrafts,
 			releaseCalls,
 			trustedTargetUris,
 		}, {
-			available: true,
-			enabled: true,
-			connectedWorkspace: 'file:///home/user/project',
+			available: false,
+			enabled: false,
+			connectedWorkspace: agentHost.preparedSessionWorktree.toString(),
 			preparedSessionId: replacement.sessionId,
-			transferredConfig: [['mode', 'interactive']],
+			transferredConfig: [['isolation', 'folder'], ['mode', 'interactive']],
 			selectedTargetModels: [[replacement.sessionId, replacementResource, targetModelId, ChatModelSource.Chosen]],
 			selectedTargetAgents: [[replacement.sessionId, targetAgent.uri, targetAgent.name]],
+			createdWorktree: [{ session: sourceBackendSession.toString(), prompt: 'Fix the issue' }],
+			targetMetadata: {
+				'vscode.devContainerWorktree': {
+					version: 1,
+					handle: '00000000-0000-4000-8000-000000000001',
+				},
+			},
+			claimedDetachedWorktrees: ['00000000-0000-4000-8000-000000000001'],
+			ownerDisposed: [sourceBackendSession.toString()],
+			deletedDetachedWorktrees: ['00000000-0000-4000-8000-000000000001'],
 			deletedTargetDrafts: [replacement.sessionId],
 			releaseCalls: 1,
-			trustedTargetUris: [remoteWorkspace.toString()],
+			trustedTargetUris: [agentHost.preparedSessionWorktree.toString(), remoteWorkspace.toString()],
 		});
 	});
 
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/REMOTE_AGENT_HOST_SESSIONS_PROVIDER.md b/src/vs/sessions/contrib/providers/remoteAgentHost/REMOTE_AGENT_HOST_SESSIONS_PROVIDER.md
index e79b7d08d49170..5b7efc63bf0c93 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/REMOTE_AGENT_HOST_SESSIONS_PROVIDER.md
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/REMOTE_AGENT_HOST_SESSIONS_PROVIDER.md
@@ -84,6 +84,8 @@ Focused tests live beside the remote provider and remote-host services. Tests ow
 
 The service stages a runtime-only `DevContainer` entry and asks the remote Agent Host service to connect its factory-built client, then creates a `RemoteAgentHostSessionsProvider` around it. The shared remote Agent Host contribution observes the connection and supplies connection-level filesystem, model, terminal, and log integration. Dev Container CLI output is streamed into one stable `Dev Container (<workspace>)` Output channel per source workspace, which is reused across connection attempts.
 
+When both worktree isolation and Dev Container execution are selected, the local Agent Host creates the worktree before the container starts. The connector opens the Dev Container on that host worktree, and the container-backed session uses folder isolation so it does not create a second worktree inside the container. The remote session stores only an opaque worktree handle in its metadata; authoritative host paths stay in a local detached-worktree record. Archive, unarchive, and delete resolve that handle through the local Agent Host so cleanup and recreation match ordinary local worktree sessions without retaining a hidden local session. Successful remote listings reconcile their active handles with old local records; cleanup removes only clean worktrees and preserves dirty work.
+
 ## Change policy
 
 Update this specification only when connection/provider ownership, routing identity, or the shared Agent Host lifecycle boundary changes. Do not append transport algorithms, telemetry schemas, retry narratives, or incident history.
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/browser/devContainerAgentHostService.ts b/src/vs/sessions/contrib/providers/remoteAgentHost/browser/devContainerAgentHostService.ts
index 13008a55db48fe..47b9818240e501 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/browser/devContainerAgentHostService.ts
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/browser/devContainerAgentHostService.ts
@@ -233,6 +233,7 @@ export class DevContainerAgentHostService extends Disposable implements IDevCont
 			const provider = providerStore.add(this._createProvider({
 				address: connected.address,
 				name: connected.name,
+				devContainerWorktreeScope: key,
 				omitHostFromWorkspaceLabel: true,
 			}));
 			providerStore.add(this._sessionsProvidersService.registerProvider(provider));
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts b/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts
index dfd241a513b44b..086040dca14a59 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts
@@ -17,7 +17,7 @@ import { localize } from '../../../../../nls.js';
 import { agentHostUri } from '../../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
 import { AGENT_HOST_SCHEME, agentHostAuthority, type AgentHostUriMapper, fromAgentHostUri, toAgentHostContentUri, toAgentHostUri } from '../../../../../platform/agentHost/common/agentHostUri.js';
 import { AgentSession, type IAgentSessionMetadata } from '../../../../../platform/agentHost/common/agent.js';
-import { type IAgentConnection } from '../../../../../platform/agentHost/common/agentService.js';
+import { IAgentHostService, type IAgentConnection } from '../../../../../platform/agentHost/common/agentService.js';
 import { ChangesetKind } from '../../../../../platform/agentHost/common/changesetUri.js';
 import { IRemoteAgentHostService, removeWebSocketRemoteAgentHostEntry, RemoteAgentHostConnectionStatus } from '../../../../../platform/agentHost/common/remoteAgentHostService.js';
 import type { ISessionGitState } from '../../../../../platform/agentHost/common/state/sessionState.js';
@@ -46,6 +46,7 @@ import type { ISessionsProviderAutomations } from '../../../../services/sessions
 import { AutomationStore } from '../../../automations/browser/automationService.js';
 import { providerAutomationStorageKey } from '../../../automations/common/automationStorageService.js';
 import { remoteAgentHostSessionTypeAuthorityPrefix, remoteAgentHostSessionTypeId } from '../../../../../platform/agentHost/common/agentHostSessionType.js';
+import { readAgentDevContainerWorktreeMetadata } from '../../../../../platform/agentHost/common/meta/agentDevContainerWorktreeMeta.js';
 
 /** Storage key prefix for cached session summaries, per remote address. */
 const CACHED_SESSIONS_STORAGE_PREFIX = 'remoteAgentHost.cachedSessions.v2.';
@@ -94,6 +95,7 @@ export interface IRemoteAgentHostSessionsProviderConfig {
 	 * one entry for the whole group instead of one per connection. See {@link IAgentHostGroup}.
 	 */
 	readonly hostGroup?: IAgentHostGroup;
+	readonly devContainerWorktreeScope?: string;
 }
 
 /**
@@ -179,6 +181,7 @@ export class RemoteAgentHostSessionsProvider extends BaseAgentHostSessionsProvid
 	private readonly _omitHostFromWorkspaceLabel: boolean;
 	private readonly _workspaceTypeIcon: ThemeIcon | undefined;
 	private readonly _defaultChangesetKind: IRemoteAgentHostSessionsProviderConfig['defaultChangesetKind'];
+	private readonly _devContainerWorktreeScope: string | undefined;
 	/** Storage key used for persisting {@link _sessionCache} snapshots. */
 	private readonly _storageKey: string;
 	/**
@@ -189,6 +192,7 @@ export class RemoteAgentHostSessionsProvider extends BaseAgentHostSessionsProvid
 	 * re-announced so the UI can repopulate.
 	 */
 	private _unpublished = false;
+	private readonly _detachedWorktreeDeletionTasks = new Map<string, Promise<void>>();
 
 
 	constructor(
@@ -196,6 +200,7 @@ export class RemoteAgentHostSessionsProvider extends BaseAgentHostSessionsProvid
 		@IFileDialogService private readonly _fileDialogService: IFileDialogService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IStorageService storageService: IStorageService,
+		@IAgentHostService private readonly _localAgentHostService: IAgentHostService,
 		@IChatSessionsService chatSessionsService: IChatSessionsService,
 		@IChatService chatService: IChatService,
 		@IChatWidgetService chatWidgetService: IChatWidgetService,
@@ -221,6 +226,7 @@ export class RemoteAgentHostSessionsProvider extends BaseAgentHostSessionsProvid
 		this._omitHostFromWorkspaceLabel = config.omitHostFromWorkspaceLabel === true;
 		this._workspaceTypeIcon = config.workspaceTypeIcon;
 		this._defaultChangesetKind = config.defaultChangesetKind;
+		this._devContainerWorktreeScope = config.devContainerWorktreeScope;
 		this.onDidReportConnectProgress = config.onDidReportConnectProgress;
 		this.canConnectOnDemand = !!config.connectOnDemand;
 		this._register(this._onDidChangeSessionsImmediately(() => this.updateResourceLabelHomes()));
@@ -266,6 +272,115 @@ export class RemoteAgentHostSessionsProvider extends BaseAgentHostSessionsProvid
 		}));
 	}
 
+	override async archiveSession(sessionId: string): Promise<void> {
+		if (!this._hasSession(sessionId) || !this.connection) {
+			return;
+		}
+		await this._setDetachedWorktreeArchived(sessionId, true);
+		if (!this._setSessionArchived(sessionId, true)) {
+			await this._setDetachedWorktreeArchived(sessionId, false);
+		}
+	}
+
+	override async unarchiveSession(sessionId: string): Promise<void> {
+		if (!this._hasSession(sessionId) || !this.connection) {
+			return;
+		}
+		await this._setDetachedWorktreeArchived(sessionId, false);
+		if (!this._setSessionArchived(sessionId, false)) {
+			await this._setDetachedWorktreeArchived(sessionId, true);
+		}
+	}
+
+	override async deleteSessions(sessionIds: readonly string[]): Promise<void> {
+		const detachedWorktrees = sessionIds.filter(sessionId => this._hasSession(sessionId)).map(sessionId => ({
+			sessionId,
+			handle: this._getDetachedWorktreeHandle(sessionId),
+		})).filter((entry): entry is { sessionId: string; handle: string } => !!entry.handle);
+		let deleteError: unknown;
+		try {
+			await super.deleteSessions(sessionIds);
+		} catch (error) {
+			deleteError = error;
+		}
+		let worktreeError: unknown;
+		for (const { sessionId, handle } of detachedWorktrees) {
+			if (this._hasSession(sessionId)) {
+				continue;
+			}
+			try {
+				await this._deleteDetachedWorktree(handle);
+			} catch (error) {
+				worktreeError ??= error;
+			}
+		}
+		if (deleteError) {
+			throw deleteError;
+		}
+		if (worktreeError) {
+			throw worktreeError;
+		}
+	}
+
+	protected override _onNewSessionAbandoned(sessionId: string, reason: 'discarded' | 'sendFailed' | 'providerDisposed'): void {
+		if (reason === 'sendFailed') {
+			return;
+		}
+		const handle = this._getDetachedWorktreeHandle(sessionId);
+		if (handle) {
+			void this._deleteDetachedWorktree(handle).catch(error =>
+				this._logService.error(`[${this.id}] Failed to delete detached worktree for abandoned session '${sessionId}'.`, error));
+		}
+	}
+
+	protected override _onBackendSessionRemoved(rawId: string): void {
+		const handle = readAgentDevContainerWorktreeMetadata(this._getSessionMetadataByRawId(rawId))?.handle;
+		if (handle) {
+			void this._deleteDetachedWorktree(handle).catch(error =>
+				this._logService.error(`[${this.id}] Failed to delete detached worktree for remotely removed session '${rawId}'.`, error));
+		}
+	}
+
+	protected override _onHostReconciledSessions(rawIds: ReadonlySet<string>): void {
+		if (!this._devContainerWorktreeScope || !this._localAgentHostService.reconcileDetachedWorktrees) {
+			return;
+		}
+		const activeHandles = [...rawIds]
+			.map(rawId => readAgentDevContainerWorktreeMetadata(this._getSessionMetadataByRawId(rawId))?.handle)
+			.filter((handle): handle is string => !!handle);
+		void this._localAgentHostService.reconcileDetachedWorktrees(this._devContainerWorktreeScope, activeHandles).catch(error =>
+			this._logService.error(`[${this.id}] Failed to reconcile detached Dev Container worktrees.`, error));
+	}
+
+	private _getDetachedWorktreeHandle(sessionId: string): string | undefined {
+		return readAgentDevContainerWorktreeMetadata(this._getSessionMetadata(sessionId))?.handle;
+	}
+
+	private async _setDetachedWorktreeArchived(sessionId: string, archived: boolean): Promise<void> {
+		const handle = this._getDetachedWorktreeHandle(sessionId);
+		if (!handle) {
+			return;
+		}
+		if (!this._localAgentHostService.setDetachedWorktreeArchived) {
+			throw new Error(`Local Agent Host does not support ${archived ? 'archiving' : 'unarchiving'} prepared worktrees.`);
+		}
+		await this._localAgentHostService.setDetachedWorktreeArchived(handle, archived);
+	}
+
+	private _deleteDetachedWorktree(handle: string): Promise<void> {
+		const existing = this._detachedWorktreeDeletionTasks.get(handle);
+		if (existing) {
+			return existing;
+		}
+		if (!this._localAgentHostService.deleteDetachedWorktree) {
+			return Promise.reject(new Error('Local Agent Host does not support deleting prepared worktrees.'));
+		}
+		const task = this._localAgentHostService.deleteDetachedWorktree(handle)
+			.finally(() => this._detachedWorktreeDeletionTasks.delete(handle));
+		this._detachedWorktreeDeletionTasks.set(handle, task);
+		return task;
+	}
+
 	// -- BaseAgentHostSessionsProvider hooks ---------------------------------
 
 	protected get connection(): IAgentConnection | undefined { return this._connection; }
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/electron-browser/devContainerAgentHostConnector.contribution.ts b/src/vs/sessions/contrib/providers/remoteAgentHost/electron-browser/devContainerAgentHostConnector.contribution.ts
index 696ae0db248173..d5545d1f9704a3 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/electron-browser/devContainerAgentHostConnector.contribution.ts
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/electron-browser/devContainerAgentHostConnector.contribution.ts
@@ -31,7 +31,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../workbench/common/contributions.js';
 import { Extensions, IOutputChannelRegistry, IOutputService } from '../../../../../workbench/services/output/common/output.js';
-import { DevContainerAgentHostEnabledSettingId, IDevContainerAgentHostConnection, IDevContainerAgentHostConnector, IDevContainerAgentHostService } from '../../../../common/devContainerAgentHostService.js';
+import { DevContainerAgentHostEnabledSettingId, DevContainerWorktreeEnabledSettingId, IDevContainerAgentHostConnection, IDevContainerAgentHostConnector, IDevContainerAgentHostService } from '../../../../common/devContainerAgentHostService.js';
 
 /** Throws when Dev Container Agent Host connections are disabled. */
 export function ensureDevContainerAgentHostsEnabled(configurationService: IConfigurationService): void {
@@ -262,7 +262,17 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			description: localize('chat.agentHost.devContainer.enabled', "Enable running Agent Host sessions in Dev Containers."),
 			default: false,
 			scope: ConfigurationScope.APPLICATION,
+			tags: ['experimental'],
+			experiment: { mode: 'auto' },
+		},
+		[DevContainerWorktreeEnabledSettingId]: {
+			type: 'boolean',
+			description: localize('chat.agentHost.devContainer.worktree.enabled', "Enable running Dev Container Agent Host sessions in new worktrees."),
+			default: false,
+			scope: ConfigurationScope.APPLICATION,
 			included: false,
+			tags: ['experimental'],
+			experiment: { mode: 'auto' },
 		},
 	},
 });
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/devContainerAgentHostService.test.ts b/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/devContainerAgentHostService.test.ts
index 1185b3fbf78a84..35b0625ad5b0b8 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/devContainerAgentHostService.test.ts
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/devContainerAgentHostService.test.ts
@@ -265,6 +265,7 @@ suite('Dev Container Agent Host Service', () => {
 				config: {
 					address,
 					name: 'Source Dev Container',
+					devContainerWorktreeScope: getComparisonKey(sourceWorkspace),
 					omitHostFromWorkspaceLabel: true,
 				},
 				connected: true,
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/remoteAgentHostSessionsProvider.test.ts b/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/remoteAgentHostSessionsProvider.test.ts
index 2766b614aef4a2..e73f66b5cc1c3a 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/remoteAgentHostSessionsProvider.test.ts
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/remoteAgentHostSessionsProvider.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { timeout } from '../../../../../../base/common/async.js';
+import { DeferredPromise, timeout } from '../../../../../../base/common/async.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
@@ -16,7 +16,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/
 import { AgentSession, type IAgentSessionMetadata } from '../../../../../../platform/agentHost/common/agent.js';
 import { agentHostAuthority, toAgentHostUri } from '../../../../../../platform/agentHost/common/agentHostUri.js';
 import { ChangesetKind } from '../../../../../../platform/agentHost/common/changesetUri.js';
-import { type IAgentConnection } from '../../../../../../platform/agentHost/common/agentService.js';
+import { IAgentHostService, type IAgentConnection } from '../../../../../../platform/agentHost/common/agentService.js';
 import { SessionArtifactType, withSessionArtifacts } from '../../../../../../platform/agentHost/common/sessionArtifacts.js';
 import type { ResolveSessionConfigResult } from '../../../../../../platform/agentHost/common/state/protocol/commands.js';
 import { MessageKind, SessionLifecycle, type AgentInfo, type AutomationState, type RootState, type SessionConfigState, type SessionState } from '../../../../../../platform/agentHost/common/state/protocol/state.js';
@@ -238,7 +238,7 @@ function createSession(id: string, opts?: { provider?: string; summary?: string;
 	};
 }
 
-function createProvider(disposables: DisposableStore, connection: MockAgentConnection, overrides?: { address?: string; preferenceKey?: string; connectionName?: string | undefined; sendRequest?: (resource: URI, message: string, options?: IChatSendRequestOptions) => Promise<ChatSendResult>; openSession?: boolean; storageService?: IStorageService; noConnection?: boolean; isWebPlatform?: boolean; workspaceTrusted?: boolean; omitHostFromWorkspaceLabel?: boolean; workspaceTypeIcon?: ThemeIcon; defaultChangesetKind?: IRemoteAgentHostSessionsProviderConfig['defaultChangesetKind']; ctor?: typeof RemoteAgentHostSessionsProvider; labelService?: ILabelService; defaultDirectory?: string }): RemoteAgentHostSessionsProvider {
+function createProvider(disposables: DisposableStore, connection: MockAgentConnection, overrides?: { address?: string; preferenceKey?: string; connectionName?: string | undefined; sendRequest?: (resource: URI, message: string, options?: IChatSendRequestOptions) => Promise<ChatSendResult>; openSession?: boolean; storageService?: IStorageService; localAgentHostService?: IAgentHostService; noConnection?: boolean; isWebPlatform?: boolean; workspaceTrusted?: boolean; omitHostFromWorkspaceLabel?: boolean; workspaceTypeIcon?: ThemeIcon; defaultChangesetKind?: IRemoteAgentHostSessionsProviderConfig['defaultChangesetKind']; devContainerWorktreeScope?: string; ctor?: typeof RemoteAgentHostSessionsProvider; labelService?: ILabelService; defaultDirectory?: string }): RemoteAgentHostSessionsProvider {
 	const instantiationService = disposables.add(new TestInstantiationService());
 
 	instantiationService.stub(IFileDialogService, {});
@@ -264,6 +264,7 @@ function createProvider(disposables: DisposableStore, connection: MockAgentConne
 		lookupLanguageModel: () => undefined,
 	});
 	instantiationService.stub(IStorageService, overrides?.storageService ?? disposables.add(new InMemoryStorageService()));
+	instantiationService.stub(IAgentHostService, overrides?.localAgentHostService ?? new class extends mock<IAgentHostService>() { }());
 	instantiationService.stub(IProgressService, {});
 	instantiationService.stub(ILabelService, overrides?.labelService ?? new MockLabelService());
 	instantiationService.stub(ILogService, new NullLogService());
@@ -294,6 +295,7 @@ function createProvider(disposables: DisposableStore, connection: MockAgentConne
 		omitHostFromWorkspaceLabel: overrides?.omitHostFromWorkspaceLabel,
 		workspaceTypeIcon: overrides?.workspaceTypeIcon,
 		defaultChangesetKind: overrides?.defaultChangesetKind,
+		devContainerWorktreeScope: overrides?.devContainerWorktreeScope,
 	};
 
 	const baseCtor = overrides?.ctor ?? RemoteAgentHostSessionsProvider;
@@ -324,7 +326,7 @@ async function waitForSessionConfig(provider: RemoteAgentHostSessionsProvider, s
 	});
 }
 
-function fireSessionAdded(connection: MockAgentConnection, rawId: string, opts?: { provider?: string; title?: string; project?: { uri: string; displayName: string }; workingDirectory?: string; createdAt?: string; modifiedAt?: string }): void {
+function fireSessionAdded(connection: MockAgentConnection, rawId: string, opts?: { provider?: string; title?: string; project?: { uri: string; displayName: string }; workingDirectory?: string; createdAt?: string; modifiedAt?: string; metadata?: Record<string, unknown> }): void {
 	const provider = opts?.provider ?? 'copilotcli';
 	const sessionUri = AgentSession.uri(provider, rawId);
 	connection.fireNotification({
@@ -339,6 +341,7 @@ function fireSessionAdded(connection: MockAgentConnection, rawId: string, opts?:
 			modifiedAt: opts?.modifiedAt ?? new Date().toISOString(),
 			project: opts?.project,
 			workingDirectories: opts?.workingDirectory ? [opts.workingDirectory] : undefined,
+			_meta: opts?.metadata,
 		},
 	});
 }
@@ -754,6 +757,141 @@ suite('RemoteAgentHostSessionsProvider', () => {
 		assert.strictEqual(remaining.find((s) => s.title.get() === 'To Delete'), undefined);
 	});
 
+	test('delegates Dev Container worktree lifecycle by handle from session metadata', async () => {
+		const handle = '00000000-0000-4000-8000-000000000001';
+		const metadata = { 'vscode.devContainerWorktree': { version: 1, handle } };
+		const delegated: string[] = [];
+		const localAgentHostService = new class extends mock<IAgentHostService>() {
+			override async setDetachedWorktreeArchived(actualHandle: string, archived: boolean): Promise<void> {
+				delegated.push(`${archived ? 'archive' : 'unarchive'}:${actualHandle}`);
+			}
+			override async deleteDetachedWorktree(actualHandle: string): Promise<void> {
+				delegated.push(`delete:${actualHandle}`);
+			}
+		}();
+		const provider = createProvider(disposables, connection, { localAgentHostService });
+		fireSessionAdded(connection, 'dev-container-worktree', { title: 'Dev Container Worktree', metadata });
+		const session = provider.getSessions().find(candidate => candidate.title.get() === 'Dev Container Worktree');
+		assert.ok(session);
+		await provider.deleteSession(session.sessionId);
+
+		const unarchiveConnection = new MockAgentConnection();
+		const unarchiveProvider = createProvider(disposables, unarchiveConnection, { localAgentHostService });
+		fireSessionAdded(unarchiveConnection, 'dev-container-worktree-unarchive', { title: 'Dev Container Worktree Unarchive', metadata });
+		const sessionToUnarchive = unarchiveProvider.getSessions().find(candidate => candidate.title.get() === 'Dev Container Worktree Unarchive');
+		assert.ok(sessionToUnarchive);
+		await unarchiveProvider.unarchiveSession(sessionToUnarchive.sessionId);
+
+		const archiveConnection = new MockAgentConnection();
+		const archiveProvider = createProvider(disposables, archiveConnection, { localAgentHostService });
+		fireSessionAdded(archiveConnection, 'dev-container-worktree-archive', { title: 'Dev Container Worktree Archive', metadata });
+		const sessionToArchive = archiveProvider.getSessions().find(candidate => candidate.title.get() === 'Dev Container Worktree Archive');
+		assert.ok(sessionToArchive);
+		await archiveProvider.archiveSession(sessionToArchive.sessionId);
+
+		assert.deepStrictEqual(delegated, [
+			`delete:${handle}`,
+			`unarchive:${handle}`,
+			`archive:${handle}`,
+		]);
+	});
+
+	test('deletes a detached Dev Container worktree when its draft is abandoned', async () => {
+		const handle = '00000000-0000-4000-8000-000000000001';
+		const deleted = new DeferredPromise<void>();
+		const localAgentHostService = new class extends mock<IAgentHostService>() {
+			override async deleteDetachedWorktree(actualHandle: string): Promise<void> {
+				assert.strictEqual(actualHandle, handle);
+				deleted.complete();
+			}
+		}();
+		const provider = createProvider(disposables, connection, { localAgentHostService });
+		const draft = provider.createNewSession(
+			URI.parse('vscode-agent-host://localhost__4321/home/user/project'),
+			provider.sessionTypes[0].id,
+			{ metadata: { 'vscode.devContainerWorktree': { version: 1, handle } } },
+		);
+
+		provider.deleteNewSession(draft.sessionId);
+		await deleted.p;
+
+		assert.strictEqual(deleted.isSettled, true);
+	});
+
+	test('deletes a detached Dev Container worktree when its draft provider disconnects', async () => {
+		const handle = '00000000-0000-4000-8000-000000000001';
+		const deleted = new DeferredPromise<void>();
+		const provider = createProvider(disposables, connection, {
+			localAgentHostService: new class extends mock<IAgentHostService>() {
+				override async deleteDetachedWorktree(actualHandle: string): Promise<void> {
+					assert.strictEqual(actualHandle, handle);
+					deleted.complete();
+				}
+			}(),
+		});
+		provider.createNewSession(
+			URI.parse('vscode-agent-host://localhost__4321/home/user/project'),
+			provider.sessionTypes[0].id,
+			{ metadata: { 'vscode.devContainerWorktree': { version: 1, handle } } },
+		);
+
+		provider.clearConnection();
+		await deleted.p;
+
+		assert.strictEqual(deleted.isSettled, true);
+	});
+
+	test('deletes a detached Dev Container worktree when the remote session is removed', async () => {
+		const handle = '00000000-0000-4000-8000-000000000001';
+		const deleted = new DeferredPromise<void>();
+		createProvider(disposables, connection, {
+			localAgentHostService: new class extends mock<IAgentHostService>() {
+				override async deleteDetachedWorktree(actualHandle: string): Promise<void> {
+					assert.strictEqual(actualHandle, handle);
+					deleted.complete();
+				}
+			}(),
+		});
+		fireSessionAdded(connection, 'removed-dev-container-worktree', {
+			metadata: { 'vscode.devContainerWorktree': { version: 1, handle } },
+		});
+
+		fireSessionRemoved(connection, 'removed-dev-container-worktree');
+		await deleted.p;
+
+		assert.strictEqual(deleted.isSettled, true);
+	});
+
+	test('reconciles detached worktree handles after an authoritative session listing', async () => {
+		class RefreshableRemoteAgentHostSessionsProvider extends RemoteAgentHostSessionsProvider {
+			refresh(): Promise<void> { return this._refreshSessions(); }
+		}
+		const handle = '00000000-0000-4000-8000-000000000001';
+		const metadata = { 'vscode.devContainerWorktree': { version: 1, handle } };
+		const reconciliations: { scope: string; activeHandles: readonly string[] }[] = [];
+		const provider = createProvider(disposables, connection, {
+			ctor: RefreshableRemoteAgentHostSessionsProvider,
+			devContainerWorktreeScope: 'file:///workspace',
+			localAgentHostService: new class extends mock<IAgentHostService>() {
+				override async reconcileDetachedWorktrees(scope: string, activeHandles: readonly string[]): Promise<void> {
+					reconciliations.push({ scope, activeHandles });
+				}
+			}(),
+		}) as RefreshableRemoteAgentHostSessionsProvider;
+		const session = createSession('temporarily-unlisted', { _meta: metadata });
+		connection.addSession(session);
+		await provider.refresh();
+
+		await connection.disposeSession(session.session);
+		await provider.refresh();
+
+		assert.deepStrictEqual(reconciliations, [
+			{ scope: 'file:///workspace', activeHandles: [] },
+			{ scope: 'file:///workspace', activeHandles: [handle] },
+			{ scope: 'file:///workspace', activeHandles: [] },
+		]);
+	});
+
 	// ---- Rename -------
 
 	test('renameSession dispatches SessionTitleChanged action with correct session URI', async () => {
diff --git a/src/vs/sessions/contrib/providers/remoteAgentHost/test/electron-browser/devContainerAgentHostConnector.test.ts b/src/vs/sessions/contrib/providers/remoteAgentHost/test/electron-browser/devContainerAgentHostConnector.test.ts
index 85f063092594c6..f2817fc080976d 100644
--- a/src/vs/sessions/contrib/providers/remoteAgentHost/test/electron-browser/devContainerAgentHostConnector.test.ts
+++ b/src/vs/sessions/contrib/providers/remoteAgentHost/test/electron-browser/devContainerAgentHostConnector.test.ts
@@ -13,7 +13,7 @@ import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurati
 import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
 import { Registry } from '../../../../../../platform/registry/common/platform.js';
-import { DevContainerAgentHostEnabledSettingId } from '../../../../../common/devContainerAgentHostService.js';
+import { DevContainerAgentHostEnabledSettingId, DevContainerWorktreeEnabledSettingId } from '../../../../../common/devContainerAgentHostService.js';
 import { ensureDevContainerAgentHostsEnabled, isDevContainerWorkspaceAvailable } from '../../electron-browser/devContainerAgentHostConnector.contribution.js';
 
 suite('Dev Container Agent Host Connector', () => {
@@ -58,16 +58,37 @@ suite('Dev Container Agent Host Connector', () => {
 		});
 	});
 
-	test('registers a hidden, disabled-by-default user setting', () => {
+	test('registers an experimental, disabled-by-default user setting', () => {
 		const property = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
-			.getExcludedConfigurationProperties()[DevContainerAgentHostEnabledSettingId];
+			.getConfigurationProperties()[DevContainerAgentHostEnabledSettingId];
 
 		assert.deepStrictEqual({
 			default: property.default,
 			scope: property.scope,
+			tags: property.tags,
+			experiment: property.experiment,
 		}, {
 			default: false,
 			scope: ConfigurationScope.APPLICATION,
+			tags: ['experimental', 'onExP'],
+			experiment: { mode: 'auto' },
+		});
+	});
+
+	test('registers a hidden experimental setting for combining Dev Containers and worktrees', () => {
+		const property = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
+			.getExcludedConfigurationProperties()[DevContainerWorktreeEnabledSettingId];
+
+		assert.deepStrictEqual({
+			default: property.default,
+			scope: property.scope,
+			tags: property.tags,
+			experiment: property.experiment,
+		}, {
+			default: false,
+			scope: ConfigurationScope.APPLICATION,
+			tags: ['experimental', 'onExP'],
+			experiment: { mode: 'auto' },
 		});
 	});
 
diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
index 2296a4103e639a..facf3410541846 100644
--- a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
+++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
@@ -192,6 +192,7 @@
 	height: 100%;
 	box-sizing: border-box;
 	position: relative;
+	overflow: visible;
 	padding: 8px 6px 8px 12px;
 
 	&.archived {
@@ -486,7 +487,7 @@
 	content: '';
 	position: absolute;
 	top: var(--vscode-spacing-size280);
-	bottom: 0;
+	bottom: calc(-1 * var(--vscode-spacing-size20));
 	left: var(--vscode-spacing-size200);
 	border-left: var(--vscode-strokeThickness) solid var(--vscode-tree-inactiveIndentGuidesStroke);
 	opacity: 0;
@@ -505,6 +506,7 @@
 	flex-direction: column;
 	box-sizing: border-box;
 	position: relative;
+	overflow: visible;
 	padding: 0 var(--vscode-spacing-size120) 0 var(--vscode-spacing-size360);
 	color: var(--vscode-foreground);
 	font-size: var(--vscode-fontSize-body1);
@@ -514,7 +516,7 @@
 		content: '';
 		position: absolute;
 		top: 0;
-		bottom: 0;
+		bottom: calc(-1 * var(--vscode-spacing-size20));
 		left: var(--vscode-spacing-size200);
 		border-left: var(--vscode-strokeThickness) solid var(--vscode-tree-inactiveIndentGuidesStroke);
 		opacity: 0;
@@ -689,7 +691,7 @@
 .session-section {
 	display: flex;
 	align-items: center;
-	font-size: var(--vscode-fontSize-label2, 11px);
+	font-size: var(--vscode-fontSize-label1, 12px);
 	font-weight: var(--vscode-fontWeight-semiBold, 600);
 	color: var(--vscode-descriptionForeground);
 	padding: 0 10px;
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsActions.ts b/src/vs/sessions/contrib/sessions/browser/sessionsActions.ts
index 87c0c7e5abfe7b..9513284e6dde91 100644
--- a/src/vs/sessions/contrib/sessions/browser/sessionsActions.ts
+++ b/src/vs/sessions/contrib/sessions/browser/sessionsActions.ts
@@ -605,7 +605,7 @@ registerAction2(class DeleteSessionListChatAction extends Action2 {
 	constructor() {
 		super({
 			id: 'sessions.list.deleteChat',
-			title: localize2('deleteChat', "Delete Chat"),
+			title: localize2('deleteChat', "Delete..."),
 			f1: false,
 			menu: {
 				id: Menus.SessionChatItemContext,
diff --git a/src/vs/sessions/contrib/sessions/electron-browser/sessions.contribution.ts b/src/vs/sessions/contrib/sessions/electron-browser/sessions.contribution.ts
index b8454ccf766291..dae65a2f8fb49f 100644
--- a/src/vs/sessions/contrib/sessions/electron-browser/sessions.contribution.ts
+++ b/src/vs/sessions/contrib/sessions/electron-browser/sessions.contribution.ts
@@ -15,7 +15,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		[SESSIONS_APPLICATION_BADGE_SETTING]: {
 			type: 'boolean',
 			tags: ['preview'],
-			description: localize('sessions.showApplicationBadge', "Controls whether the application icon shows a badge with the number of unread sessions and sessions that need input. The badge appears on the dock icon on macOS, on the launcher icon on Linux and over the taskbar icon on Windows."),
+			description: localize('sessions.showApplicationBadge', "Controls whether the application icon shows a badge with the number of unarchived sessions that are unread and no longer in progress, need input, or are no longer in progress and have failing CI checks on an open, non-draft pull request. The badge appears on the dock icon on macOS, on the launcher icon on Linux and over the taskbar icon on Windows."),
 			default: false,
 			experiment: { mode: 'auto' }
 		},
diff --git a/src/vs/sessions/contrib/sessions/electron-browser/sessionsApplicationBadge.ts b/src/vs/sessions/contrib/sessions/electron-browser/sessionsApplicationBadge.ts
index a7955fba5e5800..8b08c5631acc32 100644
--- a/src/vs/sessions/contrib/sessions/electron-browser/sessionsApplicationBadge.ts
+++ b/src/vs/sessions/contrib/sessions/electron-browser/sessionsApplicationBadge.ts
@@ -10,6 +10,7 @@ import { autorun, derived, IObservable, observableFromEvent } from '../../../../
 import { isWindows } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IApplicationBadge, INativeHostService } from '../../../../platform/native/common/native.js';
 import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -17,13 +18,16 @@ import { IWorkbenchContribution } from '../../../../workbench/common/contributio
 import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../../../workbench/common/theme.js';
 import { ISession, SessionStatus } from '../../../services/sessions/common/session.js';
 import { ISessionsManagementService } from '../../../services/sessions/common/sessionsManagement.js';
+import { BlockedSessions } from '../../blockedSessions/browser/blockedSessions.js';
 
 export const SESSIONS_APPLICATION_BADGE_SETTING = 'sessions.showApplicationBadge';
 
 /**
- * Renders the number of sessions that need the user's attention — unread or
- * waiting for input, archived ones excluded — as a badge on the application
- * icon in the dock (macOS), the launcher (Linux) or the taskbar (Windows).
+ * Renders the number of unarchived sessions that need the user's attention:
+ * unread sessions no longer in progress, sessions waiting for input, and
+ * non-in-progress sessions with failing CI on an open, non-draft pull request.
+ * The badge appears on the application icon in the dock (macOS), the launcher
+ * (Linux) or the taskbar (Windows).
  */
 export class SessionsApplicationBadge extends Disposable implements IWorkbenchContribution {
 
@@ -41,16 +45,19 @@ export class SessionsApplicationBadge extends Disposable implements IWorkbenchCo
 	private readonly _sessions: IObservable<readonly ISession[]>;
 	private readonly _colorTheme: IObservable<IColorTheme>;
 	private readonly _count: IObservable<number>;
+	private readonly _blockedSessions: BlockedSessions;
 
 	constructor(
 		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
 		@INativeHostService private readonly _nativeHostService: INativeHostService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IThemeService private readonly _themeService: IThemeService,
+		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
 
 		this._enabled = observableConfigValue(SESSIONS_APPLICATION_BADGE_SETTING, false, this._configurationService);
+		this._blockedSessions = this._register(instantiationService.createInstance(BlockedSessions));
 
 		this._sessions = observableFromEvent(this, this._sessionsManagementService.onDidChangeSessions, () => this._sessionsManagementService.getSessions());
 
@@ -61,13 +68,15 @@ export class SessionsApplicationBadge extends Disposable implements IWorkbenchCo
 				return 0;
 			}
 
+			const blockedSessionIds = new Set(this._blockedSessions.blockedSessions.read(reader).map(session => session.sessionId));
 			let count = 0;
 			for (const session of this._sessions.read(reader)) {
 				if (session.isArchived.read(reader)) {
 					continue;
 				}
 
-				if (!session.isRead.read(reader) || session.status.read(reader) === SessionStatus.NeedsInput) {
+				if (blockedSessionIds.has(session.sessionId)
+					|| (!session.isRead.read(reader) && session.status.read(reader) !== SessionStatus.InProgress)) {
 					count++;
 				}
 			}
diff --git a/src/vs/sessions/contrib/sessions/test/browser/sessionsActions.test.ts b/src/vs/sessions/contrib/sessions/test/browser/sessionsActions.test.ts
index d503ad93292f7f..f59c8a8c6a440e 100644
--- a/src/vs/sessions/contrib/sessions/test/browser/sessionsActions.test.ts
+++ b/src/vs/sessions/contrib/sessions/test/browser/sessionsActions.test.ts
@@ -108,6 +108,12 @@ suite('Sessions - Actions', () => {
 		assert.strictEqual(pin && (typeof pin.command.title === 'string' ? pin.command.title : pin.command.title.value), 'Pin');
 	});
 
+	test('keeps the Command Palette delete action explicit', () => {
+		const deleteChat = MenuRegistry.getCommand('sessions.chatCompositeBar.deleteChat');
+
+		assert.strictEqual(deleteChat && (typeof deleteChat.title === 'string' ? deleteChat.title : deleteChat.title.value), 'Delete Chat');
+	});
+
 	test('groups session toolbar actions with concise titles', () => {
 		const actions = MenuRegistry.getMenuItems(Menus.SessionBarToolbar)
 			.filter(isIMenuItem)
diff --git a/src/vs/sessions/contrib/sessions/test/browser/sessionsListContextMenu.test.ts b/src/vs/sessions/contrib/sessions/test/browser/sessionsListContextMenu.test.ts
index 874793f0643d67..03e3eaff665372 100644
--- a/src/vs/sessions/contrib/sessions/test/browser/sessionsListContextMenu.test.ts
+++ b/src/vs/sessions/contrib/sessions/test/browser/sessionsListContextMenu.test.ts
@@ -226,13 +226,14 @@ suite('Sessions list context menus', () => {
 		const menuItems = MenuRegistry.getMenuItems(Menus.SessionChatItemContext).filter(isIMenuItem);
 		assert.deepStrictEqual(menuItems.map(item => ({
 			id: item.command.id,
+			title: typeof item.command.title === 'string' ? item.command.title : item.command.title.value,
 			group: item.group,
 			order: item.order,
 			when: item.when?.serialize(),
 		})), [
-			{ id: 'sessions.list.renameChat', group: '1_chat', order: 1, when: 'sessionChatItem.canRename && !sessionChatItem.isUntitled' },
-			{ id: 'sessions.list.openChatToSide', group: '1_chat', order: 2, when: undefined },
-			{ id: 'sessions.list.deleteChat', group: '2_delete', order: 1, when: 'sessionChatItem.canDelete' },
+			{ id: 'sessions.list.renameChat', title: 'Rename...', group: '1_chat', order: 1, when: 'sessionChatItem.canRename && !sessionChatItem.isUntitled' },
+			{ id: 'sessions.list.openChatToSide', title: 'Open to the Side', group: '1_chat', order: 2, when: undefined },
+			{ id: 'sessions.list.deleteChat', title: 'Delete...', group: '2_delete', order: 1, when: 'sessionChatItem.canDelete' },
 		]);
 		const chatContext = { session, chat: peer };
 		for (const actionId of ['sessions.list.renameChat', 'sessions.list.openChatToSide', 'sessions.list.deleteChat']) {
@@ -247,11 +248,13 @@ suite('Sessions list context menus', () => {
 			renamedChats: harness.managementService.renamedChats,
 			openedToSide,
 			deletedChats: harness.managementService.deletedChats,
+			deleteChatOptions: harness.managementService.deleteChatOptions,
 		}, {
 			renameInputs: ['Peer'],
 			renamedChats: [{ session, chatResource: peer.resource, title: 'Renamed Peer' }],
 			openedToSide: [peer],
 			deletedChats: [{ session, chatResource: peer.resource }],
+			deleteChatOptions: [undefined],
 		});
 	});
 });
diff --git a/src/vs/sessions/contrib/sessions/test/browser/sessionsListTestUtils.ts b/src/vs/sessions/contrib/sessions/test/browser/sessionsListTestUtils.ts
index 56bc80bde521ad..b2b216a1156396 100644
--- a/src/vs/sessions/contrib/sessions/test/browser/sessionsListTestUtils.ts
+++ b/src/vs/sessions/contrib/sessions/test/browser/sessionsListTestUtils.ts
@@ -25,6 +25,7 @@ import { ISessionsProvidersService } from '../../../../services/sessions/browser
 import { ISessionsService } from '../../../../services/sessions/browser/sessionsService.js';
 import { IActiveSession, ISessionsManagementService } from '../../../../services/sessions/common/sessionsManagement.js';
 import { IChat, ISession, ISessionCapabilities, ISessionChangesSummary, SessionStatus } from '../../../../services/sessions/common/session.js';
+import { IDeleteChatOptions } from '../../../../services/sessions/common/sessionsProvider.js';
 
 const ITestAgentSessionsService = createDecorator<object>('agentSessions');
 
@@ -45,6 +46,7 @@ export class TestSessionsManagementService extends mock<ISessionsManagementServi
 	readonly archived: ISession[] = [];
 	readonly renamedChats: { readonly session: ISession; readonly chatResource: URI; readonly title: string }[] = [];
 	readonly deletedChats: { readonly session: ISession; readonly chatResource: URI }[] = [];
+	readonly deleteChatOptions: (IDeleteChatOptions | undefined)[] = [];
 	renameError: Error | undefined;
 
 	constructor(sessions: ISession[]) {
@@ -71,8 +73,9 @@ export class TestSessionsManagementService extends mock<ISessionsManagementServi
 		this.archived.push(session);
 	}
 
-	override async deleteChat(session: ISession, chatResource: URI): Promise<void> {
+	override async deleteChat(session: ISession, chatResource: URI, options?: IDeleteChatOptions): Promise<void> {
 		this.deletedChats.push({ session, chatResource });
+		this.deleteChatOptions.push(options);
 	}
 
 	override async renameChat(session: ISession, chatResource: URI, title: string): Promise<void> {
diff --git a/src/vs/sessions/contrib/sessions/test/electron-browser/sessionsApplicationBadge.test.ts b/src/vs/sessions/contrib/sessions/test/electron-browser/sessionsApplicationBadge.test.ts
index d4baff5c58b0e6..a32721d8dc75ca 100644
--- a/src/vs/sessions/contrib/sessions/test/electron-browser/sessionsApplicationBadge.test.ts
+++ b/src/vs/sessions/contrib/sessions/test/electron-browser/sessionsApplicationBadge.test.ts
@@ -13,10 +13,12 @@ import { BufferReader, BufferWriter, deserialize, serialize } from '../../../../
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { IConfigurationChangeEvent } from '../../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { IApplicationBadge, INativeHostService } from '../../../../../platform/native/common/native.js';
 import { TestThemeService } from '../../../../../platform/theme/test/common/testThemeService.js';
 import { ISession, SessionStatus } from '../../../../services/sessions/common/session.js';
 import { ISessionsChangeEvent, ISessionsManagementService } from '../../../../services/sessions/common/sessionsManagement.js';
+import { BlockedSessions } from '../../../blockedSessions/browser/blockedSessions.js';
 import { SESSIONS_APPLICATION_BADGE_SETTING, SessionsApplicationBadge } from '../../electron-browser/sessionsApplicationBadge.js';
 
 class TestSessionsManagementService extends mock<ISessionsManagementService>() {
@@ -48,6 +50,18 @@ class TestNativeHostService extends mock<INativeHostService>() {
 	}
 }
 
+class TestBlockedSessions extends mock<BlockedSessions>() {
+
+	private readonly _blockedSessions = observableValue<readonly ISession[]>('blockedSessions', []);
+	override readonly blockedSessions = this._blockedSessions;
+
+	setSessions(sessions: readonly ISession[]): void {
+		this._blockedSessions.set(sessions, undefined);
+	}
+
+	override dispose(): void { }
+}
+
 function createSession(id: string, state: { status?: SessionStatus; isRead?: boolean; isArchived?: boolean }) {
 	const status = observableValue<SessionStatus>(`status-${id}`, state.status ?? SessionStatus.Completed);
 	const isRead = observableValue(`isRead-${id}`, state.isRead ?? true);
@@ -73,21 +87,26 @@ suite('SessionsApplicationBadge', () => {
 
 		const nativeHost = new TestNativeHostService();
 		const configuration = new TestConfigurationService({ [SESSIONS_APPLICATION_BADGE_SETTING]: enabled });
+		const blockedSessions = new TestBlockedSessions();
+		blockedSessions.setSessions(sessions.filter(session => !session.isArchived.get() && session.status.get() === SessionStatus.NeedsInput));
+		const instantiationService = store.add(new TestInstantiationService());
+		instantiationService.stubInstance(BlockedSessions, blockedSessions);
 
-		store.add(new SessionsApplicationBadge(management, nativeHost, configuration, new TestThemeService()));
+		store.add(new SessionsApplicationBadge(management, nativeHost, configuration, new TestThemeService(), instantiationService));
 
-		return { management, nativeHost, configuration };
+		return { management, nativeHost, configuration, blockedSessions };
 	}
 
 	function badgeCounts(nativeHost: TestNativeHostService): (number | undefined)[] {
 		return nativeHost.badges.map(badge => badge?.count);
 	}
 
-	test('counts unread and needs-input sessions, ignoring archived and idle ones', () => {
+	test('counts unread and needs-input sessions, ignoring archived, in-progress unread, and idle ones', () => {
 		const { nativeHost } = createBadge([
 			createSession('unread', { isRead: false }).session,
 			createSession('needs-input', { status: SessionStatus.NeedsInput }).session,
 			createSession('unread-and-needs-input', { isRead: false, status: SessionStatus.NeedsInput }).session,
+			createSession('in-progress-unread', { isRead: false, status: SessionStatus.InProgress }).session,
 			createSession('archived-unread', { isRead: false, isArchived: true }).session,
 			createSession('archived-needs-input', { status: SessionStatus.NeedsInput, isArchived: true }).session,
 			createSession('idle', {}).session,
@@ -103,6 +122,17 @@ suite('SessionsApplicationBadge', () => {
 		]);
 	});
 
+	test('counts a read session with failing CI', () => {
+		const failingCI = createSession('failing-ci', {});
+		const { nativeHost, blockedSessions } = createBadge([failingCI.session]);
+
+		blockedSessions.setSessions([failingCI.session]);
+
+		assert.deepStrictEqual(nativeHost.badges.map(badge => ({ count: badge?.count, description: badge?.description })), [
+			{ count: 1, description: '1 session needs your attention' }
+		]);
+	});
+
 	test('is off until enabled', () => {
 		const { nativeHost, configuration } = createBadge([createSession('unread', { isRead: false }).session], false);
 
@@ -120,13 +150,14 @@ suite('SessionsApplicationBadge', () => {
 
 	test('follows session state and session list changes', () => {
 		const unread = createSession('unread', { isRead: false });
-		const { nativeHost, management } = createBadge([unread.session]);
+		const { nativeHost, management, blockedSessions } = createBadge([unread.session]);
 
 		unread.isRead.set(true, undefined);
 
 		const added = createSession('added', { status: SessionStatus.NeedsInput });
 		management.sessions.push(added.session);
 		management.change();
+		blockedSessions.setSessions([added.session]);
 
 		added.isArchived.set(true, undefined);
 
diff --git a/src/vs/sessions/services/sessions/browser/sessionsManagementService.ts b/src/vs/sessions/services/sessions/browser/sessionsManagementService.ts
index a65222021f0a5d..1c0de89b12b0bb 100644
--- a/src/vs/sessions/services/sessions/browser/sessionsManagementService.ts
+++ b/src/vs/sessions/services/sessions/browser/sessionsManagementService.ts
@@ -725,7 +725,7 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		const requestActivity = new MutableDisposable<IDisposable>();
 		try {
 			requestActivity.value = provider.startNewSessionRequest?.(session.sessionId);
-			({ provider, session } = await this._prepareNewSessionForSend(provider, session, requestActivity, true));
+			({ provider, session } = await this._prepareNewSessionForSend(provider, session, requestActivity, true, options.query));
 
 			// The session is graduating into the list (being sent),
 			// so the provider keeps owning it — just drop the pointer, do not delete.
@@ -768,6 +768,7 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		session: ISession,
 		requestActivity: MutableDisposable<IDisposable> | undefined,
 		replaceCurrentDraft: boolean,
+		query: string,
 	): Promise<{ provider: ISessionsProvider; session: ISession }> {
 		if (!provider.prepareNewSession) {
 			return { provider, session };
@@ -788,7 +789,7 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		}));
 		let prepared: IPreparedNewSession;
 		try {
-			prepared = await provider.prepareNewSession(session.sessionId, preparationTokenSource.token);
+			prepared = await provider.prepareNewSession(session.sessionId, preparationTokenSource.token, query);
 		} finally {
 			preparationListeners.dispose();
 			preparationTokenSource.dispose();
@@ -1027,7 +1028,7 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		let graduatingProvider = provider;
 		let graduatingSession = session;
 		try {
-			({ provider: graduatingProvider, session: graduatingSession } = await this._prepareNewSessionForSend(provider, session, undefined, false));
+			({ provider: graduatingProvider, session: graduatingSession } = await this._prepareNewSessionForSend(provider, session, undefined, false, options.query));
 			await this._sendNewChatRequestInBackground(graduatingProvider, graduatingSession, options);
 		} catch (error) {
 			graduatingProvider.deleteNewSession(graduatingSession.sessionId);
diff --git a/src/vs/sessions/services/sessions/browser/sessionsPartService.ts b/src/vs/sessions/services/sessions/browser/sessionsPartService.ts
index 56b59cf2501d5d..af7dd7d2a31515 100644
--- a/src/vs/sessions/services/sessions/browser/sessionsPartService.ts
+++ b/src/vs/sessions/services/sessions/browser/sessionsPartService.ts
@@ -31,6 +31,11 @@ export interface ISessionsPartService {
 	 */
 	updateVisibleSessions(visible: readonly (IActiveSession | undefined)[], active: IActiveSession | undefined): void;
 
+	/**
+	 * Controls whether mounted session views may render independently of the part's grid visibility.
+	 */
+	setContentVisible(visible: boolean): void;
+
 	/**
 	 * Fires with the session id of a grid slot that received keyboard focus. The
 	 * view service listens to promote that session to the active session. Only
diff --git a/src/vs/sessions/services/sessions/common/sessionsProvider.ts b/src/vs/sessions/services/sessions/common/sessionsProvider.ts
index 1c5344753af5a0..401ec2844879d2 100644
--- a/src/vs/sessions/services/sessions/common/sessionsProvider.ts
+++ b/src/vs/sessions/services/sessions/common/sessionsProvider.ts
@@ -273,9 +273,11 @@ export interface ISessionsProvider {
 	/**
 	 * Asynchronously replace a draft before its first chat is created.
 	 * Providers use this to materialize execution environments that can change
-	 * the provider or workspace backing the session.
+	 * the provider or workspace backing the session. The first query is supplied
+	 * so preparation that depends on it, such as worktree branch naming, does not
+	 * need to delay until the replacement provider sends the request.
 	 */
-	prepareNewSession?(sessionId: string, token: CancellationToken): Promise<IPreparedNewSession>;
+	prepareNewSession?(sessionId: string, token: CancellationToken, query: string): Promise<IPreparedNewSession>;
 
 	/**
 	 * Mark a new session as preparing its first request before asynchronous
diff --git a/src/vs/sessions/services/sessions/test/browser/sessionsManagementService.test.ts b/src/vs/sessions/services/sessions/test/browser/sessionsManagementService.test.ts
index 11d91acc220407..629d72cae84c73 100644
--- a/src/vs/sessions/services/sessions/test/browser/sessionsManagementService.test.ts
+++ b/src/vs/sessions/services/sessions/test/browser/sessionsManagementService.test.ts
@@ -1102,6 +1102,7 @@ suite('SessionsManagementService', () => {
 			workspace: constObservable(workspace),
 		});
 		const preparation = new DeferredPromise<void>();
+		let preparedQuery: string | undefined;
 		const deleted: string[] = [];
 		const originalProvider = new class extends TestSessionsProvider {
 			override readonly id = 'local';
@@ -1112,7 +1113,8 @@ suite('SessionsManagementService', () => {
 				originalRequestInProgress.set(true, undefined);
 				return toDisposable(() => originalRequestInProgress.set(false, undefined));
 			}
-			override async prepareNewSession() {
+			override async prepareNewSession(_sessionId: string, _token: CancellationToken, query: string) {
+				preparedQuery = query;
 				await preparation.p;
 				return { session: replacement };
 			}
@@ -1160,6 +1162,7 @@ suite('SessionsManagementService', () => {
 
 		assert.deepStrictEqual({
 			deleted,
+			preparedQuery,
 			replacements,
 			sent,
 			visibleSessions: view.visibleSessions.get().map(session => session?.sessionId ?? null),
@@ -1168,6 +1171,7 @@ suite('SessionsManagementService', () => {
 			replacementRequestInProgress: replacement.isNewSessionRequestInProgress?.get(),
 		}, {
 			deleted: ['local-draft'],
+			preparedQuery: 'hi',
 			replacements: ['local-draft->dev-draft'],
 			sent: ['createNewChat', 'sendRequest:dev-draft'],
 			visibleSessions: ['dev-draft'],
diff --git a/src/vs/sessions/sessions.desktop.main.ts b/src/vs/sessions/sessions.desktop.main.ts
index 50d12f94cf4f08..15b89578396616 100644
--- a/src/vs/sessions/sessions.desktop.main.ts
+++ b/src/vs/sessions/sessions.desktop.main.ts
@@ -69,6 +69,7 @@ import '../workbench/services/localization/electron-browser/localeService.js';
 import '../workbench/services/extensions/electron-browser/extensionsScannerService.js';
 import '../workbench/services/extensionManagement/electron-browser/extensionManagementServerService.js';
 import '../workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.js';
+import '../workbench/services/extensionManagement/electron-browser/extensionGalleryAccountService.js';
 import '../workbench/services/extensionManagement/electron-browser/extensionTipsService.js';
 import '../workbench/services/userDataSync/electron-browser/userDataSyncService.js';
 import '../workbench/services/userDataSync/electron-browser/userDataAutoSyncService.js';
diff --git a/src/vs/sessions/test/browser/chatGroupsView.test.ts b/src/vs/sessions/test/browser/chatGroupsView.test.ts
index 057b439f1ee56b..04d4661d597d15 100644
--- a/src/vs/sessions/test/browser/chatGroupsView.test.ts
+++ b/src/vs/sessions/test/browser/chatGroupsView.test.ts
@@ -208,6 +208,30 @@ suite('Sessions - ChatGroupsView', () => {
 		});
 	});
 
+	test('does not lay out chat views while the session is hidden', () => {
+		const { view, chatViewFactory } = createHarness(disposables);
+		view.setSession(new TestActiveSession([createChat('main')]), options);
+		const chatView = chatViewFactory.views.find(candidate => candidate.kind === 'chat')!;
+
+		view.layout(800, 600, 0, 0);
+		const initialLayoutCount = chatView.layoutCount;
+		view.setSessionVisible(false);
+		view.layout(640, 480, 0, 0);
+		const hiddenLayoutCount = chatView.layoutCount;
+		view.setSessionVisible(true);
+		view.layout(640, 480, 0, 0);
+
+		assert.deepStrictEqual({
+			initialLayoutCount,
+			hiddenLayoutCount,
+			shownLayoutCount: chatView.layoutCount,
+		}, {
+			initialLayoutCount: 1,
+			hiddenLayoutCount: 1,
+			shownLayoutCount: 2,
+		});
+	});
+
 	test('focusing another group updates the session active chat', () => {
 		const { sessionsService, view } = createHarness(disposables);
 		const main = createChat('main');
diff --git a/src/vs/sessions/test/browser/sessionsPart.test.ts b/src/vs/sessions/test/browser/sessionsPart.test.ts
index af1e677db6a65c..940f946741a674 100644
--- a/src/vs/sessions/test/browser/sessionsPart.test.ts
+++ b/src/vs/sessions/test/browser/sessionsPart.test.ts
@@ -37,8 +37,11 @@ interface ISessionsPartTestHarness {
 class TestSessionView implements IDisposable {
 	readonly element = document.createElement('div');
 	readonly minimumWidth = 200;
+	readonly partVisibility: boolean[] = [];
 
-	setPartVisible(_visible: boolean): void { }
+	setPartVisible(visible: boolean): void {
+		this.partVisibility.push(visible);
+	}
 	dispose(): void { }
 }
 
@@ -97,4 +100,28 @@ suite('Sessions - Sessions Part', () => {
 	test('pointer activation expands only a minimum-width session', () => {
 		assertActivation(() => new MouseEvent(EventType.MOUSE_DOWN, { bubbles: true, button: 0 }));
 	});
+
+	test('combines content and grid visibility for mounted session views', () => {
+		const view = new TestSessionView();
+		const partVisibilityEvents: boolean[] = [];
+		const part: SessionsPart = Object.assign(Object.create(SessionsPart.prototype), {
+			_isPartVisible: true,
+			_contentVisible: true,
+			_slots: [{ view }],
+			_onDidVisibilityChange: { fire: (visible: boolean) => partVisibilityEvents.push(visible) },
+		});
+
+		part.setVisible(false);
+		part.setContentVisible(false);
+		part.setContentVisible(true);
+		part.setVisible(true);
+
+		assert.deepStrictEqual({
+			sessionView: view.partVisibility,
+			part: partVisibilityEvents,
+		}, {
+			sessionView: [false, false, false, true],
+			part: [false, true],
+		});
+	});
 });
diff --git a/src/vs/sessions/test/browser/workbench.test.ts b/src/vs/sessions/test/browser/workbench.test.ts
index a12183173a9798..ea049d2a10ca0b 100644
--- a/src/vs/sessions/test/browser/workbench.test.ts
+++ b/src/vs/sessions/test/browser/workbench.test.ts
@@ -104,6 +104,7 @@ suite('Sessions - Workbench', () => {
 		readonly gridVisibility: Map<object, boolean>;
 		readonly mobileNavLayers: string[];
 		readonly focusedSessions: number;
+		readonly customViewTransitionSteps: string[];
 		readonly sidePaneToggleEvents: ('will' | { readonly did: ISidePaneToggleEvent })[];
 		layoutPolicy: { viewportClass: { get(): string } };
 		sessionsPartView: object;
@@ -212,7 +213,9 @@ suite('Sessions - Workbench', () => {
 		const renderedCustomViews: (object | undefined)[] = [];
 		const gridVisibility = new Map<object, boolean>();
 		const mobileNavLayers: string[] = [];
+		const customViewTransitionSteps: string[] = [];
 		let focusedSessions = 0;
+		let sessionsContentVisible = true;
 		const sidePaneToggleEvents: ('will' | { did: ISidePaneToggleEvent })[] = [];
 		const notifyPartVisibility = (view: object, visible: boolean) => notifyPartVisibilityOn(host as unknown as ITestWorkbench, view, visible);
 		let editorNodeVisible = (options.partVisibility?.editor ?? false) || (options.partVisibility?.auxiliaryBar ?? true);
@@ -244,6 +247,11 @@ suite('Sessions - Workbench', () => {
 				hasMaximizedView: () => false,
 				exitMaximizedView: () => { },
 				setViewVisible: (view: object, visible: boolean, sizing?: { type: string }) => {
+					if (view === customViewGridPartView) {
+						customViewTransitionSteps.push(`grid:customView:${visible}`);
+					} else if (view === sessionsPartView) {
+						customViewTransitionSteps.push(`grid:sessions:${visible}`);
+					}
 					if (view === editorPartView) {
 						editorNodeVisible = visible;
 						if (visible && partVisibility.editor && options.panelHeightOnEditorShow !== undefined) {
@@ -323,7 +331,15 @@ suite('Sessions - Workbench', () => {
 			},
 			customViewGridPartService: { setView: (descriptor: object | undefined) => { renderedCustomViews.push(descriptor); }, focusActiveView: () => { } },
 			_customViewVisibleKey: { set: () => { } },
-			sessionsPartService: { focusSession: () => { focusedSessions++; } },
+			sessionsPartService: {
+				focusSession: () => { focusedSessions++; },
+				setContentVisible: (visible: boolean) => {
+					if (sessionsContentVisible !== visible) {
+						sessionsContentVisible = visible;
+						customViewTransitionSteps.push(`content:${visible}`);
+					}
+				},
+			},
 			sessionsService: { activeSession: { get: () => undefined } },
 			// captures
 			resizes,
@@ -337,6 +353,7 @@ suite('Sessions - Workbench', () => {
 			renderedCustomViews,
 			gridVisibility,
 			mobileNavLayers,
+			customViewTransitionSteps,
 			sidePaneToggleEvents,
 			get focusedSessions() { return focusedSessions; },
 		};
@@ -2704,6 +2721,39 @@ suite('Sessions - Workbench', () => {
 		});
 	});
 
+	test('suspends session content throughout the custom view grid swap', () => {
+		const host = createHost();
+
+		applyCustomViewGridVisibility.call(host, {});
+		applyCustomViewGridVisibility.call(host, undefined);
+
+		assert.deepStrictEqual(host.customViewTransitionSteps, [
+			'content:false',
+			'grid:customView:true',
+			'grid:sessions:false',
+			'grid:sessions:true',
+			'grid:customView:false',
+			'content:true',
+		]);
+	});
+
+	test('keeps session content suspended when a custom view opens before grid creation', () => {
+		const host = createHost();
+		Object.assign(host, { workbenchGrid: undefined });
+
+		applyCustomViewGridVisibility.call(host, {});
+		const whileShown = [...host.customViewTransitionSteps];
+		applyCustomViewGridVisibility.call(host, undefined);
+
+		assert.deepStrictEqual({
+			whileShown,
+			afterHide: host.customViewTransitionSteps,
+		}, {
+			whileShown: ['content:false'],
+			afterHide: ['content:false', 'content:true'],
+		});
+	});
+
 	test('hiding the custom view restores the desired part visibility, including changes made while it was shown', () => {
 		const host = createHost({ partVisibility: { editor: true, auxiliaryBar: true, panel: false, sessions: true } });
 
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts
index 40fe4c9191d19c..c3c41e3e3a459e 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts
@@ -435,6 +435,10 @@ export class DraftSyncState {
 		return this._synced;
 	}
 
+	/**
+	 * The chosen model the channel holds, which a local fallback must not overwrite. Recorded on
+	 * publish as well as on receive: a window never sees its own draft echo back through the channel.
+	 */
 	get remoteModel(): ModelSelection | undefined {
 		return this._remoteModel;
 	}
@@ -444,11 +448,15 @@ export class DraftSyncState {
 		this._remoteModel = remoteDraft?.model;
 	}
 
-	shouldPublish(outgoing: Message | undefined): boolean {
+	shouldPublish(outgoing: Message | undefined, chosen = false): boolean {
 		if (equals(this._synced, outgoing)) {
 			return false;
 		}
 		this._synced = outgoing;
+		// Only a chosen model is worth protecting; recording a stand-in would pin the channel to it.
+		if (chosen) {
+			this._remoteModel = outgoing?.model;
+		}
 		return true;
 	}
 }
@@ -5535,11 +5543,12 @@ export class AgentHostSessionHandler extends Disposable implements IChatSessionC
 				return;
 			}
 			let draft = this._inputStateToDraft(sessionResource, state);
+			const chosen = isInConversationModelChoice(state?.selectedModelReason);
 			// Don't overwrite the channel's model with one we only fell back to.
-			if (draft && draftState.remoteModel && !isInConversationModelChoice(state?.selectedModelReason)) {
+			if (draft && draftState.remoteModel && !chosen) {
 				draft = { ...draft, model: draftState.remoteModel };
 			}
-			if (!draftState.shouldPublish(draft)) {
+			if (!draftState.shouldPublish(draft, chosen)) {
 				return;
 			}
 
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
index 9d717db63518ea..bd21df93309e24 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
@@ -372,7 +372,7 @@
 	.agent-session-section {
 		display: flex;
 		align-items: center;
-		font-size: 11px;
+		font-size: var(--vscode-fontSize-label1);
 		font-weight: var(--vscode-fontWeight-semiBold);
 		color: var(--vscode-descriptionForeground);
 		text-transform: uppercase;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
index 8d1e2b5cc84a6b..a70f773c3b8ef6 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
@@ -63,15 +63,6 @@
 			-webkit-user-select: text;
 
 			.rendered-markdown {
-				a {
-					color: var(--vscode-textLink-foreground);
-				}
-
-				a:hover,
-				a:active {
-					color: var(--vscode-textLink-activeForeground);
-				}
-
 				p {
 					margin: 0;
 				}
@@ -95,6 +86,15 @@
 	}
 }
 
+.interactive-session .chat-question-carousel-container .rendered-markdown a {
+	color: var(--vscode-textLink-foreground);
+}
+
+.interactive-session .chat-question-carousel-container .rendered-markdown a:hover,
+.interactive-session .chat-question-carousel-container .rendered-markdown a:active {
+	color: var(--vscode-textLink-activeForeground);
+}
+
 .interactive-session .chat-question-carousel-container.chat-question-carousel-collapsed {
 	.chat-question-carousel-content {
 		.chat-question-description,
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelSelectionController.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelSelectionController.ts
index 64bbce2ed203b1..82f7a89c1fbf8d 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelSelectionController.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelSelectionController.ts
@@ -24,6 +24,7 @@ import { ILanguageModelChatMetadataAndIdentifier } from '../../../common/languag
 import { IIntendedModelHolder } from '../../../common/model/chatModel.js';
 import { IIntendedModelSelection, InitialModelSelectionResult, isInConversationModelChoice, isRestoredModelReason, ModelSelectionReason, resolveConfiguredModel, resolveInitialModelSelection, resolveModelIdentifier, RestoredModelReason } from '../../../common/modelSelection.js';
 import { findBestMatchingModel, IsModelSupportedHere, resolveModelFromSyncState, shouldResetModelToDefault, shouldResetOnModelListChange } from './chatInputModelUtils.js';
+import { isByokModel } from '../../../common/chatSelectedModel.js';
 import { IChatModelSelectionDiagnostics, NullChatModelSelectionDiagnostics } from './chatModelSelectionDiagnostics.js';
 
 /** What a surface supplies: its catalog, its idea of usable, and what to do with a decision. */
@@ -449,9 +450,14 @@ export class ChatInputModelSelectionController extends Disposable {
 		return this._runtime.getIntentHolder().intendedModel;
 	}
 
-	/** The model to fall back to: the surface's declared default, else the first on offer. */
+	/**
+	 * The model to fall back to: the declared default, else the first non-BYOK model, else the first
+	 * on offer — but never a billable stand-in for a model the conversation is still awaiting.
+	 */
 	private _defaultModel(models: readonly ILanguageModelChatMetadataAndIdentifier[]): ILanguageModelChatMetadataAndIdentifier | undefined {
-		return this._runtime.getDeclaredDefaultModel(models) ?? models[0];
+		return this._runtime.getDeclaredDefaultModel(models)
+			?? models.find(model => !isByokModel(model.metadata))
+			?? (this.isAwaitingRememberedModel() ? undefined : models[0]);
 	}
 
 	/** The models selectable for the bound session right now. */
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelUtils.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelUtils.ts
index 518c63bc5780a1..7e92c9de4be63d 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelUtils.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputModelUtils.ts
@@ -6,7 +6,8 @@
 import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
 import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, isLanguageModelVendorAbsenceConclusive } from '../../../common/languageModels.js';
 import { URI } from '../../../../../../base/common/uri.js';
-import { localChatSessionType } from '../../../common/chatSessionsService.js';
+import { isAgentHostTarget, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { isByokModel } from '../../../common/chatSelectedModel.js';
 import { getChatSessionType, isUntitledChatSession } from '../../../common/model/chatUri.js';
 
 /**
@@ -15,6 +16,11 @@ import { getChatSessionType, isUntitledChatSession } from '../../../common/model
  */
 export type IsModelSupportedHere = (model: ILanguageModelChatMetadataAndIdentifier) => boolean;
 
+/** Whether the vendor published this itself, rather than it being an agent-host copy of a BYOK model. */
+function isOwnModel(model: ILanguageModelChatMetadataAndIdentifier): boolean {
+	return model.metadata.byokModelIdentifier === undefined;
+}
+
 /**
  * Filter models based on session type.
  * When a session has a specific type (and it's not 'local'), only models targeting that
@@ -185,11 +191,29 @@ export function shouldRestorePerTypeModelOnSessionSwitch(isEmpty: boolean, sessi
 	return isEmpty && sessionOwnsPool && !hadIncomingModel;
 }
 
+/**
+ * Whether two models bill the same way. A BYOK model and a first-party one can share id, family and
+ * name, so matching across them changes which account is billed; two copies of one key do match.
+ */
+function isSameBillingIdentity(
+	a: ILanguageModelChatMetadataAndIdentifier,
+	b: ILanguageModelChatMetadataAndIdentifier,
+): boolean {
+	if (isByokModel(a.metadata) !== isByokModel(b.metadata)) {
+		return false;
+	}
+	if (!isByokModel(a.metadata)) {
+		return true;
+	}
+	return (a.metadata.byokModelIdentifier ?? a.identifier) === (b.metadata.byokModelIdentifier ?? b.identifier);
+}
+
 /**
  * Find a model in `pool` that matches `previous` by id, then family, then
  * name (case-insensitive). Used to carry a selection across model pools
  * (e.g. `copilot/claude-sonnet-4.6` → `agent-host-copilotcli:claude-sonnet-4.6`).
  * Returns `undefined` when no candidate matches.
+ * Candidates that would change which account is billed are never matches.
  */
 export function findBestMatchingModel(
 	previous: ILanguageModelChatMetadataAndIdentifier | undefined,
@@ -198,12 +222,16 @@ export function findBestMatchingModel(
 	if (!previous || pool.length === 0) {
 		return undefined;
 	}
+	const candidates = pool.filter(m => isSameBillingIdentity(previous, m));
+	if (candidates.length === 0) {
+		return undefined;
+	}
 	const id = previous.metadata.id?.trim().toLowerCase();
 	const family = previous.metadata.family?.trim().toLowerCase();
 	const name = previous.metadata.name?.trim().toLowerCase();
-	return (id ? pool.find(m => m.metadata.id?.trim().toLowerCase() === id) : undefined)
-		?? (family ? pool.find(m => m.metadata.family?.trim().toLowerCase() === family) : undefined)
-		?? (name ? pool.find(m => m.metadata.name?.trim().toLowerCase() === name) : undefined);
+	return (id ? candidates.find(m => m.metadata.id?.trim().toLowerCase() === id) : undefined)
+		?? (family ? candidates.find(m => m.metadata.family?.trim().toLowerCase() === family) : undefined)
+		?? (name ? candidates.find(m => m.metadata.name?.trim().toLowerCase() === name) : undefined);
 }
 
 /**
@@ -291,6 +319,8 @@ export function resolveModelFromSyncState(
  * - Copilot is the exception: its models are gated on an async token that can resolve slower than fast/local BYOK
  *   providers, so an early empty resolution is transient. Keeping its cache avoids resetting (and persisting) a
  *   restored Copilot selection to a BYOK default, which also preserves the selection across sign-out/in (see #321037).
+ * - An agent-host vendor is judged on models of its OWN: it also publishes bridged copies of the workbench's
+ *   BYOK models, and counting those as live evicts the cache mid-publication and persists the gap.
  * - When nothing is contributed yet and there are no live models (startup / reload), the full cache is returned to
  *   avoid flickering the picker to empty.
  */
@@ -304,11 +334,17 @@ export function mergeModelsWithCache(
 		return cachedModels;
 	}
 	const liveVendors = new Set(liveModels.map(m => m.metadata.vendor));
+	const ownLiveVendors = new Set(liveModels.filter(m => isOwnModel(m)).map(m => m.metadata.vendor));
 	const usableCached = cachedModels.filter(m => {
 		const vendor = m.metadata.vendor;
-		if (!contributedVendors.has(vendor) || liveVendors.has(vendor)) {
+		if (!contributedVendors.has(vendor) || ownLiveVendors.has(vendor)) {
 			return false;
 		}
+		// Only bridged copies so far, so the vendor has not finished publishing. Its own models are
+		// kept; the bridged ones are already live, so a removed key must not come back from cache.
+		if (liveVendors.has(vendor) && isAgentHostTarget(vendor)) {
+			return isOwnModel(m);
+		}
 		if (isLanguageModelVendorAbsenceConclusive(vendor, liveVendors.has(vendor), resolvedVendors?.has(vendor) ?? false)) {
 			return false;
 		}
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/draftSyncState.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/draftSyncState.test.ts
index ea7a0df3534126..242b3b0d0e8494 100644
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessions/draftSyncState.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/draftSyncState.test.ts
@@ -20,10 +20,11 @@ function draft(text: string, modelId?: string): Message {
 /** Mirrors how `_installDraftSync` builds and sends a draft. */
 function publish(state: DraftSyncState, outgoing: Message, reason: ModelSelectionReason): { published: boolean; model: string | undefined } {
 	let next: Message = outgoing;
-	if (state.remoteModel && !isInConversationModelChoice(reason)) {
+	const chosen = isInConversationModelChoice(reason);
+	if (state.remoteModel && !chosen) {
 		next = { ...next, model: state.remoteModel as ModelSelection };
 	}
-	return { published: state.shouldPublish(next), model: next.model?.id };
+	return { published: state.shouldPublish(next, chosen), model: next.model?.id };
 }
 
 const CHOSE = ModelSelectionReason.UserSelection;
@@ -71,4 +72,29 @@ suite('DraftSyncState', () => {
 			echo: { published: false, model: 'gpt-5.6-sol' },
 		});
 	});
+
+	test('a window that publishes its own draft still guards the model it put there', () => {
+		// A window never sees its own draft echo back, so inbound-only tracking left this guard dead
+		// here: the fallback overwrote the user's model and peers adopted it.
+		const state = new DraftSyncState(undefined);
+
+		const actual = {
+			// A stand-in published first must not pin the channel, or no later model could replace it.
+			standIn: publish(state, draft('', 'auto'), FELL_BACK),
+			pinnedByStandIn: state.remoteModel?.id,
+			// The user picks a model and types; this window establishes the channel's model.
+			userPicks: publish(state, draft('working on it', 'gpt-5.6-terra'), CHOSE),
+			// A catalog wave drops that model and the picker falls back.
+			afterFallback: publish(state, draft('working on it', 'byok-opus-5'), FELL_BACK),
+			channelModel: state.remoteModel?.id,
+		};
+
+		assert.deepStrictEqual(actual, {
+			standIn: { published: true, model: 'auto' },
+			pinnedByStandIn: undefined,
+			userPicks: { published: true, model: 'gpt-5.6-terra' },
+			afterFallback: { published: false, model: 'gpt-5.6-terra' },
+			channelModel: 'gpt-5.6-terra',
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelSelectionController.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelSelectionController.test.ts
index 4ce523b056bc07..68bc6d4ca8b8d4 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelSelectionController.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelSelectionController.test.ts
@@ -42,6 +42,12 @@ function targetedModel(identifier: string, sessionType: string): ILanguageModelC
  * conversation reproduces the production guarantee — one record per conversation, reachable only
  * while that conversation is bound — rather than assuming it.
  */
+/** An agent-host model; `byokModelIdentifier` marks it as a copy bridged in from a BYOK provider. */
+function hostModel(identifier: string, byokModelIdentifier?: string): ILanguageModelChatMetadataAndIdentifier {
+	const base = targetedModel(identifier, 'agent-host-copilotcli');
+	return { ...base, metadata: { ...base.metadata, vendor: 'agent-host-copilotcli', byokModelIdentifier } };
+}
+
 function createIntentStore(
 	boundKey: () => string | undefined,
 	intents = new Map<string | undefined, IIntendedModelSelection | undefined>(),
@@ -68,6 +74,8 @@ interface IRuntimeState {
 	 * only while that conversation is bound — is reproduced rather than assumed.
 	 */
 	readonly intents?: Map<string | undefined, IIntendedModelSelection | undefined>;
+	/** Set to report the session type as still loading until a model targets it. */
+	readonly awaitsSessionModels?: boolean;
 }
 
 function createRuntime(
@@ -82,6 +90,7 @@ function createRuntime(
 		getModels: () => state.models,
 		getAllModels: () => state.models,
 		getConfiguredModelValue: () => state.configuredModel,
+		...(state.awaitsSessionModels ? { isAwaitingSessionModels: (type: string) => !hasModelsTargetingSession(state.models, type) } : {}),
 		isModelSupportedHere: model => isModelSupportedForMode(model, ChatModeKind.Ask) && isModelSupportedForInlineChat(model, ChatAgentLocation.Chat),
 		getDeclaredDefaultModel: models => models.find(model => model.metadata.isDefaultForLocation[ChatAgentLocation.Chat]),
 		subscribeToModelChanges: listener => modelChanges.event(listener),
@@ -1249,6 +1258,57 @@ suite('ChatInputModelSelectionController', () => {
 		});
 	});
 
+	test('a BYOK-only wave leaves the awaited model alone and yields to the first non-BYOK model', () => {
+		// A wave carrying only bridged BYOK copies used to reset the picker and take one as "first
+		// available", moving the conversation onto the user's own API key.
+		const sessionType = 'agent-host-copilotcli';
+		const chosen = hostModel('agent-host-copilotcli:gpt-5.6-terra');
+		const anthropic = hostModel('agent-host-copilotcli:anthropic/Anthropic/claude-opus-5', 'anthropic/Anthropic/claude-opus-5');
+		const openrouter = hostModel('agent-host-copilotcli:openrouter/OpenRouter/ai21/jamba', 'openrouter/OpenRouter/ai21/jamba');
+		const free = hostModel('agent-host-copilotcli:gpt-5.6-sol');
+		const modelChanges = disposables.add(new Emitter<string>());
+		const state: IRuntimeState = { models: [anthropic, openrouter, chosen], sessionType, isEmpty: false, awaitsSessionModels: true };
+		const applied: string[] = [];
+		const controller = disposables.add(new ChatInputModelSelectionController(createRuntime(state, modelChanges, applied)));
+
+		controller.syncFromConversationState(chosen, undefined, sessionType, 'chat:one', false, ModelSelectionReason.RestoredChoice);
+		// Only the two BYOK providers are on offer: neither is picked, and neither is ranked above the other.
+		state.models = [anthropic, openrouter];
+		modelChanges.fire('byok-only-wave');
+		const duringByokOnly = controller.currentModel.get()?.identifier;
+		// A non-BYOK model publishes, but still not the awaited one.
+		state.models = [anthropic, openrouter, free];
+		modelChanges.fire('free-model-wave');
+
+		assert.deepStrictEqual({ duringByokOnly, afterNonByok: controller.currentModel.get()?.identifier, applied }, {
+			duringByokOnly: chosen.identifier,
+			afterNonByok: free.identifier,
+			applied: [chosen.identifier, free.identifier],
+		});
+	});
+
+	test('a conversation with no model to keep is still seeded by the pool that arrives', () => {
+		// The guard must not become a permanent no-op: with nothing awaited, a BYOK-only pool still
+		// seeds the conversation — for a signed-out user it is the only way to run at all.
+		const sessionType = 'agent-host-copilotcli';
+		const bridged = hostModel('agent-host-copilotcli:anthropic/Anthropic/claude-opus-5', 'anthropic/Anthropic/claude-opus-5');
+		const modelChanges = disposables.add(new Emitter<string>());
+		const state: IRuntimeState = { models: [], sessionType, awaitsSessionModels: true };
+		const applied: string[] = [];
+		const controller = disposables.add(new ChatInputModelSelectionController(createRuntime(state, modelChanges, applied)));
+
+		controller.initialize(undefined);
+		const beforePublish = controller.currentModel.get()?.identifier;
+		state.models = [bridged];
+		modelChanges.fire('byok-only');
+
+		assert.deepStrictEqual({ beforePublish, current: controller.currentModel.get()?.identifier, applied }, {
+			beforePublish: undefined,
+			current: bridged.identifier,
+			applied: [bridged.identifier],
+		});
+	});
+
 	test('waits for a cold conversation model rather than settling for a stand-in', () => {
 		const sessionType = 'agent-host-test';
 		const fallback = targetedModel('test/fallback', sessionType);
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelUtils.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelUtils.test.ts
index 43703e687a3602..fd147df061e3c6 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelUtils.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatInputModelUtils.test.ts
@@ -459,6 +459,35 @@ suite('ChatInputModelUtils', () => {
 			const target = createSessionModel('claude-sonnet-4.6', 'claude sonnet 4.6', 'agent-host-copilotcli', { family: 'claude-sonnet-4.6' });
 			assert.strictEqual(findBestMatchingModel(prev, [target])?.identifier, target.identifier);
 		});
+
+		test('never carries a selection across the BYOK billing boundary', () => {
+			// A bridged BYOK copy shares id, family and display name with the first-party model, so
+			// treating it as the same selection would silently change which account is billed.
+			const prev = createSessionModel('claude-opus-5', 'Claude Opus 5', 'agent-host-copilotcli', { family: 'claude-opus-5' });
+			const byokNamesake = createSessionModel('anthropic/Anthropic/claude-opus-5', 'Claude Opus 5', 'agent-host-copilotcli', {
+				family: 'claude-opus-5',
+				byokModelIdentifier: 'anthropic/Anthropic/claude-opus-5',
+			});
+			assert.strictEqual(findBestMatchingModel(prev, [byokNamesake]), undefined);
+			assert.strictEqual(findBestMatchingModel(byokNamesake, [prev]), undefined);
+		});
+
+		test('still carries a BYOK selection onto the agent host copy of the same key', () => {
+			// The renderer original sets `isBYOK`; the agent-host copy carries its identifier as
+			// `byokModelIdentifier`. Same key, so this is the carry-over the function exists for.
+			const original = { ...createModel('claude-opus-5', 'Claude Opus 5', { vendor: 'anthropic', family: 'claude-opus-5', isBYOK: true }), identifier: 'anthropic/Anthropic/claude-opus-5' };
+			const bridged = createSessionModel('anthropic/Anthropic/claude-opus-5', 'Claude Opus 5', 'agent-host-copilotcli', {
+				family: 'claude-opus-5',
+				byokModelIdentifier: 'anthropic/Anthropic/claude-opus-5',
+			});
+			assert.deepStrictEqual({
+				forward: findBestMatchingModel(original, [bridged])?.identifier,
+				back: findBestMatchingModel(bridged, [original])?.identifier,
+			}, {
+				forward: bridged.identifier,
+				back: original.identifier,
+			});
+		});
 	});
 
 	suite('shouldResetModelToDefault', () => {
@@ -622,6 +651,30 @@ suite('ChatInputModelUtils', () => {
 			assert.deepStrictEqual(result.map(m => m.metadata.id).sort(), ['gpt', 'other-model']);
 		});
 
+		test('a vendor publishing only bridged BYOK copies keeps its cached own models', () => {
+			// The incident: the host's own models briefly dropped while its bridged BYOK copies stayed,
+			// and counting those as live evicted — then re-persisted over — the real pool.
+			const host = 'agent-host-copilotcli';
+			const bridged = createSessionModel('anthropic/Anthropic/claude-opus-5', 'Claude Opus 5', host, {
+				vendor: host,
+				byokModelIdentifier: 'anthropic/Anthropic/claude-opus-5',
+			});
+			const cachedOwn = createSessionModel('gpt-5.6-terra', 'GPT-5.6 Terra', host, { vendor: host });
+			const result = mergeModelsWithCache([bridged], [cachedOwn], new Set([host]), new Set([host]));
+
+			assert.deepStrictEqual(result.map(m => m.metadata.id).sort(), ['anthropic/Anthropic/claude-opus-5', 'gpt-5.6-terra']);
+		});
+
+		test('a vendor that has published its own models drops its cache as before', () => {
+			// Once the host's own catalog lands it is authoritative, so stale cache must not linger.
+			const host = 'agent-host-copilotcli';
+			const liveOwn = createSessionModel('gpt-5.6-terra', 'GPT-5.6 Terra', host, { vendor: host });
+			const staleCached = createSessionModel('gpt-5.5-retired', 'GPT-5.5 Retired', host, { vendor: host });
+			const result = mergeModelsWithCache([liveOwn], [staleCached], new Set([host]), new Set([host]));
+
+			assert.deepStrictEqual(result.map(m => m.metadata.id), ['gpt-5.6-terra']);
+		});
+
 		test('evicts cached models from vendors no longer contributed', () => {
 			const liveModel = createModel('gpt', 'GPT');
 			const cachedRemovedVendor = createModel('removed-model', 'Removed Model', { vendor: 'removed-vendor' });
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index a60cb5f0e0b3f8..56405fc019dcbe 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -24,7 +24,8 @@ import { CommandsRegistry, ICommandService } from '../../../../platform/commands
 import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { ExtensionGalleryManifestStatus, ExtensionGalleryResourceType, ExtensionGalleryServiceUrlConfigKey, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestStatus, ExtensionGalleryResourceType, ExtensionGalleryAuthProviderConfigKey, ExtensionGalleryServiceUrlConfigKey, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { IExtensionGalleryAccountService } from '../../../services/extensionManagement/common/extensionGalleryAccount.js';
 import { EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, ExtensionRequestsTimeoutConfigKey, ExtensionsLocalizedLabel, FilterType, IExtensionGalleryService, IExtensionManagementService, PreferencesLocalizedLabel, SortBy, VerifyExtensionSignatureConfigKey } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { areSameExtensions, getIdAndVersion } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ExtensionStorageService } from '../../../../platform/extensionManagement/common/extensionStorage.js';
@@ -50,7 +51,6 @@ import { IsSessionsWindowContext, ResourceContextKey, WorkbenchStateContext } fr
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation } from '../../../common/views.js';
-import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/browser/defaultAccount.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { EnablementState, IExtensionManagementServerService, IPublisherInfo, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
@@ -360,6 +360,18 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 					}
 				},
 			},
+			[ExtensionGalleryAuthProviderConfigKey]: {
+				type: 'string',
+				enum: ['github', 'microsoft'],
+				enumDescriptions: [
+					localize('extensions.gallery.authProvider.github', "Authenticate to the Extensions Marketplace using GitHub."),
+					localize('extensions.gallery.authProvider.microsoft', "Authenticate to the Extensions Marketplace using a Microsoft (Entra ID) account."),
+				],
+				description: localize('extensions.gallery.authProvider', "Configure the authentication provider for the Extensions Marketplace"),
+				default: 'github',
+				scope: ConfigurationScope.APPLICATION,
+				included: false,
+			},
 			'extensions.supportNodeGlobalNavigator': {
 				type: 'boolean',
 				description: localize('extensionsSupportNodeGlobalNavigator', "When enabled, Node.js navigator object is exposed on the global scope."),
@@ -2118,12 +2130,15 @@ registerAction2(class ExtensionsGallerySignInAction extends Action2 {
 			title: localize2('signInToMarketplace', 'Sign in to access Extensions Marketplace'),
 			menu: {
 				id: MenuId.AccountsContext,
-				when: CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.RequiresSignIn)
+				when: ContextKeyExpr.or(
+					CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.RequiresSignIn),
+					CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.AccessDenied),
+				)
 			},
 		});
 	}
-	run(accessor: ServicesAccessor): Promise<void> {
-		return accessor.get(ICommandService).executeCommand(DEFAULT_ACCOUNT_SIGN_IN_COMMAND);
+	async run(accessor: ServicesAccessor): Promise<void> {
+		await accessor.get(IExtensionGalleryAccountService).signIn();
 	}
 });
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index ced3d32a8bcc3d..7ddb915ade26b9 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -69,7 +69,6 @@ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { IExtensionGalleryManifest, IExtensionGalleryManifestService, ExtensionGalleryManifestStatus } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 import { URI } from '../../../../base/common/uri.js';
-import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/browser/defaultAccount.js';
 
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
 export const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);
@@ -146,7 +145,10 @@ export class ExtensionsViewletViewsContribution extends Disposable implements IW
 				ContextKeyExpr.or(
 					ContextKeyExpr.has('searchMarketplaceExtensions'), ContextKeyExpr.and(DefaultViewsContext)
 				),
-				ContextKeyExpr.or(CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.RequiresSignIn), CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.AccessDenied))
+				ContextKeyExpr.or(
+					CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.RequiresSignIn),
+					CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.AccessDenied)
+				)
 			),
 			order: -1,
 		});
@@ -155,10 +157,11 @@ export class ExtensionsViewletViewsContribution extends Disposable implements IW
 		viewRegistry.registerViews(viewDescriptors, this.container);
 
 		viewRegistry.registerViewWelcomeContent('workbench.views.extensions.marketplaceAccess', {
-			content: localize('sign in', "[Sign in to access Extensions Marketplace]({0})", `command:${DEFAULT_ACCOUNT_SIGN_IN_COMMAND}`),
+			content: localize('sign in', "[Sign in to access Extensions Marketplace]({0})", `command:workbench.extensions.actions.gallery.signIn`),
 			when: CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.RequiresSignIn)
 		});
 
+		// Access denied applies to every provider (microsoft/github/default), so gate on status alone.
 		viewRegistry.registerViewWelcomeContent('workbench.views.extensions.marketplaceAccess', {
 			content: localize('access denied', "Your account does not have access to the Extensions Marketplace. Please contact your administrator."),
 			when: CONTEXT_EXTENSIONS_GALLERY_STATUS.isEqualTo(ExtensionGalleryManifestStatus.AccessDenied)
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionGalleryAccount.ts b/src/vs/workbench/services/extensionManagement/common/extensionGalleryAccount.ts
new file mode 100644
index 00000000000000..fd0d8b5dbfd1d8
--- /dev/null
+++ b/src/vs/workbench/services/extensionManagement/common/extensionGalleryAccount.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+/** `accessToken` is only carried when the provider authenticates with a bearer. */
+export interface IExtensionGalleryAccount {
+	readonly accessToken?: string;
+}
+
+export const enum ExtensionGalleryAccountStatus {
+	/** None signed in, or several with no choice made. */
+	SignedOut = 'signedOut',
+	Ineligible = 'ineligible',
+	Eligible = 'eligible',
+	/** Could not be resolved — a transient auth failure, not a sign-out. */
+	Unknown = 'unknown'
+}
+
+/**
+ * The authentication half of marketplace access. Implementations live in the Electron layer and
+ * are supplied through {@link IExtensionGalleryAccountService.setAccountProvider}, so the service
+ * itself never depends on authentication.
+ */
+export interface IExtensionGalleryAccountProvider {
+	readonly accountStatus: ExtensionGalleryAccountStatus;
+	readonly onDidChangeAccountStatus: Event<ExtensionGalleryAccountStatus>;
+	readonly onDidChangeAccount: Event<void>;
+
+	/** Never prompts. Check {@link accountStatus} for whether the account may actually be used. */
+	getAccount(): Promise<IExtensionGalleryAccount | undefined>;
+
+	/** Interactive. The provider owns account selection and how the session is obtained. */
+	signIn(): Promise<void>;
+}
+
+export const IExtensionGalleryAccountService = createDecorator<IExtensionGalleryAccountService>('extensionGalleryAccountService');
+
+/** Identity and entitlement for the Private Marketplace. Knows nothing about URLs or HTTP. */
+export interface IExtensionGalleryAccountService {
+	readonly _serviceBrand: undefined;
+
+	readonly accountStatus: ExtensionGalleryAccountStatus;
+	readonly onDidChangeAccountStatus: Event<ExtensionGalleryAccountStatus>;
+	readonly onDidChangeAccount: Event<void>;
+
+	/** Never prompts. Check {@link accountStatus} for whether the account may actually be used. */
+	getAccount(): Promise<IExtensionGalleryAccount | undefined>;
+
+	/** Interactive sign-in for whichever provider the deployment configured. */
+	signIn(): Promise<void>;
+
+	setAccountProvider(provider: IExtensionGalleryAccountProvider): void;
+}
diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryAccountService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryAccountService.ts
new file mode 100644
index 00000000000000..e9a2dec3d3c7a2
--- /dev/null
+++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryAccountService.ts
@@ -0,0 +1,370 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDefaultAccount } from '../../../../base/common/defaultAccount.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { getClaimsFromJWT } from '../../../../base/common/oauth.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
+import { ExtensionGalleryAuthProviderConfigKey } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationService } from '../../authentication/common/authentication.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { ExtensionGalleryAccountStatus, IExtensionGalleryAccount, IExtensionGalleryAccountProvider, IExtensionGalleryAccountService } from '../common/extensionGalleryAccount.js';
+
+/** The authentication provider that gates Private Marketplace access. */
+type ExtensionGalleryAccessProviderId = 'github' | 'microsoft';
+
+const PREFERRED_ACCOUNT_KEY = 'marketplace.account';
+
+// Well-known MSA (personal account) tenant ids. Duplicated from the microsoft-authentication
+// extension, which lives in the extension host and is not importable here.
+const MSA_TENANT_ID = '9188040d-6c67-4c5b-b112-36a304b66dad';
+const MSA_PASSTHROUGH_TENANT_ID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a';
+
+type MarketplaceAuthEvent = {
+	authProvider: string;
+	eligible: boolean;
+};
+
+type MarketplaceAuthClassification = {
+	authProvider: {
+		classification: 'SystemMetaData';
+		purpose: 'FeatureInsight';
+		comment: 'The auth provider used (github, microsoft).';
+	};
+	eligible: {
+		classification: 'SystemMetaData';
+		purpose: 'FeatureInsight';
+		isMeasurement: true;
+		comment: 'Whether the user was granted marketplace access.';
+	};
+	owner: 'sandy081';
+	comment: 'Reports marketplace authentication results for enterprise marketplace access.';
+};
+
+/** The remembered account choice. `authProvider` scopes it so a provider switch ignores it. */
+interface IPreferredAccount {
+	readonly authProvider: string;
+	readonly id: string;
+}
+
+/** Status bookkeeping and eligibility reporting shared by the provider implementations. */
+abstract class AbstractGalleryAccountProvider extends Disposable implements IExtensionGalleryAccountProvider {
+
+	protected readonly _onDidChangeAccount = this._register(new Emitter<void>());
+	readonly onDidChangeAccount: Event<void> = this._onDidChangeAccount.event;
+
+	private _accountStatus = ExtensionGalleryAccountStatus.Unknown;
+	get accountStatus(): ExtensionGalleryAccountStatus { return this._accountStatus; }
+	private readonly _onDidChangeAccountStatus = this._register(new Emitter<ExtensionGalleryAccountStatus>());
+	readonly onDidChangeAccountStatus: Event<ExtensionGalleryAccountStatus> = this._onDidChangeAccountStatus.event;
+
+	constructor(
+		protected readonly authProviderId: ExtensionGalleryAccessProviderId,
+		private readonly telemetryService: ITelemetryService,
+		protected readonly logService: ILogService,
+	) {
+		super();
+	}
+
+	async getAccount(): Promise<IExtensionGalleryAccount | undefined> {
+		try {
+			return await this.doGetAccount();
+		} catch (error) {
+			// Distinct from "no account" so the caller does not demand sign-in for a transient failure.
+			this.logService.error('[Marketplace] Unable to resolve the marketplace account', error);
+			this.setAccountStatus(ExtensionGalleryAccountStatus.Unknown);
+			return undefined;
+		}
+	}
+
+	protected abstract doGetAccount(): Promise<IExtensionGalleryAccount | undefined>;
+
+	abstract signIn(): Promise<void>;
+
+	protected setAccountStatus(status: ExtensionGalleryAccountStatus): void {
+		if (this._accountStatus !== status) {
+			this._accountStatus = status;
+			this._onDidChangeAccountStatus.fire(status);
+		}
+	}
+
+	protected reportEligibility(eligible: boolean): void {
+		this.telemetryService.publicLog2<MarketplaceAuthEvent, MarketplaceAuthClassification>('marketplace:auth:checked', {
+			authProvider: this.authProviderId,
+			eligible
+		});
+	}
+}
+
+/** Entitlement from the default account's SKU or enterprise flag. No bearer is carried. */
+export class GitHubGalleryAccountProvider extends AbstractGalleryAccountProvider {
+
+	constructor(
+		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
+		@IProductService private readonly productService: IProductService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@ILogService logService: ILogService,
+	) {
+		super('github', telemetryService, logService);
+		this._register(this.defaultAccountService.onDidChangeDefaultAccount(() => this._onDidChangeAccount.fire()));
+	}
+
+	protected override async doGetAccount(): Promise<IExtensionGalleryAccount | undefined> {
+		const account = await this.defaultAccountService.getDefaultAccount();
+		if (!account) {
+			this.setAccountStatus(ExtensionGalleryAccountStatus.SignedOut);
+			return undefined;
+		}
+		const eligible = this.checkAccess(account);
+		this.reportEligibility(eligible);
+		this.setAccountStatus(eligible ? ExtensionGalleryAccountStatus.Eligible : ExtensionGalleryAccountStatus.Ineligible);
+		// A result is returned even when ineligible, so the caller can tell "signed in but denied"
+		// apart from "no account" — the two map to different statuses.
+		return {};
+	}
+
+	override async signIn(): Promise<void> {
+		await this.defaultAccountService.signIn();
+	}
+
+	private checkAccess(account: IDefaultAccount): boolean {
+		this.logService.debug('[Marketplace] Checking Account SKU access for configured gallery', account.entitlementsData?.access_type_sku);
+		if (account.entitlementsData?.access_type_sku
+			&& this.productService.extensionsGallery?.accessSKUs?.includes(account.entitlementsData.access_type_sku)) {
+			this.logService.debug('[Marketplace] Account has access to configured gallery');
+			return true;
+		}
+		this.logService.debug('[Marketplace] Checking enterprise account access for configured gallery', account.enterprise);
+		return account.enterprise;
+	}
+}
+
+/** Entitlement decided locally from the token's tenant claim. The bearer travels with it. */
+export class MicrosoftGalleryAccountProvider extends AbstractGalleryAccountProvider {
+
+	constructor(
+		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IProductService private readonly productService: IProductService,
+		@IStorageService private readonly storageService: IStorageService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@ILogService logService: ILogService,
+	) {
+		super('microsoft', telemetryService, logService);
+		this._register(this.authenticationService.onDidChangeSessions(e => {
+			if (e.providerId === 'microsoft') {
+				this._onDidChangeAccount.fire();
+			}
+		}));
+	}
+
+	/**
+	 * Session lookup and interactive sign-in must request the same scopes, or the session created
+	 * by one is invisible to the other. Absent when the deployment did not configure them.
+	 */
+	private get scopes(): string[] | undefined {
+		return this.productService.extensionsGallery?.accessScopes;
+	}
+
+	protected override async doGetAccount(): Promise<IExtensionGalleryAccount | undefined> {
+		const session = await this.getSession();
+		if (!session) {
+			this.setAccountStatus(ExtensionGalleryAccountStatus.SignedOut);
+			return undefined;
+		}
+		const eligible = this.isEligible(session);
+		this.reportEligibility(eligible);
+		this.setAccountStatus(eligible ? ExtensionGalleryAccountStatus.Eligible : ExtensionGalleryAccountStatus.Ineligible);
+		// The bearer is withheld when ineligible: that identity must never reach the marketplace.
+		return { accessToken: eligible ? session.accessToken : undefined };
+	}
+
+	/** Work/school tenant is eligible, personal is not. Fails closed on an unreadable token. */
+	private isEligible(session: AuthenticationSession): boolean {
+		const rawToken = session.idToken ?? session.accessToken;
+		let tid: string | undefined;
+		try {
+			tid = getClaimsFromJWT(rawToken).tid;
+		} catch (error) {
+			this.logService.error('[Marketplace] Unable to decode the Microsoft token to determine account eligibility — treating as ineligible.', error);
+			return false;
+		}
+		if (!tid) {
+			return false;
+		}
+		return tid !== MSA_TENANT_ID && tid !== MSA_PASSTHROUGH_TENANT_ID;
+	}
+
+	/**
+	 * Anchored to the remembered account rather than an arbitrary `sessions[0]`. Several accounts
+	 * with no preference returns `undefined` rather than guessing. Never prompts.
+	 */
+	private async getSession(): Promise<AuthenticationSession | undefined> {
+		const scopes = this.scopes;
+		if (!scopes) {
+			this.logService.error('[Marketplace] extensionsGallery.accessScopes is not configured — the Microsoft marketplace path cannot request a session.');
+			return undefined;
+		}
+		const sessions = await this.authenticationService.getSessions('microsoft', scopes);
+		if (sessions.length === 0) {
+			return undefined;
+		}
+		const preferredId = this.readPreferredAccountId();
+		if (preferredId) {
+			const remembered = sessions.find(session => session.account.id === preferredId);
+			// Fall through rather than silently switching accounts.
+			if (remembered) {
+				return remembered;
+			}
+		}
+		if (sessions.length === 1) {
+			this.storePreferredAccountId(sessions[0].account.id);
+			return sessions[0];
+		}
+		return undefined;
+	}
+
+	override async signIn(): Promise<void> {
+		const scopes = this.scopes;
+		if (!scopes) {
+			this.logService.error('[Marketplace] extensionsGallery.accessScopes is not configured — cannot sign in to the Microsoft marketplace path.');
+			return;
+		}
+
+		// Passing a known account binds to it without a fresh interactive login; omitting it falls
+		// back to interactive sign-in, which is also how the user adds a different account.
+		const chooseAccount = async (account: AuthenticationSessionAccount | undefined): Promise<void> => {
+			// Persist before creating the session so re-validation already sees the grounded account.
+			if (account) {
+				this.storePreferredAccountId(account.id);
+			}
+			const session = await this.authenticationService.createSession('microsoft', scopes, account ? { account } : undefined);
+			this.storePreferredAccountId(session.account.id);
+		};
+
+		const accounts = await this.authenticationService.getAccounts('microsoft');
+		if (accounts.length <= 1) {
+			await chooseAccount(accounts.at(0));
+			return;
+		}
+
+		interface IAccountPickItem extends IQuickPickItem {
+			readonly account?: AuthenticationSessionAccount;
+		}
+		const picks: IAccountPickItem[] = accounts.map(account => ({ label: account.label, account }));
+		picks.push({ label: localize('marketplace.signInDifferentAccount', "Sign in with a Different Account…") });
+
+		const pick = await this.quickInputService.pick(picks, {
+			placeHolder: localize('marketplace.pickAccount', "Select the account to use for the Extensions Marketplace")
+		});
+		if (!pick) {
+			return; // cancelled
+		}
+		await chooseAccount(pick.account);
+	}
+
+	private readPreferredAccountId(): string | undefined {
+		const raw = this.storageService.get(PREFERRED_ACCOUNT_KEY, StorageScope.APPLICATION);
+		if (!raw) {
+			return undefined;
+		}
+		let parsed: unknown;
+		try {
+			parsed = JSON.parse(raw);
+		} catch {
+			this.storageService.remove(PREFERRED_ACCOUNT_KEY, StorageScope.APPLICATION);
+			return undefined;
+		}
+		if (!parsed || typeof parsed !== 'object') {
+			return undefined;
+		}
+		const candidate = parsed as Partial<IPreferredAccount>;
+		if (candidate.authProvider !== this.authProviderId || typeof candidate.id !== 'string') {
+			return undefined;
+		}
+		return candidate.id;
+	}
+
+	private storePreferredAccountId(accountId: string): void {
+		const preferred: IPreferredAccount = { authProvider: this.authProviderId, id: accountId };
+		this.storageService.store(PREFERRED_ACCOUNT_KEY, JSON.stringify(preferred), StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+}
+
+/**
+ * Forwards to whichever provider the deployment configured. Holds no authentication dependency of
+ * its own, so it can sit in the service graph that authentication itself depends on.
+ */
+export class ExtensionGalleryAccountService extends Disposable implements IExtensionGalleryAccountService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private provider: IExtensionGalleryAccountProvider | undefined;
+	private readonly providerListeners = this._register(new MutableDisposable<DisposableStore>());
+
+	private readonly _onDidChangeAccount = this._register(new Emitter<void>());
+	readonly onDidChangeAccount: Event<void> = this._onDidChangeAccount.event;
+
+	private readonly _onDidChangeAccountStatus = this._register(new Emitter<ExtensionGalleryAccountStatus>());
+	readonly onDidChangeAccountStatus: Event<ExtensionGalleryAccountStatus> = this._onDidChangeAccountStatus.event;
+
+	get accountStatus(): ExtensionGalleryAccountStatus {
+		return this.provider?.accountStatus ?? ExtensionGalleryAccountStatus.Unknown;
+	}
+
+	setAccountProvider(provider: IExtensionGalleryAccountProvider): void {
+		this.provider = provider;
+		const listeners = new DisposableStore();
+		listeners.add(provider.onDidChangeAccount(() => this._onDidChangeAccount.fire()));
+		listeners.add(provider.onDidChangeAccountStatus(status => this._onDidChangeAccountStatus.fire(status)));
+		this.providerListeners.value = listeners;
+		// Anything that resolved before the provider arrived saw no account; let it try again.
+		this._onDidChangeAccount.fire();
+	}
+
+	async getAccount(): Promise<IExtensionGalleryAccount | undefined> {
+		return this.provider?.getAccount();
+	}
+
+	async signIn(): Promise<void> {
+		await this.provider?.signIn();
+	}
+}
+
+registerSingleton(IExtensionGalleryAccountService, ExtensionGalleryAccountService, InstantiationType.Delayed);
+
+/**
+ * Creates the configured provider and hands it to the service. Lives outside the core service
+ * graph, so it can depend on authentication without forming the cycle the service must avoid.
+ */
+export class ExtensionGalleryAccountProviderContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.extensionGalleryAccountProvider';
+
+	constructor(
+		@IConfigurationService configurationService: IConfigurationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IExtensionGalleryAccountService accountService: IExtensionGalleryAccountService,
+	) {
+		super();
+		const authProvider: ExtensionGalleryAccessProviderId = configurationService.getValue<string>(ExtensionGalleryAuthProviderConfigKey) === 'microsoft' ? 'microsoft' : 'github';
+		const provider = this._register(authProvider === 'microsoft'
+			? instantiationService.createInstance(MicrosoftGalleryAccountProvider)
+			: instantiationService.createInstance(GitHubGalleryAccountProvider));
+		accountService.setAccountProvider(provider);
+	}
+}
+
+registerWorkbenchContribution2(ExtensionGalleryAccountProviderContribution.ID, ExtensionGalleryAccountProviderContribution, WorkbenchPhase.BlockStartup);
diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
index d670862d736e8b..2b440fb44a8f31 100644
--- a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
@@ -9,7 +9,7 @@ import { IHeaders } from '../../../../base/parts/request/common/request.js';
 import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { IExtensionGalleryManifestService, IExtensionGalleryManifest, ExtensionGalleryServiceUrlConfigKey, ExtensionGalleryManifestStatus } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { IExtensionGalleryManifestService, IExtensionGalleryManifest, ExtensionGalleryServiceUrlConfigKey, ExtensionGalleryAuthProviderConfigKey, ExtensionGalleryManifestStatus } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 import { ExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifestService.js';
 import { resolveMarketplaceHeaders } from '../../../../platform/externalServices/common/marketplace.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
@@ -20,11 +20,10 @@ import { IProductService } from '../../../../platform/product/common/productServ
 import { asJson, IRequestService } from '../../../../platform/request/common/request.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IHostService } from '../../host/browser/host.js';
-import { IDefaultAccount } from '../../../../base/common/defaultAccount.js';
+import { ExtensionGalleryAccountStatus, IExtensionGalleryAccountService } from '../common/extensionGalleryAccount.js';
 
 export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryManifestService implements IExtensionGalleryManifestService {
 
@@ -49,7 +48,7 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IRequestService private readonly requestService: IRequestService,
-		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
+		@IExtensionGalleryAccountService private readonly galleryAccountService: IExtensionGalleryAccountService,
 		@ILogService private readonly logService: ILogService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IHostService private readonly hostService: IHostService,
@@ -80,6 +79,8 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 			}
 			updateChannels(manifest);
 			this._register(this.onDidChangeExtensionGalleryManifest(manifest => updateChannels(manifest)));
+		}).catch(error => {
+			this.logService.error('[Marketplace] Error during initial gallery manifest bootstrap', error);
 		});
 	}
 
@@ -101,44 +102,70 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 		const configuredServiceUrl = this.configurationService.getValue<string>(ExtensionGalleryServiceUrlConfigKey);
 		if (configuredServiceUrl) {
 			this.logService.trace('[Marketplace] Private marketplace configured, checking access and fetching manifest', configuredServiceUrl);
-			await this.handleDefaultAccountAccess(configuredServiceUrl);
-			this._register(this.defaultAccountService.onDidChangeDefaultAccount(() => this.handleDefaultAccountAccess(configuredServiceUrl)));
+			this._register(this.galleryAccountService.onDidChangeAccount(() => this.handleMarketplaceAccountAccess(configuredServiceUrl)));
+			await this.handleMarketplaceAccountAccess(configuredServiceUrl);
 		} else {
 			const defaultExtensionGalleryManifest = await super.getExtensionGalleryManifest();
 			this.update(defaultExtensionGalleryManifest);
 		}
 
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (!e.affectsConfiguration(ExtensionGalleryServiceUrlConfigKey)) {
-				return;
+			if (e.affectsConfiguration(ExtensionGalleryServiceUrlConfigKey)) {
+				this.requestRestart(localize('extensionGalleryManifestService.accountChange', "{0} is now configured to a different Marketplace. Please restart to apply the changes.", this.productService.nameLong));
+			} else if (e.affectsConfiguration(ExtensionGalleryAuthProviderConfigKey)) {
+				this.requestRestart(localize('extensionGalleryManifestService.configurationChange', "The Extensions Marketplace configuration has changed. Please restart to apply the changes."));
 			}
-			this.requestRestart();
 		}));
 	}
 
-	private async handleDefaultAccountAccess(configuredServiceUrl: string): Promise<void> {
-		const account = await this.defaultAccountService.getDefaultAccount();
+	private async handleMarketplaceAccountAccess(configuredServiceUrl: string): Promise<void> {
+		try {
+			const account = await this.galleryAccountService.getAccount();
+			if (!account) {
+				// A transient failure to resolve the account is not a sign-out - Unknown means we could
+				// not tell - so it must not retract a marketplace the user already has.
+				if (this.galleryAccountService.accountStatus === ExtensionGalleryAccountStatus.Unknown
+					&& this.currentStatus === ExtensionGalleryManifestStatus.Available) {
+					return;
+				}
+				this.logService.debug('[Marketplace] Enterprise marketplace configured but user not signed in');
+				this.update(null, ExtensionGalleryManifestStatus.RequiresSignIn);
+				return;
+			}
 
-		if (!account) {
-			this.logService.debug('[Marketplace] Enterprise marketplace configured but user not signed in');
-			this.update(null, ExtensionGalleryManifestStatus.RequiresSignIn);
-		} else if (!this.checkAccess(account)) {
-			this.logService.debug('[Marketplace] User signed in but lacks access to enterprise marketplace');
-			this.update(null, ExtensionGalleryManifestStatus.AccessDenied);
-		} else if (this.currentStatus !== ExtensionGalleryManifestStatus.Available) {
-			try {
-				const manifest = await this.getExtensionGalleryManifestFromServiceUrl(configuredServiceUrl);
-				this.update(manifest);
-				this.telemetryService.publicLog2<
-					{},
-					{
-						owner: 'sandy081';
-						comment: 'Reports when a user successfully accesses a custom marketplace';
-					}>('galleryservice:custom:marketplace');
-			} catch (error) {
-				this.logService.error('[Marketplace] Error retrieving enterprise gallery manifest', error);
-				this.update(null, ExtensionGalleryManifestStatus.AccessDenied);
+			switch (this.galleryAccountService.accountStatus) {
+				case ExtensionGalleryAccountStatus.Unknown:
+					this.logService.debug('[Marketplace] User signed in but account status is unknown');
+					this.update(null, ExtensionGalleryManifestStatus.RequiresSignIn);
+					return;
+				case ExtensionGalleryAccountStatus.Ineligible:
+					this.logService.debug('[Marketplace] User signed in but lacks access to private marketplace');
+					this.update(null, ExtensionGalleryManifestStatus.AccessDenied);
+					return;
+				case ExtensionGalleryAccountStatus.SignedOut:
+					this.logService.debug('[Marketplace] User signed out');
+					this.update(null, ExtensionGalleryManifestStatus.RequiresSignIn);
+					return;
+				case ExtensionGalleryAccountStatus.Eligible:
+					try {
+
+						const manifest = await this.getExtensionGalleryManifestFromServiceUrl(configuredServiceUrl);
+						this.update(manifest);
+						this.telemetryService.publicLog2<
+							{},
+							{
+								owner: 'sandy081';
+								comment: 'Reports when a user successfully accesses a custom marketplace';
+							}>('galleryservice:custom:marketplace');
+					} catch (error) {
+						this.logService.error('[Marketplace] Error fetching manifest from custom marketplace', error);
+						this.update(null, ExtensionGalleryManifestStatus.AccessDenied);
+					}
+					return;
 			}
+		} catch (error) {
+			this.logService.error('[Marketplace] Error handling marketplace account access', error);
+			this.update(null, ExtensionGalleryManifestStatus.RequiresSignIn);
 		}
 	}
 
@@ -158,19 +185,9 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 		}
 	}
 
-	private checkAccess(account: IDefaultAccount): boolean {
-		this.logService.debug('[Marketplace] Checking Account SKU access for configured gallery', account.entitlementsData?.access_type_sku);
-		if (account.entitlementsData?.access_type_sku && this.productService.extensionsGallery?.accessSKUs?.includes(account.entitlementsData.access_type_sku)) {
-			this.logService.debug('[Marketplace] Account has access to configured gallery');
-			return true;
-		}
-		this.logService.debug('[Marketplace] Checking enterprise account access for configured gallery', account.enterprise);
-		return account.enterprise;
-	}
-
-	private async requestRestart(): Promise<void> {
+	private async requestRestart(message: string): Promise<void> {
 		const confirmation = await this.dialogService.confirm({
-			message: localize('extensionGalleryManifestService.accountChange', "{0} is now configured to a different Marketplace. Please restart to apply the changes.", this.productService.nameLong),
+			message,
 			primaryButton: localize({ key: 'restart', comment: ['&& denotes a mnemonic'] }, "&&Restart")
 		});
 		if (confirmation.confirmed) {
diff --git a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
index d0f47ea4ff2651..58f7b7df4483e2 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -1294,6 +1294,21 @@ suite('ExtensionEnablementService Test', () => {
 		]);
 	});
 
+	test('test extensions declaring agents window support are enabled in sessions window', () => {
+		instantiationService.stub(IWorkbenchEnvironmentService, { isSessionsWindow: true });
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+
+		const supported = aLocalExtension2('pub.supported', { main: 'main.js', enabledApiProposals: ['agentsWindowActivation'], capabilities: { agentsWindow: { supported: true } } });
+		const unsupported = aLocalExtension2('pub.unsupported', { enabledApiProposals: ['agentsWindowActivation'], capabilities: { agentsWindow: { supported: false } }, contributes: aContributes('themes') });
+		const unsupportedWithoutProposal = aLocalExtension2('pub.unsupportedWithoutProposal', { main: 'main.js', capabilities: { agentsWindow: { supported: true } } });
+
+		assert.deepStrictEqual([supported, unsupported, unsupportedWithoutProposal].map(ext => testObject.getEnablementState(ext)), [
+			EnablementState.EnabledGlobally,
+			EnablementState.DisabledByEnvironment,
+			EnablementState.DisabledByEnvironment,
+		]);
+	});
+
 	test('test extensions are not disabled in non-sessions window', () => {
 		const withMain = aLocalExtension2('pub.withMain', { main: 'main.js' });
 		const withBrowser = aLocalExtension2('pub.withBrowser', { browser: 'main.browser.js' });
diff --git a/src/vs/workbench/services/extensionManagement/test/electron-browser/extensionGalleryManifestService.test.ts b/src/vs/workbench/services/extensionManagement/test/electron-browser/extensionGalleryManifestService.test.ts
new file mode 100644
index 00000000000000..738046264b3415
--- /dev/null
+++ b/src/vs/workbench/services/extensionManagement/test/electron-browser/extensionGalleryManifestService.test.ts
@@ -0,0 +1,863 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { bufferToStream, encodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
+import { IDefaultAccount, IEntitlementsData } from '../../../../../base/common/defaultAccount.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IRequestContext, IRequestOptions } from '../../../../../base/parts/request/common/request.js';
+import { mock } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { ExtensionGalleryManifestStatus, ExtensionGalleryAuthProviderConfigKey, ExtensionGalleryServiceUrlConfigKey } from '../../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IRequestService } from '../../../../../platform/request/common/request.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryServiceShape } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IConfirmation, IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationService } from '../../../authentication/common/authentication.js';
+import { IHostService } from '../../../host/browser/host.js';
+import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
+import { WorkbenchExtensionGalleryManifestService } from '../../electron-browser/extensionGalleryManifestService.js';
+import { ExtensionGalleryAccountService, GitHubGalleryAccountProvider, MicrosoftGalleryAccountProvider } from '../../electron-browser/extensionGalleryAccountService.js';
+import { IExtensionGalleryAccountService } from '../../common/extensionGalleryAccount.js';
+
+function mockResponse(statusCode: number, body: object): IRequestContext {
+	return {
+		res: { headers: {}, statusCode },
+		stream: bufferToStream(VSBuffer.fromString(JSON.stringify(body))),
+	};
+}
+
+function createDefaultAccount(overrides: Partial<IDefaultAccount> = {}): IDefaultAccount {
+	return {
+		authenticationProvider: { id: 'github', name: 'GitHub', enterprise: false },
+		accountName: 'testuser',
+		sessionId: 'session-1',
+		enterprise: false,
+		entitlementsData: undefined,
+		...overrides,
+	};
+}
+
+// Well-known tenant ids used to classify a Microsoft account as work/school (Entra, eligible) vs.
+// personal Microsoft Account (MSA, ineligible). Mirrors the production classification in
+// `extensionGalleryAccountService.ts`.
+const ENTRA_TENANT_ID = '72f988bf-86f1-41af-91ab-2d7cd011db47'; // A work/school (Entra) tenant — eligible.
+const MSA_TENANT_ID = '9188040d-6c67-4c5b-b112-36a304b66dad'; // Personal Microsoft Account — ineligible.
+const MSA_PASSTHROUGH_TENANT_ID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a'; // MSA pass-through tenant — ineligible.
+
+/** Builds a structurally valid (unsigned) JWT whose payload carries `claims`, matching `getClaimsFromJWT`. */
+function makeJwt(claims: Record<string, unknown>): string {
+	const encode = (obj: object) => encodeBase64(VSBuffer.fromString(JSON.stringify(obj)));
+	return `${encode({ alg: 'none', typ: 'JWT' })}.${encode(claims)}.sig`;
+}
+
+// Eligibility is decided locally from the account's ID-token `tid` (tenant) claim, so a session must
+// carry an ID token to be classified. The tenant defaults to a work/school (Entra) tenant → eligible.
+function createMicrosoftSession(accessToken = 'ms-token', accountId = 'ms-account-1', sessionId = 'ms-session-1', tid = ENTRA_TENANT_ID): AuthenticationSession {
+	return {
+		id: sessionId,
+		accessToken,
+		account: { id: accountId, label: `${accountId}@contoso.com` },
+		scopes: ['openid', 'profile', 'email', 'offline_access'],
+		idToken: makeJwt({ tid, oid: accountId }),
+	};
+}
+
+// Gallery manifest response stub. A well-formed manifest with an (empty) `resources` array is a
+// valid service index; eligibility is no longer discovered from a manifest resource.
+function createGalleryManifest() {
+	return {
+		version: '1.0',
+		resources: [],
+	};
+}
+
+/** Captures emitted telemetry events so tests can assert on event names and dimensions. */
+class RecordingTelemetryService extends NullTelemetryServiceShape {
+	readonly events: { readonly eventName: string; readonly data: unknown }[] = [];
+
+	override publicLog2(eventName?: string, data?: unknown): void {
+		if (eventName) {
+			this.events.push({ eventName, data });
+		}
+	}
+}
+
+suite('WorkbenchExtensionGalleryManifestService', () => {
+
+	const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let onDidChangeDefaultAccount: Emitter<IDefaultAccount | null>;
+	let onDidChangeSessions: Emitter<{ providerId: string; label: string; event: AuthenticationSessionsChangeEvent }>;
+	let requestHandler: (options: IRequestOptions) => IRequestContext | Promise<IRequestContext>;
+	let defaultAccount: IDefaultAccount | null;
+	let microsoftSessions: AuthenticationSession[];
+	let configurationService: TestConfigurationService;
+	let storageData: Map<string, string>;
+	let telemetryService: RecordingTelemetryService;
+	let restartPrompts: string[];
+
+	setup(() => {
+		defaultAccount = null;
+		microsoftSessions = [];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+		storageData = new Map();
+		restartPrompts = [];
+
+		onDidChangeDefaultAccount = disposableStore.add(new Emitter<IDefaultAccount | null>());
+		onDidChangeSessions = disposableStore.add(new Emitter<{ providerId: string; label: string; event: AuthenticationSessionsChangeEvent }>());
+
+		configurationService = new TestConfigurationService({
+			[ExtensionGalleryServiceUrlConfigKey]: 'https://marketplace.example.com',
+		});
+
+		instantiationService = disposableStore.add(new TestInstantiationService());
+
+		instantiationService.stub(IProductService, {
+			version: '1.0.0',
+			extensionsGallery: {
+				serviceUrl: 'https://default-marketplace.example.com',
+				controlUrl: '',
+				extensionUrlTemplate: '',
+				resourceUrlTemplate: '',
+				nlsBaseUrl: '',
+				accessSKUs: ['copilot_business'],
+				accessScopes: ['openid', 'profile', 'email', 'offline_access'],
+			},
+			nameLong: 'VS Code Test',
+		});
+
+		instantiationService.stub(IEnvironmentService, new class extends mock<IEnvironmentService>() {
+		}());
+
+		instantiationService.stub(IFileService, new class extends mock<IFileService>() {
+		}());
+
+		telemetryService = new RecordingTelemetryService();
+		instantiationService.stub(ITelemetryService, telemetryService);
+
+		instantiationService.stub(IStorageService, new class extends mock<IStorageService>() {
+			override get(key: string, _scope: StorageScope, fallbackValue: string): string;
+			override get(key: string, _scope: StorageScope, fallbackValue?: string): string | undefined;
+			override get(key: string, _scope: StorageScope, fallbackValue?: string): string | undefined {
+				return storageData.get(key) ?? fallbackValue;
+			}
+			override store(key: string, value: string, _scope: StorageScope, _target: StorageTarget): void {
+				storageData.set(key, value);
+			}
+			override remove(key: string, _scope: StorageScope): void {
+				storageData.delete(key);
+			}
+		}());
+
+		instantiationService.stub(IRemoteAgentService, new class extends mock<IRemoteAgentService>() {
+			override getConnection() { return null; }
+		}());
+
+		instantiationService.stub(ISharedProcessService, new class extends mock<ISharedProcessService>() {
+			override getChannel(_channelName: string): any {
+				return {
+					call: () => Promise.resolve(),
+					listen: () => Event.None,
+				};
+			}
+		}());
+
+		instantiationService.stub(IConfigurationService, configurationService);
+
+		instantiationService.stub(IRequestService, new class extends mock<IRequestService>() {
+			override async request(options: IRequestOptions) {
+				return requestHandler(options);
+			}
+		}());
+
+		instantiationService.stub(IDefaultAccountService, new class extends mock<IDefaultAccountService>() {
+			override readonly onDidChangeDefaultAccount = onDidChangeDefaultAccount.event;
+			override async getDefaultAccount() { return defaultAccount; }
+		}());
+
+		instantiationService.stub(ILogService, new NullLogService());
+
+		instantiationService.stub(IDialogService, new class extends mock<IDialogService>() {
+			override async confirm(confirmation: IConfirmation) { restartPrompts.push(confirmation.message); return { confirmed: false }; }
+		}());
+
+		instantiationService.stub(IHostService, new class extends mock<IHostService>() {
+			override async restart() { }
+		}());
+
+		instantiationService.stub(IAuthenticationService, new class extends mock<IAuthenticationService>() {
+			override readonly onDidChangeSessions = onDidChangeSessions.event;
+			override async getSessions(providerId: string) {
+				if (providerId === 'microsoft') {
+					return microsoftSessions;
+				}
+				return [];
+			}
+			override async createSession(providerId: string) {
+				return createMicrosoftSession();
+			}
+		}());
+
+		instantiationService.stub(IContextKeyService, disposableStore.add(new MockContextKeyService()));
+	});
+
+	function createService(): WorkbenchExtensionGalleryManifestService {
+		// Built here (not in setup) so the provider is chosen after each test sets the config;
+		// registered to the store because it is injected, not owned by the manifest service.
+		const accountService = disposableStore.add(instantiationService.createInstance(ExtensionGalleryAccountService));
+		// Play the role of the production contribution, which builds the auth-dependent provider
+		// outside the service graph and hands it over.
+		const useMicrosoft = configurationService.getValue<string>(ExtensionGalleryAuthProviderConfigKey) === 'microsoft';
+		const provider = disposableStore.add(useMicrosoft
+			? instantiationService.createInstance(MicrosoftGalleryAccountProvider)
+			: instantiationService.createInstance(GitHubGalleryAccountProvider));
+		accountService.setAccountProvider(provider);
+		instantiationService.stub(IExtensionGalleryAccountService, accountService);
+		return disposableStore.add(instantiationService.createInstance(WorkbenchExtensionGalleryManifestService));
+	}
+
+	// --- Provider routing ---
+
+	test('GitHub provider — enterprise account → Available', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({ enterprise: true });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('GitHub provider — no account → RequiresSignIn', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = null;
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+	});
+
+	test('GitHub provider — non-enterprise account without SKU → AccessDenied', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({ enterprise: false });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+	});
+
+	test('GitHub provider — a denied account that is later granted entitlement becomes Available', async () => {
+		// A denial is a verdict about the account as it is now, not a durable one: nothing may
+		// outlive the condition that produced it and keep the user locked out after it changes.
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({ enterprise: false });
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+
+		// The same account gains entitlement, with no sign-out in between.
+		defaultAccount = createDefaultAccount({ enterprise: true });
+		onDidChangeDefaultAccount.fire(defaultAccount);
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('GitHub provider — account with matching SKU → Available', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({
+			enterprise: false,
+			entitlementsData: { access_type_sku: 'copilot_business' } as IEntitlementsData,
+		});
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('default (no authProvider) — uses GitHub path', async () => {
+		// No authProvider config set
+		defaultAccount = createDefaultAccount({ enterprise: true });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('Microsoft provider — no session → RequiresSignIn', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [];
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+	});
+
+	test('Microsoft provider — eligible (work/school) session → Available', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// A work/school (Entra) tenant is eligible; the index is then fetched with the session token.
+		microsoftSessions = [createMicrosoftSession()];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('Microsoft provider — personal (MSA) account → AccessDenied without touching the index', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// A personal Microsoft Account (MSA) is ineligible. The verdict is decided locally from the
+		// token's tenant claim BEFORE any index fetch, so an ineligible account never probes the index.
+		microsoftSessions = [createMicrosoftSession('ms-token', 'ms-account-1', 'ms-session-1', MSA_TENANT_ID)];
+		let indexRequests = 0;
+		requestHandler = () => { indexRequests++; return mockResponse(200, createGalleryManifest()); };
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('Microsoft provider — MSA pass-through tenant → AccessDenied without touching the index', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// The MSA pass-through tenant is also classified as a personal account → ineligible.
+		microsoftSessions = [createMicrosoftSession('ms-token', 'ms-account-1', 'ms-session-1', MSA_PASSTHROUGH_TENANT_ID)];
+		let indexRequests = 0;
+		requestHandler = () => { indexRequests++; return mockResponse(200, createGalleryManifest()); };
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('Microsoft provider — no ID token, access token carries tenant → eligible (fallback)', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// The ID token is preferred, but when it is absent the access token is decoded as a fallback.
+		// Here the access token is a JWT carrying a work/school tenant → eligible.
+		microsoftSessions = [{ ...createMicrosoftSession(makeJwt({ tid: ENTRA_TENANT_ID, oid: 'ms-account-1' })), idToken: undefined }];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('Microsoft provider — undecodable token → AccessDenied without touching the index', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// An opaque/undecodable token cannot confirm a work/school account, so it is treated as
+		// ineligible rather than wrongly granting access — and the index is never probed.
+		microsoftSessions = [{ ...createMicrosoftSession(), idToken: 'not-a-jwt' }];
+		let indexRequests = 0;
+		requestHandler = () => { indexRequests++; return mockResponse(200, createGalleryManifest()); };
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('Microsoft provider — token without a tenant claim → AccessDenied without touching the index', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// A decodable token that carries no `tid` cannot be confirmed as a work/school account, so it
+		// is treated as ineligible.
+		microsoftSessions = [{ ...createMicrosoftSession(), idToken: makeJwt({ oid: 'ms-account-1' }) }];
+		let indexRequests = 0;
+		requestHandler = () => { indexRequests++; return mockResponse(200, createGalleryManifest()); };
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('Microsoft provider — service index returns 500 with JSON body → AccessDenied (not parsed as manifest)', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [createMicrosoftSession()];
+		// A 5xx error body is valid JSON and truthy; it must be rejected outright rather than
+		// mistaken for a manifest.
+		requestHandler = () => mockResponse(500, { error: 'internal' });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+	});
+
+	test('Microsoft provider — manifest fetch fails → AccessDenied', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [createMicrosoftSession()];
+		// Manifest discovery fails transiently (network error)
+		requestHandler = () => { throw new Error('network down'); };
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// A configured marketplace whose manifest can't be fetched is reported as denied, as on main.
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+	});
+
+	test('Microsoft provider — no session → RequiresSignIn without probing the service index', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [];
+		// When 'microsoft' is configured and there is no session, we must NOT issue an
+		// anonymous request to the (possibly auth-gated) service index — that request is a
+		// guaranteed 401. We go straight to sign-in and only touch the index once a token
+		// exists. Assert no request was made.
+		let indexRequests = 0;
+		requestHandler = () => {
+			indexRequests++;
+			return mockResponse(401, { message: 'auth required' });
+		};
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('Microsoft provider — no session → stays RequiresSignIn even when the index would fail', async () => {
+		// Pins the invariant that makes "not signed in" a stable, actionable state: with no session
+		// the index is never probed, so a failing marketplace cannot mask the sign-in affordance.
+		// Covers the post-startup re-validation triggered when authentication connects.
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [];
+		let indexRequests = 0;
+		requestHandler = () => {
+			indexRequests++;
+			return mockResponse(400, { message: 'client rejected' });
+		};
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+
+		// A session change arrives (as it does when the Microsoft provider registers post-startup)
+		// and triggers a re-validation.
+		onDidChangeSessions.fire({ providerId: 'microsoft', label: 'Microsoft', event: { added: [], removed: [], changed: [] } });
+		await new Promise<void>(resolve => setTimeout(resolve, 0));
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('Microsoft provider — service index rejects the client (400) → AccessDenied', async () => {
+		// A marketplace that refuses this client outright — e.g. below its minimum supported
+		// version — is a durable rejection, so retrying cannot help. `main` reports any failed
+		// fetch of a configured marketplace as AccessDenied ("contact your administrator"); keep
+		// that for this case rather than the transient "check your network connection".
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [createMicrosoftSession()];
+		requestHandler = () => mockResponse(400, { message: 'Only VS Code clients version 1.104.2 or later are allowed.' });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+	});
+
+	test('Microsoft — single signed-in account, no stored preference → adopted and persisted', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// Exactly one signed-in account and no remembered choice: the selection is unambiguous, so
+		// it is adopted for the check AND persisted so later windows reuse the same account instead
+		// of re-deriving it.
+		microsoftSessions = [createMicrosoftSession()];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+		assert.deepStrictEqual(JSON.parse(storageData.get('marketplace.account')!), { authProvider: 'microsoft', id: 'ms-account-1' });
+	});
+
+	test('Microsoft — multiple signed-in accounts, no stored preference → RequiresSignIn (never guesses)', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// Several accounts are signed in and none was ever chosen. Picking one arbitrarily could grant
+		// access under the wrong identity, so selection is refused: no index request is made, no
+		// account is persisted, and the user is sent to an explicit sign-in.
+		microsoftSessions = [
+			createMicrosoftSession('token-1', 'ms-account-1', 'ms-session-1'),
+			createMicrosoftSession('token-2', 'ms-account-2', 'ms-session-2'),
+		];
+		let indexRequests = 0;
+		requestHandler = () => {
+			indexRequests++;
+			return mockResponse(200, createGalleryManifest());
+		};
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+		assert.strictEqual(indexRequests, 0);
+		assert.ok(!storageData.has('marketplace.account'));
+	});
+
+	test('Microsoft — multiple accounts, stored preference selects that account (not sessions[0])', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// Two accounts signed in. The first is a personal account (ineligible), the remembered choice
+		// is the second (eligible). Landing on Available therefore proves the remembered account was
+		// used; picking `sessions[0]` would have produced AccessDenied.
+		storageData.set('marketplace.account', JSON.stringify({ authProvider: 'microsoft', id: 'ms-account-2' }));
+		microsoftSessions = [
+			createMicrosoftSession('token-1', 'ms-account-1', 'ms-session-1', MSA_TENANT_ID),
+			createMicrosoftSession('token-2', 'ms-account-2', 'ms-session-2', ENTRA_TENANT_ID),
+		];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	test('Microsoft — stored preference no longer signed in, several remain → RequiresSignIn (no silent switch)', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// The remembered account is gone, but two others remain. Rather than silently switching to a
+		// different identity, selection is refused and the user must choose again.
+		storageData.set('marketplace.account', JSON.stringify({ authProvider: 'microsoft', id: 'ms-account-gone' }));
+		microsoftSessions = [
+			createMicrosoftSession('token-1', 'ms-account-1', 'ms-session-1'),
+			createMicrosoftSession('token-2', 'ms-account-2', 'ms-session-2'),
+		];
+		let indexRequests = 0;
+		requestHandler = () => {
+			indexRequests++;
+			return mockResponse(200, createGalleryManifest());
+		};
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+		assert.strictEqual(indexRequests, 0);
+	});
+
+	test('GitHub provider — eligible account, manifest fetch fails → AccessDenied', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({ enterprise: true });
+		requestHandler = () => { throw new Error('network down'); };
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.AccessDenied);
+	});
+
+	test('authProvider is matched case-sensitively — a differently-cased value uses the GitHub path', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'Microsoft');
+		microsoftSessions = [createMicrosoftSession()];
+		defaultAccount = createDefaultAccount({ enterprise: true });
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// Not the 'microsoft' literal → GitHub path with enterprise account → Available
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+
+	test('Microsoft — product.json accessScopes are the scopes requested', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		instantiationService.stub(IProductService, {
+			version: '1.0.0',
+			extensionsGallery: {
+				serviceUrl: 'https://default-marketplace.example.com',
+				controlUrl: '',
+				extensionUrlTemplate: '',
+				resourceUrlTemplate: '',
+				nlsBaseUrl: '',
+				accessSKUs: ['copilot_business'],
+				accessScopes: ['api://marketplace.example.com/.default', 'offline_access'],
+			},
+			nameLong: 'VS Code Test',
+		});
+		let requestedScopes: readonly string[] | undefined;
+		instantiationService.stub(IAuthenticationService, new class extends mock<IAuthenticationService>() {
+			override readonly onDidChangeSessions = onDidChangeSessions.event;
+			override async getSessions(providerId: string, scopes?: readonly string[]): Promise<readonly AuthenticationSession[]> {
+				requestedScopes = scopes;
+				return [createMicrosoftSession()];
+			}
+		}());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.deepStrictEqual(requestedScopes, ['api://marketplace.example.com/.default', 'offline_access']);
+	});
+
+	test('Microsoft — no accessScopes configured → no session is requested and access is not granted', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		instantiationService.stub(IProductService, {
+			version: '1.0.0',
+			extensionsGallery: {
+				serviceUrl: 'https://default-marketplace.example.com',
+				controlUrl: '',
+				extensionUrlTemplate: '',
+				resourceUrlTemplate: '',
+				nlsBaseUrl: '',
+				accessSKUs: ['copilot_business'],
+			},
+			nameLong: 'VS Code Test',
+		});
+		let sessionsRequested = false;
+		instantiationService.stub(IAuthenticationService, new class extends mock<IAuthenticationService>() {
+			override readonly onDidChangeSessions = onDidChangeSessions.event;
+			override async getSessions(): Promise<readonly AuthenticationSession[]> {
+				sessionsRequested = true;
+				return [createMicrosoftSession()];
+			}
+		}());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// An unconfigured deployment must not fall back to scopes it did not ask for, and an
+		// eligible session must not be adopted on the strength of a guess.
+		assert.strictEqual(sessionsRequested, false);
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+	});
+
+	test('Microsoft — getSessions throws → RequiresSignIn (not silent Unavailable)', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		instantiationService.stub(IAuthenticationService, new class extends mock<IAuthenticationService>() {
+			override readonly onDidChangeSessions = onDidChangeSessions.event;
+			override async getSessions(): Promise<readonly AuthenticationSession[]> {
+				throw new Error('Auth service unavailable');
+			}
+		}());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// The account couldn't be resolved — the configured marketplace must report a definite
+		// state rather than a blank (Unavailable) view.
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+	});
+
+	test('GitHub — getDefaultAccount throws → RequiresSignIn (not silent Unavailable)', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		instantiationService.stub(IDefaultAccountService, new class extends mock<IDefaultAccountService>() {
+			override readonly onDidChangeDefaultAccount = onDidChangeDefaultAccount.event;
+			override async getDefaultAccount(): Promise<IDefaultAccount> {
+				throw new Error('Account service unavailable');
+			}
+		}());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.RequiresSignIn);
+	});
+
+	// --- Already-available marketplace ---
+
+	test('Microsoft — switching to a different eligible account publishes that account catalog', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [createMicrosoftSession('token-a', 'ms-account-1', 'ms-session-1')];
+		requestHandler = () => mockResponse(200, { version: '1.0', resources: [{ id: 'tenantA', type: 'ExtensionQueryService' }] });
+
+		const service = createService();
+		const first = await service.getExtensionGalleryManifest();
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+		assert.strictEqual(first?.resources[0].id, 'tenantA');
+
+		// A private marketplace is account-scoped, so a different eligible account can be served a
+		// different catalog. The already-available status must not suppress the new one.
+		microsoftSessions = [createMicrosoftSession('token-b', 'ms-account-2', 'ms-session-2')];
+		requestHandler = () => mockResponse(200, { version: '1.0', resources: [{ id: 'tenantB', type: 'ExtensionQueryService' }] });
+		onDidChangeSessions.fire({ providerId: 'microsoft', label: 'Microsoft', event: { added: [], removed: [], changed: [] } });
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		const second = await service.getExtensionGalleryManifest();
+		assert.strictEqual(second?.resources[0].id, 'tenantB');
+	});
+
+	test('Microsoft — a transient auth failure does not downgrade an available marketplace', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		let authFails = false;
+		instantiationService.stub(IAuthenticationService, new class extends mock<IAuthenticationService>() {
+			override readonly onDidChangeSessions = onDidChangeSessions.event;
+			override async getSessions(): Promise<readonly AuthenticationSession[]> {
+				if (authFails) {
+					throw new Error('Auth service unavailable');
+				}
+				return [createMicrosoftSession()];
+			}
+		}());
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+
+		// The account can no longer be resolved. That is not a sign-out, and it must not retract a
+		// marketplace the user already has.
+		authFails = true;
+		onDidChangeSessions.fire({ providerId: 'microsoft', label: 'Microsoft', event: { added: [], removed: [], changed: [] } });
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	// --- No configuredServiceUrl ---
+
+	test('no configuredServiceUrl — uses default gallery manifest', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryServiceUrlConfigKey, '');
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// With no configured marketplace serviceUrl the Entra/private-marketplace path is never
+		// engaged; the base class falls back to the product's default gallery → Available.
+		assert.strictEqual(service.extensionGalleryManifestStatus, ExtensionGalleryManifestStatus.Available);
+	});
+
+	// --- Configuration changes ---
+
+	function fireConfigChange(...keys: string[]) {
+		configurationService.onDidChangeConfigurationEmitter.fire({
+			affectsConfiguration: (key: string) => keys.includes(key),
+		} as IConfigurationChangeEvent);
+	}
+
+	test('changing authProvider mid-session prompts for restart', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [createMicrosoftSession()];
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+		assert.deepStrictEqual(restartPrompts, []);
+
+		// The provider is chosen once at startup, so a later change cannot take effect in this
+		// window. It must not be silently ignored.
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		fireConfigChange(ExtensionGalleryAuthProviderConfigKey);
+
+		assert.deepStrictEqual(restartPrompts, ['The Extensions Marketplace configuration has changed. Please restart to apply the changes.']);
+	});
+
+	test('changing serviceUrl mid-session keeps its own restart message', async () => {
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		fireConfigChange(ExtensionGalleryServiceUrlConfigKey);
+
+		// A different marketplace, not a different sign-in — the existing wording still applies.
+		assert.deepStrictEqual(restartPrompts, ['VS Code Test is now configured to a different Marketplace. Please restart to apply the changes.']);
+	});
+
+	test('an unrelated configuration change does not prompt for restart', async () => {
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		fireConfigChange('editor.fontSize');
+
+		assert.deepStrictEqual(restartPrompts, []);
+	});
+
+	// --- Telemetry ---
+
+	function authCheckedEvents() {
+		return telemetryService.events.filter(e => e.eventName === 'marketplace:auth:checked').map(e => e.data);
+	}
+
+	function customMarketplaceCount() {
+		return telemetryService.events.filter(e => e.eventName === 'galleryservice:custom:marketplace').length;
+	}
+
+	test('telemetry — GitHub eligible access reports custom marketplace and auth check', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({ enterprise: true });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(customMarketplaceCount(), 1);
+		assert.deepStrictEqual(authCheckedEvents(), [{ authProvider: 'github', eligible: true }]);
+	});
+
+	test('telemetry — GitHub ineligible access reports auth check but not custom marketplace', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = createDefaultAccount({ enterprise: false });
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// Denied access never publishes the manifest, so the custom-marketplace event does not fire.
+		assert.strictEqual(customMarketplaceCount(), 0);
+		assert.deepStrictEqual(authCheckedEvents(), [{ authProvider: 'github', eligible: false }]);
+	});
+
+	test('telemetry — Microsoft eligible access reports custom marketplace and auth check', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		microsoftSessions = [createMicrosoftSession()];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// Regression guard: the custom-marketplace event must fire for the Microsoft path too, not
+		// just for GitHub. The github/microsoft distinction lives on 'marketplace:auth:checked'.
+		assert.strictEqual(customMarketplaceCount(), 1);
+		assert.deepStrictEqual(authCheckedEvents(), [{ authProvider: 'microsoft', eligible: true }]);
+	});
+
+	test('telemetry — Microsoft ineligible access reports auth check but not custom marketplace', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'microsoft');
+		// A personal Microsoft Account (MSA) is ineligible under the local tenant check.
+		microsoftSessions = [createMicrosoftSession('ms-token', 'ms-account-1', 'ms-session-1', MSA_TENANT_ID)];
+		requestHandler = () => mockResponse(200, createGalleryManifest());
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		assert.strictEqual(customMarketplaceCount(), 0);
+		assert.deepStrictEqual(authCheckedEvents(), [{ authProvider: 'microsoft', eligible: false }]);
+	});
+
+	test('telemetry — RequiresSignIn does not report any access verdict', async () => {
+		configurationService.setUserConfiguration(ExtensionGalleryAuthProviderConfigKey, 'github');
+		defaultAccount = null;
+
+		const service = createService();
+		await service.getExtensionGalleryManifest();
+
+		// No definitive verdict was reached, so nothing is cached and no verdict is reported.
+		assert.strictEqual(customMarketplaceCount(), 0);
+		assert.deepStrictEqual(authCheckedEvents(), []);
+	});
+});
diff --git a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
index dad5d2898e0e0a..b448c855a89159 100644
--- a/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
+++ b/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts
@@ -100,6 +100,13 @@ export class ExtensionManifestPropertiesService extends Disposable implements IE
 			return configuredSessionsWindowSupport;
 		}
 
+		if (manifest.enabledApiProposals?.includes('agentsWindowActivation')) {
+			const declaredSessionsWindowSupport = manifest.capabilities?.agentsWindow?.supported;
+			if (declaredSessionsWindowSupport !== undefined) {
+				return declaredSessionsWindowSupport;
+			}
+		}
+
 		// In the sessions window only extensions that have no code are currently allowed to run
 		if (manifest.main || manifest.browser) {
 			return false;
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 09dd590ee8aea1..cf756954d70a45 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -587,6 +587,20 @@ export const schema: IJSONSchema = {
 							markdownDescription: nls.localize('vscode.extension.capabilities.untrustedWorkspaces.description', "A description of how workspace trust affects the extensions behavior and why it is needed. This only applies when `supported` is not `true`."),
 						}
 					}
+				},
+				agentsWindow: {
+					description: nls.localize('vscode.extension.capabilities.agentsWindow', "Declares whether the extension should be enabled in the Agents window. Requires the `agentsWindowActivation` API proposal."),
+					type: 'object',
+					required: ['supported'],
+					defaultSnippets: [
+						{ body: { supported: true } },
+					],
+					properties: {
+						supported: {
+							markdownDescription: nls.localize('vscode.extension.capabilities.agentsWindow.supported', "Declares whether the extension supports running in the Agents window. The extension must enable the `agentsWindowActivation` API proposal for this property to take effect."),
+							type: 'boolean'
+						}
+					}
 				}
 			}
 		},
diff --git a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts
index a9c6d56d42a848..1a592ed3f55081 100644
--- a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts
+++ b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts
@@ -150,10 +150,20 @@ suite('ExtensionManifestPropertiesService - SessionsWindowSupport', () => {
 		testObject = createTestObject();
 
 		assert.deepStrictEqual([
-			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ main: './out/extension.js', contributes: { commands: [] } })),
-			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ name: 'b', contributes: { themes: [] } })),
+			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ main: './out/extension.js', capabilities: { agentsWindow: { supported: false } }, contributes: { commands: [] } })),
+			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ name: 'b', capabilities: { agentsWindow: { supported: true } }, contributes: { themes: [] } })),
 		], [true, false]);
 	});
+
+	test('uses declared agents window support', () => {
+		testObject = createTestObject();
+
+		assert.deepStrictEqual([
+			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ main: './out/extension.js', enabledApiProposals: ['agentsWindowActivation'], capabilities: { agentsWindow: { supported: true } }, contributes: { commands: [] } })),
+			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ enabledApiProposals: ['agentsWindowActivation'], capabilities: { agentsWindow: { supported: false } }, contributes: { themes: [] } })),
+			testObject.canExecuteOnSessionsWindow(getExtensionManifest({ main: './out/extension.js', capabilities: { agentsWindow: { supported: true } }, contributes: { commands: [] } })),
+		], [true, false, false]);
+	});
 });
 
 
diff --git a/src/vs/workbench/test/browser/componentFixtures/chat/chatQuestionCarousel.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/chat/chatQuestionCarousel.fixture.ts
index 82c998e822d2d3..7b989d831fad61 100644
--- a/src/vs/workbench/test/browser/componentFixtures/chat/chatQuestionCarousel.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/chat/chatQuestionCarousel.fixture.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../../base/browser/dom.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IMarkdownRendererService, MarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
 import { IChatQuestion, IChatQuestionCarousel } from '../../../../contrib/chat/common/chatService/chatService.js';
 import { ChatQuestionCarouselPart, IChatQuestionCarouselOptions } from '../../../../contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.js';
@@ -123,6 +124,19 @@ const multiSelectQuestion: IChatQuestion = {
 	defaultValue: ['lint', 'fmt'],
 };
 
+const markdownLinksQuestion: IChatQuestion = {
+	id: 'review-results',
+	type: 'text',
+	title: 'Review results',
+	message: new MarkdownString('Review the [VS Code documentation](https://code.visualstudio.com/docs) before continuing.'),
+	detailedMessage: new MarkdownString([
+		'Related resources:',
+		'',
+		'- [VS Code repository](https://github.com/microsoft/vscode)',
+		'- [Extension API](https://code.visualstudio.com/api)',
+	].join('\n')),
+};
+
 // ============================================================================
 // Fixtures
 // ============================================================================
@@ -157,6 +171,15 @@ export default defineThemedFixtureGroup({ path: 'chat/' }, {
 		render: (context) => renderCarousel(context, createCarousel([singleSelectQuestion], false)),
 	}),
 
+	MarkdownLinks: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: (context) => {
+			const carousel = createCarousel([markdownLinksQuestion]);
+			carousel.message = new MarkdownString('See the [question guidance](https://code.visualstudio.com/docs/copilot/chat/chat-agent-mode) for more information.');
+			renderCarousel(context, carousel);
+		},
+	}),
+
 	SubmittedSummary: defineComponentFixture({
 		labels: { kind: 'screenshot' },
 		render: (context) => {
diff --git a/src/vs/workbench/test/browser/componentFixtures/sessions/sessionsList.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/sessions/sessionsList.fixture.ts
index 2713a6ae86302e..543f29aa740a1a 100644
--- a/src/vs/workbench/test/browser/componentFixtures/sessions/sessionsList.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/sessions/sessionsList.fixture.ts
@@ -169,6 +169,7 @@ interface IRenderOptions {
 	readonly grouping?: SessionsGrouping;
 	readonly width?: number;
 	readonly phone?: boolean;
+	readonly revealHierarchyGuides?: boolean;
 }
 
 function renderSessionsList(ctx: ComponentFixtureContext, options: IRenderOptions): void {
@@ -298,6 +299,14 @@ function renderSessionsList(ctx: ComponentFixtureContext, options: IRenderOption
 		approvalModel,
 	}));
 	list.layout(options.phone ? 260 : 220, width);
+
+	if (options.revealHierarchyGuides) {
+		const sessionItem = listHost.querySelector<HTMLElement>('.session-item');
+		if (!sessionItem) {
+			throw new Error('Expected a session row to reveal its hierarchy guides.');
+		}
+		sessionItem.dispatchEvent(new MouseEvent('mouseover', { bubbles: true }));
+	}
 }
 
 const GROUP: ISessionGroup = { id: 'group-1', name: 'Release work', createdAt: Date.now() };
@@ -362,6 +371,26 @@ export default defineThemedFixtureGroup({ path: 'sessions/' }, {
 			width: 340,
 		}),
 	}),
+	SessionsList_NestedChatHierarchyGuides: defineComponentFixture({
+		labels: { kind: 'screenshot', blocksCi: true },
+		expectedVisualDescriptions: ['An expanded session has two nested chat rows. A single vertical hierarchy guide runs continuously from below the parent session icon through the first child and ends in an L-shaped connector at the final child, with no gaps between rows.'],
+		render: ctx => renderSessionsList(ctx, {
+			sessions: [
+				{
+					id: 'a',
+					title: 'HTTP Client Retry Plan',
+					workspace: 'vscode-tools',
+					minutesAgo: 2,
+					chats: [
+						{ id: 'task-a', title: 'Task A' },
+						{ id: 'task-b', title: 'Task B' },
+					],
+				},
+			],
+			revealHierarchyGuides: true,
+			width: 340,
+		}),
+	}),
 	SessionsList_NestedChatApprovals_Phone: defineComponentFixture({
 		render: ctx => renderSessionsList(ctx, {
 			sessions: [
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 9bc4dbca5165c9..a02eb91a007b0c 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -68,6 +68,7 @@ import './services/localization/electron-browser/localeService.js';
 import './services/extensions/electron-browser/extensionsScannerService.js';
 import './services/extensionManagement/electron-browser/extensionManagementServerService.js';
 import './services/extensionManagement/electron-browser/extensionGalleryManifestService.js';
+import './services/extensionManagement/electron-browser/extensionGalleryAccountService.js';
 import './services/extensionManagement/electron-browser/extensionTipsService.js';
 import './services/userDataSync/electron-browser/userDataSyncService.js';
 import './services/userDataSync/electron-browser/userDataAutoSyncService.js';
diff --git a/src/vscode-dts/vscode.proposed.agentsWindowActivation.d.ts b/src/vscode-dts/vscode.proposed.agentsWindowActivation.d.ts
new file mode 100644
index 00000000000000..43146aa06c26e7
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.agentsWindowActivation.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Empty placeholder because this proposal only enables the `capabilities.agentsWindow` property in package.json.
diff --git a/test/automation/src/agentsWindow.ts b/test/automation/src/agentsWindow.ts
index f8c7f386337b5f..92526c45be4b69 100644
--- a/test/automation/src/agentsWindow.ts
+++ b/test/automation/src/agentsWindow.ts
@@ -109,6 +109,12 @@ export class AgentsWindow {
 		await this.code.waitForElement(SESSION_TYPE_PICKER_VISIBLE, undefined, retryCount);
 	}
 
+	async waitForActiveSessionView(timeoutMs: number = 30_000): Promise<void> {
+		const retryCount = Math.ceil(timeoutMs / 100);
+		await this.code.waitForElement(NEW_SESSION_VIEW, result => !result, retryCount);
+		await this.code.waitForElement(ACTIVE_SESSION_INPUT_EDITOR, undefined, retryCount);
+	}
+
 	private async isSessionTypeSelected(label: string): Promise<boolean> {
 		const picker = this.code.driver.currentPage.locator(SESSION_TYPE_PICKER_VISIBLE).first();
 		return ((await picker.textContent()) ?? '').trim().toLowerCase() === label.trim().toLowerCase();
diff --git a/test/componentFixtures/blocks-ci-screenshots.md b/test/componentFixtures/blocks-ci-screenshots.md
index 8d502bb1c4ed46..8687b470258d2f 100644
--- a/test/componentFixtures/blocks-ci-screenshots.md
+++ b/test/componentFixtures/blocks-ci-screenshots.md
@@ -203,3 +203,9 @@
 
 #### sessions/chat/newWidget/newChatWidget/NewSessionWorkspacePicker/Light
 ![screenshot](https://hediet-screenshots.azurewebsites.net/images/c51cbace6b7e770064231bb3aac07f91ad41e4fcf4d5bd6aedfbdb00c775fa45)
+
+#### sessions/sessionsList/SessionsList_NestedChatHierarchyGuides/Dark
+![screenshot](https://hediet-screenshots.azurewebsites.net/images/ae6689aace7015963b6fc3812c77019921e63523f97f630afde63579729077f2)
+
+#### sessions/sessionsList/SessionsList_NestedChatHierarchyGuides/Light
+![screenshot](https://hediet-screenshots.azurewebsites.net/images/c46f523601ae0d57ae2bb306465cac7f1fb127adf02c3047c362f8432bd2c864)
diff --git a/test/smoke/src/areas/agentsWindow/agentsWindow.test.ts b/test/smoke/src/areas/agentsWindow/agentsWindow.test.ts
index c1c4a18fb651c9..cecf302d772ae6 100644
--- a/test/smoke/src/areas/agentsWindow/agentsWindow.test.ts
+++ b/test/smoke/src/areas/agentsWindow/agentsWindow.test.ts
@@ -40,6 +40,8 @@ const CODEX_WARMUP_REPLY = 'MOCKED_CODEX_WARMUP_RESPONSE';
 const AGENT_HOST_SCENARIO_ID = 'smoke-hello-agent-host';
 const AGENT_HOST_REPLY = 'MOCKED_AGENT_HOST_RESPONSE';
 const AGENT_HOST_MODEL = 'gpt-5.3-codex';
+const AGENT_HOST_REPLACEMENT_SCENARIO_ID = 'smoke-agent-host-session-replacement';
+const AGENT_HOST_REPLACEMENT_REPLY = 'MOCKED_AGENT_HOST_REPLACEMENT_RESPONSE';
 
 const AGENT_HOST_SANDBOX_SCENARIO_ID = 'smoke-hello-agent-host-sandbox';
 const AGENT_HOST_SANDBOX_REPLY = 'MOCKED_AGENT_HOST_SANDBOX_RESPONSE';
@@ -61,6 +63,7 @@ export function setup(logger: Logger) {
 			serverLabel: 'AgentHost',
 			registerScenarios: ({ ScenarioBuilder, registerScenario }) => {
 				registerScenario(AGENT_HOST_SCENARIO_ID, new ScenarioBuilder().emit(AGENT_HOST_REPLY).build());
+				registerScenario(AGENT_HOST_REPLACEMENT_SCENARIO_ID, new ScenarioBuilder().emit(AGENT_HOST_REPLACEMENT_REPLY).build());
 				registerScenario(AGENT_HOST_SANDBOX_SCENARIO_ID, shellEchoScenario(AGENT_HOST_SANDBOX_REPLY));
 			},
 			settings: {
@@ -81,6 +84,25 @@ export function setup(logger: Logger) {
 			},
 		});
 
+		it('Replaces the new session UI with the in-progress AgentHost session', async function () {
+			this.timeout(5 * 60 * 1000);
+
+			const app = this.app as Application;
+
+			try {
+				await app.workbench.agentsWindow.waitForNewSessionView();
+				await app.workbench.agentsWindow.selectSessionType('Copilot');
+				await app.workbench.agentsWindow.submitNewSessionPrompt(`replace the new session UI [scenario:${AGENT_HOST_REPLACEMENT_SCENARIO_ID}]`);
+				await app.workbench.agentsWindow.waitForActiveSessionView();
+				await app.workbench.agentsWindow.waitForAssistantText(AGENT_HOST_REPLACEMENT_REPLY);
+				await app.workbench.agentsWindow.startNewSession();
+			} catch (error) {
+				logger.log(`Agents Window (AgentHost replacement) FAILURE: ${error instanceof Error ? error.stack ?? error.message : String(error)}`);
+				await dumpFailureDiagnostics(app, logger, 'Agents Window (AgentHost replacement)', { sendButtonSelector: AGENTS_SEND_BUTTON_SELECTOR });
+				throw error;
+			}
+		});
+
 		it('Test Copilot CLI session via AgentHost', async function () {
 			this.timeout(5 * 60 * 1000);