@codingame/monaco-vscode-chat-service-override 37.2.0 → 37.3.0

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

@@ -46,20 +46,20 @@ import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vsco
 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-katex-common/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables';
+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';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
 import { matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
-import { ChatSubmitAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+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, getCompletionRangeWord, getAttachedContextCompletionMatch, getAttachedContextCompletionSortText, attachedContextCompletionAdditionalTriggerCharacters } from './chatInputCompletionUtils.js';
+import { computeCompletionRanges, isEmptyUpToCompletionWord, escapeForCharClass, getCompletionRangeWord, getAttachedContextCompletionMatch, getAttachedContextCompletionSortText, attachedContextCompletionAdditionalTriggerCharacters } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletionUtils';
 import { AgentSessionProviders, getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 
 var BuiltinDynamicCompletions_1, ToolCompletions_1;
@@ -113,7 +113,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 }
                 const sessionType = getChatSessionType(widget.viewModel.model.sessionResource);
                 return {
-                    suggestions: ( slashCommands.filter(c => {
+                    suggestions: slashCommands.filter(c => {
                         if (!c.silent && !widget.attachmentCapabilities.supportsPromptAttachments) {
                             return false;
                         }
@@ -151,7 +151,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                                 }]
                             } : undefined
                         };
-                    }))
+                    })
                 };
             }
         }));
@@ -182,7 +182,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 }
                 const currentSessionType = getChatSessionType(widget.viewModel.model.sessionResource);
                 return {
-                    suggestions: ( slashCommands.filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when)).filter(c => matchesSessionType(c.sessionTypes, currentSessionType)).map((c, i) => {
+                    suggestions: slashCommands.filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when)).filter(c => matchesSessionType(c.sessionTypes, currentSessionType)).map((c, i) => {
                         const withSlash = `${chatSubcommandLeader}${c.command}`;
                         return {
                             label: {
@@ -204,7 +204,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                                 }]
                             } : undefined
                         };
-                    }))
+                    })
                 };
             }
         }));
@@ -247,7 +247,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                     return null;
                 }
                 return {
-                    suggestions: ( userInvocableCommands.map((c, i) => {
+                    suggestions: userInvocableCommands.map((c, i) => {
                         const colonLabel = `/${c.name}`;
                         const hasSubcommand = c.name.includes(":");
                         const displayLabel = hasSubcommand ? `/${c.name.replace(/:/g, " ")}` : colonLabel;
@@ -264,7 +264,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                             sortText: "a".repeat(i + 1),
                             kind: CompletionItemKind.Text
                         };
-                    }))
+                    })
                 };
             }
         }));
@@ -293,7 +293,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                     return null;
                 }
                 return {
-                    suggestions: mcpService.servers.get().flatMap(server => ( server.prompts.get().map(prompt => {
+                    suggestions: mcpService.servers.get().flatMap(server => server.prompts.get().map(prompt => {
                         const label = `/mcp.${prompt.id}`;
                         return {
                             label: {
@@ -309,7 +309,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                             range,
                             kind: CompletionItemKind.Text
                         };
-                    })))
+                    }))
                 };
             }
         }));
@@ -351,7 +351,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                     return;
                 }
                 return {
-                    suggestions: ( usedAgent.agent.slashCommands.map((c, i) => {
+                    suggestions: usedAgent.agent.slashCommands.map((c, i) => {
                         const withSlash = `/${c.name}`;
                         return {
                             label: withSlash,
@@ -360,7 +360,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                             range,
                             kind: CompletionItemKind.Text
                         };
-                    }))
+                    })
                 };
             }
         };
@@ -395,13 +395,13 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 }
                 const agents = this.chatAgentService.getAgents().filter(a => a.locations.includes(widget.location));
                 const chatSessionContributions = this.chatSessionsService.getAllChatSessionContributions();
-                const chatSessionAgentIds = ( new Set(( chatSessionContributions.map(contribution => contribution.type))));
+                const chatSessionAgentIds = ( new Set(chatSessionContributions.map(contribution => contribution.type)));
                 const agentsForSlashCommands = agents.filter(a => !( chatSessionAgentIds.has(a.id)));
                 const getFilterText = (agent, command) => {
                     const dummyPrefix = agent.id === "github.copilot.terminalPanel" ? `0000` : ``;
                     return `${chatAgentLeader}${dummyPrefix}${agent.name}.${command}`;
                 };
