@codingame/monaco-vscode-katex-common 27.0.0 → 28.0.1

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

@@ -4,7 +4,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as chat from './media/chat.css';
 import * as chatAgentHover from './media/chatAgentHover.css';
 import * as chatViewWelcome from './media/chatViewWelcome.css';
-import { $ as $$1, clearNode, setVisibility, findParentWithClass, getTopLeftOffset, append, addStandardDisposableListener, EventType, addDisposableListener, scheduleAtNextAnimationFrame, getWindow, createElement, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, clearNode, setVisibility, findParentWithClass, getTopLeftOffset, append, addStandardDisposableListener, EventType, addDisposableListener, isAncestor, scheduleAtNextAnimationFrame, getWindow, createElement, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { timeout, disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
@@ -30,7 +30,6 @@ import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/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';
@@ -40,10 +39,6 @@ import { bindContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
-import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { EditorResourceAccessor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { checkModeOption } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
@@ -56,6 +51,7 @@ import { getModeNameForTelemetry, ChatMode } from '@codingame/monaco-vscode-api/
 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 { getDynamicVariablesForWidget, getSelectedToolAndToolSetsForWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatVariables';
 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';
@@ -64,11 +60,10 @@ import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { isWorkspaceVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { isResponseVM, isRequestVM, ChatViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
-import { ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind, ChatConfiguration, ChatPermissionLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 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 { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID, handleModeSwitch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -113,9 +108,10 @@ const supportsAllAttachments = {
     supportsProblemAttachments: true,
     supportsSymbolAttachments: true,
     supportsTerminalAttachments: true,
-    supportsPromptAttachments: true
+    supportsPromptAttachments: true,
+    supportsHandOffs: true
 };
-const DISCLAIMER = ( localize(6664, "AI responses may be inaccurate"));
+const DISCLAIMER = ( localize(6760, "AI responses may be inaccurate"));
 let ChatWidget = class ChatWidget extends Disposable {
     static {
         ChatWidget_1 = this;
@@ -161,12 +157,18 @@ let ChatWidget = class ChatWidget extends Disposable {
                     parts: []
                 };
             }
-            this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
-                selectedAgent: this._lastSelectedAgent,
-                mode: this.input.currentModeKind,
-                attachmentCapabilities: this.attachmentCapabilities,
-                forcedAgent: this._lockedAgent?.id ? this.chatAgentService.getAgent(this._lockedAgent.id) : undefined
-            });
+            this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequestWithReferences(
+                getDynamicVariablesForWidget(this),
+                getSelectedToolAndToolSetsForWidget(this),
+                this.getInput(),
+                this.location,
+                {
+                    selectedAgent: this._lastSelectedAgent,
+                    mode: this.input.currentModeKind,
+                    attachmentCapabilities: this.attachmentCapabilities,
+                    forcedAgent: this._lockedAgent?.id ? this.chatAgentService.getAgent(this._lockedAgent.id) : undefined
+                }
+            );
             this._onDidChangeParsedInput.fire();
         }
         return this.parsedChatRequest;
@@ -189,7 +191,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         viewOptions,
         styles,
         codeEditorService,
-        editorService,
         configurationService,
         dialogService,
         contextKeyService,
@@ -211,7 +212,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         chatSessionsService,
         agentSessionsService,
         chatTodoListService,
-        contextService,
         lifecycleService,
         chatAttachmentResolveService,
         chatTipService,
@@ -221,7 +221,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.viewOptions = viewOptions;
         this.styles = styles;
         this.codeEditorService = codeEditorService;
-        this.editorService = editorService;
         this.configurationService = configurationService;
         this.dialogService = dialogService;
         this.contextKeyService = contextKeyService;
@@ -242,7 +241,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.chatSessionsService = chatSessionsService;
         this.agentSessionsService = agentSessionsService;
         this.chatTodoListService = chatTodoListService;
-        this.contextService = contextService;
         this.lifecycleService = lifecycleService;
         this.chatAttachmentResolveService = chatAttachmentResolveService;
         this.chatTipService = chatTipService;
@@ -287,9 +285,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._visible = false;
         this._isRenderingWelcome = false;
         this._attachmentCapabilities = supportsAllAttachments;
-        this.promptDescriptionsCache = ( new Map());
-        this.promptUriCache = ( new Map());
-        this._isLoadingPromptDescriptions = false;
         this.viewModelDisposables = this._register(( new DisposableStore()));
         this._editingSession = observableValue(this, undefined);
         this._viewModelObs = observableFromEvent(this, this.onDidChangeViewModel, () => this.viewModel);
@@ -425,7 +420,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.renderChatEditingSessionState();
         }));
         this._register(
-            codeEditorService.registerCodeEditorOpenHandler(async (input, _source, _sideBySide) => {
+            this.codeEditorService.registerCodeEditorOpenHandler(async (input, _source, _sideBySide) => {
                 const resource = input.resource;
                 if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
                     return null;
@@ -580,6 +575,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             renderStyle
         });
         this._register(addDisposableListener(parent, EventType.MOUSE_WHEEL, e => {
+            if (e.defaultPrevented) {
+                return;
+            }
+            if (isAncestor(e.target, this.container)) {
+                return;
+            }
             this.listWidget.delegateScrollFromMouseWheelEvent(e);
         }));
         this._register(autorun(reader => {
@@ -697,11 +698,17 @@ let ChatWidget = class ChatWidget extends Disposable {
             return;
         }
         const previous = this.parsedChatRequest;
-        this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
-            selectedAgent: this._lastSelectedAgent,
-            mode: this.input.currentModeKind,
-            attachmentCapabilities: this.attachmentCapabilities
-        });
+        this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequestWithReferences(
+            getDynamicVariablesForWidget(this),
+            getSelectedToolAndToolSetsForWidget(this),
+            this.getInput(),
+            this.location,
+            {
+                selectedAgent: this._lastSelectedAgent,
+                mode: this.input.currentModeKind,
+                attachmentCapabilities: this.attachmentCapabilities
+            }
+        );
         if (!previous || !IParsedChatRequest.equals(previous, this.parsedChatRequest)) {
             this._onDidChangeParsedInput.fire();
         }
@@ -809,7 +816,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
                     const providers = product.defaultChatAgent.provider;
                     additionalMessage = ( new MarkdownString(( localize(
-                        6665,
+                        6761,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).",
                         providers.default.name,
                         providers.default.name,
@@ -844,15 +851,20 @@ let ChatWidget = class ChatWidget extends Disposable {
             return;
         }
         const tipContainer = this.inputPart.gettingStartedTipContainerElement;
-        if (this._gettingStartedTipPart.value) {
-            setVisibility(true, tipContainer);
-            return;
-        }
         const tip = this.chatTipService.getWelcomeTip(this.contextKeyService);
         if (!tip) {
+            if (this._gettingStartedTipPart.value) {
+                this._gettingStartedTipPartRef = undefined;
+                this._gettingStartedTipPart.clear();
+                clearNode(tipContainer);
+            }
             setVisibility(false, tipContainer);
             return;
         }
+        if (this._gettingStartedTipPart.value) {
+            setVisibility(true, tipContainer);
+            return;
+        }
         const store = ( new DisposableStore());
         const renderer = this.instantiationService.createInstance(ChatContentMarkdownRenderer);
         const tipPart = store.add(
@@ -885,7 +897,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             return ( new MarkdownString(""));
         } else if (this._instructionFilesExist === false) {
             return (new MarkdownString(localize(
-                6666,
+                6762,
                 "[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
                 `command:${GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID}`
             ), {
@@ -910,19 +922,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(
-                6667,
+                6763,
                 "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(
-                6668,
+                6764,
                 "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(6669, "Delegate to {0}", this._lockedAgent?.prefix)),
+                title: providerTitle ?? ( localize(6765, "Delegate to {0}", this._lockedAgent?.prefix)),
                 message,
                 icon: providerIcon ?? Codicon.sendToRemoteAgent,
                 additionalMessage,
@@ -931,155 +943,19 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         let title;
         if (this.input.currentModeKind === ChatModeKind.Ask) {
-            title = ( localize(6670, "Ask about your code"));
+            title = ( localize(6766, "Ask about your code"));
         } else if (this.input.currentModeKind === ChatModeKind.Edit) {
-            title = ( localize(6671, "Edit in context"));
+            title = ( localize(6767, "Edit in context"));
         } else {
-            title = ( localize(6672, "Build with Agent"));
+            title = ( localize(6768, "Build with Agent"));
         }
         return {
             title,
             message: ( new MarkdownString(DISCLAIMER)),
             icon: Codicon.chatSparkle,
-            additionalMessage,
-            suggestedPrompts: this.getPromptFileSuggestions()
+            additionalMessage
         };
     }
-    getPromptFileSuggestions() {
-        if (!this.chatEntitlementService.sentiment.installed) {
-            const isEmpty = this.contextService.getWorkbenchState() === WorkbenchState.EMPTY;
-            if (isEmpty) {
-                return [{
-                    icon: Codicon.vscode,
-                    label: ( localize(6673, "Ask @vscode")),
-                    prompt: ( localize(6674, "@vscode How do I change the theme to light mode?"))
-                }, {
-                    icon: Codicon.newFolder,
-                    label: ( localize(6675, "Create Project")),
-                    prompt: ( localize(6676, "Create a #new Hello World project in TypeScript"))
-                }];
-            } else {
-                return [{
-                    icon: Codicon.debugAlt,
-                    label: ( localize(6677, "Build Workspace")),
-                    prompt: ( localize(6678, "How do I build this workspace?"))
-                }, {
-                    icon: Codicon.gear,
-                    label: ( localize(6679, "Show Config")),
-                    prompt: ( localize(6680, "Where is the configuration for this project defined?"))
-                }];
-            }
-        }
-        const activeEditor = this.editorService.activeEditor;
-        const resource = activeEditor ? EditorResourceAccessor.getOriginalUri(activeEditor) : undefined;
-        const suggestions = PromptsConfig.getPromptFilesRecommendationsValue(this.configurationService, resource);
-        if (!suggestions) {
-            return [];
-        }
-        const result = [];
-        const promptsToLoad = [];
-        for (const [promptName] of Object.entries(suggestions)) {
-            const description = this.promptDescriptionsCache.get(promptName);
-            if (description === undefined) {
-                promptsToLoad.push(promptName);
-            }
-        }
-        if (promptsToLoad.length > 0 && !this._isLoadingPromptDescriptions) {
-            this.loadPromptDescriptions(promptsToLoad);
-            return [];
-        }
-        const promptsWithScores = [];
-        for (const [promptName, condition] of Object.entries(suggestions)) {
-            let score = 0;
-            if (typeof condition === "boolean") {
-                score = condition ? 1 : 0;
-            }
-            else if (typeof condition === "string") {
-                try {
-                    const whenClause = ContextKeyExpr.deserialize(condition);
-                    if (whenClause) {
-                        const allEditors = this.codeEditorService.listCodeEditors();
-                        if (allEditors.length > 0) {
-                            score = allEditors.reduce((count, editor) => {
-                                try {
-                                    const editorContext = this.contextKeyService.getContext(editor.getDomNode());
-                                    return count + (whenClause.evaluate(editorContext) ? 1 : 0);
-                                } catch (error) {
-                                    this.logService.warn("Failed to evaluate when clause for editor:", error);
-                                    return count;
-                                }
-                            }, 0);
-                        } else {
-                            score = this.contextKeyService.contextMatchesRules(whenClause) ? 1 : 0;
-                        }
-                    } else {
-                        score = 0;
-                    }
-                } catch (error) {
-                    this.logService.warn(
-                        "Failed to parse when clause for prompt file suggestion:",
-                        condition,
-                        error
-                    );
-                    score = 0;
-                }
-            }
-            if (score > 0) {
-                promptsWithScores.push({
-                    promptName,
-                    condition,
-                    score
-                });
-            }
-        }
-        promptsWithScores.sort((a, b) => b.score - a.score);
-        const topPrompts = promptsWithScores.slice(0, 5);
-        for (const {
-            promptName
-        } of topPrompts) {
-            const description = this.promptDescriptionsCache.get(promptName);
-            const commandLabel = ( localize(6681, "{0}", promptName));
-            const uri = this.promptUriCache.get(promptName);
-            const descriptionText = description?.trim() ? description : undefined;
-            result.push({
-                icon: Codicon.run,
-                label: commandLabel,
-                description: descriptionText,
-                prompt: `/${promptName} `,
-                uri: uri
-            });
-        }
-        return result;
-    }
-    async loadPromptDescriptions(promptNames) {
-        if (this._store.isDisposed) {
-            return;
-        }
-        this._isLoadingPromptDescriptions = true;
-        try {
-            const promptCommands = await this.promptsService.getPromptSlashCommands(CancellationToken.None);
-            let cacheUpdated = false;
-            for (const promptCommand of promptCommands) {
-                if (promptNames.includes(promptCommand.name)) {
-                    const description = promptCommand.description;
-                    if (description) {
-                        this.promptDescriptionsCache.set(promptCommand.name, description);
-                        cacheUpdated = true;
-                    } else {
-                        this.promptDescriptionsCache.set(promptCommand.name, "");
-                        cacheUpdated = true;
-                    }
-                }
-            }
-            if (cacheUpdated) {
-                this.renderWelcomeViewContentIfNeeded();
-            }
-        } catch (error) {
-            this.logService.warn("Failed to load specific prompt descriptions:", error);
-        } finally {
-            this._isLoadingPromptDescriptions = false;
-        }
-    }
     async renderChatEditingSessionState() {
         if (!this.input) {
             return;
@@ -1098,7 +974,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (this.lifecycleService.willShutdown) {
             return;
         }
-        if (this.isLockedToCodingAgent) {
+        if (this.isLockedToCodingAgent && !this._attachmentCapabilities.supportsHandOffs) {
             this.chatSuggestNextWidget.hide();
             return;
         }
@@ -1406,6 +1282,9 @@ let ChatWidget = class ChatWidget extends Disposable {
                 rowContainer.appendChild(this.inputContainer);
                 this.createInput(this.inputContainer);
                 this.input.setChatMode(this.inputPart.currentModeObs.get().id);
+                this.input.setPermissionLevel(
+                    this.inputPart.currentModeInfo.permissionLevel ?? ChatPermissionLevel.Default
+                );
                 this.input.setEditing(true, isEditingSentRequest);
                 this._onDidChangeActiveInputEditor.fire();
             } else {
@@ -1481,6 +1360,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const isInput = this.configurationService.getValue("chat.editRequests") === "input";
         if (!isInput) {
             this.inputPart.setChatMode(this.input.currentModeObs.get().id);
+            this.inputPart.setPermissionLevel(this.input.currentModeInfo.permissionLevel ?? ChatPermissionLevel.Default);
             const currentModel = this.input.selectedLanguageModel.get();
             if (currentModel) {
                 this.inputPart.switchModel(currentModel.metadata);
@@ -1537,10 +1417,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             renderWorkingSet: this.viewOptions.enableWorkingSet === "explicit",
             supportsChangingModes: this.viewOptions.supportsChangingModes,
             dndContainer: this.viewOptions.dndContainer,
+            inputEditorMinLines: this.viewOptions.inputEditorMinLines,
             widgetViewKindTag: this.getWidgetViewKindTag(),
             defaultMode: this.viewOptions.defaultMode,
             sessionTypePickerDelegate: this.viewOptions.sessionTypePickerDelegate,
-            workspacePickerDelegate: this.viewOptions.workspacePickerDelegate
+            workspacePickerDelegate: this.viewOptions.workspacePickerDelegate,
+            isSessionsWindow: this.viewOptions.isSessionsWindow
         };
         if (this.viewModel?.editing) {
             const editedRequest = this.listWidget.getTemplateDataForRequestId(this.viewModel?.editing?.id);
@@ -1616,6 +1498,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.renderFollowups();
             this.renderChatSuggestNextWidget();
         }));
+        const foregroundSessionCountContextKeys = ( new Set([ChatContextKeys.foregroundSessionCount.key]));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(foregroundSessionCountContextKeys) && this.isEmpty()) {
+                this.renderGettingStartedTipIfNeeded();
+            }
+        }));
         let previousModelIdentifier;
         this._register(autorun(reader => {
             const modelIdentifier = this.inputPart.selectedLanguageModel.read(reader)?.identifier;
@@ -1691,13 +1579,13 @@ let ChatWidget = class ChatWidget extends Disposable {
         clearNode(tipContainer);
         setVisibility(false, tipContainer);
         this._codeBlockModelCollection.clear();
-        this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection, undefined);
         this.inputPart.setInputModel(model.inputModel, model.getRequests().length === 0);
+        this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection, undefined);
         this.listWidget.setViewModel(this.viewModel);
         if (this._lockedAgent) {
             let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
             if (!placeholder) {
-                placeholder = ( localize(6682, "Chat with {0}", this._lockedAgent.id));
+                placeholder = ( localize(6769, "Chat with {0}", this._lockedAgent.id));
             }
             this.viewModel.setInputPlaceholder(placeholder);
             this.inputEditor.updateOptions({
@@ -1743,7 +1631,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this._hasPendingRequestsContextKey.set(pendingCount > 0);
             const steeringCount = pendingRequests.filter(pending => pending.kind === ChatRequestQueueKind.Steering).length;
             if (announceSteering && steeringCount > 0 && lastSteeringCount === 0) {
-                status(( localize(6683, "Steering")));
+                status(( localize(6770, "Steering")));
             }
             lastSteeringCount = steeringCount;
         };
@@ -1882,7 +1770,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         const options = {
             attempt: lastRequest.attempt + 1,
             location: this.location,
-            userSelectedModelId: this.input.currentLanguageModel
+            userSelectedModelId: this.input.currentLanguageModel,
+            modeInfo: this.input.currentModeInfo
         };
         return await this.chatService.resendRequest(lastRequest, options);
     }
@@ -1891,6 +1780,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (!agentSlashPromptPart) {
             return;
         }
+        this.chatTipService.recordSlashCommandUsage(agentSlashPromptPart.name);
         const slashCommand = await this.promptsService.resolvePromptSlashCommand(agentSlashPromptPart.name, CancellationToken.None);
         if (!slashCommand) {
             return;
@@ -1963,7 +1853,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const editorValue = this.getInput();
         const requestInputs = {
             input: !query ? editorValue : query.query,
-            attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource)
+            attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext() : this.input.getAttachedAndImplicitContext()
         };
         const isUserQuery = !query;
         const isEditing = this.viewModel?.editing;
@@ -1997,7 +1887,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         await this._applyPromptFileIfSet(requestInputs);
         await this._autoAttachInstructions(requestInputs);
-        if (this.viewOptions.enableWorkingSet !== undefined && this.input.currentModeKind === ChatModeKind.Edit && !this.chatService.edits2Enabled) {
+        if (this.viewOptions.enableWorkingSet !== undefined && this.input.currentModeKind === ChatModeKind.Edit) {
             const uniqueWorkingSetEntries = ( new ResourceSet());
             const editingSessionAttachedContext = requestInputs.attachedContext;
             const previousRequests = this.viewModel.model.getRequests();
@@ -2112,16 +2002,16 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         const promptResult = await this.dialogService.prompt({
             type: "question",
-            message: ( localize(6684, "You already have pending requests.")),
+            message: ( localize(6771, "You already have pending requests.")),
             detail: ( localize(
-                6685,
+                6772,
                 "Do you want to keep them in the queue or remove them before sending this message?"
             )),
             buttons: [{
-                label: ( localize(6686, "Keep Pending Requests")),
+                label: ( localize(6773, "Keep Pending Requests")),
                 run: () => "keep"
             }, {
-                label: ( localize(6687, "Remove Pending Requests")),
+                label: ( localize(6774, "Remove Pending Requests")),
                 run: () => "remove"
             }],
             cancelButton: true
@@ -2353,6 +2243,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, 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)), ( __param(29, IChatAttachmentResolveService)), ( __param(30, IChatTipService)), ( __param(31, IChatDebugService))], ChatWidget));
+ChatWidget = ChatWidget_1 = ( __decorate([( __param(4, ICodeEditorService)), ( __param(5, IConfigurationService)), ( __param(6, IDialogService)), ( __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, ILifecycleService)), ( __param(27, IChatAttachmentResolveService)), ( __param(28, IChatTipService)), ( __param(29, IChatDebugService))], 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(6688, "Follow up question: {0}", baseTitle));
+        button.element.ariaLabel = ( localize(6775, "Follow up question: {0}", baseTitle));
         button.label = ( new MarkdownString(baseTitle));
         this._register(button.onDidClick(() => this.clickHandler(followup)));
     }