@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.d.ts

@@ -1,5 +1,4 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 export interface IChatViewTitleDelegate {
@@ -8,7 +7,6 @@ export interface IChatViewTitleDelegate {
 export declare class ChatViewTitleControl extends Disposable {
     private readonly container;
     private readonly delegate;
-    private readonly configurationService;
     private readonly instantiationService;
     private static readonly DEFAULT_TITLE;
     private static readonly PICK_AGENT_SESSION_ACTION_ID;
@@ -22,15 +20,12 @@ export declare class ChatViewTitleControl extends Disposable {
     private navigationToolbar?;
     private actionsToolbar?;
     private lastKnownHeight;
-    constructor(container: HTMLElement, delegate: IChatViewTitleDelegate, configurationService: IConfigurationService, instantiationService: IInstantiationService);
-    private registerListeners;
+    constructor(container: HTMLElement, delegate: IChatViewTitleDelegate, instantiationService: IInstantiationService);
     private registerActions;
     private render;
     update(model: IChatModel | undefined): void;
     private doUpdate;
     private updateTitle;
-    private getIcon;
     private shouldRender;
-    private isEnabled;
     getHeight(): number;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js

@@ -2,35 +2,36 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatViewTitleControl from './media/chatViewTitleControl.css';
-import { h, EventType as EventType$1, addDisposableListener, show, hide } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { h, EventType as EventType$1, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { Gesture, EventType } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/touch';
 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 { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { registerAction2, Action2, 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { AgentSessionProviders, getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { AgentSessionsPicker } from '../../agentSessions/agentSessionsPicker.js';
 
 var ChatViewTitleControl_1;
 registerCss(chatViewTitleControl);
 let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
-    static { ChatViewTitleControl_1 = this; }
-    static { this.DEFAULT_TITLE = ( localize(5878, "Chat")); }
-    static { this.PICK_AGENT_SESSION_ACTION_ID = 'workbench.action.chat.pickAgentSession'; }
-    constructor(container, delegate, configurationService, instantiationService) {
+    static {
+        ChatViewTitleControl_1 = this;
+    }
+    static {
+        this.DEFAULT_TITLE = ( localize(6150, "Chat"));
+    }
+    static {
+        this.PICK_AGENT_SESSION_ACTION_ID = "workbench.action.chat.pickAgentSession";
+    }
+    constructor(container, delegate, instantiationService) {
         super();
         this.container = container;
         this.delegate = delegate;
-        this.configurationService = configurationService;
         this.instantiationService = instantiationService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
@@ -39,28 +40,20 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         this.modelDisposables = this._register(( new MutableDisposable()));
         this.lastKnownHeight = 0;
         this.render(this.container);
-        this.registerListeners();
         this.registerActions();
     }
-    registerListeners() {
-        this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(ChatConfiguration.ChatViewTitleEnabled)) {
-                this.doUpdate();
-            }
-        }));
-    }
     registerActions() {
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID,
-                    title: ( localize(5879, "Pick Agent Session")),
+                    title: ( localize(6151, "Pick Agent Session")),
                     f1: false,
                     menu: [{
-                            id: MenuId.ChatViewSessionTitleNavigationToolbar,
-                            group: 'navigation',
-                            order: 2
-                        }]
+                        id: MenuId.ChatViewSessionTitleNavigationToolbar,
+                        group: "navigation",
+                        order: 2
+                    }]
                 });
             }
             async run(accessor) {
@@ -71,27 +64,40 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         }));
     }
     render(parent) {
-        const elements = h('div.chat-view-title-container', [
-            h('div.chat-view-title-navigation-toolbar@navigationToolbar'),
-            h('span.chat-view-title-icon@icon'),
-            h('div.chat-view-title-actions-toolbar@actionsToolbar'),
+        const elements = h("div.chat-view-title-container", [
+            h("div.chat-view-title-navigation-toolbar@navigationToolbar"),
+            h("div.chat-view-title-actions-toolbar@actionsToolbar")
         ]);
-        this.navigationToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, elements.navigationToolbar, MenuId.ChatViewSessionTitleNavigationToolbar, {
-            actionViewItemProvider: (action) => {
-                if (action.id === ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID) {
-                    this.titleLabel.value = ( new ChatViewTitleLabel(action));
-                    this.titleLabel.value.updateTitle(this.title ?? ChatViewTitleControl_1.DEFAULT_TITLE, this.getIcon());
-                    return this.titleLabel.value;
+        this.navigationToolbar = this._register(this.instantiationService.createInstance(
+            MenuWorkbenchToolBar,
+            elements.navigationToolbar,
+            MenuId.ChatViewSessionTitleNavigationToolbar,
+            {
+                actionViewItemProvider: action => {
+                    if (action.id === ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID) {
+                        this.titleLabel.value = ( new ChatViewTitleLabel(action));
+                        this.titleLabel.value.updateTitle(this.title ?? ChatViewTitleControl_1.DEFAULT_TITLE);
+                        return this.titleLabel.value;
+                    }
+                    return undefined;
+                },
+                hiddenItemStrategy: HiddenItemStrategy.NoHide,
+                menuOptions: {
+                    shouldForwardArgs: true
                 }
-                return undefined;
-            },
-            hiddenItemStrategy: HiddenItemStrategy.NoHide,
-            menuOptions: { shouldForwardArgs: true }
-        }));
-        this.actionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, elements.actionsToolbar, MenuId.ChatViewSessionTitleToolbar, {
-            menuOptions: { shouldForwardArgs: true },
-            hiddenItemStrategy: HiddenItemStrategy.NoHide
-        }));
+            }
+        ));
+        this.actionsToolbar = this._register(this.instantiationService.createInstance(
+            MenuWorkbenchToolBar,
+            elements.actionsToolbar,
+            MenuId.ChatViewSessionTitleToolbar,
+            {
+                menuOptions: {
+                    shouldForwardArgs: true
+                },
+                hiddenItemStrategy: HiddenItemStrategy.NoHide
+            }
+        ));
         this.titleContainer = elements.root;
         this._register(Gesture.addTarget(this.titleContainer));
         for (const eventType of [EventType.Tap, EventType$1.CLICK]) {
@@ -104,14 +110,14 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
     update(model) {
         this.model = model;
         this.modelDisposables.value = model?.onDidChange(e => {
-            if (e.kind === 'setCustomTitle' || e.kind === 'addRequest') {
+            if (e.kind === "setCustomTitle" || e.kind === "addRequest") {
                 this.doUpdate();
             }
         });
         this.doUpdate();
     }
     doUpdate() {
-        const markdownTitle = ( new MarkdownString(this.model?.title ?? ''));
+        const markdownTitle = ( new MarkdownString(this.model?.title ?? ""));
         this.title = renderAsPlaintext(markdownTitle);
         this.updateTitle(this.title ?? ChatViewTitleControl_1.DEFAULT_TITLE);
         const context = this.model && {
@@ -129,63 +135,44 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         if (!this.titleContainer) {
             return;
         }
-        this.titleContainer.classList.toggle('visible', this.shouldRender());
-        this.titleLabel.value?.updateTitle(title, this.getIcon());
+        this.titleContainer.classList.toggle("visible", this.shouldRender());
+        this.titleLabel.value?.updateTitle(title);
         const currentHeight = this.getHeight();
         if (currentHeight !== this.lastKnownHeight) {
             this.lastKnownHeight = currentHeight;
             this._onDidChangeHeight.fire();
         }
     }
-    getIcon() {
-        const sessionType = this.model?.contributedChatSession?.chatSessionType;
-        switch (sessionType) {
-            case AgentSessionProviders.Background:
-            case AgentSessionProviders.Cloud:
-                return getAgentSessionProviderIcon(sessionType);
-        }
-        return undefined;
-    }
     shouldRender() {
-        if (!this.isEnabled()) {
-            return false;
-        }
         return !!this.model?.title;
     }
-    isEnabled() {
-        return this.configurationService.getValue(ChatConfiguration.ChatViewTitleEnabled) === true;
-    }
     getHeight() {
-        if (!this.titleContainer || this.titleContainer.style.display === 'none') {
+        if (!this.titleContainer || this.titleContainer.style.display === "none") {
             return 0;
         }
         return this.titleContainer.offsetHeight;
     }
 };
-ChatViewTitleControl = ChatViewTitleControl_1 = ( __decorate([
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IInstantiationService))
-], ChatViewTitleControl));
+ChatViewTitleControl = ChatViewTitleControl_1 = ( __decorate([( __param(2, IInstantiationService))], ChatViewTitleControl));
 class ChatViewTitleLabel extends ActionViewItem {
     constructor(action, options) {
-        super(null, action, { ...options, icon: false, label: true });
+        super(null, action, {
+            ...options,
+            icon: false,
+            label: true
+        });
         this.titleLabel = undefined;
-        this.titleIcon = undefined;
     }
     render(container) {
         super.render(container);
-        container.classList.add('chat-view-title-action-item');
-        this.label?.classList.add('chat-view-title-label-container');
-        this.titleIcon = this.label?.appendChild(h('span').root);
-        this.titleLabel = this.label?.appendChild(h('span.chat-view-title-label').root);
+        container.classList.add("chat-view-title-action-item");
+        this.label?.classList.add("chat-view-title-label-container");
+        this.titleLabel = this.label?.appendChild(h("span.chat-view-title-label").root);
         this.updateLabel();
-        this.updateIcon();
     }
-    updateTitle(title, icon) {
+    updateTitle(title) {
         this.title = title;
-        this.icon = icon;
         this.updateLabel();
-        this.updateIcon();
     }
     updateLabel() {
         if (!this.titleLabel) {
@@ -193,22 +180,8 @@ class ChatViewTitleLabel extends ActionViewItem {
         }
         if (this.title) {
             this.titleLabel.textContent = this.title;
-        }
-        else {
-            this.titleLabel.textContent = '';
-        }
-    }
-    updateIcon() {
-        if (!this.titleIcon) {
-            return;
-        }
-        if (this.icon) {
-            this.titleIcon.className = ThemeIcon.asClassName(this.icon);
-            show(this.titleIcon);
-        }
-        else {
-            this.titleIcon.className = '';
-            hide(this.titleIcon);
+        } else {
+            this.titleLabel.textContent = "";
         }
     }
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css

@@ -77,22 +77,6 @@
 			background-color: var(--vscode-inputOption-activeBackground);
 		}
 	}
-
-	.agent-sessions-link-container {
-		padding: 8px 0;
-		font-size: 12px;
-		text-align: center;
-	}
-
-	.agent-sessions-link-container a {
-		color: var(--vscode-descriptionForeground);
-	}
-
-	.agent-sessions-link-container a:hover,
-	.agent-sessions-link-container a:active {
-		text-decoration: none;
-		color: var(--vscode-textLink-foreground);
-	}
 }
 
 /* Sessions control: stacked */
@@ -101,6 +85,11 @@
 	.agent-sessions-container {
 		border-bottom: 1px solid var(--vscode-panel-border);
 	}
+
+	.agent-sessions-new-button-container {
+		/* hide new session button when stacked */
+		display: none;
+	}
 }
 
 /* Sessions control: side by side */
