From acf52885ca6b2edd3afa6676fee24c8c02b87119 Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Tue, 13 Jan 2026 15:35:20 -0800
Subject: [PATCH] remove `chat.cca partnerAgents.enabled` (#2821)

* only show if >1 partnerAgent

* remove experimental string
---
 extensions/copilot/package.json                 |  9 ---------
 .../vscode-node/copilotCloudSessionsProvider.ts | 17 ++++++-----------
 .../common/configurationService.ts              |  1 -
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/extensions/copilot/package.json b/extensions/copilot/package.json
index 7b8b5a96f08..fb8320190df 100644
--- a/extensions/copilot/package.json
+++ b/extensions/copilot/package.json
@@ -3921,15 +3921,6 @@
 							"advanced",
 							"experimental"
 						]
-					},
-					"github.copilot.chat.CCAPartnerAgents.enabled": {
-						"type": "boolean",
-						"default": false,
-						"markdownDescription": "Enable partner agents for Copilot Coding Agent (CCA) sessions. Reload VS Code to apply.",
-						"tags": [
-							"advanced",
-							"experimental"
-						]
 					}
 				}
 			}
diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts
index 3f02aaad439..ffe04db06ee 100644
--- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts
+++ b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts
@@ -10,7 +10,6 @@ import * as vscode from 'vscode';
 import { Uri } from 'vscode';
 import { IExperimentationService } from '../../../lib/node/chatLibMain';
 import { IAuthenticationService } from '../../../platform/authentication/common/authentication';
-import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
 import { IGitExtensionService } from '../../../platform/git/common/gitExtensionService';
 import { GithubRepoId, IGitService } from '../../../platform/git/common/gitService';
@@ -198,7 +197,6 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 		@IGithubRepositoryService private readonly _githubRepositoryService: IGithubRepositoryService,
 		@IChatDelegationSummaryService private readonly _chatDelegationSummaryService: IChatDelegationSummaryService,
 		@IExperimentationService private readonly _experimentationService: IExperimentationService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -420,8 +418,8 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 
 
 			// Partner agents
-			const partnerAgentsEnabled = this._configurationService.getConfig(ConfigKey.Advanced.CCAPartnerAgents);
-			if (partnerAgentsEnabled && partnerAgents.length > 0) {
+			// Only show if repo provides a choice of agent (>1)
+			if (partnerAgents.length > 1) {
 				const partnerAgentItems: vscode.ChatSessionProviderOptionItem[] = partnerAgents.map(agent => ({
 					id: agent.id,
 					name: agent.name,
@@ -429,7 +427,7 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 				optionGroups.push({
 					id: PARTNER_AGENTS_OPTION_GROUP_ID,
 					name: vscode.l10n.t('Partner Agents'),
-					description: vscode.l10n.t('(Experimental) Select which partner agent to use'),
+					description: vscode.l10n.t('Select which partner agent to use'),
 					items: partnerAgentItems,
 				});
 			}
@@ -898,7 +896,6 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 
 	private createEmptySession(resource: Uri): vscode.ChatSession {
 		const sessionId = resource ? resource.path.slice(1) : undefined;
-		const partnerAgentsEnabled = this._configurationService.getConfig(ConfigKey.Advanced.CCAPartnerAgents);
 		return {
 			history: [],
 			...(sessionId && sessionId.startsWith('untitled-')
@@ -910,11 +907,9 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 						[MODELS_OPTION_GROUP_ID]:
 							this.sessionModelMap.get(resource)
 							?? (this.sessionModelMap.set(resource, DEFAULT_MODEL_ID), DEFAULT_MODEL_ID),
-						...(partnerAgentsEnabled && {
-							[PARTNER_AGENTS_OPTION_GROUP_ID]:
-								this.sessionPartnerAgentMap.get(resource)
-								?? (this.sessionPartnerAgentMap.set(resource, DEFAULT_PARTNER_AGENT_ID), DEFAULT_PARTNER_AGENT_ID),
-						}),
+						[PARTNER_AGENTS_OPTION_GROUP_ID]:
+							this.sessionPartnerAgentMap.get(resource)
+							?? (this.sessionPartnerAgentMap.set(resource, DEFAULT_PARTNER_AGENT_ID), DEFAULT_PARTNER_AGENT_ID),
 					}
 				}
 				: {}),
diff --git a/extensions/copilot/src/platform/configuration/common/configurationService.ts b/extensions/copilot/src/platform/configuration/common/configurationService.ts
index ad19d5ad3ac..577781fd529 100644
--- a/extensions/copilot/src/platform/configuration/common/configurationService.ts
+++ b/extensions/copilot/src/platform/configuration/common/configurationService.ts
@@ -696,7 +696,6 @@ export namespace ConfigKey {
 		export const InlineEditsPreferredModel = defineSetting<string | 'none'>('nextEditSuggestions.preferredModel', ConfigType.ExperimentBased, 'none');
 		export const DiagnosticsContextProvider = defineAndMigrateExpSetting<boolean>('chat.advanced.inlineEdits.diagnosticsContextProvider.enabled', 'chat.inlineEdits.diagnosticsContextProvider.enabled', false);
 		export const Gemini3MultiReplaceString = defineSetting<boolean>('chat.edits.gemini3MultiReplaceString', ConfigType.ExperimentBased, false);
-		export const CCAPartnerAgents = defineSetting<boolean>('chat.CCAPartnerAgents.enabled', ConfigType.Simple, false);
 	}
 
 	/**