@codingame/monaco-vscode-chat-service-override 14.0.6 → 15.0.0

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

@@ -0,0 +1,39 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IStatusbarService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
+import { IChatQuotasService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatQuotasService.service";
+import { IChatEntitlementsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementsService.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+export declare class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
+    private readonly statusbarService;
+    private readonly chatQuotasService;
+    private readonly chatEntitlementsService;
+    private readonly contextKeyService;
+    private readonly keybindingService;
+    private readonly configurationService;
+    private readonly commandService;
+    private readonly hoverService;
+    private readonly editorService;
+    private readonly productService;
+    private readonly languageService;
+    static readonly ID = "chat.statusBarEntry";
+    private entry;
+    private readonly entryDisposables;
+    private dateFormatter;
+    constructor(statusbarService: IStatusbarService, chatQuotasService: IChatQuotasService, chatEntitlementsService: IChatEntitlementsService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, configurationService: IConfigurationService, commandService: ICommandService, hoverService: IHoverService, editorService: IEditorService, productService: IProductService, languageService: ILanguageService);
+    private create;
+    private registerListeners;
+    private getEntryProps;
+    private createQuotaIndicator;
+    private createShortcuts;
+    private createSettings;
+    private createCodeCompletionsSetting;
+    dispose(): void;
+}

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

@@ -0,0 +1,386 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import './media/chatStatus.css.js';
+import { safeIntl } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
+import { Disposable, MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { language, OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { StatusbarAlignment, ShowTooltipCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatQuotasService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatQuotasService.service';
+import { TOGGLE_CHAT_ACTION_ID, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, quotaToButtonMessage, CHAT_SETUP_ACTION_LABEL, CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { $, EventHelper, append, EventType, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { IChatEntitlementsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementsService.service';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { KeybindingLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
+import { defaultKeybindingLabelStyles, defaultCheckboxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
+import { Checkbox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/toggle/toggle';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { registerColor, transparent } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import { contrastBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import { inputValidationInfoBorder, inputValidationWarningBorder, inputValidationErrorBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { CTX_INLINE_CHAT_POSSIBLE } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
+import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
+import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
+import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { Gesture, EventType as EventType$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/touch';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+
+var ChatStatusBarEntry_1;
+const gaugeBackground = registerColor('gauge.background', {
+    dark: inputValidationInfoBorder,
+    light: inputValidationInfoBorder,
+    hcDark: contrastBorder,
+    hcLight: contrastBorder
+}, ( localize(4715, "Gauge background color.")));
+registerColor('gauge.foreground', {
+    dark: ( transparent(gaugeBackground, 0.3)),
+    light: ( transparent(gaugeBackground, 0.3)),
+    hcDark: Color.white,
+    hcLight: Color.white
+}, ( localize(4716, "Gauge foreground color.")));
+registerColor('gauge.border', {
+    dark: null,
+    light: null,
+    hcDark: contrastBorder,
+    hcLight: contrastBorder
+}, ( localize(4717, "Gauge border color.")));
+const gaugeWarningBackground = registerColor('gauge.warningBackground', {
+    dark: inputValidationWarningBorder,
+    light: inputValidationWarningBorder,
+    hcDark: contrastBorder,
+    hcLight: contrastBorder
+}, ( localize(4718, "Gauge warning background color.")));
+registerColor('gauge.warningForeground', {
+    dark: ( transparent(gaugeWarningBackground, 0.3)),
+    light: ( transparent(gaugeWarningBackground, 0.3)),
+    hcDark: Color.white,
+    hcLight: Color.white
+}, ( localize(4719, "Gauge warning foreground color.")));
+const gaugeErrorBackground = registerColor('gauge.errorBackground', {
+    dark: inputValidationErrorBorder,
+    light: inputValidationErrorBorder,
+    hcDark: contrastBorder,
+    hcLight: contrastBorder
+}, ( localize(4720, "Gauge error background color.")));
+registerColor('gauge.errorForeground', {
+    dark: ( transparent(gaugeErrorBackground, 0.3)),
+    light: ( transparent(gaugeErrorBackground, 0.3)),
+    hcDark: Color.white,
+    hcLight: Color.white
+}, ( localize(4721, "Gauge error foreground color.")));
+let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
+    static { ChatStatusBarEntry_1 = this; }
+    static { this.ID = 'chat.statusBarEntry'; }
+    constructor(statusbarService, chatQuotasService, chatEntitlementsService, contextKeyService, keybindingService, configurationService, commandService, hoverService, editorService, productService, languageService) {
+        super();
+        this.statusbarService = statusbarService;
+        this.chatQuotasService = chatQuotasService;
+        this.chatEntitlementsService = chatEntitlementsService;
+        this.contextKeyService = contextKeyService;
+        this.keybindingService = keybindingService;
+        this.configurationService = configurationService;
+        this.commandService = commandService;
+        this.hoverService = hoverService;
+        this.editorService = editorService;
+        this.productService = productService;
+        this.languageService = languageService;
+        this.entry = undefined;
+        this.entryDisposables = this._register(( new MutableDisposable()));
+        this.dateFormatter = ( new Lazy(
+            () => safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' })
+        ));
+        this.create();
+        this.registerListeners();
+    }
+    async create() {
+        if (this.configurationService.getValue('chat.experimental.statusIndicator.enabled') === true) {
+            this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry_1.ID, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
+            this.statusbarService.updateEntryVisibility(`${this.productService.defaultChatAgent?.extensionId}.status`, false);
+        }
+        else {
+            this.entry?.dispose();
+            this.entry = undefined;
+        }
+    }
+    registerListeners() {
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('chat.experimental.statusIndicator.enabled')) {
+                this.create();
+            }
+        }));
+        const contextKeysSet = ( new Set([
+            ChatContextKeys.Setup.limited.key,
+            ChatContextKeys.Setup.installed.key,
+            ChatContextKeys.Setup.canSignUp.key,
+            ChatContextKeys.Setup.signedOut.key
+        ]));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (!this.entry) {
+                return;
+            }
+            if (e.affectsSome(contextKeysSet)) {
+                this.entry.update(this.getEntryProps());
+            }
+        }));
+        this._register(this.chatQuotasService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
+    }
+    getEntryProps() {
+        const disposables = ( new DisposableStore());
+        this.entryDisposables.value = disposables;
+        let text = '$(copilot)';
+        let ariaLabel = ( localize(4722, "Copilot Status"));
+        let command = TOGGLE_CHAT_ACTION_ID;
+        let tooltip;
+        let kind;
+        const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
+        if (chatQuotaExceeded || completionsQuotaExceeded) {
+            let quotaWarning;
+            if (chatQuotaExceeded && !completionsQuotaExceeded) {
+                quotaWarning = ( localize(4723, "Chat limit reached"));
+            }
+            else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+                quotaWarning = ( localize(4724, "Completions limit reached"));
+            }
+            else {
+                quotaWarning = ( localize(4725, "Limit reached"));
+            }
+            text = `$(copilot-warning) ${quotaWarning}`;
+            ariaLabel = quotaWarning;
+            command = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+            tooltip = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
+            kind = 'prominent';
+        }
+        else if (this.contextKeyService.getContextKeyValue(ChatContextKeys.Setup.installed.key) === false ||
+            this.contextKeyService.getContextKeyValue(ChatContextKeys.Setup.canSignUp.key) === true) {
+            tooltip = CHAT_SETUP_ACTION_LABEL.value;
+        }
+        else if (this.contextKeyService.getContextKeyValue(ChatContextKeys.Setup.signedOut.key) === true) {
+            text = '$(copilot-not-connected)';
+            ariaLabel = ( localize(4726, "Sign in to Use Copilot..."));
+            tooltip = ( localize(4726, "Sign in to Use Copilot..."));
+        }
+        else if (this.contextKeyService.getContextKeyValue(ChatContextKeys.Setup.limited.key) === true) {
+            tooltip = () => {
+                const container = $('div.chat-status-bar-entry-tooltip');
+                {
+                    const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
+                    container.appendChild($('div.header', undefined, ( localize(4727, "Copilot Free Usage"))));
+                    const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, ( localize(4728, "Chat messages")));
+                    const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, ( localize(4729, "Code completions")));
+                    container.appendChild($('div.description', undefined, ( localize(
+                        4730,
+                        "Limits will reset on {0}.",
+                        this.dateFormatter.value.format(quotaResetDate)
+                    ))));
+                    const cts = ( new CancellationTokenSource());
+                    disposables.add(toDisposable(() => cts.dispose(true)));
+                    this.chatEntitlementsService.resolve(cts.token).then(() => {
+                        if (cts.token.isCancellationRequested) {
+                            return;
+                        }
+                        const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
+                        chatQuotaIndicator(chatTotal, chatRemaining);
+                        completionsQuotaIndicator(completionsTotal, completionsRemaining);
+                    });
+                }
+                {
+                    container.appendChild($('hr'));
+                    container.appendChild($('div.header', undefined, ( localize(4731, "Settings"))));
+                    this.createSettings(container, disposables);
+                }
+                {
+                    container.appendChild($('hr'));
+                    container.appendChild($('div.header', undefined, ( localize(4732, "Keybindings"))));
+                    this.createShortcuts(container, disposables);
+                }
+                return container;
+            };
+            command = ShowTooltipCommand;
+        }
+        else {
+            tooltip = () => {
+                const container = $('div.chat-status-bar-entry-tooltip');
+                {
+                    container.appendChild($('div.header', undefined, ( localize(4731, "Settings"))));
+                    this.createSettings(container, disposables);
+                }
+                {
+                    container.appendChild($('hr'));
+                    container.appendChild($('div.header', undefined, ( localize(4732, "Keybindings"))));
+                    this.createShortcuts(container, disposables);
+                }
+                return container;
+            };
+            command = ShowTooltipCommand;
+        }
+        return {
+            name: ( localize(4722, "Copilot Status")),
+            text,
+            ariaLabel,
+            command,
+            showInAllWindows: true,
+            kind,
+            tooltip
+        };
+    }
+    createQuotaIndicator(container, total, remaining, label) {
+        const quotaText = $('span');
+        const quotaBit = $('div.quota-bit');
+        const quotaIndicator = container.appendChild($('div.quota-indicator', undefined, $('div.quota-label', undefined, $('span', undefined, label), quotaText), $('div.quota-bar', undefined, quotaBit)));
+        const update = (total, remaining) => {
+            quotaIndicator.classList.remove('error');
+            quotaIndicator.classList.remove('warning');
+            if (typeof total === 'number' && typeof remaining === 'number') {
+                let usedPercentage = Math.round(((total - remaining) / total) * 100);
+                if (total !== remaining && usedPercentage === 0) {
+                    usedPercentage = 1;
+                }
+                quotaText.textContent = ( localize(4733, "{0}%", usedPercentage));
+                quotaBit.style.width = `${usedPercentage}%`;
+                if (usedPercentage >= 90) {
+                    quotaIndicator.classList.add('error');
+                }
+                else if (usedPercentage >= 75) {
+                    quotaIndicator.classList.add('warning');
+                }
+            }
+        };
+        update(total, remaining);
+        return update;
+    }
+    createShortcuts(container, disposables) {
+        const shortcuts = container.appendChild($('div.shortcuts'));
+        const entries = coalesce([
+            { text: ( localize(4734, "Chat")), id: CHAT_OPEN_ACTION_ID },
+            { text: ( localize(4735, "Copilot Edits")), id: 'workbench.action.chat.openEditSession' },
+            this.contextKeyService.contextMatchesRules(( ContextKeyExpr.and(CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())))) ? { text: ( localize(4736, "Inline Chat")), id: 'inlineChat.start' } : undefined,
+            { text: ( localize(4737, "Quick Chat")), id: 'workbench.action.quickchat.toggle' },
+        ]);
+        const onTrigger = (commandId, e) => {
+            EventHelper.stop(e, true);
+            this.hoverService.hideHover(true);
+            this.commandService.executeCommand(commandId);
+        };
+        for (const entry of entries) {
+            const keys = this.keybindingService.lookupKeybinding(entry.id);
+            if (!keys) {
+                continue;
+            }
+            const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text }));
+            append(shortcut, $('span.shortcut-label', undefined, entry.text));
+            const shortcutKey = disposables.add(( new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles })));
+            shortcutKey.set(keys);
+            disposables.add(Gesture.addTarget(shortcut));
+            [EventType.CLICK, EventType$1.Tap].forEach(eventType => {
+                disposables.add(addDisposableListener(shortcut, eventType, e => onTrigger(entry.id, e)));
+            });
+            disposables.add(addDisposableListener(shortcut, EventType.KEY_DOWN, e => {
+                const event = ( new StandardKeyboardEvent(e));
+                if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
+                    onTrigger(entry.id, e);
+                }
+            }));
+        }
+        return shortcuts;
+    }
+    createSettings(container, disposables) {
+        const language = this.editorService.activeTextEditorLanguageId;
+        const settings = container.appendChild($('div.settings'));
+        {
+            const globalSetting = append(settings, $('div.setting'));
+            this.createCodeCompletionsSetting(globalSetting, ( localize(4738, "Code completions (all files)")), '*', disposables);
+            if (language) {
+                const languageSetting = append(settings, $('div.setting'));
+                this.createCodeCompletionsSetting(languageSetting, ( localize(
+                    4739,
+                    "Code completions ({0})",
+                    this.languageService.getLanguageName(language) ?? language
+                )), language, disposables);
+            }
+        }
+        return settings;
+    }
+    createCodeCompletionsSetting(container, label, language, disposables) {
+        const settingId = 'github.copilot.enable';
+        const readSetting = () => {
+            const result = this.configurationService.getValue(settingId);
+            if (!isObject(result)) {
+                return false;
+            }
+            if (typeof result[language] !== 'undefined') {
+                return Boolean(result[language]);
+            }
+            return Boolean(result['*']);
+        };
+        const writeSetting = (checkbox) => {
+            let result = this.configurationService.getValue(settingId);
+            if (!isObject(result)) {
+                result = Object.create(null);
+            }
+            return this.configurationService.updateValue(settingId, { ...result, [language]: checkbox.checked });
+        };
+        const settingCheckbox = disposables.add(( new Checkbox(label, readSetting(), defaultCheckboxStyles)));
+        container.appendChild(settingCheckbox.domNode);
+        const settingLabel = append(container, $('span.setting-label', undefined, label));
+        disposables.add(Gesture.addTarget(settingLabel));
+        [EventType.CLICK, EventType$1.Tap].forEach(eventType => {
+            disposables.add(addDisposableListener(settingLabel, eventType, e => {
+                if (settingCheckbox?.enabled) {
+                    EventHelper.stop(e, true);
+                    settingCheckbox.checked = !settingCheckbox.checked;
+                    writeSetting(settingCheckbox);
+                    settingCheckbox.focus();
+                }
+            }));
+        });
+        disposables.add(settingCheckbox.onChange(() => {
+            writeSetting(settingCheckbox);
+        }));
+        disposables.add(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(settingId)) {
+                settingCheckbox.checked = readSetting();
+            }
+        }));
+    }
+    dispose() {
+        super.dispose();
+        this.entry?.dispose();
+        this.entry = undefined;
+    }
+};
+ChatStatusBarEntry = ChatStatusBarEntry_1 = ( __decorate([
+    ( __param(0, IStatusbarService)),
+    ( __param(1, IChatQuotasService)),
+    ( __param(2, IChatEntitlementsService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IKeybindingService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, ICommandService)),
+    ( __param(7, IHoverService)),
+    ( __param(8, IEditorService)),
+    ( __param(9, IProductService)),
+    ( __param(10, ILanguageService))
+], ChatStatusBarEntry));
+
+export { ChatStatusBarEntry };

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

