@codingame/monaco-vscode-chat-service-override 32.0.2 → 33.0.5

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolResultCompressorService.js

@@ -1,11 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { getErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { MIN_COMPRESSIBLE_LENGTH, isProtectedFromCompression } from '../../common/tools/toolResultCompressor.js';
 
 let ToolResultCompressorService = class ToolResultCompressorService extends Disposable {
     constructor(_configurationService, _telemetryService, _logService) {
@@ -14,6 +15,7 @@ let ToolResultCompressorService = class ToolResultCompressorService extends Disp
         this._telemetryService = _telemetryService;
         this._logService = _logService;
         this._filters = ( new Map());
+        this._caches = ( new Map());
     }
     registerFilter(filter) {
         for (const id of filter.toolIds) {
@@ -25,29 +27,126 @@ let ToolResultCompressorService = class ToolResultCompressorService extends Disp
             bucket.push(filter);
         }
     }
+    registerCache(cache) {
+        for (const id of cache.toolIds) {
+            let bucket = this._caches.get(id);
+            if (!bucket) {
+                bucket = [];
+                this._caches.set(id, bucket);
+            }
+            bucket.push(cache);
+        }
+    }
     maybeCompress(toolId, input, result) {
         if (!this._configurationService.getValue(ChatConfiguration.CompressOutputEnabled)) {
             return undefined;
         }
-        const filters = this._filters.get(toolId);
-        if (!filters || filters.length === 0) {
-            return undefined;
+        const caches = this._caches.get(toolId);
+        if (caches && caches.length > 0) {
+            for (const c of caches) {
+                try {
+                    c.observe(toolId, input);
+                } catch (err) {
+                    this._logService.warn(
+                        `[ToolResultCompressor] cache ${c.id} threw in observe on tool ${toolId}: ${getErrorMessage(err)}`,
+                        err
+                    );
+                }
+            }
+            for (const c of caches) {
+                let hit;
+                try {
+                    hit = c.lookup(toolId, input);
+                } catch (err) {
+                    this._logService.warn(
+                        `[ToolResultCompressor] cache ${c.id} threw in lookup on tool ${toolId}: ${getErrorMessage(err)}`,
+                        err
+                    );
+                    continue;
+                }
+                if (hit) {
+                    const totalBefore = result.content.reduce((acc, p) => acc + (p.kind === "text" ? p.value.length : 0), 0);
+                    if (totalBefore < MIN_COMPRESSIBLE_LENGTH) {
+                        continue;
+                    }
+                    const hasProtectedContent = ( result.content.some(p => p.kind === "text" && isProtectedFromCompression(p.value)));
+                    if (hasProtectedContent) {
+                        continue;
+                    }
+                    const cachedResult = this._buildCacheHitResult(result, hit);
+                    const totalAfter = cachedResult.content.reduce((acc, p) => acc + (p.kind === "text" ? p.value.length : 0), 0);
+                    if (totalAfter >= totalBefore) {
+                        continue;
+                    }
+                    this._sendTelemetry(toolId, [`cache:${c.id}`], totalBefore, totalAfter, true);
+                    return cachedResult;
+                }
+            }
         }
-        const matchingFilters = filters.filter(f => f.matches(toolId, input));
+        const filters = this._filters.get(toolId);
+        const matchingFilters = filters?.filter(f => {
+            try {
+                return f.matches(toolId, input);
+            } catch (err) {
+                this._logService.warn(
+                    `[ToolResultCompressor] filter ${f.id} threw in matches on tool ${toolId}: ${getErrorMessage(err)}`,
+                    err
+                );
+                return false;
+            }
+        }) ?? [];
         if (matchingFilters.length === 0) {
+            this._recordInCaches(toolId, input, result, caches);
             return undefined;
         }
         matchingFilters.slice();
         {
+            this._recordInCaches(toolId, input, result, caches);
             return undefined;
         }
     }
-    _sendTelemetry(toolId, filterIds, beforeChars, afterChars) {
+    _buildCacheHitResult(original, hit) {
+        const iso = ( new Date(hit.timestamp)).toISOString();
+        const text = `Same output as last run (${iso}). To disable, set ${ChatConfiguration.CompressOutputEnabled} to false.`;
+        const firstText = original.content.find(p => p.kind === "text");
+        const replacement = {
+            kind: "text",
+            value: text,
+            audience: firstText?.audience,
+            title: firstText?.title
+        };
+        const nonText = original.content.filter(p => p.kind !== "text");
+        return {
+            ...original,
+            content: [replacement, ...nonText]
+        };
+    }
+    _recordInCaches(toolId, input, result, caches) {
+        if (!caches || caches.length === 0) {
+            return;
+        }
+        const text = ( result.content.filter(p => p.kind === "text").map(p => p.value)).join("\n");
+        if (!text) {
+            return;
+        }
+        for (const c of caches) {
+            try {
+                c.record(toolId, input, text);
+            } catch (err) {
+                this._logService.warn(
+                    `[ToolResultCompressor] cache ${c.id} threw in record on tool ${toolId}: ${getErrorMessage(err)}`,
+                    err
+                );
+            }
+        }
+    }
+    _sendTelemetry(toolId, filterIds, beforeChars, afterChars, cacheHit) {
         this._telemetryService.publicLog2("toolResultCompressed", {
             toolId,
             filters: filterIds.join(","),
             beforeChars,
-            afterChars
+            afterChars,
+            cacheHit
         });
     }
 };

package/vscode/src/vs/workbench/contrib/chat/browser/tools/usagesTool.js

@@ -14,7 +14,6 @@ import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { getDefinitionsAtPosition, getReferencesAtPosition, getImplementationsAtPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/gotoSymbol/browser/goToSymbol';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { QueryType, resultIsMatch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
@@ -55,7 +54,7 @@ let UsagesTool = class UsagesTool extends Disposable {
         this._workspaceContextService = _workspaceContextService;
     }
     getToolData() {
-        return this._buildToolData(StaticModelDescription, ( localize(7037, "Find references, definitions, and implementations of a symbol")));
+        return this._buildToolData(StaticModelDescription, ( localize(7107, "Find references, definitions, and implementations of a symbol")));
     }
     _buildToolData(modelDescription, userDescription) {
         return {
@@ -63,11 +62,10 @@ let UsagesTool = class UsagesTool extends Disposable {
             toolReferenceName: "usages",
             canBeReferencedInPrompt: false,
             icon: ThemeIcon.fromId(Codicon.references.id),
-            displayName: ( localize(7038, "List Code Usages")),
+            displayName: ( localize(7108, "List Code Usages")),
             userDescription,
             modelDescription,
             source: ToolDataSource.Internal,
-            when: ( ContextKeyExpr.has("config.chat.tools.usagesTool.enabled")),
             inputSchema: {
                 type: "object",
                 properties: {
@@ -95,7 +93,7 @@ let UsagesTool = class UsagesTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const input = context.parameters;
         return {
-            invocationMessage: ( localize(7039, "Analyzing usages of `{0}`", input.symbol))
+            invocationMessage: ( localize(7109, "Analyzing usages of `{0}`", input.symbol))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -148,7 +146,7 @@ let UsagesTool = class UsagesTool extends Disposable {
             )]);
             if (references.length === 0) {
                 const result = createToolSimpleTextResult(`No usages found for \`${input.symbol}\`.`);
-                result.toolResultMessage = ( new MarkdownString(( localize(7040, "Analyzed usages of `{0}`, no results", input.symbol))));
+                result.toolResultMessage = ( new MarkdownString(( localize(7110, "Analyzed usages of `{0}`, no results", input.symbol))));
                 return result;
             }
             const previews = await this._getLinePreviews(input.symbol, references, token);
@@ -169,8 +167,8 @@ let UsagesTool = class UsagesTool extends Disposable {
             }
             const text = lines.join("\n");
             const result = createToolSimpleTextResult(text);
-            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(7041, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
-                7042,
+            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(7111, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
+                7112,
                 "Analyzed usages of `{0}`, {1} results",
                 input.symbol,
                 references.length

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

@@ -0,0 +1,28 @@
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
+import { DefaultModelContribution } from "./defaultModelContribution.js";
+/**
+ * Populates the dynamic enum of language models for the `chat.utilityModel`
+ * setting. Selecting a model here overrides the internal `copilot-utility`
+ * family used for general background/fallback flows (titles, summaries, etc.).
+ */
+export declare class UtilityModelContribution extends DefaultModelContribution {
+    static readonly ID = "workbench.contrib.utilityModel";
+    static readonly modelIds: string[];
+    static readonly modelLabels: string[];
+    static readonly modelDescriptions: string[];
+    constructor(languageModelsService: ILanguageModelsService, logService: ILogService);
+}
+/**
+ * Populates the dynamic enum of language models for the
+ * `chat.utilitySmallModel` setting. Selecting a model here overrides the
+ * internal `copilot-utility-small` family used for fast/cheap background
+ * flows (commit messages, intent detection, inline-chat progress, etc.).
+ */
+export declare class UtilitySmallModelContribution extends DefaultModelContribution {
+    static readonly ID = "workbench.contrib.utilitySmallModel";
+    static readonly modelIds: string[];
+    static readonly modelLabels: string[];
+    static readonly modelDescriptions: string[];
+    constructor(languageModelsService: ILanguageModelsService, logService: ILogService);
+}

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

@@ -0,0 +1,75 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
+import { createDefaultModelArrays, DefaultModelContribution } from './defaultModelContribution.js';
+
+const defaultEntryLabel = ( localize(7113, "Default"));
+const defaultEntryDescription = ( localize(7114, "Use the built-in default utility model"));
+const utilityArrays = createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription);
+const utilitySmallArrays = createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription);
+let UtilityModelContribution = class UtilityModelContribution extends DefaultModelContribution {
+    static {
+        this.ID = "workbench.contrib.utilityModel";
+    }
+    static {
+        this.modelIds = utilityArrays.modelIds;
+    }
+    static {
+        this.modelLabels = utilityArrays.modelLabels;
+    }
+    static {
+        this.modelDescriptions = utilityArrays.modelDescriptions;
+    }
+    constructor(languageModelsService, logService) {
+        super(utilityArrays, {
+            configKey: ChatConfiguration.UtilityModel,
+            configSectionId: "chatSidebar",
+            logPrefix: "[UtilityModel]",
+            storageFormat: "vendorAndId",
+            defaultEntryLabel,
+            defaultEntryDescription
+        }, languageModelsService, logService);
+    }
+};
+UtilityModelContribution = ( __decorate([( __param(0, ILanguageModelsService)), ( __param(1, ILogService))], UtilityModelContribution));
+let UtilitySmallModelContribution = class UtilitySmallModelContribution extends DefaultModelContribution {
+    static {
+        this.ID = "workbench.contrib.utilitySmallModel";
+    }
+    static {
+        this.modelIds = utilitySmallArrays.modelIds;
+    }
+    static {
+        this.modelLabels = utilitySmallArrays.modelLabels;
+    }
+    static {
+        this.modelDescriptions = utilitySmallArrays.modelDescriptions;
+    }
+    constructor(languageModelsService, logService) {
+        super(utilitySmallArrays, {
+            configKey: ChatConfiguration.UtilitySmallModel,
+            configSectionId: "chatSidebar",
+            logPrefix: "[UtilitySmallModel]",
+            storageFormat: "vendorAndId",
+            defaultEntryLabel,
+            defaultEntryDescription
+        }, languageModelsService, logService);
+    }
+};
+UtilitySmallModelContribution = ( __decorate([( __param(0, ILanguageModelsService)), ( __param(1, ILogService))], UtilitySmallModelContribution));
+registerWorkbenchContribution2(
+    UtilityModelContribution.ID,
+    UtilityModelContribution,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    UtilitySmallModelContribution.ID,
+    UtilitySmallModelContribution,
+    WorkbenchPhase.BlockRestore
+);
+
+export { UtilityModelContribution, UtilitySmallModelContribution };

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -17,29 +17,29 @@ const chatViewsWelcomeJsonSchema = {
     properties: {
         icon: {
             type: "string",
-            description: ( localize(7043, "The icon for the welcome message."))
+            description: ( localize(7115, "The icon for the welcome message."))
         },
         title: {
             type: "string",
-            description: ( localize(7044, "The title of the welcome message."))
+            description: ( localize(7116, "The title of the welcome message."))
         },
         content: {
             type: "string",
             description: ( localize(
-                7045,
+                7117,
                 "The content of the welcome message. The first command link will be rendered as a button."
             ))
         },
         when: {
             type: "string",
-            description: ( localize(7046, "Condition when the welcome message is shown."))
+            description: ( localize(7118, "Condition when the welcome message is shown."))
         }
     }
 };
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatViewsWelcome",
     jsonSchema: {
-        description: ( localize(7047, "Contributes a welcome message to a chat view")),
+        description: ( localize(7119, "Contributes a welcome message to a chat view")),
         type: "array",
         items: chatViewsWelcomeJsonSchema
     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/{toolInvocationParts/chatToolOutputStateCache.d.ts → chatOutputPartStateCache.d.ts}

@@ -1,16 +1,15 @@
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IChatToolOutputStateCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service";
-export interface IOutputState {
-    webviewOrigin: string;
+import { IChatOutputPartStateCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatOutputPartStateCache.service";
+export interface IOutputPartState {
     height: number;
     webviewState?: string;
 }
-export declare class ChatToolOutputStateCache implements IChatToolOutputStateCache {
+export declare class ChatOutputPartStateCache implements IChatOutputPartStateCache {
     readonly _serviceBrand: undefined;
     private readonly _cache;
     constructor(storageService: IStorageService);
-    get(toolCallId: string): IOutputState | undefined;
-    set(toolCallId: string, state: IOutputState): void;
+    get(key: string): IOutputPartState | undefined;
+    set(key: string, state: IOutputPartState): void;
     private _serialize;
     private _deserialize;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/{toolInvocationParts/chatToolOutputStateCache.js → chatOutputPartStateCache.js}

@@ -7,12 +7,17 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
-const CACHE_STORAGE_KEY = "chat/toolOutputStateCache";
+const CACHE_STORAGE_KEY = "chat/outputPartStateCache";
+const LEGACY_CACHE_STORAGE_KEY = "chat/toolOutputStateCache";
 const CACHE_LIMIT = 100;
-let ChatToolOutputStateCache = class ChatToolOutputStateCache {
+let ChatOutputPartStateCache = class ChatOutputPartStateCache {
     constructor(storageService) {
         this._cache = ( new LRUCache(CACHE_LIMIT, 0.75));
-        const raw = storageService.get(CACHE_STORAGE_KEY, StorageScope.WORKSPACE, "{}");
+        const raw = storageService.get(
+            CACHE_STORAGE_KEY,
+            StorageScope.WORKSPACE,
+            storageService.get(LEGACY_CACHE_STORAGE_KEY, StorageScope.WORKSPACE, "{}")
+        );
         this._deserialize(raw);
         const onWillSaveStateBecauseOfShutdown = Event.filter(
             storageService.onWillSaveState,
@@ -27,11 +32,11 @@ let ChatToolOutputStateCache = class ChatToolOutputStateCache {
             );
         });
     }
-    get(toolCallId) {
-        return this._cache.get(toolCallId);
+    get(key) {
+        return this._cache.get(key);
     }
-    set(toolCallId, state) {
-        this._cache.set(toolCallId, state);
+    set(key, state) {
+        this._cache.set(key, state);
     }
     _serialize() {
         const data = Object.create(null);
@@ -45,13 +50,16 @@ let ChatToolOutputStateCache = class ChatToolOutputStateCache {
             const data = JSON.parse(raw);
             for (const key in data) {
                 const state = data[key];
-                if (typeof state.webviewOrigin === "string" && typeof state.height === "number") {
-                    this._cache.set(key, state);
+                if (typeof state.height === "number") {
+                    this._cache.set(key, {
+                        height: state.height,
+                        webviewState: typeof state.webviewState === "string" ? state.webviewState : undefined
+                    });
                 }
             }
         } catch {}
     }
 };
-ChatToolOutputStateCache = ( __decorate([( __param(0, IStorageService))], ChatToolOutputStateCache));
+ChatOutputPartStateCache = ( __decorate([( __param(0, IStorageService))], ChatOutputPartStateCache));
 
-export { ChatToolOutputStateCache };
+export { ChatOutputPartStateCache };

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

@@ -41,7 +41,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this.contextKeyService = contextKeyService;
         this._altKeyPressed = false;
         const isSteerDefault = this._isSteerDefault();
-        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7506, "Steer with Message")) : ( localize(7507, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!this.contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
+        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7592, "Steer with Message")) : ( localize(7593, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!this.contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
         this._primaryAction = this._register(( new ActionViewItem(undefined, this._primaryActionAction, {
             icon: true,
             label: false
@@ -49,7 +49,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this._register(this.contextKeyService.onDidChangeContext(e => {
             this._primaryActionAction.enabled = !!this.contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key);
         }));
-        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7508, "More Actions...")))));
+        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7594, "More Actions...")))));
         this._dropdown = this._register(( new ChevronActionWidgetDropdown(dropdownAction, {
             actionProvider: {
                 getActions: () => this._getDropdownActions()
@@ -77,7 +77,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
     }
     _updatePrimaryAction() {
         const isSteer = this._isEffectiveSteer();
-        this._primaryActionAction.label = isSteer ? ( localize(7506, "Steer with Message")) : ( localize(7507, "Add to Queue"));
+        this._primaryActionAction.label = isSteer ? ( localize(7592, "Steer with Message")) : ( localize(7593, "Add to Queue"));
         this._primaryActionAction.class = ThemeIcon.asClassName(isSteer ? Codicon.arrowUp : Codicon.add);
     }
     _runDefaultAction() {
@@ -134,7 +134,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         const steerKeybinding = this.keybindingService.lookupKeybinding(ChatSteerWithMessageAction.ID, lookupContext, true);
         const queueAction = {
             id: ChatQueueMessageAction.ID,
-            label: ( localize(7507, "Add to Queue")),
+            label: ( localize(7593, "Add to Queue")),
             tooltip: "",
             enabled: true,
             checked: !isSteerDefault,
@@ -143,7 +143,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             keybinding: queueKeybinding,
             hover: {
                 content: ( localize(
-                    7509,
+                    7595,
                     "Queue this message to send after the current request completes. The current response will finish uninterrupted before the queued message is sent."
                 ))
             },
@@ -153,7 +153,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const steerAction = {
             id: ChatSteerWithMessageAction.ID,
-            label: ( localize(7506, "Steer with Message")),
+            label: ( localize(7592, "Steer with Message")),
             tooltip: "",
             enabled: true,
             checked: isSteerDefault,
@@ -162,7 +162,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             keybinding: steerKeybinding,
             hover: {
                 content: ( localize(
-                    7510,
+                    7596,
                     "Send this message at the next opportunity, signaling the current request to yield. The current response will stop and the new message will be sent immediately."
                 ))
             },
@@ -172,13 +172,13 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const sendAction = {
             id: "_" + ChatSubmitAction.ID,
-            label: ( localize(7511, "Stop and Send")),
+            label: ( localize(7597, "Stop and Send")),
             tooltip: "",
             enabled: true,
             icon: Codicon.arrowRight,
             class: undefined,
             hover: {
-                content: ( localize(7512, "Cancel the current request and send this message immediately."))
+                content: ( localize(7598, "Cancel the current request and send this message immediately."))
             },
             run: () => {
                 this.commandService.executeCommand(ChatSubmitAction.ID);

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

@@ -91,33 +91,65 @@ let AgentHostInputCompletions = class AgentHostInputCompletions extends AgentHos
     }
     _buildItem(position, item, widget) {
         const replaceRange = AgentHostInputCompletions_1.computeRange(position, item);
-        const label = item.attachment.displayName ?? item.insertText;
-        const description = item.attachment.uri.path;
-        return {
-            label: {
-                label,
-                description
-            },
-            insertText: item.insertText,
-            filterText: item.insertText,
-            range: replaceRange,
-            kind: item.attachment.isDirectory ? CompletionItemKind.Folder : CompletionItemKind.File,
-            command: {
-                id: AgentHostInputCompletions_1.addReferenceCommand,
-                title: "",
-                arguments: [( new AgentHostReferenceArgument(
-                    widget,
-                    item.attachment.uri,
-                    item.attachment.displayName,
-                    !!item.attachment.isDirectory,
-                    replaceRange.replace.setEndPosition(
-                        replaceRange.replace.startLineNumber,
-                        replaceRange.replace.startColumn + item.insertText.length
-                    ),
-                    item.attachment._meta
-                ))]
+        const attachment = item.attachment;
+        switch (attachment.kind) {
+        case "command":
+            {
+                return {
+                    label: item.insertText,
+                    insertText: item.insertText,
+                    filterText: item.insertText,
+                    range: replaceRange,
+                    kind: CompletionItemKind.Text,
+                    detail: attachment.description
+                };
             }
-        };
+        case "skill":
+            {
+                const label = item.insertText.trimEnd();
+                return {
+                    label: attachment.displayName ? {
+                        label,
+                        description: attachment.displayName
+                    } : label,
+                    insertText: item.insertText,
+                    filterText: item.insertText,
+                    range: replaceRange,
+                    kind: CompletionItemKind.Text,
+                    detail: attachment.description
+                };
+            }
+        default:
+            {
+                const label = attachment.displayName ?? item.insertText;
+                const description = attachment.uri.path;
+                return {
+                    label: {
+                        label,
+                        description
+                    },
+                    insertText: item.insertText,
+                    filterText: item.insertText,
+                    range: replaceRange,
+                    kind: attachment.isDirectory ? CompletionItemKind.Folder : CompletionItemKind.File,
+                    command: {
+                        id: AgentHostInputCompletions_1.addReferenceCommand,
+                        title: "",
+                        arguments: [( new AgentHostReferenceArgument(
+                            widget,
+                            attachment.uri,
+                            attachment.displayName,
+                            !!attachment.isDirectory,
+                            replaceRange.replace.setEndPosition(
+                                replaceRange.replace.startLineNumber,
+                                replaceRange.replace.startColumn + item.insertText.length
+                            ),
+                            attachment._meta
+                        ))]
+                    }
+                };
+            }
+        }
     }
 };
 AgentHostInputCompletions = AgentHostInputCompletions_1 = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatSessionsService))], AgentHostInputCompletions));