@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts

@@ -7,6 +7,7 @@ import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -29,11 +30,14 @@ import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
     private readonly storageService;
     private readonly chatService;
     private readonly chatAgentService;
     private readonly logService;
+    private readonly notificationService;
     private readonly layoutService;
     private readonly chatSessionsService;
     private readonly telemetryService;
@@ -42,6 +46,8 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly chatEntitlementService;
     private readonly commandService;
     private readonly activityService;
+    private readonly workbenchEnvironmentService;
+    private readonly hostService;
     private readonly memento;
     private readonly viewState;
     private viewPaneContainer;
@@ -52,7 +58,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private restoringSession;
     private readonly modelRef;
     private readonly activityBadge;
-    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService);
+    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, workbenchEnvironmentService: IWorkbenchEnvironmentService, hostService: IHostService);
     private updateContextKeys;
     private getViewPositionAndLocation;
     private getSessionHoverPosition;
@@ -97,6 +103,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private registerControlsListeners;
     private setupContextMenu;
     private applyModel;
+    private _applyModel;
     private showModel;
     private updateWidgetLockState;
     private clear;

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.js

@@ -23,6 +23,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 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';
@@ -72,6 +73,9 @@ import { AgentSessionsFilter, AgentSessionsGrouping } from '@codingame/monaco-vs
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ChatViewPane_1;
@@ -95,6 +99,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         chatService,
         chatAgentService,
         logService,
+        notificationService,
         layoutService,
         chatSessionsService,
         telemetryService,
@@ -103,7 +108,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         agentSessionsService,
         chatEntitlementService,
         commandService,
-        activityService
+        activityService,
+        workbenchEnvironmentService,
+        hostService
     ) {
         super(
             options,
@@ -121,6 +128,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.chatService = chatService;
         this.chatAgentService = chatAgentService;
         this.logService = logService;
+        this.notificationService = notificationService;
         this.layoutService = layoutService;
         this.chatSessionsService = chatSessionsService;
         this.telemetryService = telemetryService;
@@ -129,6 +137,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.chatEntitlementService = chatEntitlementService;
         this.commandService = commandService;
         this.activityService = activityService;
+        this.workbenchEnvironmentService = workbenchEnvironmentService;
+        this.hostService = hostService;
         this.lastDimensionsPerOrientation = ( new Map());
         this.modelRef = this._register(( new MutableDisposable()));
         this.activityBadge = this._register(( new MutableDisposable()));
@@ -140,6 +150,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         if (lifecycleService.startupKind !== StartupKind.ReloadedWindow && this.configurationService.getValue(ChatConfiguration.RestoreLastPanelSession) === false) {
             this.viewState.sessionId = undefined;
+            this.viewState.sessionResource = undefined;
         }
         this.sessionsViewerVisible = false;
         this.sessionsViewerSidebarWidth = Math.max(
@@ -199,8 +210,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }[viewLocation === ViewContainerLocation.Panel ? this.layoutService.getPanelPosition() : sideBarPosition];
     }
     updateViewPaneClasses(fromEvent) {
-        const welcomeEnabled = !this.chatEntitlementService.sentiment.installed;
-        this.viewPaneContainer?.classList.toggle("chat-view-welcome-enabled", welcomeEnabled);
         const activityBarLocationDefault = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) === "default";
         this.viewPaneContainer?.classList.toggle("activity-bar-location-default", activityBarLocationDefault);
         this.viewPaneContainer?.classList.toggle("activity-bar-location-other", !activityBarLocationDefault);
@@ -235,15 +244,12 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => {
             return e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION);
         })(() => this.updateViewPaneClasses(true)));
