@codingame/monaco-vscode-chat-service-override 7.0.11 → 7.1.1

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

@@ -2,12 +2,15 @@ import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { EditorType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { AbstractGotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -15,17 +18,14 @@ import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/brow
 import { ChatContextAttachments } from '../contrib/chatContextAttachments.js';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_LOCATION, CONTEXT_IN_QUICK_CHAT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_QUICK_CHAT, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
+import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { AnythingQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { EditorType } from 'vscode/vscode/vs/editor/common/editorCommon';
-import { compare } from 'vscode/vscode/vs/base/common/strings';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatContextActions";
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
     registerAction2(AttachFileAction);
@@ -36,7 +36,7 @@ class AttachFileAction extends Action2 {
     constructor() {
         super({
             id: AttachFileAction.ID,
-            title: ( localize2WithPath(_moduleId, 0, "Attach File")),
+            title: ( localize2(7296, "Attach File")),
             category: CHAT_CATEGORY,
             f1: false
         });
@@ -45,7 +45,7 @@ class AttachFileAction extends Action2 {
         const variablesService = accessor.get(IChatVariablesService);
         const textEditorService = accessor.get(IEditorService);
         const activeUri = textEditorService.activeEditor?.resource;
-        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote].includes(activeUri.scheme)) {
+        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
             variablesService.attachContext('file', activeUri, ChatAgentLocation.Panel);
         }
     }
@@ -55,7 +55,7 @@ class AttachSelectionAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionAction.ID,
-            title: ( localize2WithPath(_moduleId, 1, "Add Selection to Chat")),
+            title: ( localize2(7297, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: false
         });
@@ -65,7 +65,7 @@ class AttachSelectionAction extends Action2 {
         const textEditorService = accessor.get(IEditorService);
         const activeEditor = textEditorService.activeTextEditorControl;
         const activeUri = textEditorService.activeEditor?.resource;
-        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote].includes(activeUri.scheme)) {
+        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
             const selection = activeEditor?.getSelection();
             if (selection) {
                 variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
@@ -75,12 +75,26 @@ class AttachSelectionAction extends Action2 {
 }
 class AttachContextAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachContext'; }
+    static { this._cdt = ( (ContextKeyExpr.or( (ContextKeyExpr.and(
+         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+         (CONTEXT_IN_QUICK_CHAT.isEqualTo(false))
+    )),  (ContextKeyExpr.and(
+         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor)),
+         (ContextKeyExpr.equals('config.chat.experimental.variables.editor', true))
+    )),  (ContextKeyExpr.and(
+         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Notebook)),
+         (ContextKeyExpr.equals('config.chat.experimental.variables.notebook', true))
+    )),  (ContextKeyExpr.and(
+         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal)),
+         (ContextKeyExpr.equals('config.chat.experimental.variables.terminal', true))
+    ))))); }
     constructor() {
         super({
             id: AttachContextAction.ID,
-            title: ( localize2WithPath(_moduleId, 2, "Attach Context")),
+            title: ( localize2(7298, "Attach Context")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
+            precondition: AttachContextAction._cdt,
             keybinding: {
                 when: CONTEXT_IN_CHAT_INPUT,
                 primary: KeyMod.CtrlCmd | KeyCode.Slash,
@@ -88,10 +102,7 @@ class AttachContextAction extends Action2 {
             },
             menu: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
-                         (CONTEXT_IN_QUICK_CHAT.isEqualTo(false))
-                    ))),
+                    when: AttachContextAction._cdt,
                     id: MenuId.ChatExecute,
                     group: 'navigation',
                 },
@@ -121,7 +132,7 @@ class AttachContextAction extends Action2 {
                     isDynamic: pick.isDynamic,
                     value: pick.value,
                     name: `${typeof pick.value === 'string' && pick.value.startsWith('#') ? pick.value.slice(1) : ''}${selection}`,
-                    fullName: `${pick.icon ? `$(${pick.icon.id}) ` : ''}${selection}`
+                    fullName: selection
                 });
             }
             else if ('symbol' in pick && pick.symbol) {
@@ -155,6 +166,15 @@ class AttachContextAction extends Action2 {
                     isDynamic: true
                 });
             }
