@codingame/monaco-vscode-katex-common 31.0.0 → 32.0.0

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -8,9 +9,12 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { IChatAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { AcceptElicitationRequestActionId } from '../../actions/chatElicitationActions.js';
+import { IChatToolRiskAssessmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.service';
 import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
+import { ToolRiskBadgeWidget } from './toolInvocationParts/toolRiskBadgeWidget.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatElicitationContentPart = class ChatElicitationContentPart extends Disposable {
@@ -26,7 +30,9 @@ let ChatElicitationContentPart = class ChatElicitationContentPart extends Dispos
         instantiationService,
         chatAccessibilityService,
         contextKeyService,
-        keybindingService
+        keybindingService,
+        languageModelToolsService,
+        riskAssessmentService
     ) {
         super();
         this.elicitation = elicitation;
@@ -34,6 +40,8 @@ let ChatElicitationContentPart = class ChatElicitationContentPart extends Dispos
         this.chatAccessibilityService = chatAccessibilityService;
         this.contextKeyService = contextKeyService;
         this.keybindingService = keybindingService;
+        this.languageModelToolsService = languageModelToolsService;
+        this.riskAssessmentService = riskAssessmentService;
         const buttons = [];
         if (elicitation.kind === "elicitation2") {
             const acceptTooltip = this.keybindingService.appendKeybinding(elicitation.acceptButtonLabel, AcceptElicitationRequestActionId);
@@ -72,6 +80,7 @@ let ChatElicitationContentPart = class ChatElicitationContentPart extends Dispos
                 subtitle: elicitation.subtitle,
                 buttons,
                 message: this.getMessageToRender(elicitation),
+                footerBanner: this._createRiskBadge(elicitation),
                 toolbarData: {
                     partType: "elicitation",
                     partSource: elicitation.source?.type,
@@ -83,7 +92,11 @@ let ChatElicitationContentPart = class ChatElicitationContentPart extends Dispos
         confirmationWidget.setShowButtons(
             elicitation.kind === "elicitation2" && elicitation.state.get() === ElicitationState.Pending
         );
-        this._register(confirmationWidget.onDidClick(async e => {
+        this._register(confirmationWidget.onDidClick(async (
+            {
+                button: e
+            }
+        ) => {
             if (elicitation.kind !== "elicitation2") {
                 return;
             }
@@ -116,6 +129,46 @@ let ChatElicitationContentPart = class ChatElicitationContentPart extends Dispos
         messageMd.appendCodeblock("json", JSON.stringify(elicitation.acceptedResult, null, 2));
         return messageMd;
     }
+    _createRiskBadge(elicitation) {
+        if (elicitation.kind !== "elicitation2" || !elicitation.riskAssessment) {
+            return undefined;
+        }
+        if (!this.riskAssessmentService.isEnabled()) {
+            return undefined;
+        }
+        const {
+            toolId,
+            parameters
+        } = elicitation.riskAssessment;
+        const tool = this.languageModelToolsService.getTool(toolId);
+        if (!tool) {
+            return undefined;
+        }
+        const widget = this._register(this.instantiationService.createInstance(ToolRiskBadgeWidget));
+        const cached = this.riskAssessmentService.getCached(tool, parameters);
+        if (cached) {
+            widget.setAssessment(cached);
+        } else {
+            widget.setLoading();
+            const cts = this._register(( new CancellationTokenSource()));
+            (async () => {
+                try {
+                    const result = await this.riskAssessmentService.assess(tool, parameters, cts.token);
+                    if (cts.token.isCancellationRequested) {
+                        return;
+                    }
+                    if (!result) {
+                        widget.setHidden();
+                        return;
+                    }
+                    widget.setAssessment(result);
+                } catch {
+                    widget.setHidden();
+                }
+            })();
+        }
+        return widget.domNode;
+    }
     hasSameContent(other) {
         return other === this.elicitation;
     }
@@ -123,6 +176,6 @@ let ChatElicitationContentPart = class ChatElicitationContentPart extends Dispos
         this._register(disposable);
     }
 };
-ChatElicitationContentPart = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IChatAccessibilityService)), ( __param(4, IContextKeyService)), ( __param(5, IKeybindingService))], ChatElicitationContentPart));
+ChatElicitationContentPart = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IChatAccessibilityService)), ( __param(4, IContextKeyService)), ( __param(5, IKeybindingService)), ( __param(6, ILanguageModelToolsService)), ( __param(7, IChatToolRiskAssessmentService))], ChatElicitationContentPart));
 
 export { ChatElicitationContentPart };

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

