@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -1,16 +1,18 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IChatSessionItemProvider, IChatSessionItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { 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";
-export declare class LocalChatSessionsProvider extends Disposable implements IChatSessionItemProvider {
+export declare class LocalChatSessionsProvider extends Disposable implements IChatSessionItemProvider, IWorkbenchContribution {
     private readonly editorGroupService;
     private readonly chatWidgetService;
     private readonly chatService;
     private readonly chatSessionsService;
+    static readonly ID = "workbench.contrib.localChatSessionsProvider";
     static readonly CHAT_WIDGET_VIEW_ID = "workbench.panel.chat.view.copilot";
     static readonly HISTORY_NODE_ID = "show-history";
     readonly chatSessionType = "local";
@@ -22,6 +24,7 @@ export declare class LocalChatSessionsProvider extends Disposable implements ICh
     private editorOrder;
     constructor(editorGroupService: IEditorGroupsService, chatWidgetService: IChatWidgetService, chatService: IChatService, chatSessionsService: IChatSessionsService);
     private registerWidgetListeners;
+    private _registerWidgetModelListeners;
     private registerProgressListener;
     private registerModelTitleListener;
     private initializeCurrentEditorSet;

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

@@ -3,19 +3,22 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { localChatSessionType, 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 { ChatAgentLocation } 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 { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { isChatSession, getChatSessionType } from './common.js';
+import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { isChatSession } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
 
 var LocalChatSessionsProvider_1;
 let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposable {
     static { LocalChatSessionsProvider_1 = this; }
+    static { this.ID = 'workbench.contrib.localChatSessionsProvider'; }
     static { this.CHAT_WIDGET_VIEW_ID = 'workbench.panel.chat.view.copilot'; }
     static { this.HISTORY_NODE_ID = 'show-history'; }
     get onDidChangeChatSessionItems() { return this._onDidChangeChatSessionItems.event; }
@@ -25,12 +28,13 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
         this.chatWidgetService = chatWidgetService;
         this.chatService = chatService;
         this.chatSessionsService = chatSessionsService;
-        this.chatSessionType = 'local';
+        this.chatSessionType = localChatSessionType;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._onDidChangeChatSessionItems = this._register(( new Emitter()));
         this.currentEditorSet = ( new Set());
         this.editorOrder = [];
+        this._register(this.chatSessionsService.registerChatSessionItemProvider(this));
         this.initializeCurrentEditorSet();
         this.registerWidgetListeners();
         this._register(this.chatService.onDidDisposeSession(() => {
@@ -50,30 +54,27 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
                 'viewId' in widget.viewContext &&
                 widget.viewContext.viewId === LocalChatSessionsProvider_1.CHAT_WIDGET_VIEW_ID) {
                 this._onDidChange.fire();
-                this._register(widget.onDidChangeViewModel(() => {
-                    this._onDidChange.fire();
-                    if (widget.viewModel) {
-                        this.registerProgressListener(widget.viewModel.model.requestInProgressObs);
-                    }
-                }));
-                this.registerModelTitleListener(widget);
-                if (widget.viewModel) {
-                    this.registerProgressListener(widget.viewModel.model.requestInProgressObs);
-                }
+                this._registerWidgetModelListeners(widget);
             }
         }));
         const existingWidgets = this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat)
             .filter(widget => typeof widget.viewContext === 'object' && 'viewId' in widget.viewContext && widget.viewContext.viewId === LocalChatSessionsProvider_1.CHAT_WIDGET_VIEW_ID);
         existingWidgets.forEach(widget => {
-            this._register(widget.onDidChangeViewModel(() => {
-                this._onDidChange.fire();
-                this.registerModelTitleListener(widget);
-            }));
+            this._registerWidgetModelListeners(widget);
+        });
+    }
+    _registerWidgetModelListeners(widget) {
+        const register = () => {
             this.registerModelTitleListener(widget);
             if (widget.viewModel) {
                 this.registerProgressListener(widget.viewModel.model.requestInProgressObs);
             }
-        });
+        };
+        this._register(widget.onDidChangeViewModel(() => {
+            register();
+            this._onDidChangeChatSessionItems.fire();
+        }));
+        register();
     }
     registerProgressListener(observable) {
         const progressEvent = Event.fromObservableLight(observable);
@@ -108,14 +109,13 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
         return `${group.id}-${editor.typeId}-${editor.resource?.toString() || editor.getName()}`;
     }
     isLocalChatSession(editor) {
-        if (!isChatSession(editor)) {
+        if (!isChatSession(this.chatSessionsService.getContentProviderSchemes(), editor)) {
             return false;
         }
         if (!(editor instanceof ChatEditorInput)) {
             return false;
         }
-        const sessionType = getChatSessionType(editor);
-        return sessionType === 'local';
+        return editor.getSessionType() === localChatSessionType;
     }
     modelToStatus(model) {
         if (model.requestInProgress) {
@@ -125,7 +125,7 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
             const requests = model.getRequests();
             if (requests.length > 0) {
                 const lastRequest = requests[requests.length - 1];
-                if (lastRequest && lastRequest.response) {
+                if (lastRequest?.response) {
                     if (lastRequest.response.isCanceled || lastRequest.response.result?.errorDetails) {
                         return ChatSessionStatus.Failed;
                     }
@@ -156,10 +156,12 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
         const status = chatWidget?.viewModel?.model ? this.modelToStatus(chatWidget.viewModel.model) : undefined;
         const widgetSession = {
             id: LocalChatSessionsProvider_1.CHAT_WIDGET_VIEW_ID,
-            label: chatWidget?.viewModel?.model.title || ( localize2(5235, "Chat")).value,
-            description: ( localize(5236, "Chat View")),
+            resource: ( URI.parse(`${Schemas.vscodeLocalChatSession}://widget`)),
+            label: chatWidget?.viewModel?.model.title || ( localize2(5399, "Chat")).value,
+            description: ( localize(5400, "Chat View")),
             iconPath: Codicon.chatSparkle,
             status,
+            timing: { startTime: chatWidget?.viewModel?.model.getRequests().at(0)?.timestamp || 0 },
             provider: this
         };
         sessions.push(widgetSession);
@@ -167,28 +169,28 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
             const editorInfo = editorMap.get(editorKey);
             if (editorInfo) {
                 let status;
-                let timestamp;
-                if (editorInfo.editor instanceof ChatEditorInput && editorInfo.editor.sessionId) {
-                    const model = this.chatService.getSession(editorInfo.editor.sessionId);
+                let startTime;
+                if (editorInfo.editor instanceof ChatEditorInput && editorInfo.editor.sessionResource && editorInfo.editor.sessionId) {
+                    const model = this.chatService.getSession(editorInfo.editor.sessionResource);
                     if (model) {
                         status = this.modelToStatus(model);
                         const requests = model.getRequests();
                         if (requests.length > 0) {
-                            const lastRequest = requests[requests.length - 1];
-                            timestamp = lastRequest.timestamp;
+                            startTime = requests.at(0)?.timestamp;
                         }
                         else {
-                            timestamp = Date.now();
+                            startTime = Date.now();
                         }
                     }
                     const editorSession = {
                         id: editorInfo.editor.sessionId,
+                        resource: editorInfo.editor.resource,
                         label: editorInfo.editor.getName(),
                         iconPath: Codicon.chatSparkle,
                         status,
                         provider: this,
                         timing: {
-                            startTime: timestamp ?? 0
+                            startTime: startTime ?? 0
                         }
                     };
                     sessions.push(editorSession);
@@ -197,7 +199,9 @@ let LocalChatSessionsProvider = class LocalChatSessionsProvider extends Disposab
         });
         const historyNode = {
             id: LocalChatSessionsProvider_1.HISTORY_NODE_ID,
-            label: ( localize(5237, "History")),
+            resource: ( URI.parse(`${Schemas.vscodeLocalChatSession}://history`)),
+            label: ( localize(5401, "History")),
+            timing: { startTime: 0 }
         };
         return [...sessions, historyNode];
     }

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

@@ -1,22 +1,25 @@
 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 { 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";
-import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 export declare class ChatSessionsView extends Disposable implements IWorkbenchContribution {
-    private readonly configurationService;
+    static readonly ID = "workbench.contrib.chatSessionsView";
+    constructor();
+    private registerViewContainer;
+}
+export declare class ChatSessionsViewContrib extends Disposable implements IWorkbenchContribution {
     private readonly instantiationService;
     private readonly chatSessionsService;
-    private readonly chatEntitlementService;
+    private readonly logService;
+    private readonly productService;
     static readonly ID = "workbench.contrib.chatSessions";
-    private isViewContainerRegistered;
-    private localProvider;
     private readonly sessionTracker;
-    private viewContainer;
-    constructor(configurationService: IConfigurationService, instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, chatEntitlementService: IChatEntitlementService);
-    private setupEditorTracking;
-    private updateViewContainerRegistration;
-    private registerViewContainer;
-    private deregisterViewContainer;
+    private readonly registeredViewDescriptors;
+    constructor(instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, logService: ILogService, productService: IProductService);
+    private getAllChatSessionItemProviders;
+    private updateViewRegistration;
+    private registerViews;
+    dispose(): void;
 }

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

@@ -4,6 +4,7 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -18,127 +19,59 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/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 { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
+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 { ChatConfiguration, VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+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 { LocalChatSessionsProvider } from '../localChatSessionsProvider.js';
 import { SessionsViewPane } from './sessionsViewPane.js';
 
-let ChatSessionsView = class ChatSessionsView extends Disposable {
-    static { this.ID = 'workbench.contrib.chatSessions'; }
-    constructor(configurationService, instantiationService, chatSessionsService, chatEntitlementService) {
+class ChatSessionsView extends Disposable {
+    static { this.ID = 'workbench.contrib.chatSessionsView'; }
+    constructor() {
         super();
-        this.configurationService = configurationService;
-        this.instantiationService = instantiationService;
-        this.chatSessionsService = chatSessionsService;
-        this.chatEntitlementService = chatEntitlementService;
-        this.isViewContainerRegistered = false;
-        this.sessionTracker = this._register(this.instantiationService.createInstance(ChatSessionTracker));
-        this.setupEditorTracking();
-        this.localProvider = this._register(this.instantiationService.createInstance(LocalChatSessionsProvider));
-        this._register(this.chatSessionsService.registerChatSessionItemProvider(this.localProvider));
-        this.updateViewContainerRegistration();
-        this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(ChatConfiguration.AgentSessionsViewLocation)) {
-                this.updateViewContainerRegistration();
-            }
-        }));
-        this._register(this.chatEntitlementService.onDidChangeSentiment(e => {
-            this.updateViewContainerRegistration();
-        }));
-    }
-    setupEditorTracking() {
-        this._register(this.sessionTracker.onDidChangeEditors(e => {
-            this.chatSessionsService.notifySessionItemsChanged(e.sessionType);
-        }));
-    }
-    updateViewContainerRegistration() {
-        const location = this.configurationService.getValue(ChatConfiguration.AgentSessionsViewLocation);
-        const sentiment = this.chatEntitlementService.sentiment;
-        if (sentiment.disabled || sentiment.hidden || (location !== 'view' && this.isViewContainerRegistered)) {
-            this.deregisterViewContainer();
-        }
-        else if (location === 'view' && !this.isViewContainerRegistered) {
-            this.registerViewContainer();
-        }
+        this.registerViewContainer();
     }
     registerViewContainer() {
-        if (this.isViewContainerRegistered) {
-            return;
-        }
-        this.viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
-            id: VIEWLET_ID,
-            title: ( localize2(5238, "Chat Sessions")),
-            ctorDescriptor: ( new SyncDescriptor(ChatSessionsViewPaneContainer, [this.sessionTracker])),
-            hideIfEmpty: false,
-            icon: registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, 'Icon for Chat Sessions View'),
+        ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
+            id: AGENT_SESSIONS_VIEWLET_ID,
+            title: ( localize2(5402, "Agent Sessions")),
+            ctorDescriptor: ( new SyncDescriptor(ChatSessionsViewPaneContainer)),
+            hideIfEmpty: true,
+            icon: registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, 'Icon for Agent Sessions View'),
             order: 6
         }, ViewContainerLocation.Sidebar);
-        this.isViewContainerRegistered = true;
-    }
-    deregisterViewContainer() {
-        if (this.viewContainer) {
-            const allViews = ( Registry.as(Extensions.ViewsRegistry)).getViews(this.viewContainer);
-            if (allViews.length > 0) {
-                ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(allViews, this.viewContainer);
-            }
-            ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(this.viewContainer);
-            this.viewContainer = undefined;
-            this.isViewContainerRegistered = false;
-        }
     }
-};
-ChatSessionsView = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IChatSessionsService)),
-    ( __param(3, IChatEntitlementService))
-], ChatSessionsView));
-let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends ViewPaneContainer {
-    constructor(sessionTracker, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService, productService, chatSessionsService) {
-        super(VIEWLET_ID, {
-            mergeViewWithContainerWhenSingleView: false,
-        }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
-        this.sessionTracker = sessionTracker;
-        this.productService = productService;
+}
+let ChatSessionsViewContrib = class ChatSessionsViewContrib extends Disposable {
+    static { this.ID = 'workbench.contrib.chatSessions'; }
+    constructor(instantiationService, chatSessionsService, logService, productService) {
+        super();
+        this.instantiationService = instantiationService;
         this.chatSessionsService = chatSessionsService;
+        this.logService = logService;
+        this.productService = productService;
         this.registeredViewDescriptors = ( new Map());
-        this.updateViewRegistration();
+        this.sessionTracker = this._register(this.instantiationService.createInstance(ChatSessionTracker));
+        void this.updateViewRegistration();
         this._register(this.chatSessionsService.onDidChangeItemsProviders(() => {
-            this.updateViewRegistration();
-        }));
-        this._register(this.chatSessionsService.onDidChangeSessionItems((chatSessionType) => {
-            this.refreshProviderTree(chatSessionType);
+            void this.updateViewRegistration();
         }));
         this._register(this.chatSessionsService.onDidChangeAvailability(() => {
-            this.updateViewRegistration();
+            void this.updateViewRegistration();
         }));
     }
-    getTitle() {
-        const title = ( localize(5239, "Chat Sessions"));
-        return title;
-    }
     getAllChatSessionItemProviders() {
         return Array.from(this.chatSessionsService.getAllChatSessionItemProviders());
     }
-    refreshProviderTree(chatSessionType) {
-        const providers = this.getAllChatSessionItemProviders();
-        const targetProvider = providers.find(provider => provider.chatSessionType === chatSessionType);
-        if (targetProvider) {
-            const viewId = `${VIEWLET_ID}.${chatSessionType}`;
-            const view = this.getView(viewId);
-            if (view) {
-                view.refreshTree();
-            }
-        }
-    }
     async updateViewRegistration() {
         const contributions = this.chatSessionsService.getAllChatSessionContributions();
-        await Promise.all(( contributions.map(contrib => this.chatSessionsService.canResolveItemProvider(contrib.type))));
+        await Promise.all(( contributions.map(
+            contrib => this.chatSessionsService.hasChatSessionItemProvider(contrib.type)
+        )));
         const currentProviders = this.getAllChatSessionItemProviders();
         const currentProviderIds = ( new Set(( currentProviders.map(p => p.chatSessionType))));
         const viewsToUnregister = [];
@@ -149,7 +82,7 @@ let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends
             }
         }
         if (viewsToUnregister.length > 0) {
-            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(VIEWLET_ID);
+            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(AGENT_SESSIONS_VIEWLET_ID);
             if (container) {
                 ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(viewsToUnregister, container);
             }
@@ -157,13 +90,13 @@ let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends
         this.registerViews(contributions);
     }
     async registerViews(extensionPointContributions) {
-        const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(VIEWLET_ID);
+        const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(AGENT_SESSIONS_VIEWLET_ID);
         const providers = this.getAllChatSessionItemProviders();
         if (container && providers.length > 0) {
             const viewDescriptorsToRegister = [];
-            const localProvider = providers.find(p => p.chatSessionType === 'local');
+            const localProvider = providers.find(p => p.chatSessionType === localChatSessionType);
             const historyProvider = providers.find(p => p.chatSessionType === 'history');
-            const otherProviders = providers.filter(p => p.chatSessionType !== 'local' && p.chatSessionType !== 'history');
+            const otherProviders = providers.filter(p => p.chatSessionType !== localChatSessionType && p.chatSessionType !== 'history');
             const providersWithDisplayNames = ( otherProviders.map(provider => {
                 const extContribution = extensionPointContributions.find(c => c.type === provider.chatSessionType);
                 if (!extContribution) {
@@ -172,28 +105,45 @@ let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends
                 }
                 return {
                     provider,
-                    displayName: extContribution.displayName
+                    displayName: extContribution.displayName,
+                    order: extContribution.order
                 };
             })).filter(item => item !== null);
-            providersWithDisplayNames.sort((a, b) => a.displayName.localeCompare(b.displayName));
+            providersWithDisplayNames.sort((a, b) => {
+                if (a.order === undefined && b.order === undefined) {
+                    return a.displayName.localeCompare(b.displayName);
+                }
+                if (a.order === undefined) {
+                    return 1;
+                }
+                if (b.order === undefined) {
+                    return -1;
+                }
+                const orderCompare = a.order - b.order;
+                if (orderCompare !== 0) {
+                    return orderCompare;
+                }
+                return a.displayName.localeCompare(b.displayName);
+            });
             const orderedProviders = [
-                ...(localProvider ? [{ provider: localProvider, displayName: 'Local Chat Sessions', baseOrder: 0 }] : []),
-                ...(historyProvider ? [{ provider: historyProvider, displayName: 'History', baseOrder: 1, when: undefined }] : []),
+                ...(localProvider ? [{ provider: localProvider, displayName: 'Local Chat Agent', baseOrder: 0, when: ChatContextKeyExprs.agentViewWhen }] : []),
+                ...(historyProvider ? [{ provider: historyProvider, displayName: 'History', baseOrder: 1, when: ChatContextKeyExprs.agentViewWhen }] : []),
                 ...( providersWithDisplayNames.map((item, index) => ({
                     ...item,
                     baseOrder: 2 + index,
-                    when: undefined,
+                    when: ChatContextKeyExprs.agentViewWhen,
                 })))
             ];
             orderedProviders.forEach(({ provider, displayName, baseOrder, when }) => {
                 if (!( this.registeredViewDescriptors.has(provider.chatSessionType))) {
+                    const viewId = `${AGENT_SESSIONS_VIEWLET_ID}.${provider.chatSessionType}`;
                     const viewDescriptor = {
-                        id: `${VIEWLET_ID}.${provider.chatSessionType}`,
+                        id: viewId,
                         name: {
                             value: displayName,
                             original: displayName,
                         },
-                        ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [provider, this.sessionTracker])),
+                        ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [provider, this.sessionTracker, viewId])),
                         canToggleVisibility: true,
                         canMoveView: true,
                         order: baseOrder,
@@ -201,33 +151,33 @@ let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends
                     };
                     viewDescriptorsToRegister.push(viewDescriptor);
                     this.registeredViewDescriptors.set(provider.chatSessionType, viewDescriptor);
-                    if (provider.chatSessionType === 'local') {
+                    if (provider.chatSessionType === localChatSessionType) {
                         const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
                         this._register(viewsRegistry.registerViewWelcomeContent(viewDescriptor.id, {
                             content: ( localize(
-                                5240,
-                                "No local chat sessions\n[Start a Chat](command:{0})",
+                                5403,
+                                "No local chat agent sessions\n[Start an Agent Session](command:{0})",
                                 ACTION_ID_OPEN_CHAT
                             )),
                         }));
                     }
                 }
             });
-            const gettingStartedViewId = `${VIEWLET_ID}.gettingStarted`;
+            const gettingStartedViewId = `${AGENT_SESSIONS_VIEWLET_ID}.gettingStarted`;
             if (!( this.registeredViewDescriptors.has('gettingStarted'))
-                && this.productService.chatSessionRecommendations
-                && this.productService.chatSessionRecommendations.length) {
+                && this.productService.chatSessionRecommendations?.length) {
                 const gettingStartedDescriptor = {
                     id: gettingStartedViewId,
                     name: {
-                        value: ( localize(5241, "Getting Started")),
+                        value: ( localize(5404, "Getting Started")),
                         original: 'Getting Started',
                     },
-                    ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [null, this.sessionTracker])),
+                    ctorDescriptor: ( new SyncDescriptor(SessionsViewPane, [null, this.sessionTracker, gettingStartedViewId])),
                     canToggleVisibility: true,
                     canMoveView: true,
                     order: 1000,
                     collapsed: !!otherProviders.length,
+                    when: ( ContextKeyExpr.false())
                 };
                 viewDescriptorsToRegister.push(gettingStartedDescriptor);
                 this.registeredViewDescriptors.set('gettingStarted', gettingStartedDescriptor);