-        this._register(this.chatEntitlementService.onDidChangeSentiment(() => {
-            this.updateViewPaneClasses(true);
-        }));
     }
     onDidChangeAgents() {
         if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)) {
             if (!this._widget?.viewModel && !this.restoringSession) {
                 const sessionResource = this.getTransferredOrPersistedSessionInfo();
-                this.restoringSession = (sessionResource ? this.chatService.getOrRestoreSession(sessionResource) : Promise.resolve(undefined)).then(async modelRef => {
+                this.restoringSession = (sessionResource ? this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, CancellationToken.None) : Promise.resolve(undefined)).then(async modelRef => {
                     if (!this._widget) {
                         return;
                     }
@@ -264,6 +270,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (this.chatService.transferredSessionResource) {
             return this.chatService.transferredSessionResource;
         }
+        if (this.viewState.sessionResource) {
+            return this.viewState.sessionResource;
+        }
         return this.viewState.sessionId ? LocalChatSessionUri.forSession(this.viewState.sessionId) : undefined;
     }
     renderBody(parent) {
@@ -304,7 +313,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const sessionsContainer = this.sessionsContainer = parent.appendChild($(".agent-sessions-container"));
         const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $(".agent-sessions-title-container"));
         const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $("span.agent-sessions-title"));
-        sessionsTitle.textContent = ( localize(6242, "Sessions"));
+        sessionsTitle.textContent = ( localize(6894, "Sessions"));
         this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
             this.sessionsControl?.scrollToTop();
             this.sessionsControl?.focus();
@@ -332,7 +341,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             ...defaultButtonStyles,
             secondary: true
         })));
-        newSessionButton.label = ( localize(6243, "New Session"));
+        newSessionButton.label = ( localize(6895, "New Session"));
         this._register(
             newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT))
         );
@@ -364,6 +373,11 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             this.onDidChangeBodyVisibility(visible => sessionsControl.setVisible(visible))
         );
         sessionsToolbar.context = sessionsControl;
