@codingame/monaco-vscode-katex-common 26.1.1 → 26.2.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatPendingDragAndDrop.js

@@ -0,0 +1,148 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { $, DragAndDropObserver, addDisposableListener, EventType } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ChatRequestQueueKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+
+const PENDING_REQUEST_ID_ATTR = "data-pending-request-id";
+const PENDING_KIND_ATTR = "data-pending-kind";
+const DRAGGING_CLASS = "chat-pending-dragging";
+let ChatPendingDragController = class ChatPendingDragController extends Disposable {
+    constructor(listContainer, _getViewModel, _chatService) {
+        super();
+        this._getViewModel = _getViewModel;
+        this._chatService = _chatService;
+        this._insertIndicator = $(".chat-pending-insert-indicator");
+        listContainer.append(this._insertIndicator);
+        this._register(toDisposable(() => this._insertIndicator.remove()));
+        this._register(( new DragAndDropObserver(listContainer, {
+            onDragOver: e => this._onDragOver(e),
+            onDragLeave: () => this._hideIndicator(),
+            onDragEnd: () => this._onDragEnd(),
+            onDrop: e => this._onDrop(e)
+        })));
+    }
+    attachDragHandle(element, handleEl, rowContainer, disposables) {
+        handleEl.setAttribute("draggable", "true");
+        disposables.add(addDisposableListener(handleEl, EventType.DRAG_START, e => {
+            if (!e.dataTransfer || !element.pendingKind) {
+                return;
+            }
+            this._dragState = {
+                element,
+                pendingKind: element.pendingKind
+            };
+            rowContainer.classList.add(DRAGGING_CLASS);
+            e.dataTransfer.setDragImage(rowContainer, 0, 0);
+            e.dataTransfer.effectAllowed = "move";
+        }));
+        disposables.add(addDisposableListener(handleEl, EventType.DRAG_END, () => {
+            rowContainer.classList.remove(DRAGGING_CLASS);
+            this._onDragEnd();
+        }));
+    }
+    _onDragOver(e) {
+        if (!this._dragState) {
+            return;
+        }
+        const target = this._findDropTarget(e);
+        if (!target) {
+            this._hideIndicator();
+            return;
+        }
+        e.preventDefault();
+        if (e.dataTransfer) {
+            e.dataTransfer.dropEffect = "move";
+        }
+        const rect = target.row.getBoundingClientRect();
+        const midY = rect.top + rect.height / 2;
+        const before = e.clientY < midY;
+        this._showIndicator(target.row, before);
+    }
+    _onDrop(e) {
+        this._hideIndicator();
+        if (!this._dragState) {
+            return;
+        }
+        const target = this._findDropTarget(e);
+        if (!target) {
+            return;
+        }
+        e.preventDefault();
+        const rect = target.row.getBoundingClientRect();
+        const midY = rect.top + rect.height / 2;
+        const insertBefore = e.clientY < midY;
+        this._reorder(this._dragState.element, target.requestId, insertBefore);
+        this._dragState = undefined;
+    }
+    _onDragEnd() {
+        this._hideIndicator();
+        this._dragState = undefined;
+    }
+    _showIndicator(targetRow, before) {
+        const rect = targetRow.getBoundingClientRect();
+        const parentRect = this._insertIndicator.parentElement.getBoundingClientRect();
+        this._insertIndicator.style.display = "block";
+        this._insertIndicator.style.left = `${rect.left - parentRect.left}px`;
+        this._insertIndicator.style.width = `${rect.width}px`;
+        this._insertIndicator.style.top = before ? `${rect.top - parentRect.top}px` : `${rect.bottom - parentRect.top}px`;
+    }
+    _hideIndicator() {
+        this._insertIndicator.style.display = "none";
+    }
+    _findDropTarget(e) {
+        if (!this._dragState) {
+            return undefined;
+        }
+        const target = e.target?.closest?.(`[${PENDING_REQUEST_ID_ATTR}]`);
+        if (!target) {
+            return undefined;
+        }
+        const requestId = target.getAttribute(PENDING_REQUEST_ID_ATTR);
+        const kind = target.getAttribute(PENDING_KIND_ATTR);
+        if (kind !== this._dragState.pendingKind || requestId === this._dragState.element.id) {
+            return undefined;
+        }
+        return {
+            row: target,
+            requestId
+        };
+    }
+    _reorder(draggedElement, targetId, insertBefore) {
+        const viewModel = this._getViewModel();
+        if (!viewModel) {
+            return;
+        }
+        const pendingRequests = viewModel.model.getPendingRequests();
+        const draggedKind = draggedElement.pendingKind;
+        const group = [];
+        const rest = [];
+        for (const p of pendingRequests) {
+            (p.kind === draggedKind ? group : rest).push(p);
+        }
+        const draggedIdx = group.findIndex(p => p.request.id === draggedElement.id);
+        if (draggedIdx === -1) {
+            return;
+        }
+        const [dragged] = group.splice(draggedIdx, 1);
+        let targetIdx = group.findIndex(p => p.request.id === targetId);
+        if (targetIdx === -1) {
+            return;
+        }
+        if (!insertBefore) {
+            targetIdx++;
+        }
+        group.splice(targetIdx, 0, dragged);
+        const reordered = (
+        (draggedKind === ChatRequestQueueKind.Steering ?
+        [...group, ...rest] : [...rest, ...group]).map(p => ({
+            requestId: p.request.id,
+            kind: p.kind
+        })));
+        this._chatService.setPendingRequests(viewModel.sessionResource, reordered);
+    }
+};
+ChatPendingDragController = ( __decorate([( __param(2, IChatService))], ChatPendingDragController));
+
+export { ChatPendingDragController };

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