@@ -239,7 +189,7 @@ let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends
     }
     dispose() {
         if (this.registeredViewDescriptors.size > 0) {
-            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(VIEWLET_ID);
+            const container = ( Registry.as(Extensions.ViewContainersRegistry)).get(AGENT_SESSIONS_VIEWLET_ID);
             if (container) {
                 const allRegisteredViews = Array.from(( this.registeredViewDescriptors.values()));
                 ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(allRegisteredViews, container);
@@ -249,20 +199,35 @@ let ChatSessionsViewPaneContainer = class ChatSessionsViewPaneContainer extends
         super.dispose();
     }
 };
+ChatSessionsViewContrib = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IChatSessionsService)),
+    ( __param(2, ILogService)),
+    ( __param(3, 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, {
+            mergeViewWithContainerWhenSingleView: false,
+        }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
+    }
+    getTitle() {
+        const title = ( localize(5405, "Agent Sessions"));
+        return title;
+    }
+};
 ChatSessionsViewPaneContainer = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IWorkbenchLayoutService)),
-    ( __param(4, IContextMenuService)),
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IExtensionService)),
-    ( __param(7, IThemeService)),
-    ( __param(8, IStorageService)),
-    ( __param(9, IWorkspaceContextService)),
-    ( __param(10, IViewDescriptorService)),
-    ( __param(11, ILogService)),
-    ( __param(12, IProductService)),
-    ( __param(13, IChatSessionsService))
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IWorkbenchLayoutService)),
+    ( __param(3, IContextMenuService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, IExtensionService)),
+    ( __param(6, IThemeService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, IWorkspaceContextService)),
+    ( __param(9, IViewDescriptorService)),
+    ( __param(10, ILogService))
 ], ChatSessionsViewPaneContainer));
 
-export { ChatSessionsView };
+export { ChatSessionsView, ChatSessionsViewContrib };