+        this._register(this.hostService.onDidChangeFocus(hasFocus => {
+            if (hasFocus) {
+                sessionsControl.refresh();
+            }
+        }));
         this._register(Event.runAndSubscribe(Event.filter(
             this.configurationService.onDidChangeConfiguration,
             e => e.affectsConfiguration(ChatConfiguration.ChatViewSessionsOrientation)
@@ -417,7 +431,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         } else {
             if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
                 newSessionsContainerVisible =
-                !!this.chatEntitlementService.sentiment.installed && (!this._widget || (this._widget.isEmpty() && !!this._widget.viewModel)) && !this.welcomeController?.isShowingWelcome.get();
+                !!this.chatEntitlementService.sentiment.installed && (!this._widget || (this._widget.isEmpty() && !!this._widget.viewModel && !this._widget.viewModel.model.title)) && !this.welcomeController?.isShowingWelcome.get();
             }
             else {
                 newSessionsContainerVisible =
@@ -448,7 +462,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const locationBasedColors = this.getLocationBasedColors();
         const editorOverflowWidgetsDomNode = this.layoutService.getContainer(getWindow(chatControlsContainer)).appendChild($(".chat-editor-overflow.monaco-editor"));
         this._register(toDisposable(() => editorOverflowWidgetsDomNode.remove()));
-        this.createChatTitleControl(chatControlsContainer);
+        if (this.viewDescriptorService.getViewLocationById(this.id) !== ViewContainerLocation.ChatBar) {
+            this.createChatTitleControl(chatControlsContainer);
+        }
         const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
         this._widget = this._register(
             scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Chat, {
@@ -467,9 +483,11 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 },
                 editorOverflowWidgetsDomNode,
                 enableImplicitContext: true,
-                enableWorkingSet: "explicit",
+                enableWorkingSet: this.workbenchEnvironmentService.isSessionsWindow ? "implicit" : "explicit",
                 supportsChangingModes: true,
-                dndContainer: parent
+                dndContainer: parent,
+                inputEditorMinLines: this.workbenchEnvironmentService.isSessionsWindow ? 2 : undefined,
+                isSessionsWindow: this.workbenchEnvironmentService.isSessionsWindow
             }, {
                 listForeground: SIDE_BAR_FOREGROUND,
                 listBackground: locationBasedColors.background,
@@ -555,7 +573,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 progressBadgeDisposables.value.add(autorun(reader => {
                     if (model.requestInProgress.read(reader)) {
                         this.activityBadge.value = this.activityService.showViewActivity(this.id, {
-                            badge: ( new ProgressBadge(() => ( localize(6244, "Agent Session in Progress"))))
+                            badge: ( new ProgressBadge(() => ( localize(6896, "Agent Session in Progress"))))
                         });
                     } else {
                         this.activityBadge.clear();
@@ -582,9 +600,13 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             });
         }));
     }
-    async applyModel() {
+    applyModel() {
+        this.restoringSession = this._applyModel();
+        this.restoringSession.finally(() => this.restoringSession = undefined);
+    }
+    async _applyModel() {
         const sessionResource = this.getTransferredOrPersistedSessionInfo();
-        const modelRef = sessionResource ? await this.chatService.getOrRestoreSession(sessionResource) : undefined;
+        const modelRef = sessionResource ? await this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, CancellationToken.None) : undefined;
         await this.showModel(modelRef);
     }
     async showModel(modelRef, startNewSession = true) {
@@ -592,7 +614,11 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.modelRef.value = undefined;
         let ref;
         if (startNewSession) {
-            ref = modelRef ?? (this.chatService.transferredSessionResource ? await this.chatService.getOrRestoreSession(this.chatService.transferredSessionResource) : this.chatService.startSession(ChatAgentLocation.Chat));
+            ref = modelRef ?? (this.chatService.transferredSessionResource ? await this.chatService.acquireOrLoadSession(
+                this.chatService.transferredSessionResource,
+                ChatAgentLocation.Chat,
+                CancellationToken.None
+            ) : this.chatService.startNewLocalSession(ChatAgentLocation.Chat));
             if (!ref) {
                 throw ( new Error("Could not start chat session"));
             }
@@ -600,8 +626,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.modelRef.value = ref;
         const model = ref?.object;
         if (model) {
-            await this.updateWidgetLockState(model.sessionResource);
-            this.viewState.sessionId = model.sessionId;
+            await this.updateWidgetLockState(getChatSessionType(model.sessionResource));
+            this.viewState.sessionResource = model.sessionResource;
         }
         this._widget.setModel(model);
         this.titleControl?.update(model);
@@ -611,17 +637,16 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         return model;
     }
-    async updateWidgetLockState(sessionResource) {
-        const sessionType = getChatSessionType(sessionResource);
+    async updateWidgetLockState(sessionType) {
         if (sessionType === localChatSessionType) {
             this._widget.unlockFromCodingAgent();
             return;
         }
         let canResolve = false;
         try {
-            canResolve = await this.chatSessionsService.canResolveChatSession(sessionResource);
+            canResolve = await this.chatSessionsService.canResolveChatSession(sessionType);
         } catch (error) {
-            this.logService.warn(`Failed to resolve chat session '${( sessionResource.toString())}' for locking`, error);
+            this.logService.warn(`Failed to resolve chat session type '${sessionType}' for locking`, error);
         }
         if (!canResolve) {
             this._widget.unlockFromCodingAgent();
@@ -640,6 +665,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.updateActions();
     }
     async loadSession(sessionResource) {
+        if (this.restoringSession) {
+            await this.restoringSession;
+        }
         return this.progressService.withProgress({
             location: ChatViewId,
             delay: 200
@@ -648,14 +676,18 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             const clearWidget = disposableTimeout(() => {
                 queue = this.showModel(undefined, false).then(() => {});
             }, 100);
-            const sessionType = getChatSessionType(sessionResource);
-            if (sessionType !== localChatSessionType) {
-                await this.chatSessionsService.canResolveChatSession(sessionResource);
+            try {
+                const newModelRef = await this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, CancellationToken.None);
+                clearWidget.dispose();
+                await queue;
+                return this.showModel(newModelRef);
+            } catch (err) {
+                clearWidget.dispose();
+                await queue;
+                this.logService.error(`Failed to load chat session '${( sessionResource.toString())}'`, err);
+                this.notificationService.error(( localize(6897, "Failed to open chat session: {0}", toErrorMessage(err))));
+                return this.showModel(undefined);
             }
-            const newModelRef = await this.chatService.loadSessionForResource(sessionResource, ChatAgentLocation.Chat, CancellationToken.None);
-            clearWidget.dispose();
-            await queue;
-            return this.showModel(newModelRef);
         });
     }
     focus() {
@@ -727,9 +759,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         default:
             newSessionsViewerOrientation = width >= ChatViewPane_1.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH ? AgentSessionsViewerOrientation.SideBySide : AgentSessionsViewerOrientation.Stacked;
         }
-        if (newSessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked && width >= ChatViewPane_1.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH && this.getViewPositionAndLocation().location === ViewContainerLocation.AuxiliaryBar && this.layoutService.isAuxiliaryBarMaximized()) {
-            newSessionsViewerOrientation = AgentSessionsViewerOrientation.SideBySide;
-        }
         this.sessionsViewerOrientation = newSessionsViewerOrientation;
         if (newSessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
             this.viewPaneContainer.classList.toggle("sessions-control-orientation-sidebyside", true);
@@ -787,10 +816,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             widthReduction = this.sessionsContainer.offsetWidth;
         }
         else {
-            const sessionsHeight = availableSessionsHeight - 1 ;
-            this.sessionsControlContainer.style.height = `${sessionsHeight}px`;
+            this.sessionsControlContainer.style.height = `${availableSessionsHeight}px`;
             this.sessionsControlContainer.style.width = ``;
-            this.sessionsControl.layout(sessionsHeight, width);
+            this.sessionsControl.layout(availableSessionsHeight, width);
             heightReduction = this.sessionsContainer.offsetHeight;
             widthReduction = 0;
         }
@@ -889,6 +917,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         } : undefined;
     }
 };
-ChatViewPane = ChatViewPane_1 = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IContextMenuService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IViewDescriptorService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, IThemeService)), ( __param(9, IHoverService)), ( __param(10, IStorageService)), ( __param(11, IChatService)), ( __param(12, IChatAgentService)), ( __param(13, ILogService)), ( __param(14, IWorkbenchLayoutService)), ( __param(15, IChatSessionsService)), ( __param(16, ITelemetryService)), ( __param(17, ILifecycleService)), ( __param(18, IProgressService)), ( __param(19, IAgentSessionsService)), ( __param(20, IChatEntitlementService)), ( __param(21, ICommandService)), ( __param(22, IActivityService))], ChatViewPane));
+ChatViewPane = ChatViewPane_1 = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IContextMenuService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IViewDescriptorService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, IThemeService)), ( __param(9, IHoverService)), ( __param(10, IStorageService)), ( __param(11, IChatService)), ( __param(12, IChatAgentService)), ( __param(13, ILogService)), ( __param(14, INotificationService)), ( __param(15, IWorkbenchLayoutService)), ( __param(16, IChatSessionsService)), ( __param(17, ITelemetryService)), ( __param(18, ILifecycleService)), ( __param(19, IProgressService)), ( __param(20, IAgentSessionsService)), ( __param(21, IChatEntitlementService)), ( __param(22, ICommandService)), ( __param(23, IActivityService)), ( __param(24, IWorkbenchEnvironmentService)), ( __param(25, IHostService))], ChatViewPane));
 
 export { ChatViewPane };

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js

