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

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

@@ -6,11 +6,12 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ChatEditPillElement } from './chatEditPillElement.js';
+import { ChatEditPillElement, isResourceContentEmpty } from './chatEditPillElement.js';
 
 let ChatExternalEditContentPart = class ChatExternalEditContentPart extends ChatEditPillElement {
     get domNode() {
@@ -23,11 +24,13 @@ let ChatExternalEditContentPart = class ChatExternalEditContentPart extends Chat
         modelService,
         languageService,
         hoverService,
-        editorService
+        editorService,
+        textModelService
     ) {
         super(labelService, modelService, languageService, hoverService);
         this.edit = edit;
         this.editorService = editorService;
+        this.textModelService = textModelService;
         this._onDidChangeDiff = this._register(( new Emitter()));
         this.onDidChangeDiff = this._onDidChangeDiff.event;
         this.render(edit);
@@ -45,10 +48,10 @@ let ChatExternalEditContentPart = class ChatExternalEditContentPart extends Chat
         if (edit.diff && (edit.diff.added > 0 || edit.diff.removed > 0)) {
             this.setDiff(edit.diff);
             const fileName = this.labelService.getUriBasenameLabel(edit.uri);
-            const insertionsFragment = edit.diff.added === 1 ? ( localize(7266, "1 insertion")) : ( localize(7267, "{0} insertions", edit.diff.added));
-            const deletionsFragment = edit.diff.removed === 1 ? ( localize(7268, "1 deletion")) : ( localize(7269, "{0} deletions", edit.diff.removed));
+            const insertionsFragment = edit.diff.added === 1 ? ( localize(7809, "1 insertion")) : ( localize(7810, "{0} insertions", edit.diff.added));
+            const deletionsFragment = edit.diff.removed === 1 ? ( localize(7811, "1 deletion")) : ( localize(7812, "{0} deletions", edit.diff.removed));
             this.setAriaLabel(( localize(
-                7270,
+                7813,
                 "Edited {0}, {1}, {2}",
                 fileName,
                 insertionsFragment,
@@ -69,7 +72,7 @@ let ChatExternalEditContentPart = class ChatExternalEditContentPart extends Chat
             this.setAriaLabel(`${label} ${this.labelService.getUriBasenameLabel(edit.uri)}`);
         }
     }
-    openEdit(
+    async openEdit(
         {
             editorOptions: options,
             openToSide
@@ -77,6 +80,13 @@ let ChatExternalEditContentPart = class ChatExternalEditContentPart extends Chat
     ) {
         const group = openToSide ? SIDE_GROUP : undefined;
         if (this.edit.beforeContentUri && this.edit.afterContentUri) {
+            if (this.edit.editKind === "edit" && (this.edit.diff?.removed ?? 0) === 0 && (await isResourceContentEmpty(this.textModelService, this.edit.beforeContentUri))) {
+                this.editorService.openEditor({
+                    resource: this.edit.uri,
+                    options
+                }, group);
+                return;
+            }
             this.editorService.openEditor({
                 original: {
                     resource: this.edit.beforeContentUri
@@ -105,28 +115,28 @@ let ChatExternalEditContentPart = class ChatExternalEditContentPart extends Chat
         return (isEqual(other.uri, this.edit.uri) && other.editKind === this.edit.editKind && (other.diff?.added ?? 0) === (this.edit.diff?.added ?? 0) && (other.diff?.removed ?? 0) === (this.edit.diff?.removed ?? 0));
     }
 };
-ChatExternalEditContentPart = ( __decorate([( __param(2, ILabelService)), ( __param(3, IModelService)), ( __param(4, ILanguageService)), ( __param(5, IHoverService)), ( __param(6, IEditorService))], ChatExternalEditContentPart));
+ChatExternalEditContentPart = ( __decorate([( __param(2, ILabelService)), ( __param(3, IModelService)), ( __param(4, ILanguageService)), ( __param(5, IHoverService)), ( __param(6, IEditorService)), ( __param(7, ITextModelService))], ChatExternalEditContentPart));
 function describeEdit(edit) {
     switch (edit.editKind) {
     case "create":
         return {
             icon: Codicon.check,
-            label: ( localize(7271, "Created"))
+            label: ( localize(7814, "Created"))
         };
     case "delete":
         return {
             icon: Codicon.check,
-            label: ( localize(7272, "Deleted"))
+            label: ( localize(7815, "Deleted"))
         };
     case "rename":
         return {
             icon: Codicon.check,
-            label: ( localize(7273, "Renamed"))
+            label: ( localize(7816, "Renamed"))
         };
     case "edit":
         return {
             icon: Codicon.check,
-            label: ( localize(7274, "Edited"))
+            label: ( localize(7817, "Edited"))
         };
     }
 }

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

@@ -20,7 +20,7 @@ let ChatHookContentPart = class ChatHookContentPart extends ChatCollapsibleConte
         const isStopped = !!hookPart.stopReason;
         const isWarning = !!hookPart.systemMessage;
         const toolName = hookPart.toolDisplayName;
-        const title = isStopped ? (toolName ? ( localize(7275, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7276, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(7277, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7278, "Warning from {0} hook", hookTypeLabel)));
+        const title = isStopped ? (toolName ? ( localize(7818, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7819, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(7820, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7821, "Warning from {0} hook", hookTypeLabel)));
         super(title, context, undefined, hoverService, configurationService);
         this.hookPart = hookPart;
         this.icon = isStopped ? Codicon.error : isWarning ? Codicon.warning : Codicon.check;

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

@@ -246,10 +246,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             );
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute("aria-label", ( localize(7279, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(7822, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        7280,
+                        7823,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -319,7 +319,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(7281, "Add File to Chat")),
+            title: ( localize2(7824, "Add File to Chat")),
             menu: [{
                 id: MenuId.ChatInlineResourceAnchorContext,
                 group: "chat",
@@ -343,7 +343,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(7282, "Copy")),
+            title: ( localize2(7825, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -370,7 +370,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(7283, "Open to the Side")),
+            title: ( localize2(7826, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -436,8 +436,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(7284, "Go to Definition")),
-                mnemonicTitle: ( localize(7285, "Go to &&Definition"))
+                ...( localize2(7827, "Go to Definition")),
+                mnemonicTitle: ( localize(7828, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -494,8 +494,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(7286, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(7287, "Go to &&Type Definitions"))
+                ...( localize2(7829, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(7830, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -520,8 +520,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(7288, "Go to Implementations")),
-                mnemonicTitle: ( localize(7289, "Go to &&Implementations"))
+                ...( localize2(7831, "Go to Implementations")),
+                mnemonicTitle: ( localize(7832, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -546,8 +546,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(7290, "Go to References")),
-                mnemonicTitle: ( localize(7291, "Go to &&References"))
+                ...( localize2(7833, "Go to References")),
+                mnemonicTitle: ( localize(7834, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,

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

@@ -4,6 +4,7 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
@@ -18,6 +19,7 @@ import { IEditSessionDiffStats, IEditSessionEntryDiff } from "@codingame/monaco-
 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";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatOutputRendererService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service";
 import { ICodeBlockRenderOptions } from "./codeBlockPart.js";
@@ -43,6 +45,7 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     private readonly instantiationService;
     private readonly aiEditTelemetryService;
     private readonly chatOutputRendererService;
+    private readonly chatSessionsService;
     private static ID_POOL;
     readonly codeblocksPartId: string;
     readonly domNode: HTMLElement;
@@ -60,7 +63,7 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     private readonly mathLayoutParticipants;
     /** Incremental rendering morpher — only created when the experiment is enabled. */
     private _incrementalMorpher;
-    constructor(markdown: IChatMarkdownContent, context: IChatContentPartRenderContext, editorPool: EditorPool, fillInIncompleteTokens: boolean | undefined, codeBlockStartIndex: number | undefined, renderer: IMarkdownRenderer, markdownRenderOptions: MarkdownRenderOptions | undefined, currentWidth: number, rendererOptions: IChatMarkdownContentPartOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService, chatOutputRendererService: IChatOutputRendererService);
+    constructor(markdown: IChatMarkdownContent, context: IChatContentPartRenderContext, editorPool: EditorPool, fillInIncompleteTokens: boolean | undefined, codeBlockStartIndex: number | undefined, renderer: IMarkdownRenderer, markdownRenderOptions: MarkdownRenderOptions | undefined, currentWidth: number, rendererOptions: IChatMarkdownContentPartOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService, chatOutputRendererService: IChatOutputRendererService, chatSessionsService: IChatSessionsService);
     dispose(): void;
     private renderCodeBlockPill;
     private renderChatOutputCodeBlock;
@@ -102,12 +105,13 @@ export declare class CollapsedCodeBlock extends ChatEditPillElement {
     private readonly menuService;
     private readonly chatService;
     private readonly configurationService;
+    private readonly textModelService;
     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);
+    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, textModelService: ITextModelService);
     private showDiff;
     /**
      * @param uri URI of the file on-disk being changed

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

@@ -24,6 +24,7 @@ import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
@@ -42,6 +43,7 @@ import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { MarkedKatexSupport } from '../../../../markdown/browser/markedKatexSupport.js';
 import { extractCodeblockUrisFromText, extractVulnerabilitiesFromText } from '../../../common/widget/annotations.js';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatOutputRendererService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service';
@@ -50,7 +52,7 @@ import { parseUnifiedDiff, MarkdownDiffBlockPart } from './chatDiffBlockPart.js'
 import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
 import { CodeBlockPart } from './codeBlockPart.js';
 import * as chatCodeBlockPill from './media/chatCodeBlockPill.css';
-import { ChatEditPillElement } from './chatEditPillElement.js';
+import { ChatEditPillElement, isResourceContentEmpty } from './chatEditPillElement.js';
 import { ChatExtensionsContentPart } from './chatExtensionsContentPart.js';
 import { ChatProgressSubPart } from './chatProgressContentPart.js';
 import { IncrementalDOMMorpher } from './chatIncrementalRendering/chatIncrementalRendering.js';
@@ -87,7 +89,8 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         configurationService,
         instantiationService,
         aiEditTelemetryService,
-        chatOutputRendererService
+        chatOutputRendererService,
+        chatSessionsService
     ) {
         super();
         this.markdown = markdown;
@@ -96,6 +99,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         this.instantiationService = instantiationService;
         this.aiEditTelemetryService = aiEditTelemetryService;
         this.chatOutputRendererService = chatOutputRendererService;
+        this.chatSessionsService = chatSessionsService;
         this.codeblocksPartId = String(++ChatMarkdownContentPart_1.ID_POOL);
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
@@ -161,6 +165,12 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 gfm: true,
                 breaks: true
             };
+            const configuredUriTransformer = markdownRenderOptions?.transformUri;
+            const transformUri = isResponseVM(element) ? (href, kind) => this.chatSessionsService.resolveChatResponseUri(
+                element.sessionResource,
+                configuredUriTransformer?.(href, kind) ?? href,
+                kind
+            ) : configuredUriTransformer;
             const result = store.add(renderer.render(this.markdown.content, {
                 sanitizerConfig: MarkedKatexSupport.getSanitizerOptions({
                     allowedTags: allowedChatMarkdownHtmlTags,
@@ -313,7 +323,8 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 },
                 markedOptions: markedOpts,
                 markedExtensions,
-                ...markdownRenderOptions
+                ...markdownRenderOptions,
+                transformUri
             }, this.domNode));
             if (isResponseVM(element) && !element.model.codeBlockInfos && element.model.isComplete) {
                 element.model.initializeCodeBlockInfos(( this._codeblocks.map(info => {
@@ -323,7 +334,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                             feature: "sideBarChat",
                             editDeltaInfo: info.editDeltaInfo,
                             languageId: info.languageId,
-                            modeId: element.model.request?.modeInfo?.modeId,
+                            modeId: element.model.request?.modeInfo?.telemetryModeId,
                             modelId: element.model.request?.modelId,
                             applyCodeBlockSuggestionId: undefined,
                             source: undefined,
@@ -506,7 +517,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         this._register(disposable);
     }
 };
-ChatMarkdownContentPart = ChatMarkdownContentPart_1 = ( __decorate([( __param(9, IContextKeyService)), ( __param(10, IConfigurationService)), ( __param(11, IInstantiationService)), ( __param(12, IAiEditTelemetryService)), ( __param(13, IChatOutputRendererService))], ChatMarkdownContentPart));
+ChatMarkdownContentPart = ChatMarkdownContentPart_1 = ( __decorate([( __param(9, IContextKeyService)), ( __param(10, IConfigurationService)), ( __param(11, IInstantiationService)), ( __param(12, IAiEditTelemetryService)), ( __param(13, IChatOutputRendererService)), ( __param(14, IChatSessionsService))], ChatMarkdownContentPart));
 function equalsInlineReferences(a, b) {
     if (a === b) {
         return true;
@@ -587,7 +598,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
         this._disposeCts = this._register(( new CancellationTokenSource()));
         this._renderedOutputPart = this._register(( new MutableDisposable()));
         this.reuseKey = ChatOutputCodeBlockPart_1.reuseKey(context.element.id, codeBlockIndex, identifier);
-        const title = ( localize(7292, "Rendered code block {0}", codeBlockIndex + 1));
+        const title = ( localize(7835, "Rendered code block {0}", codeBlockIndex + 1));
         this.element = $(".interactive-result-code-block.chat-output-code-block.tool-output-part");
         this.element.tabIndex = -1;
         this.element.ariaLabel = title;
@@ -604,7 +615,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
             parent.style.height = `${partState.height}px`;
         }
         const progressMessage = $("span");
-        progressMessage.textContent = ( localize(7293, "Rendering code block..."));
+        progressMessage.textContent = ( localize(7836, "Rendering code block..."));
         const progressPart = this._register(this.instantiationService.createInstance(
             ChatProgressSubPart,
             progressMessage,
@@ -680,7 +691,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
         iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
         errorHeaderNode.append(iconElement);
         const errorTitleNode = $(".output-error-title");
-        errorTitleNode.textContent = ( localize(7294, "Error rendering the code block"));
+        errorTitleNode.textContent = ( localize(7837, "Error rendering the code block"));
         errorHeaderNode.append(errorTitleNode);
         const errorMessageNode = $(".output-error-details");
         errorMessageNode.textContent = error?.message || String(error);
@@ -706,7 +717,8 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
         menuService,
         hoverService,
         chatService,
-        configurationService
+        configurationService,
+        textModelService
     ) {
         super(labelService, modelService, languageService, hoverService);
         this.sessionResource = sessionResource;
@@ -718,6 +730,7 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
         this.menuService = menuService;
         this.chatService = chatService;
         this.configurationService = configurationService;
+        this.textModelService = textModelService;
         this._onDidChangeDiff = this._register(( new Emitter()));
         this.onDidChangeDiff = this._onDidChangeDiff.event;
         this.progressStore = this._store.add(( new DisposableStore()));
@@ -743,13 +756,21 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
             });
         }));
     }
-    showDiff(
+    async showDiff(
         {
             editorOptions: options,
             openToSide
         }
     ) {
+        const group = openToSide ? SIDE_GROUP : undefined;
         if (this.currentDiff) {
+            if (this.currentDiff.removed === 0 && (await isResourceContentEmpty(this.textModelService, this.currentDiff.originalURI)) && this.uri) {
+                this.editorService.openEditor({
+                    resource: this.uri,
+                    options
+                }, group);
+                return;
+            }
             this.editorService.openEditor({
                 original: {
                     resource: this.currentDiff.originalURI
@@ -758,12 +779,12 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
                     resource: this.currentDiff.modifiedURI
                 },
                 options
-            }, openToSide ? SIDE_GROUP : undefined);
+            }, group);
         } else if (this.uri) {
             this.editorService.openEditor({
                 resource: this.uri,
                 options
-            }, openToSide ? SIDE_GROUP : undefined);
+            }, group);
         }
     }
     render(uri) {
@@ -790,7 +811,7 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
         this.progressStore.add(autorun(r => {
             if (isStreaming.read(r)) {
                 const codicon = ThemeIcon.modify(Codicon.loading, "spin");
-                this.setStatus(codicon, ( localize(7295, "Applying edits")));
+                this.setStatus(codicon, ( localize(7838, "Applying edits")));
                 const entry = editSession.readEntry(uri, r);
                 const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
@@ -799,10 +820,10 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
                     this.setLabelDetail("");
                 } else {
                     this.setProgressFill(undefined);
-                    this.setLabelDetail(rwRatio === 0 || !rwRatio ? ( localize(7296, "Generating edits...")) : ( localize(7297, "({0}%)...", rwRatio)));
+                    this.setLabelDetail(rwRatio === 0 || !rwRatio ? ( localize(7839, "Generating edits...")) : ( localize(7840, "({0}%)...", rwRatio)));
                 }
             } else {
-                this.setStatus(Codicon.check, ( localize(7298, "Edited")));
+                this.setStatus(Codicon.check, ( localize(7841, "Edited")));
                 this.setProgressFill(undefined);
                 this.setLabelDetail("");
             }
@@ -819,10 +840,10 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
                     added: changes.added,
                     removed: changes.removed
                 });
-                const insertionsFragment = changes.added === 1 ? ( localize(7299, "1 insertion")) : ( localize(7300, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(7301, "1 deletion")) : ( localize(7302, "{0} deletions", changes.removed));
+                const insertionsFragment = changes.added === 1 ? ( localize(7842, "1 insertion")) : ( localize(7843, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(7844, "1 deletion")) : ( localize(7845, "{0} deletions", changes.removed));
                 this.setAriaLabel(( localize(
-                    7303,
+                    7846,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,
@@ -835,7 +856,7 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
         }));
     }
 };
-CollapsedCodeBlock = ( __decorate([( __param(3, ILabelService)), ( __param(4, IEditorService)), ( __param(5, IModelService)), ( __param(6, ILanguageService)), ( __param(7, IContextMenuService)), ( __param(8, IContextKeyService)), ( __param(9, IMenuService)), ( __param(10, IHoverService)), ( __param(11, IChatService)), ( __param(12, IConfigurationService))], CollapsedCodeBlock));
+CollapsedCodeBlock = ( __decorate([( __param(3, ILabelService)), ( __param(4, IEditorService)), ( __param(5, IModelService)), ( __param(6, ILanguageService)), ( __param(7, IContextMenuService)), ( __param(8, IContextKeyService)), ( __param(9, IMenuService)), ( __param(10, IHoverService)), ( __param(11, IChatService)), ( __param(12, IConfigurationService)), ( __param(13, ITextModelService))], CollapsedCodeBlock));
 function fixCodeText(text, languageId) {
     if (languageId === "php") {
         if (!text.trim().startsWith("<?")) {

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

@@ -0,0 +1,35 @@
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
+import { IAgentHostCustomizationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service";
+import { IChatMcpAuthenticationRequired } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { IChatContentPart } from "./chatContentParts.js";
+export declare class ChatMcpAuthenticationContentPart extends Disposable implements IChatContentPart {
+    private readonly data;
+    private readonly markdownRendererService;
+    private readonly agentHostCustomizationService;
+    readonly domNode: HTMLElement;
+    private readonly rendered;
+    /**
+     * Whether this part was ever shown. Used to distinguish the initial empty
+     * state (the part is emitted with an empty `servers` observable that is
+     * populated immediately after) from the terminal state where every server
+     * has been authenticated — only the latter marks the part
+     * {@link IChatMcpAuthenticationRequired.isUsed used}.
+     */
+    private _hasBeenVisible;
+    /**
+     * The MCP server currently being authenticated, or `undefined` when idle.
+     * While set, the part shows an "Authenticating …" progress message for that
+     * server and stays visible regardless of the underlying auth-required state.
+     */
+    private readonly _authenticating;
+    constructor(data: IChatMcpAuthenticationRequired, markdownRendererService: IMarkdownRendererService, agentHostCustomizationService: IAgentHostCustomizationService);
+    private render;
+    private _renderMessage;
+    private authenticate;
+    private updateVisibility;
+    hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
+    addDisposable(disposable: IDisposable): void;
+}

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

@@ -0,0 +1,140 @@
+
+import { registerCss } from '@codingame/monaco-vscode-api/css';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { $, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { escapeMarkdownSyntaxTokens, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import { McpServerStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { IAgentHostCustomizationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service';
+import * as chatMcpServersInteractionContent from './media/chatMcpServersInteractionContent.css';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+
+registerCss(chatMcpServersInteractionContent);
+let ChatMcpAuthenticationContentPart = class ChatMcpAuthenticationContentPart extends Disposable {
+    constructor(data, markdownRendererService, agentHostCustomizationService) {
+        super();
+        this.data = data;
+        this.markdownRendererService = markdownRendererService;
+        this.agentHostCustomizationService = agentHostCustomizationService;
+        this.rendered = this._register(( new MutableDisposable()));
+        this._hasBeenVisible = false;
+        this._authenticating = observableValue(this, undefined);
+        this.domNode = $(".chat-mcp-servers-interaction");
+        this._register(autorun(reader => {
+            const servers = this.data.servers.read(reader);
+            const authenticating = this._authenticating.read(reader);
+            this.render(servers, authenticating);
+            this.updateVisibility(servers, authenticating);
+        }));
+        this._register(this.agentHostCustomizationService.onDidChangeCustomizations(
+            () => this.updateVisibility(this.data.servers.get(), this._authenticating.get())
+        ));
+    }
+    render(servers, authenticating) {
+        clearNode(this.domNode);
+        this.rendered.clear();
+        if (authenticating) {
+            this._renderMessage(ThemeIcon.modify(Codicon.loading, "spin"), ( localize(
+                7847,
+                "Authenticating {0}...",
+                "`" + escapeMarkdownSyntaxTokens(authenticating.name) + "`"
+            )));
+            return;
+        }
+        if (!servers.length) {
+            return;
+        }
+        const links = ( servers.map(server => "`" + escapeMarkdownSyntaxTokens(server.name) + "`")).join(", ");
+        const content = servers.length === 1 ? ( localize(
+            7848,
+            "The MCP server {0} requires authentication. [Authenticate](#authenticate)?",
+            links
+        )) : ( localize(
+            7849,
+            "The MCP servers {0} require authentication. [Authenticate](#authenticate)?",
+            links
+        ));
+        this._renderMessage(Codicon.mcp, content, {
+            href: "#authenticate",
+            run: () => void this.authenticate()
+        });
+    }
+    _renderMessage(icon, content, action) {
+        const container = $(".chat-mcp-servers-interaction-hint");
+        const messageContainer = $(".chat-mcp-servers-message");
+        const iconElement = $(".chat-mcp-servers-icon");
+        iconElement.classList.add(...ThemeIcon.asClassNameArray(icon));
+        const rendered = this.rendered.value = this.markdownRendererService.render(( new MarkdownString(content, {
+            isTrusted: true
+        })), action ? {
+            actionHandler: href => {
+                if (href !== action.href) {
+                    return Promise.resolve(false);
+                }
+                action.run();
+                return Promise.resolve(true);
+            }
+        } : undefined);
+        messageContainer.appendChild(iconElement);
+        messageContainer.appendChild(rendered.element);
+        container.appendChild(messageContainer);
+        this.domNode.appendChild(container);
+        if (action) {
+            const actionLink = rendered.element.querySelector(`a[data-href="${action.href}"]`);
+            if (actionLink) {
+                actionLink.setAttribute("role", "button");
+                actionLink.href = "";
+            }
+        }
+    }
+    async authenticate() {
+        const sessionResource = URI.revive(this.data.sessionResource);
+        try {
+            for (const server of this.data.servers.get()) {
+                this._authenticating.set(server, undefined);
+                await this.agentHostCustomizationService.authenticateMcpServer(sessionResource, server.id);
+            }
+        } finally {
+            this._authenticating.set(undefined, undefined);
+        }
+    }
+    updateVisibility(dataServers, authenticating) {
+        if (authenticating) {
+            this.domNode.style.display = "";
+            this._hasBeenVisible = true;
+            return;
+        }
+        const sessionResource = URI.revive(this.data.sessionResource);
+        const servers = this.agentHostCustomizationService.getMcpServers(sessionResource);
+        const visible = ( dataServers.some(server => ( servers.some(
+            current => current.id === server.id && current.status === McpServerStatus.AuthRequired
+        ))));
+        this.domNode.style.display = visible ? "" : "none";
+        if (visible) {
+            this._hasBeenVisible = true;
+        } else if (this._hasBeenVisible) {
+            this.data.isUsed = true;
+        }
+    }
+    hasSameContent(other, _followingContent, _element) {
+        return other.kind === "mcpAuthenticationRequired";
+    }
+    addDisposable(disposable) {
+        this._register(disposable);
+    }
+};
+ChatMcpAuthenticationContentPart = ( __decorate([( __param(1, IMarkdownRendererService)), ( __param(2, IAgentHostCustomizationService))], ChatMcpAuthenticationContentPart));
+
+export { ChatMcpAuthenticationContentPart };