@codingame/monaco-vscode-chat-service-override 31.0.1 → 32.0.1

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

@@ -28,13 +28,15 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
 import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { slashReg, agentReg, variableReg } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { NativeEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry';
 import { TextAreaEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var InputEditorDecorations_1;
@@ -78,7 +80,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         themeService,
         chatAgentService,
         labelService,
-        promptsService,
+        customizationHarnessService,
         editorService
     ) {
         super();
@@ -87,7 +89,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this.themeService = themeService;
         this.chatAgentService = chatAgentService;
         this.labelService = labelService;
-        this.promptsService = promptsService;
+        this.customizationHarnessService = customizationHarnessService;
         this.editorService = editorService;
         this.id = "inputEditorDecorations";
         this.previouslyUsedAgents = ( new Set());
@@ -140,9 +142,12 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this._register(
             this.chatAgentService.onDidChangeAgents(() => this.triggerInputEditorDecorationsUpdate())
         );
-        this._register(
-            this.promptsService.onDidChangeSlashCommands(() => this.triggerInputEditorDecorationsUpdate())
-        );
+        this._register(this.customizationHarnessService.onDidChangeSlashCommands(e => {
+            const sessionResource = this.widget.viewModel?.sessionResource;
+            if (sessionResource && e.sessionType === getChatSessionType(sessionResource)) {
+                this.triggerInputEditorDecorationsUpdate();
+            }
+        }));
         this._register(autorun(reader => {
             const currentMode = this.widget.input.currentModeObs.read(reader);
             if (currentMode) {
@@ -201,7 +206,11 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
     }
     triggerInputEditorDecorationsUpdate() {
         this.updateInputPlaceholderDecoration();
-        this.updateThrottle.trigger(token => this.updateAsyncInputEditorDecorations(token));
+        this.updateThrottle.trigger(token => this.updateAsyncInputEditorDecorations(token)).catch(err => {
+            if (!isCancellationError(err)) {
+                throw err;
+            }
+        });
     }
     updateInputPlaceholderDecoration() {
         const inputValue = this.widget.inputEditor.getValue();
@@ -299,11 +308,15 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this.clickablePromptSlashCommand = undefined;
         this.widget.inputEditor.setDecorationsByType(decorationDescription, clickableSlashPromptTextDecorationType, []);
         const parsedRequest = this.widget.parsedInput.parts;
+        const viewModel = this.widget.viewModel;
+        if (!viewModel) {
+            return;
+        }
         const agentPart = parsedRequest.find(p => p instanceof ChatRequestAgentPart);
         const agentSubcommandPart = parsedRequest.find(p => p instanceof ChatRequestAgentSubcommandPart);
         const slashCommandPart = parsedRequest.find(p => p instanceof ChatRequestSlashCommandPart);
         const slashPromptPart = parsedRequest.find(p => p instanceof ChatRequestSlashPromptPart);
-        const promptSlashCommand = slashPromptPart ? await this.promptsService.resolvePromptSlashCommand(slashPromptPart.name, token) : undefined;
+        const promptSlashCommand = slashPromptPart ? await this.customizationHarnessService.resolvePromptSlashCommand(slashPromptPart.name, getChatSessionType(viewModel.sessionResource), token) : undefined;
         if (token.isCancellationRequested) {
             return;
         }
@@ -338,7 +351,8 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         }
         if (slashCommandPart) {
             textDecorations.push({
-                range: slashCommandPart.editorRange
+                range: slashCommandPart.editorRange,
+                hoverMessage: ( new MarkdownString(slashCommandPart.slashCommand.detail))
             });
         }
         if (slashPromptPart && promptSlashCommand) {
@@ -347,8 +361,12 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 uri: promptSlashCommand.uri
             };
             const promptHoverMessage = ( new MarkdownString());
+            if (promptSlashCommand.description) {
+                promptHoverMessage.appendText(promptSlashCommand.description);
+                promptHoverMessage.appendText("\n");
+            }
             promptHoverMessage.appendText(( localize(
-                7210,
+                7526,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true
@@ -375,7 +393,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             });
         }
         const dynamicVariableParts = parsedRequest.filter(p => p instanceof ChatRequestDynamicVariablePart);
-        const isEditingPreviousRequest = !!this.widget.viewModel?.editing;
+        const isEditingPreviousRequest = !!viewModel.editing;
         if (isEditingPreviousRequest) {
             for (const variable of dynamicVariableParts) {
                 varDecorations.push({
@@ -410,7 +428,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         }
     }
 };
-InputEditorDecorations = InputEditorDecorations_1 = ( __decorate([( __param(1, ICodeEditorService)), ( __param(2, IThemeService)), ( __param(3, IChatAgentService)), ( __param(4, ILabelService)), ( __param(5, IPromptsService)), ( __param(6, IEditorService))], InputEditorDecorations));
+InputEditorDecorations = InputEditorDecorations_1 = ( __decorate([( __param(1, ICodeEditorService)), ( __param(2, IThemeService)), ( __param(3, IChatAgentService)), ( __param(4, ILabelService)), ( __param(5, ICustomizationHarnessService)), ( __param(6, IEditorService))], InputEditorDecorations));
 class InputEditorSlashCommandMode extends Disposable {
     constructor(widget) {
         super();

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

@@ -62,7 +62,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(7211, "There is a chat agent hover part here.");
+        return localize(7527, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));

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

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    7258,
+                    7568,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",

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

@@ -182,7 +182,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(7259, "Loading..."));
+            const loadingMessage = ( localize(7569, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);
@@ -195,10 +195,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         }
         if (chatSessionType !== localChatSessionType) {
             try {
-                await raceCancellationError(
-                    this.chatSessionsService.canResolveChatSession(input.resource.scheme),
-                    token
-                );
+                await raceCancellationError(this.chatSessionsService.canResolveChatSession(chatSessionType), token);
                 const contributions = this.chatSessionsService.getAllChatSessionContributions();
                 const contribution = contributions.find(c => c.type === chatSessionType);
                 if (contribution) {

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

@@ -338,7 +338,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const sessionsContainer = this.sessionsContainer = parent.appendChild($(".agent-sessions-container"));
         const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $(".agent-sessions-title-container"));
         const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $("span.agent-sessions-title"));
-        sessionsTitle.textContent = ( localize(7278, "Sessions"));
+        sessionsTitle.textContent = ( localize(7588, "Sessions"));
         this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
             this.sessionsControl?.scrollToTop();
             this.sessionsControl?.focus();
@@ -366,7 +366,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             ...defaultButtonStyles,
             secondary: true
         })));
-        newSessionButton.label = ( localize(7279, "New Session"));
+        newSessionButton.label = ( localize(7589, "New Session"));
         this._register(
             newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT))
         );
@@ -608,7 +608,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 progressBadgeDisposables.value.add(autorun(reader => {
                     if (model.requestInProgress.read(reader)) {
                         this.activityBadge.value = this.activityService.showViewActivity(this.id, {
-                            badge: ( new ProgressBadge(() => ( localize(7280, "Agent Session in Progress"))))
+                            badge: ( new ProgressBadge(() => ( localize(7590, "Agent Session in Progress"))))
                         });
                     } else {
                         this.activityBadge.clear();
@@ -720,6 +720,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.updateActions();
     }
     async loadSession(sessionResource) {
+        const t0 = Date.now();
+        this.logService.trace(`[ChatViewPane] loadSession start uri=${( sessionResource.toString())}`);
         this.loadSessionCts.value?.cancel();
         const cts = this.loadSessionCts.value = ( new CancellationTokenSource());
         const token = cts.token;
@@ -727,6 +729,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             await this.restoringSession;
         }
         if (token.isCancellationRequested) {
+            this.logService.trace(
+                `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())} cancelled=true phase=preAcquire`
+            );
             return undefined;
         }
         return this.progressService.withProgress({
@@ -747,18 +752,32 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 await queue;
                 if (token.isCancellationRequested) {
                     newModelRef?.dispose();
+                    this.logService.trace(
+                        `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())} cancelled=true phase=postAcquire`
+                    );
                     return undefined;
                 }
-                return this.showModel(token, newModelRef);
+                const result = await this.showModel(token, newModelRef);
+                this.logService.trace(
+                    `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())}`
+                );
+                return result;
             } catch (err) {
                 clearWidget.dispose();
                 await queue;
                 if (token.isCancellationRequested) {
+                    this.logService.trace(
+                        `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())} cancelled=true phase=error`
+                    );
                     return undefined;
                 }
                 this.logService.error(`Failed to load chat session '${( sessionResource.toString())}'`, err);
-                this.notificationService.error(( localize(7281, "Failed to open chat session: {0}", toErrorMessage(err))));
-                return this.showModel(token, undefined);
+                this.notificationService.error(( localize(7591, "Failed to open chat session: {0}", toErrorMessage(err))));
+                const result = await this.showModel(token, undefined);
+                this.logService.trace(
+                    `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())} error=true`
+                );
+                return result;
             } finally {
                 clearWidgetCancellationListener.dispose();
             }

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js

@@ -23,7 +23,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         ChatViewTitleControl_1 = this;
     }
     static {
-        this.DEFAULT_TITLE = ( localize(7282, "Chat"));
+        this.DEFAULT_TITLE = ( localize(7592, "Chat"));
     }
     static {
         this.PICK_AGENT_SESSION_ACTION_ID = "workbench.action.chat.pickAgentSession";
@@ -48,7 +48,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
             constructor() {
                 super({
                     id: ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID,
-                    title: ( localize(7283, "Pick Agent Session")),
+                    title: ( localize(7593, "Pick Agent Session")),
                     f1: false,
                     menu: [{
                         id: MenuId.ChatViewSessionTitleNavigationToolbar,

package/vscode/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.d.ts

@@ -39,8 +39,8 @@ export declare class ChatDebugServiceImpl extends Disposable implements IChatDeb
     activeSessionResource: URI | undefined;
     /** Priority for deduplicating events with the same ID: lower = richer. */
     private static readonly _eventKindPriority;
-    /** Schemes eligible for debug logging and provider invocation. */
-    private static readonly _debugEligibleSchemes;
+    /** Session types eligible for debug logging and provider invocation. */
+    private static readonly _debugEligibleSessionTypes;
     private _isDebugEligibleSession;
     log(sessionResource: URI, name: string, details?: string, level?: ChatDebugLogLevel, options?: {
         id?: string;

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

@@ -7,7 +7,8 @@ import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ChatDebugLogLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 class SessionEventBuffer {
     constructor(capacity) {
@@ -103,13 +104,13 @@ class ChatDebugServiceImpl extends Disposable {
         };
     }
     static {
-        this._debugEligibleSchemes = ( new Set([
-        LocalChatSessionUri.scheme,
+        this._debugEligibleSessionTypes = ( new Set([
+        localChatSessionType,
         "copilotcli",
         "claude-code"]));
     }
     _isDebugEligibleSession(sessionResource) {
-        return ( ChatDebugServiceImpl._debugEligibleSchemes.has(sessionResource.scheme)) || ( this._importedSessions.has(sessionResource));
+        return ( ChatDebugServiceImpl._debugEligibleSessionTypes.has(getChatSessionType(sessionResource))) || ( this._importedSessions.has(sessionResource));
     }
     log(sessionResource, name, details, level = ChatDebugLogLevel.Info, options) {
         if (!this._isDebugEligibleSession(sessionResource)) {

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.d.ts

@@ -132,6 +132,7 @@ export declare class ChatService extends Disposable implements IChatService {
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
     private queuePendingRequest;
     sendRequest(sessionResource: URI, request: string, options?: IChatSendRequestOptions): Promise<ChatSendResult>;
+    private getAttachmentCapabilitiesForParser;
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;