@@ -23,7 +23,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         ChatViewTitleControl_1 = this;
     }
     static {
-        this.DEFAULT_TITLE = ( localize(6245, "Chat"));
+        this.DEFAULT_TITLE = ( localize(6898, "Chat"));
     }
     static {
         this.PICK_AGENT_SESSION_ACTION_ID = "workbench.action.chat.pickAgentSession";
@@ -43,11 +43,12 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         this.registerActions();
     }
     registerActions() {
+        const that = this;
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID,
-                    title: ( localize(6246, "Pick Agent Session")),
+                    title: ( localize(6899, "Pick Agent Session")),
                     f1: false,
                     menu: [{
                         id: MenuId.ChatViewSessionTitleNavigationToolbar,
@@ -58,16 +59,16 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
             }
             async run(accessor) {
                 const instantiationService = accessor.get(IInstantiationService);
-                const agentSessionsPicker = instantiationService.createInstance(AgentSessionsPicker);
+                const agentSessionsPicker = instantiationService.createInstance(AgentSessionsPicker, that.titleLabel.value?.element, undefined);
                 await agentSessionsPicker.pickAgentSession();
             }
         }));
     }
     render(parent) {
-        const elements = h("div.chat-view-title-container", [
+        const elements = h("div.chat-view-title-container", [h("div.chat-view-title-inner", [
             h("div.chat-view-title-navigation-toolbar@navigationToolbar"),
             h("div.chat-view-title-actions-toolbar@actionsToolbar")
-        ]);
+        ])]);
         this.navigationToolbar = this._register(this.instantiationService.createInstance(
             MenuWorkbenchToolBar,
             elements.navigationToolbar,

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css

@@ -18,27 +18,12 @@
 
 		.interactive-session {
 
-			/* needed so that the chat welcome and chat input does not overflow and input grows over welcome */
+			/* needed so that the chat input does not overflow and input grows over content above */
 			width: 100%;
 			min-height: 0;
 			min-width: 0;
 		}
 	}
-
-	&:not(.chat-view-welcome-enabled) {
-
-		.interactive-session {
-
-			/* hide most welcome pieces (except suggested actions) when we show recent sessions to make some space */
-			.chat-welcome-view .chat-welcome-view-icon,
-			.chat-welcome-view .chat-welcome-view-title,
-			.chat-welcome-view .chat-welcome-view-message,
-			.chat-welcome-view .chat-welcome-view-disclaimer,
-			.chat-welcome-view .chat-welcome-view-tips {
-				visibility: hidden;
-			}
-		}
-	}
 }
 
 /* Sessions control: either sidebar or stacked */
@@ -83,7 +68,10 @@
 .chat-viewpane.has-sessions-control.sessions-control-orientation-stacked {
 
 	.agent-sessions-container {
-		border-bottom: 1px solid var(--vscode-panel-border);
+		/* center it above the chat which has this max-width restriction */
+		max-width: 950px;
+		margin: 0 auto;
+		width: 100%;
 	}
 
 	.agent-sessions-new-button-container {
@@ -112,7 +100,7 @@
 	}
 
 	.agent-sessions-new-button-container {
-		padding: 8px 12px;
+		padding: 8px;
 	}
 }
 
@@ -139,7 +127,15 @@
 	}
 
 	.agent-session-section {
-		padding: 0 12px 0 20px;
+		padding: 0 6px 0 14px;
+	}
+
+	/* Stacked: symmetric padding */
+	&.sessions-control-orientation-stacked {
+
+		.agent-sessions-empty-filter-message {
+			padding-left: 20px;
+		}
 	}
 
 	/* Right position: symmetric padding */
