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

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

@@ -2,7 +2,6 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -12,30 +11,29 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { openSession } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsOpener';
 import { isLocalAgentSessionItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
-import { AgentSessionsSorter, groupAgentSessionsByDate } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer';
-import { AGENT_SESSION_RENAME_ACTION_ID, AGENT_SESSION_DELETE_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { sessionDateFromNow, AgentSessionsSorter, groupAgentSessionsByDate } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer';
+import { getAgentSessionTime, AGENT_SESSION_RENAME_ACTION_ID, AGENT_SESSION_DELETE_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { AgentSessionsFilter } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter';
 
 const archiveButton = {
     iconClass: ThemeIcon.asClassName(Codicon.archive),
-    tooltip: ( localize(4984, "Archive"))
+    tooltip: ( localize(5120, "Archive"))
 };
 const unarchiveButton = {
     iconClass: ThemeIcon.asClassName(Codicon.inbox),
-    tooltip: ( localize(4985, "Unarchive"))
+    tooltip: ( localize(5121, "Unarchive"))
 };
 const renameButton = {
     iconClass: ThemeIcon.asClassName(Codicon.edit),
-    tooltip: ( localize(4986, "Rename"))
+    tooltip: ( localize(5122, "Rename"))
 };
 const deleteButton = {
     iconClass: ThemeIcon.asClassName(Codicon.trash),
-    tooltip: ( localize(4987, "Delete"))
+    tooltip: ( localize(5123, "Delete"))
 };
 function getSessionDescription(session) {
     const descriptionText = typeof session.description === "string" ? session.description : session.description ? renderAsPlaintext(session.description) : undefined;
-    const timeAgo = fromNow(
-        session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created
-    );
+    const timeAgo = sessionDateFromNow(getAgentSessionTime(session.timing));
     const descriptionParts = [descriptionText, session.providerLabel, timeAgo].filter(part => !!part);
     return descriptionParts.join(" • ");
 }
@@ -50,11 +48,15 @@ function getSessionButtons(session) {
 }
 let AgentSessionsPicker = class AgentSessionsPicker {
     constructor(
+        anchor,
+        options,
         agentSessionsService,
         quickInputService,
         instantiationService,
         commandService
     ) {
+        this.anchor = anchor;
+        this.options = options;
         this.agentSessionsService = agentSessionsService;
         this.quickInputService = quickInputService;
         this.instantiationService = instantiationService;
@@ -66,19 +68,26 @@ let AgentSessionsPicker = class AgentSessionsPicker {
         const picker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        picker.items = this.createPickerItems();
+        const filter = disposables.add(this.instantiationService.createInstance(AgentSessionsFilter, {}));
+        picker.anchor = this.anchor;
+        picker.items = this.createPickerItems(filter);
         picker.canAcceptInBackground = true;
-        picker.placeholder = ( localize(4988, "Search agent sessions by name"));
+        picker.placeholder = ( localize(5124, "Search agent sessions by name"));
         disposables.add(picker.onDidAccept(e => {
             const pick = picker.selectedItems[0];
             if (pick) {
-                this.instantiationService.invokeFunction(openSession, pick.session, {
+                const openOptions = {
                     sideBySide: e.inBackground,
                     editorOptions: {
                         preserveFocus: e.inBackground,
                         pinned: e.inBackground
                     }
-                });
+                };
+                if (this.options?.overrideSessionOpen) {
+                    this.options.overrideSessionOpen(pick.session, openOptions);
+                } else {
+                    this.instantiationService.invokeFunction(openSession, pick.session, openOptions);
+                }
             }
             if (!e.inBackground) {
                 picker.hide();
@@ -101,14 +110,14 @@ let AgentSessionsPicker = class AgentSessionsPicker {
                 await this.agentSessionsService.model.resolve(session.providerType);
                 this.pickAgentSession();
             } else {
-                picker.items = this.createPickerItems();
+                picker.items = this.createPickerItems(filter);
             }
         }));
         disposables.add(picker.onDidHide(() => disposables.dispose()));
         picker.show();
     }
-    createPickerItems() {
-        const sessions = this.agentSessionsService.model.sessions.sort(this.sorter.compare.bind(this.sorter));
+    createPickerItems(filter) {
+        const sessions = this.agentSessionsService.model.sessions.filter(session => !filter.exclude(session)).sort(this.sorter.compare.bind(this.sorter));
         const items = [];
         const groupedSessions = groupAgentSessionsByDate(sessions);
         for (const group of ( groupedSessions.values())) {
@@ -136,6 +145,6 @@ let AgentSessionsPicker = class AgentSessionsPicker {
         };
     }
 };
-AgentSessionsPicker = ( __decorate([( __param(0, IAgentSessionsService)), ( __param(1, IQuickInputService)), ( __param(2, IInstantiationService)), ( __param(3, ICommandService))], AgentSessionsPicker));
+AgentSessionsPicker = ( __decorate([( __param(2, IAgentSessionsService)), ( __param(3, IQuickInputService)), ( __param(4, IInstantiationService)), ( __param(5, ICommandService))], AgentSessionsPicker));
 
 export { AgentSessionsPicker, archiveButton, deleteButton, getSessionButtons, getSessionDescription, renameButton, unarchiveButton };

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

@@ -9,6 +9,7 @@ export declare class AgentSessionsQuickAccessProvider extends PickerQuickAccessP
     private readonly instantiationService;
     private readonly commandService;
     private readonly sorter;
+    private readonly filter;
     constructor(agentSessionsService: IAgentSessionsService, instantiationService: IInstantiationService, commandService: ICommandService);
     protected _getPicks(filter: string): Promise<(IQuickPickSeparator | IPickerQuickAccessItem)[]>;
     private toPickItem;

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

@@ -11,6 +11,7 @@ import { openSession } from '@codingame/monaco-vscode-katex-common/vscode/vs/wor
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { getSessionDescription, getSessionButtons, unarchiveButton, archiveButton, deleteButton, renameButton } from './agentSessionsPicker.js';
+import { AgentSessionsFilter } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter';
 
 const AGENT_SESSIONS_QUICK_ACCESS_PREFIX = "agent ";
 let AgentSessionsQuickAccessProvider = class AgentSessionsQuickAccessProvider extends PickerQuickAccessProvider {
@@ -18,17 +19,18 @@ let AgentSessionsQuickAccessProvider = class AgentSessionsQuickAccessProvider ex
         super(AGENT_SESSIONS_QUICK_ACCESS_PREFIX, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localize(4989, "No matching agent sessions"))
+                label: ( localize(5125, "No matching agent sessions"))
             }
         });
         this.agentSessionsService = agentSessionsService;
         this.instantiationService = instantiationService;
         this.commandService = commandService;
         this.sorter = ( new AgentSessionsSorter());
+        this.filter = this._register(this.instantiationService.createInstance(AgentSessionsFilter, {}));
     }
     async _getPicks(filter) {
         const picks = [];
-        const sessions = this.agentSessionsService.model.sessions.sort(this.sorter.compare.bind(this.sorter));
+        const sessions = this.agentSessionsService.model.sessions.filter(session => !this.filter.exclude(session)).sort(this.sorter.compare.bind(this.sorter));
         const groupedSessions = groupAgentSessionsByDate(sessions);
         for (const group of ( groupedSessions.values())) {
             if (group.sessions.length > 0) {

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

@@ -5,7 +5,7 @@ import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/c
 const inAgentSessionProjection = ( new RawContextKey("chatInAgentSessionProjection", false, {
     type: "boolean",
     description: ( localize(
-        5014,
+        5151,
         "True when the workbench is in agent session projection mode for reviewing an agent session."
     ))
 }));

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

@@ -21,7 +21,7 @@ class EnterAgentSessionProjectionAction extends Action2 {
     constructor() {
         super({
             id: EnterAgentSessionProjectionAction.ID,
-            title: ( localize2(5015, "Enter Agent Session Projection")),
+            title: ( localize2(5152, "Enter Agent Session Projection")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.AgentSessionProjectionEnabled}`)), ( inAgentSessionProjection.negate())))
@@ -50,7 +50,7 @@ class ExitAgentSessionProjectionAction extends Action2 {
     constructor() {
         super({
             id: ExitAgentSessionProjectionAction.ID,
-            title: ( localize2(5016, "Exit Agent Session Projection")),
+            title: ( localize2(5153, "Exit Agent Session Projection")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, inAgentSessionProjection)),
@@ -68,13 +68,13 @@ class ExitAgentSessionProjectionAction extends Action2 {
 }
 class ToggleAgentStatusAction extends ToggleTitleBarConfigAction {
     constructor() {
-        super(ChatConfiguration.AgentStatusEnabled, ( localize(5017, "Agent Status")), ( localize(5018, "Toggle visibility of the Agent Status in title bar")), 6, ( ContextKeyExpr.and(ChatContextKeys.enabled, ( IsCompactTitleBarContext.negate()), ChatContextKeys.supported, ( ContextKeyExpr.has("config.window.commandCenter")))));
+        super(ChatConfiguration.AgentStatusEnabled, ( localize(5154, "Agent Status")), ( localize(5155, "Toggle visibility of the Agent Status in title bar")), 6, ( ContextKeyExpr.and(ChatContextKeys.enabled, ( IsCompactTitleBarContext.negate()), ChatContextKeys.supported, ( ContextKeyExpr.has("config.window.commandCenter")))));
     }
 }
 class ToggleUnifiedAgentsBarAction extends ToggleTitleBarConfigAction {
     constructor() {
-        super(ChatConfiguration.UnifiedAgentsBar, ( localize(5019, "Agent Quick Input")), ( localize(
-            5020,
+        super(ChatConfiguration.UnifiedAgentsBar, ( localize(5156, "Agent Quick Input")), ( localize(
+            5157,
             "Toggle Agent Quick Input, replacing the classic command center search box."
         )), 7, ( ContextKeyExpr.and(ChatContextKeys.enabled, ( IsCompactTitleBarContext.negate()), ChatContextKeys.supported, ( ContextKeyExpr.has("config.window.commandCenter")))));
     }

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

@@ -35,6 +35,8 @@ export declare class AgentSessionProjectionService extends Disposable implements
     get isActive(): boolean;
     /** Prevents re-entrant exits and enter-on-exit races */
     private _isExiting;
+    /** Prevents checkForEmptyEditors from exiting during session swaps */
+    private _isSwappingSessions;
     private _activeSession;
     get activeSession(): IAgentSession | undefined;
     private readonly _onDidChangeProjectionMode;

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

@@ -9,10 +9,10 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { MODAL_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
-import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
@@ -64,6 +64,7 @@ let AgentSessionProjectionService = class AgentSessionProjectionService extends
         this.agentSessionsService = agentSessionsService;
         this._isActive = false;
         this._isExiting = false;
+        this._isSwappingSessions = false;
         this._onDidChangeProjectionMode = this._register(( new Emitter()));
         this.onDidChangeProjectionMode = this._onDidChangeProjectionMode.event;
         this._onDidChangeActiveSession = this._register(( new Emitter()));
@@ -80,7 +81,7 @@ let AgentSessionProjectionService = class AgentSessionProjectionService extends
         return this.configurationService.getValue(ChatConfiguration.AgentSessionProjectionEnabled) === true;
     }
     _checkForEmptyEditors() {
-        if (!this._isActive || this._isExiting) {
+        if (!this._isActive || this._isExiting || this._isSwappingSessions) {
             return;
         }
         const hasVisibleEditors = this.editorService.visibleEditors.length > 0;
@@ -109,7 +110,7 @@ let AgentSessionProjectionService = class AgentSessionProjectionService extends
     async _openSessionInChatPanel(session) {
         session.setRead(true);
         await this.chatSessionsService.activateChatSessionItemProvider(session.providerType);
-        await this.chatWidgetService.openSession(session.resource, ChatViewPaneTarget, {
+        await this.chatWidgetService.openSession(session.resource, undefined, {
             title: {
                 preferred: session.label
             },
@@ -131,17 +132,23 @@ let AgentSessionProjectionService = class AgentSessionProjectionService extends
                 `[AgentSessionProjection] Found ${diffResources.length} files with diffs to display`
             );
             if (diffResources.length > 0) {
-                await this.editorGroupsService.applyWorkingSet("empty", {
-                    preserveFocus: true
-                });
-                await this.commandService.executeCommand("_workbench.openMultiDiffEditor", {
-                    multiDiffSourceUri: session.resource.with({
+                await this.editorService.openEditor({
+                    multiDiffSource: session.resource.with({
                         scheme: session.resource.scheme + "-agent-session-projection"
                     }),
-                    title: ( localize(5021, "{0} - All Changes", session.label)),
-                    resources: diffResources
-                });
-                this.logService.trace(`[AgentSessionProjection] Multi-diff editor opened successfully`);
+                    resources: ( diffResources.map(dr => ({
+                        original: {
+                            resource: dr.originalUri
+                        },
+                        modified: {
+                            resource: dr.modifiedUri
+                        }
+                    }))),
+                    label: ( localize(5158, "{0} - All Changes", session.label))
+                }, MODAL_GROUP);
+                this.logService.trace(
+                    `[AgentSessionProjection] Multi-diff editor opened successfully in modal view`
+                );
                 const sessionKey = ( session.resource.toString());
                 const newWorkingSet = this.editorGroupsService.saveWorkingSet(`agent-session-projection-${sessionKey}`);
                 this._sessionWorkingSets.set(sessionKey, newWorkingSet);
@@ -176,19 +183,48 @@ let AgentSessionProjectionService = class AgentSessionProjectionService extends
             this.logService.trace(
                 "[AgentSessionProjection] Session is in progress, opening chat without projection mode"
             );
+            if (this._isActive) {
+                await this.exitProjection({
+                    startNewChat: false
+                });
+            }
             await this._openSessionInChatPanel(session);
             return;
         }
         let hasUndecidedChanges = true;
+        let editingSessionExists = true;
         if (session.providerType === AgentSessionProviders.Local) {
             const editingSession = this.chatEditingService.getEditingSession(session.resource);
-            hasUndecidedChanges = editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified) ?? false;
-            if (!hasUndecidedChanges) {
-                this.logService.trace(
-                    "[AgentSessionProjection] Local session has no undecided changes, opening chat without projection mode"
-                );
+            editingSessionExists = !!editingSession;
+            if (editingSession) {
+                hasUndecidedChanges = ( editingSession.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified));
+                if (!hasUndecidedChanges) {
+                    this.logService.trace(
+                        "[AgentSessionProjection] Local session has no undecided changes, opening chat without projection mode"
+                    );
+                }
+            } else {
+                hasUndecidedChanges = false;
+                this.logService.trace("[AgentSessionProjection] Local session has no editing session yet");
             }
         }
+        if (!hasUndecidedChanges && this._isActive && editingSessionExists) {
+            this.logService.trace(
+                "[AgentSessionProjection] Switching to session without changes while in projection mode, exiting projection"
+            );
+            await this.exitProjection({
+                startNewChat: false
+            });
+            await this._openSessionInChatPanel(session);
+            return;
+        }
+        if (!hasUndecidedChanges && this._isActive && !editingSessionExists) {
+            this.logService.trace(
+                "[AgentSessionProjection] Switching to session without editing session while in projection mode, staying in projection"
+            );
+            await this._openSessionInChatPanel(session);
+            return;
+        }
         if (hasUndecidedChanges) {
             if (!this._isActive && !this._preProjectionWorkingSet) {
                 const visibleEditorsBefore = this.editorService.visibleEditors.length;
@@ -198,46 +234,49 @@ let AgentSessionProjectionService = class AgentSessionProjectionService extends
                     visibleEditorsBefore
                 });
             }
-            if (this._isActive && this._activeSession) {
+            const isSwapping = this._isActive && this._activeSession;
+            if (isSwapping) {
+                this._isSwappingSessions = true;
                 const previousSessionKey = ( this._activeSession.resource.toString());
                 const previousWorkingSet = this.editorGroupsService.saveWorkingSet(`agent-session-projection-${previousSessionKey}`);
                 this._sessionWorkingSets.set(previousSessionKey, previousWorkingSet);
             }
-            let filesOpened = false;
-            if (session.providerType === AgentSessionProviders.Local) {
-                await this.editorGroupsService.applyWorkingSet("empty", {
-                    preserveFocus: true
-                });
-                filesOpened = true;
-            } else {
-                filesOpened = await this._openSessionFiles(session);
-            }
-            if (!filesOpened) {
-                this.logService.trace(
-                    "[AgentSessionProjection] No files to display, opening chat without projection mode"
-                );
-                if (!this._isActive && this._preProjectionWorkingSet) {
-                    await this.editorGroupsService.applyWorkingSet(this._preProjectionWorkingSet);
-                    this.editorGroupsService.deleteWorkingSet(this._preProjectionWorkingSet);
-                    this._preProjectionWorkingSet = undefined;
-                }
-            } else {
-                const wasActive = this._isActive;
-                this._isActive = true;
-                this._activeSession = session;
-                this._inProjectionModeContextKey.set(true);
-                this.layoutService.mainContainer.classList.add("agent-session-projection-active");
-                if (!wasActive) {
-                    this._wasAuxiliaryBarMaximized = isAuxBarMaximized;
-                    this.logService.trace("[AgentSessionProjection] captured auxiliary bar maximized state", {
-                        wasAuxiliaryBarMaximized: this._wasAuxiliaryBarMaximized
-                    });
+            try {
+                let filesOpened = false;
+                if (session.providerType === AgentSessionProviders.Local) {
+                    filesOpened = true;
+                } else {
+                    filesOpened = await this._openSessionFiles(session);
                 }
-                this.agentTitleBarStatusService.enterSessionMode(session.resource, session.label);
-                if (!wasActive) {
-                    this._onDidChangeProjectionMode.fire(true);
+                if (!filesOpened) {
+                    this.logService.trace(
+                        "[AgentSessionProjection] No files to display, opening chat without projection mode"
+                    );
+                    if (!this._isActive && this._preProjectionWorkingSet) {
+                        await this.editorGroupsService.applyWorkingSet(this._preProjectionWorkingSet);
+                        this.editorGroupsService.deleteWorkingSet(this._preProjectionWorkingSet);
+                        this._preProjectionWorkingSet = undefined;
+                    }
+                } else {
+                    const wasActive = this._isActive;
+                    this._isActive = true;
+                    this._activeSession = session;
+                    this._inProjectionModeContextKey.set(true);
+                    this.layoutService.mainContainer.classList.add("agent-session-projection-active");
+                    if (!wasActive) {
+                        this._wasAuxiliaryBarMaximized = isAuxBarMaximized;
+                        this.logService.trace("[AgentSessionProjection] captured auxiliary bar maximized state", {
+                            wasAuxiliaryBarMaximized: this._wasAuxiliaryBarMaximized
+                        });
+                    }
+                    this.agentTitleBarStatusService.enterSessionMode(session.resource, session.label);
+                    if (!wasActive) {
+                        this._onDidChangeProjectionMode.fire(true);
+                    }
+                    this._onDidChangeActiveSession.fire(session);
                 }
-                this._onDidChangeActiveSession.fire(session);
+            } finally {
+                this._isSwappingSessions = false;
             }
         }
         await this._openSessionInChatPanel(session);

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.js

@@ -73,6 +73,12 @@ let AgentSessionReadyContribution = class AgentSessionReadyContribution extends
                 this._checkSession(currentWidget.viewModel?.sessionResource);
             }
         }));
+        this._register(this.agentSessionsService.model.onDidChangeSessions(() => {
+            const currentWidget = this.chatWidgetService.getAllWidgets().find(w => w.location === ChatAgentLocation.Chat);
+            if (currentWidget) {
+                this._checkSession(currentWidget.viewModel?.sessionResource);
+            }
+        }));
     }
     _watchWidget(widget) {
         this._widgetDisposables.clear();
@@ -85,6 +91,16 @@ let AgentSessionReadyContribution = class AgentSessionReadyContribution extends
         if (sessionResource?.toString() !== this._watchedSessionResource?.toString()) {
             this._suppressSessionReady = false;
         }
+        if (this.agentSessionProjectionService.isActive) {
+            const activeSession = this.agentSessionProjectionService.activeSession;
+            if (sessionResource && activeSession && ( sessionResource.toString()) !== ( activeSession.resource.toString())) {
+                const newSession = this.agentSessionsService.getSession(sessionResource);
+                if (newSession) {
+                    this.agentSessionProjectionService.enterProjection(newSession);
+                }
+            }
+            return;
+        }
         this._updateSessionReadyState(sessionResource);
     }
     _clearEntriesWatcher() {
@@ -101,7 +117,6 @@ let AgentSessionReadyContribution = class AgentSessionReadyContribution extends
         }
         if (this.agentSessionProjectionService.isActive) {
             this._clearEntriesWatcher();
-            this.agentTitleBarStatusService.exitSessionReadyMode();
             return;
         }
         if (!sessionResource) {
@@ -181,14 +196,14 @@ registerWorkbenchContribution2(
 );
 MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
     submenu: MenuId.AgentsTitleBarControlMenu,
-    title: ( localize(5022, "Agents")),
+    title: ( localize(5159, "Agents")),
     icon: Codicon.chatSparkle,
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`)), ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)))))),
     order: 10002
 });
 MenuRegistry.appendMenuItem(MenuId.TitleBar, {
     submenu: MenuId.ChatTitleBarMenu,
-    title: ( localize(5023, "Chat")),
+    title: ( localize(5160, "Chat")),
     group: "navigation",
     icon: Codicon.chatSparkle,
     when: ( ContextKeyExpr.and(ChatContextKeys.supported, ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabled.negate()))), ( ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`)), ( ( ContextKeyExpr.has("config.window.commandCenter")).negate()))),
@@ -197,7 +212,7 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, {
 MenuRegistry.appendMenuItem(MenuId.AgentsTitleBarControlMenu, {
     command: {
         id: "workbench.action.chat.toggle",
-        title: ( localize(5024, "Open Chat"))
+        title: ( localize(5161, "Open Chat"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`)), ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)))))),
     group: "a_open",
