@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -2,20 +2,27 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
+import { RunOnceScheduler, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { Disposable, DisposableResourceMap, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableResourceMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { FocusMode } from '@codingame/monaco-vscode-api/vscode/vs/platform/native/common/native';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { observeChatModelIsIdle } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/model/chatModelIdle';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
+import { getChatNotificationDedupeKey, ChatNotificationKind } from '../common/chatNotification.js';
 import { ChatConfiguration, ChatNotificationMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { autorunIterableDelta, autorunDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
+function hasCompletedSince(model, watchingSince) {
+    const completedAt = model.lastRequest?.response?.completionTimestamp;
+    return completedAt !== undefined && completedAt >= watchingSince;
+}
 let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
     static {
         this.ID = "workbench.contrib.chatWindowNotifier";
@@ -44,8 +51,21 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
             })
         );
     }
+    _getIdleNotificationDelay() {
+        return 500;
+    }
+    _getBackgroundNotificationDelay() {
+        return 250;
+    }
     _trackModel(model) {
-        return autorunDelta(model.requestNeedsInput, (
+        const store = ( new DisposableStore());
+        const isIdle = observeChatModelIsIdle(model);
+        const watchingSince = Date.now();
+        const idleScheduler = store.add(( new RunOnceScheduler(
+            () => void this._notifyIdleIfNeeded(model, isIdle, watchingSince),
+            this._getIdleNotificationDelay()
+        )));
+        store.add(autorunDelta(model.requestNeedsInput, (
             {
                 lastValue,
                 newValue
@@ -58,7 +78,20 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
             } else if (previousNeedsInput && !currentNeedsInput) {
                 this._clearNotification(model.sessionResource);
             }
-        });
+        }));
+        store.add(autorunDelta(isIdle, (
+            {
+                lastValue,
+                newValue
+            }
+        ) => {
+            if (lastValue === false && newValue === true && hasCompletedSince(model, watchingSince)) {
+                idleScheduler.schedule();
+            } else if (!newValue) {
+                idleScheduler.cancel();
+            }
+        }));
+        return store;
     }
     async _notifyIfNeeded(sessionResource, info) {
         const mode = this._configurationService.getValue(ChatConfiguration.NotifyWindowOnConfirmation);
@@ -67,6 +100,10 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
         }
         const widget = this._chatWidgetService.getWidgetBySessionResource(sessionResource);
         const targetWindow = widget ? getWindow(widget.domNode) : mainWindow;
+        await this._delayForBackgroundWindow(widget?.visible === true);
+        if (!this._chatService.getSession(sessionResource)?.requestNeedsInput.get()) {
+            return;
+        }
         const isFocused = targetWindow.document.hasFocus();
         if (mode !== ChatNotificationMode.Always && isFocused) {
             return;
@@ -77,16 +114,17 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
                 mode: FocusMode.Notify
             });
         }
-        const notificationTitle = info.title ? ( localize(7399, "Session: {0}", info.title)) : ( localize(7400, "Untitled Session"));
+        const notificationTitle = info.title ? ( localize(8637, "Session: {0}", info.title)) : ( localize(8638, "Untitled Session"));
         const cts = ( new CancellationTokenSource());
         this._activeNotifications.set(sessionResource, toDisposable(() => cts.dispose(true)));
         const isQuestionCarousel = this._isQuestionCarouselPending(sessionResource);
         try {
-            const actionLabel = isQuestionCarousel ? ( localize(7401, "Open Session")) : ( localize(7402, "Allow"));
+            const actionLabel = isQuestionCarousel ? ( localize(8639, "Open Session")) : ( localize(8640, "Allow"));
             const result = await this._hostService.showToast({
                 title: this._sanitizeOSToastText(notificationTitle),
                 body: this._getNotificationBody(sessionResource, info, isQuestionCarousel),
-                actions: [actionLabel]
+                actions: [actionLabel],
+                dedupeKey: getChatNotificationDedupeKey(sessionResource, ChatNotificationKind.NeedsInput)
             }, cts.token);
             if (result.actionIndex === 0 && !isQuestionCarousel && this._confirmAllow(sessionResource)) {
                 return;
@@ -102,6 +140,57 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
             this._clearNotification(sessionResource);
         }
     }
