@codingame/monaco-vscode-api 26.1.1 → 26.1.2

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -10,6 +10,7 @@ import { parse, revive } from '../../../base/common/marshalling.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { Mimes } from '../../../base/common/mime.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
+import { OS } from '../../../base/common/platform.js';
 import { WellDefinedPrefixTree } from '../../../base/common/prefixTree.js';
 import { basename } from '../../../base/common/resources.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
@@ -27,6 +28,7 @@ import { SaveReason, DEFAULT_EDITOR_ASSOCIATION } from '../../common/editor.js';
 import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
 import { isImageVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
+import { resolveEffectiveCommand } from '../../contrib/chat/common/promptSyntax/hookSchema.js';
 import { ToolInvocationPresentation, ToolDataSource } from '../../contrib/chat/common/tools/languageModelToolsService.js';
 import { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState } from '../../contrib/debug/common/debug.js';
@@ -40,7 +42,7 @@ import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorSer
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
-import { StandardTokenType as StandardTokenType$1, ViewColumn as ViewColumn$1, DecorationRangeBehavior as DecorationRangeBehavior$1, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelDataPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelThinkingPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatQuestionType, ChatQuestion, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseFileTreePart, ChatResponseMultiDiffPart as ChatResponseMultiDiffPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatToolInvocationPart as ChatToolInvocationPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseExtensionsPart as ChatResponseExtensionsPart$1, ChatResponsePullRequestPart as ChatResponsePullRequestPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, InlineCompletionDisplayLocationKind, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, McpHttpServerDefinition, McpStdioServerDefinition, SourceControlInputBoxValidationType as SourceControlInputBoxValidationType$1 } from './extHostTypes.js';
+import { StandardTokenType as StandardTokenType$1, ViewColumn as ViewColumn$1, DecorationRangeBehavior as DecorationRangeBehavior$1, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelDataPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelThinkingPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatQuestionType, ChatQuestion, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseFileTreePart, ChatResponseMultiDiffPart as ChatResponseMultiDiffPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatToolInvocationPart as ChatToolInvocationPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseExtensionsPart as ChatResponseExtensionsPart$1, ChatResponsePullRequestPart as ChatResponsePullRequestPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, InlineCompletionDisplayLocationKind, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, McpHttpServerDefinition, McpStdioServerDefinition, SourceControlInputBoxValidationType as SourceControlInputBoxValidationType$1 } from './extHostTypes.js';
 import { SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation } from './extHostTypes/symbolInformation.js';
 import { Position as Position$1 } from './extHostTypes/position.js';
 import { Selection as Selection$1 } from './extHostTypes/selection.js';
@@ -2791,6 +2793,23 @@ var ChatResponseThinkingProgressPart;
 })(
     ChatResponseThinkingProgressPart || (ChatResponseThinkingProgressPart = {})
 );