@@ -150,7 +146,7 @@
 		}
 
 		.agent-session-section {
-			padding: 0 12px 0 8px;
+			padding: 0 6px 0 8px;
 		}
 	}
 

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css

@@ -7,9 +7,18 @@
 
 	.chat-view-title-container {
 		display: none;
-		align-items: center;
 		cursor: pointer;
 
+		.chat-view-title-inner {
+			display: flex;
+			align-items: center;
+			/* center it above the chat which has this max-width restriction */
+			max-width: 950px;
+			margin: 0 auto;
+			width: 100%;
+			box-sizing: border-box;
+		}
+
 		.chat-view-title-navigation-toolbar {
 			overflow: hidden;
 
@@ -44,7 +53,7 @@
 	}
 
 	.chat-view-title-container.visible {
-		display: flex;
+		display: block;
 	}
 }
 
@@ -62,28 +71,28 @@
 	&.chat-view-location-sidebar,
 	&.chat-view-location-panel,
 	&.chat-view-location-auxiliarybar {
-		.chat-view-title-container {
+		.chat-view-title-inner {
 			padding: 0 12px 0 16px;
 		}
 	}
 
 	/* Auxiliarybar with non-default activity bar position */
 	&.activity-bar-location-other.chat-view-location-auxiliarybar {
-		.chat-view-title-container {
+		.chat-view-title-inner {
 			padding: 0 8px 0 16px;
 		}
 	}
 
 	/* Side-by-side sessions: left position (any activity bar) */
 	&.has-sessions-control.sessions-control-orientation-sidebyside.chat-view-position-left {
-		.chat-view-title-container {
+		.chat-view-title-inner {
 			padding: 0 8px;
 		}
 	}
 
 	/* Side-by-side sessions: right position (default activity bar only) */
 	&.activity-bar-location-default.has-sessions-control.sessions-control-orientation-sidebyside.chat-view-position-right {
-		.chat-view-title-container {
+		.chat-view-title-inner {
 			padding: 0 8px 0 16px;
 		}
 	}

package/vscode/src/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.d.ts

@@ -0,0 +1,40 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+/**
+ * Possible section IDs for the AI Customization Management Editor sidebar.
+ */
+export declare const AICustomizationManagementSection: {
+    readonly Agents: "agents";
+    readonly Skills: "skills";
+    readonly Instructions: "instructions";
+    readonly Prompts: "prompts";
+    readonly Hooks: "hooks";
+    readonly McpServers: "mcpServers";
+    readonly Plugins: "plugins";
+    readonly Models: "models";
+};
+export type AICustomizationManagementSection = typeof AICustomizationManagementSection[keyof typeof AICustomizationManagementSection];
+/**
+ * Per-type filter policy controlling which storage sources and user file
+ * roots are visible for a given customization type.
+ */
+export interface IStorageSourceFilter {
+    /**
+     * Which storage groups to display (e.g. workspace, user, extension).
+     */
+    readonly sources: readonly PromptsStorage[];
+    /**
+     * If set, only user files under these roots are shown (allowlist).
+     * If `undefined`, all user file roots are included.
+     */
+    readonly includedUserFileRoots?: readonly URI[];
+}
+/**
+ * Applies a storage source filter to an array of items that have uri and storage.
+ * Removes items whose storage is not in the filter's source list,
+ * and for user-storage items, removes those not under an allowed root.
+ */
+export declare function applyStorageSourceFilter<T extends {
+    readonly uri: URI;
+    readonly storage: PromptsStorage;
+}>(items: readonly T[], filter: IStorageSourceFilter): readonly T[];

package/vscode/src/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.js

@@ -0,0 +1,28 @@
+
+import { isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+
+const AICustomizationManagementSection = {
+    Agents: "agents",
+    Skills: "skills",
+    Instructions: "instructions",
+    Prompts: "prompts",
+    Hooks: "hooks",
+    McpServers: "mcpServers",
+    Plugins: "plugins",
+    Models: "models"
+};
+function applyStorageSourceFilter(items, filter) {
+    const sourceSet = ( new Set(filter.sources));
+    return items.filter(item => {
+        if (!( sourceSet.has(item.storage))) {
+            return false;
+        }
+        if (item.storage === PromptsStorage.user && filter.includedUserFileRoots) {
+            return ( filter.includedUserFileRoots.some(root => isEqualOrParent(item.uri, root)));
+        }
+        return true;
+    });
+}
+
+export { AICustomizationManagementSection, applyStorageSourceFilter };