@codingame/monaco-vscode-chat-service-override 8.0.3 → 9.0.0

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

@@ -178,7 +178,7 @@ let QuickChat = class QuickChat extends Disposable {
             IContextKeyService,
             this._register(this.contextKeyService.createScoped(parent))
         ]))));
-        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { resource: true }, { renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } }, {
+        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { isQuickChat: true }, { renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } }, {
             listForeground: quickInputForeground,
             listBackground: quickInputBackground,
             inputEditorBackground: inputBackground,

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

@@ -1,6 +1,5 @@
 import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -15,22 +14,16 @@ class ChatResponseAccessibleView {
         this.name = 'panelChat';
         this.type = AccessibleViewType.View;
         this.when = CONTEXT_IN_CHAT_SESSION;
-        this._initialRender = true;
     }
     getProvider(accessor) {
         const widgetService = accessor.get(IChatWidgetService);
-        const codeEditorService = accessor.get(ICodeEditorService);
         const widget = widgetService.lastFocusedWidget;
         if (!widget) {
             return;
         }
-        const chatInputFocused = this._initialRender && !!codeEditorService.getFocusedCodeEditor() || false;
-        if (this._initialRender && chatInputFocused) {
+        const chatInputFocused = widget.hasInputFocus();
+        if (chatInputFocused) {
             widget.focusLastMessage();
-            this._initialRender = false;
-        }
-        if (!widget) {
-            return;
         }
         const verifiedWidget = widget;
         const focusedItem = verifiedWidget.getFocus();

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

@@ -9,14 +9,17 @@ import { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/ch
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatDynamicVariableModel } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestVariablePart, ChatRequestDynamicVariablePart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatContextAttachments } from './contrib/chatContextAttachments.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 
 let ChatVariablesService = class ChatVariablesService {
-    constructor(chatWidgetService, viewsService) {
+    constructor(chatWidgetService, viewsService, toolsService) {
         this.chatWidgetService = chatWidgetService;
         this.viewsService = viewsService;
+        this.toolsService = toolsService;
         this._resolver = ( new Map());
     }
     async resolveVariables(prompt, attachedContextVariables, model, progress, token) {
@@ -43,7 +46,13 @@ let ChatVariablesService = class ChatVariablesService {
                 }
             }
             else if (part instanceof ChatRequestDynamicVariablePart) {
-                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data };
+                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, };
+            }
+            else if (part instanceof ChatRequestToolPart) {
+                const tool = this.toolsService.getTool(part.toolId);
+                if (tool) {
+                    resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined, fullName: tool.displayName };
+                }
             }
         });
         const resolvedAttachedContext = [];
@@ -141,7 +150,8 @@ let ChatVariablesService = class ChatVariablesService {
 };
 ChatVariablesService = ( __decorate([
     ( __param(0, IChatWidgetService)),
-    ( __param(1, IViewsService))
+    ( __param(1, IViewsService)),
+    ( __param(2, ILanguageModelToolsService))
 ], ChatVariablesService));
 
 export { ChatVariablesService };

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

@@ -69,8 +69,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             }
             else if (this._widget?.viewModel?.initState === ChatModelInitState.Initialized) {
                 this.didUnregisterProvider = true;
-                this._onDidChangeViewWelcomeState.fire();
             }
+            this._onDidChangeViewWelcomeState.fire();
         }));
     }
     getActionsContext() {
@@ -78,7 +78,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             chatView: this
         };
     }
