@codingame/monaco-vscode-chat-service-override 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/chat.js

@@ -14,8 +14,11 @@ import { ChatVariablesService } from './vscode/src/vs/workbench/contrib/chat/bro
 import { QuickChatService } from './vscode/src/vs/workbench/contrib/chat/browser/chatQuick.js';
 import { IChatAgentService, ChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { InlineChatServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl.js';
-import { IInlineChatSessionService, InlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
+import { InlineChatSessionServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js';
+import { IInlineChatSavingService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService';
+import { InlineChatSavingServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.js';
 import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
 import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
 
@@ -32,7 +35,8 @@ function getServiceOverride() {
         [( IChatAgentService.toString())]: new SyncDescriptor(ChatAgentService, [], true),
         [( IChatVariablesService.toString())]: new SyncDescriptor(ChatVariablesService, [], true),
         [( IInlineChatService.toString())]: new SyncDescriptor(InlineChatServiceImpl, [], true),
-        [( IInlineChatSessionService.toString())]: new SyncDescriptor(InlineChatSessionService, [], true)
+        [( IInlineChatSessionService.toString())]: new SyncDescriptor(InlineChatSessionServiceImpl, [], true),
+        [( IInlineChatSavingService.toString())]: new SyncDescriptor(InlineChatSavingServiceImpl, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "2.0.3-improve-modularity.1",
+  "version": "2.1.0-update-vscode-1.86.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3-improve-modularity.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0-update-vscode-1.86.1",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -1,7 +1,7 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { IAccessibleNotificationService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IAudioCueService, AudioCue } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
@@ -11,16 +11,16 @@ import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/brow
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 
-const ACTION_ID_CLEAR_CHAT = `workbench.action.chat.clear`;
-function registerClearActions() {
-    registerAction2(class ClearEditorAction extends Action2 {
+const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
+function registerNewChatActions() {
+    registerAction2(class NewChatEditorAction extends Action2 {
         constructor() {
             super({
-                id: 'workbench.action.chatEditor.clear',
+                id: 'workbench.action.chatEditor.newChat',
                 title: ( localize2WithPath(
                     'vs/workbench/contrib/chat/browser/actions/chatClearActions',
-                    'chat.newSession.label',
-                    "New Session"
+                    'chat.newChat.label',
+                    "New Chat"
                 )),
                 icon: Codicon.plus,
                 f1: false,
@@ -41,14 +41,14 @@ function registerClearActions() {
     registerAction2(class GlobalClearChatAction extends Action2 {
         constructor() {
             super({
-                id: ACTION_ID_CLEAR_CHAT,
+                id: ACTION_ID_NEW_CHAT,
                 title: ( localize2WithPath(
                     'vs/workbench/contrib/chat/browser/actions/chatClearActions',
-                    'chat.newSession.label',
-                    "New Session"
+                    'chat.newChat.label',
+                    "New Chat"
                 )),
                 category: CHAT_CATEGORY,
-                icon: Codicon.clearAll,
+                icon: Codicon.plus,
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true,
                 keybinding: {
@@ -77,13 +77,13 @@ function registerClearActions() {
         }
     });
 }
-const getClearChatActionDescriptorForViewTitle = (viewId, providerId) => ({
+const getNewChatActionDescriptorForViewTitle = (viewId, providerId) => ({
     viewId,
-    id: `workbench.action.chat.${providerId}.clear`,
+    id: `workbench.action.chat.${providerId}.newChat`,
     title: ( localize2WithPath(
         'vs/workbench/contrib/chat/browser/actions/chatClearActions',
-        'chat.newSession.label',
-        "New Session"
+        'chat.newChat.label',
+        "New Chat"
     )),
     menu: {
         id: MenuId.ViewTitle,
@@ -96,10 +96,10 @@ const getClearChatActionDescriptorForViewTitle = (viewId, providerId) => ({
     icon: Codicon.plus,
     f1: false
 });
-function getClearAction(viewId, providerId) {
-    return class ClearAction extends ViewAction {
+function getNewChatAction(viewId, providerId) {
+    return class NewChatAction extends ViewAction {
         constructor() {
-            super(getClearChatActionDescriptorForViewTitle(viewId, providerId));
+            super(getNewChatActionDescriptorForViewTitle(viewId, providerId));
         }
         async runInView(accessor, view) {
             announceChatCleared(accessor);
@@ -109,7 +109,7 @@ function getClearAction(viewId, providerId) {
     };
 }
 function announceChatCleared(accessor) {
-    accessor.get(IAccessibleNotificationService).notify("clear" );
+    accessor.get(IAudioCueService).playAudioCue(AudioCue.clear);
 }
 
-export { ACTION_ID_CLEAR_CHAT, getClearAction, registerClearActions };
+export { ACTION_ID_NEW_CHAT, getNewChatAction, registerNewChatActions };

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

@@ -16,7 +16,7 @@ import { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/term
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService, InteractiveSessionCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { IChatService, ChatAgentCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { CTX_INLINE_CHAT_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
@@ -90,7 +90,7 @@ function registerChatCodeBlockActions() {
                     action: {
                         kind: 'copy',
                         codeBlockIndex: context.codeBlockIndex,
-                        copyType: InteractiveSessionCopyKind.Toolbar,
+                        copyKind: ChatAgentCopyKind.Toolbar,
                         copiedCharacters: context.code.length,
                         totalCharacters: context.code.length,
                         copiedText: context.code,
@@ -126,7 +126,7 @@ function registerChatCodeBlockActions() {
             action: {
                 kind: 'copy',
                 codeBlockIndex: context.codeBlockIndex,
-                copyType: InteractiveSessionCopyKind.Action,
+                copyKind: ChatAgentCopyKind.Action,
                 copiedText,
                 copiedCharacters: copiedText.length,
                 totalCharacters,
@@ -388,7 +388,7 @@ function registerChatCodeBlockActions() {
             else {
                 terminalGroupService.showPanel(true);
             }
-            terminal.sendText(context.code, false, true);
+            terminal.runCommand(context.code, false);
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
                     providerId: context.element.providerId,

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

@@ -1,10 +1,9 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
@@ -12,7 +11,7 @@ import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat
 import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService, AUX_WINDOW_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 
 var MoveToNewLocation;
 ( (function(MoveToNewLocation) {
@@ -25,13 +24,13 @@ const getMoveToChatActionDescriptorForViewTitle = (viewId, providerId, moveTo) =
         value: moveTo === MoveToNewLocation.Editor ? ( localizeWithPath(
             'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
             'chat.openInEditor.label',
-            "Open Session in Editor"
+            "Open Chat in Editor"
         )) : ( localizeWithPath(
             'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
             'chat.openInNewWindow.label',
-            "Open Session in New Window"
+            "Open Chat in New Window"
         )),
-        original: moveTo === MoveToNewLocation.Editor ? 'Open Session in Editor' : 'Open Session in New Window',
+        original: moveTo === MoveToNewLocation.Editor ? 'Open Chat in Editor' : 'Open Chat in New Window',
     },
     category: CHAT_CATEGORY,
     precondition: CONTEXT_PROVIDER_EXISTS,
@@ -59,24 +58,10 @@ function getMoveToAction(viewId, providerId, moveTo) {
             if (!viewModel) {
                 return;
             }
-            const editorGroupService = accessor.get(IEditorGroupsService);
-            const instantiationService = accessor.get(IInstantiationService);
             const editorService = accessor.get(IEditorService);
             const sessionId = viewModel.sessionId;
             view.clear();
-            switch (moveTo) {
-                case (MoveToNewLocation.Editor): {
-                    await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId: viewModel.sessionId }, pinned: true } });
-                    break;
-                }
-                case (MoveToNewLocation.Window): {
-                    await openInNewWindow(instantiationService, editorGroupService, { target: { sessionId } });
-                    break;
-                }
-                default: {
-                    throw new Error(`Unexpected move to location : ${moveTo}`);
-                }
-            }
+            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         }
     };
 }
@@ -89,9 +74,9 @@ function registerMoveActions() {
                     value: ( localizeWithPath(
                         'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
                         'interactiveSession.openInEditor.label',
-                        "Open Session in Editor"
+                        "Open Chat in Editor"
                     )),
-                    original: 'Open Session in Editor'
+                    original: 'Open Chat in Editor'
                 },
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_PROVIDER_EXISTS,
@@ -110,9 +95,9 @@ function registerMoveActions() {
                     value: ( localizeWithPath(
                         'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
                         'interactiveSession.openInNewWindow.label',
-                        "Open Session in New Window"
+                        "Open Chat in New Window"
                     )),
-                    original: 'Open Session In New Window'
+                    original: 'Open Chat In New Window'
                 },
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_PROVIDER_EXISTS,
@@ -131,9 +116,9 @@ function registerMoveActions() {
                     value: ( localizeWithPath(
                         'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
                         'interactiveSession.openInSidebar.label',
-                        "Open Session in Side Bar"
+                        "Open Chat in Side Bar"
                     )),
-                    original: 'Open Session in Side Bar'
+                    original: 'Open Chat in Side Bar'
                 },
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_PROVIDER_EXISTS,
@@ -155,24 +140,10 @@ async function executeMoveToAction(accessor, moveTo) {
     const viewService = accessor.get(IViewsService);
     const chatService = accessor.get(IChatService);
     const editorService = accessor.get(IEditorService);
-    const instantiationService = accessor.get(IInstantiationService);
-    const editorGroupService = accessor.get(IEditorGroupsService);
     const widget = widgetService.lastFocusedWidget;
     if (!widget || !('viewId' in widget.viewContext)) {
         const providerId = chatService.getProviderInfos()[0].id;
-        switch (moveTo) {
-            case (MoveToNewLocation.Editor): {
-                await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId }, pinned: true } });
-                break;
-            }
-            case (MoveToNewLocation.Window): {
-                await openInNewWindow(instantiationService, editorGroupService, { target: { providerId } });
-                break;
-            }
-            default: {
-                throw new Error(`Unexpected move to location : ${moveTo}`);
-            }
-        }
+        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         return;
     }
     const viewModel = widget.viewModel;
@@ -182,23 +153,7 @@ async function executeMoveToAction(accessor, moveTo) {
     const sessionId = viewModel.sessionId;
     const view = await viewService.openView(widget.viewContext.viewId);
     view.clear();
-    switch (moveTo) {
-        case (MoveToNewLocation.Editor): {
-            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId: sessionId }, pinned: true } });
-            break;
-        }
-        case (MoveToNewLocation.Window): {
-            await openInNewWindow(instantiationService, editorGroupService, { target: { sessionId } });
-        }
-        default: {
-            throw new Error(`Unexpected move to location : ${moveTo}`);
-        }
-    }
-}
-async function openInNewWindow(intstantiationService, editorGroupService, options) {
-    const auxiliaryEditorPart = await editorGroupService.createAuxiliaryEditorPart();
-    const chatEditorInput = intstantiationService.createInstance(ChatEditorInput, ChatEditorInput.getNewEditorUri(), options);
-    await auxiliaryEditorPart.activeGroup.openEditor(chatEditorInput, { pinned: true });
+    await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
 async function moveToSidebar(accessor) {
     const viewsService = accessor.get(IViewsService);

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

@@ -24,7 +24,7 @@ import './contrib/chatInputEditorContrib.js';
 import './contrib/chatHistoryVariables.js';
 import { RegisteredEditorPriority, IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { registerMoveActions } from './actions/chatMoveActions.js';
-import { registerClearActions, ACTION_ID_CLEAR_CHAT } from './actions/chatClearActions.js';
+import { registerNewChatActions, ACTION_ID_NEW_CHAT } from './actions/chatClearActions.js';
 import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
@@ -205,16 +205,16 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
     constructor(slashCommandService, commandService, chatAgentService) {
         super();
         this._store.add(slashCommandService.registerSlashCommand({
-            command: 'clear',
+            command: 'newChat',
             detail: ( localizeWithPath(
                 'vs/workbench/contrib/chat/browser/chat.contribution',
-                'clear',
-                "Clear the session"
+                'newChat',
+                "Start a new chat"
             )),
-            sortText: 'z2_clear',
+            sortText: 'z2_newChat',
             executeImmediately: true
         }, async () => {
-            commandService.executeCommand(ACTION_ID_CLEAR_CHAT);
+            commandService.executeCommand(ACTION_ID_NEW_CHAT);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'help',
@@ -246,7 +246,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
                     return `\t* [\`${chatSubcommandLeader}${c.name}\`](command:${SubmitAction.ID}?${urlSafeArg}) - ${c.description}`;
                 })).join('\n');
-                return agentLine + '\n' + commandText;
+                return (agentLine + '\n' + commandText).trim();
             })))).join('\n');
             progress.report({ content: ( new MarkdownString(agentText, { isTrusted: { enabledCommands: [SubmitAction.ID] } })), kind: 'markdownContent' });
             if (defaultAgent?.metadata.helpTextPostfix) {
@@ -280,4 +280,4 @@ registerChatExecuteActions();
 registerQuickChatActions();
 registerChatExportActions();
 registerMoveActions();
-registerClearActions();
+registerNewChatActions();

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { AudioCue, IAudioCueService } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
@@ -10,18 +10,17 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         super();
         this._audioCueService = _audioCueService;
         this._instantiationService = _instantiationService;
-        this._pendingCueMap = ( new Map());
+        this._pendingCueMap = this._register(( new DisposableMap()));
         this._requestId = 0;
     }
     acceptRequest() {
         this._requestId++;
         this._audioCueService.playAudioCue(AudioCue.chatRequestSent, { allowManyInParallel: true });
-        this._pendingCueMap.set(this._requestId, this._register(this._instantiationService.createInstance(AudioCueScheduler)));
+        this._pendingCueMap.set(this._requestId, this._instantiationService.createInstance(AudioCueScheduler));
         return this._requestId;
     }
     acceptResponse(response, requestId) {
-        this._pendingCueMap.get(requestId)?.dispose();
-        this._pendingCueMap.delete(requestId);
+        this._pendingCueMap.deleteAndDispose(requestId);
         const isPanelChat = typeof response !== 'string';
         const responseContent = typeof response === 'string' ? response : response?.response.asString();
         this._audioCueService.playAudioCue(AudioCue.chatResponseReceived, { allowManyInParallel: true });

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

@@ -10,7 +10,7 @@ import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/view
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
 import { getHistoryAction, getOpenChatEditorAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { getClearAction } from './actions/chatClearActions.js';
+import { getNewChatAction } from './actions/chatClearActions.js';
 import { getMoveToEditorAction, getMoveToNewWindowAction } from './actions/chatMoveActions.js';
 import { getQuickChatActionForProvider } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
 import { ChatViewPane, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
@@ -139,7 +139,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         ( Registry.as(Extensions$1.ViewsRegistry)).registerViews(viewDescriptor, this._viewContainer);
         const disposables = ( new DisposableStore());
         disposables.add(registerAction2(getHistoryAction(viewId, providerDescriptor.id)));
-        disposables.add(registerAction2(getClearAction(viewId, providerDescriptor.id)));
+        disposables.add(registerAction2(getNewChatAction(viewId, providerDescriptor.id)));
         disposables.add(registerAction2(getMoveToEditorAction(viewId, providerDescriptor.id)));
         disposables.add(registerAction2(getMoveToNewWindowAction(viewId, providerDescriptor.id)));
         disposables.add(registerAction2(getOpenChatEditorAction(providerDescriptor.id, providerDescriptor.label, providerDescriptor.when)));

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import './media/chatEditor.css.js';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';

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

@@ -232,7 +232,7 @@ let QuickChat = class QuickChat extends Disposable {
         }
         for (const request of this.model.getRequests()) {
             if (request.response?.response.value || request.response?.errorDetails) {
-                this.chatService.addCompleteRequest(widget.viewModel.sessionId, request.message, {
+                this.chatService.addCompleteRequest(widget.viewModel.sessionId, request.message, request.variableData, {
                     message: request.response.response.value,
                     errorDetails: request.response.errorDetails,
                     followups: request.response.followups

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

@@ -45,7 +45,7 @@ let ChatVariablesService = class ChatVariablesService {
         await Promise.allSettled(jobs);
         return {
             variables: resolvedVariables,
-            prompt: parsedPrompt.join('').trim()
+            message: parsedPrompt.join('').trim()
         };
     }
     getUniqueReferenceName(name, vars) {

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

@@ -8,7 +8,6 @@ import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/service
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { inputPlaceholderForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
@@ -36,13 +35,14 @@ function agentAndCommandToKey(agent, subcommand) {
     return `${agent}__${subcommand}`;
 }
 let InputEditorDecorations = class InputEditorDecorations extends Disposable {
-    constructor(widget, instantiationService, codeEditorService, themeService, chatService) {
+    constructor(widget, instantiationService, codeEditorService, themeService, chatService, chatAgentService) {
         super();
         this.widget = widget;
         this.instantiationService = instantiationService;
         this.codeEditorService = codeEditorService;
         this.themeService = themeService;
         this.chatService = chatService;
+        this.chatAgentService = chatAgentService;
         this.id = 'inputEditorDecorations';
         this.previouslyUsedAgents = ( new Set());
         this.viewModelDisposables = this._register(( new MutableDisposable()));
@@ -61,6 +61,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent.id, e.slashCommand.name));
             }
         }));
+        this._register(this.chatAgentService.onDidChangeAgents(() => this.updateInputEditorDecorations()));
         this.registerViewModelListeners();
     }
     registerViewModelListeners() {
@@ -221,7 +222,8 @@ InputEditorDecorations = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, ICodeEditorService)),
     ( __param(3, IThemeService)),
-    ( __param(4, IChatService))
+    ( __param(4, IChatService)),
+    ( __param(5, IChatAgentService))
 ], InputEditorDecorations));
 let InputEditorSlashCommandMode = class InputEditorSlashCommandMode extends Disposable {
     constructor(widget, chatService) {
@@ -421,6 +423,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                         return {
                             label: { label: withSlash, description: agentLabel },
                             filterText: `${chatSubcommandLeader}${agent.id}${c.name}`,
+                            commitCharacters: [' '],
                             insertText: `${agentLabel} ${withSlash} `,
                             detail: `(${agentLabel}) ${c.description}`,
                             range: ( new Range(1, 1, 1, 1)),
@@ -443,20 +446,14 @@ AgentCompletions = ( __decorate([
 let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposable {
     static { BuiltinDynamicCompletions_1 = this; }
     static { this.VariableNameDef = ( new RegExp(`${chatVariableLeader}\\w*`, 'g')); }
-    constructor(languageFeaturesService, chatWidgetService, configurationService, productService) {
+    constructor(languageFeaturesService, chatWidgetService) {
         super();
         this.languageFeaturesService = languageFeaturesService;
         this.chatWidgetService = chatWidgetService;
-        this.configurationService = configurationService;
-        this.productService = productService;
         this._register(this.languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
             _debugDisplayName: 'chatDynamicCompletions',
             triggerCharacters: [chatVariableLeader],
             provideCompletionItems: async (model, position, _context, _token) => {
-                const fileVariablesEnabled = this.configurationService.getValue('chat.experimental.fileVariables') ?? this.productService.quality !== 'stable';
-                if (!fileVariablesEnabled) {
-                    return;
-                }
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
                 if (!widget || !widget.supportsFileReferences) {
                     return null;
@@ -469,7 +466,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                     position.lineNumber,
                     range.replace.startColumn,
                     position.lineNumber,
-                    range.replace.endColumn + 'file:'.length
+                    range.replace.startColumn + '#file:'.length
                 ));
                 return {
                     suggestions: [
@@ -494,9 +491,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
 };
 BuiltinDynamicCompletions = BuiltinDynamicCompletions_1 = ( __decorate([
     ( __param(0, ILanguageFeaturesService)),
-    ( __param(1, IChatWidgetService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IProductService))
+    ( __param(1, IChatWidgetService))
 ], BuiltinDynamicCompletions));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BuiltinDynamicCompletions, 4 );
 function computeCompletionRanges(model, position, reg) {
@@ -595,9 +590,9 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
                 previousInputValue = inputValue;
             }
             const change = e.changes[0];
-            if (!change.text) {
+            if (!change.text && this.widget.viewModel) {
                 parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue).then(previousParsedValue => {
-                    const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart);
+                    const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart);
                     deletableTokens.forEach(token => {
                         const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);
                         if ((deletedRangeOfToken && !deletedRangeOfToken.isEmpty()) && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {