@codingame/monaco-vscode-chat-service-override 2.2.2 → 3.1.0

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

@@ -2,20 +2,20 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { AudioCue, IAudioCueService } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
+import { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
-    constructor(_audioCueService, _instantiationService) {
+    constructor(_accessibilitySignalService, _instantiationService) {
         super();
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._instantiationService = _instantiationService;
         this._pendingCueMap = this._register(( new DisposableMap()));
         this._requestId = 0;
     }
     acceptRequest() {
         this._requestId++;
-        this._audioCueService.playAudioCue(AudioCue.chatRequestSent, { allowManyInParallel: true });
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
         this._pendingCueMap.set(this._requestId, this._instantiationService.createInstance(AudioCueScheduler));
         return this._requestId;
     }
@@ -23,7 +23,7 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         this._pendingCueMap.deleteAndDispose(requestId);
         const isPanelChat = typeof response !== 'string';
         const responseContent = typeof response === 'string' ? response : response?.response.asString();
-        this._audioCueService.playAudioCue(AudioCue.chatResponseReceived, { allowManyInParallel: true });
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
         if (!response) {
             return;
         }
@@ -32,17 +32,17 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
     }
 };
 ChatAccessibilityService = ( __decorate([
-    ( __param(0, IAudioCueService)),
+    ( __param(0, IAccessibilitySignalService)),
     ( __param(1, IInstantiationService))
 ], ChatAccessibilityService));
 const CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS = 5000;
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let AudioCueScheduler = class AudioCueScheduler extends Disposable {
-    constructor(_audioCueService) {
+    constructor(_accessibilitySignalService) {
         super();
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._scheduler = ( new RunOnceScheduler(() => {
-            this._audioCueLoop = this._audioCueService.playAudioCueLoop(AudioCue.chatResponsePending, CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS);
+            this._audioCueLoop = this._accessibilitySignalService.playSignalLoop(AccessibilitySignal.chatResponsePending, CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS);
         }, CHAT_RESPONSE_PENDING_ALLOWANCE_MS));
         this._scheduler.schedule();
     }
@@ -54,7 +54,7 @@ let AudioCueScheduler = class AudioCueScheduler extends Disposable {
     }
 };
 AudioCueScheduler = ( __decorate([
-    ( __param(0, IAudioCueService))
+    ( __param(0, IAccessibilitySignalService))
 ], AudioCueScheduler));
 
 export { ChatAccessibilityService };

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

@@ -7,8 +7,8 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { getHistoryAction, getOpenChatEditorAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { getNewChatAction } from './actions/chatClearActions.js';
 import { getMoveToEditorAction, getMoveToNewWindowAction } from './actions/chatMoveActions.js';
@@ -17,7 +17,7 @@ import { ChatViewPane, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 
-const chatExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const chatExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'interactiveSession',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -72,8 +72,9 @@ const chatExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
             result.push(`onInteractiveSession:${contrib.id}`);
         }
     },
-}));
+});
 let ChatExtensionPointHandler = class ChatExtensionPointHandler {
+    static { this.ID = 'workbench.contrib.chatExtensionPointHandler'; }
     constructor(_chatContributionService) {
         this._chatContributionService = _chatContributionService;
         this._registrationDisposables = ( new Map());
@@ -110,7 +111,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         ));
         const icon = Codicon.commentDiscussion;
         const viewContainerId = CHAT_SIDEBAR_PANEL_ID;
-        const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
+        const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
             id: viewContainerId,
             title,
             icon,
@@ -136,7 +137,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                 ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ providerId: providerDescriptor.id }])),
                 when: ContextKeyExpr.deserialize(providerDescriptor.when)
             }];
-        ( Registry.as(Extensions$1.ViewsRegistry)).registerViews(viewDescriptor, this._viewContainer);
+        ( Registry.as(Extensions.ViewsRegistry)).registerViews(viewDescriptor, this._viewContainer);
         const disposables = ( new DisposableStore());
         disposables.add(registerAction2(getHistoryAction(viewId, providerDescriptor.id)));
         disposables.add(registerAction2(getNewChatAction(viewId, providerDescriptor.id)));
@@ -146,8 +147,8 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         disposables.add(registerAction2(getQuickChatActionForProvider(providerDescriptor.id, providerDescriptor.label)));
         return {
             dispose: () => {
-                ( Registry.as(Extensions$1.ViewsRegistry)).deregisterViews(viewDescriptor, this._viewContainer);
-                ( Registry.as(Extensions$1.ViewContainersRegistry)).deregisterViewContainer(this._viewContainer);
+                ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(viewDescriptor, this._viewContainer);
+                ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(this._viewContainer);
                 disposables.dispose();
             }
         };
@@ -156,8 +157,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
 ChatExtensionPointHandler = ( __decorate([
     ( __param(0, IChatContributionService))
 ], ChatExtensionPointHandler));