-                const justAgents = ( agents.filter(a => !a.isDefault).filter(a => !( chatSessionAgentIds.has(a.id))).map(agent => {
+                const justAgents = agents.filter(a => !a.isDefault).filter(a => !( chatSessionAgentIds.has(a.id))).map(agent => {
                     const {
                         label: agentLabel,
                         isDupe
@@ -428,47 +428,49 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                             }]
                         }
                     };
-                }));
+                });
                 return {
-                    suggestions: justAgents.concat(coalesce(agentsForSlashCommands.flatMap(agent => ( agent.slashCommands.map((c, i) => {
-                        if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentModeKind)?.id !== agent.id) {
-                            return;
-                        }
-                        const {
-                            label: agentLabel,
-                            isDupe
-                        } = this.getAgentCompletionDetails(agent);
-                        const label = `${agentLabel} ${chatSubcommandLeader}${c.name}`;
-                        const item = {
-                            label: isDupe ? {
-                                label,
-                                description: c.description,
-                                detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined
-                            } : label,
-                            documentation: c.description,
-                            filterText: getFilterText(agent, c.name),
-                            commitCharacters: [" "],
-                            insertText: label + " ",
-                            range,
-                            kind: CompletionItemKind.Text,
-                            sortText: `x${chatAgentLeader}${agent.name}${c.name}`,
-                            command: {
-                                id: AssignSelectedAgentAction.ID,
-                                title: AssignSelectedAgentAction.ID,
-                                arguments: [{
-                                    agent,
-                                    widget
-                                }]
+                    suggestions: justAgents.concat(coalesce(
+                        agentsForSlashCommands.flatMap(agent => agent.slashCommands.map((c, i) => {
+                            if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentModeKind)?.id !== agent.id) {
+                                return;
                             }
-                        };
-                        if (agent.isDefault) {
-                            const label = `${chatSubcommandLeader}${c.name}`;
-                            item.label = label;
-                            item.insertText = `${label} `;
-                            item.documentation = c.description;
-                        }
-                        return item;
-                    })))))
+                            const {
+                                label: agentLabel,
+                                isDupe
+                            } = this.getAgentCompletionDetails(agent);
+                            const label = `${agentLabel} ${chatSubcommandLeader}${c.name}`;
+                            const item = {
+                                label: isDupe ? {
+                                    label,
+                                    description: c.description,
+                                    detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined
+                                } : label,
+                                documentation: c.description,
+                                filterText: getFilterText(agent, c.name),
+                                commitCharacters: [" "],
+                                insertText: label + " ",
+                                range,
+                                kind: CompletionItemKind.Text,
+                                sortText: `x${chatAgentLeader}${agent.name}${c.name}`,
+                                command: {
+                                    id: AssignSelectedAgentAction.ID,
+                                    title: AssignSelectedAgentAction.ID,
+                                    arguments: [{
+                                        agent,
+                                        widget
+                                    }]
+                                }
+                            };
+                            if (agent.isDefault) {
+                                const label = `${chatSubcommandLeader}${c.name}`;
+                                item.label = label;
+                                item.insertText = `${label} `;
+                                item.documentation = c.description;
+                            }
+                            return item;
+                        }))
+                    ))
                 };
             }
         }));
@@ -502,7 +504,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                     a => a.locations.includes(widget.location) && a.modes.includes(widget.input.currentModeKind)
                 ).filter(a => !this.chatSessionsService.getChatSessionContribution(a.id));
                 return {
-                    suggestions: coalesce(agents.flatMap(agent => ( agent.slashCommands.map((c, i) => {
+                    suggestions: coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
                         if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentModeKind)?.id !== agent.id) {
                             return;
                         }
@@ -541,7 +543,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                             item.documentation = c.description;
                         }
                         return item;
-                    }))))
+                    })))
                 };
             }
         }));
