@codingame/monaco-vscode-katex-common 29.1.0 → 30.0.0

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

@@ -236,10 +236,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             );
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute("aria-label", ( localize(6679, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(6734, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        6680,
+                        6735,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -309,7 +309,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(6681, "Add File to Chat")),
+            title: ( localize2(6736, "Add File to Chat")),
             menu: [{
                 id: MenuId.ChatInlineResourceAnchorContext,
                 group: "chat",
@@ -333,7 +333,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(6682, "Copy")),
+            title: ( localize2(6737, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -360,7 +360,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(6683, "Open to the Side")),
+            title: ( localize2(6738, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -426,8 +426,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(6684, "Go to Definition")),
-                mnemonicTitle: ( localize(6685, "Go to &&Definition"))
+                ...( localize2(6739, "Go to Definition")),
+                mnemonicTitle: ( localize(6740, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -484,8 +484,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(6686, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(6687, "Go to &&Type Definitions"))
+                ...( localize2(6741, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(6742, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -510,8 +510,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(6688, "Go to Implementations")),
-                mnemonicTitle: ( localize(6689, "Go to &&Implementations"))
+                ...( localize2(6743, "Go to Implementations")),
+                mnemonicTitle: ( localize(6744, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -536,8 +536,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(6690, "Go to References")),
-                mnemonicTitle: ( localize(6691, "Go to &&References"))
+                ...( localize2(6745, "Go to References")),
+                mnemonicTitle: ( localize(6746, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -555,4 +555,4 @@ registerAction2(class GoToReferencesAction extends Action2 {
     }
 });
 
-export { InlineAnchorWidget, renderFileWidgets };
+export { InlineAnchorWidget, getEditorOverrideForChatResource, renderFileWidgets };

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

@@ -15,6 +15,7 @@ import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
+import { IEditSessionDiffStats, IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatMarkdownContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
@@ -48,6 +49,12 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: Event<void>;
+    private readonly _onDidChangeDiff;
+    /**
+     * Fires when any edit pill (CollapsedCodeBlock) in this markdown part updates its diff.
+     * The aggregated stats reflect the total added/removed across all edit pills.
+     */
+    readonly onDidChangeDiff: Event<IEditSessionDiffStats>;
     private readonly allRefs;
     private readonly _codeblocks;
     get codeblocks(): IChatCodeBlockInfo[];
@@ -55,6 +62,7 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     constructor(markdown: IChatMarkdownContent, context: IChatContentPartRenderContext, editorPool: EditorPool, fillInIncompleteTokens: boolean | undefined, codeBlockStartIndex: number | undefined, renderer: IMarkdownRenderer, markdownRenderOptions: MarkdownRenderOptions | undefined, currentWidth: number, codeBlockModelCollection: CodeBlockModelCollection, rendererOptions: IChatMarkdownContentPartOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, textModelService: ITextModelService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService);
     dispose(): void;
     private renderCodeBlockPill;
+    private fireAggregatedDiff;
     private renderCodeBlock;
     hasSameContent(other: IChatProgressRenderableResponseContent): boolean;
     layout(width: number): void;
@@ -84,6 +92,9 @@ export declare class CollapsedCodeBlock extends Disposable {
     private readonly hover;
     private tooltip;
     private currentDiff;
+    get diff(): IEditSessionEntryDiff | undefined;
+    private readonly _onDidChangeDiff;
+    readonly onDidChangeDiff: Event<IEditSessionEntryDiff>;
     private readonly progressStore;
     constructor(sessionResource: URI, requestId: string, inUndoStop: string | undefined, labelService: ILabelService, editorService: IEditorService, modelService: IModelService, languageService: ILanguageService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, menuService: IMenuService, hoverService: IHoverService, chatService: IChatService, configurationService: IConfigurationService);
     private registerListeners;

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

@@ -99,6 +99,8 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         this.codeblocksPartId = String(++ChatMarkdownContentPart_1.ID_POOL);
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
+        this._onDidChangeDiff = this._register(( new Emitter()));
+        this.onDidChangeDiff = this._onDidChangeDiff.event;
         this.allRefs = [];
         this._codeblocks = [];
         this.mathLayoutParticipants = ( new Set());
@@ -293,7 +295,6 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                                 this._codeblocks[codeBlockInfo.codeBlockPartIndex].codemapperUri = e.codemapperUri;
                             });
                         }
-                        this.allRefs.push(ref);
                         const ownerMarkdownPartId = this.codeblocksPartId;
                         const info = new (class {
                             constructor() {
@@ -382,14 +383,35 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
     }
     renderCodeBlockPill(sessionResource, requestId, inUndoStop, codemapperUri) {
         const codeBlock = this.instantiationService.createInstance(CollapsedCodeBlock, sessionResource, requestId, inUndoStop);
-        if (codemapperUri) {
-            codeBlock.render(codemapperUri);
-        }
-        return {
+        const diffListenerStore = ( new DisposableStore());
+        const ref = {
             object: codeBlock,
             isStale: () => false,
-            dispose: () => codeBlock.dispose()
+            dispose: () => {
+                codeBlock.dispose();
+                diffListenerStore.dispose();
+            }
         };
+        this.allRefs.push(ref);
+        diffListenerStore.add(codeBlock.onDidChangeDiff(() => this.fireAggregatedDiff()));
+        if (codemapperUri) {
+            codeBlock.render(codemapperUri);
+        }
+        return ref;
+    }
+    fireAggregatedDiff() {
+        let totalAdded = 0;
+        let totalRemoved = 0;
+        for (const ref of this.allRefs) {
+            if (ref.object instanceof CollapsedCodeBlock && ref.object.diff) {
+                totalAdded += ref.object.diff.added;
+                totalRemoved += ref.object.diff.removed;
+            }
+        }
+        this._onDidChangeDiff.fire({
+            added: totalAdded,
+            removed: totalRemoved
+        });
     }
     renderCodeBlock(data, text, isComplete, currentWidth) {
         const ref = this.editorPool.get();
@@ -456,6 +478,9 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
     get uri() {
         return this._uri;
     }
+    get diff() {
+        return this.currentDiff;
+    }
     constructor(
         sessionResource,
         requestId,
@@ -486,6 +511,8 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
         this.chatService = chatService;
         this.configurationService = configurationService;
         this.hover = this._register(( new MutableDisposable()));
+        this._onDidChangeDiff = this._register(( new Emitter()));
+        this.onDidChangeDiff = this._onDidChangeDiff.event;
         this.progressStore = this._store.add(( new DisposableStore()));
         this.element = $("div.chat-codeblock-pill-container");
         this.statusIndicatorContainer = $("div.status-indicator-container");
@@ -588,7 +615,7 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 statusIconEl.classList.add(...statusIconClasses);
                 const entry = editSession.readEntry(uri, r);
                 const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
-                statusLabelEl.textContent = ( localize(6692, "Applying edits"));
+                statusLabelEl.textContent = ( localize(6747, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -597,13 +624,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 } else {
                     progressFill.style.width = "0%";
                     this.pillElement.classList.remove("progress-filling");
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6693, "Generating edits...")) : ( localize(6694, "({0}%)...", rwRatio));
+                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6748, "Generating edits...")) : ( localize(6749, "({0}%)...", rwRatio));
                 }
             } else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(6695, "Edited"));
+                statusLabelEl.textContent = ( localize(6750, "Edited"));
                 const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -621,12 +648,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
             const labelRemoved = this.pillElement.querySelector(".label-removed") ?? this.pillElement.appendChild($$1("span.label-removed"));
             if (changes && !changes?.identical && !changes?.quitEarly) {
                 this.currentDiff = changes;
+                this._onDidChangeDiff.fire(changes);
                 labelAdded.textContent = `+${changes.added}`;
                 labelRemoved.textContent = `-${changes.removed}`;
-                const insertionsFragment = changes.added === 1 ? ( localize(6696, "1 insertion")) : ( localize(6697, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(6698, "1 deletion")) : ( localize(6699, "{0} deletions", changes.removed));
+                const insertionsFragment = changes.added === 1 ? ( localize(6751, "1 insertion")) : ( localize(6752, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(6753, "1 deletion")) : ( localize(6754, "{0} deletions", changes.removed));
                 const summary = ( localize(
-                    6700,
+                    6755,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,

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

@@ -92,25 +92,25 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             text: "`" + escapeMarkdownSyntaxTokens(s.label) + "`",
             id: McpCommandIds.ServerOptions,
             arguments: [s.id],
-            tooltip: ( localize(6701, "Show options for {0}", s.label))
+            tooltip: ( localize(6756, "Show options for {0}", s.label))
         }, false))).join(", ");
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            text: ( localize(6702, "Skip?")),
+            text: ( localize(6757, "Skip?")),
             id: McpCommandIds.SkipCurrentAutostart,
-            tooltip: ( localize(6703, "Skip starting this MCP server"))
+            tooltip: ( localize(6758, "Skip starting this MCP server"))
         });
         let content;
         if (state.starting.length === 0) {
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendText(( localize(6704, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
+            })).appendText(( localize(6759, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
         } else {
             const serverLinks = this.createServerCommandLinks(state.starting);
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendMarkdown(( localize(6705, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
+            })).appendMarkdown(( localize(6760, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
         }
         if (this.workingProgressPart) {
             this.workingProgressPart.updateMessage(content);
@@ -149,12 +149,12 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
         const count = serversRequiringInteraction.length;
         const links = this.createServerCommandLinks(serversRequiringInteraction);
         const content = count === 1 ? ( localize(
-            6706,
+            6761,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            6707,
+            6762,
             "The MCP servers {0} may have new tools and require interaction to start. [Start them now?]({1})",
             links,
             "#start"
@@ -196,7 +196,7 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             const serversToStart = state.serversRequiringInteraction;
             for (let i = 0; i < serversToStart.length; i++) {
                 const serverInfo = serversToStart[i];
-                startLink.textContent = ( localize(6708, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(6763, "Starting {0}...", serverInfo.label));
                 const server = this.mcpService.servers.get().find(s => s.definition.id === serverInfo.id);
                 if (server) {
                     await startServerAndWaitForLiveTools(server, {

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

@@ -64,7 +64,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
         const viewListButton = ( new ButtonWithIcon(viewListButtonContainer, {}));
         this._register(autorun(reader => {
             const fileCount = this.diffData.read(reader).resources.length;
-            viewListButton.label = fileCount === 1 ? ( localize(6709, "Changed 1 file")) : ( localize(6710, "Changed {0} files", fileCount));
+            viewListButton.label = fileCount === 1 ? ( localize(6764, "Changed 1 file")) : ( localize(6765, "Changed {0} files", fileCount));
         }));
         const setExpansionState = () => {
             viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
@@ -86,7 +86,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
     renderViewAllFileChangesButton(container) {
         const button = container.appendChild($(".chat-view-changes-icon"));
         button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
-        button.title = ( localize(6711, "Open Changes"));
+        button.title = ( localize(6766, "Open Changes"));
         return addDisposableListener(button, "click", e => {
             const source = ( URI.parse(`multi-diff-editor:${( ( new Date()).getMilliseconds().toString()) + ( Math.random().toString())}`));
             const {
@@ -143,7 +143,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
                 alwaysConsumeMouseWheel: false,
                 accessibilityProvider: {
                     getAriaLabel: element => element.uri.path,
-                    getWidgetAriaLabel: () => ( localize(6712, "File Changes"))
+                    getWidgetAriaLabel: () => ( localize(6767, "File Changes"))
                 }
             })
         );
@@ -259,7 +259,7 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($(".deletions"));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute("aria-label", ( localize(
-                6713,
+                6768,
                 "{0} lines added, {1} lines removed",
                 element.diff.added,
                 element.diff.removed

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

@@ -146,7 +146,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
         configurationService,
         languageModelToolsService
     ) {
-        const defaultLabel = ( localize(6714, "Working"));
+        const defaultLabel = ( localize(6769, "Working"));
         const pool = buildPhrasePool([defaultLabel], configurationService);
         const label = pool[Math.floor(Math.random() * pool.length)];
         const progressMessage = {
@@ -168,7 +168,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
         );
         this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
             if (isEqual(context.element.sessionResource, e.sessionResource)) {
-                this.updateMessage(( new MarkdownString(( localize(6715, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
+                this.updateMessage(( new MarkdownString(( localize(6770, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
             }
         }));
     }

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

@@ -151,6 +151,7 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
     private renderSingleSelect;
     private renderMultiSelect;
     private getCurrentAnswer;
+    private getOptionsWithDefaultsFirst;
     /**
      * Renders a "Skipped" message when the carousel is dismissed without answers.
      */