@@ -6,6 +6,7 @@ import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/brows
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -63,6 +64,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private readonly codeEditorService;
     private readonly editorService;
     private readonly configurationService;
+    private readonly dialogService;
     private readonly contextKeyService;
     private readonly instantiationService;
     private readonly chatService;
@@ -142,7 +144,6 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private visibleChangeCount;
     private requestInProgress;
     private agentInInput;
-    private currentRequest;
     private _visible;
     get visible(): boolean;
     private _instructionFilesCheckPromise;
@@ -152,6 +153,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private readonly _lockedToCodingAgentContextKey;
     private readonly _agentSupportsAttachmentsContextKey;
     private readonly _sessionIsEmptyContextKey;
+    private readonly _hasPendingRequestsContextKey;
     private _attachmentCapabilities;
     private readonly promptDescriptionsCache;
     private readonly promptUriCache;
@@ -169,7 +171,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     readonly viewContext: IChatWidgetViewContext;
     get supportsChangingModes(): boolean;
     get locationData(): IChatLocationData | undefined;
-    constructor(location: ChatAgentLocation | IChatWidgetLocationOptions, viewContext: IChatWidgetViewContext | undefined, viewOptions: IChatWidgetViewOptions, styles: IChatWidgetStyles, codeEditorService: ICodeEditorService, editorService: IEditorService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatService: IChatService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, chatAccessibilityService: IChatAccessibilityService, logService: ILogService, themeService: IThemeService, chatSlashCommandService: IChatSlashCommandService, chatEditingService: IChatEditingService, telemetryService: ITelemetryService, promptsService: IPromptsService, toolsService: ILanguageModelToolsService, chatModeService: IChatModeService, chatLayoutService: IChatLayoutService, chatEntitlementService: IChatEntitlementService, chatSessionsService: IChatSessionsService, agentSessionsService: IAgentSessionsService, chatTodoListService: IChatTodoListService, contextService: IWorkspaceContextService, lifecycleService: ILifecycleService);
+    constructor(location: ChatAgentLocation | IChatWidgetLocationOptions, viewContext: IChatWidgetViewContext | undefined, viewOptions: IChatWidgetViewOptions, styles: IChatWidgetStyles, codeEditorService: ICodeEditorService, editorService: IEditorService, configurationService: IConfigurationService, dialogService: IDialogService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatService: IChatService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, chatAccessibilityService: IChatAccessibilityService, logService: ILogService, themeService: IThemeService, chatSlashCommandService: IChatSlashCommandService, chatEditingService: IChatEditingService, telemetryService: ITelemetryService, promptsService: IPromptsService, toolsService: ILanguageModelToolsService, chatModeService: IChatModeService, chatLayoutService: IChatLayoutService, chatEntitlementService: IChatEntitlementService, chatSessionsService: IChatSessionsService, agentSessionsService: IAgentSessionsService, chatTodoListService: IChatTodoListService, contextService: IWorkspaceContextService, lifecycleService: ILifecycleService);
     private _lastSelectedAgent;
     set lastSelectedAgent(agent: IChatAgentData | undefined);
     get lastSelectedAgent(): IChatAgentData | undefined;
