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

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

@@ -0,0 +1,96 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
+import { getCommandArgumentHint } from '../../../../../../../platform/agentHost/common/meta/agentCompletionAttachmentMeta.js';
+import { getAgentHostCompletionReferenceKindFromValue, AgentHostCompletionReferenceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
+import { getInputPlaceholderColor, getRangeForPlaceholder } from './chatInputPlaceholderDecoration.js';
+
+const decorationDescription = "chat";
+const commandArgumentHintDecorationType = "chat-command-argument-hint";
+let InputEditorCommandArgumentHint = class InputEditorCommandArgumentHint extends Disposable {
+    constructor(widget, codeEditorService, themeService) {
+        super();
+        this.widget = widget;
+        this.codeEditorService = codeEditorService;
+        this.themeService = themeService;
+        this.id = "inputEditorCommandArgumentHint";
+        this._referencesListener = this._register(( new MutableDisposable()));
+        this._register(
+            this.codeEditorService.registerDecorationType(decorationDescription, commandArgumentHintDecorationType, {})
+        );
+        this.update();
+        this._register(this.widget.onDidChangeParsedInput(() => this.update()));
+        this._register(this.widget.inputEditor.onDidChangeModelContent(() => this.update()));
+    }
+    update() {
+        this._ensureSubscribedToReferences();
+        const decoration = this.getArgumentHintDecoration();
+        this.widget.inputEditor.setDecorationsByType(
+            decorationDescription,
+            commandArgumentHintDecorationType,
+            decoration ? [decoration] : []
+        );
+    }
+    _ensureSubscribedToReferences() {
+        if (this._referencesListener.value) {
+            return;
+        }
+        const dynamicVariableModel = this.widget.getContrib(ChatDynamicVariableModel.ID);
+        if (dynamicVariableModel) {
+            this._referencesListener.value = dynamicVariableModel.onDidChangeReferences(() => this.update());
+        }
+    }
+    getArgumentHintDecoration() {
+        const model = this.widget.inputEditor.getModel();
+        if (!model) {
+            return undefined;
+        }
+        const dynamicVariableModel = this.widget.getContrib(ChatDynamicVariableModel.ID);
+        if (!dynamicVariableModel) {
+            return undefined;
+        }
+        for (const ref of dynamicVariableModel.variables) {
+            if (getAgentHostCompletionReferenceKindFromValue(ref.data) !== AgentHostCompletionReferenceKind.Command) {
+                continue;
+            }
+            const argumentHint = getCommandArgumentHint(ref._meta);
+            if (!argumentHint) {
+                continue;
+            }
+            if (!this.isCommandOnlyContent(model, ref.range)) {
+                return undefined;
+            }
+            return {
+                range: getRangeForPlaceholder(ref.range),
+                renderOptions: {
+                    after: {
+                        contentText: argumentHint,
+                        color: getInputPlaceholderColor(this.themeService)
+                    }
+                }
+            };
+        }
+        return undefined;
+    }
+    isCommandOnlyContent(model, range) {
+        const beforeRange = ( new Range(1, 1, range.startLineNumber, range.startColumn));
+        if (model.getValueInRange(beforeRange).trim().length > 0) {
+            return false;
+        }
+        const fullRange = model.getFullModelRange();
+        const afterRange = ( new Range(
+            range.endLineNumber,
+            range.endColumn,
+            fullRange.endLineNumber,
+            fullRange.endColumn
+        ));
+        return model.getValueInRange(afterRange) === " ";
+    }
+};
+InputEditorCommandArgumentHint = ( __decorate([( __param(1, ICodeEditorService)), ( __param(2, IThemeService))], InputEditorCommandArgumentHint));
+ChatWidget.CONTRIBS.push(InputEditorCommandArgumentHint);

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletionUtils.d.ts

@@ -1,13 +1,25 @@
+import { InternalSuggestOptions } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions";
 import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
 import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { IWordAtPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/wordHelper";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+export declare const attachedContextCompletionSortText = "\0";
+export declare const attachedContextCompletionAdditionalTriggerCharacters: readonly [
+    ":",
+    "-"
+];
+export declare function getAttachedContextCompletionSortText(score: number): string;
+export declare function getAttachedContextCompletionMatch(typedWord: string, leader: string, name: string, kind: string, suggestOptions: InternalSuggestOptions): {
+    filterText: string;
+    score: number;
+} | undefined;
 export declare function escapeForCharClass(text: string): string;
 export interface IChatCompletionRangeResult {
     insert: Range;
     replace: Range;
     varWord: IWordAtPosition | null;
 }
+export declare function getCompletionRangeWord(rangeResult: IChatCompletionRangeResult): string | undefined;
 export declare function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp, onlyOnWordStart?: boolean): IChatCompletionRangeResult | undefined;
 export declare function isEmptyUpToCompletionWord(model: ITextModel, rangeResult: IChatCompletionRangeResult): boolean;
 /**

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

@@ -1,10 +1,45 @@
 
+import { fuzzyScoreGracefulAggressive, fuzzyScore, FuzzyScoreOptions } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { getWordAtText } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/wordHelper';
 
+const attachedContextCompletionSortText = "\u0000";
+const attachedContextCompletionAdditionalTriggerCharacters = [":", "-"];
+function getAttachedContextCompletionSortText(score) {
+    return `${attachedContextCompletionSortText}${( (0x7FFFFFFF - score).toString(16)).padStart(8, "0")}`;
+}
+function getAttachedContextCompletionMatch(typedWord, leader, name, kind, suggestOptions) {
+    if (!typedWord) {
+        return {
+            filterText: typedWord,
+            score: 0
+        };
+    }
+    const searchableText = `${leader}${name} ${leader}attachment:${name} ${name} ${kind}`;
+    const scoreFn = suggestOptions.filterGraceful ? fuzzyScoreGracefulAggressive : fuzzyScore;
+    const score = scoreFn(
+        typedWord,
+        typedWord.toLowerCase(),
+        0,
+        searchableText,
+        searchableText.toLowerCase(),
+        0,
+        {
+            ...FuzzyScoreOptions.default,
+            firstMatchCanBeWeak: !suggestOptions.matchOnWordStartOnly
+        }
+    );
+    return score ? {
+        filterText: typedWord,
+        score: score[0]
+    } : undefined;
+}
 function escapeForCharClass(text) {
     return text.replace(/[-\\^\]]/g, "\\$&");
 }
+function getCompletionRangeWord(rangeResult) {
+    return rangeResult.varWord?.word.slice(0, rangeResult.insert.endColumn - rangeResult.insert.startColumn);
+}
 function computeCompletionRanges(model, position, reg, onlyOnWordStart = false) {
     const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);
     if (!varWord && model.getWordUntilPosition(position).word) {
@@ -72,4 +107,4 @@ function isAtTriggerCharacterToken(model, position, triggerCharacters) {
     return triggerCharacters.includes(token[0]);
 }
 
-export { computeCompletionRanges, escapeForCharClass, isAtTriggerCharacterToken, isEmptyUpToCompletionWord };
+export { attachedContextCompletionAdditionalTriggerCharacters, attachedContextCompletionSortText, computeCompletionRanges, escapeForCharClass, getAttachedContextCompletionMatch, getAttachedContextCompletionSortText, getCompletionRangeWord, isAtTriggerCharacterToken, isEmptyUpToCompletionWord };

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

@@ -16,6 +16,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { isCodeEditor, getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { CompletionItemKind, SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { IOutlineModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service';
@@ -39,12 +40,13 @@ import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { McpPromptArgumentPick } from '../../../../../mcp/browser/mcpPromptArgumentPick.js';
 import { McpResourceURI } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
-import { searchFilesAndFolders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchChatContext';
+import { searchFilesAndFolders, MAX_CHAT_FILE_COMPLETION_RESULTS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchChatContext';
 import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
 import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatRequestAgentPart, chatSubcommandLeader, chatAgentLeader, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, chatVariableLeader, ChatRequestToolPart, ChatRequestToolSetPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
+import { toAttachedContextDynamicVariable } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables';
 import { ChatModeKind, ChatAgentLocation, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
@@ -57,7 +59,7 @@ import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
-import { computeCompletionRanges, isEmptyUpToCompletionWord, escapeForCharClass } from './chatInputCompletionUtils.js';
+import { computeCompletionRanges, isEmptyUpToCompletionWord, escapeForCharClass, getCompletionRangeWord, getAttachedContextCompletionMatch, getAttachedContextCompletionSortText, attachedContextCompletionAdditionalTriggerCharacters } from './chatInputCompletionUtils.js';
 import { AgentSessionProviders, getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 
 var BuiltinDynamicCompletions_1, ToolCompletions_1;
@@ -570,7 +572,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(8329, "Install Chat Extensions..."));
+                const label = ( localize(9882, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -698,7 +700,7 @@ class StartParameterizedPromptAction extends Action2 {
                 after: {
                     content: " ",
                     inlineClassNameAffectsLetterSpacing: true,
-                    inlineClassName: ThemeIcon.asClassName(ThemeIcon.modify(Codicon.loading, "spin")) + " chat-prompt-spinner"
+                    inlineClassName: ThemeIcon.asClassName(ThemeIcon.modify(Codicon.loadingCompact, "spin")) + " chat-prompt-spinner"
                 }
             });
             store.add(toDisposable(() => {
@@ -718,7 +720,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(8330, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(9883, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -746,15 +748,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(8331, "Prompt Resource"))
+                            name: ( localize(9884, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(8332, "Prompt Image")),
-                        fullName: ( localize(8332, "Prompt Image")),
+                        name: ( localize(9885, "Prompt Image")),
+                        fullName: ( localize(9885, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -865,6 +867,52 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         this.chatAgentService = chatAgentService;
         this.instantiationService = instantiationService;
         this.chatSessionsService = chatSessionsService;
+        this.registerVariableCompletions("attachedContexts", (
+            {
+                widget,
+                range
+            }
+        ) => {
+            if (!widget.supportsFileReferences) {
+                return;
+            }
+            const typedLeader = range.varWord?.word?.charAt(0) === chatAgentLeader ? chatAgentLeader : chatVariableLeader;
+            const typedWord = getCompletionRangeWord(range) ?? typedLeader;
+            const suggestOptions = widget.inputEditor.getOption(EditorOption.suggest);
+            const suggestions = coalesce(( widget.attachmentModel.attachments.filter(attachment => !attachment.range).map(attachment => {
+                const match = getAttachedContextCompletionMatch(typedWord, typedLeader, attachment.name, attachment.kind, suggestOptions);
+                if (!match) {
+                    return undefined;
+                }
+                const text = `${typedLeader}attachment:${attachment.name}`;
+                const referenceRange = {
+                    startLineNumber: range.replace.startLineNumber,
+                    startColumn: range.replace.startColumn,
+                    endLineNumber: range.replace.endLineNumber,
+                    endColumn: range.replace.startColumn + text.length
+                };
+                return {
+                    label: {
+                        label: attachment.name,
+                        description: ( localize(9886, "Attached context"))
+                    },
+                    filterText: match.filterText,
+                    insertText: range.varWord?.endColumn === range.replace.endColumn ? `${text} ` : text,
+                    range,
+                    kind: attachment.kind === "directory" ? CompletionItemKind.Folder : attachment.kind === "file" || attachment.kind === "image" ? CompletionItemKind.File : CompletionItemKind.Reference,
+                    sortText: getAttachedContextCompletionSortText(match.score),
+                    command: {
+                        id: BuiltinDynamicCompletions_1.addReferenceCommand,
+                        title: "",
+                        arguments: [( new ReferenceArgument(widget, toAttachedContextDynamicVariable(attachment, referenceRange)))]
+                    }
+                };
+            })));
+            return {
+                suggestions,
+                incomplete: true
+            };
+        }, BuiltinDynamicCompletions_1.VariableNameDef, true, attachedContextCompletionAdditionalTriggerCharacters);
         const fileWordPattern = ( new RegExp(
             `[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}][^\\s]*`,
             "g"
@@ -999,7 +1047,6 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 const sessionProviderFilter = [
                     AgentSessionProviders.Local,
                     AgentSessionProviders.Background,
-                    AgentSessionProviders.Claude,
                     AgentSessionProviders.AgentHostCopilot
                 ];
                 for await (const group of this.chatSessionsService.getChatSessionItems(sessionProviderFilter, token)) {
@@ -1052,7 +1099,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 result.suggestions.push({
                     label: {
                         label: sessionPrefix,
-                        description: ( localize(8333, "Attach a chat session"))
+                        description: ( localize(9887, "Attach a chat session"))
                     },
                     filterText: sessionPrefix,
                     insertText: `${sessionPrefix}:`,
@@ -1100,20 +1147,22 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
     registerVariableCompletions(
         debugName,
         provider,
-        wordPattern = BuiltinDynamicCompletions_1.VariableNameDef
+        wordPattern = BuiltinDynamicCompletions_1.VariableNameDef,
+        includeAgentHost = false,
+        additionalTriggerCharacters = []
     ) {
         this._register(this.languageFeaturesService.completionProvider.register({
             scheme: Schemas.vscodeChatInput,
             hasAccessToAllModels: true
         }, {
             _debugDisplayName: `chatVarCompletions-${debugName}`,
-            triggerCharacters: [chatVariableLeader, chatAgentLeader],
+            triggerCharacters: [chatVariableLeader, chatAgentLeader, ...additionalTriggerCharacters],
             provideCompletionItems: async (model, position, context, token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
                 if (!widget) {
                     return;
                 }
-                if (isAgentHostBackedWidget(widget)) {
+                if (!includeAgentHost && isAgentHostBackedWidget(widget)) {
                     return;
                 }
                 const range = computeCompletionRanges(model, position, wordPattern, true);
@@ -1138,7 +1187,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(8334, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(9888, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1190,7 +1239,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(8335, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(9889, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1209,7 +1258,8 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                     token,
                     cacheKey.key,
                     this.configurationService,
-                    this.searchService
+                    this.searchService,
+                    MAX_CHAT_FILE_COMPLETION_RESULTS
                 );
                 for (const file of files) {
                     if (!( seen.has(file))) {
@@ -1379,7 +1429,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(8336, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(9890, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

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

@@ -7,29 +7,19 @@ import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { MouseTargetType } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import '@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 { inputPlaceholderForeground } 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 { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
+import { getInputPlaceholderColor, getRangeForPlaceholder } from './chatInputPlaceholderDecoration.js';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
 import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { slashReg, agentReg, variableReg } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { registerChatInputReferenceDecorationType } from './chatInputReferenceDecorations.js';
 import { NativeEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry';
 import { TextAreaEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -59,14 +49,6 @@ function exactlyOneSpaceAfterPart(parsedRequest, part) {
     const nextPart = parsedRequest[partIdx + 1];
     return nextPart && nextPart instanceof ChatRequestTextPart && nextPart.text === " ";
 }
-function getRangeForPlaceholder(part) {
-    return {
-        startLineNumber: part.editorRange.startLineNumber,
-        endLineNumber: part.editorRange.endLineNumber,
-        startColumn: part.editorRange.endColumn + 1,
-        endColumn: 1000
-    };
-}
 let InputEditorDecorations = class InputEditorDecorations extends Disposable {
     static {
         InputEditorDecorations_1 = this;
@@ -100,6 +82,11 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this._register(
             this.widget.inputEditor.onDidChangeModelContent(() => this.triggerInputEditorDecorationsUpdate())
         );
+        this._register(this.widget.inputEditor.onDidChangeConfiguration(e => {
+            if (e.hasChanged(EditorOption.placeholder)) {
+                this.triggerInputEditorDecorationsUpdate();
+            }
+        }));
         this._register(
             this.widget.onDidChangeParsedInput(() => this.triggerInputEditorDecorationsUpdate())
         );
@@ -190,19 +177,10 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 borderRadius: "3px"
             })
         );
-        this._register(
-            this.codeEditorService.registerDecorationType(decorationDescription, dynamicVariableDecorationType, {
-                color: themeColorFromId(chatSlashCommandForeground),
-                backgroundColor: themeColorFromId(chatSlashCommandBackground),
-                borderRadius: "3px",
-                rangeBehavior: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
-            })
-        );
+        this._register(registerChatInputReferenceDecorationType(this.codeEditorService));
     }
     getPlaceholderColor() {
-        const theme = this.themeService.getColorTheme();
-        const transparentForeground = theme.getColor(inputPlaceholderForeground);
-        return transparentForeground?.toString();
+        return getInputPlaceholderColor(this.themeService);
     }
     triggerInputEditorDecorationsUpdate() {
         this.updateInputPlaceholderDecoration();
@@ -217,9 +195,17 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         const viewModel = this.widget.viewModel;
         if (!viewModel) {
             this.updateAriaPlaceholder(undefined);
+            if (inputValue) {
+                this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, []);
+            }
             return;
         }
         if (!inputValue) {
+            if (this.widget.inputEditor.getOption(EditorOption.placeholder)) {
+                this.updateAriaPlaceholder(undefined);
+                this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, []);
+                return;
+            }
             const mode = this.widget.input.currentModeObs.get();
             const placeholder = mode.argumentHint?.get() ?? mode.description.get() ?? "";
             const displayPlaceholder = viewModel.inputPlaceholder || placeholder;
@@ -254,7 +240,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentPart.agent.metadata.followupPlaceholder;
             if (agentPart.agent.description && exactlyOneSpaceAfterPart(parsedRequest, agentPart)) {
                 placeholderDecoration = [{
-                    range: getRangeForPlaceholder(agentPart),
+                    range: getRangeForPlaceholder(agentPart.editorRange),
                     renderOptions: {
                         after: {
                             contentText: shouldRenderFollowupPlaceholder ? agentPart.agent.metadata.followupPlaceholder : agentPart.agent.description,
@@ -272,7 +258,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentSubcommandPart.command.followupPlaceholder;
             if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(parsedRequest, agentSubcommandPart)) {
                 placeholderDecoration = [{
-                    range: getRangeForPlaceholder(agentSubcommandPart),
+                    range: getRangeForPlaceholder(agentSubcommandPart.editorRange),
                     renderOptions: {
                         after: {
                             contentText: shouldRenderFollowupPlaceholder ? agentSubcommandPart.command.followupPlaceholder : agentSubcommandPart.command.description,
@@ -288,7 +274,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         if (onlyAgentCommandAndWhitespace) {
             if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(parsedRequest, agentSubcommandPart)) {
                 placeholderDecoration = [{
-                    range: getRangeForPlaceholder(agentSubcommandPart),
+                    range: getRangeForPlaceholder(agentSubcommandPart.editorRange),
                     renderOptions: {
                         after: {
                             contentText: agentSubcommandPart.command.description,
@@ -326,7 +312,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 const description = promptSlashCommand.argumentHint;
                 if (description) {
                     this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, [{
-                        range: getRangeForPlaceholder(slashPromptPart),
+                        range: getRangeForPlaceholder(slashPromptPart.editorRange),
                         renderOptions: {
                             after: {
                                 contentText: description,
@@ -366,7 +352,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 promptHoverMessage.appendText("\n");
             }
             promptHoverMessage.appendText(( localize(
-                8337,
+                9891,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.d.ts

@@ -6,6 +6,7 @@ import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { type IImageVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
     private readonly editor;
     private readonly instantiationService;
@@ -24,3 +25,20 @@ export declare class ChatAgentHoverPart implements IHoverPart {
     constructor(owner: IEditorHoverParticipant<ChatAgentHoverPart>, range: Range, agent: IChatAgentData);
     isValidForHoverAnchor(anchor: HoverAnchor): boolean;
 }
+export declare class ChatAttachmentReferenceHoverParticipant implements IEditorHoverParticipant<ChatAttachmentReferenceHoverPart> {
+    private readonly editor;
+    private readonly chatWidgetService;
+    readonly hoverOrdinal: number;
+    constructor(editor: ICodeEditor, chatWidgetService: IChatWidgetService);
+    computeSync(anchor: HoverAnchor, _lineDecorations: IModelDecoration[]): ChatAttachmentReferenceHoverPart[];
+    renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ChatAttachmentReferenceHoverPart[]): IRenderedHoverParts<ChatAttachmentReferenceHoverPart>;
+    getAccessibleContent(hoverPart: ChatAttachmentReferenceHoverPart): string;
+}
+export declare class ChatAttachmentReferenceHoverPart implements IHoverPart {
+    readonly owner: IEditorHoverParticipant<ChatAttachmentReferenceHoverPart>;
+    readonly range: Range;
+    readonly attachment: IImageVariableEntry;
+    readonly buffer: Uint8Array;
+    constructor(owner: IEditorHoverParticipant<ChatAttachmentReferenceHoverPart>, range: Range, attachment: IImageVariableEntry, buffer: Uint8Array);
+    isValidForHoverAnchor(anchor: HoverAnchor): boolean;
+}