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

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

@@ -3,13 +3,12 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { truncate } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-2c64d2c2-fdf7-5675-a2fe-f6f65fbdedbf-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { getActionBarActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuItemAction, 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';
@@ -25,46 +24,42 @@ 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 { fillEditorsDragData } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/dnd';
-import { ResourceLabels } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels';
-import { ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { fillEditorsDragData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/dnd';
+import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
+import { 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 { 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, ChatEditorTitleMaxLength } 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 { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { NEW_CHAT_SESSION_ACTION_ID, findExistingChatEditorByUri, getSessionItemContextOverlay } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
-import { LocalChatSessionsProvider } from '../localChatSessionsProvider.js';
-import { SessionsDataSource, SessionsDelegate, SessionsRenderer, GettingStartedDelegate, GettingStartedRenderer } from './sessionsTreeRenderer.js';
+import { NEW_CHAT_SESSION_ACTION_ID, getSessionItemContextOverlay } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
+import { ArchivedSessionItems, SessionsDataSource, SessionsDelegate, SessionsRenderer, GettingStartedDelegate, GettingStartedRenderer } from './sessionsTreeRenderer.js';
 
 class SessionsIdentityProvider {
     getId(element) {
+        if (element instanceof ArchivedSessionItems) {
+            return 'archived-session-items';
+        }
         return ( element.resource.toString());
     }
 }
 class SessionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5428, 'Chat Sessions');
+        return localize(5513, 'Chat Sessions');
     }
     getAriaLabel(element) {
         return element.label;
     }
 }
 let SessionsViewPane = class SessionsViewPane extends ViewPane {
-    constructor(provider, sessionTracker, viewId, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, chatService, editorService, viewsService, logService, progressService, menuService, commandService, chatWidgetService, editorGroupsService, chatSessionsService) {
+    constructor(provider, viewId, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, chatService, logService, progressService, menuService, commandService, chatWidgetService, editorGroupsService, chatSessionsService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.provider = provider;
-        this.sessionTracker = sessionTracker;
         this.viewId = viewId;
         this.chatService = chatService;
-        this.editorService = editorService;
-        this.viewsService = viewsService;
         this.logService = logService;
         this.progressService = progressService;
         this.menuService = menuService;
@@ -74,13 +69,6 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         this.chatSessionsService = chatSessionsService;
         this._isEmpty = true;
         this.minimumBodySize = 44;
-        if (provider instanceof LocalChatSessionsProvider) {
-            this._register(provider.onDidChange(() => {
-                if (this.tree && this.isBodyVisible()) {
-                    this.refreshTreeWithProgress();
-                }
-            }));
-        }
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(ChatConfiguration.ShowAgentSessionsViewDescription)) {
                 if (this.tree && this.isBodyVisible()) {
@@ -112,7 +100,7 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
             title: defaultAction.label,
             icon: Codicon.plus,
         }, undefined, undefined, undefined, undefined);
-        const actions = this.menuService.getMenuActions(MenuId.ChatSessionsMenu, this.scopedContextKeyService, { shouldForwardArgs: true });
+        const actions = this.menuService.getMenuActions(MenuId.AgentSessionsContext, this.scopedContextKeyService, { shouldForwardArgs: true });
         const primaryActions = getActionBarActions(actions, 'submenu').primary.filter(action => {
             if (action instanceof MenuItemAction && defaultAction instanceof MenuItemAction) {
                 if (!action.item.source?.id || !defaultAction.item.source?.id) {
@@ -129,7 +117,7 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         }
         const dropdownAction = toAction({
             id: 'selectNewChatSessionOption',
-            label: ( localize(5429, 'More...')),
+            label: ( localize(5514, 'More...')),
             class: 'codicon-chevron-down',
             run: () => { }
         });
@@ -166,7 +154,7 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         try {
             await this.progressService.withProgress({
                 location: this.id,
-                title: ( localize(5430, 'Refreshing chat sessions...')),
+                title: ( localize(5515, 'Refreshing chat sessions...')),
             }, async () => {
                 await this.tree.updateChildren(this.provider);
             });
@@ -183,7 +171,7 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         try {
             await this.progressService.withProgress({
                 location: this.id,
-                title: ( localize(5431, 'Loading chat sessions...')),
+                title: ( localize(5516, 'Loading chat sessions...')),
             }, async () => {
                 await this.tree.setInput(this.provider);
             });
@@ -203,16 +191,13 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         this.treeContainer = append(container, $('.chat-sessions-tree-container'));
         this.messageElement = append(container, $('.chat-sessions-message'));
         this.messageElement.style.display = 'none';
-        const dataSource = ( new SessionsDataSource(this.provider, this.chatService, this.sessionTracker));
+        const dataSource = ( new SessionsDataSource(this.provider));
         const delegate = ( new SessionsDelegate(this.configurationService));
         const identityProvider = ( new SessionsIdentityProvider());
         const accessibilityProvider = ( new SessionsAccessibilityProvider());
         const renderer = this.instantiationService.createInstance(SessionsRenderer, this.viewDescriptorService.getViewLocationById(this.viewId));
         this._register(renderer);
         const getResourceForElement = (element) => {
-            if (element.id === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID) {
-                return null;
-            }
             return element.resource;
         };
         this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'ChatSessions', this.treeContainer, delegate, [renderer], dataSource, {
@@ -220,23 +205,23 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
                 onDragStart: (data, originalEvent) => {
                     try {
                         const elements = data.getData();
-                        const uris = coalesce(( elements.map(getResourceForElement)));
+                        const uris = ( elements.map(getResourceForElement));
                         this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, uris, originalEvent));
                     }
                     catch {
                     }
                 },
                 getDragURI: (element) => {
-                    if (element.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
+                    if (element instanceof ArchivedSessionItems) {
                         return null;
                     }
-                    return getResourceForElement(element)?.toString() ?? null;
+                    return ( getResourceForElement(element).toString());
                 },
                 getDragLabel: (elements) => {
                     if (elements.length === 1) {
                         return elements[0].label;
                     }
-                    return localize(5432, "{0} agent sessions", elements.length);
+                    return localize(5517, "{0} agent sessions", elements.length);
                 },
                 drop: () => { },
                 onDragOver: () => false,
@@ -267,7 +252,10 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
             }
         }));
         this._register(this.tree.onContextMenu((e) => {
-            if (e.element && e.element.id !== LocalChatSessionsProvider.HISTORY_NODE_ID) {
+            if (e.element && !(e.element instanceof ArchivedSessionItems)) {
+                this.showContextMenu(e);
+            }
+            if (e.element) {
                 this.showContextMenu(e);
             }
         }));
@@ -297,13 +285,13 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         const items = [
             {
                 id: 'install-extensions',
-                label: ( localize(5433, "Install Chat Extensions")),
+                label: ( localize(5518, "Install Agents...")),
                 icon: Codicon.extensions,
                 commandId: 'chat.sessions.gettingStarted'
             },
             {
                 id: 'learn-more',
-                label: ( localize(5434, "Learn More About GitHub Copilot coding agent")),
+                label: ( localize(5519, "Learn More About GitHub Copilot coding agent")),
                 commandId: 'vscode.open',
                 icon: Codicon.book,
                 args: [( URI.parse('https://aka.ms/coding-agent-docs'))]
@@ -335,19 +323,7 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
     }
     async openChatSession(session) {
         try {
-            const existingEditor = findExistingChatEditorByUri(session.resource, this.editorGroupsService);
-            if (existingEditor) {
-                await this.editorService.openEditor(existingEditor.editor, existingEditor.group);
-                return;
-            }
-            if (this.chatWidgetService.getWidgetBySessionResource(session.resource)) {
-                return;
-            }
-            if (session.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-                return;
-            }
-            if (session.id === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID) {
-                await this.viewsService.openView(ChatViewId);
+            if (session instanceof ArchivedSessionItems) {
                 return;
             }
             const options = {
@@ -358,10 +334,7 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
                 },
                 preserveFocus: true,
             };
-            await this.editorService.openEditor({
-                resource: session.resource,
-                options,
-            });
+            await this.chatWidgetService.openSession(session.resource, undefined, options);
         }
         catch (error) {
             this.logService.error('[SessionsViewPane] Failed to open chat session:', error);
@@ -373,13 +346,13 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
         }
         const session = e.element;
         const sessionWithProvider = session;
-        const contextOverlay = getSessionItemContextOverlay(session, sessionWithProvider.provider, this.chatWidgetService, this.chatService, this.editorGroupsService);
+        const contextOverlay = getSessionItemContextOverlay(session, sessionWithProvider.provider, this.chatService, this.editorGroupsService);
         const contextKeyService = this.contextKeyService.createOverlay(contextOverlay);
         const marshalledSession = {
             session: session,
             $mid: MarshalledId.ChatSessionContext
         };
-        const menu = this.menuService.createMenu(MenuId.ChatSessionsMenu, contextKeyService);
+        const menu = this.menuService.createMenu(MenuId.AgentSessionsContext, contextKeyService);
         const actions = menu.getActions({ arg: marshalledSession, shouldForwardArgs: true });
         const { secondary } = getActionBarActions(actions, 'inline');
         this.contextMenuService.showContextMenu({
@@ -391,25 +364,23 @@ let SessionsViewPane = class SessionsViewPane extends ViewPane {
     }
 };
 SessionsViewPane = ( __decorate([
-    ( __param(4, IKeybindingService)),
-    ( __param(5, IContextMenuService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IContextKeyService)),
-    ( __param(8, IViewDescriptorService)),
-    ( __param(9, IInstantiationService)),
-    ( __param(10, IOpenerService)),
-    ( __param(11, IThemeService)),
-    ( __param(12, IHoverService)),
-    ( __param(13, IChatService)),
-    ( __param(14, IEditorService)),
-    ( __param(15, IViewsService)),
-    ( __param(16, ILogService)),
-    ( __param(17, IProgressService)),
-    ( __param(18, IMenuService)),
-    ( __param(19, ICommandService)),
-    ( __param(20, IChatWidgetService)),
-    ( __param(21, IEditorGroupsService)),
-    ( __param(22, IChatSessionsService))
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IContextKeyService)),
+    ( __param(7, IViewDescriptorService)),
+    ( __param(8, IInstantiationService)),
+    ( __param(9, IOpenerService)),
+    ( __param(10, IThemeService)),
+    ( __param(11, IHoverService)),
+    ( __param(12, IChatService)),
+    ( __param(13, ILogService)),
+    ( __param(14, IProgressService)),
+    ( __param(15, IMenuService)),
+    ( __param(16, ICommandService)),
+    ( __param(17, IChatWidgetService)),
+    ( __param(18, IEditorGroupsService)),
+    ( __param(19, IChatSessionsService))
 ], SessionsViewPane));
 
 export { SessionsViewPane };

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

@@ -10,10 +10,12 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IEditableData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentAttachmentCapabilities } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionProviderOptionGroup, IChatSessionsExtensionPoint, SessionOptionsChangedCallback } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { ChatSessionStatus, IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsExtensionPoint, SessionOptionsChangedCallback } 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 { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 export declare class ChatSessionsService extends Disposable implements IChatSessionsService {
     private readonly _logService;
     private readonly _chatAgentService;
@@ -42,6 +44,10 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
         readonly added: string[];
         readonly removed: string[];
     }>;
+    private readonly _onDidChangeSessionOptions;
+    get onDidChangeSessionOptions(): Event<URI>;
+    private readonly _onDidChangeOptionGroups;
+    get onDidChangeOptionGroups(): Event<string>;
     private readonly inProgressMap;
     private readonly _sessionTypeOptions;
     private readonly _sessionTypeIcons;
@@ -73,8 +79,9 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     private _disposeSessionsForContribution;
     private _registerAgent;
     getAllChatSessionContributions(): IChatSessionsExtensionPoint[];
+    getChatSessionContribution(chatSessionType: string): IChatSessionsExtensionPoint | undefined;
     getAllChatSessionItemProviders(): IChatSessionItemProvider[];
-    hasChatSessionItemProvider(chatViewType: string): Promise<boolean>;
+    activateChatSessionItemProvider(chatViewType: string): Promise<IChatSessionItemProvider | undefined>;
     canResolveChatSession(chatSessionResource: URI): Promise<boolean>;
     getAllChatSessionItems(token: CancellationToken): Promise<Array<{
         readonly chatSessionType: string;
@@ -83,21 +90,12 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     private getChatSessionItems;
     registerChatSessionItemProvider(provider: IChatSessionItemProvider): IDisposable;
     registerChatSessionContentProvider(chatSessionType: string, provider: IChatSessionContentProvider): IDisposable;
-    /**
-     * Creates a new chat session by delegating to the appropriate provider
-     * @param chatSessionType The type of chat session provider to use
-     * @param options Options for the new session including the request
-     * @param token A cancellation token
-     * @returns A session ID for the newly created session
-     */
-    getNewChatSessionItem(chatSessionType: string, options: {
-        request: IChatAgentRequest;
-        metadata?: any;
-    }, token: CancellationToken): Promise<IChatSessionItem>;
+    registerChatModelChangeListeners(chatService: IChatService, chatSessionType: string, onChange: () => void): IDisposable;
+    getInProgressSessionDescription(chatModel: IChatModel): string | undefined;
     getOrCreateChatSession(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
     hasAnySessionOptions(sessionResource: URI): boolean;
-    getSessionOption(sessionResource: URI, optionId: string): string | undefined;
-    setSessionOption(sessionResource: URI, optionId: string, value: string): boolean;
+    getSessionOption(sessionResource: URI, optionId: string): string | IChatSessionProviderOptionItem | undefined;
+    setSessionOption(sessionResource: URI, optionId: string, value: string | IChatSessionProviderOptionItem): boolean;
     setEditableSession(sessionResource: URI, data: IEditableData | null): Promise<void>;
     getEditableData(sessionResource: URI): IEditableData | undefined;
     isEditable(sessionResource: URI): boolean;
@@ -120,7 +118,7 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
      */
     notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{
         optionId: string;
-        value: string;
+        value: string | IChatSessionProviderOptionItem;
     }>): Promise<void>;
     /**
      * Get the icon for a specific session type
@@ -143,4 +141,5 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
      */
     getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined;
     getContentProviderSchemes(): string[];
+    isChatSessionInProgressStatus(state: ChatSessionStatus): boolean;
 }