@@ -206,7 +221,7 @@ MenuRegistry.appendMenuItem(MenuId.AgentsTitleBarControlMenu, {
 MenuRegistry.appendMenuItem(MenuId.AgentsTitleBarControlMenu, {
     command: {
         id: `toggle.${ChatConfiguration.UnifiedAgentsBar}`,
-        title: ( localize(5025, "Agent Quick Input (Experimental)")),
+        title: ( localize(5162, "Agent Quick Input (Experimental)")),
         toggled: ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ProductQualityContext.notEqualsTo("stable")))),

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

@@ -20,6 +20,7 @@ import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/p
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 /**
  * Agent Status Widget - renders agent status in the command center.
  *
@@ -47,6 +48,7 @@ export declare class AgentTitleBarStatusWidget extends BaseActionViewItem {
     private readonly configurationService;
     private readonly chatEntitlementService;
     private readonly chatWidgetService;
+    private readonly telemetryService;
     private _container;
     private readonly _dynamicDisposables;
     /** The currently displayed in-progress session (if any) - clicking pill opens this */
@@ -63,7 +65,7 @@ export declare class AgentTitleBarStatusWidget extends BaseActionViewItem {
     private readonly _commandCenterMenu;
     /** Menu for ChatTitleBarMenu items (same as chat controls dropdown) */
     private readonly _chatTitleBarMenu;
-    constructor(action: IAction, options: IBaseActionViewItemOptions | undefined, instantiationService: IInstantiationService, agentTitleBarStatusService: IAgentTitleBarStatusService, hoverService: IHoverService, commandService: ICommandService, keybindingService: IKeybindingService, agentSessionsService: IAgentSessionsService, labelService: ILabelService, workspaceContextService: IWorkspaceContextService, environmentService: IBrowserWorkbenchEnvironmentService, editorGroupsService: IEditorGroupsService, editorService: IEditorService, menuService: IMenuService, contextKeyService: IContextKeyService, storageService: IStorageService, configurationService: IConfigurationService, chatEntitlementService: IChatEntitlementService, chatWidgetService: IChatWidgetService);
+    constructor(action: IAction, options: IBaseActionViewItemOptions | undefined, instantiationService: IInstantiationService, agentTitleBarStatusService: IAgentTitleBarStatusService, hoverService: IHoverService, commandService: ICommandService, keybindingService: IKeybindingService, agentSessionsService: IAgentSessionsService, labelService: ILabelService, workspaceContextService: IWorkspaceContextService, environmentService: IBrowserWorkbenchEnvironmentService, editorGroupsService: IEditorGroupsService, editorService: IEditorService, menuService: IMenuService, contextKeyService: IContextKeyService, storageService: IStorageService, configurationService: IConfigurationService, chatEntitlementService: IChatEntitlementService, chatWidgetService: IChatWidgetService, telemetryService: ITelemetryService);
     render(container: HTMLElement): void;
     setFocusable(_focusable: boolean): void;
     focus(): void;