@@ -572,7 +574,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(10015, "Install Chat Extensions..."));
+                const label = ( localize(12007, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -720,7 +722,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(10016, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(12008, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -748,15 +750,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(10017, "Prompt Resource"))
+                            name: ( localize(12009, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(10018, "Prompt Image")),
-                        fullName: ( localize(10018, "Prompt Image")),
+                        name: ( localize(12010, "Prompt Image")),
+                        fullName: ( localize(12010, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -879,35 +881,37 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             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(10019, "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)))]
+            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(12011, "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
@@ -1099,7 +1103,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 result.suggestions.push({
                     label: {
                         label: sessionPrefix,
-                        description: ( localize(10020, "Attach a chat session"))
+                        description: ( localize(12012, "Attach a chat session"))
                     },
                     filterText: sessionPrefix,
                     insertText: `${sessionPrefix}:`,
@@ -1187,7 +1191,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(10021, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(12013, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1239,14 +1243,14 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(10022, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(12014, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
         }
         if (pattern) {
             const cacheKey = this.updateCacheKey();
-            const workspaces = ( this.workspaceContextService.getWorkspace().folders.map(folder => folder.uri));
+            const workspaces = this.workspaceContextService.getWorkspace().folders.map(folder => folder.uri);
             for (const workspace of workspaces) {
                 const {
                     folders,
@@ -1429,7 +1433,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(10023, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(12015, "{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

@@ -12,14 +12,14 @@ import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/c
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { getInputPlaceholderColor, getRangeForPlaceholder } from './chatInputPlaceholderDecoration.js';
+import { getInputPlaceholderColor, getRangeForPlaceholder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputPlaceholderDecoration';
 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 { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-api/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-katex-common/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
+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 { registerChatInputReferenceDecorationType } from './chatInputReferenceDecorations.js';
+import { registerChatInputReferenceDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputReferenceDecorations';
 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';
@@ -352,7 +352,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 promptHoverMessage.appendText("\n");
             }
             promptHoverMessage.appendText(( localize(
-                10024,
+                12016,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true

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

@@ -6,7 +6,7 @@ import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from '@
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 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 { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
 import { extractAgentAndCommand, ChatRequestDynamicVariablePart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -21,7 +21,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/mod
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { coerceImageBuffer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatImageBuffer';
-import { createImageHoverContent } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets';
+import { createImageHoverContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
     constructor(editor, instantiationService, chatWidgetService, commandService) {
@@ -74,7 +74,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(10025, "There is a chat agent hover part here.");
+        return localize(12017, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));
@@ -129,7 +129,7 @@ let ChatAttachmentReferenceHoverParticipant = class ChatAttachmentReferenceHover
             hoverPart.attachment.id,
             () => context.onContentsChanged()
         );
-        hover.element.setAttribute("aria-label", ( localize(10026, "Image attachment reference, {0}", hoverPart.attachment.name)));
+        hover.element.setAttribute("aria-label", ( localize(12018, "Image attachment reference, {0}", hoverPart.attachment.name)));
         context.fragment.appendChild(hover.element);
         return ( new RenderedHoverParts([{
             hoverPart,
@@ -138,7 +138,7 @@ let ChatAttachmentReferenceHoverParticipant = class ChatAttachmentReferenceHover
         }]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(10027, "Image attachment reference, {0}", hoverPart.attachment.name);
+        return localize(12019, "Image attachment reference, {0}", hoverPart.attachment.name);
     }
 };
 ChatAttachmentReferenceHoverParticipant = ( __decorate([( __param(1, IChatWidgetService))], ChatAttachmentReferenceHoverParticipant));

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

@@ -6,7 +6,7 @@ import { $ as $$1, h as h$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 
-registerCss(editorHoverWrapper);
+registerCss(editorHoverWrapper, 1);
 const $ = $$1;
 const h = h$1;
 let ChatEditorHoverWrapper = class ChatEditorHoverWrapper {

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    10194,
+                    12186,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
@@ -320,7 +320,7 @@ let QuickChat = class QuickChat extends Disposable {
                             if (isCellTextEditOperationArray(group)) {
                                 message.push({
                                     kind: "textEdit",
-                                    edits: ( group.map(e => e.edit)),
+                                    edits: group.map(e => e.edit),
                                     uri: group[0].uri
                                 });
                             } else {

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js

@@ -195,7 +195,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(10195, "Loading..."));
+            const loadingMessage = ( localize(12187, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts

@@ -26,8 +26,8 @@ import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/wor
 import { SessionTypeSelectionReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { AgentSessionsControl } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl";
 import { ChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
-import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
-import { IChatViewsWelcomeDescriptor } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome";
+import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
+import { IChatViewsWelcomeDescriptor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { AgentSessionsViewerOrientation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
@@ -35,7 +35,7 @@ import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IAgentHostEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostEnablementService.service";
-import { IAgentSession } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
+import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IMicCaptureService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/micCaptureService.service";