+var ChatResponseHookPart;
+(function(ChatResponseHookPart) {
+    function from(part) {
+        return {
+            kind: "hook",
+            hookType: part.hookType,
+            stopReason: part.stopReason,
+            systemMessage: part.systemMessage,
+            metadata: part.metadata
+        };
+    }
+    ChatResponseHookPart.from = from;
+    function to(part) {
+        return new ChatResponseHookPart$1(part.hookType, part.stopReason, part.systemMessage, part.metadata);
+    }
+    ChatResponseHookPart.to = to;
+})(ChatResponseHookPart || (ChatResponseHookPart = {}));
 var ChatResponseWarningPart;
 (function(ChatResponseWarningPart) {
     function from(part) {
@@ -3149,6 +3168,8 @@ var ChatResponsePart;
             return ChatResponseProgressPart.from(part);
         } else if (part instanceof ChatResponseThinkingProgressPart$1) {
             return ChatResponseThinkingProgressPart.from(part);
+        } else if (part instanceof ChatResponseHookPart$1) {
+            return ChatResponseHookPart.from(part);
         } else if (part instanceof ChatResponseFileTreePart) {
             return ChatResponseFilesPart.from(part);
         } else if (part instanceof ChatResponseMultiDiffPart$1) {
@@ -3259,7 +3280,9 @@ var ChatAgentRequest;
             modeInstructions: request.modeInstructions?.content,
             modeInstructions2: ChatRequestModeInstructions.to(request.modeInstructions),
             subAgentInvocationId: request.subAgentInvocationId,
-            subAgentName: request.subAgentName
+            subAgentName: request.subAgentName,
+            hasHooksEnabled: request.hasHooksEnabled ?? false,
+            hooks: request.hooks ? ChatRequestHooksConverter.to(request.hooks) : undefined
         };
         if (!isProposedApiEnabled(extension, "chatParticipantPrivate")) {
             delete requestWithAllProps.id;
@@ -3272,6 +3295,8 @@ var ChatAgentRequest;
             delete requestWithAllProps.sessionId;
             delete requestWithAllProps.subAgentInvocationId;
             delete requestWithAllProps.subAgentName;
+            delete requestWithAllProps.hasHooksEnabled;
+            delete requestWithAllProps.hooks;
         }
         if (!isProposedApiEnabled(extension, "chatParticipantAdditions")) {
             delete requestWithAllProps.acceptedConfirmationData;
@@ -3915,5 +3940,44 @@ var SourceControlInputBoxValidationType;
 })(
     SourceControlInputBoxValidationType || (SourceControlInputBoxValidationType = {})
 );
+var ChatRequestHooksConverter;
+(function(ChatRequestHooksConverter) {
+    function to(hooks) {
+        const result = {};
+        for (const [hookType, commands] of Object.entries(hooks)) {
+            if (!commands || commands.length === 0) {
+                continue;
+            }
+            const converted = [];
+            for (const cmd of commands) {
+                const resolved = ChatHookCommand.to(cmd);
+                if (resolved) {
+                    converted.push(resolved);
+                }
+            }
+            if (converted.length > 0) {
+                result[hookType] = converted;
+            }
+        }
+        return result;
+    }
+    ChatRequestHooksConverter.to = to;
+})(ChatRequestHooksConverter || (ChatRequestHooksConverter = {}));
+var ChatHookCommand;
+(function(ChatHookCommand) {
+    function to(hook) {
+        const command = resolveEffectiveCommand(hook, OS);
+        if (!command) {
+            return undefined;
+        }
+        return {
+            command,
+            cwd: hook.cwd,
+            env: hook.env,
+            timeout: hook.timeout
+        };
+    }
+    ChatHookCommand.to = to;
+})(ChatHookCommand || (ChatHookCommand = {}));
 
-export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatTask, ChatTaskResult, ChatToolInvocationPart, CodeActionTriggerKind, Color, ColorPresentation, CompletionCommand, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, LanguageModelToolSource, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SourceControlInputBoxValidationType, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalCompletionResourceOptions, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatHookCommand, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestHooksConverter, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatTask, ChatTaskResult, ChatToolInvocationPart, CodeActionTriggerKind, Color, ColorPresentation, CompletionCommand, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, LanguageModelToolSource, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SourceControlInputBoxValidationType, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalCompletionResourceOptions, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };

package/vscode/src/vs/workbench/api/common/extHostTypes.d.ts

@@ -18,6 +18,7 @@ import { SnippetString } from "./extHostTypes/snippetString.js";
 import { SymbolKind, SymbolTag } from "./extHostTypes/symbolInformation.js";
 import { TextEdit } from "./extHostTypes/textEdit.js";
 import { WorkspaceEdit } from "./extHostTypes/workspaceEdit.js";
+import { HookTypeValue } from "../../contrib/chat/common/promptSyntax/hookSchema.js";
 export { CodeActionKind } from "./extHostTypes/codeActionKind.js";
 export { Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag } from "./extHostTypes/diagnostic.js";
 export { Location } from "./extHostTypes/location.js";
