Remove experimental setting for retrying after filtered response (#830)

Author: jwangxx

package.json

@@ -2918,14 +2918,6 @@
 						},
 						"markdownDescription": "Configure custom OpenAI-compatible models. Each key should be a unique model ID, and the value should be an object with model configuration including name, url, toolCalling, vision, maxInputTokens, and maxOutputTokens properties."
 					},
-					"github.copilot.chat.enableRetryAfterFilteredResponse": {
-						"type": "boolean",
-						"default": true,
-						"tags": [
-							"experimental"
-						],
-						"description": "%github.copilot.config.retryAfterFilteredResponse.enabled%"
-					},
 					"github.copilot.chat.alternateGptPrompt.enabled": {
 						"type": "boolean",
 						"default": false,

package.nls.json

@@ -132,7 +132,6 @@
 	"github.copilot.config.setupTests.enabled": "Enables the `/setupTests` intent and prompting in `/tests` generation.",
 	"github.copilot.config.byok.ollamaEndpoint": "The endpoint to use for the Ollama when accessed via bring your own key. Defaults to localhost.",
 	"github.copilot.config.virtualTools.threshold": "This setting defines the tool count over which virtual tools should be used. Virtual tools group similar sets of tools together and they allow the model to activate them on-demand. Certain tool groups will optimistically be pre-activated. We are actively developing this feature and you experience degraded tool calling once the threshold is hit.\n\nMay be set to `0` to disable virtual tools.",
-	"github.copilot.config.retryAfterFilteredResponse.enabled": "Enables retrying after a filtered response. If enabled, Copilot Chat will retry the request after a content filter blocks the response.",
 	"github.copilot.config.alternateGptPrompt.enabled": "Enables an experimental alternate prompt for GPT models instead of the default prompt.",
 	"github.copilot.config.gpt5AlternatePrompt": "Specifies an experimental alternate prompt to use for GPT-5 models.",
 	"github.copilot.config.grokCodeAlternatePrompt": "Specifies an experimental alternate prompt to use for Grok Code models.",

src/extension/prompt/node/chatMLFetcher.ts

@@ -12,7 +12,7 @@ import { ChatFetchError, ChatFetchResponseType, ChatFetchRetriableError, ChatLoc
 import { IConversationOptions } from '../../../platform/chat/common/conversationOptions';
 import { getTextPart, toTextParts } from '../../../platform/chat/common/globalStringUtils';
 import { IInteractionService } from '../../../platform/chat/common/interactionService';
-import { ConfigKey, HARD_TOOL_LIMIT, IConfigurationService } from '../../../platform/configuration/common/configurationService';
+import { HARD_TOOL_LIMIT } from '../../../platform/configuration/common/configurationService';
 import { ICAPIClientService } from '../../../platform/endpoint/common/capiClient';
 import { IDomainService } from '../../../platform/endpoint/common/domainService';
 import { IEnvService } from '../../../platform/env/common/envService';
@@ -23,7 +23,6 @@ import { IChatEndpoint } from '../../../platform/networking/common/networking';
 import { ChatCompletion, FilterReason, FinishedCompletionReason } from '../../../platform/networking/common/openai';
 import { ChatFailKind, ChatRequestCanceled, ChatRequestFailed, ChatResults, fetchAndStreamChat, FetchResponseKind } from '../../../platform/openai/node/fetch';
 import { IRequestLogger } from '../../../platform/requestLogger/node/requestLogger';
-import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
 import { ITelemetryService, TelemetryProperties } from '../../../platform/telemetry/common/telemetry';
 import { TelemetryData } from '../../../platform/telemetry/common/telemetryData';
 import { calculateLineRepetitionStats, isRepetitive } from '../../../util/common/anomalyDetection';
@@ -93,8 +92,6 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 		@IInteractionService private readonly _interactionService: IInteractionService,
 		@IChatQuotaService private readonly _chatQuotaService: IChatQuotaService,
 		@IConversationOptions options: IConversationOptions,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IExperimentationService private readonly experimentationService: IExperimentationService,
 	) {
 		super(options);
 	}
@@ -496,28 +493,16 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 
 		const result = completions.at(0);
 
-		const isRetryAfterFilteredResponseEnabled = this.configurationService.getExperimentBasedConfig(ConfigKey.EnableRetryAfterFilteredResponse, this.experimentationService);
-
 		switch (result?.finishReason) {
 			case FinishedCompletionReason.ContentFilter:
-				if (isRetryAfterFilteredResponseEnabled) {
-					return {
-						type: ChatFetchResponseType.FilteredRetry,
-						category: result.filterReason ?? FilterReason.Copyright,
-						reason: 'Response got filtered.',
-						value: completions.map(c => getTextPart(c.message.content)),
-						requestId: requestId,
-						serverRequestId: result.requestId.headerRequestId,
-					};
-				} else {
-					return {
-						type: ChatFetchResponseType.Filtered,
-						category: result.filterReason ?? FilterReason.Copyright,
-						reason: 'Response got filtered.',
-						requestId: requestId,
-						serverRequestId: result.requestId.headerRequestId
-					};
-				}
+				return {
+					type: ChatFetchResponseType.FilteredRetry,
+					category: result.filterReason ?? FilterReason.Copyright,
+					reason: 'Response got filtered.',
+					value: completions.map(c => getTextPart(c.message.content)),
+					requestId: requestId,
+					serverRequestId: result.requestId.headerRequestId,
+				};
 			case FinishedCompletionReason.Length:
 				return {
 					type: ChatFetchResponseType.Length,

src/platform/configuration/common/configurationService.ts

@@ -784,7 +784,6 @@ export namespace ConfigKey {
 	export const UseAlternativeNESNotebookFormat = defineExpSetting<boolean>('chat.notebook.enhancedNextEditSuggestions.enabled', false);
 	export const CustomInstructionsInSystemMessage = defineSetting<boolean>('chat.customInstructionsInSystemMessage', true);
 
-	export const EnableRetryAfterFilteredResponse = defineExpSetting<boolean>('chat.enableRetryAfterFilteredResponse', true);
 	export const EnableAlternateGptPrompt = defineExpSetting<boolean>('chat.alternateGptPrompt.enabled', false);
 	export const Gpt5AlternatePrompt = defineExpSetting<string>('chat.gpt5AlternatePrompt', 'default');
 	export const GrokCodeAlternatePrompt = defineExpSetting<string>('chat.grokCodeAlternatePrompt', 'default');