@codingame/monaco-vscode-katex-common 24.3.0 → 25.0.0

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

@@ -6,7 +6,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 
 const $ = $$1;
 let ChatCommandButtonContentPart = class ChatCommandButtonContentPart extends Disposable {
@@ -17,7 +17,7 @@ let ChatCommandButtonContentPart = class ChatCommandButtonContentPart extends Di
         const enabled = !isResponseVM(context.element) || !context.element.isStale;
         const tooltip = enabled ?
             commandButton.command.tooltip :
-            ( localize(5049, "Button not available in restored chat"));
+            ( localize(5614, "Button not available in restored chat"));
         const button = this._register(( new Button(
             this.domNode,
             { ...defaultButtonStyles, supportIcons: true, title: tooltip }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatConfirmationContentPart.d.ts

@@ -1,10 +1,10 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatConfirmation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatConfirmation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatConfirmationContentPart extends Disposable implements IChatContentPart {
     private readonly instantiationService;
     private readonly chatService;

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

@@ -4,8 +4,8 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { SimpleChatConfirmationWidget } from './chatConfirmationWidget.js';
 
@@ -24,10 +24,10 @@ let ChatConfirmationContentPart = class ChatConfirmationContentPart extends Disp
                 isSecondary: button !== confirmation.buttons?.[0],
             })))
             : [
-                { label: ( localize(5050, "Accept")), data: confirmation.data },
-                { label: ( localize(5051, "Dismiss")), data: confirmation.data, isSecondary: true },
+                { label: ( localize(5615, "Accept")), data: confirmation.data },
+                { label: ( localize(5616, "Dismiss")), data: confirmation.data, isSecondary: true },
             ];
-        const confirmationWidget = this._register(this.instantiationService.createInstance(SimpleChatConfirmationWidget, context, { title: confirmation.title, buttons, message: confirmation.message, silent: confirmation.isLive === false }));
+        const confirmationWidget = this._register(this.instantiationService.createInstance(SimpleChatConfirmationWidget, context, { title: confirmation.title, buttons, message: confirmation.message }));
         confirmationWidget.setShowButtons(!confirmation.isUsed);
         this._register(confirmationWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
         this._register(confirmationWidget.onDidClick(async (e) => {

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

@@ -3,13 +3,12 @@ import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import type { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
-import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
+import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 export interface IChatConfirmationButton<T> {
     label: string;
     isSecondary?: boolean;
@@ -29,7 +28,6 @@ export interface IChatConfirmationWidgetOptions<T> {
         partType: string;
         partSource?: string;
     };
-    silent?: boolean;
 }
 export declare class ChatQueryTitlePart extends Disposable {
     private readonly element;
@@ -47,25 +45,21 @@ declare abstract class BaseSimpleChatConfirmationWidget<T> extends Disposable {
     protected readonly context: IChatContentPartRenderContext;
     protected readonly instantiationService: IInstantiationService;
     protected readonly _markdownRendererService: IMarkdownRendererService;
-    private readonly _configurationService;
     private _onDidClick;
     get onDidClick(): Event<IChatConfirmationButton<T>>;
     protected _onDidChangeHeight: Emitter<void>;
     get onDidChangeHeight(): Event<void>;
     private _domNode;
     get domNode(): HTMLElement;
-    private get showingButtons();
     setShowButtons(showButton: boolean): void;
     private readonly messageElement;
-    private readonly silent;
-    private readonly notificationManager;
-    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidgetOptions<T>, instantiationService: IInstantiationService, _markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, _configurationService: IConfigurationService, contextKeyService: IContextKeyService);
-    protected renderMessage(element: HTMLElement, listContainer: HTMLElement): void;
+    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidgetOptions<T>, instantiationService: IInstantiationService, _markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
+    protected renderMessage(element: HTMLElement): void;
 }
 /** @deprecated Use ChatConfirmationWidget instead */
 export declare class SimpleChatConfirmationWidget<T> extends BaseSimpleChatConfirmationWidget<T> {
     private _renderedMessage;
-    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidgetOptions<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService);
+    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidgetOptions<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
     updateMessage(message: string | IMarkdownString): void;
 }
 export interface IChatConfirmationWidget2Options<T> {
@@ -85,7 +79,6 @@ declare abstract class BaseChatConfirmationWidget<T> extends Disposable {
     protected readonly instantiationService: IInstantiationService;
     protected readonly markdownRendererService: IMarkdownRendererService;
     private readonly contextMenuService;
-    private readonly _configurationService;
     private readonly chatMarkdownAnchorService;
     private _onDidClick;
     get onDidClick(): Event<IChatConfirmationButton<T>>;
@@ -94,23 +87,21 @@ declare abstract class BaseChatConfirmationWidget<T> extends Disposable {
     private _domNode;
     get domNode(): HTMLElement;
     private _buttonsDomNode;
-    private get showingButtons();
     setShowButtons(showButton: boolean): void;
     private readonly messageElement;
     private readonly markdownContentPart;
-    private readonly notificationManager;
     get codeblocksPartId(): string | undefined;
     get codeblocks(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat").IChatCodeBlockInfo[] | undefined;
-    constructor(_context: IChatContentPartRenderContext, options: IChatConfirmationWidget2Options<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, _configurationService: IConfigurationService, contextKeyService: IContextKeyService, chatMarkdownAnchorService: IChatMarkdownAnchorService);
+    constructor(_context: IChatContentPartRenderContext, options: IChatConfirmationWidget2Options<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, chatMarkdownAnchorService: IChatMarkdownAnchorService);
     updateButtons(buttons: IChatConfirmationButton<T>[]): void;
-    protected renderMessage(element: HTMLElement | IMarkdownString | string, listContainer: HTMLElement): void;
+    protected renderMessage(element: HTMLElement | IMarkdownString | string): void;
 }
 export declare class ChatConfirmationWidget<T> extends BaseChatConfirmationWidget<T> {
     private _renderedMessage;
-    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidget2Options<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, chatMarkdownAnchorService: IChatMarkdownAnchorService);
+    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidget2Options<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, chatMarkdownAnchorService: IChatMarkdownAnchorService);
     updateMessage(message: string | IMarkdownString): void;
 }
 export declare class ChatCustomConfirmationWidget<T> extends BaseChatConfirmationWidget<T> {
-    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidget2Options<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, chatMarkdownAnchorService: IChatMarkdownAnchorService);
+    constructor(context: IChatContentPartRenderContext, options: IChatConfirmationWidget2Options<T>, instantiationService: IInstantiationService, markdownRendererService: IMarkdownRendererService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, chatMarkdownAnchorService: IChatMarkdownAnchorService);
 }
 export {};

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

@@ -1,27 +1,23 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { createElement, triggerNotification, h, getWindow, isHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { createElement, h, isHTMLElement } 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 { Separator, Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+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, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
-import { FocusMode } from '@codingame/monaco-vscode-api/vscode/vs/platform/native/common/native';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
-import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { ChatMarkdownContentPart } from './chatMarkdownContentPart.js';
 import * as chatConfirmationWidget from './media/chatConfirmationWidget.css';
 
@@ -79,66 +75,23 @@ let ChatQueryTitlePart = class ChatQueryTitlePart extends Disposable {
 ChatQueryTitlePart = ( __decorate([
     ( __param(3, IMarkdownRendererService))
 ], ChatQueryTitlePart));
-let ChatConfirmationNotifier = class ChatConfirmationNotifier extends Disposable {
-    constructor(_hostService, _chatWidgetService) {
-        super();
-        this._hostService = _hostService;
-        this._chatWidgetService = _chatWidgetService;
-        this.disposables = this._register(( new MutableDisposable()));
-    }
-    async notify(targetWindow, sessionResource) {
-        this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
-        const widget = this._chatWidgetService.getWidgetBySessionResource(sessionResource);
-        const title = widget?.viewModel?.model.title ? ( localize(5052, "Chat: {0}", widget.viewModel.model.title)) : ( localize(5053, "Untitled Chat"));
-        const notification = await triggerNotification(title, {
-            detail: ( localize(5054, "Approval needed to continue."))
-        });
-        if (notification) {
-            const disposables = this.disposables.value = ( new DisposableStore());
-            disposables.add(notification);
-            disposables.add(Event.once(notification.onClick)(async () => {
-                await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
-                if (widget) {
-                    await this._chatWidgetService.reveal(widget);
-                    widget.focusInput();
-                }
-                disposables.dispose();
-            }));
-            disposables.add(this._hostService.onDidChangeFocus(focus => {
-                if (focus) {
-                    disposables.dispose();
-                }
-            }));
-        }
-    }
-};
-ChatConfirmationNotifier = ( __decorate([
-    ( __param(0, IHostService)),
-    ( __param(1, IChatWidgetService))
-], ChatConfirmationNotifier));
 let BaseSimpleChatConfirmationWidget = class BaseSimpleChatConfirmationWidget extends Disposable {
     get onDidClick() { return this._onDidClick.event; }
     get onDidChangeHeight() { return this._onDidChangeHeight.event; }
     get domNode() {
         return this._domNode;
     }
-    get showingButtons() {
-        return !this.domNode.classList.contains('hideButtons');
-    }
     setShowButtons(showButton) {
         this.domNode.classList.toggle('hideButtons', !showButton);
     }
-    constructor(context, options, instantiationService, _markdownRendererService, contextMenuService, _configurationService, contextKeyService) {
+    constructor(context, options, instantiationService, _markdownRendererService, contextMenuService, contextKeyService) {
         super();
         this.context = context;
         this.instantiationService = instantiationService;
         this._markdownRendererService = _markdownRendererService;
-        this._configurationService = _configurationService;
         this._onDidClick = this._register(( new Emitter()));
         this._onDidChangeHeight = this._register(( new Emitter()));
-        const { title, subtitle, message, buttons, silent } = options;
-        this.silent = !!silent;
-        this.notificationManager = this._register(instantiationService.createInstance(ChatConfirmationNotifier));
+        const { title, subtitle, message, buttons } = options;
         const elements = h('.chat-confirmation-widget-container@container', [
             h('.chat-confirmation-widget@root', [
                 h('.chat-confirmation-widget-title@title'),
@@ -191,40 +144,34 @@ let BaseSimpleChatConfirmationWidget = class BaseSimpleChatConfirmationWidget ex
                 ['chatConfirmationPartSource', options.toolbarData.partSource],
             ]);
             const nestedInsta = this._register(instantiationService.createChild(( new ServiceCollection([IContextKeyService, overlay]))));
-            this._register(nestedInsta.createInstance(MenuWorkbenchToolBar, elements.toolbar, MenuId.ChatConfirmationMenu, {
+            const toolbar = this._register(nestedInsta.createInstance(MenuWorkbenchToolBar, elements.toolbar, MenuId.ChatConfirmationMenu, {
                 menuOptions: {
                     arg: options.toolbarData.arg,
                     shouldForwardArgs: true,
                 }
             }));
+            this._register(toolbar.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
         }
     }
-    renderMessage(element, listContainer) {
+    renderMessage(element) {
         this.messageElement.append(element);
-        if (this.showingButtons && this._configurationService.getValue('chat.notifyWindowOnConfirmation') && !this.silent) {
-            const targetWindow = getWindow(listContainer);
-            if (!targetWindow.document.hasFocus()) {
-                this.notificationManager.notify(targetWindow, this.context.element.sessionResource);
-            }
-        }
     }
 };
 BaseSimpleChatConfirmationWidget = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMarkdownRendererService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IContextKeyService))
+    ( __param(5, IContextKeyService))
 ], BaseSimpleChatConfirmationWidget));
 let SimpleChatConfirmationWidget = class SimpleChatConfirmationWidget extends BaseSimpleChatConfirmationWidget {
-    constructor(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService) {
-        super(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService);
+    constructor(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService) {
+        super(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService);
         this.updateMessage(options.message);
     }
     updateMessage(message) {
         this._renderedMessage?.remove();
         const renderedMessage = this._register(this._markdownRendererService.render(typeof message === 'string' ? ( new MarkdownString(message)) : message, { asyncRenderCallback: () => this._onDidChangeHeight.fire() }));
-        this.renderMessage(renderedMessage.element, this.context.container);
+        this.renderMessage(renderedMessage.element);
         this._renderedMessage = renderedMessage.element;
     }
 };
@@ -232,8 +179,7 @@ SimpleChatConfirmationWidget = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMarkdownRendererService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IContextKeyService))
+    ( __param(5, IContextKeyService))
 ], SimpleChatConfirmationWidget));
 let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Disposable {
     get onDidClick() { return this._onDidClick.event; }
@@ -241,9 +187,6 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
     get domNode() {
         return this._domNode;
     }
-    get showingButtons() {
-        return !this.domNode.classList.contains('hideButtons');
-    }
     setShowButtons(showButton) {
         this.domNode.classList.toggle('hideButtons', !showButton);
     }
@@ -253,19 +196,17 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
     get codeblocks() {
         return this.markdownContentPart.value?.codeblocks;
     }
-    constructor(_context, options, instantiationService, markdownRendererService, contextMenuService, _configurationService, contextKeyService, chatMarkdownAnchorService) {
+    constructor(_context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService) {
         super();
         this._context = _context;
         this.instantiationService = instantiationService;
         this.markdownRendererService = markdownRendererService;
         this.contextMenuService = contextMenuService;
-        this._configurationService = _configurationService;
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this._onDidClick = this._register(( new Emitter()));
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.markdownContentPart = this._register(( new MutableDisposable()));
         const { title, subtitle, message, buttons, icon } = options;
-        this.notificationManager = this._register(instantiationService.createInstance(ChatConfirmationNotifier));
         const elements = h('.chat-confirmation-widget-container@container', [
             h('.chat-confirmation-widget2@root', [
                 h('.chat-confirmation-widget-title', [
@@ -337,7 +278,7 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
             }
         }
     }
-    renderMessage(element, listContainer) {
+    renderMessage(element) {
         this.markdownContentPart.clear();
         if (!isHTMLElement(element)) {
             const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, {
@@ -356,31 +297,24 @@ let BaseChatConfirmationWidget = class BaseChatConfirmationWidget extends Dispos
             child.remove();
         }
         this.messageElement.append(element);
-        if (this.showingButtons && this._configurationService.getValue('chat.notifyWindowOnConfirmation')) {
-            const targetWindow = getWindow(listContainer);
-            if (!targetWindow.document.hasFocus()) {
-                this.notificationManager.notify(targetWindow, this._context.element.sessionResource);
-            }
-        }
     }
 };
 BaseChatConfirmationWidget = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMarkdownRendererService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IChatMarkdownAnchorService))
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IChatMarkdownAnchorService))
 ], BaseChatConfirmationWidget));
 let ChatConfirmationWidget = class ChatConfirmationWidget extends BaseChatConfirmationWidget {
-    constructor(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService, chatMarkdownAnchorService) {
-        super(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService, chatMarkdownAnchorService);
-        this.renderMessage(options.message, context.container);
+    constructor(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService) {
+        super(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService);
+        this.renderMessage(options.message);
     }
     updateMessage(message) {
         this._renderedMessage?.remove();
         const renderedMessage = this._register(this.markdownRendererService.render(typeof message === 'string' ? ( new MarkdownString(message)) : message, { asyncRenderCallback: () => this._onDidChangeHeight.fire() }));
-        this.renderMessage(renderedMessage.element, this._context.container);
+        this.renderMessage(renderedMessage.element);
         this._renderedMessage = renderedMessage.element;
     }
 };
@@ -388,29 +322,27 @@ ChatConfirmationWidget = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMarkdownRendererService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IChatMarkdownAnchorService))
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IChatMarkdownAnchorService))
 ], ChatConfirmationWidget));
 let ChatCustomConfirmationWidget = class ChatCustomConfirmationWidget extends BaseChatConfirmationWidget {
-    constructor(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService, chatMarkdownAnchorService) {
-        super(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService, chatMarkdownAnchorService);
-        this.renderMessage(options.message, context.container);
+    constructor(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService) {
+        super(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService);
+        this.renderMessage(options.message);
     }
 };
 ChatCustomConfirmationWidget = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMarkdownRendererService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IChatMarkdownAnchorService))
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IChatMarkdownAnchorService))
 ], ChatCustomConfirmationWidget));
 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(5055, "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString)));
+    container.setAttribute('aria-label', ( localize(5617, "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString)));
     container.classList.add('chat-confirmation-widget-container');
 }
 

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

@@ -2,7 +2,7 @@ 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 { IChatRendererDelegate } from "../chatListRenderer.js";
 import { ChatEditorOptions } from "../chatOptions.js";
-import { CodeBlockPart, CodeCompareBlockPart } from "../codeBlockPart.js";
+import { CodeBlockPart, CodeCompareBlockPart } from "./codeBlockPart.js";
 import { IDisposableReference } from "./chatCollections.js";
 export declare class EditorPool extends Disposable {
     private readonly isSimpleWidget;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { CodeBlockPart, CodeCompareBlockPart } from './codeBlockPart.js';
 import { ResourcePool } from './chatCollections.js';
 
 let EditorPool = class EditorPool extends Disposable {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatDiffBlockPart.d.ts → widget/chatContentParts/chatDiffBlockPart.d.ts}

@@ -3,8 +3,8 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { DiffEditorPool } from "./chatContentParts/chatContentCodePools.js";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { DiffEditorPool } from "./chatContentCodePools.js";
 /**
  * Parses unified diff format into before/after content.
  * Supports standard unified diff format with - and + prefixes.

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatElicitationContentPart.d.ts

@@ -2,10 +2,10 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatElicitationRequest, IChatElicitationRequestSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatElicitationRequest, IChatElicitationRequestSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatElicitationContentPart extends Disposable implements IChatContentPart {
     private readonly elicitation;
     private readonly instantiationService;

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

@@ -7,10 +7,10 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 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/chatContextKeys';
-import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+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 { IChatAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { AcceptElicitationRequestActionId } from '../actions/chatElicitationActions.js';
+import { AcceptElicitationRequestActionId } from '../../actions/chatElicitationActions.js';
 import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatErrorConfirmationPart.d.ts

@@ -2,11 +2,11 @@ import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ChatErrorLevel, IChatResponseErrorDetailsConfirmationButton } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IChatErrorDetailsPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { ChatErrorLevel, IChatResponseErrorDetailsConfirmationButton } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatErrorDetailsPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatErrorConfirmationContentPart extends Disposable implements IChatContentPart {
     private readonly errorDetails;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatErrorConfirmationPart.js

@@ -6,8 +6,8 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { assertIsResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { assertIsResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatErrorWidget } from './chatErrorContentPart.js';
 

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatErrorContentPart.d.ts

@@ -1,9 +1,9 @@
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
-import { ChatErrorLevel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { ChatErrorLevel } 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 { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatErrorContentPart extends Disposable implements IChatContentPart {
     private readonly errorDetails;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatErrorContentPart.js

@@ -3,7 +3,7 @@ import { $ as $$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/do
 import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ChatErrorLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ChatErrorLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
 const $ = $$1;
 class ChatErrorContentPart extends Disposable {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatExtensionsContentPart.d.ts

@@ -2,10 +2,10 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
-import { IChatExtensionsContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatExtensionsContent } 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, IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatExtensionsContentPart extends Disposable implements IChatContentPart {
     private readonly extensionsContent;
     readonly domNode: HTMLElement;

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

@@ -29,7 +29,7 @@ let ChatExtensionsContentPart = class ChatExtensionsContentPart extends Disposab
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this.domNode = $('.chat-extensions-content-part');
         const loadingElement = append(this.domNode, $('.loading-extensions-element'));
-        append(loadingElement, $(ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin'))), $('span.loading-message', undefined, ( localize(5056, 'Loading extensions...'))));
+        append(loadingElement, $(ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin'))), $('span.loading-message', undefined, ( localize(5618, 'Loading extensions...'))));
         const extensionsList = append(this.domNode, $('.extensions-list'));
         const list = this._register(instantiationService.createInstance(ExtensionsList, extensionsList, ChatViewId, { alwaysConsumeMouseWheel: false }, { onFocus: Event.None, onBlur: Event.None, filters: {} }));
         getExtensions(extensionsContent.extensions, extensionsWorkbenchService).then(extensions => {

package/vscode/src/vs/workbench/contrib/chat/browser/{chatInlineAnchorWidget.d.ts → widget/chatContentParts/chatInlineAnchorWidget.d.ts}

@@ -14,8 +14,8 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { INotebookDocumentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service";
 import { IWorkspaceSymbol } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/search";
-import { IChatContentInlineReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
+import { IChatContentInlineReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 type ContentRefData = {
     readonly kind: "symbol";
     readonly symbol: IWorkspaceSymbol;