From be161a6b320b4d69ed3bc654ca73a6f2adc287b6 Mon Sep 17 00:00:00 2001
From: Vijay Upadya <41652029+vijayupadya@users.noreply.github.com>
Date: Sat, 18 Jul 2026 22:19:29 -0700
Subject: [PATCH] Apply gemini prompt update to all except gemini-3-flash and
 gemini-2.5 (#324830)

* apply prompt update to all gemini-3

* Update filter

* update prompt
---
 .../extension/prompts/node/agent/geminiPrompts.tsx  | 13 ++++++++++---
 .../configuration/common/configurationService.ts    |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/extensions/copilot/src/extension/prompts/node/agent/geminiPrompts.tsx b/extensions/copilot/src/extension/prompts/node/agent/geminiPrompts.tsx
index e55d98ac98ba8..aab977cc04b09 100644
--- a/extensions/copilot/src/extension/prompts/node/agent/geminiPrompts.tsx
+++ b/extensions/copilot/src/extension/prompts/node/agent/geminiPrompts.tsx
@@ -33,9 +33,16 @@ export class DefaultGeminiAgentPrompt extends PromptElement<DefaultAgentPromptPr
 	async render(state: void, sizing: PromptSizing) {
 		const tools = detectToolCapabilities(this.props.availableTools);
 
-		// Experiment to reduce Gemini 3.5 Flash's proactive tool usage by instructing it to minimize tool calls.
-		const reduceToolUse = this.props.modelFamily?.toLowerCase().includes('gemini-3.5-flash')
-			&& this.configurationService.getExperimentBasedConfig(ConfigKey.EnableGemini35FlashReducedToolUsePrompt, this.experimentationService);
+		// Experiment to reduce Gemini models' proactive tool usage by instructing them to minimize tool calls.
+		// Applies to all Gemini models except the gemini-3-flash and gemini-2 families.
+		const modelFamily = this.props.modelFamily?.toLowerCase();
+		const isExcludedGeminiFamily = !!modelFamily && (
+			modelFamily.includes('gemini-3-flash')
+			|| modelFamily.includes('gemini-2')
+		);
+		const reduceToolUse = !!modelFamily?.includes('gemini')
+			&& !isExcludedGeminiFamily
+			&& this.configurationService.getExperimentBasedConfig(ConfigKey.EnableGemini3ReducedToolUsePrompt, this.experimentationService);
 
 		return <InstructionMessage>
 			<Tag name='instructions'>
diff --git a/extensions/copilot/src/platform/configuration/common/configurationService.ts b/extensions/copilot/src/platform/configuration/common/configurationService.ts
index f6ceb8ebca85f..e737515a7d14f 100644
--- a/extensions/copilot/src/platform/configuration/common/configurationService.ts
+++ b/extensions/copilot/src/platform/configuration/common/configurationService.ts
@@ -1061,7 +1061,7 @@ export namespace ConfigKey {
 
 	export const EnableAlternateGptPrompt = defineSetting<boolean>('chat.alternateGptPrompt.enabled', ConfigType.ExperimentBased, false);
 	export const EnableAlternateGeminiModelFPrompt = defineSetting<boolean>('chat.alternateGeminiModelFPrompt.enabled', ConfigType.ExperimentBased, false);
-	export const EnableGemini35FlashReducedToolUsePrompt = defineSetting<boolean>('chat.gemini35FlashReducedToolUsePrompt.enabled', ConfigType.ExperimentBased, true);
+	export const EnableGemini3ReducedToolUsePrompt = defineSetting<boolean>('chat.gemini35FlashReducedToolUsePrompt.enabled', ConfigType.ExperimentBased, true);
 
 	export const EnableOrganizationCustomAgents = defineSetting<boolean>('chat.organizationCustomAgents.enabled', ConfigType.Simple, true);
 	export const EnableOrganizationInstructions = defineSetting<boolean>('chat.organizationInstructions.enabled', ConfigType.Simple, true);