@@ -254,6 +256,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     rerunLastRequest(): Promise<void>;
     private _applyPromptFileIfSet;
     private _acceptInput;
+    private confirmPendingRequestsBeforeSend;
     getModeRequestOptions(): Partial<IChatSendRequestOptions>;
     getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[];
     getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidget.js

@@ -28,6 +28,7 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -51,6 +52,7 @@ import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contr
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, ChatRequestSlashPromptPart, formatChatQuestion, ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
+import { ChatRequestQueueKind, ChatSendResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
@@ -63,7 +65,6 @@ import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/cont
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ComputeAutomaticInstructions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { handleModeSwitch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { isIChatResourceViewContext, isIChatViewViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
@@ -101,7 +102,7 @@ const supportsAllAttachments = {
     supportsSymbolAttachments: true,
     supportsTerminalAttachments: true
 };
-const DISCLAIMER = ( localize(6047, "AI responses may be inaccurate."));
+const DISCLAIMER = ( localize(6131, "AI responses may be inaccurate."));
 let ChatWidget = class ChatWidget extends Disposable {
     static {
         ChatWidget_1 = this;
@@ -131,7 +132,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         } else {
             this.logService.debug("ChatWidget#setViewModel: no viewModel");
         }
-        this.currentRequest = undefined;
         this._onDidChangeViewModel.fire({
             previousSessionResource,
             currentSessionResource: this._viewModel?.sessionResource
@@ -177,6 +177,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         codeEditorService,
         editorService,
         configurationService,
+        dialogService,
         contextKeyService,
         instantiationService,
         chatService,
@@ -205,6 +206,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.codeEditorService = codeEditorService;
         this.editorService = editorService;
         this.configurationService = configurationService;
+        this.dialogService = dialogService;
         this.contextKeyService = contextKeyService;
         this.instantiationService = instantiationService;
         this.chatService = chatService;
@@ -270,6 +272,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._lockedToCodingAgentContextKey = ChatContextKeys.lockedToCodingAgent.bindTo(this.contextKeyService);
         this._agentSupportsAttachmentsContextKey = ChatContextKeys.agentSupportsAttachments.bindTo(this.contextKeyService);
         this._sessionIsEmptyContextKey = ChatContextKeys.chatSessionIsEmpty.bindTo(this.contextKeyService);
+        this._hasPendingRequestsContextKey = ChatContextKeys.hasPendingRequests.bindTo(this.contextKeyService);
         this.viewContext = viewContext ?? {};
         const viewModelObs = observableFromEvent(this, this.onDidChangeViewModel, () => this.viewModel);
         if (typeof location === "object") {
@@ -679,7 +682,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
                     const providers = product.defaultChatAgent.provider;
                     additionalMessage = ( new MarkdownString(( localize(
-                        6048,
+                        6132,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).",
                         providers.default.name,
                         providers.default.name,
@@ -725,7 +728,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         } else if (this._instructionFilesExist === false) {
             const generateInstructionsCommand = "workbench.action.chat.generateInstructions";
             return (new MarkdownString(localize(
-                6049,
+                6133,
                 "[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
                 `command:${generateInstructionsCommand}`
             ), {
@@ -738,13 +741,7 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     async _checkForAgentInstructionFiles() {
         try {
-            const useCopilotInstructionsFiles = this.configurationService.getValue(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES);
-            const useAgentMd = this.configurationService.getValue(PromptsConfig.USE_AGENT_MD);
-            if (!useCopilotInstructionsFiles && !useAgentMd) {
-                return true;
-            }
-            return ((await this.promptsService.listCopilotInstructionsMDs(CancellationToken.None)).length > 0 ||
-            (await this.promptsService.listAgentMDs(CancellationToken.None, false)).length > 0);
+            return (await this.promptsService.listAgentInstructions(CancellationToken.None)).length > 0;
         } catch (error) {
             this.logService.warn("[ChatWidget] Error checking for instruction files:", error);
             return false;
@@ -756,19 +753,19 @@ let ChatWidget = class ChatWidget extends Disposable {
             const providerTitle = this._lockedAgent ? this.chatSessionsService.getWelcomeTitleForSessionType(this._lockedAgent.id) : undefined;
             const providerMessage = this._lockedAgent ? this.chatSessionsService.getWelcomeMessageForSessionType(this._lockedAgent.id) : undefined;
             const message = providerMessage ? ( new MarkdownString(providerMessage)) : (this._lockedAgent?.prefix === "@copilot " ? ( new MarkdownString(( localize(
-                6050,
+                6134,
                 "This chat session will be forwarded to the {0} [coding agent]({1}) where work is completed in the background. ",
                 this._lockedAgent.prefix,
                 "https://aka.ms/coding-agent-docs"
             )) + DISCLAIMER, {
                 isTrusted: true
             })) : ( new MarkdownString(( localize(
-                6051,
+                6135,
                 "This chat session will be forwarded to the {0} coding agent where work is completed in the background. ",
                 this._lockedAgent?.prefix
             )) + DISCLAIMER)));
             return {
-                title: providerTitle ?? ( localize(6052, "Delegate to {0}", this._lockedAgent?.prefix)),
+                title: providerTitle ?? ( localize(6136, "Delegate to {0}", this._lockedAgent?.prefix)),
                 message,
                 icon: providerIcon ?? Codicon.sendToRemoteAgent,
                 additionalMessage,
@@ -777,11 +774,11 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         let title;
         if (this.input.currentModeKind === ChatModeKind.Ask) {
-            title = ( localize(6053, "Ask about your code"));
+            title = ( localize(6137, "Ask about your code"));
         } else if (this.input.currentModeKind === ChatModeKind.Edit) {
-            title = ( localize(6054, "Edit in context"));
+            title = ( localize(6138, "Edit in context"));
         } else {
-            title = ( localize(6055, "Build with Agent"));
+            title = ( localize(6139, "Build with Agent"));
         }
         return {
             title,
@@ -797,22 +794,22 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (isEmpty) {
                 return [{
                     icon: Codicon.vscode,
-                    label: ( localize(6056, "Ask @vscode")),
-                    prompt: ( localize(6057, "@vscode How do I change the theme to light mode?"))
+                    label: ( localize(6140, "Ask @vscode")),
+                    prompt: ( localize(6141, "@vscode How do I change the theme to light mode?"))
                 }, {
                     icon: Codicon.newFolder,
-                    label: ( localize(6058, "Create Project")),
-                    prompt: ( localize(6059, "Create a #new Hello World project in TypeScript"))
+                    label: ( localize(6142, "Create Project")),
+                    prompt: ( localize(6143, "Create a #new Hello World project in TypeScript"))
                 }];
             } else {
                 return [{
                     icon: Codicon.debugAlt,
-                    label: ( localize(6060, "Build Workspace")),
-                    prompt: ( localize(6061, "How do I build this workspace?"))
+                    label: ( localize(6144, "Build Workspace")),
+                    prompt: ( localize(6145, "How do I build this workspace?"))
                 }, {
                     icon: Codicon.gear,
-                    label: ( localize(6062, "Show Config")),
-                    prompt: ( localize(6063, "Where is the configuration for this project defined?"))
+                    label: ( localize(6146, "Show Config")),
+                    prompt: ( localize(6147, "Where is the configuration for this project defined?"))
                 }];
             }
         }
@@ -884,7 +881,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             promptName
         } of topPrompts) {
             const description = this.promptDescriptionsCache.get(promptName);
-            const commandLabel = ( localize(6064, "{0}", promptName));
+            const commandLabel = ( localize(6148, "{0}", promptName));
             const uri = this.promptUriCache.get(promptName);
             const descriptionText = description?.trim() ? description : undefined;
             result.push({
@@ -1195,21 +1192,23 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (request.id === currentElement.id) {
                     request.setShouldBeBlocked(false);
                     request.attachedContext?.forEach(addToContext);
-                    currentElement.variables.forEach(addToContext);
                 }
             }
+            currentElement.variables.forEach(addToContext);
             this.viewModel?.setEditing(currentElement);
             if (item?.contextKeyService) {
                 ChatContextKeys.currentlyEditing.bindTo(item.contextKeyService).set(true);
             }
+            const isEditingSentRequest = currentElement.pendingKind === undefined ? ChatContextKeys.EditingRequestType.Sent : ChatContextKeys.EditingRequestType.QueueOrSteer;
             const isInput = this.configurationService.getValue("chat.editRequests") === "input";
-            this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
+            this.inputPart?.setEditing(!!this.viewModel?.editing && isInput, isEditingSentRequest);
             if (!isInput) {
                 const rowContainer = item.rowContainer;
                 this.inputContainer = $$1(".chat-edit-input-container");
                 rowContainer.appendChild(this.inputContainer);
                 this.createInput(this.inputContainer);
                 this.input.setChatMode(this.inputPart.currentModeObs.get().id);
+                this.input.setEditing(true, isEditingSentRequest);
             } else {
                 this.inputPart.element.classList.add("editing");
             }
@@ -1275,7 +1274,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.inputPart.element.classList.remove("editing");
         }
         this.viewModel?.setEditing(undefined);
-        this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
+        this.inputPart?.setEditing(false, undefined);
         this.onDidChangeItems();
         this.telemetryService.publicLog2("chat.editRequestsFinished", {
             editRequestType: this.configurationService.getValue("chat.editRequests"),
@@ -1428,6 +1427,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this.viewModel = undefined;
             this.onDidChangeItems();
+            this._hasPendingRequestsContextKey.set(false);
             return;
         }
         if (isEqual(model.sessionResource, this.viewModel?.sessionResource)) {
@@ -1446,7 +1446,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (this._lockedAgent) {
             let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
             if (!placeholder) {
-                placeholder = ( localize(6065, "Chat with {0}", this._lockedAgent.id));
+                placeholder = ( localize(6149, "Chat with {0}", this._lockedAgent.id));
             }
             this.viewModel.setInputPlaceholder(placeholder);
             this.inputEditor.updateOptions({
@@ -1484,6 +1484,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.onDidChangeItems();
         }));
         this._sessionIsEmptyContextKey.set(model.getRequests().length === 0);
+        const updatePendingRequestKeys = () => {
+            const pendingCount = model.getPendingRequests().length;
+            this._hasPendingRequestsContextKey.set(pendingCount > 0);
+        };
+        updatePendingRequestKeys();
+        this.viewModelDisposables.add(model.onDidChangePendingRequests(() => updatePendingRequestKeys()));
         this.refreshParsedInput();
         this.viewModelDisposables.add(model.onDidChange(e => {
             if (e.kind === "setAgent") {
@@ -1658,10 +1664,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             await this._applyPromptMetadata(parseResult.header, requestInput);
         }
     }
-    async _acceptInput(query, options) {
-        if (this.viewModel?.model.requestInProgress.get()) {
-            return;
-        }
+    async _acceptInput(query, options = {}) {
         if (!query && this.input.generating) {
             const generatingAutoSubmitWindow = 500;
             const start = Date.now();
@@ -1693,10 +1696,28 @@ let ChatWidget = class ChatWidget extends Disposable {
             attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource)
         };
         const isUserQuery = !query;
-        if (this.viewModel?.editing) {
+        const isEditing = this.viewModel?.editing;
+        if (isEditing) {
+            const editingPendingRequest = this.viewModel.editing.pendingKind;
+            if (editingPendingRequest !== undefined) {
+                const editingRequestId = this.viewModel.editing.id;
+                this.chatService.removePendingRequest(this.viewModel.sessionResource, editingRequestId);
+                options.queue ??= editingPendingRequest;
+            } else {
+                this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource);
+                options.queue = undefined;
+            }
             this.finishedEditing(true);
             this.viewModel.model?.setCheckpoint(undefined);
         }
+        const model = this.viewModel.model;
+        const requestInProgress = model.requestInProgress.get();
+        if (requestInProgress) {
+            options.queue ??= ChatRequestQueueKind.Queued;
+        }
+        if (!requestInProgress && !isEditing && !(await this.confirmPendingRequestsBeforeSend(model, options))) {
+            return;
+        }
         await this._applyPromptFileIfSet(requestInputs);
         await this._autoAttachInstructions(requestInputs);
         if (this.viewOptions.enableWorkingSet !== undefined && this.input.currentModeKind === ChatModeKind.Edit && !this.chatService.edits2Enabled) {
@@ -1720,10 +1741,6 @@ let ChatWidget = class ChatWidget extends Disposable {
                 actualSize: uniqueWorkingSetEntries.size
             });
         }
-        this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource);
-        if (this.currentRequest) {
-            await Promise.race([this.currentRequest, timeout(1000)]);
-        }
         this.input.validateAgentMode();
         if (this.viewModel.model.checkpoint) {
             const requests = this.viewModel.model.getRequests();
@@ -1734,7 +1751,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 }
             }
         }
-        if (this.viewModel.sessionResource) {
+        if (this.viewModel.sessionResource && !options.queue) {
             this.chatAccessibilityService.acceptRequest(this._viewModel.sessionResource);
         }
         const result = await this.chatService.sendRequest(this.viewModel.sessionResource, requestInputs.input, {
@@ -1749,20 +1766,27 @@ let ChatWidget = class ChatWidget extends Disposable {
             noCommandDetection: options?.noCommandDetection,
             ...this.getModeRequestOptions(),
             modeInfo: this.input.currentModeInfo,
-            agentIdSilent: this._lockedAgent?.id
+            agentIdSilent: this._lockedAgent?.id,
+            queue: options?.queue
         });
-        if (!result) {
+        if (this.viewModel.sessionResource && !options.queue) {
             this.chatAccessibilityService.disposeRequest(this.viewModel.sessionResource);
+        }
+        if (ChatSendResult.isRejected(result)) {
             return;
         }
         this.updateChatViewVisibility();
         this.input.acceptInput(options?.storeToHistory ?? isUserQuery);
+        const sent = ChatSendResult.isQueued(result) ? await result.deferred : result;
+        if (!ChatSendResult.isSent(sent)) {
+            return;
+        }
         this._onDidSubmitAgent.fire({
-            agent: result.agent,
-            slashCommand: result.slashCommand
+            agent: sent.data.agent,
+            slashCommand: sent.data.slashCommand
         });
-        this.handleDelegationExitIfNeeded(this._lockedAgent, result.agent);
-        this.currentRequest = result.responseCompletePromise.then(() => {
+        this.handleDelegationExitIfNeeded(this._lockedAgent, sent.data.agent);
+        sent.data.responseCompletePromise.then(() => {
             const responses = this.viewModel?.getItems().filter(isResponseVM);
             const lastResponse = responses?.[responses.length - 1];
             this.chatAccessibilityService.acceptResponse(
@@ -1783,9 +1807,42 @@ let ChatWidget = class ChatWidget extends Disposable {
                     this.input.setValue(question, false);
                 }
             }
-            this.currentRequest = undefined;
         });
-        return result.responseCreatedPromise;
+        return sent.data.responseCreatedPromise;
+    }
+    async confirmPendingRequestsBeforeSend(model, options) {
+        if (options.queue) {
+            return true;
+        }
+        const hasPendingRequests = model.getPendingRequests().length > 0;
+        if (!hasPendingRequests) {
+            return true;
+        }
+        const promptResult = await this.dialogService.prompt({
+            type: "question",
+            message: ( localize(6150, "You already have pending requests.")),
+            detail: ( localize(
+                6151,
+                "Do you want to keep them in the queue or remove them before sending this message?"
+            )),
+            buttons: [{
+                label: ( localize(6152, "Keep Pending Requests")),
+                run: () => "keep"
+            }, {
+                label: ( localize(6153, "Remove Pending Requests")),
+                run: () => "remove"
+            }],
+            cancelButton: true
+        });
+        if (!promptResult.result) {
+            return false;
+        }
+        if (promptResult.result === "remove") {
+            for (const pendingRequest of [...model.getPendingRequests()]) {
+                this.chatService.removePendingRequest(model.sessionResource, pendingRequest.request.id);
+            }
+        }
+        return true;
     }
     getModeRequestOptions() {
         return {
@@ -1963,7 +2020,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this._switchToAgentByName(agent);
         }
         if (tools !== undefined && this.input.currentModeKind === ChatModeKind.Agent) {
-            const enablementMap = this.toolsService.toToolAndToolSetEnablementMap(tools, Target.VSCode, this.input.selectedLanguageModel.get()?.metadata);
+            const enablementMap = this.toolsService.toToolAndToolSetEnablementMap(tools, this.input.selectedLanguageModel.get()?.metadata);
             this.input.selectedToolsModel.set(enablementMap, true);
         }
         if (model !== undefined) {
@@ -1990,6 +2047,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.listWidget.delegateScrollFromMouseWheelEvent(browserEvent);
     }
 };
-ChatWidget = ChatWidget_1 = ( __decorate([( __param(4, ICodeEditorService)), ( __param(5, IEditorService)), ( __param(6, IConfigurationService)), ( __param(7, IContextKeyService)), ( __param(8, IInstantiationService)), ( __param(9, IChatService)), ( __param(10, IChatAgentService)), ( __param(11, IChatWidgetService)), ( __param(12, IChatAccessibilityService)), ( __param(13, ILogService)), ( __param(14, IThemeService)), ( __param(15, IChatSlashCommandService)), ( __param(16, IChatEditingService)), ( __param(17, ITelemetryService)), ( __param(18, IPromptsService)), ( __param(19, ILanguageModelToolsService)), ( __param(20, IChatModeService)), ( __param(21, IChatLayoutService)), ( __param(22, IChatEntitlementService)), ( __param(23, IChatSessionsService)), ( __param(24, IAgentSessionsService)), ( __param(25, IChatTodoListService)), ( __param(26, IWorkspaceContextService)), ( __param(27, ILifecycleService))], ChatWidget));
+ChatWidget = ChatWidget_1 = ( __decorate([( __param(4, ICodeEditorService)), ( __param(5, IEditorService)), ( __param(6, IConfigurationService)), ( __param(7, IDialogService)), ( __param(8, IContextKeyService)), ( __param(9, IInstantiationService)), ( __param(10, IChatService)), ( __param(11, IChatAgentService)), ( __param(12, IChatWidgetService)), ( __param(13, IChatAccessibilityService)), ( __param(14, ILogService)), ( __param(15, IThemeService)), ( __param(16, IChatSlashCommandService)), ( __param(17, IChatEditingService)), ( __param(18, ITelemetryService)), ( __param(19, IPromptsService)), ( __param(20, ILanguageModelToolsService)), ( __param(21, IChatModeService)), ( __param(22, IChatLayoutService)), ( __param(23, IChatEntitlementService)), ( __param(24, IChatSessionsService)), ( __param(25, IAgentSessionsService)), ( __param(26, IChatTodoListService)), ( __param(27, IWorkspaceContextService)), ( __param(28, ILifecycleService))], ChatWidget));
 
 export { ChatWidget, isQuickChat };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatFollowups.js

@@ -45,7 +45,7 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         } else if (followup.kind === "command") {
             button.element.classList.add("interactive-followup-command");
         }
-        button.element.ariaLabel = ( localize(6066, "Follow up question: {0}", baseTitle));
+        button.element.ariaLabel = ( localize(6154, "Follow up question: {0}", baseTitle));
         button.label = ( new MarkdownString(baseTitle));
         this._register(button.onDidClick(() => this.clickHandler(followup)));
     }