@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatUsageWidget.js

@@ -18,43 +18,59 @@ let ChatUsageWidget = class ChatUsageWidget extends Disposable {
         this.chatEntitlementService = chatEntitlementService;
         this._onDidChangeContentHeight = ( new Emitter());
         this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
-        this.dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
-        this.dateTimeFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
-        this.element = $$1('.chat-usage-widget');
+        this.dateFormatter = safeIntl.DateTimeFormat(language, {
+            year: "numeric",
+            month: "long",
+            day: "numeric"
+        });
+        this.dateTimeFormatter = safeIntl.DateTimeFormat(language, {
+            year: "numeric",
+            month: "long",
+            day: "numeric",
+            hour: "numeric",
+            minute: "numeric"
+        });
+        this.element = $$1(".chat-usage-widget");
         this.create(this.element);
         this.render();
         this._register(this.chatEntitlementService.onDidChangeQuotaRemaining(() => this.render()));
         this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.render()));
     }
     create(container) {
-        this.usageSection = append(container, $('.copilot-usage-section'));
+        this.usageSection = append(container, $(".copilot-usage-section"));
     }
     render() {
         clearNode(this.usageSection);
-        const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate, resetDateHasTime } = this.chatEntitlementService.quotas;
+        const {
+            chat: chatQuota,
+            completions: completionsQuota,
+            premiumChat: premiumChatQuota,
+            resetDate,
+            resetDateHasTime
+        } = this.chatEntitlementService.quotas;
         if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.installed && !completionsQuota && !chatQuota && !premiumChatQuota) {
-            this.renderLimitedQuotaItem(this.usageSection, ( localize(5250, 'Inline Suggestions')));
-            this.renderLimitedQuotaItem(this.usageSection, ( localize(5251, 'Chat messages')));
+            this.renderLimitedQuotaItem(this.usageSection, ( localize(5428, "Inline Suggestions")));
+            this.renderLimitedQuotaItem(this.usageSection, ( localize(5429, "Chat messages")));
         }
         else if (completionsQuota || chatQuota || premiumChatQuota) {
             if (completionsQuota) {
-                this.renderQuotaItem(this.usageSection, ( localize(5252, 'Inline Suggestions')), completionsQuota);
+                this.renderQuotaItem(this.usageSection, ( localize(5430, "Inline Suggestions")), completionsQuota);
             }
             if (chatQuota) {
-                this.renderQuotaItem(this.usageSection, ( localize(5253, 'Chat messages')), chatQuota);
+                this.renderQuotaItem(this.usageSection, ( localize(5431, "Chat messages")), chatQuota);
             }
             if (premiumChatQuota) {
-                this.renderQuotaItem(this.usageSection, ( localize(5254, 'Premium requests')), premiumChatQuota);
+                this.renderQuotaItem(this.usageSection, ( localize(5432, "Premium requests")), premiumChatQuota);
                 if (premiumChatQuota.overageEnabled) {
-                    const overageMessage = append(this.usageSection, $('.overage-message'));
-                    overageMessage.textContent = ( localize(5255, 'Additional paid premium requests enabled.'));
+                    const overageMessage = append(this.usageSection, $(".overage-message"));
+                    overageMessage.textContent = ( localize(5433, "Additional paid premium requests enabled."));
                 }
             }
             if (resetDate) {
-                const resetText = append(this.usageSection, $('.allowance-resets'));
+                const resetText = append(this.usageSection, $(".allowance-resets"));
                 resetText.textContent = ( localize(
-                    5256,
-                    'Allowance resets {0}.',
+                    5434,
+                    "Allowance resets {0}.",
                     resetDateHasTime ? this.dateTimeFormatter.value.format(( new Date(resetDate))) : this.dateFormatter.value.format(( new Date(resetDate)))
                 ));
             }
@@ -63,26 +79,24 @@ let ChatUsageWidget = class ChatUsageWidget extends Disposable {
         this._onDidChangeContentHeight.fire(height);
     }
     renderQuotaItem(container, label, quota) {
-        const quotaItem = append(container, $('.quota-item'));
-        const quotaItemHeader = append(quotaItem, $('.quota-item-header'));
-        const quotaItemLabel = append(quotaItemHeader, $('.quota-item-label'));
+        const quotaItem = append(container, $(".quota-item"));
+        const quotaItemHeader = append(quotaItem, $(".quota-item-header"));
+        const quotaItemLabel = append(quotaItemHeader, $(".quota-item-label"));
         quotaItemLabel.textContent = label;
-        const quotaItemValue = append(quotaItemHeader, $('.quota-item-value'));
+        const quotaItemValue = append(quotaItemHeader, $(".quota-item-value"));
         if (quota.unlimited) {
-            quotaItemValue.textContent = ( localize(5257, 'Included'));
+            quotaItemValue.textContent = ( localize(5435, "Included"));
+        } else {
+            quotaItemValue.textContent = ( localize(5435, "Included"));
         }
-        else {
-            quotaItemValue.textContent = ( localize(5257, 'Included'));
-        }
-        const progressBarContainer = append(quotaItem, $('.quota-bar'));
-        const progressBar = append(progressBarContainer, $('.quota-bit'));
+        const progressBarContainer = append(quotaItem, $(".quota-bar"));
+        const progressBar = append(progressBarContainer, $(".quota-bit"));
         const percentageUsed = this.getQuotaPercentageUsed(quota);
-        progressBar.style.width = percentageUsed + '%';
+        progressBar.style.width = percentageUsed + "%";
         if (percentageUsed >= 90) {
-            quotaItem.classList.add('error');
-        }
-        else if (percentageUsed >= 75) {
-            quotaItem.classList.add('warning');
+            quotaItem.classList.add("error");
+        } else if (percentageUsed >= 75) {
+            quotaItem.classList.add("warning");
         }
     }
     getQuotaPercentageUsed(quota) {
@@ -92,18 +106,16 @@ let ChatUsageWidget = class ChatUsageWidget extends Disposable {
         return Math.max(0, 100 - quota.percentRemaining);
     }
     renderLimitedQuotaItem(container, label) {
-        const quotaItem = append(container, $('.quota-item'));
-        const quotaItemHeader = append(quotaItem, $('.quota-item-header'));
-        const quotaItemLabel = append(quotaItemHeader, $('.quota-item-label'));
+        const quotaItem = append(container, $(".quota-item"));
+        const quotaItemHeader = append(quotaItem, $(".quota-item-header"));
+        const quotaItemLabel = append(quotaItemHeader, $(".quota-item-label"));
         quotaItemLabel.textContent = label;
-        const quotaItemValue = append(quotaItemHeader, $('.quota-item-value'));
-        quotaItemValue.textContent = ( localize(5258, 'Limited'));
-        const progressBarContainer = append(quotaItem, $('.quota-bar'));
-        append(progressBarContainer, $('.quota-bit'));
+        const quotaItemValue = append(quotaItemHeader, $(".quota-item-value"));
+        quotaItemValue.textContent = ( localize(5436, "Limited"));
+        const progressBarContainer = append(quotaItem, $(".quota-bar"));
+        append(progressBarContainer, $(".quota-bit"));
     }
 };
-ChatUsageWidget = ( __decorate([
-    ( __param(0, IChatEntitlementService))
-], ChatUsageWidget));
+ChatUsageWidget = ( __decorate([( __param(0, IChatEntitlementService))], ChatUsageWidget));
 
 export { ChatUsageWidget };

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css

@@ -43,6 +43,7 @@
 
 .models-widget .models-search-and-button-container .section-title-actions .models-add-model-button {
 	white-space: nowrap;
+	padding: 5px 8px 5px 4px;
 }
 
 /** Table styling **/
@@ -121,16 +122,34 @@
 	flex: 0 1 auto;
 }
 