@@ -1504,6 +1505,17 @@ export declare class ChatResponseThinkingProgressPart {
         readonly [key: string]: any;
     });
 }
+export declare class ChatResponseHookPart {
+    hookType: HookTypeValue;
+    stopReason?: string;
+    systemMessage?: string;
+    metadata?: {
+        readonly [key: string]: unknown;
+    };
+    constructor(hookType: HookTypeValue, stopReason?: string, systemMessage?: string, metadata?: {
+        readonly [key: string]: unknown;
+    });
+}
 export declare class ChatResponseWarningPart {
     value: vscode.MarkdownString;
     constructor(value: string | vscode.MarkdownString);

package/vscode/src/vs/workbench/api/common/extHostTypes.js

@@ -2441,6 +2441,14 @@ class ChatResponseThinkingProgressPart {
         this.metadata = metadata;
     }
 }
+class ChatResponseHookPart {
+    constructor(hookType, stopReason, systemMessage, metadata) {
+        this.hookType = hookType;
+        this.stopReason = stopReason;
+        this.systemMessage = systemMessage;
+        this.metadata = metadata;
+    }
+}
 class ChatResponseWarningPart {
     constructor(value) {
         if (typeof value !== "string" && value.isTrusted === true) {
@@ -2962,4 +2970,4 @@ class McpHttpServerDefinition {
     }
 }
 
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatQuestion, ChatQuestionType, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionChangedFile2, ChatSessionStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, McpToolInvocationContentData, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatQuestion, ChatQuestionType, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionChangedFile2, ChatSessionStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, McpToolInvocationContentData, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js

@@ -790,13 +790,7 @@ function registerChatActions() {
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
-                precondition: ChatContextKeys.enabled,
-                menu: {
-                    id: CHAT_CONFIG_MENU_ID,
-                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)))),
-                    order: 11,
-                    group: "1_level"
-                }
+                precondition: ChatContextKeys.enabled
             });
         }
         async run(accessor) {

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.d.ts

@@ -9,6 +9,11 @@ export declare enum AgentSessionProviders {
 }
 export declare function isBuiltInAgentSessionProvider(provider: string): boolean;
 export declare function getAgentSessionProvider(sessionResource: URI | string): AgentSessionProviders | undefined;
+/**
+ * Observable holding the display name for the background agent session provider.
+ * Updated via experiment treatment to allow A/B testing of the display name.
+ */
+export declare const backgroundAgentDisplayName: import("../../../../../base/common/observable.js").ISettableObservable<string, void>;
 export declare function getAgentSessionProviderName(provider: AgentSessionProviders): string;
 export declare function getAgentSessionProviderIcon(provider: AgentSessionProviders): ThemeIcon;
 export declare function isFirstPartyAgentSessionProvider(provider: AgentSessionProviders): boolean;

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.js

@@ -2,6 +2,7 @@
 import { localize } from '../../../../../nls.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { URI } from '../../../../../base/common/uri.js';
+import '../../../../../base/common/observableInternal/index.js';
 import '../../common/chatSessionsService.js';
 import { registerColor, transparent } from '../../../../../platform/theme/common/colorUtils.js';
 import { foreground } from '../../../../../platform/theme/common/colors/baseColors.js';
@@ -15,6 +16,7 @@ import '../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 import { getChatSessionType } from '../../common/model/chatUri.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 
 var AgentSessionProviders;
 (function(AgentSessionProviders) {
@@ -40,14 +42,15 @@ function getAgentSessionProvider(sessionResource) {
         return undefined;
     }
 }
+const backgroundAgentDisplayName = observableValue("backgroundAgentDisplayName", ( localize(4914, "Background")));
 function getAgentSessionProviderName(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
-        return localize(4898, "Local");
+        return localize(4915, "Local");
     case AgentSessionProviders.Background:
-        return localize(4899, "Background");
+        return backgroundAgentDisplayName.get();
     case AgentSessionProviders.Cloud:
-        return localize(4900, "Cloud");
+        return localize(4916, "Cloud");
     case AgentSessionProviders.Claude:
         return "Claude";
     case AgentSessionProviders.Codex:
@@ -94,27 +97,27 @@ function getAgentSessionProviderDescription(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
         return localize(
-            4901,
+            4917,
             "Run tasks within VS Code chat. The agent iterates via chat and works interactively to implement changes on your main workspace."
         );
     case AgentSessionProviders.Background:
         return localize(
-            4902,
+            4918,
             "Delegate tasks to a background agent running locally on your machine. The agent iterates via chat and works asynchronously in a Git worktree to implement changes isolated from your main workspace using the GitHub Copilot CLI."
         );
     case AgentSessionProviders.Cloud:
         return localize(
-            4903,
+            4919,
             "Delegate tasks to the GitHub Copilot coding agent. The agent iterates via chat and works asynchronously in the cloud to implement changes and pull requests as needed."
         );
     case AgentSessionProviders.Claude:
         return localize(
-            4904,
+            4920,
             "Delegate tasks to the Claude Agent SDK using the Claude models included in your GitHub Copilot subscription. The agent iterates via chat and works interactively to implement changes on your main workspace."
         );
     case AgentSessionProviders.Codex:
         return localize(
-            4905,
+            4921,
             "Opens a new Codex session in the editor. Codex sessions can be managed from the chat sessions view."
         );
     }
@@ -134,23 +137,23 @@ registerColor("agentSessionReadIndicator.foreground", {
     light: ( transparent(foreground, 0.15)),
     hcDark: null,
     hcLight: null
-}, ( localize(4906, "Foreground color for the read indicator in an agent session.")));
+}, ( localize(4922, "Foreground color for the read indicator in an agent session.")));
 registerColor("agentSessionSelectedBadge.border", {
     dark: ( transparent(listActiveSelectionForeground, 0.3)),
     light: ( transparent(listActiveSelectionForeground, 0.3)),
     hcDark: foreground,
     hcLight: foreground
-}, ( localize(4907, "Border color for the badges in selected agent session items.")));
+}, ( localize(4923, "Border color for the badges in selected agent session items.")));
 registerColor("agentSessionSelectedUnfocusedBadge.border", {
     dark: ( transparent(foreground, 0.3)),
     light: ( transparent(foreground, 0.3)),
     hcDark: foreground,
     hcLight: foreground
 }, ( localize(
-    4908,
+    4924,
     "Border color for the badges in selected agent session items when the view is unfocused."
 )));
 const AGENT_SESSION_RENAME_ACTION_ID = "agentSession.rename";
 const AGENT_SESSION_DELETE_ACTION_ID = "agentSession.delete";
 
