@codingame/monaco-vscode-katex-common 24.2.0 → 25.0.0

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

@@ -15,27 +15,27 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 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 { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { IChatLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService.service";
-import { IChatModel, IChatModelInputState, IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
+import { IChatLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service";
+import { IChatModel, IChatModelInputState, IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatLocationData, IChatSendRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes";
+import { IChatLocationData, IChatSendRequestOptions } 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/chatSlashCommands.service";
-import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service";
-import { ChatViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
+import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service";
+import { ChatViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
-import { ChatTreeItem, IChatAcceptInputOptions, IChatCodeBlockInfo, IChatFileTreeInfo, IChatWidget, IChatWidgetViewContext, IChatWidgetViewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ChatTreeItem, IChatAcceptInputOptions, IChatCodeBlockInfo, IChatFileTreeInfo, IChatWidget, IChatWidgetViewContext, IChatWidgetViewModelChangeEvent, IChatWidgetViewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { ChatAttachmentModel } from "./chatAttachmentModel.js";
-import { ChatInputPart, IChatInputStyles } from "./chatInputPart.js";
+import { ChatAttachmentModel } from "../attachments/chatAttachmentModel.js";
+import { ChatInputPart, IChatInputStyles } from "./input/chatInputPart.js";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 export interface IChatWidgetStyles extends IChatInputStyles {
     readonly inputEditorBackground: string;
@@ -104,7 +104,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private _onDidFocus;
     readonly onDidFocus: Event<void>;
     private _onDidChangeViewModel;
-    readonly onDidChangeViewModel: Event<void>;
+    readonly onDidChangeViewModel: Event<IChatWidgetViewModelChangeEvent>;
     private _onDidScroll;
     readonly onDidScroll: Event<void>;
     private _onDidAcceptInput;
@@ -132,6 +132,8 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private readonly _codeBlockModelCollection;
     private lastItem;
     private readonly visibilityTimeoutDisposable;
+    private readonly visibilityAnimationFrameDisposable;
+    private readonly scrollAnimationFrameDisposable;
     private readonly inputPartDisposable;
     private readonly inlineInputPartDisposable;
     private inputContainer;

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

@@ -57,38 +57,38 @@ import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { katexContainerClassName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/markdown/common/markedKatexExtension';
 import { checkModeOption } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { decidedChatEditingResourceContextKey, ModifiedFileEntryState, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, inChatEditingSessionContextKey, applyingChatEditsFailedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { decidedChatEditingResourceContextKey, ModifiedFileEntryState, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, inChatEditingSessionContextKey, applyingChatEditsFailedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
+import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader, ChatRequestSlashPromptPart, formatChatQuestion, ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, 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 { 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/chatSlashCommands.service';
-import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service';
-import { isWorkspaceVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { isResponseVM, isRequestVM, ChatViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
+import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
+import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service';
+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 { ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { ComputeAutomaticInstructions } from '../common/promptSyntax/computeAutomaticInstructions.js';
+import { ToolSet } 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 { 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';
 import { IChatWidgetService, IChatAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
+import { ChatAccessibilityProvider } from '../accessibility/chatAccessibilityProvider.js';
 import { ChatSuggestNextWidget } from './chatContentParts/chatSuggestNextWidget.js';
-import { ChatInputPart } from './chatInputPart.js';
+import { ChatInputPart } from './input/chatInputPart.js';
 import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
 import { ChatEditorOptions } from './chatOptions.js';
-import { ChatViewWelcomePart } from './viewsWelcome/chatViewWelcomeController.js';
+import { ChatViewWelcomePart } from '../viewsWelcome/chatViewWelcomeController.js';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
@@ -117,7 +117,7 @@ const supportsAllAttachments = {
     supportsSymbolAttachments: true,
     supportsTerminalAttachments: true,
 };
-const DISCLAIMER = ( localize(5653, "AI responses may be inaccurate."));
+const DISCLAIMER = ( localize(5791, "AI responses may be inaccurate."));
 let ChatWidget = class ChatWidget extends Disposable {
     static { ChatWidget_1 = this; }
     static { this.CONTRIBS = []; }
@@ -127,6 +127,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (this._viewModel === viewModel) {
             return;
         }
+        const previousSessionResource = this._viewModel?.sessionResource;
         this.viewModelDisposables.clear();
         this._viewModel = viewModel;
         if (viewModel) {
@@ -136,7 +137,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         else {
             this.logService.debug('ChatWidget#setViewModel: no viewModel');
         }
-        this._onDidChangeViewModel.fire();
+        this.currentRequest = undefined;
+        this._onDidChangeViewModel.fire({ previousSessionResource, currentSessionResource: this._viewModel?.sessionResource });
     }
     get viewModel() {
         return this._viewModel;
@@ -224,6 +226,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.onDidChangeEmptyState = this._onDidChangeEmptyState.event;
         this.contribs = [];
         this.visibilityTimeoutDisposable = this._register(( new MutableDisposable()));
+        this.visibilityAnimationFrameDisposable = this._register(( new MutableDisposable()));
+        this.scrollAnimationFrameDisposable = this._register(( new MutableDisposable()));
         this.inputPartDisposable = this._register(( new MutableDisposable()));
         this.inlineInputPartDisposable = this._register(( new MutableDisposable()));
         this.recentlyRestoredCheckpoint = false;
@@ -465,7 +469,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         })));
         scrollDownButton.element.classList.add('chat-scroll-down');
         scrollDownButton.label = `$(${Codicon.chevronDown.id})`;
-        scrollDownButton.setTitle(( localize(5654, "Scroll down")));
+        scrollDownButton.setTitle(( localize(5792, "Scroll down")));
         this._register(scrollDownButton.onDidClick(() => {
             this.scrollLock = true;
             this.scrollToEnd();
@@ -479,8 +483,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.tree.rerender();
             }
         }));
-        this._register(this.editorOptions.onDidChange(() => this.onDidStyleChange()));
-        this.onDidStyleChange();
+        this._register(Event.runAndSubscribe(this.editorOptions.onDidChange, () => this.onDidStyleChange()));
         if (this.viewModel) {
             this.onDidChangeItems();
             this.scrollToEnd();
@@ -649,7 +652,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
                     const providers = product.defaultChatAgent.provider;
                     additionalMessage = ( new MarkdownString(( localize(
-                        5655,
+                        5793,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).",
                         providers.default.name,
                         providers.default.name,
@@ -696,7 +699,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         else if (this._instructionFilesExist === false) {
             const generateInstructionsCommand = 'workbench.action.chat.generateInstructions';
             return (new MarkdownString(localize(
-                5656,
+                5794,
                 "[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
                 `command:${generateInstructionsCommand}`
             ), { isTrusted: { enabledCommands: [generateInstructionsCommand] } }));
@@ -727,18 +730,18 @@ let ChatWidget = class ChatWidget extends Disposable {
                 ? ( new MarkdownString(providerMessage))
                 : (this._lockedAgent?.prefix === '@copilot '
                     ? ( new MarkdownString(( localize(
-                5657,
+                5795,
                 "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(
-                5658,
+                5796,
                 "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(5659, "Delegate to {0}", this._lockedAgent?.prefix)),
+                title: providerTitle ?? ( localize(5797, "Delegate to {0}", this._lockedAgent?.prefix)),
                 message,
                 icon: providerIcon ?? Codicon.sendToRemoteAgent,
                 additionalMessage,
@@ -747,13 +750,13 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         let title;
         if (this.input.currentModeKind === ChatModeKind.Ask) {
-            title = ( localize(5660, "Ask about your code"));
+            title = ( localize(5798, "Ask about your code"));
         }
         else if (this.input.currentModeKind === ChatModeKind.Edit) {
-            title = ( localize(5661, "Edit in context"));
+            title = ( localize(5799, "Edit in context"));
         }
         else {
-            title = ( localize(5662, "Build with Agent"));
+            title = ( localize(5800, "Build with Agent"));
         }
         return {
             title,
@@ -770,13 +773,13 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return [
                     {
                         icon: Codicon.vscode,
-                        label: ( localize(5663, "Ask @vscode")),
-                        prompt: ( localize(5664, "@vscode How do I change the theme to light mode?")),
+                        label: ( localize(5801, "Ask @vscode")),
+                        prompt: ( localize(5802, "@vscode How do I change the theme to light mode?")),
                     },
                     {
                         icon: Codicon.newFolder,
-                        label: ( localize(5665, "Create Project")),
-                        prompt: ( localize(5666, "Create a #new Hello World project in TypeScript")),
+                        label: ( localize(5803, "Create Project")),
+                        prompt: ( localize(5804, "Create a #new Hello World project in TypeScript")),
                     }
                 ];
             }
@@ -784,13 +787,13 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return [
                     {
                         icon: Codicon.debugAlt,
-                        label: ( localize(5667, "Build Workspace")),
-                        prompt: ( localize(5668, "How do I build this workspace?")),
+                        label: ( localize(5805, "Build Workspace")),
+                        prompt: ( localize(5806, "How do I build this workspace?")),
                     },
                     {
                         icon: Codicon.gear,
-                        label: ( localize(5669, "Show Config")),
-                        prompt: ( localize(5670, "Where is the configuration for this project defined?")),
+                        label: ( localize(5807, "Show Config")),
+                        prompt: ( localize(5808, "Where is the configuration for this project defined?")),
                     }
                 ];
             }
@@ -857,7 +860,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const topPrompts = promptsWithScores.slice(0, 5);
         for (const { promptName } of topPrompts) {
             const description = this.promptDescriptionsCache.get(promptName);
-            const commandLabel = ( localize(5671, "{0}", promptName));
+            const commandLabel = ( localize(5809, "{0}", promptName));
             const uri = this.promptUriCache.get(promptName);
             const descriptionText = description?.trim() ? description : undefined;
             result.push({
@@ -912,7 +915,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
     }
     async renderFollowups() {
-        if (this.lastItem && isResponseVM(this.lastItem) && this.lastItem.isComplete && this.input.currentModeKind === ChatModeKind.Ask) {
+        if (this.lastItem && isResponseVM(this.lastItem) && this.lastItem.isComplete) {
             this.input.renderFollowups(this.lastItem.replyFollowups, this.lastItem);
         }
         else {
@@ -1080,9 +1083,9 @@ let ChatWidget = class ChatWidget extends Disposable {
                         this.onDidChangeItems(true);
                     }
                 }, 0);
-                this._register(scheduleAtNextAnimationFrame(getWindow(this.listContainer), () => {
+                this.visibilityAnimationFrameDisposable.value = scheduleAtNextAnimationFrame(getWindow(this.listContainer), () => {
                     this._onDidShow.fire();
-                }));
+                });
             }
         }
         else if (wasVisible) {
@@ -1212,14 +1215,23 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this.viewModel?.model.setCheckpoint(currentElement.id);
             const currentContext = [];
+            const addedContextIds = ( new Set());
+            const addToContext = (entry) => {
+                if (( addedContextIds.has(entry.id)) || isWorkspaceVariableEntry(entry)) {
+                    return;
+                }
+                if ((isPromptFileVariableEntry(entry) || isPromptTextVariableEntry(entry)) && entry.automaticallyAdded) {
+                    return;
+                }
+                addedContextIds.add(entry.id);
+                currentContext.push(entry);
+            };
             for (let i = requests.length - 1; i >= 0; i -= 1) {
                 const request = requests[i];
                 if (request.id === currentElement.id) {
                     request.shouldBeBlocked = false;
-                    if (request.attachedContext) {
-                        const context = request.attachedContext.filter(entry => !isWorkspaceVariableEntry(entry) && (!(isPromptFileVariableEntry(entry) || isPromptTextVariableEntry(entry)) || !entry.automaticallyAdded));
-                        currentContext.push(...context);
-                    }
+                    request.attachedContext?.forEach(addToContext);
+                    currentElement.variables.forEach(addToContext);
                 }
             }
             this.viewModel?.setEditing(currentElement);
@@ -1233,7 +1245,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.inputContainer = $$1('.chat-edit-input-container');
                 rowContainer.appendChild(this.inputContainer);
                 this.createInput(this.inputContainer);
-                this.input.setChatMode(this.inputPart.currentModeKind);
+                this.input.setChatMode(this.inputPart.currentModeObs.get().id);
             }
             else {
                 this.inputPart.element.classList.add('editing');
@@ -1280,7 +1292,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         const isInput = this.configurationService.getValue('chat.editRequests') === 'input';
         if (!isInput) {
-            this.inputPart.setChatMode(this.input.currentModeKind);
+            this.inputPart.setChatMode(this.input.currentModeObs.get().id);
             const currentModel = this.input.selectedLanguageModel;
             if (currentModel) {
                 this.inputPart.switchModel(currentModel.metadata);
@@ -1352,9 +1364,9 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (!lastResponseIsRendering || this.scrollLock) {
                 const lastElementWasVisible = this.tree.scrollTop + this.tree.renderHeight >= this.previousTreeScrollHeight - 2;
                 if (lastElementWasVisible) {
-                    this._register(scheduleAtNextAnimationFrame(getWindow(this.listContainer), () => {
+                    this.scrollAnimationFrameDisposable.value = scheduleAtNextAnimationFrame(getWindow(this.listContainer), () => {
                         this.scrollToEnd();
-                    }, 0));
+                    }, 0);
                 }
             }
         }
@@ -1493,6 +1505,9 @@ let ChatWidget = class ChatWidget extends Disposable {
             throw ( new Error('Call render() before setModel()'));
         }
         if (!model) {
+            if (this.viewModel?.editing) {
+                this.finishedEditing();
+            }
             this.viewModel = undefined;
             this.onDidChangeItems();
             return;
@@ -1500,6 +1515,9 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (isEqual(model.sessionResource, this.viewModel?.sessionResource)) {
             return;
         }
+        if (this.viewModel?.editing) {
+            this.finishedEditing();
+        }
         this.inputPart.clearTodoListWidget(model.sessionResource, false);
         this.chatSuggestNextWidget.hide();
         this._codeBlockModelCollection.clear();
@@ -1509,7 +1527,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (this._lockedAgent) {
             let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
             if (!placeholder) {
-                placeholder = ( localize(5672, "Chat with {0}", this._lockedAgent.id));
+                placeholder = ( localize(5810, "Chat with {0}", this._lockedAgent.id));
             }
             this.viewModel.setInputPlaceholder(placeholder);
             this.inputEditor.updateOptions({ placeholder });
@@ -1710,7 +1728,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._onDidAcceptInput.fire();
         this.scrollLock = this.isLockedToCodingAgent || !!checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll);
         const editorValue = this.getInput();
-        const requestId = this.chatAccessibilityService.acceptRequest();
         const requestInputs = {
             input: !query ? editorValue : query.query,
             attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource),
@@ -1754,6 +1771,9 @@ let ChatWidget = class ChatWidget extends Disposable {
                 }
             }
         }
+        if (this.viewModel.sessionResource) {
+            this.chatAccessibilityService.acceptRequest(this._viewModel.sessionResource);
+        }
         const result = await this.chatService.sendRequest(this.viewModel.sessionResource, requestInputs.input, {
             userSelectedModelId: this.input.currentLanguageModel,
             location: this.location,
@@ -1766,17 +1786,17 @@ let ChatWidget = class ChatWidget extends Disposable {
             agentIdSilent: this._lockedAgent?.id,
         });
         if (!result) {
-            this.chatAccessibilityService.disposeRequest(requestId);
+            this.chatAccessibilityService.disposeRequest(this.viewModel.sessionResource);
             return;
         }
         this.updateChatViewVisibility();
-        this.input.acceptInput(isUserQuery);
+        this.input.acceptInput(options?.storeToHistory ?? isUserQuery);
         this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
         this.handleDelegationExitIfNeeded(this._lockedAgent, result.agent);
         this.currentRequest = result.responseCompletePromise.then(() => {
             const responses = this.viewModel?.getItems().filter(isResponseVM);
             const lastResponse = responses?.[responses.length - 1];
-            this.chatAccessibilityService.acceptResponse(this, this.container, lastResponse, requestId, options?.isVoiceInput);
+            this.chatAccessibilityService.acceptResponse(this, this.container, lastResponse, this.viewModel?.sessionResource, options?.isVoiceInput);
             if (lastResponse?.result?.nextQuestion) {
                 const { prompt, participant, command } = lastResponse.result.nextQuestion;
                 const question = formatChatQuestion(this.chatAgentService, this.location, prompt, participant, command);

package/vscode/src/vs/workbench/contrib/chat/browser/{chatFollowups.d.ts → widget/input/chatFollowups.d.ts}

@@ -1,7 +1,7 @@
 import { IButtonStyles } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatFollowup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatFollowup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 export declare class ChatFollowups<T extends IChatFollowup> extends Disposable {
     private readonly location;

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

@@ -5,8 +5,8 @@ import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/b
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { formatChatQuestion } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { formatChatQuestion } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 
 const $ = $$1;
 let ChatFollowups = class ChatFollowups extends Disposable {
@@ -40,7 +40,7 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         else if (followup.kind === 'command') {
             button.element.classList.add('interactive-followup-command');
         }
-        button.element.ariaLabel = ( localize(5293, "Follow up question: {0}", baseTitle));
+        button.element.ariaLabel = ( localize(5811, "Follow up question: {0}", baseTitle));
         button.label = ( new MarkdownString(baseTitle));
         this._register(button.onDidClick(() => this.clickHandler(followup)));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatInputPart.d.ts → widget/input/chatInputPart.d.ts}

@@ -21,28 +21,28 @@ import { ISharedWebContentExtractorService } from "@codingame/monaco-vscode-api/
 import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatModelInputState, IChatRequestModeInfo, IInputModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatModelInputState, IChatRequestModeInfo, IInputModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
 import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
-import { IChatFollowup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatFollowup } 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 { ChatRequestVariableSet, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { ChatRequestVariableSet, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatAgentLocation, ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { ChatAttachmentModel } from "./chatAttachmentModel.js";
-import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service";
-import { ChatDragAndDrop } from "./chatDragAndDrop.js";
+import { ChatAttachmentModel } from "../../attachments/chatAttachmentModel.js";
+import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
+import { ChatDragAndDrop } from "../chatDragAndDrop.js";
 import { ChatSelectedTools } from "./chatSelectedTools.js";
-import { ChatImplicitContext } from "./contrib/chatImplicitContext.js";
-import { ChatRelatedFiles } from "./contrib/chatInputRelatedFilesContrib.js";
+import { ChatImplicitContext } from "../../attachments/chatImplicitContext.js";
+import { ChatRelatedFiles } from "../../attachments/chatInputRelatedFilesContrib.js";
 export interface IChatInputStyles {
     overlayBackground: string;
     listForeground: string;
@@ -317,6 +317,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     toggleChatInputOverlay(editing: boolean): void;
     renderAttachedContext(): void;
     private hasImplicitContextBlock;
+    private isAttachmentAlreadyAttached;
     private handleAttachmentDeletion;
     private handleAttachmentOpen;
     private handleAttachmentNavigation;