+    async _notifyIdleIfNeeded(model, isIdle, watchingSince) {
+        if (!hasCompletedSince(model, watchingSince) || !isIdle.get() || model.requestNeedsInput.get()) {
+            return;
+        }
+        const mode = this._configurationService.getValue(ChatConfiguration.NotifyWindowOnResponseReceived);
+        if (mode === ChatNotificationMode.Off) {
+            return;
+        }
+        const widget = this._chatWidgetService.getWidgetBySessionResource(model.sessionResource);
+        const targetWindow = widget ? getWindow(widget.domNode) : mainWindow;
+        await this._delayForBackgroundWindow(widget?.visible === true);
+        if (!isIdle.get() || model.requestNeedsInput.get()) {
+            return;
+        }
+        const isFocused = targetWindow.document.hasFocus();
+        if (mode !== ChatNotificationMode.Always && isFocused) {
+            return;
+        }
+        this._clearNotification(model.sessionResource);
+        if (!isFocused) {
+            await this._hostService.focus(targetWindow, {
+                mode: FocusMode.Notify
+            });
+        }
+        const cts = ( new CancellationTokenSource());
+        this._activeNotifications.set(model.sessionResource, toDisposable(() => cts.dispose(true)));
+        try {
+            const title = model.title ? ( localize(8637, "Session: {0}", model.title)) : ( localize(8638, "Untitled Session"));
+            const result = await this._hostService.showToast({
+                title: this._sanitizeOSToastText(title),
+                body: ( localize(8641, "Session finished.")),
+                actions: [( localize(8639, "Open Session"))],
+                dedupeKey: getChatNotificationDedupeKey(model.sessionResource, ChatNotificationKind.Idle)
+            }, cts.token);
+            if (result.clicked || typeof result.actionIndex === "number") {
+                await this._hostService.focus(targetWindow, {
+                    mode: FocusMode.Force
+                });
+                const openedWidget = await this._chatWidgetService.openSession(model.sessionResource);
+                openedWidget?.focusInput();
+            }
+        } finally {
+            this._clearNotification(model.sessionResource);
+        }
+    }
+    async _delayForBackgroundWindow(isWidgetVisible) {
+        if (isWidgetVisible && (await this._hostService.hadLastFocus())) {
+            return;
+        }
+        await timeout(this._getBackgroundNotificationDelay());
+    }
     _confirmAllow(sessionResource) {
         const model = this._chatService.getSession(sessionResource);
         const lastResponse = model?.lastRequest?.response;
@@ -121,7 +210,7 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
     }
     _getNotificationBody(sessionResource, info, isQuestionCarousel) {
         if (isQuestionCarousel) {
-            return localize(7403, "Questions need your input.");
+            return localize(8642, "Questions need your input.");
         }
         const terminalCommand = this._getPendingTerminalCommand(sessionResource);
         if (terminalCommand) {
@@ -130,7 +219,7 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
         if (info.detail) {
             return this._sanitizeOSToastText(info.detail);
         }
-        return localize(7404, "Approval needed to continue.");
+        return localize(8643, "Approval needed to continue.");
     }
     _getPendingTerminalCommand(sessionResource) {
         const model = this._chatService.getSession(sessionResource);

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

@@ -64,8 +64,8 @@ let AgentPluginRecommendations = class AgentPluginRecommendations extends Dispos
         if (uninstalledCount === 0) {
             return;
         }
-        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(7405, "This workspace recommends 1 agent plugin.")) : ( localize(7406, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
-            label: ( localize(7407, "Show Plugins")),
+        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(8644, "This workspace recommends 1 agent plugin.")) : ( localize(8645, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
+            label: ( localize(8646, "Show Plugins")),
             run: () => {
                 this._extensionsWorkbenchService.openSearch("@agentPlugins @recommended");
             }

package/vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.js

@@ -11,22 +11,22 @@ import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workb
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatContext",
     jsonSchema: {
-        description: ( localize(7408, "Contributes chat context integrations to the chat widget.")),
+        description: ( localize(8647, "Contributes chat context integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(7409, "A unique identifier for this item.")),
+                    description: ( localize(8648, "A unique identifier for this item.")),
                     type: "string"
                 },
                 icon: {
-                    description: ( localize(7410, "The icon associated with this chat context item.")),
+                    description: ( localize(8649, "The icon associated with this chat context item.")),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        7411,
+                        8650,
                         "A user-friendly name for this item which is used for display in menus."
                     )),
                     type: "string"
@@ -50,7 +50,7 @@ let ChatContextContribution = class ChatContextContribution extends Disposable {
         this._chatContextService = _chatContextService;
         extensionPoint.setHandler(extensions => {
             for (const ext of extensions) {
-                if (!isProposedApiEnabled(ext.description)) {
+                if (!isProposedApiEnabled(ext.description, "chatContextProvider")) {
                     continue;
                 }
                 if (!Array.isArray(ext.value)) {
@@ -60,7 +60,7 @@ let ChatContextContribution = class ChatContextContribution extends Disposable {
                     const icon = contribution.icon ? ThemeIcon.fromString(contribution.icon) : undefined;
                     if (!icon && contribution.icon) {
                         ext.collector.error(( localize(
-                            7412,
+                            8651,
                             "Invalid icon format for chat context contribution '{0}'. Icon must be in the format '{1}' or '{2}', e.g. '{3}'.",
                             contribution.id,
                             "$(iconId)",

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

@@ -6,6 +6,15 @@ import { IChatRequestWorkspaceVariableEntry, StringChatContextValue } from "@cod
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+/**
+ * A selector describing which tabs a resource context provider applies to. Either a
+ * {@link LanguageSelector} matched against a resource's URI, or a webview `viewType`.
+ */
+export type ChatTabSelector = {
+    uri: LanguageSelector;
+} | {
+    viewType: string;
+};
 export declare class ChatContextService extends Disposable {
     private readonly _contextPickService;
     private readonly _extensionService;
@@ -25,11 +34,11 @@ export declare class ChatContextService extends Disposable {
     private _registerWithPickService;
     registerChatWorkspaceContextProvider(id: string, provider: IChatWorkspaceContextProvider): void;
     registerChatExplicitContextProvider(id: string, provider: IChatExplicitContextProvider): void;
-    registerChatResourceContextProvider(id: string, selector: LanguageSelector, provider: IChatResourceContextProvider): void;
+    registerChatResourceContextProvider(id: string, selector: ChatTabSelector, provider: IChatResourceContextProvider): void;
     unregisterChatContextProvider(id: string): void;
     updateWorkspaceContextItems(id: string, items: IChatContextItem[]): void;
     getWorkspaceContextItems(): IChatRequestWorkspaceVariableEntry[];
-    contextForResource(uri: URI, language?: string): Promise<StringChatContextValue | undefined>;
+    contextForResource(uri: URI, language?: string, viewType?: string): Promise<StringChatContextValue | undefined>;
     private _contextForResource;
     resolveChatContext(context: StringChatContextValue, language?: string): Promise<StringChatContextValue>;
     private _asPicker;

package/vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.js

@@ -7,9 +7,13 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
+function isViewTypeTabSelector(selector) {
+    return selector.viewType !== undefined;
+}
 let ChatContextService = class ChatContextService extends Disposable {
     constructor(_contextPickService, _extensionService) {
         super();
@@ -91,23 +95,17 @@ let ChatContextService = class ChatContextService extends Disposable {
         }
         return items;
     }
-    async contextForResource(uri, language) {
-        return this._contextForResource(uri, false, language);
+    async contextForResource(uri, language, viewType) {
+        return this._contextForResource(uri, false, language, viewType);
     }
-    async _contextForResource(uri, withValue, language) {
+    async _contextForResource(uri, withValue, language, viewType) {
         const scoredProviders = [];
         for (const providerEntry of ( this._providers.values())) {
             if (!providerEntry.resourceProvider) {
                 continue;
             }
-            const matchScore = score(
-                providerEntry.resourceProvider.selector,
-                uri,
-                language ?? "",
-                true,
-                undefined,
-                undefined
-            );
+            const selector = providerEntry.resourceProvider.selector;
+            const matchScore = isViewTypeTabSelector(selector) ? (viewType !== undefined && selector.viewType === viewType ? 10 : 0) : score(selector.uri, uri, language ?? "", true, undefined, undefined);
             scoredProviders.push({
                 score: matchScore,
                 provider: providerEntry.resourceProvider.provider
@@ -118,7 +116,7 @@ let ChatContextService = class ChatContextService extends Disposable {
             return;
         }
         const provider = scoredProviders[0].provider;
-        const context = (await provider.provideChatContext(uri, withValue, CancellationToken.None));
+        const context = (await provider.provideChatContext(uri, withValue, viewType, CancellationToken.None));
         if (!context) {
             return;
         }
@@ -127,7 +125,7 @@ let ChatContextService = class ChatContextService extends Disposable {
         const contextValue = {
             value: undefined,
             name: derivedLabel,
-            icon: context.icon,
+            iconPath: context.iconPath,
             uri: uri,
             resourceUri: context.resourceUri,
             modelDescription: context.modelDescription,
@@ -185,9 +183,18 @@ let ChatContextService = class ChatContextService extends Disposable {
                 picks: picks().then(items => {
                     return ( items.map(item => {
                         const derivedLabel = item.label ?? (item.resourceUri ? basename(item.resourceUri) : "Unknown");
+                        const iconPath = item.iconPath;
+                        const isThemeIcon = ThemeIcon.isThemeIcon(iconPath);
                         return {
                             label: derivedLabel,
-                            iconClass: item.icon ? ThemeIcon.asClassName(item.icon) : undefined,
+                            iconClass: isThemeIcon ? ThemeIcon.asClassName(iconPath) : undefined,
+                            iconPath: (!isThemeIcon && iconPath) ? (URI.isUri(iconPath) ? {
+                                dark: iconPath,
+                                light: iconPath
+                            } : {
+                                dark: iconPath.dark,
+                                light: iconPath.light
+                            }) : undefined,
                             asAttachment: async () => {
                                 let contextValue = item;
                                 if ((contextValue.value === undefined) && providerEntry?.explicitProvider) {
@@ -198,8 +205,9 @@ let ChatContextService = class ChatContextService extends Disposable {
                                     kind: "generic",
                                     id: resolvedLabel,
                                     name: resolvedLabel,
-                                    icon: contextValue.icon,
-                                    value: contextValue.value
+                                    iconPath: contextValue.iconPath ?? item.iconPath,
+                                    value: contextValue.value,
+                                    tooltip: contextValue.tooltip ?? item.tooltip
                                 };
                             }
                         };

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

@@ -12,8 +12,8 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 function createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription) {
     return {
         modelIds: [""],
-        modelLabels: [defaultEntryLabel ?? ( localize(7413, "Auto (Vendor Default)"))],
-        modelDescriptions: [defaultEntryDescription ?? ( localize(7414, "Use the vendor's default model"))]
+        modelLabels: [defaultEntryLabel ?? ( localize(8652, "Auto (Vendor Default)"))],
+        modelDescriptions: [defaultEntryDescription ?? ( localize(8653, "Use the vendor's default model"))]
     };
 }
 let DefaultModelContribution = class DefaultModelContribution extends Disposable {
@@ -48,8 +48,8 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
             modelLabels.length = 0;
             modelDescriptions.length = 0;
             modelIds.push("");
-            modelLabels.push(defaultEntryLabel ?? ( localize(7413, "Auto (Vendor Default)")));
-            modelDescriptions.push(defaultEntryDescription ?? ( localize(7414, "Use the vendor's default model")));
+            modelLabels.push(defaultEntryLabel ?? ( localize(8652, "Auto (Vendor Default)")));
+            modelDescriptions.push(defaultEntryDescription ?? ( localize(8653, "Use the vendor's default model")));
             const models = [];
             const allModelIds = this._languageModelsService.getLanguageModelIds();
             for (const modelId of allModelIds) {
@@ -119,7 +119,7 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
                     }
                     modelIds.push(storedId);
                     modelLabels.push(( localize(
-                        7415,
+                        8654,
                         "{0} ({1})",
                         model.metadata.name,
                         vendorDisplayName ?? model.metadata.vendor

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

@@ -46,8 +46,8 @@ let EnablementStatusWidget = class EnablementStatusWidget extends Disposable {
 };
 EnablementStatusWidget = ( __decorate([( __param(3, IMarkdownRendererService))], EnablementStatusWidget));
 const pluginEnablementLabels = {
-    disabledProfile: ( localize(7420, "This plugin is disabled.")),
-    disabledWorkspace: ( localize(7421, "This plugin is disabled for this workspace."))
+    disabledProfile: ( localize(8660, "This plugin is disabled.")),
+    disabledWorkspace: ( localize(8661, "This plugin is disabled for this workspace."))
 };
 
 export { EnablementStatusWidget, pluginEnablementLabels };

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

@@ -0,0 +1,44 @@
+import { IChatInputNotification } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService";
+/** Payload versions this build understands. Bump when making a breaking shape change. */
+export declare const CHAT_EXP_NOTIFICATION_VERSION = 1;
+/**
+ * Which chats a notification attaches to. An omitted or empty selector list means any.
+ *
+ * Both lists are matched against a set of candidates rather than one string, so a selector can
+ * name a session type or the harness behind it, and a model by id, family, name or vendor.
+ */
+export interface IChatExpNotificationMatch {
+    readonly sessionTypes: readonly string[];
+    readonly selectedModels: readonly string[];
+    /** Models that suppress the notification, so a nudge can skip users already on its target. */
+    readonly excludeSelectedModels: readonly string[];
+}
+/** A parsed notification, ready to hand to the notification service once `when` is bound. */
+export type ChatExpNotification = Omit<IChatInputNotification, "when"> & {
+    readonly match: IChatExpNotificationMatch;
+    /** The entry's source text, used to tell a changed notification from an unchanged one. */
+    readonly signature: string;
+};
+export type ChatExpNotificationParseResult = {
+    readonly notifications: readonly ChatExpNotification[];
+    readonly error?: undefined;
+} | {
+    readonly notifications?: undefined;
+    readonly error: string;
+};
+/** Describes the chat a notification is matched against. The caller resolves the harness. */
+export interface IChatExpNotificationMatchContext {
+    readonly sessionType: string | undefined;
+    /** Agent host provider id, or `undefined` for sessions with no agent host. */
+    readonly harness: string | undefined;
+    readonly selectedModelId: string | undefined;
+    /** Other identifiers for the selected model, such as its id, family, name and vendor. */
+    readonly selectedModelAliases: readonly string[] | undefined;
+}
+/**
+ * Parses and validates a notification payload. Never throws, and rejects a bad payload whole
+ * rather than in part, so a malformed entry cannot quietly change who sees what.
+ */
+export declare function parseChatExpNotifications(raw: string | undefined): ChatExpNotificationParseResult;
+/** Whether the chat described by `context` should be shown a notification matching `match`. */
+export declare function matchesChatExpNotification(match: IChatExpNotificationMatch, context: IChatExpNotificationMatchContext): boolean;