-    updateModel(model, viewState) {
+    updateModel(model) {
         this.modelDisposables.clear();
         model = model ?? (this.chatService.transferredSessionData?.sessionId
             ? this.chatService.getOrRestoreSession(this.chatService.transferredSessionData.sessionId)
@@ -86,10 +86,13 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (!model) {
             throw ( new Error('Could not start chat session'));
         }
-        this._widget.setModel(model, { ...(viewState ?? this.viewState) });
+        this._widget.setModel(model, { ...this.viewState });
         this.viewState.sessionId = model.sessionId;
     }
     shouldShowWelcome() {
+        if (!this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)) {
+            return true;
+        }
         const noPersistedSessions = !this.chatService.hasSessions();
         return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
     }
@@ -143,7 +146,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (this.widget.viewModel) {
             this.chatService.clearSession(this.widget.viewModel.sessionId);
         }
-        this.updateModel(undefined, { ...this.viewState, inputValue: undefined });
+        this.updateViewState();
+        this.updateModel(undefined);
     }
     loadSession(sessionId) {
         if (this.widget.viewModel) {
@@ -166,13 +170,16 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     saveState() {
         if (this._widget) {
             this._widget.saveState();
-            const widgetViewState = this._widget.getViewState();
-            this.viewState.inputValue = widgetViewState.inputValue;
-            this.viewState.inputState = widgetViewState.inputState;
+            this.updateViewState();
             this.memento.saveMemento();
         }
         super.saveState();
     }
+    updateViewState() {
+        const widgetViewState = this._widget.getViewState();
+        this.viewState.inputValue = widgetViewState.inputValue;
+        this.viewState.inputState = widgetViewState.inputState;
+    }
 };
 ChatViewPane = ( __decorate([
     ( __param(1, IKeybindingService)),

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

@@ -1,4 +1,3 @@
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
@@ -11,8 +10,6 @@ class ChatContextAttachments extends Disposable {
         super();
         this.widget = widget;
         this._attachedContext = ( new Set());
-        this._onDidChangeInputState = this._register(( new Emitter()));
-        this.onDidChangeInputState = this._onDidChangeInputState.event;
         this._register(this.widget.onDidChangeContext((e) => {
             if (e.removed) {
                 this._removeContext(e.removed);
@@ -46,12 +43,10 @@ class ChatContextAttachments extends Disposable {
             this._attachedContext.add(attachment);
         }
         this.widget.setContext(overwrite, ...attachments);
-        this._onDidChangeInputState.fire();
     }
     _removeContext(attachments) {
         if (attachments.length) {
             attachments.forEach(this._attachedContext.delete, this._attachedContext);
-            this._onDidChangeInputState.fire();
         }
     }
     _clearAttachedContext() {

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

@@ -15,9 +15,10 @@ import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/c
 import { SelectAndInsertFileAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { getFullyQualifiedId, ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService, IChatAgentNameService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, chatSubcommandLeader, chatAgentLeader, chatVariableLeader, ChatRequestVariablePart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, chatSubcommandLeader, chatAgentLeader, chatVariableLeader, ChatRequestVariablePart, ChatRequestToolPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 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 { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 var BuiltinDynamicCompletions_1, VariableCompletions_1;
@@ -266,7 +267,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 if (!widget || !widget.supportsFileReferences) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions_1.VariableNameDef);
+                const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions_1.VariableNameDef, true);
                 if (!range) {
                     return null;
                 }
@@ -281,7 +282,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                         {
                             label: `${chatVariableLeader}file`,
                             insertText: `${chatVariableLeader}file:`,
-                            detail: ( localize(7153, "Pick a file")),
+                            detail: ( localize(7125, "Pick a file")),
                             range,
                             kind: CompletionItemKind.Text,
                             command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -298,11 +299,17 @@ BuiltinDynamicCompletions = BuiltinDynamicCompletions_1 = ( (__decorate([
     ( (__param(1, IChatWidgetService)))
 ], BuiltinDynamicCompletions)));
 ( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(BuiltinDynamicCompletions, LifecyclePhase.Eventually);
-function computeCompletionRanges(model, position, reg) {
+function computeCompletionRanges(model, position, reg, onlyOnWordStart = false) {
     const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);
     if (!varWord && model.getWordUntilPosition(position).word) {
         return;
     }
+    if (varWord && onlyOnWordStart) {
+        const wordBefore = model.getWordUntilPosition({ lineNumber: position.lineNumber, column: varWord.startColumn });
+        if (wordBefore.word) {
+            return;
+        }
+    }
     let insert;
     let replace;
     if (!varWord) {
@@ -327,7 +334,7 @@ function computeCompletionRanges(model, position, reg) {
 let VariableCompletions = class VariableCompletions extends Disposable {
     static { VariableCompletions_1 = this; }
     static { this.VariableNameDef = ( (new RegExp(`${chatVariableLeader}\\w*`, 'g'))); }
-    constructor(languageFeaturesService, chatWidgetService, chatVariablesService, configService) {
+    constructor(languageFeaturesService, chatWidgetService, chatVariablesService, configService, toolsService) {
         super();
         this.languageFeaturesService = languageFeaturesService;
         this.chatWidgetService = chatWidgetService;
@@ -347,15 +354,16 @@ let VariableCompletions = class VariableCompletions extends Disposable {
                 if (!widget || !( (locations.has(widget.location)))) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, VariableCompletions_1.VariableNameDef);
+                const range = computeCompletionRanges(model, position, VariableCompletions_1.VariableNameDef, true);
                 if (!range) {
                     return null;
                 }
                 const usedAgent = widget.parsedInput.parts.find(p => p instanceof ChatRequestAgentPart);
                 const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
                 const usedVariables = widget.parsedInput.parts.filter((p) => p instanceof ChatRequestVariablePart);
+                const usedVariableNames = ( (new Set( (usedVariables.map(v => v.variableName)))));
                 const variableItems = ( (Array.from(this.chatVariablesService.getVariables(widget.location))
-                    .filter(v => !( (usedVariables.some(usedVar => usedVar.variableName === v.name))))
+                    .filter(v => !( (usedVariableNames.has(v.name))))
                     .filter(v => !v.isSlow || slowSupported)
                     .map((v) => {
                     const withLeader = `${chatVariableLeader}${v.name}`;
@@ -368,8 +376,27 @@ let VariableCompletions = class VariableCompletions extends Disposable {
                         sortText: 'z'
                     };
                 })));
+                const usedTools = widget.parsedInput.parts.filter((p) => p instanceof ChatRequestToolPart);
+                const usedToolNames = ( (new Set( (usedTools.map(v => v.toolName)))));
+                const toolItems = [];
+                if (!usedAgent || usedAgent.agent.supportsToolReferences) {
+                    toolItems.push(...( (Array.from(toolsService.getTools())
+                        .filter(t => t.canBeInvokedManually)
+                        .filter(t => !( (usedToolNames.has(t.name ?? ''))))
+                        .map((t) => {
+                        const withLeader = `${chatVariableLeader}${t.name}`;
+                        return {
+                            label: withLeader,
+                            range,
+                            insertText: withLeader + ' ',
+                            detail: t.userDescription,
+                            kind: CompletionItemKind.Text,
+                            sortText: 'z'
+                        };
+                    }))));
+                }
                 return {
-                    suggestions: variableItems
+                    suggestions: [...variableItems, ...toolItems]
                 };
             }
         }));
@@ -379,6 +406,7 @@ VariableCompletions = VariableCompletions_1 = ( (__decorate([
     ( (__param(0, ILanguageFeaturesService))),
     ( (__param(1, IChatWidgetService))),
     ( (__param(2, IChatVariablesService))),
-    ( (__param(3, IConfigurationService)))
+    ( (__param(3, IConfigurationService))),
+    ( (__param(4, ILanguageModelToolsService)))
 ], VariableCompletions)));
 ( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(VariableCompletions, LifecyclePhase.Eventually);

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

@@ -20,7 +20,7 @@ import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat
 import { dynamicVariableDecorationType } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatSlashCommandForeground, chatSlashCommandBackground } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 
 const decorationDescription = 'chat';
@@ -200,6 +200,10 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         for (const variable of variableParts) {
             varDecorations.push({ range: variable.editorRange });
         }
+        const toolParts = parsedRequest.filter((p) => p instanceof ChatRequestToolPart);
+        for (const tool of toolParts) {
+            varDecorations.push({ range: tool.editorRange });
+        }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
     }
 };
@@ -258,7 +262,7 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
             const change = e.changes[0];
             if (!change.text && this.widget.viewModel) {
                 const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent });
-                const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart);
+                const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart || p instanceof ChatRequestToolPart);
                 deletableTokens.forEach(token => {
                     const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);
                     if (deletedRangeOfToken && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {

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

@@ -61,7 +61,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         );
     }
     getAccessibleContent(hoverPart) {
-        return ( localize(7154, 'There is a chat agent hover part here.'));
+        return ( localize(7126, 'There is a chat agent hover part here.'));
     }
 };
 ChatAgentHoverParticipant = ( (__decorate([