@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.0

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

@@ -1,43 +1,36 @@
 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 { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 export interface IChatViewTitleDelegate {
-    updateTitle(title: string): void;
     focusChat(): void;
 }
 export declare class ChatViewTitleControl extends Disposable {
     private readonly container;
     private readonly delegate;
     private readonly configurationService;
-    private readonly viewDescriptorService;
     private readonly instantiationService;
     private static readonly DEFAULT_TITLE;
+    private static readonly PICK_AGENT_SESSION_ACTION_ID;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    private get viewContainerModel();
     private title;
     private titleContainer;
     private titleLabel;
-    private titleIcon;
     private model;
     private modelDisposables;
     private navigationToolbar?;
     private actionsToolbar?;
     private lastKnownHeight;
-    constructor(container: HTMLElement, delegate: IChatViewTitleDelegate, configurationService: IConfigurationService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService);
+    constructor(container: HTMLElement, delegate: IChatViewTitleDelegate, configurationService: IConfigurationService, instantiationService: IInstantiationService);
     private registerListeners;
+    private registerActions;
     private render;
     update(model: IChatModel | undefined): void;
     private doUpdate;
-    private updateIcon;
-    private getIcon;
-    private getIconHoverContent;
     private updateTitle;
+    private getIcon;
     private shouldRender;
     private isEnabled;
-    getSingleViewPaneContainerTitle(): string | undefined;
-    private getTitleWithPrefix;
     getHeight(): number;
 }

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

@@ -2,10 +2,9 @@
 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 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { h, EventType as EventType$1, addDisposableListener, show, hide } 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 { getBaseLayerHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegate2';
 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';
@@ -13,76 +12,87 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 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 { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+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 { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { LayoutSettings, ActivityBarPosition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { AgentSessionProviders, getAgentSessionProviderIcon, getAgentSessionProviderName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+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(5650, "Chat")); }
-    get viewContainerModel() {
-        const viewContainer = this.viewDescriptorService.getViewContainerByViewId(ChatViewId);
-        if (viewContainer) {
-            return this.viewDescriptorService.getViewContainerModel(viewContainer);
-        }
-        return undefined;
-    }
-    constructor(container, delegate, configurationService, viewDescriptorService, instantiationService) {
+    static { this.DEFAULT_TITLE = ( localize(5878, "Chat")); }
+    static { this.PICK_AGENT_SESSION_ACTION_ID = 'workbench.action.chat.pickAgentSession'; }
+    constructor(container, delegate, configurationService, instantiationService) {
         super();
         this.container = container;
         this.delegate = delegate;
         this.configurationService = configurationService;
-        this.viewDescriptorService = viewDescriptorService;
         this.instantiationService = instantiationService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this.title = undefined;
+        this.titleLabel = this._register(( new MutableDisposable()));
         this.modelDisposables = this._register(( new MutableDisposable()));
         this.lastKnownHeight = 0;
         this.render(this.container);
         this.registerListeners();
+        this.registerActions();
     }
     registerListeners() {
-        if (this.viewContainerModel) {
-            this._register(this.viewContainerModel.onDidAddVisibleViewDescriptors(() => this.doUpdate()));
-            this._register(this.viewContainerModel.onDidRemoveVisibleViewDescriptors(() => this.doUpdate()));
-        }
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION) ||
-                e.affectsConfiguration(ChatConfiguration.ChatViewTitleEnabled)) {
+            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")),
+                    f1: false,
+                    menu: [{
+                            id: MenuId.ChatViewSessionTitleNavigationToolbar,
+                            group: 'navigation',
+                            order: 2
+                        }]
+                });
+            }
+            async run(accessor) {
+                const instantiationService = accessor.get(IInstantiationService);
+                const agentSessionsPicker = instantiationService.createInstance(AgentSessionsPicker);
+                await agentSessionsPicker.pickAgentSession();
+            }
+        }));
+    }
     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('span.chat-view-title-label@label'),
             h('div.chat-view-title-actions-toolbar@actionsToolbar'),
         ]);
         this.navigationToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, elements.navigationToolbar, MenuId.ChatViewSessionTitleNavigationToolbar, {
-            menuOptions: { shouldForwardArgs: true },
-            hiddenItemStrategy: HiddenItemStrategy.NoHide
+            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;
+                }
+                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.titleContainer = elements.root;
-        this.titleLabel = elements.label;
-        this.titleIcon = elements.icon;
-        this._register(getBaseLayerHoverDelegate().setupDelayedHoverAtMouse(this.titleIcon, () => ({
-            content: this.getIconHoverContent() ?? '',
-            appearance: { compact: true }
-        })));
         this._register(Gesture.addTarget(this.titleContainer));
         for (const eventType of [EventType.Tap, EventType$1.CLICK]) {
             this._register(addDisposableListener(this.titleContainer, eventType, () => {
@@ -103,9 +113,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
     doUpdate() {
         const markdownTitle = ( new MarkdownString(this.model?.title ?? ''));
         this.title = renderAsPlaintext(markdownTitle);
-        this.delegate.updateTitle(this.getTitleWithPrefix());
         this.updateTitle(this.title ?? ChatViewTitleControl_1.DEFAULT_TITLE);
-        this.updateIcon();
         const context = this.model && {
             $mid: MarshalledId.ChatViewContext,
             sessionResource: this.model.sessionResource
@@ -117,16 +125,16 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
             this.actionsToolbar.context = context;
         }
     }
-    updateIcon() {
-        if (!this.titleIcon) {
+    updateTitle(title) {
+        if (!this.titleContainer) {
             return;
         }
-        const icon = this.getIcon();
-        if (icon) {
-            this.titleIcon.className = `chat-view-title-icon ${ThemeIcon.asClassName(icon)}`;
-        }
-        else {
-            this.titleIcon.className = 'chat-view-title-icon';
+        this.titleContainer.classList.toggle('visible', this.shouldRender());
+        this.titleLabel.value?.updateTitle(title, this.getIcon());
+        const currentHeight = this.getHeight();
+        if (currentHeight !== this.lastKnownHeight) {
+            this.lastKnownHeight = currentHeight;
+            this._onDidChangeHeight.fire();
         }
     }
     getIcon() {
@@ -138,56 +146,15 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         }
         return undefined;
     }
-    getIconHoverContent() {
-        const sessionType = this.model?.contributedChatSession?.chatSessionType;
-        switch (sessionType) {
-            case AgentSessionProviders.Background:
-            case AgentSessionProviders.Cloud:
-                return localize(5651, "{0} Agent Session", getAgentSessionProviderName(sessionType));
-        }
-        return undefined;
-    }
-    updateTitle(title) {
-        if (!this.titleContainer || !this.titleLabel) {
-            return;
-        }
-        this.titleContainer.classList.toggle('visible', this.shouldRender());
-        this.titleLabel.textContent = title;
-        const currentHeight = this.getHeight();
-        if (currentHeight !== this.lastKnownHeight) {
-            this.lastKnownHeight = currentHeight;
-            this._onDidChangeHeight.fire();
-        }
-    }
     shouldRender() {
         if (!this.isEnabled()) {
             return false;
         }
-        if (this.viewContainerModel && this.viewContainerModel.visibleViewDescriptors.length > 1) {
-            return false;
-        }
-        if (this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.DEFAULT) {
-            return false;
-        }
         return !!this.model?.title;
     }
     isEnabled() {
         return this.configurationService.getValue(ChatConfiguration.ChatViewTitleEnabled) === true;
     }
-    getSingleViewPaneContainerTitle() {
-        if (!this.isEnabled() ||
-            this.shouldRender()
-        ) {
-            return undefined;
-        }
-        return this.getTitleWithPrefix();
-    }
-    getTitleWithPrefix() {
-        if (this.title) {
-            return localize(5652, "Chat: {0}", this.title);
-        }
-        return ChatViewTitleControl_1.DEFAULT_TITLE;
-    }
     getHeight() {
         if (!this.titleContainer || this.titleContainer.style.display === 'none') {
             return 0;
@@ -197,8 +164,53 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
 };
 ChatViewTitleControl = ChatViewTitleControl_1 = ( __decorate([
     ( __param(2, IConfigurationService)),
-    ( __param(3, IViewDescriptorService)),
-    ( __param(4, IInstantiationService))
+    ( __param(3, IInstantiationService))
 ], ChatViewTitleControl));
+class ChatViewTitleLabel extends ActionViewItem {
+    constructor(action, options) {
+        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);
+        this.updateLabel();
+        this.updateIcon();
+    }
+    updateTitle(title, icon) {
+        this.title = title;
+        this.icon = icon;
+        this.updateLabel();
+        this.updateIcon();
+    }
+    updateLabel() {
+        if (!this.titleLabel) {
+            return;
+        }
+        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);
+        }
+    }
+}
 
 export { ChatViewTitleControl };

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

@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Overall styles */
+.chat-viewpane {
+	display: flex;
+	flex-direction: column;
+
+	.chat-controls-container {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		height: 100%;
+		min-height: 0;
+		min-width: 0;
+
+		.interactive-session {
+
+			/* needed so that the chat welcome and chat input does not overflow and input grows over welcome */
+			width: 100%;
+			min-height: 0;
+			min-width: 0;
+		}
+	}
+
+	&:not(.chat-view-welcome-enabled) {
+
+		.interactive-session {
+
+			/* hide most welcome pieces (except suggested actions) when we show recent sessions to make some space */
+			.chat-welcome-view .chat-welcome-view-icon,
+			.chat-welcome-view .chat-welcome-view-title,
+			.chat-welcome-view .chat-welcome-view-message,
+			.chat-welcome-view .chat-welcome-view-disclaimer,
+			.chat-welcome-view .chat-welcome-view-tips {
+				visibility: hidden;
+			}
+		}
+	}
+}
+
+/* Sessions control: either sidebar or stacked */
+.chat-viewpane.has-sessions-control .agent-sessions-container {
+	display: flex;
+	flex-direction: column;
+
+	.agent-sessions-title-container {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 11px;
+		font-weight: 700;
+		text-transform: uppercase;
+		letter-spacing: 0.5px;
+
+		.agent-sessions-title {
+			cursor: pointer;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+
+	.agent-sessions-toolbar {
+
+		.action-item {
+			/* align with the title actions*/
+			margin-right: 4px;
+		}
+
+		&.filtered .action-label.codicon.codicon-filter {
+			/* indicate when sessions filter is enabled */
+			border-color: var(--vscode-inputOption-activeBorder);
+			color: var(--vscode-inputOption-activeForeground);
+			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 */
+.chat-viewpane.has-sessions-control.sessions-control-orientation-stacked {
+
+	.agent-sessions-container {
+		border-bottom: 1px solid var(--vscode-panel-border);
+	}
+}
+
+/* Sessions control: side by side */
+.chat-viewpane.has-sessions-control.sessions-control-orientation-sidebyside {
+
+	&.chat-view-position-left {
+		flex-direction: row;
+
+		.agent-sessions-container {
+			border-right: 1px solid var(--vscode-panel-border);
+		}
+	}
+
+	&.chat-view-position-right {
+		flex-direction: row-reverse;
+
+		.agent-sessions-container {
+			border-left: 1px solid var(--vscode-panel-border);
+		}
+	}
+
+	.agent-sessions-link-container {
+		/* hide link to show more when side by side */
+		display: none;
+	}
+}
+
+/*
+ * Padding rules for agent sessions elements based on:
+ * - orientation (stacked vs sidebyside)
+ * - view position (left vs right)
+ * - activity bar location (default vs other for auxiliarybar)
+ */
+.chat-viewpane.has-sessions-control {
+
+	/* Base padding: left-aligned content */
+	.agent-sessions-title-container {
+		padding: 0 8px 0 20px;
+	}
+
+	.agent-session-section {
+		padding: 0 12px 0 20px;
+	}
+
+	/* Right position: symmetric padding */
+	&.sessions-control-orientation-sidebyside.chat-view-position-right {
+
+		.agent-sessions-title-container {
+			padding: 0 8px;
+		}
+
+		.agent-session-section {
+			padding: 0 12px 0 8px;
+		}
+	}
+
+	/* Auxiliarybar with non-default activity bar: tighter title padding */
+	&.activity-bar-location-other.chat-view-location-auxiliarybar {
+
+		.agent-sessions-title-container {
+			padding-right: 4px;
+		}
+
+		/* Right position needs adjusted left padding too */
+		&.sessions-control-orientation-sidebyside.chat-view-position-right {
+
+			.agent-sessions-title-container,
+			.agent-session-section {
+				padding-left: 8px;
+			}
+		}
+	}
+}

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

@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-viewpane {
+
+	.chat-view-title-container {
+		display: none;
+		align-items: center;
+		cursor: pointer;
+
+		.chat-view-title-navigation-toolbar {
+			overflow: hidden;
+
+			.chat-view-title-action-item {
+				flex: 1 1 auto;
+				min-width: 0;
+
+				.chat-view-title-label-container {
+					display: flex;
+					gap: 4px;
+				}
+			}
+		}
+
+		.chat-view-title-label {
+			text-transform: uppercase;
+			font-size: 11px;
+			font-weight: 700;
+			line-height: 16px;
+			display: block;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			min-width: 0;
+		}
+
+		.chat-view-title-actions-toolbar {
+			margin-left: auto;
+			padding-left: 4px;
+		}
+	}
+
+	.chat-view-title-container.visible {
+		display: flex;
+	}
+}
+
+/*
+ * Below is a very complicated set of CSS rules that try to align the
+ * chat title to the surrounding elements depending on:
+ * - the activity bar position
+ * - the chat view container (sidebar, panel, auxiliarybar)
+ * - the container orientation (left, right)
+ * - the visibility of side by side
+ */
+.chat-viewpane {
+
+	/* Default padding for all view locations */
+	&.chat-view-location-sidebar,
+	&.chat-view-location-panel,
+	&.chat-view-location-auxiliarybar {
+		.chat-view-title-container {
+			padding: 0 12px 0 16px;
+		}
+	}
+
+	/* Auxiliarybar with non-default activity bar position */
+	&.activity-bar-location-other.chat-view-location-auxiliarybar {
+		.chat-view-title-container {
+			padding: 0 8px 0 16px;
+		}
+	}
+
+	/* Side-by-side sessions: left position (any activity bar) */
+	&.has-sessions-control.sessions-control-orientation-sidebyside.chat-view-position-left {
+		.chat-view-title-container {
+			padding: 0 8px;
+		}
+	}
+
+	/* Side-by-side sessions: right position (default activity bar only) */
+	&.activity-bar-location-default.has-sessions-control.sessions-control-orientation-sidebyside.chat-view-position-right {
+		.chat-view-title-container {
+			padding: 0 8px 0 16px;
+		}
+	}
+}