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

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

@@ -28,7 +28,7 @@ let ChatAgentCommandContentPart = class ChatAgentCommandContentPart extends Disp
         }, {
             groupId
         }));
-        const rerun = ( localize(6717, "Rerun without {0}{1}", chatSubcommandLeader, cmd.name));
+        const rerun = ( localize(6803, "Rerun without {0}{1}", chatSubcommandLeader, cmd.name));
         const btn = ( new Button(this.domNode, {
             ariaLabel: rerun
         }));

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

@@ -21,14 +21,14 @@ let ChatAnonymousRateLimitedPart = class ChatAnonymousRateLimitedPart extends Di
         const messageContainer = append(this.domNode, $(".chat-rate-limited-message"));
         const message = append(messageContainer, $("div"));
         message.textContent = ( localize(
-            6718,
+            6804,
             "Continue the conversation by signing in. Your free account gets 50 premium requests a month plus access to more models and AI features."
         ));
         const signInButton = this._register(( new Button(messageContainer, {
             ...defaultButtonStyles,
             supportIcons: true
         })));
-        signInButton.label = ( localize(6719, "Enable more AI features"));
+        signInButton.label = ( localize(6805, "Enable more AI features"));
         signInButton.element.classList.add("chat-rate-limited-button");
         this._register(signInButton.onDidClick(async () => {
             const commandId = "workbench.action.chat.triggerSetup";

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

@@ -2,15 +2,18 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { IChatContentReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { IChatAttachmentWidgetRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.service";
 export interface IChatAttachmentsContentPartOptions {
     readonly variables: readonly IChatRequestVariableEntry[];
     readonly contentReferences?: ReadonlyArray<IChatContentReference>;
+    readonly modelId?: string;
     readonly domNode?: HTMLElement;
     readonly limit?: number;
 }
 export declare class ChatAttachmentsContentPart extends Disposable {
     private readonly instantiationService;
+    private readonly languageModelsService;
     private readonly chatAttachmentWidgetRegistry;
     private readonly attachedContextDisposables;
     private readonly _onDidChangeVisibility;
@@ -18,10 +21,11 @@ export declare class ChatAttachmentsContentPart extends Disposable {
     private _showingAll;
     private _variables;
     private readonly contentReferences;
+    private readonly modelId?;
     private readonly limit?;
     readonly domNode: HTMLElement | undefined;
     contextMenuHandler?: (attachment: IChatRequestVariableEntry, event: MouseEvent) => void;
-    constructor(options: IChatAttachmentsContentPartOptions, instantiationService: IInstantiationService, chatAttachmentWidgetRegistry: IChatAttachmentWidgetRegistry);
+    constructor(options: IChatAttachmentsContentPartOptions, instantiationService: IInstantiationService, languageModelsService: ILanguageModelsService, chatAttachmentWidgetRegistry: IChatAttachmentWidgetRegistry);
     /**
      * Update the variables and re-render the attachments in place.
      */
@@ -29,11 +33,12 @@ export declare class ChatAttachmentsContentPart extends Disposable {
     private initAttachedContext;
     private getVisibleAttachments;
     /**
-     * When the total number of image attachments exceeds the per-request limit,
-     * mark the oldest images (those that will be dropped by the backend) with
-     * {@link OmittedState.ImageLimitExceeded}.
+     * When the total number of image attachments exceeds the model-specific
+     * per-request limit, mark the oldest images (those dropped by the backend)
+     * with {@link OmittedState.ImageLimitExceeded}.
      */
     private markImageLimitExceeded;
+    private getImageLimitForCurrentModel;
     private renderShowMoreButton;
     private renderAttachment;
 }

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

@@ -8,21 +8,29 @@ 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
-import { isImageVariableEntry, MAX_IMAGES_PER_REQUEST, OmittedState, isElementVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isTerminalVariableEntry, isPasteVariableEntry, isNotebookOutputVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isWorkspaceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { isImageVariableEntry, OmittedState, getImageAttachmentLimit, isElementVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isTerminalVariableEntry, isPasteVariableEntry, isNotebookOutputVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isWorkspaceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatResponseReferencePartStatusKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ToolSetOrToolItemAttachmentWidget, ElementChatAttachmentWidget, ImageAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, FileAttachmentWidget, TerminalCommandAttachmentWidget, PasteAttachmentWidget, NotebookCellOutputChatAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, DefaultChatAttachmentWidget } from '../../attachments/chatAttachmentWidgets.js';
 import { IChatAttachmentWidgetRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.service';
 
 let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Disposable {
-    constructor(options, instantiationService, chatAttachmentWidgetRegistry) {
+    constructor(
+        options,
+        instantiationService,
+        languageModelsService,
+        chatAttachmentWidgetRegistry
+    ) {
         super();
         this.instantiationService = instantiationService;
+        this.languageModelsService = languageModelsService;
         this.chatAttachmentWidgetRegistry = chatAttachmentWidgetRegistry;
         this.attachedContextDisposables = this._register(( new DisposableStore()));
         this._onDidChangeVisibility = this._register(( new Emitter()));
         this._showingAll = false;
         this._variables = options.variables;
         this.contentReferences = options.contentReferences ?? [];
+        this.modelId = options.modelId;
         this.limit = options.limit;
         this.domNode = options.domNode ?? $(".chat-attached-context");
         this._contextResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, {
@@ -60,15 +68,35 @@ let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Dispos
     }
     markImageLimitExceeded(attachments) {
         const imageAttachments = attachments.filter(isImageVariableEntry);
-        if (imageAttachments.length <= MAX_IMAGES_PER_REQUEST) {
+        const maxImagesPerRequest = this.getImageLimitForCurrentModel();
+        if (maxImagesPerRequest === undefined) {
             return;
         }
-        const excessCount = imageAttachments.length - MAX_IMAGES_PER_REQUEST;
+        if (imageAttachments.length <= maxImagesPerRequest) {
+            for (const attachment of imageAttachments) {
+                if (attachment.omittedState === OmittedState.ImageLimitExceeded) {
+                    attachment.omittedState = OmittedState.NotOmitted;
+                }
+            }
+            return;
+        }
+        const excessCount = imageAttachments.length - maxImagesPerRequest;
         for (let i = 0; i < excessCount; i++) {
             if (imageAttachments[i].omittedState === OmittedState.NotOmitted || imageAttachments[i].omittedState === OmittedState.ImageLimitExceeded) {
                 imageAttachments[i].omittedState = OmittedState.ImageLimitExceeded;
             }
         }
+        for (let i = excessCount; i < imageAttachments.length; i++) {
+            if (imageAttachments[i].omittedState === OmittedState.ImageLimitExceeded) {
+                imageAttachments[i].omittedState = OmittedState.NotOmitted;
+            }
+        }
+    }
+    getImageLimitForCurrentModel() {
+        if (!this.modelId) {
+            return undefined;
+        }
+        return getImageAttachmentLimit(this.languageModelsService.lookupLanguageModel(this.modelId));
     }
     renderShowMoreButton(container) {
         const remainingCount = this._variables.length - (this.limit ?? 0);
@@ -237,6 +265,6 @@ let ChatAttachmentsContentPart = class ChatAttachmentsContentPart extends Dispos
         this.attachedContextDisposables.add(widget);
     }
 };
-ChatAttachmentsContentPart = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatAttachmentWidgetRegistry))], ChatAttachmentsContentPart));
+ChatAttachmentsContentPart = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, ILanguageModelsService)), ( __param(3, IChatAttachmentWidgetRegistry))], ChatAttachmentsContentPart));
 
 export { ChatAttachmentsContentPart };

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

@@ -93,7 +93,7 @@ let ChatCheckpointFileChangesSummaryContentPart = class ChatCheckpointFileChange
     renderViewAllFileChangesButton(container) {
         const button = container.appendChild($(".chat-view-changes-icon"));
         const hoverDisposable = this.hoverService.setupDelayedHover(button, () => ({
-            content: ( localize2(6720, "View All File Changes"))
+            content: ( localize2(6806, "View All File Changes"))
         }));
         button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
         button.setAttribute("role", "button");

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

@@ -29,7 +29,7 @@ let ChatCodeCitationContentPart = class ChatCodeCitationContentPart extends Disp
             buttonSecondaryHoverBackground: undefined,
             buttonSeparator: undefined
         })));