@@ -30,7 +30,7 @@ let ChatExtensionsContentPart = class ChatExtensionsContentPart extends Disposab
         append(
             loadingElement,
             $(ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, "spin"))),
-            $("span.loading-message", undefined, ( localize(6815, "Loading extensions...")))
+            $("span.loading-message", undefined, ( localize(7062, "Loading extensions...")))
         );
         const extensionsList = append(this.domNode, $(".extensions-list"));
         const list = this._register(

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(6816, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(6817, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(6818, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(6819, "Warning from {0} hook", hookTypeLabel)));
+        const title = isStopped ? (toolName ? ( localize(7063, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7064, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(7065, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7066, "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/chatIncrementalRendering/buffers/paragraphBuffer.d.ts

@@ -19,5 +19,5 @@ export declare function lastBlockBoundary(text: string): number;
  */
 export declare class ParagraphBuffer implements IIncrementalRenderingBuffer {
     readonly handlesFlush = false;
-    getRenderable(fullMarkdown: string, lastRendered: string): string;
+    getRenderable(fullMarkdown: string, _lastRendered: string): string;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatIncrementalRendering/buffers/paragraphBuffer.js

@@ -22,10 +22,10 @@ class ParagraphBuffer {
     constructor() {
         this.handlesFlush = false;
     }
-    getRenderable(fullMarkdown, lastRendered) {
+    getRenderable(fullMarkdown, _lastRendered) {
         const lastBlock = lastBlockBoundary(fullMarkdown);
         let renderable = lastBlock === -1
-            ? lastRendered
+            ? fullMarkdown
             : fullMarkdown.slice(0, lastBlock + 2);
         if (fullMarkdown.length - renderable.length > MAX_BUFFERED_CHARS) {
             renderable = fullMarkdown;

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

@@ -54,7 +54,9 @@ export declare class IncrementalDOMMorpher extends Disposable {
     setRenderCallback(cb: (newMarkdown: string) => void): void;
     /**
      * Forward the stream's word-rate estimate to the active buffer
-     * (word buffer or line buffer).
+     * (word buffer or line buffer). When the stream completes,
+     * also flushes any remaining buffered content for buffers
+     * that don't handle their own flushing (e.g. ParagraphBuffer).
      */
     updateStreamRate(rate: number, isComplete: boolean): void;
     /**

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

@@ -52,6 +52,10 @@ let IncrementalDOMMorpher = class IncrementalDOMMorpher extends Disposable {
         if (this._buffer instanceof WordBuffer) {
             this._buffer.setRate(rate, isComplete);
         }
+        if (isComplete && !this._buffer.handlesFlush && this._lastMarkdown.length > this._renderedMarkdown.length) {
+            this._pendingMarkdown = this._lastMarkdown;
+            this._scheduleRender();
+        }
     }
     seed(markdown, animateInitial) {
         this._lastMarkdown = markdown;

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(6820, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(7067, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        6821,
+                        7068,
                         "{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(6822, "Add File to Chat")),
+            title: ( localize2(7069, "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(6823, "Copy")),
+            title: ( localize2(7070, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -370,7 +370,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(6824, "Open to the Side")),
+            title: ( localize2(7071, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -436,8 +436,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(6825, "Go to Definition")),
-                mnemonicTitle: ( localize(6826, "Go to &&Definition"))
+                ...( localize2(7072, "Go to Definition")),
+                mnemonicTitle: ( localize(7073, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -494,8 +494,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(6827, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(6828, "Go to &&Type Definitions"))
+                ...( localize2(7074, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(7075, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -520,8 +520,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(6829, "Go to Implementations")),
-                mnemonicTitle: ( localize(6830, "Go to &&Implementations"))
+                ...( localize2(7076, "Go to Implementations")),
+                mnemonicTitle: ( localize(7077, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -546,8 +546,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(6831, "Go to References")),
-                mnemonicTitle: ( localize(6832, "Go to &&References"))
+                ...( localize2(7078, "Go to References")),
+                mnemonicTitle: ( localize(7079, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,

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

@@ -21,6 +21,8 @@ import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { 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 { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
@@ -289,7 +291,8 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                             modeId: element.model.request?.modeInfo?.modeId,
                             modelId: element.model.request?.modelId,
                             applyCodeBlockSuggestionId: undefined,
-                            source: undefined
+                            source: undefined,
+                            sourceRequestId: undefined
                         })
                     };
                 })));
@@ -299,8 +302,11 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(this.markdown, result.element)
             );
             const layoutParticipants = ( new Lazy(() => {
-                const observer = store.add(( new DisposableResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()))));
-                observer.observe(this.domNode);
+                const observer = store.add(new DisposableResizeObserver(
+                    "ChatMarkdownContentPart.mathLayout",
+                    () => this.mathLayoutParticipants.forEach(layout => layout())
+                ));
+                store.add(observer.observe(this.domNode));
                 return this.mathLayoutParticipants;
             }));
             for (const katexBlock of this.domNode.querySelectorAll(".katex-display")) {
@@ -379,7 +385,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         if (other.kind !== "markdownContent") {
             return false;
         }
-        if (other.content.value === this.markdown.content.value) {
+        if (other.content.value === this.markdown.content.value && equalsInlineReferences(other.inlineReferences, this.markdown.inlineReferences)) {
             return true;
         }
         const lastCodeblock = this._codeblocks.at(-1);
@@ -392,6 +398,9 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         if (!this._incrementalMorpher) {
             return false;
         }
+        if (!equalsInlineReferences(newMarkdown.inlineReferences, this.markdown.inlineReferences)) {
+            return false;
+        }
         const success = this._incrementalMorpher.tryMorph(newMarkdown.content.value);
         if (success) {
             this.markdown = newMarkdown;
@@ -428,6 +437,55 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
     }
 };
 ChatMarkdownContentPart = ChatMarkdownContentPart_1 = ( __decorate([( __param(9, IContextKeyService)), ( __param(10, IConfigurationService)), ( __param(11, IInstantiationService)), ( __param(12, IAiEditTelemetryService))], ChatMarkdownContentPart));
+function equalsInlineReferences(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (!a || !b) {
+        return !a && !b;
+    }
+    const aKeys = ( Object.keys(a));
+    const bKeys = ( Object.keys(b));
+    if (aKeys.length !== bKeys.length) {
+        return false;
+    }
+    return aKeys.every(key => equalsInlineReference(a[key], b[key]));
+}
+function equalsInlineReference(a, b) {
+    if (!a || !b) {
+        return !a && !b;
+    }
+    return a.resolveId === b.resolveId && a.name === b.name && equalsInlineReferenceValue(a.inlineReference, b.inlineReference);
+}
+const workspaceSymbolComparers = {
+    name: (a, b) => a.name === b.name,
+    containerName: (a, b) => a.containerName === b.containerName,
+    kind: (a, b) => a.kind === b.kind,
+    tags: (a, b) => equalsSymbolTags(a.tags, b.tags),
+    location: (a, b) => isEqual(a.location.uri, b.location.uri) && Range.equalsRange(a.location.range, b.location.range)
+};
+const workspaceSymbolComparerKeys = ( Object.keys(workspaceSymbolComparers));
+function equalsInlineReferenceValue(a, b) {
+    if (URI.isUri(a) || URI.isUri(b)) {
+        return URI.isUri(a) && URI.isUri(b) && isEqual(a, b);
+    }
+    if (isLocation(a) || isLocation(b)) {
+        return isLocation(a) && isLocation(b) && isEqual(a.uri, b.uri) && Range.equalsRange(a.range, b.range);
+    }
+    return equalsWorkspaceSymbol(a, b);
+}
+function equalsWorkspaceSymbol(a, b) {
+    return workspaceSymbolComparerKeys.every(key => workspaceSymbolComparers[key](a, b));
+}
+function equalsSymbolTags(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (!a || !b || a.length !== b.length) {
+        return false;
+    }
+    return a.every((tag, index) => tag === b[index]);
+}
 function codeblockHasClosingBackticks(str) {
     str = str.trim();
     return !!str.match(/\n```+$/);
@@ -573,7 +631,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(6833, "Applying edits"));
+                statusLabelEl.textContent = ( localize(7080, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -582,13 +640,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 } else {
                     progressFill.style.width = "0%";
                     this.pillElement.classList.remove("progress-filling");
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6834, "Generating edits...")) : ( localize(6835, "({0}%)...", rwRatio));
+                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(7081, "Generating edits...")) : ( localize(7082, "({0}%)...", rwRatio));
                 }
             } else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(6836, "Edited"));
+                statusLabelEl.textContent = ( localize(7083, "Edited"));
                 const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -609,10 +667,10 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 this._onDidChangeDiff.fire(changes);
                 labelAdded.textContent = `+${changes.added}`;
                 labelRemoved.textContent = `-${changes.removed}`;
-                const insertionsFragment = changes.added === 1 ? ( localize(6837, "1 insertion")) : ( localize(6838, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(6839, "1 deletion")) : ( localize(6840, "{0} deletions", changes.removed));
+                const insertionsFragment = changes.added === 1 ? ( localize(7084, "1 insertion")) : ( localize(7085, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(7086, "1 deletion")) : ( localize(7087, "{0} deletions", changes.removed));
                 const summary = ( localize(
-                    6841,
+                    7088,
                     "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(6842, "Show options for {0}", s.label))
+            tooltip: ( localize(7089, "Show options for {0}", s.label))
         }, false))).join(", ");
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            text: ( localize(6843, "Skip?")),
+            text: ( localize(7090, "Skip?")),
             id: McpCommandIds.SkipCurrentAutostart,
-            tooltip: ( localize(6844, "Skip starting this MCP server"))
+            tooltip: ( localize(7091, "Skip starting this MCP server"))
         });
         let content;
         if (state.starting.length === 0) {
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendText(( localize(6845, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
+            })).appendText(( localize(7092, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
         } else {
             const serverLinks = this.createServerCommandLinks(state.starting);
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendMarkdown(( localize(6846, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
+            })).appendMarkdown(( localize(7093, "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(
-            6847,
+            7094,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            6848,
+            7095,
             "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(6849, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(7096, "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(6850, "Changed 1 file")) : ( localize(6851, "Changed {0} files", fileCount));
+            viewListButton.label = fileCount === 1 ? ( localize(7097, "Changed 1 file")) : ( localize(7098, "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(6852, "Open Changes"));
+        button.title = ( localize(7099, "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(6853, "File Changes"))
+                    getWidgetAriaLabel: () => ( localize(7100, "File Changes"))
                 }
             })
         );
@@ -259,7 +259,7 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($(".deletions"));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute("aria-label", ( localize(
-                6854,
+                7101,
                 "{0} lines added, {1} lines removed",
                 element.diff.added,
                 element.diff.removed

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

@@ -1,11 +1,18 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+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 { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IChatPlanReview, IChatPlanReviewResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IPlanReviewFeedbackService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackService.service";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
@@ -20,10 +27,19 @@ export declare class ChatPlanReviewPart extends Disposable implements IChatConte
     private readonly _dialogService;
     private readonly _editorService;
     private readonly _hoverService;
+    private readonly _planReviewFeedbackService;
+    private readonly _instantiationService;
+    private readonly _textFileService;
+    private readonly _modelService;
+    private readonly _textModelService;
+    private readonly _languageService;
+    private readonly _configurationService;
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: Event<void>;
     private readonly _buttonStore;
+    private _submitButton;
+    private _renderedSubmitInlineCount;
     private readonly _messageContentDisposables;
     private readonly _titleActionsEl;
     private readonly _inlineActionsEl;
@@ -32,26 +48,66 @@ export declare class ChatPlanReviewPart extends Disposable implements IChatConte
     private readonly _messageScrollable;
     private readonly _collapseButton;
     private readonly _restoreButton;
+    private _reviewButton;
     private _isCollapsed;
     private _isExpanded;
     private _isSubmitted;
     private _selectedAction;
     private _feedbackTextarea;
     private _feedbackSection;
+    private _commentsListEl;
+    private _commentsListScrollable;
+    private _clearAllButtonEl;
     private _isFeedbackMode;
-    constructor(review: IChatPlanReview, context: IChatContentPartRenderContext, _options: IChatPlanReviewPartOptions, _markdownRendererService: IMarkdownRendererService, _contextMenuService: IContextMenuService, _dialogService: IDialogService, _editorService: IEditorService, _hoverService: IHoverService);
+    private readonly _planReviewRegistration;
+    private readonly _commentRowDisposables;
+    private _inlineEditorMountId;
+    private _suppressFeedbackModeAutoOpen;
+    private _messageEditor;
+    private _editingUri;
+    private _initialEditorContent;
+    private readonly _messageEditorDisposables;
+    constructor(review: IChatPlanReview, context: IChatContentPartRenderContext, _options: IChatPlanReviewPartOptions, _markdownRendererService: IMarkdownRendererService, _contextMenuService: IContextMenuService, _dialogService: IDialogService, _editorService: IEditorService, _hoverService: IHoverService, _planReviewFeedbackService: IPlanReviewFeedbackService, _instantiationService: IInstantiationService, _textFileService: ITextFileService, _modelService: IModelService, _textModelService: ITextModelService, _languageService: ILanguageService, _configurationService: IConfigurationService);
     hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
     private renderMarkdown;
     private renderFeedback;
+    private renderCommentsList;
+    private getCommentUri;
+    private getInlineFeedbackItems;
+    private revealInlineComment;
+    private removeInlineComment;
+    private clearAllInlineFeedback;
+    private getFeedbackUris;
+    private onInlineFeedbackChanged;
+    /**
+     * Render the action buttons into the active container (footer when
+     * expanded, inline title slot when collapsed). Clears the inactive slot
+     * so the same buttons can never appear in two places at once.
+     */
+    private renderCurrentActionButtons;
     private renderActionButtons;
+    private canSubmitFeedback;
+    private computeSubmitLabel;
+    /**
+     * Update the cached Submit button's enabled state and label without
+     * destroying the button row. Cheap enough to run on every keystroke.
+     */
+    private updateSubmitButtonState;
     private toggleCollapsed;
     private toggleExpanded;
     private updateCollapsedPresentation;
     private updateExpandedPresentation;
-    private openPlanFile;
+    private enterReviewMode;
     private submitApproval;
     private submitRejection;
     private enterFeedbackMode;
+    private exitFeedbackMode;
+    private focusFeedbackInput;
+    private mountInlineEditor;
+    private canContinueInlineEditorMount;
+    private isInlineEditorEnabled;
+    private migrateInlineFeedbackToPlan;
+    private unmountInlineEditor;
     private submitFeedback;
     private confirmAutopilot;
     private markUsed;