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

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.d.ts

@@ -1,25 +1,25 @@
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IAgentSessionsFilter } from "./agentSessionsViewer.js";
+import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
+import { IAgentSessionsFilter, IAgentSessionsSorterOptions } from "./agentSessionsViewer.js";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IListStyles } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/list/listWidget";
 import { IStyleOverride } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles";
 import { IAgentSessionsControl } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions";
-export interface IAgentSessionsControlOptions {
+import { HoverPosition } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+export interface IAgentSessionsControlOptions extends IAgentSessionsSorterOptions {
     readonly overrideStyles?: IStyleOverride<IListStyles>;
     readonly filter?: IAgentSessionsFilter;
-    readonly allowOpenSessionsInPanel?: boolean;
-    readonly trackActiveEditor?: boolean;
+    getHoverPosition(): HoverPosition;
+    trackActiveEditorSession(): boolean;
 }
 export declare class AgentSessionsControl extends Disposable implements IAgentSessionsControl {
     private readonly container;
@@ -29,17 +29,17 @@ export declare class AgentSessionsControl extends Disposable implements IAgentSe
     private readonly instantiationService;
     private readonly chatSessionsService;
     private readonly commandService;
-    private readonly editorGroupsService;
-    private readonly chatService;
     private readonly menuService;
-    private readonly chatWidgetService;
     private readonly agentSessionsService;
     private readonly telemetryService;
     private readonly editorService;
     private sessionsContainer;
     private sessionsList;
     private visible;
-    constructor(container: HTMLElement, options: IAgentSessionsControlOptions | undefined, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, commandService: ICommandService, editorGroupsService: IEditorGroupsService, chatService: IChatService, menuService: IMenuService, chatWidgetService: IChatWidgetService, agentSessionsService: IAgentSessionsService, telemetryService: ITelemetryService, editorService: IEditorService);
+    private focusedAgentSessionArchivedContextKey;
+    private focusedAgentSessionReadContextKey;
+    private focusedAgentSessionTypeContextKey;
+    constructor(container: HTMLElement, options: IAgentSessionsControlOptions, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, commandService: ICommandService, menuService: IMenuService, agentSessionsService: IAgentSessionsService, telemetryService: ITelemetryService, editorService: IEditorService);
     private registerListeners;
     private revealAndFocusActiveEditorSession;
     private createList;
@@ -47,9 +47,12 @@ export declare class AgentSessionsControl extends Disposable implements IAgentSe
     private showContextMenu;
     openFind(): void;
     refresh(): Promise<void>;
-    update(): void;
+    update(): Promise<void>;
     setVisible(visible: boolean): void;
     layout(height: number, width: number): void;
     focus(): void;
     clearFocus(): void;
+    scrollToTop(): void;
+    getFocus(): IAgentSession[];
+    reveal(sessionResource: URI): void;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.js

@@ -1,37 +1,31 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { append, $, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { isLocalAgentSessionItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
-import { AgentSessionsSorter, AgentSessionsListDelegate, AgentSessionsCompressionDelegate, AgentSessionRenderer, AgentSessionsDataSource, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsIdentityProvider, AgentSessionsDragAndDrop, AgentSessionsAccessibilityProvider } from './agentSessionsViewer.js';
+import { isAgentSession, isAgentSessionSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
+import { AgentSessionsSorter, AgentSessionsListDelegate, AgentSessionsCompressionDelegate, AgentSessionRenderer, AgentSessionSectionRenderer, AgentSessionsDataSource, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsIdentityProvider, AgentSessionsDragAndDrop, AgentSessionsAccessibilityProvider } from './agentSessionsViewer.js';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { getSessionItemContextOverlay } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
 import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { TreeFindMode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/abstractTree';
-import { ACTIVE_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { RenderIndentGuides, TreeFindMode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/abstractTree';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { openSession } from './agentSessionsOpener.js';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 
 let AgentSessionsControl = class AgentSessionsControl extends Disposable {
-    constructor(container, options, contextMenuService, contextKeyService, instantiationService, chatSessionsService, commandService, editorGroupsService, chatService, menuService, chatWidgetService, agentSessionsService, telemetryService, editorService) {
+    constructor(container, options, contextMenuService, contextKeyService, instantiationService, chatSessionsService, commandService, menuService, agentSessionsService, telemetryService, editorService) {
         super();
         this.container = container;
         this.options = options;
@@ -40,35 +34,31 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         this.instantiationService = instantiationService;
         this.chatSessionsService = chatSessionsService;
         this.commandService = commandService;
-        this.editorGroupsService = editorGroupsService;
-        this.chatService = chatService;
         this.menuService = menuService;
-        this.chatWidgetService = chatWidgetService;
         this.agentSessionsService = agentSessionsService;
         this.telemetryService = telemetryService;
         this.editorService = editorService;
         this.visible = true;
+        this.focusedAgentSessionArchivedContextKey = ChatContextKeys.isArchivedAgentSession.bindTo(this.contextKeyService);
+        this.focusedAgentSessionReadContextKey = ChatContextKeys.isReadAgentSession.bindTo(this.contextKeyService);
+        this.focusedAgentSessionTypeContextKey = ChatContextKeys.agentSessionType.bindTo(this.contextKeyService);
         this.createList(this.container);
         this.registerListeners();
     }
     registerListeners() {
-        if (this.options?.trackActiveEditor) {
-            this._register(this.editorService.onDidActiveEditorChange(() => this.revealAndFocusActiveEditorSession()));
-        }
+        this._register(this.editorService.onDidActiveEditorChange(() => this.revealAndFocusActiveEditorSession()));
     }
     revealAndFocusActiveEditorSession() {
-        if (!this.visible) {
+        if (!this.options.trackActiveEditorSession() ||
+            !this.visible) {
             return;
         }
         const input = this.editorService.activeEditor;
-        if (!(input instanceof ChatEditorInput)) {
+        const resource = (input instanceof ChatEditorInput) ? input.sessionResource : input?.resource;
+        if (!resource) {
             return;
         }
-        const sessionResource = input.sessionResource;
-        if (!sessionResource) {
-            return;
-        }
-        const matchingSession = this.agentSessionsService.model.getSession(sessionResource);
+        const matchingSession = this.agentSessionsService.model.getSession(resource);
         if (matchingSession && this.sessionsList?.hasNode(matchingSession)) {
             if (this.sessionsList.getRelativeTop(matchingSession) === null) {
                 this.sessionsList.reveal(matchingSession, 0.5);
@@ -79,10 +69,11 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
     }
     createList(container) {
         this.sessionsContainer = append(container, $('.agent-sessions-viewer'));
-        const sorter = this.instantiationService.createInstance(AgentSessionsSorter);
+        const sorter = ( new AgentSessionsSorter(this.options));
         const list = this.sessionsList = this._register(this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'AgentSessionsView', this.sessionsContainer, ( new AgentSessionsListDelegate()), ( new AgentSessionsCompressionDelegate()), [
-            this.instantiationService.createInstance(AgentSessionRenderer)
-        ], ( new AgentSessionsDataSource(this.options?.filter, sorter)), {
+            this.instantiationService.createInstance(AgentSessionRenderer, this.options),
+            this.instantiationService.createInstance(AgentSessionSectionRenderer),
+        ], ( new AgentSessionsDataSource(this.options.filter, sorter)), {
             accessibilityProvider: ( new AgentSessionsAccessibilityProvider()),
             dnd: this.instantiationService.createInstance(AgentSessionsDragAndDrop),
             identityProvider: ( new AgentSessionsIdentityProvider()),
@@ -91,12 +82,15 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
             findWidgetEnabled: true,
             defaultFindMode: TreeFindMode.Filter,
             keyboardNavigationLabelProvider: ( new AgentSessionsKeyboardNavigationLabelProvider()),
-            sorter,
-            overrideStyles: this.options?.overrideStyles,
+            overrideStyles: this.options.overrideStyles,
+            expandOnlyOnTwistieClick: true,
             twistieAdditionalCssClass: () => 'force-no-twistie',
+            collapseByDefault: () => false,
+            renderIndentGuides: RenderIndentGuides.None,
         }));
+        ChatContextKeys.agentSessionsViewerFocused.bindTo(list.contextKeyService);
         const model = this.agentSessionsService.model;
-        this._register(Event.any(this.options?.filter?.onDidChange ?? Event.None, model.onDidChangeSessions)(() => {
+        this._register(Event.any(this.options.filter?.onDidChange ?? Event.None, model.onDidChangeSessions)(() => {
             if (this.visible) {
                 list.updateChildren();
             }
@@ -109,68 +103,42 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
                 this.commandService.executeCommand(ACTION_ID_NEW_CHAT);
             }
         }));
+        this._register(Event.any(list.onDidChangeFocus, model.onDidChangeSessions)(() => {
+            const focused = list.getFocus().at(0);
+            if (focused && isAgentSession(focused)) {
+                this.focusedAgentSessionArchivedContextKey.set(focused.isArchived());
+                this.focusedAgentSessionReadContextKey.set(focused.isRead());
+                this.focusedAgentSessionTypeContextKey.set(focused.providerType);
+            }
+            else {
+                this.focusedAgentSessionArchivedContextKey.reset();
+                this.focusedAgentSessionReadContextKey.reset();
+                this.focusedAgentSessionTypeContextKey.reset();
+            }
+        }));
     }
     async openAgentSession(e) {
-        const session = e.element;
-        if (!session) {
+        const element = e.element;
+        if (!element || isAgentSessionSection(element)) {
             return;
         }
         this.telemetryService.publicLog2('agentSessionOpened', {
-            source: this.options?.allowOpenSessionsInPanel ? 'chatView' : 'agentsView',
-            providerType: session.providerType
+            providerType: element.providerType
         });
-        session.setRead(true);
-        let sessionOptions;
-        if (isLocalAgentSessionItem(session)) {
-            sessionOptions = {};
-        }
-        else {
-            sessionOptions = { title: { preferred: session.label } };
-        }
-        sessionOptions.ignoreInView = true;
-        const options = {
-            ...sessionOptions,
-            ...e.editorOptions,
-            revealIfOpened: this.options?.allowOpenSessionsInPanel
-        };
-        await this.chatSessionsService.activateChatSessionItemProvider(session.providerType);
-        let target;
-        if (e.sideBySide) {
-            target = this.options?.allowOpenSessionsInPanel ? ACTIVE_GROUP : SIDE_GROUP;
-        }
-        else if (this.options?.allowOpenSessionsInPanel) {
-            target = ChatViewPaneTarget;
-        }
-        else {
-            target = ACTIVE_GROUP;
-        }
-        const isLocalChatSession = session.resource.scheme === Schemas.vscodeChatEditor ||
-            session.resource.scheme === Schemas.vscodeLocalChatSession;
-        if (!isLocalChatSession && !(await this.chatSessionsService.canResolveChatSession(session.resource))) {
-            const editorTarget = target === ChatViewPaneTarget ? undefined : target;
-            await this.editorService.openEditor({
-                resource: session.resource,
-                options: {
-                    ...options,
-                    revealIfOpened: options?.revealIfOpened ?? true
-                }
-            }, editorTarget);
-            return;
-        }
-        await this.chatWidgetService.openSession(session.resource, target, options);
+        await this.instantiationService.invokeFunction(openSession, element, e);
     }
-    async showContextMenu({ element: session, anchor, browserEvent }) {
-        if (!session) {
+    async showContextMenu({ element, anchor, browserEvent }) {
+        if (!element || isAgentSessionSection(element)) {
             return;
         }
         EventHelper.stop(browserEvent, true);
-        const provider = await this.chatSessionsService.activateChatSessionItemProvider(session.providerType);
-        const contextOverlay = getSessionItemContextOverlay(session, provider, this.chatService, this.editorGroupsService);
-        contextOverlay.push([ChatContextKeys.isCombinedAgentSessionsViewer.key, true]);
-        contextOverlay.push([ChatContextKeys.isReadAgentSession.key, session.isRead()]);
-        contextOverlay.push([ChatContextKeys.isArchivedAgentSession.key, session.isArchived()]);
+        await this.chatSessionsService.activateChatSessionItemProvider(element.providerType);
+        const contextOverlay = [];
+        contextOverlay.push([ChatContextKeys.isArchivedAgentSession.key, element.isArchived()]);
+        contextOverlay.push([ChatContextKeys.isReadAgentSession.key, element.isRead()]);
+        contextOverlay.push([ChatContextKeys.agentSessionType.key, element.providerType]);
         const menu = this.menuService.createMenu(MenuId.AgentSessionsContext, this.contextKeyService.createOverlay(contextOverlay));
-        const marshalledSession = { session, $mid: MarshalledId.ChatSessionContext };
+        const marshalledSession = { session: element, $mid: MarshalledId.AgentSessionContext };
         this.contextMenuService.showContextMenu({
             getActions: () => Separator.join(...( menu.getActions({ arg: marshalledSession, shouldForwardArgs: true }).map(([, actions]) => actions))),
             getAnchor: () => anchor,
@@ -184,10 +152,13 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
     refresh() {
         return this.agentSessionsService.model.resolve(undefined);
     }
-    update() {
-        this.sessionsList?.updateChildren();
+    async update() {
+        await this.sessionsList?.updateChildren();
     }
     setVisible(visible) {
+        if (this.visible === visible) {
+            return;
+        }
         this.visible = visible;
         if (this.visible) {
             this.sessionsList?.updateChildren();
@@ -203,6 +174,29 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         this.sessionsList?.setFocus([]);
         this.sessionsList?.setSelection([]);
     }
+    scrollToTop() {
+        if (this.sessionsList) {
+            this.sessionsList.scrollTop = 0;
+        }
+    }
+    getFocus() {
+        const focused = this.sessionsList?.getFocus() ?? [];
+        return focused.filter(e => isAgentSession(e));
+    }
+    reveal(sessionResource) {
+        if (!this.sessionsList) {
+            return;
+        }
+        const session = this.agentSessionsService.model.getSession(sessionResource);
+        if (!session || !this.sessionsList.hasNode(session)) {
+            return;
+        }
+        if (this.sessionsList.getRelativeTop(session) === null) {
+            this.sessionsList.reveal(session, 0.5);
+        }
+        this.sessionsList.setFocus([session]);
+        this.sessionsList.setSelection([session]);
+    }
 };
 AgentSessionsControl = ( __decorate([
     ( __param(2, IContextMenuService)),
@@ -210,13 +204,10 @@ AgentSessionsControl = ( __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IChatSessionsService)),
     ( __param(6, ICommandService)),
-    ( __param(7, IEditorGroupsService)),
-    ( __param(8, IChatService)),
-    ( __param(9, IMenuService)),
-    ( __param(10, IChatWidgetService)),
-    ( __param(11, IAgentSessionsService)),
-    ( __param(12, ITelemetryService)),
-    ( __param(13, IEditorService))
+    ( __param(7, IMenuService)),
+    ( __param(8, IAgentSessionsService)),
+    ( __param(9, ITelemetryService)),
+    ( __param(10, IEditorService))
 ], AgentSessionsControl));
 
 export { AgentSessionsControl };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.d.ts

@@ -8,6 +8,7 @@ export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilte
     readonly filterMenuId: MenuId;
     readonly limitResults?: () => number | undefined;
     notifyResults?(count: number): void;
+    readonly groupResults?: () => boolean | undefined;
     overrideExclude?(session: IAgentSession): boolean | undefined;
 }
 export declare class AgentSessionsFilter extends Disposable implements Required<IAgentSessionsFilter> {
@@ -18,6 +19,7 @@ export declare class AgentSessionsFilter extends Disposable implements Required<
     private readonly _onDidChange;
     readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     readonly limitResults: () => number | undefined;
+    readonly groupResults: () => boolean | undefined;
     private excludes;
     private readonly actionDisposables;
     constructor(options: IAgentSessionsFilterOptions, chatSessionsService: IChatSessionsService, storageService: IStorageService);

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.js

@@ -8,9 +8,10 @@ import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-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 { getAgentSessionProviderName, AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
+import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 
 const DEFAULT_EXCLUDES = ( Object.freeze({
     providers: [],
@@ -27,6 +28,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this.limitResults = () => this.options.limitResults?.();
+        this.groupResults = () => this.options.groupResults?.();
         this.excludes = DEFAULT_EXCLUDES;
         this.actionDisposables = this._register(( new DisposableStore()));
         this.STORAGE_KEY = `agentSessions.filterExcludes.${this.options.filterMenuId.id.toLowerCase()}`;
@@ -116,10 +118,10 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
     }
     registerStateActions(disposables) {
         const states = [
-            { id: ChatSessionStatus.Completed, label: ( localize(4852, "Completed")) },
-            { id: ChatSessionStatus.InProgress, label: ( localize(4853, "In Progress")) },
-            { id: ChatSessionStatus.Failed, label: ( localize(4854, "Failed")) },
-            { id: ChatSessionStatus.NeedsInput, label: ( localize(4855, "Needs Input")) },
+            { id: ChatSessionStatus.Completed, label: ( localize(4896, "Completed")) },
+            { id: ChatSessionStatus.InProgress, label: ( localize(4897, "In Progress")) },
+            { id: ChatSessionStatus.NeedsInput, label: ( localize(4898, "Input Needed")) },
+            { id: ChatSessionStatus.Failed, label: ( localize(4899, "Failed")) },
         ];
         const that = this;
         let counter = 0;
@@ -153,7 +155,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             constructor() {
                 super({
                     id: `agentSessions.filter.toggleExcludeArchived.${that.options.filterMenuId.id.toLowerCase()}`,
-                    title: ( localize(4856, 'Archived')),
+                    title: ( localize(4900, 'Archived')),
                     menu: {
                         id: that.options.filterMenuId,
                         group: '3_props',
@@ -173,7 +175,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             constructor() {
                 super({
                     id: `agentSessions.filter.toggleExcludeRead.${that.options.filterMenuId.id.toLowerCase()}`,
-                    title: ( localize(4857, 'Read')),
+                    title: ( localize(4901, 'Read')),
                     menu: {
                         id: that.options.filterMenuId,
                         group: '3_props',
@@ -193,7 +195,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             constructor() {
                 super({
                     id: `agentSessions.filter.resetExcludes.${that.options.filterMenuId.id.toLowerCase()}`,
-                    title: ( localize(4858, "Reset")),
+                    title: ( localize(4902, "Reset")),
                     menu: {
                         id: that.options.filterMenuId,
                         group: '4_reset',

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsOpener.d.ts

@@ -0,0 +1,7 @@
+import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
+export declare function openSession(accessor: ServicesAccessor, session: IAgentSession, openOptions?: {
+    sideBySide?: boolean;
+    editorOptions?: IEditorOptions;
+}): Promise<void>;

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsOpener.js

@@ -0,0 +1,41 @@
+
+import { isLocalAgentSessionItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
+import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ACTIVE_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+
+async function openSession(accessor, session, openOptions) {
+    const chatSessionsService = accessor.get(IChatSessionsService);
+    const chatWidgetService = accessor.get(IChatWidgetService);
+    session.setRead(true);
+    let sessionOptions;
+    if (isLocalAgentSessionItem(session)) {
+        sessionOptions = {};
+    }
+    else {
+        sessionOptions = { title: { preferred: session.label } };
+    }
+    let options = {
+        ...sessionOptions,
+        ...openOptions?.editorOptions,
+        revealIfOpened: true
+    };
+    await chatSessionsService.activateChatSessionItemProvider(session.providerType);
+    let target;
+    if (openOptions?.sideBySide) {
+        target = ACTIVE_GROUP;
+    }
+    else {
+        target = ChatViewPaneTarget;
+    }
+    const isLocalChatSession = session.resource.scheme === Schemas.vscodeChatEditor || session.resource.scheme === Schemas.vscodeLocalChatSession;
+    if (!isLocalChatSession && !(await chatSessionsService.canResolveChatSession(session.resource))) {
+        target = openOptions?.sideBySide ? SIDE_GROUP : ACTIVE_GROUP;
+        options = { ...options, revealIfOpened: true };
+    }
+    await chatWidgetService.openSession(session.resource, target, options);
+}
+
+export { openSession };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.d.ts

@@ -0,0 +1,23 @@
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IQuickInputButton } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
+import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
+import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
+import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
+export declare const archiveButton: IQuickInputButton;
+export declare const unarchiveButton: IQuickInputButton;
+export declare const renameButton: IQuickInputButton;
+export declare const deleteButton: IQuickInputButton;
+export declare function getSessionDescription(session: IAgentSession): string;
+export declare function getSessionButtons(session: IAgentSession): IQuickInputButton[];
+export declare class AgentSessionsPicker {
+    private readonly agentSessionsService;
+    private readonly quickInputService;
+    private readonly instantiationService;
+    private readonly commandService;
+    private readonly sorter;
+    constructor(agentSessionsService: IAgentSessionsService, quickInputService: IQuickInputService, instantiationService: IInstantiationService, commandService: ICommandService);
+    pickAgentSession(): Promise<void>;
+    private createPickerItems;
+    private toPickItem;
+}