@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { toAgentHostCompletionVariableEntry, AgentHostCompletionReferenceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
@@ -32,12 +33,12 @@ let AgentHostInputCompletions = class AgentHostInputCompletions extends AgentHos
             CommandsRegistry.registerCommand(AgentHostInputCompletions_1.addReferenceCommand, (_services, arg) => {
                 assertType(arg instanceof AgentHostReferenceArgument);
                 arg.widget.getContrib(ChatDynamicVariableModel.ID)?.addReference({
-                    id: ( arg.uri.toString()),
+                    id: arg.id,
                     range: arg.range,
-                    isFile: !arg.isDirectory,
+                    isFile: arg.isFile,
                     isDirectory: arg.isDirectory,
                     fullName: arg.displayName,
-                    data: arg.uri,
+                    data: arg.data,
                     _meta: arg._meta
                 });
             })
@@ -96,27 +97,52 @@ let AgentHostInputCompletions = class AgentHostInputCompletions extends AgentHos
         case "command":
             {
                 return {
-                    label: item.insertText,
+                    label: {
+                        label: item.insertText,
+                        description: attachment.description
+                    },
                     insertText: item.insertText,
                     filterText: item.insertText,
                     range: replaceRange,
                     kind: CompletionItemKind.Text,
-                    detail: attachment.description
+                    detail: attachment.description,
+                    command: {
+                        id: AgentHostInputCompletions_1.addReferenceCommand,
+                        title: "",
+                        arguments: [AgentHostReferenceArgument.forCommand(
+                            widget,
+                            attachment.command,
+                            attachment.description,
+                            AgentHostInputCompletions_1._insertedTokenRange(replaceRange, item.insertText),
+                            attachment._meta
+                        )]
+                    }
                 };
             }
         case "skill":
             {
-                const label = item.insertText.trimEnd();
+                const label = attachment.displayName ? "/" + attachment.displayName : item.insertText.trimEnd();
                 return {
-                    label: attachment.displayName ? {
+                    label: {
                         label,
-                        description: attachment.displayName
-                    } : label,
+                        description: attachment.description
+                    },
                     insertText: item.insertText,
                     filterText: item.insertText,
                     range: replaceRange,
                     kind: CompletionItemKind.Text,
-                    detail: attachment.description
+                    detail: attachment.description,
+                    command: {
+                        id: AgentHostInputCompletions_1.addReferenceCommand,
+                        title: "",
+                        arguments: [AgentHostReferenceArgument.forSkill(
+                            widget,
+                            attachment.uri,
+                            attachment.displayName,
+                            AgentHostInputCompletions_1._insertedTokenRange(replaceRange, item.insertText),
+                            attachment._meta
+                        )]
+                    }
                 };
             }
         default:
@@ -135,33 +161,57 @@ let AgentHostInputCompletions = class AgentHostInputCompletions extends AgentHos
                     command: {
                         id: AgentHostInputCompletions_1.addReferenceCommand,
                         title: "",
-                        arguments: [( new AgentHostReferenceArgument(
+                        arguments: [AgentHostReferenceArgument.forResource(
                             widget,
                             attachment.uri,
                             attachment.displayName,
                             !!attachment.isDirectory,
-                            replaceRange.replace.setEndPosition(
-                                replaceRange.replace.startLineNumber,
-                                replaceRange.replace.startColumn + item.insertText.length
-                            ),
+                            AgentHostInputCompletions_1._insertedRange(replaceRange, item.insertText),
                             attachment._meta
-                        ))]
+                        )]
                     }
                 };
             }
         }
     }