@@ -122,9 +111,17 @@
 		}
 	}
 
-	.agent-sessions-link-container {
-		/* hide link to show more when side by side */
-		display: none;
+	.agent-sessions-new-button-container {
+		padding: 8px 12px;
+	}
+}
+
+/* Sessions control: panel location */
+.chat-viewpane.has-sessions-control.chat-view-location-panel {
+
+	.agent-sessions-new-button-container {
+		/* hide new session button in the panel considering less vertical space */
+		display: none !important;
 	}
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css

@@ -39,6 +39,7 @@
 		.chat-view-title-actions-toolbar {
 			margin-left: auto;
 			padding-left: 4px;
+			flex-shrink: 0;
 		}
 	}
 

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.d.ts

@@ -11,7 +11,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
-import { IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes";
 import { IChatCompleteResponse, IChatDetail, IChatModelReference, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSessionContext, IChatSessionStartOptions, IChatUserActionEvent } 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";
@@ -41,8 +41,15 @@ export declare class ChatService extends Disposable implements IChatService {
     readonly onDidSubmitRequest: Event<{
         readonly chatSessionResource: URI;
     }>;
+    get onDidCreateModel(): Event<ChatModel>;
     private readonly _onDidPerformUserAction;
     readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
+    private readonly _onDidReceiveQuestionCarouselAnswer;
+    readonly onDidReceiveQuestionCarouselAnswer: Event<{
+        requestId: string;
+        resolveId: string;
+        answers: Record<string, unknown> | undefined;
+    }>;
     private readonly _onDidDisposeSession;
     readonly onDidDisposeSession: Event<{
         readonly sessionResource: URI[];
@@ -73,6 +80,7 @@ export declare class ChatService extends Disposable implements IChatService {
      */
     private shouldStoreSession;
     notifyUserAction(action: IChatUserActionEvent): void;
+    notifyQuestionCarouselAnswer(requestId: string, resolveId: string, answers: Record<string, unknown> | undefined): void;
     setChatSessionTitle(sessionResource: URI, title: string): Promise<void>;
     private trace;
     private info;