@codingame/monaco-vscode-chat-service-override 24.2.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{languageModelToolsService.js → tools/languageModelToolsService.js}

@@ -6,7 +6,7 @@ import { RunOnceScheduler, timeout } from '@codingame/monaco-vscode-api/vscode/v
 import { encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { itemsEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
+import { arrayEqualsC } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { CancellationError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -33,15 +33,15 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
-import { IChatToolInvocation, ToolConfirmKind } 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 { toToolSetVariableEntry, toToolVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ChatToolInvocation } from '../../common/model/chatProgressTypes/chatToolInvocation.js';
+import { IChatToolInvocation, ToolConfirmKind } 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 { toToolSetVariableEntry, toToolVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service';
-import { ToolDataSource, VSCodeToolReference, SpecedToolAliases, ToolSet, createToolSchemaUri, stringifyPromptTsxPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { getToolConfirmationAlert } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatAccessibilityProvider';
+import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
+import { ToolDataSource, VSCodeToolReference, SpecedToolAliases, ToolSet, createToolSchemaUri, stringifyPromptTsxPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { getToolConfirmationAlert } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityProvider';
 import { observableFromEventOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { ObservableSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/set';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -54,7 +54,7 @@ var AutoApproveStorageKeys;
 })(AutoApproveStorageKeys || (AutoApproveStorageKeys = {}));
 const SkipAutoApproveConfirmationKey = 'vscode.chat.tools.global.autoApprove.testMode';
 const globalAutoApproveDescription = ( localize2(
-    5729,
+    5574,
     'Global auto approve also known as "YOLO mode" disables manual approval completely for _all tools in all workspaces_, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like [Codespaces](https://github.com/features/codespaces) and [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) have user keys forwarded into the container that could be compromised.\n\n**This feature disables [critical security protections](https://code.visualstudio.com/docs/copilot/security) and makes it much easier for an attacker to compromise the machine.**'
 ));
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
@@ -81,7 +81,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this._tools = ( new Map());
         this._toolContextKeys = ( new Set());
         this._callsByRequestId = ( new Map());
-        this.toolsObservable = observableFromEventOpts({ equalsFn: itemsEquals() }, this.onDidChangeTools, () => Array.from(this.getTools()));
+        this.toolsObservable = observableFromEventOpts({ equalsFn: arrayEqualsC() }, this.onDidChangeTools, () => Array.from(this.getTools()));
         this._toolSets = ( new ObservableSet());
         this.toolSets = derived(this, reader => {
             const allToolSets = Array.from(this._toolSets.observable.read(reader));
@@ -127,15 +127,15 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
         this.vscodeToolSet = this._register(this.createToolSet(ToolDataSource.Internal, 'vscode', VSCodeToolReference.vscode, {
             icon: ThemeIcon.fromId(Codicon.vscode.id),
-            description: ( localize(5730, 'Use VS Code features')),
+            description: ( localize(5575, 'Use VS Code features')),
         }));
         this.executeToolSet = this._register(this.createToolSet(ToolDataSource.Internal, 'execute', SpecedToolAliases.execute, {
             icon: ThemeIcon.fromId(Codicon.terminal.id),
-            description: ( localize(5731, 'Execute code and applications on your machine')),
+            description: ( localize(5576, 'Execute code and applications on your machine')),
         }));
         this.readToolSet = this._register(this.createToolSet(ToolDataSource.Internal, 'read', SpecedToolAliases.read, {
             icon: ThemeIcon.fromId(Codicon.eye.id),
-            description: ( localize(5732, 'Read files in your workspace')),
+            description: ( localize(5577, 'Read files in your workspace')),
         }));
     }
     isPermitted(toolOrToolSet, reader) {
@@ -430,10 +430,10 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             const fullReferenceName = getToolFullReferenceName(tool.data);
             prepared.confirmationMessages = {
                 ...prepared.confirmationMessages,
-                title: ( localize(5733, 'Allow tool to execute?')),
-                message: ( localize(5734, 'Run the \'{0}\' tool?', fullReferenceName)),
+                title: ( localize(5578, 'Confirm tool execution')),
+                message: ( localize(5579, 'Run the \'{0}\' tool?', fullReferenceName)),
                 disclaimer: ( new MarkdownString(( localize(
-                    5735,
+                    5580,
                     'Auto approval for \'{0}\' is restricted via {1}.',
                     getToolFullReferenceName(tool.data),
                     createMarkdownCommandLink({ title: '`' + ChatConfiguration.EligibleForAutoApproval + '`', id: 'workbench.action.openSettings', arguments: [ChatConfiguration.EligibleForAutoApproval] }, false)
@@ -443,7 +443,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         if (!isEligibleForAutoApproval && prepared?.confirmationMessages?.title) {
             prepared.confirmationMessages.disclaimer = ( new MarkdownString(( localize(
-                5735,
+                5580,
                 'Auto approval for \'{0}\' is restricted via {1}.',
                 getToolFullReferenceName(tool.data),
                 createMarkdownCommandLink({ title: '`' + ChatConfiguration.EligibleForAutoApproval + '`', id: 'workbench.action.openSettings', arguments: [ChatConfiguration.EligibleForAutoApproval] }, false)
@@ -580,14 +580,14 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         const promptResult = await this._dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(5736, 'Enable global auto approve?')),
+            message: ( localize(5581, 'Enable global auto approve?')),
             buttons: [
                 {
-                    label: ( localize(5737, 'Enable')),
+                    label: ( localize(5582, 'Enable')),
                     run: () => true
                 },
                 {
-                    label: ( localize(5738, 'Disable')),
+                    label: ( localize(5583, 'Disable')),
                     run: () => false
                 },
             ],

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

@@ -7,7 +7,7 @@ import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.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";
 export declare class UserToolSetsContributions extends Disposable implements IWorkbenchContribution {
     private readonly _languageModelToolsService;
     private readonly _userDataProfileService;

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.js

@@ -19,8 +19,8 @@ import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ToolDataSource } 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 { ToolDataSource } 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 { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { getAllCodicons, Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { isValidBasename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
@@ -30,7 +30,7 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/json
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
@@ -44,11 +44,11 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(5840, "Empty tool set")),
+            label: ( localize(5584, "Empty tool set")),
             body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
         }],
     type: 'object',
-    description: ( localize(5841, 'User tool sets configuration')),
+    description: ( localize(5585, 'User tool sets configuration')),
     additionalProperties: {
         type: 'object',
         required: ['tools'],
@@ -56,7 +56,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    5842,
+                    5586,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: 'array',
@@ -69,7 +69,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    5843,
+                    5587,
                     'Icon to use for this tool set in the UI. Uses the "\\$(name)"-syntax, like "\\$(zap)"'
                 )),
                 type: 'string',
@@ -77,7 +77,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`),
             },
             description: {
-                description: ( localize(5844, "A short description of this tool set.")),
+                description: ( localize(5588, "A short description of this tool set.")),
                 type: 'string'
             },
         },
@@ -164,7 +164,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(5845, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(5589, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -257,8 +257,8 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(5846, 'Configure Tool Sets...')),
-            shortTitle: ( localize(5847, "Tool Sets")),
+            title: ( localize2(5590, 'Configure Tool Sets...')),
+            shortTitle: ( localize(5591, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
@@ -279,7 +279,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(5848, 'Create new tool sets file...')),
+            label: ( localize(5592, 'Create new tool sets file...')),
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -296,7 +296,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(5849, 'Select a tool set to configure')),
+            placeHolder: ( localize(5593, 'Select a tool set to configure')),
         });
         if (!pick) {
             return;
@@ -304,13 +304,13 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(5850, "Type tool sets file name")),
+                placeHolder: ( localize(5594, "Type tool sets file name")),
                 validateInput: async (input) => {
                     if (!input) {
-                        return localize(5851, "Invalid file name");
+                        return localize(5595, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(5852, "'{0}' is not a valid file name", input);
+                        return localize(5596, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -17,29 +17,29 @@ const chatViewsWelcomeJsonSchema = {
     properties: {
         icon: {
             type: 'string',
-            description: ( localize(5858, 'The icon for the welcome message.')),
+            description: ( localize(5602, 'The icon for the welcome message.')),
         },
         title: {
             type: 'string',
-            description: ( localize(5859, 'The title of the welcome message.')),
+            description: ( localize(5603, 'The title of the welcome message.')),
         },
         content: {
             type: 'string',
             description: ( localize(
-                5860,
+                5604,
                 'The content of the welcome message. The first command link will be rendered as a button.'
             )),
         },
         when: {
             type: 'string',
-            description: ( localize(5861, 'Condition when the welcome message is shown.')),
+            description: ( localize(5605, 'Condition when the welcome message is shown.')),
         }
     }
 };
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(5862, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5606, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: chatViewsWelcomeJsonSchema,
     },

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

@@ -1,6 +1,6 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { InlineAnchorWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
-import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
+import { InlineAnchorWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget";
+import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 export declare class ChatMarkdownAnchorService extends Disposable implements IChatMarkdownAnchorService {
     readonly _serviceBrand: undefined;
     private _widgets;

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IChatLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService.service";
+import { IChatLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service";
 export declare class ChatLayoutService extends Disposable implements IChatLayoutService {
     readonly _serviceBrand: undefined;
     readonly fontFamily: IObservable<string | null>;

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

@@ -6,23 +6,27 @@ import { type PreferredGroup } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { ChatViewPaneTarget, IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IQuickChatService } 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 { IChatEditorOptions } from "./chatEditor.js";
+import { IChatEditorOptions } from "../widgetHosts/editor/chatEditor.js";
 export declare class ChatWidgetService extends Disposable implements IChatWidgetService {
     private readonly editorGroupsService;
     private readonly viewsService;
     private readonly quickChatService;
     private readonly layoutService;
     private readonly editorService;
+    private readonly chatService;
     readonly _serviceBrand: undefined;
     private _widgets;
     private _lastFocusedWidget;
     private readonly _onDidAddWidget;
     readonly onDidAddWidget: Event<IChatWidget>;
-    constructor(editorGroupsService: IEditorGroupsService, viewsService: IViewsService, quickChatService: IQuickChatService, layoutService: ILayoutService, editorService: IEditorService);
+    private readonly _onDidBackgroundSession;
+    readonly onDidBackgroundSession: Event<URI>;
+    constructor(editorGroupsService: IEditorGroupsService, viewsService: IViewsService, quickChatService: IQuickChatService, layoutService: ILayoutService, editorService: IEditorService, chatService: IChatService);
     get lastFocusedWidget(): IChatWidget | undefined;
     getAllWidgets(): ReadonlyArray<IChatWidget>;
     getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget>;

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

@@ -11,23 +11,27 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { isEditorGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatViewId, isIChatViewViewContext, ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatEditor } from './chatEditor.js';
-import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditor } from '../widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 
 let ChatWidgetService = class ChatWidgetService extends Disposable {
-    constructor(editorGroupsService, viewsService, quickChatService, layoutService, editorService) {
+    constructor(editorGroupsService, viewsService, quickChatService, layoutService, editorService, chatService) {
         super();
         this.editorGroupsService = editorGroupsService;
         this.viewsService = viewsService;
         this.quickChatService = quickChatService;
         this.layoutService = layoutService;
         this.editorService = editorService;
+        this.chatService = chatService;
         this._widgets = [];
         this._lastFocusedWidget = undefined;
         this._onDidAddWidget = this._register(( new Emitter()));
         this.onDidAddWidget = this._onDidAddWidget.event;
+        this._onDidBackgroundSession = this._register(( new Emitter()));
+        this.onDidBackgroundSession = this._onDidBackgroundSession.event;
     }
     get lastFocusedWidget() {
         return this._lastFocusedWidget;
@@ -173,7 +177,24 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
         }
         this._widgets.push(newWidget);
         this._onDidAddWidget.fire(newWidget);
-        return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), toDisposable(() => this._widgets.splice(this._widgets.indexOf(newWidget), 1)));
+        if (!this._lastFocusedWidget) {
+            this.setLastFocusedWidget(newWidget);
+        }
+        return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), newWidget.onDidChangeViewModel(({ previousSessionResource, currentSessionResource }) => {
+            if (!previousSessionResource || (currentSessionResource && isEqual(previousSessionResource, currentSessionResource))) {
+                return;
+            }
+            void timeout(200).then(() => {
+                if (!this.getWidgetBySessionResource(previousSessionResource) && this.chatService.getSession(previousSessionResource)) {
+                    this._onDidBackgroundSession.fire(previousSessionResource);
+                }
+            });
+        }), toDisposable(() => {
+            this._widgets.splice(this._widgets.indexOf(newWidget), 1);
+            if (this._lastFocusedWidget === newWidget) {
+                this.setLastFocusedWidget(undefined);
+            }
+        }));
     }
 };
 ChatWidgetService = ( __decorate([
@@ -181,7 +202,8 @@ ChatWidgetService = ( __decorate([
     ( __param(1, IViewsService)),
     ( __param(2, IQuickChatService)),
     ( __param(3, ILayoutService)),
-    ( __param(4, IEditorService))
+    ( __param(4, IEditorService)),
+    ( __param(5, IChatService))
 ], ChatWidgetService));
 
 export { ChatWidgetService };

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

@@ -2,8 +2,9 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
-import { IChatInputPartWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatInputPartWidgets";
+import { IChatInputPartWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets";
 /**
  * Widget that displays a status message with an optional action button.
  * Only shown for free tier users when the setting is enabled (experiment controlled via onExP tag).
@@ -12,13 +13,14 @@ export declare class ChatStatusWidget extends Disposable implements IChatInputPa
     private readonly chatEntitlementService;
     private readonly commandService;
     private readonly configurationService;
+    private readonly telemetryService;
     static readonly ID = "chatStatusWidget";
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: Event<void>;
     private messageElement;
     private actionButton;
-    constructor(chatEntitlementService: IChatEntitlementService, commandService: ICommandService, configurationService: IConfigurationService);
+    constructor(chatEntitlementService: IChatEntitlementService, commandService: ICommandService, configurationService: IConfigurationService, telemetryService: ITelemetryService);
     private initializeIfEnabled;
     get height(): number;
     private createWidgetContent;

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

@@ -10,22 +10,24 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 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 { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { ChatEntitlement, ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
-import { ChatInputPartWidgetsRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatInputPartWidgets';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatInputPartWidgetsRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 registerCss(chatStatusWidget);
 const $ = $$1;
 let ChatStatusWidget = class ChatStatusWidget extends Disposable {
     static { this.ID = 'chatStatusWidget'; }
-    constructor(chatEntitlementService, commandService, configurationService) {
+    constructor(chatEntitlementService, commandService, configurationService, telemetryService) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.commandService = commandService;
         this.configurationService = configurationService;
+        this.telemetryService = telemetryService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this.domNode = $('.chat-status-widget');
@@ -66,25 +68,29 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
         this.actionButton.element.classList.add('chat-status-button');
         if (enabledSku === 'anonymous') {
             const message = ( localize(
-                5640,
+                5831,
                 "You've reached the limit for chat messages. Try Copilot Pro for free."
             ));
-            const buttonLabel = ( localize(5641, "Sign In"));
+            const buttonLabel = ( localize(5832, "Sign In"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(5642, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(5833, "{0} {1}", message, buttonLabel));
         }
         else {
-            const message = ( localize(5643, "You've reached the limit for chat messages."));
-            const buttonLabel = ( localize(5644, "Upgrade"));
+            const message = ( localize(5834, "You've reached the limit for chat messages."));
+            const buttonLabel = ( localize(5835, "Upgrade"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(5645, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(5836, "{0} {1}", message, buttonLabel));
         }
         this._register(this.actionButton.onDidClick(async () => {
             const commandId = this.chatEntitlementService.anonymous
                 ? CHAT_SETUP_ACTION_ID
                 : 'workbench.action.chat.upgradePlan';
+            this.telemetryService.publicLog2('workbenchActionExecuted', {
+                id: commandId,
+                from: 'chatStatusWidget'
+            });
             await this.commandService.executeCommand(commandId);
         }));
         this.domNode.appendChild(contentContainer);
@@ -94,7 +100,8 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
 ChatStatusWidget = ( __decorate([
     ( __param(0, IChatEntitlementService)),
     ( __param(1, ICommandService)),
-    ( __param(2, IConfigurationService))
+    ( __param(2, IConfigurationService)),
+    ( __param(3, ITelemetryService))
 ], ChatStatusWidget));
 ChatInputPartWidgetsRegistry.register(ChatStatusWidget.ID, ChatStatusWidget, ( ContextKeyExpr.and(
     ChatContextKeys.chatQuotaExceeded,

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

@@ -22,13 +22,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } 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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
+import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } 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 { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { NativeEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry';
 import { TextAreaEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -359,6 +359,12 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
                 deletableTokens.forEach(token => {
                     const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);
                     if (deletedRangeOfToken && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {
+                        if (previousInputValue && Range.isEmpty(deletedRangeOfToken)) {
+                            const deletedText = previousInputValue.substring(change.rangeOffset, change.rangeOffset + change.rangeLength);
+                            if (deletedText !== ' ') {
+                                return;
+                            }
+                        }
                         const length = deletedRangeOfToken.endColumn - deletedRangeOfToken.startColumn;
                         const rangeToDelete = ( new Range(
                             token.editorRange.startLineNumber,

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

@@ -5,7 +5,7 @@ import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHover
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
 export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
     private readonly editor;
     private readonly instantiationService;

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

@@ -6,9 +6,9 @@ import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from '@
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(5694, 'There is a chat agent hover part here.');
+        return localize(5844, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

package/vscode/src/vs/workbench/contrib/chat/browser/{chatQuick.d.ts → widgetHosts/chatQuick.d.ts}

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IQuickChatOpenOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IQuickChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class QuickChatService extends Disposable implements IQuickChatService {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatQuick.js → widgetHosts/chatQuick.js}

@@ -29,12 +29,12 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var QuickChat_1;
@@ -236,7 +236,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle('hidden', !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    5464,
+                    5863,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? '',
                     product.defaultChatAgent?.provider?.default?.name ?? '',