+            else if ('kind' in pick && pick.kind === 'tool') {
+                toAttach.push({
+                    id: pick.id,
+                    name: pick.label,
+                    fullName: pick.label,
+                    value: undefined,
+                    isTool: true
+                });
+            }
             else {
                 toAttach.push({
                     ...pick,
@@ -175,6 +195,7 @@ class AttachContextAction extends Action2 {
         const chatVariablesService = accessor.get(IChatVariablesService);
         const commandService = accessor.get(ICommandService);
         const widgetService = accessor.get(IChatWidgetService);
+        const languageModelToolsService = accessor.get(ILanguageModelToolsService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
@@ -183,12 +204,13 @@ class AttachContextAction extends Action2 {
         const usedAgent = widget.parsedInput.parts.find(p => p instanceof ChatRequestAgentPart);
         const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
         const quickPickItems = [];
-        for (const variable of chatVariablesService.getVariables()) {
+        for (const variable of chatVariablesService.getVariables(widget.location)) {
             if (variable.fullName && (!variable.isSlow || slowSupported)) {
                 quickPickItems.push({
-                    label: `${variable.icon ? `$(${variable.icon.id}) ` : ''}${variable.fullName}`,
+                    label: variable.fullName,
                     name: variable.name,
                     id: variable.id,
+                    iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
                     icon: variable.icon
                 });
             }
@@ -200,10 +222,11 @@ class AttachContextAction extends Action2 {
                 for (const variable of completions) {
                     if (variable.fullName) {
                         quickPickItems.push({
-                            label: `${variable.icon ? `$(${variable.icon.id}) ` : ''}${variable.fullName}`,
+                            label: variable.fullName,
                             id: variable.id,
                             command: variable.command,
                             icon: variable.icon,
+                            iconClass: variable.icon ? ThemeIcon.asClassName(variable.icon) : undefined,
                             value: variable.value,
                             isDynamic: true,
                             name: variable.name
@@ -212,9 +235,26 @@ class AttachContextAction extends Action2 {
                 }
             }
         }
+        for (const tool of languageModelToolsService.getTools()) {
+            if (tool.canBeInvokedManually) {
+                const item = {
+                    kind: 'tool',
+                    label: tool.displayName ?? tool.name,
+                    id: tool.name,
+                };
+                if (ThemeIcon.isThemeIcon(tool.icon)) {
+                    item.iconClass = ThemeIcon.asClassName(tool.icon);
+                }
+                else if (tool.icon) {
+                    item.iconPath = tool.icon;
+                }
+                quickPickItems.push(item);
+            }
+        }
         quickPickItems.push({
-            label: ( localizeWithPath(_moduleId, 3, '{0} Symbol...', `$(${Codicon.symbolField.id})`)),
+            label: ( localize(7299, 'Symbol...')),
             icon: ThemeIcon.fromId(Codicon.symbolField.id),
+            iconClass: ThemeIcon.asClassName(Codicon.symbolField),
             prefix: SymbolsQuickAccessProvider.PREFIX
         });
         function extractTextFromIconLabel(label) {
@@ -237,7 +277,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: ( localizeWithPath(_moduleId, 4, 'Search attachments')),
+            placeholder: ( localize(7300, 'Search attachments')),
             providerOptions: {
                 handleAccept: (item) => {
                     if ('prefix' in item) {

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

@@ -1,4 +1,4 @@
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { CHAT_CATEGORY, stringifyItem } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -6,13 +6,12 @@ import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/brow
 import { CONTEXT_RESPONSE_FILTERED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isRequestVM, isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatCopyActions";
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2WithPath(_moduleId, 0, "Copy All")),
+                title: ( localize2(7252, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -42,7 +41,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2WithPath(_moduleId, 1, "Copy")),
+                title: ( localize2(7253, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -1,10 +1,9 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatDeveloperActions";
 function registerChatDeveloperActions() {
     registerAction2(LogChatInputHistoryAction);
 }
@@ -13,7 +12,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2WithPath(_moduleId, 0, "Log Chat Input History")),
+            title: ( localize2(7301, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true

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

@@ -1,5 +1,5 @@
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -7,13 +7,12 @@ import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/brow
 import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatFileTreeActions";
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2WithPath(_moduleId, 0, "Next File Tree")),
+                title: ( localize2(7258, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +31,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2WithPath(_moduleId, 1, "Previous File Tree")),
+                title: ( localize2(7259, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -1,6 +1,6 @@
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -12,16 +12,15 @@ import { isExportableSessionData } from 'vscode/vscode/vs/workbench/contrib/chat
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatImportExport";
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localizeWithPath(_moduleId, 0, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(7260, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2WithPath(_moduleId, 1, "Export Chat...")),
+                title: ( localize2(7261, "Export Chat...")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
@@ -55,7 +54,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2WithPath(_moduleId, 2, "Import Chat...")),
+                title: ( localize2(7262, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,

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

@@ -1,4 +1,4 @@
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } 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 { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
@@ -12,7 +12,6 @@ import { AUX_WINDOW_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/servi
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatMoveActions";
 var MoveToNewLocation;
 ( ((function(MoveToNewLocation) {
     MoveToNewLocation["Editor"] = "Editor";
@@ -23,7 +22,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2WithPath(_moduleId, 0, "Open Chat in Editor")),
+                title: ( localize2(7263, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -43,7 +42,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2WithPath(_moduleId, 1, "Open Chat in New Window")),
+                title: ( localize2(7264, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -63,7 +62,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2WithPath(_moduleId, 2, "Open Chat in Side Bar")),
+                title: ( localize2(7265, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -81,7 +80,6 @@ function registerMoveActions() {
 }
 async function executeMoveToAction(accessor, moveTo, chatView) {
     const widgetService = accessor.get(IChatWidgetService);
-    const viewService = accessor.get(IViewsService);
     const editorService = accessor.get(IEditorService);
     const widget = chatView?.widget ?? widgetService.lastFocusedWidget;
     if (!widget || !('viewId' in widget.viewContext)) {
@@ -93,9 +91,8 @@ async function executeMoveToAction(accessor, moveTo, chatView) {
         return;
     }
     const sessionId = viewModel.sessionId;
-    const view = await viewService.openView(widget.viewContext.viewId);
-    const viewState = view.widget.getViewState();
-    view.clear();
+    const viewState = widget.getViewState();
+    widget.clear();
     await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
 async function moveToSidebar(accessor) {
@@ -103,14 +100,16 @@ async function moveToSidebar(accessor) {
     const editorService = accessor.get(IEditorService);
     const editorGroupService = accessor.get(IEditorGroupsService);
     const chatEditorInput = editorService.activeEditor;
+    let view;
     if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
         await editorService.closeEditor({ editor: chatEditorInput, groupId: editorGroupService.activeGroup.id });
-        const view = await viewsService.openView(CHAT_VIEW_ID);
+        view = await viewsService.openView(CHAT_VIEW_ID);
         view.loadSession(chatEditorInput.sessionId);
     }
     else {
-        await viewsService.openView(CHAT_VIEW_ID);
+        view = await viewsService.openView(CHAT_VIEW_ID);
     }
+    view.focus();
 }
 
 export { registerMoveActions };

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

@@ -2,7 +2,7 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } 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 { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -17,13 +17,12 @@ import { NOTEBOOK_EDITOR_ID, CellEditType, CellKind } from 'vscode/vscode/vs/wor
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatTitleActions";
 function registerChatTitleActions() {
     registerAction2(class MarkHelpfulAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.markHelpful',
-                title: ( localize2WithPath(_moduleId, 0, "Helpful")),
+                title: ( localize2(7266, "Helpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
@@ -44,6 +43,7 @@ function registerChatTitleActions() {
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
                 agentId: item.agent?.id,
+                command: item.slashCommand?.name,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
                 result: item.result,
@@ -59,7 +59,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.markUnhelpful',
-                title: ( localize2WithPath(_moduleId, 1, "Unhelpful")),
+                title: ( localize2(7267, "Unhelpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
@@ -80,6 +80,7 @@ function registerChatTitleActions() {
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
                 agentId: item.agent?.id,
+                command: item.slashCommand?.name,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
                 result: item.result,
@@ -95,7 +96,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.reportIssueForBug',
-                title: ( localize2WithPath(_moduleId, 2, "Report Issue")),
+                title: ( localize2(7268, "Report Issue")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -115,6 +116,7 @@ function registerChatTitleActions() {
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
                 agentId: item.agent?.id,
+                command: item.slashCommand?.name,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
                 result: item.result,
@@ -128,7 +130,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNotebook',
-                title: ( localize2WithPath(_moduleId, 3, "Insert into Notebook")),
+                title: ( localize2(7269, "Insert into Notebook")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -158,7 +160,7 @@ function registerChatTitleActions() {
                 if (notebookEditor.isReadOnly) {
                     return;
                 }
-                const value = item.response.asString();
+                const value = ( (item.response.toString()));
                 const splitContents = splitMarkdownAndCodeBlocks(value);
                 const focusRange = notebookEditor.getFocus();
                 const index = Math.max(focusRange.end, 0);
@@ -190,7 +192,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.remove',
-                title: ( localize2WithPath(_moduleId, 4, "Remove Request and Response")),
+                title: ( localize2(7270, "Remove Request and Response")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.x,

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

@@ -3,7 +3,7 @@ import { isMarkdownString, MarkdownString } from 'vscode/vscode/vs/base/common/h
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -58,48 +58,45 @@ import { registerChatContextActions } from './actions/chatContextActions.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/chat.contribution";
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     id: 'chatSidebar',
-    title: ( localizeWithPath(_moduleId, 0, "Chat")),
+    title: ( localize(3108, "Chat")),
     type: 'object',
     properties: {
         'chat.editor.fontSize': {
             type: 'number',
-            description: ( localizeWithPath(_moduleId, 1, "Controls the font size in pixels in chat codeblocks.")),
+            description: ( localize(3109, "Controls the font size in pixels in chat codeblocks.")),
             default: isMacintosh ? 12 : 14,
         },
         'chat.editor.fontFamily': {
             type: 'string',
-            description: ( localizeWithPath(_moduleId, 2, "Controls the font family in chat codeblocks.")),
+            description: ( localize(3110, "Controls the font family in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.fontWeight': {
             type: 'string',
-            description: ( localizeWithPath(_moduleId, 3, "Controls the font weight in chat codeblocks.")),
+            description: ( localize(3111, "Controls the font weight in chat codeblocks.")),
             default: 'default'
         },
         'chat.editor.wordWrap': {
             type: 'string',
-            description: ( localizeWithPath(_moduleId, 4, "Controls whether lines should wrap in chat codeblocks.")),
+            description: ( localize(3112, "Controls whether lines should wrap in chat codeblocks.")),
             default: 'off',
             enum: ['on', 'off']
         },
         'chat.editor.lineHeight': {
             type: 'number',
-            description: ( localizeWithPath(
-                _moduleId,
-                5,
+            description: ( localize(
+                3113,
                 "Controls the line height in pixels in chat codeblocks. Use 0 to compute the line height from the font size."
             )),
             default: 0
         },
         'chat.experimental.implicitContext': {
             type: 'boolean',
-            description: ( localizeWithPath(
-                _moduleId,
-                6,
+            description: ( localize(
+                3114,
                 "Controls whether a checkbox is shown to allow the user to determine which implicit context is included with a chat participant's prompt."
             )),
             deprecated: true,
@@ -107,22 +104,22 @@ configurationRegistry.registerConfiguration({
         },
         'chat.experimental.variables.editor': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 7, "Enables variables for editor chat.")),
-            default: false
+            description: ( localize(3115, "Enables variables for editor chat.")),
+            default: true
         },
         'chat.experimental.variables.notebook': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 8, "Enables variables for notebook chat.")),
+            description: ( localize(3116, "Enables variables for notebook chat.")),
             default: false
         },
         'chat.experimental.variables.terminal': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 9, "Enables variables for terminal chat.")),
+            description: ( localize(3117, "Enables variables for terminal chat.")),
             default: false
         },
     }
 });
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localizeWithPath(_moduleId, 10, "Chat"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localize(3118, "Chat"))), [
     ( (new SyncDescriptor(ChatEditorInput)))
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
@@ -131,7 +128,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localizeWithPath(_moduleId, 10, "Chat")),
+            label: ( localize(3118, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -154,9 +151,10 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localizeWithPath(_moduleId, 11, "Start a new chat")),
+            detail: ( localize(3119, "Start a new chat")),
             sortText: 'z2_clear',
-            executeImmediately: true
+            executeImmediately: true,
+            locations: [ChatAgentLocation.Panel]
         }, async () => {
             commandService.executeCommand(ACTION_ID_NEW_CHAT);
         }));
@@ -164,7 +162,8 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
             command: 'help',
             detail: '',
             sortText: 'z1_help',
-            executeImmediately: true
+            executeImmediately: true,
+            locations: [ChatAgentLocation.Panel]
         }, async (prompt, progress) => {
             const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
             const agents = chatAgentService.getAgents();
@@ -200,8 +199,8 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                     progress.report({ content: ( (new MarkdownString(defaultAgent.metadata.helpTextVariablesPrefix))), kind: 'markdownContent' });
                 }
                 const variables = [
-                    ...chatVariablesService.getVariables(),
-                    { name: 'file', description: ( localizeWithPath(_moduleId, 12, "Choose a file in the workspace")) }
+                    ...chatVariablesService.getVariables(ChatAgentLocation.Panel),
+                    { name: 'file', description: ( localize(3120, "Choose a file in the workspace")) }
                 ];
                 const variableText = ( (variables
                     .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`)))
@@ -232,7 +231,7 @@ registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribu
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, LifecyclePhase.Eventually);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
 registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
-registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.BlockRestore);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();