@@ -1,26 +1,18 @@
-import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IDynamicVariable } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables";
+import { IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { IDynamicVariable } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables";
 import { IChatVariablesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatVariablesService implements IChatVariablesService {
     private readonly chatWidgetService;
     private readonly viewsService;
     _serviceBrand: undefined;
-    private _resolver;
     constructor(chatWidgetService: IChatWidgetService, viewsService: IViewsService);
-    resolveVariables(prompt: IParsedChatRequest, attachedContextVariables: IChatRequestVariableEntry[] | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableData>;
-    resolveVariable(variableName: string, promptText: string, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined>;
-    hasVariable(name: string): boolean;
-    getVariable(name: string): IChatVariableData | undefined;
-    getVariables(location: ChatAgentLocation): Iterable<Readonly<IChatVariableData>>;
+    resolveVariables(prompt: IParsedChatRequest, attachedContextVariables: IChatRequestVariableEntry[] | undefined): IChatRequestVariableData;
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
-    registerVariable(data: IChatVariableData, resolver: IChatVariableResolver): IDisposable;
     attachContext(name: string, value: string | URI | Location, location: ChatAgentLocation): Promise<void>;
 }

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

@@ -1,15 +1,11 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { onUnexpectedExternalError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { showEditsView, showChatView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { showEditsView, showChatView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
@@ -17,88 +13,24 @@ let ChatVariablesService = class ChatVariablesService {
     constructor(chatWidgetService, viewsService) {
         this.chatWidgetService = chatWidgetService;
         this.viewsService = viewsService;
-        this._resolver = ( new Map());
     }
-    async resolveVariables(prompt, attachedContextVariables, model, progress, token) {
+    resolveVariables(prompt, attachedContextVariables) {
         let resolvedVariables = [];
-        const jobs = [];
         prompt.parts
             .forEach((part, i) => {
-            if (part instanceof ChatRequestVariablePart) {
-                const data = this._resolver.get(part.variableName.toLowerCase());
-                if (data) {
-                    const references = [];
-                    const variableProgressCallback = (item) => {
-                        if (item.kind === 'reference') {
-                            references.push(item);
-                            return;
-                        }
-                        progress(item);
-                    };
-                    jobs.push(data.resolver(prompt.text, part.variableArg, model, variableProgressCallback, token).then(value => {
-                        if (value) {
-                            resolvedVariables[i] = { id: data.data.id, modelDescription: data.data.modelDescription, name: part.variableName, range: part.range, value, references, fullName: data.data.fullName, icon: data.data.icon };
-                        }
-                    }).catch(onUnexpectedExternalError));
-                }
-            }
-            else if (part instanceof ChatRequestDynamicVariablePart) {
-                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon, isFile: part.isFile };
-            }
-            else if (part instanceof ChatRequestToolPart) {
-                resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(part.icon) ? part.icon : undefined, fullName: part.displayName };
-            }
-        });
-        const resolvedAttachedContext = [];
-        attachedContextVariables
-            ?.forEach((attachment, i) => {
-            const data = this._resolver.get(attachment.name?.toLowerCase());
-            if (data) {
-                const references = [];
-                const variableProgressCallback = (item) => {
-                    if (item.kind === 'reference') {
-                        references.push(item);
-                        return;
-                    }
-                    progress(item);
-                };
-                jobs.push(data.resolver(prompt.text, '', model, variableProgressCallback, token).then(value => {
-                    if (value) {
-                        resolvedAttachedContext[i] = { id: data.data.id, modelDescription: data.data.modelDescription, name: attachment.name, fullName: attachment.fullName, range: attachment.range, value, references, icon: attachment.icon };
-                    }
-                }).catch(onUnexpectedExternalError));
-            }
-            else if (attachment.isDynamic || attachment.isTool) {
-                resolvedAttachedContext[i] = attachment;
+            if (part instanceof ChatRequestDynamicVariablePart || part instanceof ChatRequestToolPart) {
+                resolvedVariables[i] = part.toVariableEntry();
             }
         });
-        await Promise.allSettled(jobs);
         resolvedVariables = coalesce(resolvedVariables);
         resolvedVariables.sort((a, b) => b.range.start - a.range.start);
-        resolvedVariables.push(...coalesce(resolvedAttachedContext));
+        if (attachedContextVariables) {
+            resolvedVariables.push(...attachedContextVariables);
+        }
         return {
             variables: resolvedVariables,
         };
     }
-    async resolveVariable(variableName, promptText, model, progress, token) {
-        const data = this._resolver.get(variableName.toLowerCase());
-        if (!data) {
-            return undefined;
-        }
-        return (await data.resolver(promptText, undefined, model, progress, token));
-    }
-    hasVariable(name) {
-        return ( this._resolver.has(name.toLowerCase()));
-    }
-    getVariable(name) {
-        return this._resolver.get(name.toLowerCase())?.data;
-    }
-    getVariables(location) {
-        const all = ( Iterable.map(( this._resolver.values()), data => data.data));
-        return Iterable.filter(all, data => {
-            return location !== ChatAgentLocation.Editor || !( ( new Set(['selection', 'editor'])).has(data.name));
-        });
-    }
     getDynamicVariables(sessionId) {
         const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
         if (!widget || !widget.viewModel || !widget.supportsFileReferences) {
@@ -110,16 +42,6 @@ let ChatVariablesService = class ChatVariablesService {
         }
         return model.variables;
     }
-    registerVariable(data, resolver) {
-        const key = data.name.toLowerCase();
-        if (( this._resolver.has(key))) {
-            throw ( new Error(`A chat variable with the name '${data.name}' already exists.`));
-        }
-        this._resolver.set(key, { data, resolver });
-        return toDisposable(() => {
-            this._resolver.delete(key);
-        });
-    }
     async attachContext(name, value, location) {
         if (location !== ChatAgentLocation.Panel && location !== ChatAgentLocation.EditingSession) {
             return;
@@ -137,11 +59,6 @@ let ChatVariablesService = class ChatVariablesService {
             widget.attachmentModel.addFile(uri, range);
             return;
         }
-        const resolved = this._resolver.get(key);
-        if (!resolved) {
-            return;
-        }
-        widget.attachmentModel.addContext({ ...resolved.data, value });
     }
 };
 ChatVariablesService = ( __decorate([

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

@@ -1,5 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService {
     _serviceBrand: undefined;