When rendering the prompts, exclude turns from the history that errored due to prompt filtration (#399)

* When rendering the prompts, exclude turns from the history that errored due to prompt filtration. This was resulting in users getting stuck in a state where all their subsequent requests were being filtered.

* Differentiate between response-filtered and prompt-filtered results (response-filtered requests should be rendered in the message history whereas prompt-filtered requests should not)

Author: jwangxx

src/extension/intents/node/toolCallingLoop.ts

@@ -131,11 +131,13 @@ export abstract class ToolCallingLoop<TOptions extends IToolCallingLoopOptions =
 		const query = isContinuation ?
 			'Please continue' :
 			this.turn.request.message;
+		// exclude turns from the history that errored due to prompt filtration
+		const history = this.options.conversation.turns.slice(0, -1).filter(turn => turn.responseStatus !== TurnStatus.PromptFiltered);
 
 		return {
 			requestId: this.turn.id,
 			query,
-			history: this.options.conversation.turns.slice(0, -1),
+			history,
 			toolCallResults: this.toolCallResults,
 			toolCallRounds: this.toolCallRounds,
 			editedFileEvents: this.options.request.editedFileEvents,

src/extension/prompt/common/conversation.ts

@@ -5,6 +5,7 @@
 
 import { PromptReference, Raw } from '@vscode/prompt-tsx';
 import type { ChatRequestEditedFileEvent, ChatResponseStream, ChatResult, LanguageModelToolResult } from 'vscode';
+import { FilterReason } from '../../../platform/networking/common/openai';
 import { isLocation, toLocation } from '../../../util/common/types';
 import { ResourceMap } from '../../../util/vs/base/common/map';
 import { assertType } from '../../../util/vs/base/common/types';
@@ -22,6 +23,7 @@ export enum TurnStatus {
 	Cancelled = 'cancelled',
 	OffTopic = 'off-topic',
 	Filtered = 'filtered',
+	PromptFiltered = 'prompt-filtered',
 	Error = 'error',
 }
 
@@ -315,6 +317,7 @@ export interface IResultMetadata {
 	renderedUserMessage?: Raw.ChatCompletionContentPart[];
 	renderedGlobalContext?: Raw.ChatCompletionContentPart[];
 	command?: string;
+	filterCategory?: FilterReason;
 
 	/**
 	 * All code blocks that were in the response

src/extension/prompt/node/chatMLFetcher.ts

@@ -499,7 +499,7 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 			return { type: ChatFetchResponseType.Failed, reason, requestId, serverRequestId };
 		}
 		if (response.failKind === ChatFailKind.ContentFilter) {
-			return { type: ChatFetchResponseType.Filtered, reason, category: FilterReason.Prompt, requestId, serverRequestId };
+			return { type: ChatFetchResponseType.PromptFiltered, reason, category: FilterReason.Prompt, requestId, serverRequestId };
 		}
 		if (response.failKind === ChatFailKind.AgentUnauthorized) {
 			return { type: ChatFetchResponseType.AgentUnauthorized, reason, authorizationUrl: response.data!.authorize_url, requestId, serverRequestId };

src/extension/prompt/node/chatParticipantRequestHandler.ts

@@ -11,6 +11,7 @@ import { CanceledMessage, ChatLocation } from '../../../platform/chat/common/com
 import { IEndpointProvider } from '../../../platform/endpoint/common/endpointProvider';
 import { IIgnoreService } from '../../../platform/ignore/common/ignoreService';
 import { ILogService } from '../../../platform/log/common/logService';
+import { FilterReason } from '../../../platform/networking/common/openai';
 import { ITabsAndEditorsService } from '../../../platform/tabs/common/tabsAndEditorsService';
 import { getWorkspaceFileDisplayPath, IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
 import { ChatResponseStreamImpl } from '../../../util/common/chatResponseStreamImpl';
@@ -413,7 +414,11 @@ function createTurnFromVSCodeChatHistoryTurns(
 	if (!chatResponseTurn.result.errorDetails) {
 		status = TurnStatus.Success;
 	} else if (chatResponseTurn.result.errorDetails?.responseIsFiltered) {
-		status = TurnStatus.Filtered;
+		if (chatResponseTurn.result.metadata?.category === FilterReason.Prompt) {
+			status = TurnStatus.PromptFiltered;
+		} else {
+			status = TurnStatus.Filtered;
+		}
 	} else if (chatResponseTurn.result.errorDetails.message === 'Cancelled' || chatResponseTurn.result.errorDetails.message === CanceledMessage.message) {
 		status = TurnStatus.Cancelled;
 	} else {

src/extension/prompt/node/defaultIntentRequestHandler.ts

@@ -16,6 +16,7 @@ import { IEndpointProvider } from '../../../platform/endpoint/common/endpointPro
 import { HAS_IGNORED_FILES_MESSAGE } from '../../../platform/ignore/common/ignoreService';
 import { ILogService } from '../../../platform/log/common/logService';
 import { FinishedCallback, IResponseDelta, OptionalChatRequestParams } from '../../../platform/networking/common/fetch';
+import { FilterReason } from '../../../platform/networking/common/openai';
 import { IRequestLogger } from '../../../platform/requestLogger/node/requestLogger';
 import { ISurveyService } from '../../../platform/survey/common/surveyService';
 import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
@@ -432,10 +433,16 @@ export class DefaultIntentRequestHandler {
 			}
 			case ChatFetchResponseType.Filtered: {
 				const errorDetails = getErrorDetailsFromChatFetchError(fetchResult, (await this._authenticationService.getCopilotToken()).copilotPlan);
-				const chatResult = { errorDetails, metadata: metadataFragment };
+				const chatResult = { errorDetails, metadata: { ...metadataFragment, filterReason: fetchResult.category } };
 				this.turn.setResponse(TurnStatus.Filtered, undefined, baseModelTelemetry.properties.messageId, chatResult);
 				return chatResult;
 			}
+			case ChatFetchResponseType.PromptFiltered: {
+				const errorDetails = getErrorDetailsFromChatFetchError(fetchResult, (await this._authenticationService.getCopilotToken()).copilotPlan);
+				const chatResult = { errorDetails, metadata: { ...metadataFragment, filterReason: FilterReason.Prompt } };
+				this.turn.setResponse(TurnStatus.PromptFiltered, undefined, baseModelTelemetry.properties.messageId, chatResult);
+				return chatResult;
+			}
 			case ChatFetchResponseType.AgentUnauthorized: {
 				const chatResult = {};
 				this.turn.setResponse(TurnStatus.Error, undefined, baseModelTelemetry.properties.messageId, chatResult);

src/extension/prompts/node/panel/conversationHistory.tsx

@@ -72,7 +72,8 @@ export class HistoryWithInstructions extends PromptElement<Omit<ConversationHist
  */
 export class ConversationHistory extends PromptElement<ConversationHistoryProps> {
 	override render(_state: void, _sizing: PromptSizing): PromptPiece<any, any> | undefined {
-		let turnHistory = this.props.history;
+		// exclude turns from the history that errored due to prompt filtration
+		let turnHistory = this.props.history.filter(turn => turn.responseStatus !== TurnStatus.PromptFiltered);
 
 		if (this.props.inline && turnHistory.length > 0) {
 			const historyMessage = `The current code is a result of a previous interaction with you. Here are my previous messages: \n- ${turnHistory.map(r => r.request.message).join('\n- ')}`;

src/extension/xtab/node/xtabProvider.ts

@@ -774,6 +774,7 @@ export class XtabProvider extends ChainedStatelessNextEditProvider {
 				return new NoNextEditReason.GotCancelled('afterFetchCall');
 			case ChatFetchResponseType.OffTopic:
 			case ChatFetchResponseType.Filtered:
+			case ChatFetchResponseType.PromptFiltered:
 			case ChatFetchResponseType.Length:
 			case ChatFetchResponseType.RateLimited:
 			case ChatFetchResponseType.QuotaExceeded:

src/platform/chat/common/commonTypes.ts

@@ -87,6 +87,7 @@ export enum ChatFetchResponseType {
 	OffTopic = 'offTopic',
 	Canceled = 'canceled',
 	Filtered = 'filtered',
+	PromptFiltered = 'promptFiltered',
 	Length = 'length',
 	RateLimited = 'rateLimited',
 	QuotaExceeded = 'quotaExceeded',
@@ -123,6 +124,10 @@ export type ChatFetchError =
 	 * We requested conversation, but the response was filtered by RAI.
 	 */
 	| { type: ChatFetchResponseType.Filtered; reason: string; category: FilterReason; requestId: string; serverRequestId: string | undefined }
+	/**
+	 * We requested conversation, but the prompt was filtered by RAI.
+	 */
+	| { type: ChatFetchResponseType.PromptFiltered; reason: string; category: FilterReason; requestId: string; serverRequestId: string | undefined }
 	/**
 	 * We requested conversation, but the response was too long.
 	 */
@@ -257,6 +262,7 @@ export function getErrorDetailsFromChatFetchError(fetchResult: ChatFetchError, c
 		case ChatFetchResponseType.Failed:
 			return { message: l10n.t(`Sorry, your request failed. Please try again. Request id: {0}\n\nReason: {1}`, fetchResult.requestId, fetchResult.reason) };
 		case ChatFetchResponseType.Filtered:
+		case ChatFetchResponseType.PromptFiltered:
 			return {
 				message: getFilteredMessage(fetchResult.category),
 				responseIsFiltered: true,
@@ -289,6 +295,16 @@ export function getFilteredMessage(category: FilterReason, supportsMarkdown: boo
 			} else {
 				return l10n.t(`Sorry, the response matched public code so it was blocked. Please rephrase your prompt.`);
 			}
+		case FilterReason.Prompt:
+			if (supportsMarkdown) {
+				return l10n.t({
+					message:
+						`Sorry, your prompt was filtered by the Responsible AI Service. Please rephrase your prompt and try again. [Learn more](https://aka.ms/copilot-chat-filtered-docs).`,
+					comment: ["{Locked='](https://aka.ms/copilot-chat-filtered-docs)'}"]
+				});
+			} else {
+				return l10n.t(`Sorry, your prompt was filtered by the Responsible AI Service. Please rephrase your prompt and try again.`);
+			}
 		default:
 			if (supportsMarkdown) {
 				return l10n.t({

test/base/cachingChatMLFetcher.ts

@@ -239,6 +239,7 @@ export class CachingChatMLFetcher extends AbstractChatMLFetcher implements IDisp
 			if (
 				result.type === ChatFetchResponseType.OffTopic
 				|| result.type === ChatFetchResponseType.Filtered
+				|| result.type === ChatFetchResponseType.PromptFiltered
 				|| result.type === ChatFetchResponseType.Length
 				|| result.type === ChatFetchResponseType.Success
 			) {