-export { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, AgentSessionProviders, AgentSessionsViewerOrientation, AgentSessionsViewerPosition, getAgentCanContinueIn, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isBuiltInAgentSessionProvider, isFirstPartyAgentSessionProvider };
+export { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, AgentSessionProviders, AgentSessionsViewerOrientation, AgentSessionsViewerPosition, backgroundAgentDisplayName, getAgentCanContinueIn, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isBuiltInAgentSessionProvider, isFirstPartyAgentSessionProvider };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js

@@ -89,7 +89,7 @@ function isMarshalledAgentSessionContext(thing) {
     return false;
 }
 const agentSessionsOutputChannelId = "agentSessionsOutput";
-const agentSessionsOutputChannelLabel = ( localize(4966, "Agent Sessions"));
+const agentSessionsOutputChannelLabel = ( localize(4982, "Agent Sessions"));
 function statusToString(status) {
     switch (status) {
     case ChatSessionStatus.Failed:

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.js

@@ -5,7 +5,7 @@ const ScreenshotVariableId = "screenshot-focused-window";
 function convertBufferToScreenshotVariable(buffer) {
     return {
         id: ScreenshotVariableId,
-        name: ( localize(5094, "Screenshot")),
+        name: ( localize(5110, "Screenshot")),
         value: buffer.buffer,
         kind: "image"
     };

package/vscode/src/vs/workbench/contrib/chat/browser/chat.d.ts

@@ -10,8 +10,8 @@ import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } f
 import { IChatResponseModel, IChatModelInputState } from "../common/model/chatModel.js";
 import { IChatMode } from "../common/chatModes.js";
 import { IParsedChatRequest } from "../common/requestParser/chatParserTypes.js";
-import { IChatLocationData, IChatSendRequestOptions } from "../common/chatService/chatService.js";
-import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from "../common/model/chatViewModel.js";
+import { ChatRequestQueueKind, IChatLocationData, IChatSendRequestOptions } from "../common/chatService/chatService.js";
+import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, IChatPendingDividerViewModel } from "../common/model/chatViewModel.js";
 import { ChatAgentLocation, ChatModeKind } from "../common/constants.js";
 import { ChatAttachmentModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel";
 import { ChatInputPart } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPart";
@@ -117,7 +117,7 @@ export interface IChatFileTreeInfo {
     treeIndex: number;
     focus(): void;
 }
-export type ChatTreeItem = IChatRequestViewModel | IChatResponseViewModel;
+export type ChatTreeItem = IChatRequestViewModel | IChatResponseViewModel | IChatPendingDividerViewModel;
 export interface IChatListItemRendererOptions {
     readonly renderStyle?: "compact" | "minimal";
     readonly noHeader?: boolean;
@@ -199,6 +199,11 @@ export interface IChatAcceptInputOptions {
     isVoiceInput?: boolean;
     enableImplicitContext?: boolean;
     storeToHistory?: boolean;
+    /**
+     * When set, queues this message to be sent after the current request completes.
+     * If Steering, also sets yieldRequested on any active request to signal it should wrap up.
+     */
+    queue?: ChatRequestQueueKind;
 }
 export interface IChatWidgetViewModelChangeEvent {
     readonly previousSessionResource: URI | undefined;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.js

@@ -17,16 +17,16 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
-const ctxIsGlobalEditingSession = ( new RawContextKey("chatEdits.isGlobalEditingSession", undefined, ( localize(5308, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey("chatEdits.hasEditorModifications", undefined, ( localize(5309, "The current editor contains chat modifications"))));
-const ctxIsCurrentlyBeingModified = ( new RawContextKey("chatEdits.isCurrentlyBeingModified", undefined, ( localize(5310, "The current editor is currently being modified"))));
-const ctxReviewModeEnabled = ( new RawContextKey("chatEdits.isReviewModeEnabled", true, ( localize(5311, "Review mode for chat changes is enabled"))));
+const ctxIsGlobalEditingSession = ( new RawContextKey("chatEdits.isGlobalEditingSession", undefined, ( localize(5342, "The current editor is part of the global edit session"))));
+const ctxHasEditorModification = ( new RawContextKey("chatEdits.hasEditorModifications", undefined, ( localize(5343, "The current editor contains chat modifications"))));
+const ctxIsCurrentlyBeingModified = ( new RawContextKey("chatEdits.isCurrentlyBeingModified", undefined, ( localize(5344, "The current editor is currently being modified"))));
+const ctxReviewModeEnabled = ( new RawContextKey("chatEdits.isReviewModeEnabled", true, ( localize(5345, "Review mode for chat changes is enabled"))));
 const ctxHasRequestInProgress = ( new RawContextKey("chatEdits.isRequestInProgress", false, ( localize(
-    5312,
+    5346,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey("chatEdits.requestCount", 0, ( localize(5313, "The number of turns the editing session in this editor has"))));
-const ctxCursorInChangeRange = ( new RawContextKey("chatEdits.cursorInChangeRange", false, ( localize(5314, "The cursor is inside a change range made by chat editing."))));
+const ctxRequestCount = ( new RawContextKey("chatEdits.requestCount", 0, ( localize(5347, "The number of turns the editing session in this editor has"))));
+const ctxCursorInChangeRange = ( new RawContextKey("chatEdits.cursorInChangeRange", false, ( localize(5348, "The cursor is inside a change range made by chat editing."))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static {
         this.ID = "chat.edits.editorContextKeys";

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.d.ts

@@ -12,7 +12,7 @@ export declare class PromptFileRewriter {
     private readonly _languageModelToolsService;
     constructor(_codeEditorService: ICodeEditorService, _promptsService: IPromptsService, _languageModelToolsService: ILanguageModelToolsService);
     openAndRewriteTools(uri: URI, newTools: IToolAndToolSetEnablementMap | undefined, token: CancellationToken): Promise<void>;
-    rewriteTools(model: ITextModel, newTools: IToolAndToolSetEnablementMap, range: Range): void;
+    rewriteTools(model: ITextModel, newTools: IToolAndToolSetEnablementMap, range: Range, isString: boolean): void;
     private rewriteAttribute;
     openAndRewriteName(uri: URI, newName: string, token: CancellationToken): Promise<void>;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.js

@@ -5,6 +5,7 @@ import { EditOperation } from '../../../../../editor/common/core/editOperation.j
 import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.service.js';
 import { PromptHeaderAttributes } from '../../common/promptSyntax/promptFileParser.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.service.js';
+import { formatArrayValue } from '../../common/promptSyntax/utils/promptEditHelper.js';
 
 let PromptFileRewriter = class PromptFileRewriter {
     constructor(_codeEditorService, _promptsService, _languageModelToolsService) {
@@ -33,12 +34,13 @@ let PromptFileRewriter = class PromptFileRewriter {
             this.rewriteAttribute(model, "", toolsAttr.range);
             return;
         } else {
-            this.rewriteTools(model, newTools, toolsAttr.value.range);
+            this.rewriteTools(model, newTools, toolsAttr.value.range, toolsAttr.value.type === "string");
         }
     }
-    rewriteTools(model, newTools, range) {
+    rewriteTools(model, newTools, range, isString) {
         const newToolNames = this._languageModelToolsService.toFullReferenceNames(newTools);
-        const newValue = `[${( newToolNames.map(s => `'${s}'`)).join(", ")}]`;
+        const newEntries = ( newToolNames.map(toolName => formatArrayValue(toolName))).join(", ");
+        const newValue = isString ? newEntries : `[${newEntries}]`;
         this.rewriteAttribute(model, newValue, range);
     }
     rewriteAttribute(model, newValue, range) {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts.d.ts

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../../../base/common/lifecycle.js";
 import { ChatTreeItem, IChatCodeBlockInfo } from "../../chat.js";
-import { IChatRendererContent } from "../../../common/model/chatViewModel.js";
+import { IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel } from "../../../common/model/chatViewModel.js";
 import { CodeBlockModelCollection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection";
 import { DiffEditorPool, EditorPool } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools";
 import { IObservable } from "../../../../../../base/common/observable.js";
@@ -29,7 +29,7 @@ export interface IChatContentPart extends IDisposable {
     addDisposable?(disposable: IDisposable): void;
 }
 export interface IChatContentPartRenderContext {
-    readonly element: ChatTreeItem;
+    readonly element: IChatRequestViewModel | IChatResponseViewModel;
     readonly elementIndex: number;
     readonly container: HTMLElement;
     readonly content: ReadonlyArray<IChatRendererContent>;

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput.js

@@ -22,7 +22,7 @@ import { ModifiedFileEntryState } from '../../../common/editing/chatEditingServi
 import { LocalChatSessionUri, getChatSessionType } from '../../../common/model/chatUri.js';
 
 var ChatEditorInput_1;
-const ChatEditorIcon = registerIcon("chat-editor-label-icon", Codicon.chatSparkle, ( localize(6131, "Icon of the chat editor label.")));
+const ChatEditorIcon = registerIcon("chat-editor-label-icon", Codicon.chatSparkle, ( localize(6226, "Icon of the chat editor label.")));
 let ChatEditorInput = class ChatEditorInput extends EditorInput {
     static {
         ChatEditorInput_1 = this;
@@ -78,8 +78,8 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         if (!this.model?.editingSession || this.didTransferOutEditingSession || this.getSessionType() !== localChatSessionType) {
             return ConfirmResult.SAVE;
         }
-        const titleOverride = ( localize(6132, "Close Chat Editor"));
-        const messageOverride = ( localize(6133, "Closing the chat editor will end your current edit session."));
+        const titleOverride = ( localize(6227, "Close Chat Editor"));
+        const messageOverride = ( localize(6228, "Closing the chat editor will end your current edit session."));
         const result = await showClearEditingSessionConfirmation(this.model, this.dialogService, {
             titleOverride,
             messageOverride
@@ -118,7 +118,7 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         if (this.options.title?.preferred) {
             return this.options.title.preferred;
         }
-        return this.options.title?.fallback ?? ( localize(6134, "Chat"));
+        return this.options.title?.fallback ?? ( localize(6229, "Chat"));
     }
     getTitle(verbosity) {
         const name = this.getName();
@@ -285,25 +285,25 @@ async function showClearEditingSessionConfirmation(model, dialogService, options
     if (!undecidedEdits) {
         return true;
     }
-    const defaultPhrase = ( localize(6135, "Starting a new chat will end your current edit session."));
-    const defaultTitle = ( localize(6136, "Start new chat?"));
+    const defaultPhrase = ( localize(6230, "Starting a new chat will end your current edit session."));
+    const defaultTitle = ( localize(6231, "Start new chat?"));
     const phrase = options?.messageOverride ?? defaultPhrase;
     const title = options?.titleOverride ?? defaultTitle;
     const {
         result
     } = await dialogService.prompt({
         title,
-        message: phrase + " " + ( localize(6137, "Do you want to keep pending edits to {0} files?", undecidedEdits)),
+        message: phrase + " " + ( localize(6232, "Do you want to keep pending edits to {0} files?", undecidedEdits)),
         type: "info",
         cancelButton: true,
         buttons: [{
-            label: ( localize(6138, "Keep & Continue")),
+            label: ( localize(6233, "Keep & Continue")),
             run: async () => {
                 await model.editingSession.accept();
                 return true;
             }
         }, {
-            label: ( localize(6139, "Undo & Continue")),
+            label: ( localize(6234, "Undo & Continue")),
             run: async () => {
                 await model.editingSession.reject();
                 return true;

package/vscode/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.d.ts

@@ -10,8 +10,14 @@ export declare namespace ChatContextKeys {
     const requestInProgress: RawContextKey<boolean>;
     const currentlyEditing: RawContextKey<boolean>;
     const currentlyEditingInput: RawContextKey<boolean>;
+    enum EditingRequestType {
+        Sent = "s",
+        QueueOrSteer = "qs"
+    }
+    const editingRequestType: RawContextKey<EditingRequestType | undefined>;
     const isResponse: RawContextKey<boolean>;
     const isRequest: RawContextKey<boolean>;
+    const isPendingRequest: RawContextKey<boolean>;
     const itemId: RawContextKey<string>;
     const lastItemId: RawContextKey<string[]>;
     const editApplied: RawContextKey<boolean>;
@@ -53,6 +59,7 @@ export declare namespace ChatContextKeys {
     const chatSessionType: RawContextKey<string>;
     const hasFileAttachments: RawContextKey<boolean>;
     const chatSessionIsEmpty: RawContextKey<boolean>;
+    const hasPendingRequests: RawContextKey<boolean>;
     const remoteJobCreating: RawContextKey<boolean>;
     const hasRemoteCodingAgent: RawContextKey<boolean>;
     const hasCanDelegateProviders: RawContextKey<boolean>;