+.models-widget .models-table-container .monaco-list-row:not(.selected) .monaco-table-tr.models-status-row .monaco-table-td .model-name-container .model-name .monaco-highlighted-label.error-status {
+	color: var(--vscode-errorForeground);
+}
+
+.models-widget .models-table-container .monaco-list-row:not(.selected) .monaco-table-tr.models-status-row .monaco-table-td .model-name-container .model-name .monaco-highlighted-label.warning-status {
+	color: var(--vscode-editorWarning-foreground);
+}
+
 /** Actions column styling **/
 
-.models-widget .models-table-container .monaco-table-td .actions-column {
-	display: flex;
+.models-widget .models-table-container .monaco-list-row .monaco-table-tr.models-model-row.model-hidden .models-table-column.models-actions-column {
+	opacity: 1;
+}
+
+.models-widget .models-table-container .monaco-list-row .monaco-table-tr.models-model-row .models-table-column.models-actions-column .actions-container {
+	display: none;
 	align-items: center;
 	justify-content: center;
 	width: 100%;
 }
 
-.models-widget .models-table-container .monaco-table-td .actions-column .monaco-action-bar {
+.models-widget .models-table-container .monaco-list-row.focused .monaco-table-tr .models-table-column.models-actions-column .actions-container,
+.models-widget .models-table-container .monaco-list-row.selected .monaco-table-tr .models-table-column.models-actions-column .actions-container,
+.models-widget .models-table-container .monaco-list-row:hover .monaco-table-tr .models-table-column.models-actions-column .actions-container {
+	display: flex;
+}
+
+.models-widget .models-table-container .monaco-table-td .models-actions-column .actions-container .monaco-action-bar {
 	margin-right: 9px;
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.d.ts

@@ -2,6 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IWebview } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
@@ -23,14 +24,16 @@ export interface RenderedOutputPart extends IDisposable {
 }
 export interface RenderOutputPartWebviewOptions {
     readonly origin?: string;
+    readonly webviewState?: string;
 }
 export declare class ChatOutputRendererService extends Disposable implements IChatOutputRendererService {
-    private readonly _webviewService;
+    private readonly _contextKeyService;
     private readonly _extensionService;
+    private readonly _webviewService;
     _serviceBrand: undefined;
     private readonly _contributions;
     private readonly _renderers;
-    constructor(_webviewService: IWebviewService, _extensionService: IExtensionService);
+    constructor(_contextKeyService: IContextKeyService, _extensionService: IExtensionService, _webviewService: IWebviewService);
     registerRenderer(viewType: string, renderer: IChatOutputItemRenderer, options: RegisterOptions): IDisposable;
     renderOutputPart(mime: string, data: Uint8Array, parent: HTMLElement, webviewOptions: RenderOutputPartWebviewOptions, token: CancellationToken): Promise<RenderedOutputPart>;
     private getRenderer;

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

@@ -9,6 +9,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { WebviewContentPurpose } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
@@ -17,10 +18,11 @@ import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatOutputRendererService = class ChatOutputRendererService extends Disposable {
-    constructor(_webviewService, _extensionService) {
+    constructor(_contextKeyService, _extensionService, _webviewService) {
         super();
-        this._webviewService = _webviewService;
+        this._contextKeyService = _contextKeyService;
         this._extensionService = _extensionService;
+        this._webviewService = _webviewService;
         this._contributions = ( new Map());
         this._renderers = ( new Map());
         this._register(chatOutputRenderContributionPoint.setHandler(extensions => {
@@ -28,7 +30,11 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
         }));
     }
     registerRenderer(viewType, renderer, options) {
-        this._renderers.set(viewType, { renderer, options });
+        this._renderers.set(viewType, {
+            viewType,
+            renderer,
+            options
+        });
         return {
             dispose: () => {
                 this._renderers.delete(viewType);
@@ -45,16 +51,18 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
         }
         const store = ( new DisposableStore());
         const webview = store.add(this._webviewService.createWebviewElement({
-            title: '',
+            title: "",
             origin: webviewOptions.origin ?? generateUuid(),
+            providedViewType: rendererData.viewType,
             options: {
                 enableFindWidget: false,
                 purpose: WebviewContentPurpose.ChatOutputItem,
-                tryRestoreScrollPosition: false,
+                tryRestoreScrollPosition: false
             },
             contentOptions: {},
-            extension: rendererData.options.extension ? rendererData.options.extension : undefined,
+            extension: rendererData.options.extension ? rendererData.options.extension : undefined
         }));
+        webview.setContextKeyService(store.add(this._contextKeyService.createScoped(parent)));
         const onDidChangeHeight = store.add(( new Emitter()));
         store.add(autorun(reader => {
             const height = reader.readObservable(webview.intrinsicContentSize);
@@ -63,24 +71,32 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
                 parent.style.height = `${height.height}px`;
             }
         }));
+        if (webviewOptions.webviewState) {
+            webview.state = webviewOptions.webviewState;
+        }
         webview.mountTo(parent, getWindow(parent));
         await rendererData.renderer.renderOutputPart(mime, data, webview, token);
         return {
-            get webview() { return webview; },
+            get webview() {
+                return webview;
+            },
             onDidChangeHeight: onDidChangeHeight.event,
             dispose: () => {
                 store.dispose();
             },
             reinitialize: () => {
                 webview.reinitializeAfterDismount();
-            },
+            }
         };
     }
     async getRenderer(mime, token) {
         await raceCancellationError(this._extensionService.whenInstalledExtensionsRegistered(), token);
         for (const [id, value] of this._contributions) {
             if (( value.mimes.some(m => matchesMimeType(m, [mime])))) {
-                await raceCancellationError(this._extensionService.activateByEvent(`onChatOutputRenderer:${id}`), token);
+                await raceCancellationError(
+                    this._extensionService.activateByEvent(`onChatOutputRenderer:${id}`),
+                    token
+                );
                 const rendererData = this._renderers.get(id);
                 if (rendererData) {
                     return rendererData;
@@ -92,54 +108,53 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
     updateContributions(extensions) {
         this._contributions.clear();
         for (const extension of extensions) {
-            if (!isProposedApiEnabled(extension.description, 'chatOutputRenderer')) {
+            if (!isProposedApiEnabled(extension.description, "chatOutputRenderer")) {
                 continue;
             }
             for (const contribution of extension.value) {
                 if (( this._contributions.has(contribution.viewType))) {
-                    extension.collector.error(`Chat output renderer with view type '${contribution.viewType}' already registered`);
+                    extension.collector.error(
+                        `Chat output renderer with view type '${contribution.viewType}' already registered`
+                    );
                     continue;
                 }
                 this._contributions.set(contribution.viewType, {
-                    mimes: contribution.mimeTypes,
+                    mimes: contribution.mimeTypes
                 });
             }
         }
     }
 };
-ChatOutputRendererService = ( __decorate([
-    ( __param(0, IWebviewService)),
-    ( __param(1, IExtensionService))
-], ChatOutputRendererService));
+ChatOutputRendererService = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IExtensionService)), ( __param(2, IWebviewService))], ChatOutputRendererService));
 const chatOutputRendererContributionSchema = {
-    type: 'object',
+    type: "object",
     additionalProperties: false,
-    required: ['viewType', 'mimeTypes'],
+    required: ["viewType", "mimeTypes"],
     properties: {
         viewType: {
-            type: 'string',
-            description: ( localize(5259, 'Unique identifier for the renderer.')),
+            type: "string",
+            description: ( localize(5437, "Unique identifier for the renderer."))
         },
         mimeTypes: {
-            type: 'array',
-            description: ( localize(5260, 'MIME types that this renderer can handle')),
+            type: "array",
+            description: ( localize(5438, "MIME types that this renderer can handle")),
             items: {
-                type: 'string'
+                type: "string"
             }
         }
     }
 };
 const chatOutputRenderContributionPoint = ExtensionsRegistry.registerExtensionPoint({
-    extensionPoint: 'chatOutputRenderers',
-    activationEventsGenerator: function* (contributions) {
+    extensionPoint: "chatOutputRenderers",
+    activationEventsGenerator: function*(contributions) {
         for (const contrib of contributions) {
             yield `onChatOutputRenderer:${contrib.viewType}`;
         }
     },
     jsonSchema: {
-        description: ( localize(5261, 'Contributes a renderer for specific MIME types in chat outputs')),
-        type: 'array',
-        items: chatOutputRendererContributionSchema,
+        description: ( localize(5439, "Contributes a renderer for specific MIME types in chat outputs")),
+        type: "array",
+        items: chatOutputRendererContributionSchema
     }
 });