@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.d.ts

@@ -1,5 +1,4 @@
 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 { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
@@ -10,14 +9,12 @@ export declare class ChatSessionsView extends Disposable implements IWorkbenchCo
     private registerViewContainer;
 }
 export declare class ChatSessionsViewContrib extends Disposable implements IWorkbenchContribution {
-    private readonly instantiationService;
     private readonly chatSessionsService;
     private readonly logService;
     private readonly productService;
     static readonly ID = "workbench.contrib.chatSessions";
-    private readonly sessionTracker;
     private readonly registeredViewDescriptors;
-    constructor(instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, logService: ILogService, productService: IProductService);
+    constructor(chatSessionsService: IChatSessionsService, logService: ILogService, productService: IProductService);
     private getAllChatSessionItemProviders;
     private updateViewRegistration;
     private registerViews;

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.js

@@ -16,7 +16,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -24,9 +24,8 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { AGENT_SESSIONS_VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ChatSessionTracker } from '../chatSessionTracker.js';
+import { LEGACY_AGENT_SESSIONS_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { SessionsViewPane } from './sessionsViewPane.js';
 
 class ChatSessionsView extends Disposable {
@@ -37,8 +36,8 @@ class ChatSessionsView extends Disposable {
     }
     registerViewContainer() {
         ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
-            id: AGENT_SESSIONS_VIEWLET_ID,
-            title: ( localize2(5422, "Agent Sessions")),
+            id: LEGACY_AGENT_SESSIONS_VIEW_ID,
+            title: ( localize2(5504, "Agent Sessions")),
             ctorDescriptor: ( new SyncDescriptor(ChatSessionsViewPaneContainer)),
             hideIfEmpty: true,
             icon: registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, 'Icon for Agent Sessions View'),
@@ -48,14 +47,12 @@ class ChatSessionsView extends Disposable {
 }
 let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
     static { this.ID = 'workbench.contrib.chatSessions'; }
-    constructor(instantiationService, chatSessionsService, logService, productService) {
+    constructor(chatSessionsService, logService, productService) {
         super();
-        this.instantiationService = instantiationService;
         this.chatSessionsService = chatSessionsService;
         this.logService = logService;
         this.productService = productService;
         this.registeredViewDescriptors = ( new Map());
-        this.sessionTracker = this._register(this.instantiationService.createInstance(ChatSessionTracker));
         void this.updateViewRegistration();
         this._register(this.chatSessionsService.onDidChangeItemsProviders(() => {
             void this.updateViewRegistration();
@@ -70,7 +67,7 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
     async updateViewRegistration() {
         const contributions = this.chatSessionsService.getAllChatSessionContributions();
         await Promise.all(( contributions.map(
-            contrib => this.chatSessionsService.hasChatSessionItemProvider(contrib.type)
+            contrib => this.chatSessionsService.activateChatSessionItemProvider(contrib.type)
         )));
         const currentProviders = this.getAllChatSessionItemProviders();
         const currentProviderIds = ( new Set(( currentProviders.map(p => p.chatSessionType))));
@@ -82,7 +79,7 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
             }
         }
         if (viewsToUnregister.length > 0) {
-            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(AGENT_SESSIONS_VIEWLET_ID);
+            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(LEGACY_AGENT_SESSIONS_VIEW_ID);
             if (container) {
                 ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(viewsToUnregister, container);
             }
@@ -90,7 +87,7 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
         this.registerViews(contributions);
     }
     async registerViews(extensionPointContributions) {
-        const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(AGENT_SESSIONS_VIEWLET_ID);
+        const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(LEGACY_AGENT_SESSIONS_VIEW_ID);
         const providers = this.getAllChatSessionItemProviders();
         if (container && providers.length > 0) {
             const viewDescriptorsToRegister = [];
@@ -100,7 +97,7 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
             const providersWithDisplayNames = ( otherProviders.map(provider => {
                 const extContribution = extensionPointContributions.find(c => c.type === provider.chatSessionType);
                 if (!extContribution) {
-                    this.logService.warn(`No extension contribution found for chat session type: ${provider.chatSessionType}`);
+                    this.logService.trace(`No extension contribution found for chat session type: ${provider.chatSessionType}`);
                     return null;
                 }
                 return {
@@ -136,14 +133,14 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
             ];
             orderedProviders.forEach(({ provider, displayName, baseOrder, when }) => {
                 if (!( this.registeredViewDescriptors.has(provider.chatSessionType))) {
-                    const viewId = `${AGENT_SESSIONS_VIEWLET_ID}.${provider.chatSessionType}`;
+                    const viewId = `${LEGACY_AGENT_SESSIONS_VIEW_ID}.${provider.chatSessionType}`;
                     const viewDescriptor = {
                         id: viewId,
                         name: {
                             value: displayName,
                             original: displayName,
                         },
-                        ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [provider, this.sessionTracker, viewId])),
+                        ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [provider, viewId])),
                         canToggleVisibility: true,
                         canMoveView: true,
                         order: baseOrder,
@@ -155,7 +152,7 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
                         const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
                         this._register(viewsRegistry.registerViewWelcomeContent(viewDescriptor.id, {
                             content: ( localize(
-                                5423,
+                                5505,
                                 "No local chat agent sessions\n[Start an Agent Session](command:{0})",
                                 ACTION_ID_OPEN_CHAT
                             )),
@@ -163,16 +160,16 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
                     }
                 }
             });
-            const gettingStartedViewId = `${AGENT_SESSIONS_VIEWLET_ID}.gettingStarted`;
+            const gettingStartedViewId = `${LEGACY_AGENT_SESSIONS_VIEW_ID}.gettingStarted`;
             if (!( this.registeredViewDescriptors.has('gettingStarted'))
                 && this.productService.chatSessionRecommendations?.length) {
                 const gettingStartedDescriptor = {
                     id: gettingStartedViewId,
                     name: {
-                        value: ( localize(5424, "Getting Started")),
+                        value: ( localize(5506, "Getting Started")),
                         original: 'Getting Started',
                     },
-                    ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [null, this.sessionTracker, gettingStartedViewId])),
+                    ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [null, gettingStartedViewId])),
                     canToggleVisibility: true,
                     canMoveView: true,
                     order: 1000,
@@ -189,7 +186,7 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
     }
     dispose() {
         if (this.registeredViewDescriptors.size > 0) {
-            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(AGENT_SESSIONS_VIEWLET_ID);
+            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(LEGACY_AGENT_SESSIONS_VIEW_ID);
             if (container) {
                 const allRegisteredViews = Array.from(( this.registeredViewDescriptors.values()));
                 ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(allRegisteredViews, container);
@@ -200,19 +197,18 @@ let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
     }
 };
 ChatSessionsViewContrib = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IChatSessionsService)),
-    ( __param(2, ILogService)),
-    ( __param(3, IProductService))
+    ( __param(0, IChatSessionsService)),
+    ( __param(1, ILogService)),
+    ( __param(2, IProductService))
 ], ChatSessionsViewContrib));
 let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends ViewPaneContainer {
     constructor(instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService) {
-        super(AGENT_SESSIONS_VIEWLET_ID, {
+        super(LEGACY_AGENT_SESSIONS_VIEW_ID, {
             mergeViewWithContainerWhenSingleView: false,
         }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
     }
     getTitle() {
-        const title = ( localize(5425, "Agent Sessions"));
+        const title = ( localize(5507, "Agent Sessions"));
         return title;
     }
 };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.d.ts

@@ -11,16 +11,14 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
-import { IResourceLabel, ResourceLabels } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels";
+import { IResourceLabel, ResourceLabels } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels";
 import { ViewContainerLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { ChatSessionTracker } from "../chatSessionTracker.js";
-import { ChatSessionItemWithProvider } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common";
+import { ChatSessionItemWithProvider } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common";
 interface ISessionTemplateData {
     readonly container: HTMLElement;
     readonly iconLabel: IconLabel;
@@ -32,6 +30,14 @@ interface ISessionTemplateData {
     readonly statisticsLabel: HTMLElement;
     readonly customIcon: HTMLElement;
 }
+export declare class ArchivedSessionItems {
+    readonly label: string;
+    private readonly items;
+    constructor(label: string);
+    pushItem(item: ChatSessionItemWithProvider): void;
+    getItems(): ChatSessionItemWithProvider[];
+    clear(): void;
+}
 export interface IGettingStartedItem {
     id: string;
     label: string;
@@ -62,37 +68,35 @@ export declare class SessionsRenderer extends Disposable implements ITreeRendere
     private readonly menuService;
     private readonly contextKeyService;
     private readonly hoverService;
-    private readonly chatWidgetService;
     private readonly chatService;
     private readonly editorGroupsService;
     private readonly layoutService;
     private readonly markdownRendererService;
     static readonly TEMPLATE_ID = "session";
-    constructor(viewLocation: ViewContainerLocation | null, contextViewService: IContextViewService, configurationService: IConfigurationService, chatSessionsService: IChatSessionsService, menuService: IMenuService, contextKeyService: IContextKeyService, hoverService: IHoverService, chatWidgetService: IChatWidgetService, chatService: IChatService, editorGroupsService: IEditorGroupsService, layoutService: IWorkbenchLayoutService, markdownRendererService: IMarkdownRendererService);
+    constructor(viewLocation: ViewContainerLocation | null, contextViewService: IContextViewService, configurationService: IConfigurationService, chatSessionsService: IChatSessionsService, menuService: IMenuService, contextKeyService: IContextKeyService, hoverService: IHoverService, chatService: IChatService, editorGroupsService: IEditorGroupsService, layoutService: IWorkbenchLayoutService, markdownRendererService: IMarkdownRendererService);
     get templateId(): string;
     private getHoverPosition;
     renderTemplate(container: HTMLElement): ISessionTemplateData;
     statusToIcon(status?: ChatSessionStatus): ThemeIcon;
+    private renderArchivedNode;
     renderElement(element: ITreeNode<IChatSessionItem, FuzzyScore>, index: number, templateData: ISessionTemplateData): void;
     disposeElement(_element: ITreeNode<IChatSessionItem, FuzzyScore>, _index: number, templateData: ISessionTemplateData): void;
     private renderInputBox;
     disposeTemplate(templateData: ISessionTemplateData): void;
 }
-export declare class SessionsDataSource implements IAsyncDataSource<IChatSessionItemProvider, ChatSessionItemWithProvider> {
+export declare class SessionsDataSource implements IAsyncDataSource<IChatSessionItemProvider, ChatSessionItemWithProvider | ArchivedSessionItems> {
     private readonly provider;
-    private readonly chatService;
-    private readonly sessionTracker;
-    constructor(provider: IChatSessionItemProvider, chatService: IChatService, sessionTracker: ChatSessionTracker);
-    hasChildren(element: IChatSessionItemProvider | ChatSessionItemWithProvider): boolean;
-    getChildren(element: IChatSessionItemProvider | ChatSessionItemWithProvider): Promise<ChatSessionItemWithProvider[]>;
-    private getHistoryItems;
+    private archivedItems;
+    constructor(provider: IChatSessionItemProvider);
+    hasChildren(element: IChatSessionItemProvider | ChatSessionItemWithProvider | ArchivedSessionItems): boolean;
+    getChildren(element: IChatSessionItemProvider | ChatSessionItemWithProvider | ArchivedSessionItems): Promise<(ChatSessionItemWithProvider | ArchivedSessionItems)[]>;
 }
 export declare class SessionsDelegate implements IListVirtualDelegate<ChatSessionItemWithProvider> {
     private readonly configurationService;
     static readonly ITEM_HEIGHT = 22;
     static readonly ITEM_HEIGHT_WITH_DESCRIPTION = 44;
     constructor(configurationService: IConfigurationService);
-    getHeight(element: ChatSessionItemWithProvider): number;
+    getHeight(element: ChatSessionItemWithProvider | ArchivedSessionItems): number;
     getTemplateId(element: ChatSessionItemWithProvider): string;
 }
 export {};

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.js

@@ -15,7 +15,6 @@ import { createSingleCallFunction } from '@codingame/monaco-vscode-api/vscode/vs
 import { isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -34,20 +33,34 @@ import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/wo
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { getLocalHistoryDateFormatter } from '@codingame/monaco-vscode-af7aa6ff-f023-5da1-803d-a085ef0e5dc3-common/vscode/vs/workbench/contrib/localHistory/browser/localHistory';
+import { getLocalHistoryDateFormatter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/localHistory/browser/localHistory';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatSessionStatus, localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { allowedChatMarkdownHtmlTags } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatContentMarkdownRenderer';
+import { allowedChatMarkdownHtmlTags } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatContentMarkdownRenderer';
 import * as chatSessions from '../../media/chatSessions.css';
-import { isLocalChatSessionItem, getSessionItemContextOverlay, extractTimestamp, processSessionsWithTimeGrouping } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
-import { LocalChatSessionsProvider } from '../localChatSessionsProvider.js';
+import { getSessionItemContextOverlay, extractTimestamp, processSessionsWithTimeGrouping } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
 
 var SessionsRenderer_1;
 registerCss(chatSessions);
+class ArchivedSessionItems {
+    constructor(label) {
+        this.label = label;
+        this.items = ( new Map());
+    }
+    pushItem(item) {
+        const key = ( item.resource.toString());
+        this.items.set(key, item);
+    }
+    getItems() {
+        return Array.from(( this.items.values()));
+    }
+    clear() {
+        this.items.clear();
+    }
+}
 class GettingStartedDelegate {
     getHeight() {
         return 22;
@@ -82,7 +95,7 @@ class GettingStartedRenderer {
 let SessionsRenderer = class SessionsRenderer extends Disposable {
     static { SessionsRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'session'; }
-    constructor(viewLocation, contextViewService, configurationService, chatSessionsService, menuService, contextKeyService, hoverService, chatWidgetService, chatService, editorGroupsService, layoutService, markdownRendererService) {
+    constructor(viewLocation, contextViewService, configurationService, chatSessionsService, menuService, contextKeyService, hoverService, chatService, editorGroupsService, layoutService, markdownRendererService) {
         super();
         this.viewLocation = viewLocation;
         this.contextViewService = contextViewService;
@@ -91,7 +104,6 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.hoverService = hoverService;
-        this.chatWidgetService = chatWidgetService;
         this.chatService = chatService;
         this.editorGroupsService = editorGroupsService;
         this.layoutService = layoutService;
@@ -148,10 +160,23 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
                 return Codicon.circleOutline;
         }
     }
+    renderArchivedNode(node, templateData) {
+        templateData.customIcon.className = '';
+        templateData.descriptionRow.style.display = 'none';
+        templateData.timestamp.parentElement.style.display = 'none';
+        const childCount = node.getItems().length;
+        templateData.iconLabel.setLabel(node.label, undefined, {
+            title: childCount === 1 ? ( localize(5508, '1 session')) : ( localize(5509, '{0} sessions', childCount))
+        });
+    }
     renderElement(element, index, templateData) {
+        if (element.element instanceof ArchivedSessionItems) {
+            this.renderArchivedNode(element.element, templateData);
+            return;
+        }
         const session = element.element;
         let editableData;
-        if (isLocalChatSessionItem(session)) {
+        if (LocalChatSessionUri.parseLocalSessionId(session.resource)) {
             templateData.container.classList.add('local-session');
             editableData = this.chatSessionsService.getEditableData(session.resource);
         }
@@ -166,13 +191,13 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
         }
         templateData.actionBar.clear();
         let iconTheme;
-        if (!session.iconPath && session.id !== LocalChatSessionsProvider.HISTORY_NODE_ID) {
+        if (!session.iconPath) {
             iconTheme = this.statusToIcon(session.status);
         }
         else {
             iconTheme = session.iconPath;
         }
-        const renderDescriptionOnSecondRow = this.configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription) && session.provider.chatSessionType !== localChatSessionType;
+        const renderDescriptionOnSecondRow = this.configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription);
         if (renderDescriptionOnSecondRow && session.description) {
             templateData.container.classList.toggle('multiline', true);
             templateData.descriptionRow.style.display = 'flex';
@@ -194,10 +219,22 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
                 templateData.elementDisposable.add(addDisposableListener(templateData.descriptionLabel, 'auxclick', e => e.stopPropagation()));
             }
             clearNode(templateData.statisticsLabel);
+            let insertions = 0;
+            let deletions = 0;
+            if (session.changes instanceof Array) {
+                for (const change of session.changes) {
+                    insertions += change.insertions;
+                    deletions += change.deletions;
+                }
+            }
+            else if (session.changes) {
+                insertions = session.changes.insertions;
+                deletions = session.changes.deletions;
+            }
             const insertionNode = append(templateData.statisticsLabel, $('span.insertions'));
-            insertionNode.textContent = session.statistics ? `+${session.statistics.insertions}` : '';
+            insertionNode.textContent = session.changes ? `+${insertions}` : '';
             const deletionNode = append(templateData.statisticsLabel, $('span.deletions'));
-            deletionNode.textContent = session.statistics ? `-${session.statistics.deletions}` : '';
+            deletionNode.textContent = session.changes ? `-${deletions}` : '';
         }
         else {
             templateData.container.classList.toggle('multiline', false);
@@ -239,7 +276,7 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
             if (session.timing?.startTime) {
                 const fullDateTime = getLocalHistoryDateFormatter().format(session.timing.startTime);
                 templateData.elementDisposable.add(this.hoverService.setupDelayedHover(templateData.timestamp, () => ({
-                    content: ( localize(5426, 'Last Activity: {0}', fullDateTime)),
+                    content: ( localize(5510, 'Last Activity: {0}', fullDateTime)),
                     style: HoverStyle.Pointer,
                     position: { hoverPosition: this.getHoverPosition() }
                 }), { groupId: 'chat.sessions' }));
@@ -248,9 +285,9 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
         else {
             templateData.timestamp.parentElement.style.display = 'none';
         }
-        const contextOverlay = getSessionItemContextOverlay(session, session.provider, this.chatWidgetService, this.chatService, this.editorGroupsService);
+        const contextOverlay = getSessionItemContextOverlay(session, session.provider, this.chatService, this.editorGroupsService);
         const contextKeyService = this.contextKeyService.createOverlay(contextOverlay);
-        const menu = templateData.elementDisposable.add(this.menuService.createMenu(MenuId.ChatSessionsMenu, contextKeyService));
+        const menu = templateData.elementDisposable.add(this.menuService.createMenu(MenuId.AgentSessionsContext, contextKeyService));
         const setupActionBar = () => {
             templateData.actionBar.clear();
             const marshalledSession = {
@@ -300,7 +337,7 @@ let SessionsRenderer = class SessionsRenderer extends Disposable {
                     };
                 }
             },
-            ariaLabel: ( localize(5427, "Type session name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(5511, "Type session name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles,
         }));
         inputBox.value = session.label;
@@ -389,25 +426,22 @@ SessionsRenderer = SessionsRenderer_1 = ( __decorate([
     ( __param(4, IMenuService)),
     ( __param(5, IContextKeyService)),
     ( __param(6, IHoverService)),
-    ( __param(7, IChatWidgetService)),
-    ( __param(8, IChatService)),
-    ( __param(9, IEditorGroupsService)),
-    ( __param(10, IWorkbenchLayoutService)),
-    ( __param(11, IMarkdownRendererService))
+    ( __param(7, IChatService)),
+    ( __param(8, IEditorGroupsService)),
+    ( __param(9, IWorkbenchLayoutService)),
+    ( __param(10, IMarkdownRendererService))
 ], SessionsRenderer));
 class SessionsDataSource {
-    constructor(provider, chatService, sessionTracker) {
+    constructor(provider) {
         this.provider = provider;
-        this.chatService = chatService;
-        this.sessionTracker = sessionTracker;
+        this.archivedItems = ( new ArchivedSessionItems(( localize(5512, 'History'))));
     }
     hasChildren(element) {
-        const isProvider = element === this.provider;
-        if (isProvider) {
+        if (element === this.provider) {
             return true;
         }
-        if ('id' in element && element.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-            return true;
+        if (element instanceof ArchivedSessionItems) {
+            return element.getItems().length > 0;
         }
         return false;
     }
@@ -415,55 +449,29 @@ class SessionsDataSource {
         if (element === this.provider) {
             try {
                 const items = await this.provider.provideChatSessionItems(CancellationToken.None);
-                const itemsWithProvider = ( items.map(item => {
-                    const itemWithProvider = { ...item, provider: this.provider };
-                    itemWithProvider.timing = { startTime: extractTimestamp(item) ?? 0 };
+                this.archivedItems.clear();
+                const result = ( items.map(item => {
+                    const itemWithProvider = { ...item, provider: this.provider, timing: { startTime: extractTimestamp(item) ?? 0 } };
+                    if (itemWithProvider.history) {
+                        this.archivedItems.pushItem(itemWithProvider);
+                        return;
+                    }
                     return itemWithProvider;
-                }));
-                if (this.provider.chatSessionType !== localChatSessionType) {
-                    const hybridSessions = await this.sessionTracker.getHybridSessionsForProvider(this.provider);
-                    const existingSessions = ( new ResourceSet());
-                    itemsWithProvider.forEach(s => existingSessions.add(s.resource));
-                    hybridSessions.forEach(session => {
-                        if (!( existingSessions.has(session.resource))) {
-                            itemsWithProvider.push(session);
-                            existingSessions.add(session.resource);
-                        }
-                    });
-                    processSessionsWithTimeGrouping(itemsWithProvider);
+                })).filter(item => item !== undefined);
+                if (this.archivedItems.getItems().length > 0) {
+                    result.push(this.archivedItems);
                 }
-                return itemsWithProvider;
+                return result;
             }
             catch (error) {
                 return [];
             }
         }
-        if ('id' in element && element.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-            return this.getHistoryItems();
+        if (element instanceof ArchivedSessionItems) {
+            return processSessionsWithTimeGrouping(element.getItems());
         }
         return [];
     }
-    async getHistoryItems() {
-        try {
-            const allHistory = await this.chatService.getLocalSessionHistory();
-            const historyItems = ( allHistory.map((historyDetail) => ({
-                id: chatSessionResourceToId(historyDetail.sessionResource),
-                resource: historyDetail.sessionResource,
-                label: historyDetail.title,
-                iconPath: Codicon.chatSparkle,
-                provider: this.provider,
-                timing: {
-                    startTime: historyDetail.lastMessageDate ?? Date.now()
-                },
-                isHistory: true,
-            })));
-            processSessionsWithTimeGrouping(historyItems);
-            return historyItems;
-        }
-        catch (error) {
-            return [];
-        }
-    }
 }
 class SessionsDelegate {
     static { this.ITEM_HEIGHT = 22; }
@@ -472,7 +480,7 @@ class SessionsDelegate {
         this.configurationService = configurationService;
     }
     getHeight(element) {
-        if (element.description && this.configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription) && element.provider.chatSessionType !== localChatSessionType) {
+        if (this.configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription) && !(element instanceof ArchivedSessionItems) && element.description) {
             return SessionsDelegate.ITEM_HEIGHT_WITH_DESCRIPTION;
         }
         else {
@@ -484,4 +492,4 @@ class SessionsDelegate {
     }
 }
 
-export { GettingStartedDelegate, GettingStartedRenderer, SessionsDataSource, SessionsDelegate, SessionsRenderer };
+export { ArchivedSessionItems, GettingStartedDelegate, GettingStartedRenderer, SessionsDataSource, SessionsDelegate, SessionsRenderer };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.d.ts

@@ -13,23 +13,17 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
-import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { ChatSessionTracker } from "../chatSessionTracker.js";
 export declare class SessionsViewPane extends ViewPane {
     private readonly provider;
-    private readonly sessionTracker;
     private readonly viewId;
     private readonly chatService;
-    private readonly editorService;
-    private readonly viewsService;
     private readonly logService;
     private readonly progressService;
     private readonly menuService;
@@ -42,7 +36,7 @@ export declare class SessionsViewPane extends ViewPane {
     private treeContainer;
     private messageElement?;
     private _isEmpty;
-    constructor(provider: IChatSessionItemProvider, sessionTracker: ChatSessionTracker, viewId: string, options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, chatService: IChatService, editorService: IEditorService, viewsService: IViewsService, logService: ILogService, progressService: IProgressService, menuService: IMenuService, commandService: ICommandService, chatWidgetService: IChatWidgetService, editorGroupsService: IEditorGroupsService, chatSessionsService: IChatSessionsService);
+    constructor(provider: IChatSessionItemProvider, viewId: string, options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, chatService: IChatService, logService: ILogService, progressService: IProgressService, menuService: IMenuService, commandService: ICommandService, chatWidgetService: IChatWidgetService, editorGroupsService: IEditorGroupsService, chatSessionsService: IChatSessionsService);
     shouldShowWelcome(): boolean;
     createActionViewItem(action: IAction, options: IBaseActionViewItemOptions): IActionViewItem | undefined;
     private getChatSessionDropdown;