-const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(ChatExtensionPointHandler, 1 );
+registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, 1 );
 class ChatContributionService {
     constructor() {
         this._registeredProviders = ( new Map());

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

@@ -55,11 +55,11 @@ let ChatEditor = class ChatEditor extends EditorPane {
         if (!this.widget) {
             throw new Error('ChatEditor lifecycle issue: no editor widget');
         }
-        this.updateModel(editorModel.model);
+        this.updateModel(editorModel.model, options?.viewState ?? input.options.viewState);
     }
-    updateModel(model) {
-        this._memento = ( new Memento('interactive-session-editor-' + model.sessionId, this.storageService));
-        this._viewState = this._memento.getMemento(1 , 1 );
+    updateModel(model, viewState) {
+        this._memento = ( new Memento('interactive-session-editor-' + model.providerId, this.storageService));
+        this._viewState = viewState ?? this._memento.getMemento(1 , 1 );
         this.widget.setModel(model, { ...this._viewState });
     }
     saveState() {

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

@@ -231,10 +231,10 @@ let QuickChat = class QuickChat extends Disposable {
             return;
         }
         for (const request of this.model.getRequests()) {
-            if (request.response?.response.value || request.response?.errorDetails) {
+            if (request.response?.response.value || request.response?.result) {
                 this.chatService.addCompleteRequest(widget.viewModel.sessionId, request.message, request.variableData, {
                     message: request.response.response.value,
-                    errorDetails: request.response.errorDetails,
+                    result: request.response.result,
                     followups: request.response.followups
                 });
             }

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { onUnexpectedExternalError } from 'vscode/vscode/vs/base/common/errors';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -11,50 +12,32 @@ let ChatVariablesService = class ChatVariablesService {
         this.chatWidgetService = chatWidgetService;
         this._resolver = ( new Map());
     }
-    async resolveVariables(prompt, model, token) {
-        const resolvedVariables = {};
+    async resolveVariables(prompt, model, progress, token) {
+        let resolvedVariables = [];
         const jobs = [];
-        const parsedPrompt = [];
         prompt.parts
             .forEach((part, i) => {
             if (part instanceof ChatRequestVariablePart) {
                 const data = this._resolver.get(part.variableName.toLowerCase());
                 if (data) {
-                    jobs.push(data.resolver(prompt.text, part.variableArg, model, token).then(value => {
-                        if (value) {
-                            resolvedVariables[part.variableName] = value;
-                            parsedPrompt[i] = `[${part.text}](values:${part.variableName})`;
-                        }
-                        else {
-                            parsedPrompt[i] = part.promptText;
+                    jobs.push(data.resolver(prompt.text, part.variableArg, model, progress, token).then(values => {
+                        if (values?.length) {
+                            resolvedVariables[i] = { name: part.variableName, range: part.range, values };
                         }
                     }).catch(onUnexpectedExternalError));
                 }
             }
             else if (part instanceof ChatRequestDynamicVariablePart) {
-                const referenceName = this.getUniqueReferenceName(part.referenceText, resolvedVariables);
-                resolvedVariables[referenceName] = part.data;
-                const safeText = part.text.replace(/[\[\]]/g, '_');
-                const safeTarget = referenceName.replace(/[\(\)]/g, '_');
-                parsedPrompt[i] = `[${safeText}](values:${safeTarget})`;
-            }
-            else {
-                parsedPrompt[i] = part.promptText;
+                resolvedVariables[i] = { name: part.referenceText, range: part.range, values: part.data };
             }
         });
         await Promise.allSettled(jobs);
+        resolvedVariables = coalesce(resolvedVariables);
+        resolvedVariables.sort((a, b) => b.range.start - a.range.start);
         return {
             variables: resolvedVariables,
-            message: parsedPrompt.join('').trim()
         };
     }
-    getUniqueReferenceName(name, vars) {
-        let i = 1;
-        while (vars[name]) {
-            name = `${name}_${i++}`;
-        }
-        return name;
-    }
     hasVariable(name) {
         return ( this._resolver.has(name.toLowerCase()));
     }

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

@@ -32,6 +32,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.logService = logService;
         this.modelDisposables = this._register(( new DisposableStore()));
         this.didProviderRegistrationFail = false;
+        this.didUnregisterProvider = false;
         this.memento = ( new Memento(
             'interactive-session-view-' + this.chatViewOptions.providerId,
             this.storageService
@@ -44,6 +45,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 try {
                     this._widget.setVisible(false);
                     this.updateModel(model);
+                    this.didProviderRegistrationFail = false;
+                    this.didUnregisterProvider = false;
                     this._onDidChangeViewWelcomeState.fire();
                 }
                 finally {
@@ -51,6 +54,12 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 }
             }
         }));
+        this._register(this.chatService.onDidUnregisterProvider(({ providerId }) => {
+            if (providerId === this.chatViewOptions.providerId) {
+                this.didUnregisterProvider = true;
+                this._onDidChangeViewWelcomeState.fire();
+            }
+        }));
     }
     updateModel(model, viewState) {
         this.modelDisposables.clear();
@@ -65,7 +74,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     }
     shouldShowWelcome() {
         const noPersistedSessions = !this.chatService.hasSessions(this.chatViewOptions.providerId);
-        return !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
+        return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
     }
     getSessionId() {
         let sessionId;

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

@@ -7,7 +7,7 @@ import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/c
 let ChatHistoryVariables = class ChatHistoryVariables extends Disposable {
     constructor(chatVariablesService) {
         super();
-        this._register(chatVariablesService.registerVariable({ name: 'response', description: '', canTakeArgument: true, hidden: true }, async (message, arg, model, token) => {
+        this._register(chatVariablesService.registerVariable({ name: 'response', description: '', canTakeArgument: true, hidden: true }, async (message, arg, model, progress, token) => {
             if (!arg) {
                 return undefined;
             }