@codingame/monaco-vscode-katex-common 34.1.2 → 35.0.0

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { isFalsyOrEmpty } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { basename, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -19,7 +20,7 @@ import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ToolDataSource, isToolSet, ToolAndToolSetEnablementMap } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { getAllCodicons, Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
@@ -30,6 +31,7 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/json
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -44,7 +46,7 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-        label: ( localize(7214, "Empty tool set")),
+        label: ( localize(7732, "Empty tool set")),
         body: {
             "${1:toolSetName}": {
                 "tools": ["${2:someTool}", "${3:anotherTool}"],
@@ -54,7 +56,7 @@ const toolSetsSchema = {
         }
     }],
     type: "object",
-    description: ( localize(7215, "User tool sets configuration")),
+    description: ( localize(7733, "User tool sets configuration")),
     additionalProperties: {
         type: "object",
         required: ["tools"],
@@ -62,7 +64,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    7216,
+                    7734,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: "array",
@@ -75,7 +77,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    7217,
+                    7735,
                     "Icon to use for this tool set in the UI. Uses the \"\\$(name)\"-syntax, like \"\\$(zap)\""
                 )),
                 type: "string",
@@ -83,7 +85,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`)
             },
             description: {
-                description: ( localize(7218, "A short description of this tool set.")),
+                description: ( localize(7736, "A short description of this tool set.")),
                 type: "string"
             }
         }
@@ -156,7 +158,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             for (const tool of tools) {
                 if (tool.canBeReferencedInPrompt) {
                     data.push({
-                        name: tool.toolReferenceName ?? tool.displayName,
+                        name: this._languageModelToolsService.getFullReferenceName(tool),
                         sourceLabel: ToolDataSource.classify(tool.source).label,
                         sourceOrdinal: ToolDataSource.classify(tool.source).ordinal,
                         description: tool.userDescription ?? tool.modelDescription
@@ -165,7 +167,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             }
             for (const toolSet of toolSets) {
                 data.push({
-                    name: toolSet.referenceName,
+                    name: this._languageModelToolsService.getFullReferenceName(toolSet),
                     sourceLabel: ToolDataSource.classify(toolSet.source).label,
                     sourceOrdinal: ToolDataSource.classify(toolSet.source).ordinal,
                     description: toolSet.description
@@ -184,7 +186,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(7219, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(7737, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -241,6 +243,14 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
                     const tools = [];
                     const toolSets = [];
                     value.tools.forEach(name => {
+                        const toolOrToolSet = this._languageModelToolsService.getToolByFullReferenceName(name);
+                        if (isToolSet(toolOrToolSet)) {
+                            toolSets.push(toolOrToolSet);
+                            return;
+                        } else if (toolOrToolSet) {
+                            tools.push(toolOrToolSet);
+                            return;
+                        }
                         const tool = this._languageModelToolsService.getToolByName(name);
                         if (tool) {
                             tools.push(tool);
@@ -261,7 +271,8 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
                         label: basename(entry.resource)
                     }, `user/${( entry.resource.toString())}/${name}`, name, {
                         icon: value.icon ? ThemeIcon.fromId(value.icon) : undefined,
-                        description: value.description
+                        description: value.description,
+                        deprecated: true
                     });
                     transaction(tx => {
                         store.add(toolset);
@@ -274,6 +285,90 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
     }
 };
 UserToolSetsContributions = ( __decorate([( __param(0, IExtensionService)), ( __param(1, ILifecycleService)), ( __param(2, ILanguageModelToolsService)), ( __param(3, IUserDataProfileService)), ( __param(4, IFileService)), ( __param(5, ILogService))], UserToolSetsContributions));
+function getSelectionFromArg(arg) {
+    if (!isObject(arg)) {
+        return undefined;
+    }
+    const selection = arg.selection;
+    if (!(selection instanceof ToolAndToolSetEnablementMap)) {
+        return undefined;
+    }
+    return selection;
+}
+function getEnabledSelectionReferences(selection, toolsService) {
+    const enabledToolSets = [];
+    const enabledTools = [];
+    for (const [item, enabled] of selection) {
+        if (!enabled) {
+            continue;
+        }
+        if (isToolSet(item)) {
+            if (Iterable.every(item.getTools(), tool => selection.get(tool) !== false)) {
+                enabledToolSets.push(item);
+            }
+        } else {
+            enabledTools.push(item);
+        }
+    }
+    const coveredToolIds = ( new Set());
+    for (const toolSet of enabledToolSets) {
+        for (const tool of toolSet.getTools()) {
+            coveredToolIds.add(tool.id);
+        }
+    }
+    const references = [];
+    const seen = ( new Set());
+    const addReference = referenceName => {
+        if (( seen.has(referenceName))) {
+            return;
+        }
+        seen.add(referenceName);
+        references.push(referenceName);
+    };
+    for (const toolSet of enabledToolSets) {
+        addReference(toolsService.getFullReferenceName(toolSet));
+    }
+    for (const tool of enabledTools) {
+        if (( coveredToolIds.has(tool.id))) {
+            continue;
+        }
+        const referenceName = toolsService.getFullReferenceName(tool);
+        if (toolsService.getToolByFullReferenceName(referenceName) !== tool) {
+            continue;
+        }
+        addReference(referenceName);
+    }
+    return references;
+}
+function createToolSetFileContents(toolSetName, toolReferences) {
+    const serializedReferences = ( toolReferences.map(reference => `\t\t\t${JSON.stringify(reference)}`)).join(",\n");
+    return [
+        "{",
+        `\t${JSON.stringify(toolSetName)}: {`,
+        "\t\t\"tools\": [",
+        serializedReferences,
+        "\t\t],",
+        "\t\t\"description\": \"\",",
+        "\t\t\"icon\": \"tools\"",
+        "\t}",
+        "}"
+    ].join("\n");
+}
+function deleteToolSetFromFileContents(rawContents, toolSetName) {
+    const parsed = parse(rawContents);
+    if (!isObject(parsed)) {
+        return undefined;
+    }
+    const record = parsed;
+    if (!Object.hasOwn(record, toolSetName)) {
+        return undefined;
+    }
+    delete record[toolSetName];
+    return {
+        contents: JSON.stringify(record, undefined, "\t"),
+        isEmpty: ( Object.keys(record)).length === 0
+    };
+}
 class ConfigureToolSets extends Action2 {
     static {
         this.ID = "chat.configureToolSets";
@@ -281,8 +376,8 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(7220, "Configure Tool Sets...")),
-            shortTitle: ( localize(7221, "Tool Sets")),
+            title: ( localize2(7738, "Configure Tool Sets...")),
+            shortTitle: ( localize(7739, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
@@ -299,16 +394,28 @@ class ConfigureToolSets extends Action2 {
             }]
         });
     }
-    async run(accessor) {
+    async run(accessor, options) {
         const toolsService = accessor.get(ILanguageModelToolsService);
         const quickInputService = accessor.get(IQuickInputService);
         const editorService = accessor.get(IEditorService);
         const userDataProfileService = accessor.get(IUserDataProfileService);
         const fileService = accessor.get(IFileService);
         const textFileService = accessor.get(ITextFileService);
+        const chatWidgetService = accessor.get(IChatWidgetService);
         const picks = [];
+        const currentSelection = getSelectionFromArg(options) ?? chatWidgetService.lastFocusedWidget?.input.selectedToolsModel.entriesMap.get() ?? ToolAndToolSetEnablementMap.fromEntries([]);
+        const selectedReferences = getEnabledSelectionReferences(currentSelection, toolsService);
+        if (selectedReferences.length > 0) {
+            picks.push({
+                label: ( localize(7740, "Create from current selection...")),
+                kind: "createFromSelection",
+                alwaysShow: true,
+                iconClass: ThemeIcon.asClassName(Codicon.plus)
+            });
+        }
         picks.push({
-            label: ( localize(7222, "Create new tool sets file...")),
+            label: ( localize(7741, "Create new tool sets file...")),
+            kind: "createNewFile",
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -318,6 +425,7 @@ class ConfigureToolSets extends Action2 {
             }
             picks.push({
                 label: toolSet.referenceName,
+                kind: "existing",
                 toolset: toolSet,
                 tooltip: toolSet.description,
                 iconClass: ThemeIcon.asClassName(toolSet.icon)
@@ -325,7 +433,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(7223, "Select a tool set to configure"))
+            placeHolder: ( localize(7742, "Select a tool set to configure"))
         });
         if (!pick) {
             return;
@@ -333,13 +441,22 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(7224, "Type tool sets file name")),
+                placeHolder: ( localize(7743, "Type tool sets file name")),
                 validateInput: async input => {
                     if (!input) {
-                        return localize(7225, "Invalid file name");
+                        return localize(7744, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(7226, "'{0}' is not a valid file name", input);
+                        return localize(7745, "'{0}' is not a valid file name", input);
+                    }
+                    if (pick.kind === "createFromSelection") {
+                        const candidate = joinPath(
+                            userDataProfileService.currentProfile.promptsHome,
+                            `${input}${RawToolSetsShape.suffix}`
+                        );
+                        if (await fileService.exists(candidate)) {
+                            return localize(7746, "A file with this name already exists");
+                        }
                     }
                     return undefined;
                 }
@@ -351,7 +468,21 @@ class ConfigureToolSets extends Action2 {
                 userDataProfileService.currentProfile.promptsHome,
                 `${name}${RawToolSetsShape.suffix}`
             );
-            if (!(await fileService.exists(resource))) {
+            if (pick.kind === "createFromSelection") {
+                const toolSetName = await quickInputService.input({
+                    placeHolder: ( localize(7747, "Type new tool set name")),
+                    validateInput: async input => {
+                        if (isFalsyOrWhitespace(input)) {
+                            return localize(7748, "Tool set name cannot be empty");
+                        }
+                        return undefined;
+                    }
+                });
+                if (!toolSetName || isFalsyOrWhitespace(toolSetName)) {
+                    return;
+                }
+                await textFileService.write(resource, createToolSetFileContents(toolSetName, selectedReferences));
+            } else if (!(await fileService.exists(resource))) {
                 await textFileService.write(resource, [
                     "// Place your tool sets here...",
                     "// Example:",
@@ -380,4 +511,4 @@ class ConfigureToolSets extends Action2 {
     }
 }
 
-export { ConfigureToolSets, UserToolSetsContributions };
+export { ConfigureToolSets, RawToolSetsShape, UserToolSetsContributions, createToolSetFileContents, deleteToolSetFromFileContents, getEnabledSelectionReferences };

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

@@ -49,7 +49,7 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
         this.publisherName = $("span.chat-agent-hover-publisher-name");
         append(hoverElement.publisher, verifiedBadge, this.publisherName);
         hoverElement.warning.appendChild(renderIcon(Codicon.warning));
-        hoverElement.warning.appendChild($("span", undefined, ( localize(7240, "This chat extension is using a reserved name."))));
+        hoverElement.warning.appendChild($("span", undefined, ( localize(7774, "This chat extension is using a reserved name."))));
     }
     setAgent(id) {
         const agent = this.chatAgentService.getAgent(id);
@@ -94,7 +94,7 @@ ChatAgentHover = ( __decorate([( __param(0, IChatAgentService)), ( __param(1, IE
 function getChatAgentHoverOptions(getAgent, commandService) {
     const viewExtensionAction = {
         commandId: showExtensionsWithIdsCommandId,
-        label: ( localize(7241, "View Extension")),
+        label: ( localize(7775, "View Extension")),
         run: () => {
             const agent = getAgent();
             if (agent) {

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

@@ -152,7 +152,7 @@ let ChatArtifactsWidget = class ChatArtifactsWidget extends Disposable {
                     return;
                 }
                 this.domNode.style.display = "";
-                titleElement.textContent = data.totalCount === 1 ? ( localize(7242, "1 Artifact")) : ( localize(7243, "{0} Artifacts", data.totalCount));
+                titleElement.textContent = data.totalCount === 1 ? ( localize(7776, "1 Artifact")) : ( localize(7777, "{0} Artifacts", data.totalCount));
                 tree.layout(data.treeHeight);
                 tree.getHTMLElement().style.height = `${data.treeHeight}px`;
                 tree.setChildren(null, data.treeElements);
@@ -233,7 +233,7 @@ let ChatArtifactsWidget = class ChatArtifactsWidget extends Disposable {
         const defaultUri = URI.joinPath(defaultPath, defaultFileName);
         const targetUri = await this._fileDialogService.showSaveDialog({
             defaultUri,
-            title: ( localize(7244, "Save Artifact"))
+            title: ( localize(7778, "Save Artifact"))
         });
         if (targetUri) {
             const content = await this._fileService.readFile(sourceUri);
@@ -245,11 +245,11 @@ ChatArtifactsWidget = ChatArtifactsWidget_1 = ( __decorate([( __param(0, IChatAr
 function sourceDisplayName(source) {
     switch (source.kind) {
     case "rules":
-        return localize(7245, "Rules");
+        return localize(7779, "Rules");
     case "agent":
-        return localize(7246, "Agent");
+        return localize(7780, "Agent");
     case "subagent":
-        return source.name ?? ( localize(7247, "Subagent"));
+        return source.name ?? ( localize(7781, "Subagent"));
     }
 }
 function buildTreeElementsFromGroups(sourceGroups, multiSource, onClearSource) {
@@ -383,12 +383,12 @@ class ChatArtifactsTreeDelegate {
 class ChatArtifactsAccessibilityProvider {
     getAriaLabel(element) {
         if (isGroupNode(element)) {
-            return localize(7248, "{0} ({1} items)", element.groupName, element.artifacts.length);
+            return localize(7782, "{0} ({1} items)", element.groupName, element.artifacts.length);
         }
         return element.artifact.label;
     }
     getWidgetAriaLabel() {
-        return localize(7249, "Chat Artifacts");
+        return localize(7783, "Chat Artifacts");
     }
 }
 class ChatArtifactGroupRenderer {
@@ -429,7 +429,7 @@ class ChatArtifactGroupRenderer {
             const clearFn = group.onClear;
             templateData.actionBar.push(toAction({
                 id: "chatArtifacts.clearSource",
-                label: ( localize(7250, "Clear")),
+                label: ( localize(7784, "Clear")),
                 class: ThemeIcon.asClassName(Codicon.close),
                 run: () => clearFn()
             }), {
@@ -493,14 +493,14 @@ class ChatArtifactLeafRenderer {
             const clearFn = onClear;
             actions.push(toAction({
                 id: "chatArtifacts.clearSource",
-                label: ( localize(7250, "Clear")),
+                label: ( localize(7784, "Clear")),
                 class: ThemeIcon.asClassName(Codicon.close),
                 run: () => clearFn()
             }));
         }
         actions.push(toAction({
             id: "chatArtifacts.save",
-            label: ( localize(7251, "Save artifact")),
+            label: ( localize(7785, "Save artifact")),
             class: ThemeIcon.asClassName(Codicon.save),
             run: () => this._onSave(artifact)
         }));

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

@@ -13,12 +13,29 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
 
 const _remoteImageDisallowed = () => false;
-const nonPlainTextMarkdownSyntax = /[\\`*_[\]<>|&$~]/;
+const nonPlainTextMarkdownSyntax = /[\\`*_[\]<>|&$]/;
 const gfmAutolink = /\b(?:https?:\/\/|www\.)/i;
+const gfmStrikethrough = /~~/;
 const blockMarkdownSyntax = /(^|\n)\s{0,3}(?:#{1,6}\s|>\s?|[-+]\s|\d+[.)]\s|---+\s*$)/;
+const literalSingleTildeExtension = {
+    extensions: [{
+        name: "literalSingleTilde",
+        level: "inline",
+        tokenizer: source => {
+            if (source[0] === "~" && source[1] !== "~") {
+                return {
+                    type: "text",
+                    raw: "~",
+                    text: "~"
+                };
+            }
+            return undefined;
+        }
+    }]
+};
 function renderPlainTextMarkdown(markdown, outElement) {
     const value = markdown.value;
-    if (!value || value.includes("\n") || nonPlainTextMarkdownSyntax.test(value) || gfmAutolink.test(value) || blockMarkdownSyntax.test(value)) {
+    if (!value || value.includes("\n") || nonPlainTextMarkdownSyntax.test(value) || gfmAutolink.test(value) || gfmStrikethrough.test(value) || blockMarkdownSyntax.test(value)) {
         return undefined;
     }
     const element = outElement ?? $("div");
@@ -73,6 +90,7 @@ const allowedChatMarkdownHtmlTags = ( Object.freeze([
 function getChatMarkdownRenderOptions(options) {
     return {
         ...options,
+        markedExtensions: options?.markedExtensions?.includes(literalSingleTildeExtension) ? options.markedExtensions : [...(options?.markedExtensions ?? []), literalSingleTildeExtension],
         sanitizerConfig: {
             replaceWithPlaintext: true,
             allowedTags: {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAgentCommandContentPart.js

@@ -28,7 +28,7 @@ let ChatAgentCommandContentPart = class ChatAgentCommandContentPart extends Disp
         }, {
             groupId
         }));
-        const rerun = ( localize(7252, "Rerun without {0}{1}", chatSubcommandLeader, cmd.name));
+        const rerun = ( localize(7786, "Rerun without {0}{1}", chatSubcommandLeader, cmd.name));
         const btn = ( new Button(this.domNode, {
             ariaLabel: rerun
         }));

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAnonymousRateLimitedPart.js

@@ -21,14 +21,14 @@ let ChatAnonymousRateLimitedPart = class ChatAnonymousRateLimitedPart extends Di
         const messageContainer = append(this.domNode, $(".chat-rate-limited-message"));
         const message = append(messageContainer, $("div"));
         message.textContent = ( localize(
-            7253,
+            7787,
             "Continue the conversation by signing in. Your free account gets 50 premium requests a month plus access to more models and AI features."
         ));
         const signInButton = this._register(( new Button(messageContainer, {
             ...defaultButtonStyles,
             supportIcons: true
         })));
-        signInButton.label = ( localize(7254, "Enable more AI features"));
+        signInButton.label = ( localize(7788, "Enable more AI features"));
         signInButton.element.classList.add("chat-rate-limited-button");
         this._register(signInButton.onDidClick(async () => {
             const commandId = "workbench.action.chat.triggerSetup";

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAttachmentsContentPart.d.ts

@@ -8,6 +8,7 @@ export interface IChatAttachmentsContentPartOptions {
     readonly variables: readonly IChatRequestVariableEntry[];
     readonly contentReferences?: ReadonlyArray<IChatContentReference>;
     readonly modelId?: string;
+    readonly resolvedModelId?: string;
     readonly domNode?: HTMLElement;
     readonly limit?: number;
 }
@@ -22,6 +23,7 @@ export declare class ChatAttachmentsContentPart extends Disposable {
     private _variables;
     private readonly contentReferences;
     private readonly modelId?;
+    private readonly resolvedModelId?;
     private readonly limit?;
     readonly domNode: HTMLElement | undefined;
     contextMenuHandler?: (attachment: IChatRequestVariableEntry, event: MouseEvent) => void;
@@ -31,7 +33,9 @@ export declare class ChatAttachmentsContentPart extends Disposable {
      */
     updateVariables(variables: readonly IChatRequestVariableEntry[]): void;
     private initAttachedContext;
+    private getRenderableAttachments;
     private getVisibleAttachments;
+    private currentModelDoesNotSupportImages;
     /**
      * When the total number of image attachments exceeds the model-specific
      * per-request limit, mark the oldest images (those dropped by the backend)
@@ -39,6 +43,7 @@ export declare class ChatAttachmentsContentPart extends Disposable {
      */
     private markImageLimitExceeded;
     private getImageLimitForCurrentModel;
+    private getCurrentLanguageModel;
     private renderShowMoreButton;
     private renderAttachment;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAttachmentsContentPart.js

@@ -8,8 +8,9 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
-import { isImageVariableEntry, OmittedState, getImageAttachmentLimit, isElementVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isTerminalVariableEntry, isPasteVariableEntry, isNotebookOutputVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isBrowserViewVariableEntry, isWorkspaceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { isAgentHostCompletionVariableEntry, isImageVariableEntry, OmittedState, getImageAttachmentLimit, isElementVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isTerminalVariableEntry, isPasteVariableEntry, isNotebookOutputVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isBrowserViewVariableEntry, isWorkspaceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatResponseReferencePartStatusKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isAutoLanguageModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ToolSetOrToolItemAttachmentWidget, ElementChatAttachmentWidget, ImageAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, FileAttachmentWidget, TerminalCommandAttachmentWidget, PasteAttachmentWidget, NotebookCellOutputChatAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, BrowserViewAttachmentWidget, DefaultChatAttachmentWidget } from '../../attachments/chatAttachmentWidgets.js';
 import { IChatAttachmentWidgetRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.service';
@@ -31,6 +32,7 @@ let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Dispos
         this._variables = options.variables;
         this.contentReferences = options.contentReferences ?? [];
         this.modelId = options.modelId;
+        this.resolvedModelId = options.resolvedModelId;
         this.limit = options.limit;
         this.domNode = options.domNode ?? $(".chat-attached-context");
         this._contextResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, {
@@ -50,21 +52,30 @@ let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Dispos
     initAttachedContext(container) {
         clearNode(container);
         this.attachedContextDisposables.clear();
-        const visibleAttachments = this.getVisibleAttachments();
-        const hasMoreAttachments = this.limit && this._variables.length > this.limit && !this._showingAll;
+        const renderableAttachments = this.getRenderableAttachments();
+        const visibleAttachments = this.getVisibleAttachments(renderableAttachments);
+        const remainingCount = renderableAttachments.length - visibleAttachments.length;
+        const hasMoreAttachments = remainingCount > 0 && !this._showingAll;
         this.markImageLimitExceeded(this._variables);
         for (const attachment of visibleAttachments) {
             this.renderAttachment(attachment, container);
         }
         if (hasMoreAttachments) {
-            this.renderShowMoreButton(container);
+            this.renderShowMoreButton(container, remainingCount);
         }
     }
-    getVisibleAttachments() {
+    getRenderableAttachments() {
+        return this._variables.filter(attachment => !isAgentHostCompletionVariableEntry(attachment));
+    }
+    getVisibleAttachments(visibleAttachments) {
         if (!this.limit || this._showingAll) {
-            return this._variables;
+            return visibleAttachments;
         }
-        return this._variables.slice(0, this.limit);
+        return visibleAttachments.slice(0, this.limit);
+    }
+    currentModelDoesNotSupportImages() {
+        const model = this.getCurrentLanguageModel();
+        return !!model && !isAutoLanguageModel(model) && model.metadata.capabilities?.vision === false;
     }
     markImageLimitExceeded(attachments) {
         const imageAttachments = attachments.filter(isImageVariableEntry);
@@ -93,13 +104,35 @@ let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Dispos
         }
     }
     getImageLimitForCurrentModel() {
-        if (!this.modelId) {
-            return undefined;
+        return getImageAttachmentLimit(this.getCurrentLanguageModel()?.metadata);
+    }
+    getCurrentLanguageModel() {
+        const selectedMetadata = this.modelId ? this.languageModelsService.lookupLanguageModel(this.modelId) : undefined;
+        if (!this.resolvedModelId) {
+            return this.modelId && selectedMetadata ? {
+                identifier: this.modelId,
+                metadata: selectedMetadata
+            } : undefined;
         }
-        return getImageAttachmentLimit(this.languageModelsService.lookupLanguageModel(this.modelId));
+        const directMetadata = this.languageModelsService.lookupLanguageModel(this.resolvedModelId);
+        if (directMetadata) {
+            return {
+                identifier: this.resolvedModelId,
+                metadata: directMetadata
+            };
+        }
+        for (const identifier of this.languageModelsService.getLanguageModelIds()) {
+            const metadata = this.languageModelsService.lookupLanguageModel(identifier);
+            if (metadata?.id === this.resolvedModelId && (!selectedMetadata || metadata.vendor === selectedMetadata.vendor)) {
+                return {
+                    identifier,
+                    metadata
+                };
+            }
+        }
+        return undefined;
     }
-    renderShowMoreButton(container) {
-        const remainingCount = this._variables.length - (this.limit ?? 0);
+    renderShowMoreButton(container, remainingCount) {
         const showMoreButton = $("div.chat-attached-context-attachment.chat-attachments-show-more-button");
         showMoreButton.setAttribute("role", "button");
         showMoreButton.setAttribute("tabindex", "0");
@@ -149,11 +182,22 @@ let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Dispos
                 supportsDeletion: false
             }, container, this._contextResourceLabels);
         } else if (isImageVariableEntry(attachment)) {
-            attachment.omittedState = isAttachmentPartialOrOmitted ? OmittedState.Full : attachment.omittedState;
-            widget = this.instantiationService.createInstance(ImageAttachmentWidget, resource, attachment, undefined, {
-                shouldFocusClearButton: false,
-                supportsDeletion: false
-            }, container, this._contextResourceLabels);
+            const renderedAttachment = isAttachmentPartialOrOmitted || this.currentModelDoesNotSupportImages() ? {
+                ...attachment,
+                omittedState: OmittedState.Full
+            } : attachment;
+            widget = this.instantiationService.createInstance(
+                ImageAttachmentWidget,
+                resource,
+                renderedAttachment,
+                this.getCurrentLanguageModel(),
+                {
+                    shouldFocusClearButton: false,
+                    supportsDeletion: false
+                },
+                container,
+                this._contextResourceLabels
+            );
         } else if (isPromptFileVariableEntry(attachment)) {
             if (attachment.automaticallyAdded) {
                 return;