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

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

@@ -8,14 +8,13 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 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 } 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 { ChatSessionStatus, IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsExtensionPoint, SessionOptionsChangedCallback } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { IChatAgentAttachmentCapabilities } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { 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";
+import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 export declare class ChatSessionsService extends Disposable implements IChatSessionsService {
     private readonly _logService;
     private readonly _chatAgentService;
@@ -56,7 +55,7 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     private readonly _sessionTypeWelcomeTips;
     private readonly _sessionTypeInputPlaceholders;
     private readonly _sessions;
-    private readonly _editableSessions;
+    private readonly _hasCanDelegateProvidersKey;
     constructor(_logService: ILogService, _chatAgentService: IChatAgentService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _menuService: IMenuService, _themeService: IThemeService, _labelService: ILabelService);
     reportInProgress(chatSessionType: string, count: number): void;
     getInProgress(): {
@@ -79,6 +78,7 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     private _disposeSessionsForContribution;
     private _registerAgent;
     getAllChatSessionContributions(): IChatSessionsExtensionPoint[];
+    private _updateHasCanDelegateProvidersContextKey;
     getChatSessionContribution(chatSessionType: string): IChatSessionsExtensionPoint | undefined;
     getAllChatSessionItemProviders(): IChatSessionItemProvider[];
     activateChatSessionItemProvider(chatViewType: string): Promise<IChatSessionItemProvider | undefined>;
@@ -96,9 +96,6 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     hasAnySessionOptions(sessionResource: URI): 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;
     notifySessionItemsChanged(chatSessionType: string): void;
     /**
      * Store option groups for a session type
@@ -141,5 +138,4 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
      */
     getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined;
     getContentProviderSchemes(): string[];
-    isChatSessionInProgressStatus(state: ChatSessionStatus): boolean;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatSessions.contribution.js → chatSessions/chatSessions.contribution.js}

@@ -26,16 +26,15 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { localChatSessionType, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { localChatSessionType, isSessionInProgressStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { LEGACY_AGENT_SESSIONS_VIEW_ID, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { NEW_CHAT_SESSION_ACTION_ID } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
-import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -46,39 +45,39 @@ import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/v
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatSessions',
     jsonSchema: {
-        description: ( localize(5466, 'Contributes chat session integrations to the chat widget.')),
+        description: ( localize(5293, 'Contributes chat session integrations to the chat widget.')),
         type: 'array',
         items: {
             type: 'object',
             additionalProperties: false,
             properties: {
                 type: {
-                    description: ( localize(5467, 'Unique identifier for the type of chat session.')),
+                    description: ( localize(5294, 'Unique identifier for the type of chat session.')),
                     type: 'string',
                 },
                 name: {
                     description: ( localize(
-                        5468,
+                        5295,
                         'Name of the dynamically registered chat participant (eg: @agent). Must not contain whitespace.'
                     )),
                     type: 'string',
                     pattern: '^[\\w-]+$'
                 },
                 displayName: {
-                    description: ( localize(5469, 'A longer name for this item which is used for display in menus.')),
+                    description: ( localize(5296, 'A longer name for this item which is used for display in menus.')),
                     type: 'string',
                 },
                 description: {
-                    description: ( localize(5470, 'Description of the chat session for use in menus and tooltips.')),
+                    description: ( localize(5297, 'Description of the chat session for use in menus and tooltips.')),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(5471, 'Condition which must be true to show this item.')),
+                    description: ( localize(5298, 'Condition which must be true to show this item.')),
                     type: 'string'
                 },
                 icon: {
                     description: ( localize(
-                        5472,
+                        5299,
                         'Icon identifier (codicon ID) for the chat session editor tab. For example, "$(github)" or "$(cloud)".'
                     )),
                     anyOf: [{
@@ -88,22 +87,22 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(5473, 'Icon path when a light theme is used')),
+                                    description: ( localize(5300, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5474, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5301, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
                         }]
                 },
                 order: {
-                    description: ( localize(5475, 'Order in which this item should be displayed.')),
+                    description: ( localize(5302, 'Order in which this item should be displayed.')),
                     type: 'integer'
                 },
                 alternativeIds: {
-                    description: ( localize(5476, 'Alternative identifiers for backward compatibility.')),
+                    description: ( localize(5303, 'Alternative identifiers for backward compatibility.')),
                     type: 'array',
                     items: {
                         type: 'string'
@@ -111,87 +110,87 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 welcomeTitle: {
                     description: ( localize(
-                        5477,
+                        5304,
                         'Title text to display in the chat welcome view for this session type.'
                     )),
                     type: 'string'
                 },
                 welcomeMessage: {
                     description: ( localize(
-                        5478,
+                        5305,
                         'Message text (supports markdown) to display in the chat welcome view for this session type.'
                     )),
                     type: 'string'
                 },
                 welcomeTips: {
                     description: ( localize(
-                        5479,
+                        5306,
                         'Tips text (supports markdown and theme icons) to display in the chat welcome view for this session type.'
                     )),
                     type: 'string'
                 },
                 inputPlaceholder: {
                     description: ( localize(
-                        5480,
+                        5307,
                         'Placeholder text to display in the chat input box for this session type.'
                     )),
                     type: 'string'
                 },
                 capabilities: {
-                    description: ( localize(5481, 'Optional capabilities for this chat session.')),
+                    description: ( localize(5308, 'Optional capabilities for this chat session.')),
                     type: 'object',
                     additionalProperties: false,
                     properties: {
                         supportsFileAttachments: {
                             description: ( localize(
-                                5482,
+                                5309,
                                 'Whether this chat session supports attaching files or file references.'
                             )),
                             type: 'boolean'
                         },
                         supportsToolAttachments: {
                             description: ( localize(
-                                5483,
+                                5310,
                                 'Whether this chat session supports attaching tools or tool references.'
                             )),
                             type: 'boolean'
                         },
                         supportsMCPAttachments: {
-                            description: ( localize(5484, 'Whether this chat session supports attaching MCP resources.')),
+                            description: ( localize(5311, 'Whether this chat session supports attaching MCP resources.')),
                             type: 'boolean'
                         },
                         supportsImageAttachments: {
-                            description: ( localize(5485, 'Whether this chat session supports attaching images.')),
+                            description: ( localize(5312, 'Whether this chat session supports attaching images.')),
                             type: 'boolean'
                         },
                         supportsSearchResultAttachments: {
-                            description: ( localize(5486, 'Whether this chat session supports attaching search results.')),
+                            description: ( localize(5313, 'Whether this chat session supports attaching search results.')),
                             type: 'boolean'
                         },
                         supportsInstructionAttachments: {
-                            description: ( localize(5487, 'Whether this chat session supports attaching instructions.')),
+                            description: ( localize(5314, 'Whether this chat session supports attaching instructions.')),
                             type: 'boolean'
                         },
                         supportsSourceControlAttachments: {
                             description: ( localize(
-                                5488,
+                                5315,
                                 'Whether this chat session supports attaching source control changes.'
                             )),
                             type: 'boolean'
                         },
                         supportsProblemAttachments: {
-                            description: ( localize(5489, 'Whether this chat session supports attaching problems.')),
+                            description: ( localize(5316, 'Whether this chat session supports attaching problems.')),
                             type: 'boolean'
                         },
                         supportsSymbolAttachments: {
-                            description: ( localize(5490, 'Whether this chat session supports attaching symbols.')),
+                            description: ( localize(5317, 'Whether this chat session supports attaching symbols.')),
                             type: 'boolean'
                         }
                     }
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        5491,
+                        5318,
                         "Commands available for this chat session, which the user can invoke with a `/`."
                     )),
                     type: 'array',
@@ -203,17 +202,17 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                         properties: {
                             name: {
                                 description: ( localize(
-                                    5492,
+                                    5319,
                                     "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."
                                 )),
                                 type: 'string'
                             },
                             description: {
-                                description: ( localize(5493, "A description of this command.")),
+                                description: ( localize(5320, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localize(5494, "A condition which must be true to enable this command.")),
+                                description: ( localize(5321, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                         }
@@ -221,7 +220,7 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 canDelegate: {
                     description: ( localize(
-                        5495,
+                        5322,
                         'Whether delegation is supported. Default is false. Note that enabling this is experimental and may not be respected at all times.'
                     )),
                     type: 'boolean',
@@ -300,7 +299,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
         this._sessionTypeWelcomeTips = ( new Map());
         this._sessionTypeInputPlaceholders = ( new Map());
         this._sessions = ( new ResourceMap());
-        this._editableSessions = ( new ResourceMap());
+        this._hasCanDelegateProvidersKey = ChatContextKeys.hasCanDelegateProviders.bindTo(this._contextKeyService);
         this._register(extensionPoint.setHandler(extensions => {
             for (const ext of extensions) {
                 if (!isProposedApiEnabled(ext.description, 'chatSessionsProvider')) {
@@ -350,7 +349,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
     async updateInProgressStatus(chatSessionType) {
         try {
             const items = await this.getChatSessionItems(chatSessionType, CancellationToken.None);
-            const inProgress = items.filter(item => item.status && this.isChatSessionInProgressStatus(item.status));
+            const inProgress = items.filter(item => item.status && isSessionInProgressStatus(item.status));
             this.reportInProgress(chatSessionType, inProgress.length);
         }
         catch (error) {
@@ -424,6 +423,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                 this._sessionTypeWelcomeTips.delete(contribution.type);
                 this._sessionTypeInputPlaceholders.delete(contribution.type);
                 this._contributionDisposables.deleteAndDispose(contribution.type);
+                this._updateHasCanDelegateProvidersContextKey();
             }
         };
     }
@@ -445,7 +445,6 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
         if (primaryType) {
             const altContribution = this._contributions.get(primaryType)?.contribution;
             if (altContribution && this._isContributionAvailable(altContribution)) {
-                this._logService.trace(`Resolving chat session type '${sessionType}' to alternative type '${primaryType}'`);
                 return primaryType;
             }
         }
@@ -457,48 +456,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
         ]);
         const rawMenuActions = this._menuService.getMenuActions(MenuId.AgentSessionsCreateSubMenu, contextKeyService);
         const menuActions = ( rawMenuActions.map(value => value[1])).flat();
-        const whenClause = ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', `${LEGACY_AGENT_SESSIONS_VIEW_ID}.${contribution.type}`))));
         const disposables = ( new DisposableStore());
-        if (menuActions.length === 1) {
-            const first = menuActions[0];
-            if (first instanceof MenuItemAction) {
-                disposables.add(MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-                    group: 'navigation',
-                    title: first.label,
-                    icon: Codicon.plus,
-                    order: 1,
-                    when: whenClause,
-                    command: first.item,
-                }));
-            }
-        }
-        if (menuActions.length) {
-            disposables.add(MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-                group: 'navigation',
-                title: ( localize(5496, "Create chat session")),
-                icon: Codicon.plus,
-                order: 1,
-                when: whenClause,
-                submenu: MenuId.AgentSessionsCreateSubMenu,
-                isSplitButton: menuActions.length > 1
-            }));
-        }
-        else {
-            disposables.add(MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-                command: {
-                    id: `${NEW_CHAT_SESSION_ACTION_ID}.${contribution.type}`,
-                    title: ( localize(5497, "New {0}", contribution.displayName)),
-                    icon: Codicon.plus,
-                    source: {
-                        id: extensionDescription.identifier.value,
-                        title: extensionDescription.displayName || extensionDescription.name,
-                    }
-                },
-                group: 'navigation',
-                order: 1,
-                when: whenClause,
-            }));
-        }
         for (const action of menuActions) {
             if (action instanceof MenuItemAction) {
                 disposables.add(MenuRegistry.appendMenuItem(MenuId.ChatNewMenu, {
@@ -516,7 +474,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openSessionWithPrompt.${contribution.type}`,
-                    title: ( localize2(5498, "New {0} with Prompt", contribution.displayName)),
+                    title: ( localize2(5323, "New {0} with Prompt", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: false,
@@ -538,7 +496,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openNewSessionEditor.${contribution.type}`,
-                    title: ( localize2(5497, "New {0}", contribution.displayName)),
+                    title: ( localize2(5324, "New {0}", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: true,
@@ -555,7 +513,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                         override: ChatEditorInput.EditorID,
                         pinned: true,
                         title: {
-                            fallback: ( localize(5499, "{0}", contribution.displayName)),
+                            fallback: ( localize(5325, "{0}", contribution.displayName)),
                         }
                     };
                     const resource = ( URI.from({
@@ -576,7 +534,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openNewSessionSidebar.${contribution.type}`,
-                    title: ( localize2(5500, "New {0}", contribution.displayName)),
+                    title: ( localize2(5326, "New {0}", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: false,
@@ -634,6 +592,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                 this._onDidChangeSessionItems.fire(contribution.type);
             }
         }
+        this._updateHasCanDelegateProvidersContextKey();
     }
     _enableContribution(contribution, ext) {
         const disposableStore = ( new DisposableStore());
@@ -697,6 +656,12 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
         return Array.from(( this._contributions.values()), x => x.contribution)
             .filter(contribution => this._isContributionAvailable(contribution));
     }
+    _updateHasCanDelegateProvidersContextKey() {
+        const hasCanDelegate = this.getAllChatSessionContributions().filter(c => c.canDelegate);
+        const canDelegateEnabled = hasCanDelegate.length > 0;
+        this._logService.trace(`[ChatSessionsService] hasCanDelegateProvidersAvailable=${canDelegateEnabled} (${( hasCanDelegate.map(c => c.type)).join(', ')})`);
+        this._hasCanDelegateProvidersKey.set(canDelegateEnabled);
+    }
     getChatSessionContribution(chatSessionType) {
         const contribution = this._contributions.get(chatSessionType)?.contribution;
         if (!contribution) {
@@ -870,7 +835,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                         ? confirmationTitle
                         : confirmationTitle.value);
                     const descriptionValue = typeof description === 'string' ? description : description.value;
-                    description = titleMessage ?? ( localize(5501, "Waiting for confirmation: {0}", descriptionValue));
+                    description = titleMessage ?? ( localize(5327, "Waiting for confirmation: {0}", descriptionValue));
                 }
             }
             else if (part.kind === 'toolInvocationSerialized') {
@@ -880,7 +845,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                 description = part.content;
             }
             else if (part.kind === 'thinking') {
-                description = ( localize(5502, 'Thinking...'));
+                description = ( localize(5328, 'Thinking...'));
             }
         }
         return renderAsPlaintext(description, { useLinkFormatter: true });
@@ -924,21 +889,6 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
         const session = this._sessions.get(sessionResource);
         return !!session?.setOption(optionId, value);
     }
-    async setEditableSession(sessionResource, data) {
-        if (!data) {
-            this._editableSessions.delete(sessionResource);
-        }
-        else {
-            this._editableSessions.set(sessionResource, data);
-        }
-        this._onDidChangeSessionItems.fire(localChatSessionType);
-    }
-    getEditableData(sessionResource) {
-        return this._editableSessions.get(sessionResource);
-    }
-    isEditable(sessionResource) {
-        return ( this._editableSessions.has(sessionResource));
-    }
     notifySessionItemsChanged(chatSessionType) {
         this._onDidChangeSessionItems.fire(chatSessionType);
     }
@@ -997,9 +947,6 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
     getContentProviderSchemes() {
         return Array.from(( this._contentProviders.keys()));
     }
-    isChatSessionInProgressStatus(state) {
-        return state === ChatSessionStatus.InProgress || state === ChatSessionStatus.NeedsInput;
-    }
 };
 ChatSessionsService = ( __decorate([
     ( __param(0, ILogService)),

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.js

@@ -39,11 +39,10 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.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 { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { AGENT_SESSIONS_VIEW_CONTAINER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { ChatViewContainerId } 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 { chatViewsWelcomeRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
@@ -148,7 +147,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     }
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
-            static { this.CHAT_SETUP_ACTION_LABEL = ( localize2(5520, "Use AI Features with Copilot for free...")); }
+            static { this.CHAT_SETUP_ACTION_LABEL = ( localize2(5329, "Use AI Features with Copilot for free...")); }
             constructor() {
                 super({
                     id: CHAT_SETUP_ACTION_ID,
@@ -186,8 +185,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 if (success === false && !lifecycleService.willShutdown) {
                     const { confirmed } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(5521, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(5522, "Retry")),
+                        message: ( localize(5330, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(5331, "Retry")),
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -217,7 +216,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupForceSignIn',
-                    title: ( localize2(5523, "Sign in to use AI features"))
+                    title: ( localize2(5332, "Sign in to use AI features"))
                 });
             }
             async run(accessor) {
@@ -245,7 +244,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.triggerSetupFromAccounts',
-                    title: ( localize2(5524, "Sign in to use AI features...")),
+                    title: ( localize2(5333, "Sign in to use AI features...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: '2_copilot',
@@ -265,8 +264,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.upgradePlan',
-                    title: ( localize2(5525, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(5526, 'Chat')),
+                    title: ( localize2(5334, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(5335, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
@@ -307,8 +306,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.action.chat.manageOverages',
-                    title: ( localize2(5527, "Manage GitHub Copilot Overages")),
-                    category: ( localize2(5526, 'Chat')),
+                    title: ( localize2(5336, "Manage GitHub Copilot Overages")),
+                    category: ( localize2(5335, 'Chat')),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
@@ -381,7 +380,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: 'chat.internal.explain',
-                title: ( localize(5528, "Explain")),
+                title: ( localize(5337, "Explain")),
             },
             group: '1_chat',
             order: 4,
@@ -390,7 +389,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
             command: {
                 id: 'chat.internal.fix',
-                title: ( localize(5529, "Fix")),
+                title: ( localize(5338, "Fix")),
             },
             group: '1_action',
             order: 1,
@@ -399,7 +398,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
             command: {
                 id: 'chat.internal.review',
-                title: ( localize(5530, "Code Review")),
+                title: ( localize(5339, "Code Review")),
             },
             group: '1_action',
             order: 2,
@@ -408,7 +407,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
             command: {
                 id: 'chat.internal.generateDocs',
-                title: ( localize(5531, "Generate Docs")),
+                title: ( localize(5340, "Generate Docs")),
             },
             group: '2_generate',
             order: 1,
@@ -417,7 +416,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
             command: {
                 id: 'chat.internal.generateTests',
-                title: ( localize(5532, "Generate Tests")),
+                title: ( localize(5341, "Generate Tests")),
             },
             group: '2_generate',
             order: 2,
@@ -566,15 +565,12 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
             return;
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
-        await this.extensionsWorkbenchService.updateRunningExtensions(state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(5533, "Enabling AI features")) : ( localize(5534, "Disabling AI features")));
+        await this.extensionsWorkbenchService.updateRunningExtensions(state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(5342, "Enabling AI features")) : ( localize(5343, "Disabling AI features")));
     }
     maybeHideAuxiliaryBar() {
         const activeContainers = this.viewDescriptorService.getViewContainersByLocation(ViewContainerLocation.AuxiliaryBar).filter(container => this.viewDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0);
-        const hasChatView = ( activeContainers.some(container => container.id === ChatViewContainerId));
-        const hasAgentSessionsView = ( activeContainers.some(container => container.id === AGENT_SESSIONS_VIEW_CONTAINER_ID));
         if ((activeContainers.length === 0) ||
-            (activeContainers.length === 1 && (hasChatView || hasAgentSessionsView)) ||
-            (activeContainers.length === 2 && hasChatView && hasAgentSessionsView)
+            (activeContainers.length === 1 && activeContainers.at(0)?.id === ChatViewContainerId)
         ) {
             this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
         }
@@ -582,7 +578,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
     registerActions() {
         class ChatSetupHideAction extends Action2 {
             static { this.ID = 'workbench.action.chat.hideSetup'; }
-            static { this.TITLE = ( localize2(5535, "Learn How to Hide AI Features")); }
+            static { this.TITLE = ( localize2(5344, "Learn How to Hide AI Features")); }
             constructor() {
                 super({
                     id: ChatSetupHideAction.ID,