-        button.label = ( localize(6721, "View matches"));
+        button.label = ( localize(6807, "View matches"));
         this._register(button.onDidClick(() => {
             const citationText = `# Code Citations\n\n` + ( citations.citations.map(c => `## License: ${c.license}\n${( c.value.toString())}\n\n\`\`\`\n${c.snippet}\n\`\`\`\n\n`)).join("\n");
             this.editorService.openEditor({

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

@@ -1,18 +1,60 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+export interface IResourcePoolOptions {
+    /**
+     * Maximum number of idle items to keep in the pool.
+     * When exceeded after a debounce period, excess idle items are disposed.
+     * Defaults to no limit.
+     */
+    maxIdleSize?: number;
+    /**
+     * Delay in milliseconds before trimming excess idle items.
+     * Allows rapid get/release cycles (e.g. during streaming) without
+     * unnecessary disposal. Defaults to 10 seconds.
+     */
+    trimIdleDelay?: number;
+}
 export declare class ResourcePool<T extends IDisposable> implements IDisposable {
     private readonly _itemFactory;
+    private readonly _options?;
     private readonly pool;
+    private _trimTimer;
     private _inUse;
     get inUse(): ReadonlySet<T>;
-    constructor(_itemFactory: () => T);
+    constructor(_itemFactory: () => T, _options?: IResourcePoolOptions | undefined);
     get(): T;
     release(item: T): void;
+    private _scheduleTrim;
+    private _trimIdle;
     /**
      * Clear and dispose the items in the pool that are not in use.
      */
     clear(): void;
     dispose(): void;
 }
+/**
+ * A resource pool that supports keyed reuse. On {@link get}, the pool will
+ * prefer returning an idle item that was previously {@link release released}
+ * with the same key. Keys are best-effort hints — multiple items can share a
+ * key and the pool falls back to any idle item when no keyed match is found.
+ */
+export declare class KeyedResourcePool<T extends IDisposable> implements IDisposable {
+    private readonly _itemFactory;
+    private readonly _options?;
+    private readonly _idle;
+    private readonly _inUse;
+    private readonly _keyToItems;
+    private readonly _itemToKey;
+    private _trimTimer;
+    get inUse(): ReadonlySet<T>;
+    constructor(_itemFactory: () => T, _options?: IResourcePoolOptions | undefined);
+    get(key: string): T;
+    release(item: T, key: string): void;
+    private _scheduleTrim;
+    private _trimIdle;
+    private _removeFromMaps;
+    clear(): void;
+    dispose(): void;
+}
 export interface IDisposableReference<T> extends IDisposable {
     object: T;
     isStale: () => boolean;

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

@@ -4,8 +4,9 @@ class ResourcePool {
     get inUse() {
         return this._inUse;
     }
-    constructor(_itemFactory) {
+    constructor(_itemFactory, _options) {
         this._itemFactory = _itemFactory;
+        this._options = _options;
         this.pool = [];
         this._inUse = ( new Set());
     }
@@ -22,8 +23,37 @@ class ResourcePool {
     release(item) {
         this._inUse.delete(item);
         this.pool.push(item);
+        this._scheduleTrim();
+    }
+    _scheduleTrim() {
+        const maxIdle = this._options?.maxIdleSize;
+        if (maxIdle === undefined || this.pool.length <= maxIdle) {
+            return;
+        }
+        if (this._trimTimer !== undefined) {
+            clearTimeout(this._trimTimer);
+        }
+        const delay = this._options?.trimIdleDelay ?? 10_000;
+        this._trimTimer = setTimeout(() => {
+            this._trimTimer = undefined;
+            this._trimIdle();
+        }, delay);
+    }
+    _trimIdle() {
+        const maxIdle = this._options?.maxIdleSize;
+        if (maxIdle === undefined) {
+            return;
+        }
+        while (this.pool.length > maxIdle) {
+            const item = this.pool.pop();
+            item.dispose();
+        }
     }
     clear() {
+        if (this._trimTimer !== undefined) {
+            clearTimeout(this._trimTimer);
+            this._trimTimer = undefined;
+        }
         for (const item of this.pool) {
             item.dispose();
         }
@@ -37,5 +67,120 @@ class ResourcePool {
         this._inUse.clear();
     }
 }
+class KeyedResourcePool {
+    get inUse() {
+        return this._inUse;
+    }
+    constructor(_itemFactory, _options) {
+        this._itemFactory = _itemFactory;
+        this._options = _options;
+        this._idle = [];
+        this._inUse = ( new Set());
+        this._keyToItems = ( new Map());
+        this._itemToKey = ( new Map());
+    }
+    get(key) {
+        const candidates = this._keyToItems.get(key);
+        if (candidates) {
+            for (const item of candidates) {
+                if (!( this._inUse.has(item))) {
+                    const idx = this._idle.indexOf(item);
+                    if (idx !== -1) {
+                        this._idle.splice(idx, 1);
+                        this._inUse.add(item);
+                        return item;
+                    }
+                }
+            }
+        }
+        if (this._idle.length > 0) {
+            const item = this._idle.pop();
+            this._inUse.add(item);
+            return item;
+        }
+        const item = this._itemFactory();
+        this._inUse.add(item);
+        return item;
+    }
+    release(item, key) {
+        this._inUse.delete(item);
+        this._idle.push(item);
+        const oldKey = this._itemToKey.get(item);
+        if (oldKey !== undefined && oldKey !== key) {
+            const oldSet = this._keyToItems.get(oldKey);
+            if (oldSet) {
+                oldSet.delete(item);
+                if (oldSet.size === 0) {
+                    this._keyToItems.delete(oldKey);
+                }
+            }
+        }
+        this._itemToKey.set(item, key);
+        let keySet = this._keyToItems.get(key);
+        if (!keySet) {
+            keySet = ( new Set());
+            this._keyToItems.set(key, keySet);
+        }
+        keySet.add(item);
+        this._scheduleTrim();
+    }
+    _scheduleTrim() {
+        const maxIdle = this._options?.maxIdleSize;
+        if (maxIdle === undefined || this._idle.length <= maxIdle) {
+            return;
+        }
+        if (this._trimTimer !== undefined) {
+            clearTimeout(this._trimTimer);
+        }
+        const delay = this._options?.trimIdleDelay ?? 10_000;
+        this._trimTimer = setTimeout(() => {
+            this._trimTimer = undefined;
+            this._trimIdle();
+        }, delay);
+    }
+    _trimIdle() {
+        const maxIdle = this._options?.maxIdleSize;
+        if (maxIdle === undefined) {
+            return;
+        }
+        while (this._idle.length > maxIdle) {
+            const item = this._idle.pop();
+            this._removeFromMaps(item);
+            item.dispose();
+        }
+    }
+    _removeFromMaps(item) {
+        const key = this._itemToKey.get(item);
+        if (key !== undefined) {
+            const keySet = this._keyToItems.get(key);
+            if (keySet) {
+                keySet.delete(item);
+                if (keySet.size === 0) {
+                    this._keyToItems.delete(key);
+                }
+            }
+            this._itemToKey.delete(item);
+        }
+    }
+    clear() {
+        if (this._trimTimer !== undefined) {
+            clearTimeout(this._trimTimer);
+            this._trimTimer = undefined;
+        }
+        for (const item of this._idle) {
+            item.dispose();
+        }
+        this._idle.length = 0;
+        this._keyToItems.clear();
+        this._itemToKey.clear();
+    }
+    dispose() {
+        this.clear();
+        for (const item of this._inUse) {
+            item.dispose();
+        }
+        this._inUse.clear();
+    }
+}
 
-export { ResourcePool };
+export { KeyedResourcePool, ResourcePool };

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

@@ -23,7 +23,7 @@ let ChatCommandButtonContentPart = class ChatCommandButtonContentPart extends Di
         }
     }
     renderButton(container, command, enabled, secondary) {
-        const tooltip = enabled ? command.tooltip : ( localize(6722, "Button not available in restored chat"));
+        const tooltip = enabled ? command.tooltip : ( localize(6808, "Button not available in restored chat"));
         const button = this._register(( new Button(container, {
             ...defaultButtonStyles,
             supportIcons: true,

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

@@ -26,10 +26,10 @@ let ChatConfirmationContentPart = class ChatConfirmationContentPart extends Disp
             data: confirmation.data,
             isSecondary: button !== confirmation.buttons?.[0]
         }))) : [{
-            label: ( localize(6723, "Accept")),
+            label: ( localize(6809, "Accept")),
             data: confirmation.data
         }, {
-            label: ( localize(6724, "Dismiss")),
+            label: ( localize(6810, "Dismiss")),
             data: confirmation.data,
             isSecondary: true
         }];

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

@@ -51,6 +51,8 @@ declare abstract class BaseSimpleChatConfirmationWidget<T> extends Disposable {
     get domNode(): HTMLElement;
     setShowButtons(showButton: boolean): void;
     private readonly messageElement;
+    private readonly messageScrollable;
+    private readonly messageContentDisposables;
     constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidgetOptions<T>, instantiationService: IInstantiationService, _markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
     protected renderMessage(element: HTMLElement): void;
 }
@@ -85,6 +87,8 @@ declare abstract class BaseChatConfirmationWidget<T> extends Disposable {
     private _buttonsDomNode;
     setShowButtons(showButton: boolean): void;
     private readonly messageElement;
+    private readonly messageScrollable;
+    private readonly messageContentDisposables;
     private readonly markdownContentPart;
     get codeblocksPartId(): string | undefined;
     get codeblocks(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat").IChatCodeBlockInfo[] | undefined;

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

@@ -1,12 +1,14 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { createElement, h, isHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { createElement, h, DisposableResizeObserver, isHTMLElement, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ButtonWithDropdown, Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { Separator, Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { 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 { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -99,6 +101,7 @@ let BaseSimpleChatConfirmationWidget = class BaseSimpleChatConfirmationWidget ex
         this.instantiationService = instantiationService;
         this._markdownRendererService = _markdownRendererService;
         this._onDidClick = this._register(( new Emitter()));
+        this.messageContentDisposables = this._register(( new MutableDisposable()));
         const {
             title,
             subtitle,
@@ -121,6 +124,20 @@ let BaseSimpleChatConfirmationWidget = class BaseSimpleChatConfirmationWidget ex
             instantiationService.createInstance(ChatQueryTitlePart, elements.title, title, subtitle)
         );
         this.messageElement = elements.message;
+        const messageParent = this.messageElement.parentElement;
+        const messageNextSibling = this.messageElement.nextSibling;
+        this.messageScrollable = this._register(( new DomScrollableElement(this.messageElement, {
+            vertical: ScrollbarVisibility.Auto,
+            horizontal: ScrollbarVisibility.Hidden,
+            consumeMouseWheelIfScrollbarIsNeeded: true
+        })));
+        this.messageScrollable.getDomNode().classList.add("chat-confirmation-widget-message-scrollable");
+        messageParent?.insertBefore(this.messageScrollable.getDomNode(), messageNextSibling);
+        const messageResizeObserver = this._register(
+            new DisposableResizeObserver(() => this.messageScrollable.scanDomNode())
+        );
+        this._register(messageResizeObserver.observe(this.messageElement));
+        this._register(messageResizeObserver.observe(this.messageScrollable.getDomNode()));
         buttons.forEach(buttonData => {
             const buttonOptions = {
                 ...defaultButtonStyles,
@@ -172,7 +189,14 @@ let BaseSimpleChatConfirmationWidget = class BaseSimpleChatConfirmationWidget ex
         }
     }
     renderMessage(element) {
+        const store = ( new DisposableStore());
+        const messageContentResizeObserver = store.add(
+            new DisposableResizeObserver(() => this.messageScrollable.scanDomNode())
+        );
+        store.add(messageContentResizeObserver.observe(element));
+        this.messageContentDisposables.value = store;
         this.messageElement.append(element);
+        this.messageScrollable.scanDomNode();
     }
 };
 BaseSimpleChatConfirmationWidget = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IMarkdownRendererService)), ( __param(4, IContextMenuService)), ( __param(5, IContextKeyService))], BaseSimpleChatConfirmationWidget));
@@ -237,6 +261,7 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
         this.contextMenuService = contextMenuService;
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this._onDidClick = this._register(( new Emitter()));
+        this.messageContentDisposables = this._register(( new MutableDisposable()));
         this.markdownContentPart = this._register(( new MutableDisposable()));
         const {
             title,
@@ -265,6 +290,20 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
             )), subtitle)
         );
         this.messageElement = elements.message;
+        const messageParent = this.messageElement.parentElement;
+        const messageNextSibling = this.messageElement.nextSibling;
+        this.messageScrollable = this._register(( new DomScrollableElement(this.messageElement, {
+            vertical: ScrollbarVisibility.Auto,
+            horizontal: ScrollbarVisibility.Hidden,
+            consumeMouseWheelIfScrollbarIsNeeded: true
+        })));
+        this.messageScrollable.getDomNode().classList.add("chat-confirmation-widget-message-scrollable");
+        messageParent?.insertBefore(this.messageScrollable.getDomNode(), messageNextSibling);
+        const messageResizeObserver = this._register(
+            new DisposableResizeObserver(() => this.messageScrollable.scanDomNode())
+        );
+        this._register(messageResizeObserver.observe(this.messageElement));
+        this._register(messageResizeObserver.observe(this.messageScrollable.getDomNode()));
         this.updateButtons(buttons);
         if (options?.toolbarData) {
             const overlay = contextKeyService.createOverlay([
@@ -327,7 +366,7 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
             const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, {
                 kind: "markdownContent",
                 content: typeof element === "string" ? ( new MarkdownString()).appendMarkdown(element) : element
-            }, this._context, this._context.editorPool, false, this._context.codeBlockStartIndex, this.markdownRendererService, undefined, this._context.currentWidth.get(), this._context.codeBlockModelCollection, {
+            }, this._context, this._context.editorPool, false, this._context.codeBlockStartIndex, this.markdownRendererService, undefined, this._context.currentWidth.get(), {
                 allowInlineDiffs: true,
                 horizontalPadding: 6
             }));
@@ -340,10 +379,20 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
             this.markdownContentPart.value = part;
             element = part.domNode;
         }
-        for (const child of this.messageElement.children) {
-            child.remove();
+        clearNode(this.messageElement);
+        const store = ( new DisposableStore());
+        const messageContentResizeObserver = store.add(
+            new DisposableResizeObserver(() => this.messageScrollable.scanDomNode())
+        );
+        store.add(messageContentResizeObserver.observe(element));
+        if (this.markdownContentPart.value) {
+            store.add(
+                this.markdownContentPart.value.onDidChangeHeight(() => this.messageScrollable.scanDomNode())
+            );
         }
+        this.messageContentDisposables.value = store;
         this.messageElement.append(element);
+        this.messageScrollable.scanDomNode();
     }
 };
 BaseChatConfirmationWidget = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IMarkdownRendererService)), ( __param(4, IContextMenuService)), ( __param(5, IContextKeyService)), ( __param(6, IChatMarkdownAnchorService))], BaseChatConfirmationWidget));
@@ -405,7 +454,7 @@ function configureAccessibilityContainer(container, title, message) {
     container.tabIndex = 0;
     const titleAsString = typeof title === "string" ? title : title.value;
     const messageAsString = typeof message === "string" ? message : message && "value" in message ? message.value : message && "textContent" in message ? message.textContent : "";
-    container.setAttribute("aria-label", ( localize(6725, "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString)));
+    container.setAttribute("aria-label", ( localize(6811, "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString)));
     container.classList.add("chat-confirmation-widget-container");
 }
 

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

@@ -9,7 +9,7 @@ export declare class EditorPool extends Disposable {
     private readonly _pool;
     inUse(): Iterable<CodeBlockPart>;
     constructor(options: ChatEditorOptions, delegate: IChatRendererDelegate, overflowWidgetsDomNode: HTMLElement | undefined, isSimpleWidget: boolean | undefined, instantiationService: IInstantiationService);
-    get(): IDisposableReference<CodeBlockPart>;
+    get(key: string): IDisposableReference<CodeBlockPart>;
     clear(): void;
 }
 export declare class DiffEditorPool extends Disposable {

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

@@ -4,7 +4,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CodeBlockPart, CodeCompareBlockPart } from './codeBlockPart.js';
-import { ResourcePool } from './chatCollections.js';
+import { KeyedResourcePool, ResourcePool } from './chatCollections.js';
 import { createSingleCallFunction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/functional';
 
 let EditorPool = class EditorPool extends Disposable {
@@ -20,7 +20,7 @@ let EditorPool = class EditorPool extends Disposable {
     ) {
         super();
         this.isSimpleWidget = isSimpleWidget;
-        this._pool = this._register(( new ResourcePool(() => {
+        this._pool = this._register(( new KeyedResourcePool(() => {
             return instantiationService.createInstance(
                 CodeBlockPart,
                 options,
@@ -29,10 +29,12 @@ let EditorPool = class EditorPool extends Disposable {
                 overflowWidgetsDomNode,
                 this.isSimpleWidget
             );
+        }, {
+            maxIdleSize: 2
         })));
     }
-    get() {
-        const codeBlock = this._pool.get();
+    get(key) {
+        const codeBlock = this._pool.get(key);
         let stale = false;
         return {
             object: codeBlock,
@@ -40,7 +42,7 @@ let EditorPool = class EditorPool extends Disposable {
             dispose: createSingleCallFunction(() => {
                 codeBlock.reset();
                 stale = true;
-                this._pool.release(codeBlock);
+                this._pool.release(codeBlock, key);
             })
         };
     }