+    static _insertedRange(replaceRange, insertText) {
+        return replaceRange.replace.setEndPosition(
+            replaceRange.replace.startLineNumber,
+            replaceRange.replace.startColumn + insertText.length
+        );
+    }
+    static _insertedTokenRange(replaceRange, insertText) {
+        return this._insertedRange(replaceRange, insertText.trimEnd());
+    }
 };
 AgentHostInputCompletions = AgentHostInputCompletions_1 = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatSessionsService))], AgentHostInputCompletions));
 class AgentHostReferenceArgument {
-    constructor(widget, uri, displayName, isDirectory, range, _meta) {
+    constructor(widget, id, data, displayName, isFile, isDirectory, range, _meta) {
         this.widget = widget;
-        this.uri = uri;
+        this.id = id;
+        this.data = data;
         this.displayName = displayName;
+        this.isFile = isFile;
         this.isDirectory = isDirectory;
         this.range = range;
         this._meta = _meta;
     }
+    static forResource(widget, uri, displayName, isDirectory, range, _meta) {
+        return ( new AgentHostReferenceArgument(widget, ( uri.toString()), uri, displayName, !isDirectory, isDirectory, range, _meta));
+    }
+    static forSkill(widget, uri, displayName, range, _meta) {
+        const entry = toAgentHostCompletionVariableEntry(AgentHostCompletionReferenceKind.Skill, displayName ?? ( uri.toString()), uri, _meta);
+        return ( new AgentHostReferenceArgument(widget, entry.id, entry.value, displayName, false, false, range, _meta));
+    }
+    static forCommand(widget, command, description, range, _meta) {
+        const entry = toAgentHostCompletionVariableEntry(
+            AgentHostCompletionReferenceKind.Command,
+            description ?? command,
+            command,
+            _meta
+        );
+        return ( new AgentHostReferenceArgument(widget, entry.id, entry.value, description, false, false, range, _meta));
+    }
 }
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(AgentHostInputCompletions, LifecyclePhase.Eventually);
 

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

@@ -570,7 +570,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(7749, "Install Chat Extensions..."));
+                const label = ( localize(8329, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -718,7 +718,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(7750, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(8330, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -746,15 +746,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(7751, "Prompt Resource"))
+                            name: ( localize(8331, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(7752, "Prompt Image")),
-                        fullName: ( localize(7752, "Prompt Image")),
+                        name: ( localize(8332, "Prompt Image")),
+                        fullName: ( localize(8332, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -999,7 +999,8 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 const sessionProviderFilter = [
                     AgentSessionProviders.Local,
                     AgentSessionProviders.Background,
-                    AgentSessionProviders.Claude
+                    AgentSessionProviders.Claude,
+                    AgentSessionProviders.AgentHostCopilot
                 ];
                 for await (const group of this.chatSessionsService.getChatSessionItems(sessionProviderFilter, token)) {
                     if (token.isCancellationRequested) {
@@ -1051,7 +1052,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 result.suggestions.push({
                     label: {
                         label: sessionPrefix,
-                        description: ( localize(7753, "Attach a chat session"))
+                        description: ( localize(8333, "Attach a chat session"))
                     },
                     filterText: sessionPrefix,
                     insertText: `${sessionPrefix}:`,
@@ -1137,7 +1138,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(7754, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(8334, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1189,7 +1190,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7755, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(8335, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1378,7 +1379,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(7756, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(8336, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

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

@@ -323,7 +323,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         if (slashPromptPart && promptSlashCommand) {
             const onlyPromptCommandAndWhitespace = slashPromptPart && parsedRequest.every(isWhitespaceOrPromptPart);
             if (onlyPromptCommandAndWhitespace && exactlyOneSpaceAfterPart(parsedRequest, slashPromptPart) && promptSlashCommand) {
-                const description = promptSlashCommand.argumentHint ?? promptSlashCommand.description;
+                const description = promptSlashCommand.argumentHint;
                 if (description) {
                     this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, [{
                         range: getRangeForPlaceholder(slashPromptPart),
@@ -366,7 +366,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 promptHoverMessage.appendText("\n");
             }
             promptHoverMessage.appendText(( localize(
-                7757,
+                8337,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true

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(7758, "There is a chat agent hover part here.");
+        return localize(8338, "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(
-                    7802,
+                    8384,
                     "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.d.ts

@@ -27,6 +27,13 @@ export interface IChatEditorOptions extends IEditorOptions {
      * https://github.com/microsoft/vscode/pull/278476 as input state is stored on the model.
      */
     modelInputState?: IChatModelInputState;
+    /**
+     * Session type explicitly selected by the user when opening a new chat editor.
+     * Non-local session types are already encoded in the editor resource, so this
+     * currently preserves an explicit local selection when default/last-used
+     * provider resolution would otherwise apply.
+     */
+    explicitSessionType?: string;
     target?: {
         data: IExportableChatData | ISerializableChatData;
     };

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

@@ -143,6 +143,9 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
     }
     clearInput() {
         this.widget.setModel(undefined);
+        if (this._editorContainer) {
+            delete this._editorContainer.dataset.boundChatResource;
+        }
         super.clearInput();
     }
     showLoadingInChatWidget(message) {
@@ -182,7 +185,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(7803, "Loading..."));
+            const loadingMessage = ( localize(8385, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);
@@ -199,7 +202,12 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
                 const contributions = this.chatSessionsService.getAllChatSessionContributions();
                 const contribution = contributions.find(c => c.type === chatSessionType);
                 if (contribution) {
-                    this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+                    this.widget.lockToCodingAgent(
+                        contribution.name,
+                        contribution.displayName,
+                        contribution.type,
+                        contribution.agentHostProviderId
+                    );
                     isContributedChatSession = true;
                 } else {
                     this.widget.unlockFromCodingAgent();
@@ -237,6 +245,9 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
     }
     updateModel(model) {
         this.widget.setModel(model);
+        if (this._editorContainer) {
+            this._editorContainer.dataset.boundChatResource = ( model.sessionResource.toString());
+        }
     }
     computeEditorViewState(_resource) {
         if (!this._widget) {

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

@@ -27,11 +27,18 @@ import { IChatViewsWelcomeDescriptor } from "@codingame/monaco-vscode-katex-comm
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { AgentSessionsViewerOrientation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
+import { IMicCaptureService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/micCaptureService.service";
+import { ITtsPlaybackService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/ttsPlaybackService.service";
+import { IVoiceSessionController } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/voiceSessionController.service";
+import { IAgentTitleBarStatusService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.service";
+import { IVoicePlaybackService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/voicePlaybackService.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
     private readonly storageService;
     private readonly chatService;
@@ -47,6 +54,10 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly commandService;
     private readonly activityService;
     private readonly hostService;
+    private readonly micCaptureService;
+    private readonly ttsPlaybackService;
+    private readonly voiceSessionController;
+    private readonly chatWidgetService;
     private readonly memento;
     private readonly viewState;
     private viewPaneContainer;
@@ -58,7 +69,8 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly loadSessionCts;
     private readonly modelRef;
     private readonly activityBadge;
-    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, hostService: IHostService);
+    private readonly _currentSessionResource;
+    constructor(options: IViewPaneOptions, keybindingService2: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, hostService: IHostService, micCaptureService: IMicCaptureService, ttsPlaybackService: ITtsPlaybackService, voiceSessionController: IVoiceSessionController, chatWidgetService: IChatWidgetService, _agentTitleBarStatusService: IAgentTitleBarStatusService, _voicePlaybackService: IVoicePlaybackService, _workbenchEnvironmentService: IWorkbenchEnvironmentService);
     private updateContextKeys;
     private getViewPositionAndLocation;
     private getSessionHoverPosition;
@@ -68,6 +80,10 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private getTransferredOrPersistedSessionInfo;
     protected renderBody(parent: HTMLElement): void;
     private createControls;
+    private _voiceBarContainer;
+    private readonly _voiceBarDisposables;
+    private _updateVoiceBar;
+    private _setupVoiceTranscriptOverlay;
     private static readonly SESSIONS_SIDEBAR_MIN_WIDTH;
     private static readonly SESSIONS_SIDEBAR_SNAP_THRESHOLD;
     private static readonly SESSIONS_SIDEBAR_DEFAULT_WIDTH;
@@ -112,12 +128,14 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
      */
     startNewLocalSession(): Promise<IChatModel | undefined>;
     /**
-     * When the experimental `chat.agentHost.defaultChatProvider` setting is
-     * enabled and an agent-host contribution is registered, return a new
-     * session reference for the agent host instead of the built-in local
-     * provider. Returns `undefined` to fall back to `startNewLocalSession`.
+     * When the experimental `chat.editor.defaultProvider` setting selects a
+     * provider other than local and that contribution is registered, return a
+     * new session reference for it instead of the built-in local provider.
+     * Returns `undefined` to fall back to `startNewLocalSession`.
      */
     private acquireDefaultNewSession;
+    private acquireTransferredOrPersistedSession;
+    private shouldSkipRestoredLocalSession;
     private showModel;
     private updateWidgetLockState;
     private clear;