@codingame/monaco-vscode-katex-common 30.0.1 → 31.0.1

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

@@ -12,19 +12,18 @@ import { wrapTablesWithScrollable } from './chatMarkdownTableScrolling.js';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, MutableDisposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
-import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 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 { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+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 { 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';
-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';
@@ -43,16 +42,17 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
 import { MarkedKatexSupport } from '../../../../markdown/browser/markedKatexSupport.js';
-import { extractCodeblockUrisFromText } from '../../../common/widget/annotations.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 { 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 { allowedChatMarkdownHtmlTags } from '../chatContentMarkdownRenderer.js';
 import { parseUnifiedDiff, MarkdownDiffBlockPart } from './chatDiffBlockPart.js';
 import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
-import { localFileLanguageId, parseLocalFileData, CodeBlockPart } from './codeBlockPart.js';
+import { CodeBlockPart } from './codeBlockPart.js';
 import * as chatCodeBlockPill from './media/chatCodeBlockPill.css';
 import { ChatExtensionsContentPart } from './chatExtensionsContentPart.js';
+import { IncrementalDOMMorpher } from './chatIncrementalRendering/chatIncrementalRendering.js';
 import * as chatMarkdownPart from './media/chatMarkdownPart.css';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun, autorunSelfDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -80,20 +80,16 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         renderer,
         markdownRenderOptions,
         currentWidth,
-        codeBlockModelCollection,
         rendererOptions,
         contextKeyService,
         configurationService,
-        textModelService,
         instantiationService,
         aiEditTelemetryService
     ) {
         super();
         this.markdown = markdown;
         this.editorPool = editorPool;
-        this.codeBlockModelCollection = codeBlockModelCollection;
         this.rendererOptions = rendererOptions;
-        this.textModelService = textModelService;
         this.instantiationService = instantiationService;
         this.aiEditTelemetryService = aiEditTelemetryService;
         this.codeblocksPartId = String(++ChatMarkdownContentPart_1.ID_POOL);
@@ -107,7 +103,6 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         const element = context.element;
         const inUndoStop = findLast(context.content, e => e.kind === "undoStop", context.contentIndex)?.id;
         let globalCodeBlockIndexStart = codeBlockStartIndex;
-        let thisPartCodeBlockIndexStart = 0;
         this.domNode = $("div.chat-markdown-part");
         if (this.rendererOptions.accessibilityOptions?.statusMessage) {
             this.domNode.ariaLabel = this.rendererOptions.accessibilityOptions.statusMessage;
@@ -116,6 +111,23 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
             }
         }
         const enableMath = configurationService.getValue(ChatConfiguration.EnableMath);
+        const incrementalRenderingEnabled = configurationService.getValue(ChatConfiguration.IncrementalRendering);
+        if (incrementalRenderingEnabled && isResponseVM(element) && fillInIncompleteTokens && !element.isComplete) {
+            this._incrementalMorpher = this._register(instantiationService.createInstance(IncrementalDOMMorpher, this.domNode));
+            this._incrementalMorpher.setRenderCallback(newMd => {
+                const savedMarkdown = this.markdown;
+                const content = ( new MarkdownString(newMd, this.markdown.content));
+                content.baseUri = URI.revive(this.markdown.content.baseUri);
+                content.uris = this.markdown.content.uris;
+                this.markdown = {
+                    ...this.markdown,
+                    content
+                };
+                doRenderMarkdown();
+                this.markdown = savedMarkdown;
+                this._onDidChangeHeight.fire();
+            });
+        }
         const renderStore = this._register(( new MutableDisposable()));
         const doRenderMarkdown = () => {
             if (this._store.isDisposed) {
@@ -124,12 +136,11 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
             const store = ( new DisposableStore());
             renderStore.value = store;
             clearNode(this.domNode);
+            dispose(this.allRefs);
             this.allRefs.length = 0;
             this._codeblocks.length = 0;
             this.mathLayoutParticipants.clear();
             globalCodeBlockIndexStart = codeBlockStartIndex;
-            thisPartCodeBlockIndexStart = 0;
-            const orderedDisposablesList = [];
             const markedExtensions = enableMath ? coalesce([MarkedKatexSupport.getExtension(getWindow(context.container), {
                 throwOnError: false
             })]) : [];
@@ -137,7 +148,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 gfm: true,
                 breaks: true
             };
-            const result = store.add(renderer.render(markdown.content, {
+            const result = store.add(renderer.render(this.markdown.content, {
                 sanitizerConfig: MarkedKatexSupport.getSanitizerOptions({
                     allowedTags: allowedChatMarkdownHtmlTags,
                     allowedAttributes: allowedMarkdownHtmlAttributes
@@ -181,7 +192,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                                 dispose: () => diffPart.dispose()
                             };
                             this.allRefs.push(ref);
-                            orderedDisposablesList.push(ref);
+                            store.add(ref);
                             return diffPart.element;
                         }
                     }
@@ -193,39 +204,17 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                         return chatExtensions.domNode;
                     }
                     const globalIndex = globalCodeBlockIndexStart++;
-                    const thisPartIndex = thisPartCodeBlockIndexStart++;
-                    let textModel;
-                    let range;
-                    let vulns;
-                    let codeblockEntry;
-                    if (equalsIgnoreCase(languageId, localFileLanguageId)) {
-                        try {
-                            const parsedBody = parseLocalFileData(text);
-                            range = parsedBody.range && Range.lift(parsedBody.range);
-                            const modelRefPromise = this.textModelService.createModelReference(parsedBody.uri);
-                            textModel = modelRefPromise.then(ref => {
-                                if (!store.isDisposed) {
-                                    store.add(ref);
-                                }
-                                return ref.object.textEditorModel;
-                            });
-                        } catch (e) {
-                            return $("div");
-                        }
-                    } else {
-                        if (isResponseVM(element) || isRequestVM(element)) {
-                            const modelEntry = this.codeBlockModelCollection.getOrCreate(element.sessionResource, element, globalIndex);
-                            const fastUpdateModelEntry = this.codeBlockModelCollection.updateSync(element.sessionResource, element, globalIndex, {
-                                text,
-                                languageId,
-                                isComplete: isCodeBlockComplete
-                            });
-                            vulns = modelEntry.vulns;
-                            codeblockEntry = fastUpdateModelEntry;
-                            textModel = modelEntry.model;
-                        } else {
-                            textModel = undefined;
-                        }
+                    let codeBlockText = text;
+                    const extractedVulns = extractVulnerabilitiesFromText(text);
+                    codeBlockText = fixCodeText(extractedVulns.newText, languageId);
+                    const vulns = extractedVulns.vulnerabilities;
+                    let codemapperUri;
+                    let isEdit;
+                    const codeblockUri = extractCodeblockUrisFromText(codeBlockText);
+                    if (codeblockUri) {
+                        codemapperUri = codeblockUri.uri;
+                        isEdit = codeblockUri.isEdit;
+                        codeBlockText = codeblockUri.textWithoutResult;
                     }
                     const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
                     const renderOptions = {
@@ -236,89 +225,54 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                     }
                     const codeBlockInfo = {
                         languageId,
-                        textModel,
+                        text: codeBlockText,
                         codeBlockIndex: globalIndex,
-                        codeBlockPartIndex: thisPartIndex,
                         element,
-                        range,
                         parentContextKeyService: contextKeyService,
                         vulns,
-                        codemapperUri: codeblockEntry?.codemapperUri,
+                        codemapperUri,
                         renderOptions,
                         chatSessionResource: element.sessionResource
                     };
-                    if (element.isCompleteAddedRequest || !codeblockEntry?.codemapperUri || !codeblockEntry.isEdit) {
-                        const ref = this.renderCodeBlock(codeBlockInfo, text, isCodeBlockComplete, currentWidth);
-                        this.allRefs.push(ref);
-                        const ownerMarkdownPartId = this.codeblocksPartId;
-                        const info = new (class {
-                            constructor() {
-                                this.ownerMarkdownPartId = ownerMarkdownPartId;
-                                this.codeBlockIndex = globalIndex;
-                                this.elementId = element.id;
-                                this.chatSessionResource = element.sessionResource;
-                                this.languageId = languageId;
-                                this.isStreamingEdit = false;
-                                this.editDeltaInfo = EditDeltaInfo.fromText(text);
-                                this.codemapperUri = undefined;
-                                this.uriPromise = textModel?.then(model => model.uri) ?? Promise.resolve(undefined);
-                            }
+                    const baseCodeBlockInfo = {
+                        ownerMarkdownPartId: this.codeblocksPartId,
+                        codeBlockIndex: globalIndex,
+                        elementId: element.id,
+                        chatSessionResource: element.sessionResource,
+                        languageId,
+                        editDeltaInfo: EditDeltaInfo.fromText(text)
+                    };
+                    if (element.isCompleteAddedRequest || !codemapperUri || !isEdit) {
+                        const ref = this.renderCodeBlock(codeBlockInfo, currentWidth);
+                        this._codeblocks.push({
+                            ...baseCodeBlockInfo,
+                            codemapperUri: codeBlockInfo.codemapperUri,
+                            isStreamingEdit: false,
                             get uri() {
                                 return ref.object.uri;
-                            }
+                            },
                             focus() {
                                 ref.object.focus();
                             }
-                        })();
-                        this._codeblocks.push(info);
-                        orderedDisposablesList.push(ref);
-                        return ref.object.element;
-                    } else {
-                        const requestId = isRequestVM(element) ? element.id : element.requestId;
-                        const ref = this.renderCodeBlockPill(
-                            element.sessionResource,
-                            requestId,
-                            inUndoStop,
-                            codeBlockInfo.codemapperUri
-                        );
-                        if (isResponseVM(codeBlockInfo.element)) {
-                            this.codeBlockModelCollection.update(
-                                codeBlockInfo.element.sessionResource,
-                                codeBlockInfo.element,
-                                codeBlockInfo.codeBlockIndex,
-                                {
-                                    text,
-                                    languageId: codeBlockInfo.languageId,
-                                    isComplete: isCodeBlockComplete
-                                }
-                            ).then(e => {
-                                this._codeblocks[codeBlockInfo.codeBlockPartIndex].codemapperUri = e.codemapperUri;
-                            });
-                        }
-                        const ownerMarkdownPartId = this.codeblocksPartId;
-                        const info = new (class {
-                            constructor() {
-                                this.ownerMarkdownPartId = ownerMarkdownPartId;
-                                this.codeBlockIndex = globalIndex;
-                                this.elementId = element.id;
-                                this.codemapperUri = codeblockEntry?.codemapperUri;
-                                this.chatSessionResource = element.sessionResource;
-                                this.isStreamingEdit = !isCodeBlockComplete;
-                                this.uriPromise = Promise.resolve(undefined);
-                                this.languageId = languageId;
-                                this.editDeltaInfo = EditDeltaInfo.fromText(text);
-                            }
-                            get uri() {
-                                return undefined;
-                            }
-                            focus() {
-                                return ref.object.element.focus();
-                            }
-                        })();
-                        this._codeblocks.push(info);
-                        orderedDisposablesList.push(ref);
+                        });
+                        store.add(ref);
                         return ref.object.element;
                     }
+                    const requestId = isRequestVM(element) ? element.id : element.requestId;
+                    const ref = this.renderCodeBlockPill(element.sessionResource, requestId, inUndoStop, codemapperUri);
+                    this._codeblocks.push({
+                        ...baseCodeBlockInfo,
+                        codemapperUri,
+                        isStreamingEdit: !isCodeBlockComplete,
+                        get uri() {
+                            return undefined;
+                        },
+                        focus() {
+                            return ref.object.element.focus();
+                        }
+                    });
+                    store.add(ref);
+                    return ref.object.element;
                 },
                 markedOptions: markedOpts,
                 markedExtensions,
@@ -342,7 +296,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
             }
             const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
             store.add(
-                markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(markdown, result.element)
+                markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(this.markdown, result.element)
             );
             const layoutParticipants = ( new Lazy(() => {
                 const observer = store.add(( new DisposableResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()))));
@@ -357,17 +311,17 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                     vertical: ScrollbarVisibility.Hidden,
                     horizontal: ScrollbarVisibility.Auto
                 }));
-                orderedDisposablesList.push(scrollable);
+                store.add(scrollable);
                 katexBlock.replaceWith(scrollable.getDomNode());
                 layoutParticipants.value.add(() => {
                     scrollable.scanDomNode();
                 });
                 scrollable.scanDomNode();
             }
-            orderedDisposablesList.push(wrapTablesWithScrollable(this.domNode, layoutParticipants));
-            orderedDisposablesList.reverse().forEach(d => store.add(d));
+            store.add(wrapTablesWithScrollable(this.domNode, layoutParticipants));
         };
         doRenderMarkdown();
+        this._incrementalMorpher?.seed(markdown.content.value,  true);
         if (enableMath && !MarkedKatexSupport.getExtension(getWindow(context.container))) {
             MarkedKatexSupport.loadExtension(getWindow(context.container)).then(() => {
                 doRenderMarkdown();
@@ -394,9 +348,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         };
         this.allRefs.push(ref);
         diffListenerStore.add(codeBlock.onDidChangeDiff(() => this.fireAggregatedDiff()));
-        if (codemapperUri) {
-            codeBlock.render(codemapperUri);
-        }
+        codeBlock.render(codemapperUri);
         return ref;
     }
     fireAggregatedDiff() {
@@ -413,21 +365,14 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
             removed: totalRemoved
         });
     }
