@codingame/monaco-vscode-chat-service-override 11.1.0 → 11.1.2

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

@@ -4,23 +4,24 @@ 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';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isExportableSessionData } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isExportableSessionData } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(7602, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(7591, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(7603, "Export Chat...")),
+                title: ( localize2(7592, "Export Chat...")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
@@ -54,7 +55,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(7604, "Import Chat...")),
+                title: ( localize2(7593, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,

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

@@ -2,17 +2,18 @@ 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';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { CHAT_VIEW_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_VIEW_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditor } from '../chatEditor.js';
-import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { AUX_WINDOW_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatActions';
+import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 var MoveToNewLocation;
 ( ((function(MoveToNewLocation) {
@@ -24,7 +25,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2(7599, "Open Chat in Editor")),
+                title: ( localize2(7594, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -44,7 +45,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2(7600, "Open Chat in New Window")),
+                title: ( localize2(7595, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -64,7 +65,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2(7601, "Open Chat in Side Bar")),
+                title: ( localize2(7596, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,

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

@@ -0,0 +1,167 @@
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { InlineChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CHAT_CATEGORY, ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+export { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+
+function registerQuickChatActions() {
+    registerAction2(QuickChatGlobalAction);
+    registerAction2(AskQuickChatAction);
+    registerAction2(class OpenInChatViewAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.quickchat.openInChatView',
+                title: ( localize2(7597, "Open in Chat View")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.commentDiscussion,
+                menu: {
+                    id: MenuId.ChatInputSide,
+                    group: 'navigation',
+                    order: 10
+                }
+            });
+        }
+        run(accessor) {
+            const quickChatService = accessor.get(IQuickChatService);
+            quickChatService.openInChatView();
+        }
+    });
+    registerAction2(class CloseQuickChatAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.quickchat.close',
+                title: ( localize2(7598, "Close Quick Chat")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.close,
+                menu: {
+                    id: MenuId.ChatInputSide,
+                    group: 'navigation',
+                    order: 20
+                }
+            });
+        }
+        run(accessor) {
+            const quickChatService = accessor.get(IQuickChatService);
+            quickChatService.close();
+        }
+    });
+    registerAction2(class LaunchInlineChatFromQuickChatAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.quickchat.launchInlineChat',
+                title: ( localize2(7599, "Launch Inline Chat")),
+                f1: false,
+                category: CHAT_CATEGORY
+            });
+        }
+        async run(accessor) {
+            const quickChatService = accessor.get(IQuickChatService);
+            const codeEditorService = accessor.get(ICodeEditorService);
+            if (quickChatService.focused) {
+                quickChatService.close();
+            }
+            const codeEditor = codeEditorService.getActiveCodeEditor();
+            if (!codeEditor) {
+                return;
+            }
+            const controller = InlineChatController.get(codeEditor);
+            if (!controller) {
+                return;
+            }
+            await controller.run();
+            controller.focus();
+        }
+    });
+}
+class QuickChatGlobalAction extends Action2 {
+    constructor() {
+        super({
+            id: ASK_QUICK_QUESTION_ACTION_ID,
+            title: ( localize2(7600, 'Quick Chat')),
+            precondition: CONTEXT_CHAT_ENABLED,
+            icon: Codicon.commentDiscussion,
+            f1: false,
+            category: CHAT_CATEGORY,
+            keybinding: {
+                weight: 200 ,
+                primary: 2048  | 1024  | 512  | 42 ,
+            },
+            menu: {
+                id: MenuId.ChatCommandCenter,
+                group: 'c_quickChat',
+                order: 5
+            },
+            metadata: {
+                description: ( localize(7601, 'Toggle the quick chat')),
+                args: [{
+                        name: 'args',
+                        schema: {
+                            anyOf: [
+                                {
+                                    type: 'object',
+                                    required: ['query'],
+                                    properties: {
+                                        query: {
+                                            description: ( localize(7602, "The query to open the quick chat with")),
+                                            type: 'string'
+                                        },
+                                        isPartialQuery: {
+                                            description: ( localize(7603, "Whether the query is partial; it will wait for more user input")),
+                                            type: 'boolean'
+                                        }
+                                    },
+                                },
+                                {
+                                    type: 'string',
+                                    description: ( localize(7602, "The query to open the quick chat with"))
+                                }
+                            ]
+                        }
+                    }]
+            },
+        });
+    }
+    run(accessor, query) {
+        const quickChatService = accessor.get(IQuickChatService);
+        let options;
+        switch (typeof query) {
+            case 'string':
+                options = { query };
+                break;
+            case 'object':
+                options = query;
+                break;
+        }
+        if (options?.query) {
+            options.selection = ( (new Selection(1, options.query.length + 1, 1, options.query.length + 1)));
+        }
+        quickChatService.toggle(options);
+    }
+}
+class AskQuickChatAction extends Action2 {
+    constructor() {
+        super({
+            id: `workbench.action.openQuickChat`,
+            category: CHAT_CATEGORY,
+            title: ( localize2(7604, "Open Quick Chat")),
+            f1: true
+        });
+    }
+    run(accessor, query) {
+        const quickChatService = accessor.get(IQuickChatService);
+        quickChatService.toggle(query ? {
+            query,
+            selection: ( (new Selection(1, query.length + 1, 1, query.length + 1)))
+        } : undefined);
+    }
+}
+
+export { registerQuickChatActions };

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

@@ -19,12 +19,12 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { insertCell } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CellKind, NOTEBOOK_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { getReferencesAsDocumentContext } from '../../common/chatCodeMapperService.js';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageService, dialogService) {

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

@@ -24,8 +24,8 @@ import 'vscode/vscode/vs/base/common/map';
 import 'vscode/vscode/vs/base/common/strings';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/editor/common/languages';
-import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { chatVariableLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { chatVariableLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import '../common/chatServiceImpl.js';
 import '../common/chatSlashCommands.js';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
@@ -36,7 +36,7 @@ import '../common/languageModelStats.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 import '../common/voiceChatService.js';
 import { PanelChatAccessibilityHelp, QuickChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
-import { ChatCommandCenterRendering, registerChatActions } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatCommandCenterRendering, registerChatActions } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ACTION_ID_NEW_CHAT, registerNewChatActions } from './actions/chatClearActions.js';
 import { registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
 import { registerChatContextActions } from './actions/chatContextActions.js';
@@ -46,8 +46,8 @@ import { SubmitAction, registerChatExecuteActions } from '@codingame/monaco-vsco
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
 import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
-import { registerQuickChatActions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
-import { registerChatTitleActions } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
+import { registerChatTitleActions } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatTitleActions';
 import './chatAccessibilityService.js';
 import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/base/common/resources';
@@ -56,15 +56,15 @@ import './chatEditing/chatEditingService.js';
 import { ChatEditor } from './chatEditor.js';
 import { registerChatEditorActions } from './chatEditorActions.js';
 import { ChatEditorController } from './chatEditorController.js';
-import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput, ChatEditorInputSerializer } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatEditorSaving } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatEditorSaving';
-import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
+import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
 import { ChatExtensionPointHandler, ChatCompatibilityNotifier } from './chatParticipantContributions.js';
 import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import './chatQuick.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import './chatVariables.js';
-import '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
 import './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.js

@@ -31,7 +31,7 @@ import { MultiDiffEditorItem } from 'vscode/vscode/vs/workbench/contrib/multiDif
 import { IMultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import { ICodeMapperService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
 import { CONTEXT_CHAT_EDITING_CAN_UNDO, CONTEXT_CHAT_EDITING_CAN_REDO } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { defaultChatEditingMaxFileLimit, applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, inChatEditingSessionContextKey, applyingChatEditsContextKey, chatEditingMaxFileAssignmentName, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { defaultChatEditingMaxFileLimit, applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, inChatEditingSessionContextKey, applyingChatEditsContextKey, chatEditingMaxFileAssignmentName, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';

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

@@ -18,11 +18,11 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { clearChatEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { clearChatEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 
 let ChatEditor = class ChatEditor extends EditorPane {

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

@@ -2,12 +2,13 @@ import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ctxHasEditorModification, ChatEditorController } from './chatEditorController.js';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 class NavigateAction extends Action2 {
     constructor(next) {

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

@@ -21,7 +21,7 @@ import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/
 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_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CHAT_VIEW_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { CHAT_VIEW_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane, CHAT_EDITING_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 
 const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint({

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

@@ -22,8 +22,8 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import { quickInputForeground, quickInputBackground } from 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';

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

@@ -2,7 +2,7 @@ import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdow
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 class ChatResponseAccessibleView {

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

@@ -7,10 +7,10 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 let ChatVariablesService = class ChatVariablesService {
     constructor(chatWidgetService, viewsService) {

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

@@ -30,11 +30,11 @@ import { SIDE_BAR_FOREGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatModelInitState } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { ChatModelInitState } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatViewWelcomeController } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatViewWelcomeController } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
 
 const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
 const CHAT_EDITING_SIDEBAR_PANEL_ID = 'workbench.panel.chatEditing';

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

@@ -16,11 +16,11 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatSlashCommandForeground, chatSlashCommandBackground } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatSlashCommandForeground, chatSlashCommandBackground } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 
 const decorationDescription = 'chat';

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

@@ -5,9 +5,9 @@ import { RenderedHoverParts, HoverParticipantRegistry } from 'vscode/vscode/vs/e
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from 'vscode/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js

@@ -23,8 +23,8 @@ import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { normalizeSerializableChatData, ChatModel, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { normalizeSerializableChatData, ChatModel, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';

package/vscode/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.js

@@ -3,7 +3,7 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 
 let ChatWidgetHistoryService = class ChatWidgetHistoryService {
     constructor(storageService) {

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js

@@ -18,7 +18,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            7516,
+            7487,
             'Contributes a tool that can be invoked by a language model in a chat session, or from a standalone command. Registered tools can be used by all extensions.'
         )),
         type: 'array',
@@ -44,7 +44,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        7517,
+                        7488,
                         "A unique name for this tool. This name must be a globally unique identifier, and is also used as a name when presenting this tool to a language model."
                     )),
                     type: 'string',
@@ -52,7 +52,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        7518,
+                        7489,
                         "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.",
                         '`canBeReferencedInPrompt`'
                     )),
@@ -61,32 +61,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        7519,
+                        7490,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(7520, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(7491, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        7521,
+                        7492,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        7522,
+                        7493,
                         "A JSON schema for the input this tool accepts. The input must be an object at the top level. A particular language model may not support all JSON schema features. See the documentation for the language model family you are using for more information."
                     )),
                     $ref: toolsParametersSchemaSchemaId,
                 },
                 canBeReferencedInPrompt: {
                     markdownDescription: ( localize(
-                        7523,
+                        7494,
                         "If true, this tool shows up as an attachment that the user can add manually to their request. Chat participants will receive the tool in {0}.",
                         '`ChatRequest#toolReferences`'
                     )),
@@ -94,7 +94,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        7524,
+                        7495,
                         "An icon that represents this tool. Either a file path, an object with file paths for dark and light themes, or a theme icon reference, like `$(zap)`"
                     )),
                     anyOf: [{
@@ -104,11 +104,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(7525, 'Icon path when a light theme is used')),
+                                    description: ( localize(7496, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(7526, 'Icon path when a dark theme is used')),
+                                    description: ( localize(7497, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -116,14 +116,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        7527,
+                        7498,
                         "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."
                     )),
                     type: 'string'
                 },
                 tags: {
                     description: ( localize(
-                        7528,
+                        7499,
                         "A set of tags that roughly describe the tool's capabilities. A tool user may use these to filter the set of tools to just ones that are relevant for the task at hand, or they may want to pick a tag that can be used to identify just the tools contributed by this extension."
                     )),
                     type: 'array',