-    renderCodeBlock(data, text, isComplete, currentWidth) {
-        const ref = this.editorPool.get();
-        const editorInfo = ref.object;
-        this.codeBlockModelCollection.update(data.element.sessionResource, data.element, data.codeBlockIndex, {
-            text,
-            languageId: data.languageId,
-            isComplete
-        }).then(e => {
-            this._codeblocks[data.codeBlockPartIndex].codemapperUri = e.codemapperUri;
-        });
-        editorInfo.render(data, currentWidth).then(() => {
-            if (!this._store.isDisposed && isRequestVM(data.element)) {
-                this._onDidChangeHeight.fire();
-            }
-        });
+    renderCodeBlock(data, currentWidth) {
+        const key = CodeBlockPart.poolKey(data.element.id, data.codeBlockIndex);
+        const ref = this.editorPool.get(key);
+        this.allRefs.push(ref);
+        ref.object.render(data, currentWidth);
+        if (!this._store.isDisposed && isRequestVM(data.element)) {
+            this._onDidChangeHeight.fire();
+        }
         return ref;
     }
     hasSameContent(other) {
@@ -443,6 +388,19 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         }
         return false;
     }
+    tryIncrementalUpdate(newMarkdown) {
+        if (!this._incrementalMorpher) {
+            return false;
+        }
+        const success = this._incrementalMorpher.tryMorph(newMarkdown.content.value);
+        if (success) {
+            this.markdown = newMarkdown;
+        }
+        return success;
+    }
+    updateStreamRate(rate, isComplete) {
+        this._incrementalMorpher?.updateStreamRate(rate, isComplete);
+    }
     layout(width) {
         this.allRefs.forEach((ref, index) => {
             if (ref.object instanceof CodeBlockPart) {
@@ -469,7 +427,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
         this._register(disposable);
     }
 };
-ChatMarkdownContentPart = ChatMarkdownContentPart_1 = ( __decorate([( __param(10, IContextKeyService)), ( __param(11, IConfigurationService)), ( __param(12, ITextModelService)), ( __param(13, IInstantiationService)), ( __param(14, IAiEditTelemetryService))], ChatMarkdownContentPart));
+ChatMarkdownContentPart = ChatMarkdownContentPart_1 = ( __decorate([( __param(9, IContextKeyService)), ( __param(10, IConfigurationService)), ( __param(11, IInstantiationService)), ( __param(12, IAiEditTelemetryService))], ChatMarkdownContentPart));
 function codeblockHasClosingBackticks(str) {
     str = str.trim();
     return !!str.match(/\n```+$/);
@@ -615,7 +573,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(6747, "Applying edits"));
+                statusLabelEl.textContent = ( localize(6833, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -624,13 +582,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 } else {
                     progressFill.style.width = "0%";
                     this.pillElement.classList.remove("progress-filling");
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6748, "Generating edits...")) : ( localize(6749, "({0}%)...", rwRatio));
+                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6834, "Generating edits...")) : ( localize(6835, "({0}%)...", rwRatio));
                 }
             } else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(6750, "Edited"));
+                statusLabelEl.textContent = ( localize(6836, "Edited"));
                 const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -651,10 +609,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(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 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 summary = ( localize(
-                    6755,
+                    6841,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,
@@ -684,5 +642,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
     }
 };
 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));
+function fixCodeText(text, languageId) {
+    if (languageId === "php") {
+        if (!text.trim().startsWith("<?")) {
+            return `<?php\n${text}`;
+        }
+    }
+    return text;
+}
 
 export { ChatMarkdownContentPart, CollapsedCodeBlock, codeblockHasClosingBackticks };

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(6756, "Show options for {0}", s.label))
+            tooltip: ( localize(6842, "Show options for {0}", s.label))
         }, false))).join(", ");
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            text: ( localize(6757, "Skip?")),
+            text: ( localize(6843, "Skip?")),
             id: McpCommandIds.SkipCurrentAutostart,
-            tooltip: ( localize(6758, "Skip starting this MCP server"))
+            tooltip: ( localize(6844, "Skip starting this MCP server"))
         });
         let content;
         if (state.starting.length === 0) {
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendText(( localize(6759, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
+            })).appendText(( localize(6845, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
         } else {
             const serverLinks = this.createServerCommandLinks(state.starting);
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendMarkdown(( localize(6760, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
+            })).appendMarkdown(( localize(6846, "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(
-            6761,
+            6847,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            6762,
+            6848,
             "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(6763, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(6849, "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(6764, "Changed 1 file")) : ( localize(6765, "Changed {0} files", fileCount));
+            viewListButton.label = fileCount === 1 ? ( localize(6850, "Changed 1 file")) : ( localize(6851, "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(6766, "Open Changes"));
+        button.title = ( localize(6852, "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(6767, "File Changes"))
+                    getWidgetAriaLabel: () => ( localize(6853, "File Changes"))
                 }
             })
         );
@@ -259,7 +259,7 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($(".deletions"));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute("aria-label", ( localize(
-                6768,
+                6854,
                 "{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

@@ -0,0 +1,58 @@
+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 { 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 { 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 { IChatPlanReview, IChatPlanReviewResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+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";
+export interface IChatPlanReviewPartOptions {
+    onSubmit: (result: IChatPlanReviewResult) => void;
+}
+export declare class ChatPlanReviewPart extends Disposable implements IChatContentPart {
+    readonly review: IChatPlanReview;
+    private readonly _options;
+    private readonly _markdownRendererService;
+    private readonly _contextMenuService;
+    private readonly _dialogService;
+    private readonly _editorService;
+    private readonly _hoverService;
+    readonly domNode: HTMLElement;
+    private readonly _onDidChangeHeight;
+    readonly onDidChangeHeight: Event<void>;
+    private readonly _buttonStore;
+    private readonly _messageContentDisposables;
+    private readonly _titleActionsEl;
+    private readonly _inlineActionsEl;
+    private readonly _footerButtonsEl;
+    private readonly _messageEl;
+    private readonly _messageScrollable;
+    private readonly _collapseButton;
+    private readonly _restoreButton;
+    private _isCollapsed;
+    private _isExpanded;
+    private _isSubmitted;
+    private _selectedAction;
+    private _feedbackTextarea;
+    private _feedbackSection;
+    private _isFeedbackMode;
+    constructor(review: IChatPlanReview, context: IChatContentPartRenderContext, _options: IChatPlanReviewPartOptions, _markdownRendererService: IMarkdownRendererService, _contextMenuService: IContextMenuService, _dialogService: IDialogService, _editorService: IEditorService, _hoverService: IHoverService);
+    hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
+    private renderMarkdown;
+    private renderFeedback;
+    private renderActionButtons;
+    private toggleCollapsed;
+    private toggleExpanded;
+    private updateCollapsedPresentation;
+    private updateExpandedPresentation;
+    private openPlanFile;
+    private submitApproval;
+    private submitRejection;
+    private enterFeedbackMode;
+    private submitFeedback;
+    private confirmAutopilot;
+    private markUsed;
+}