@codingame/monaco-vscode-workbench-service-override 37.6.0 → 38.0.0

package/vscode/src/vs/sessions/contrib/sessions/browser/sessionsTelemetry.contribution.js

@@ -9,9 +9,12 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { TelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { isImageVariableEntry, isChatRequestFileEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { EditorChatUsage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editorChatUsage';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { getExcludes, QueryType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
 import { IAgentFeedbackService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.service';
@@ -20,12 +23,14 @@ import { SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/s
 import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { ISessionsProvidersService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsProvidersService.service';
-import { getSessionsTelemetryProviderId, hashSessionIdForTelemetry, classifySessionWorkspaceTopology } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionsTelemetry';
+import { getNonArchivedSessionListCount, getSessionsTelemetryProviderId, hashSessionIdForTelemetry, classifySessionWorkspaceTopology } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionsTelemetry';
 import { ISessionsPartService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService.service';
 import { ISessionsWindowUsageService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsWindowUsageService.service';
-import { SessionsLifecycleTracker } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/sessionsLifecycleTracker';
+import { getSessionsTelemetryCopilotSku } from './sessionsAccountTelemetry.js';
+import { SessionsLifecycleTracker } from './sessionsLifecycleTracker.js';
 import { SessionsTypedCharactersTracker } from './sessionsTypedCharactersTracker.js';
 
+const MAX_WORKSPACE_FILE_COUNT = 20_000;
 let SessionsTelemetryContribution = class SessionsTelemetryContribution extends Disposable {
     static {
         this.ID = "workbench.contrib.sessionsTelemetry";
@@ -44,7 +49,8 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         sessionsProvidersService,
         _sessionsTasksService,
         modelService,
-        sessionsWindowUsageService
+        sessionsWindowUsageService,
+        _chatEntitlementService
     ) {
         super();
         this._sessionsManagementService = _sessionsManagementService;
@@ -55,8 +61,8 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         this._searchService = _searchService;
         this._configurationService = _configurationService;
         this._sessionsTasksService = _sessionsTasksService;
-        this._workspaceFileCountCache = ( new Map());
-        this._workspaceFileCountInFlight = ( new Map());
+        this._chatEntitlementService = _chatEntitlementService;
+        this._workspaceFileCounts = ( new Map());
         this._providerReconcileListeners = this._register(( new DisposableMap()));
         this._lifecycleTracker = ( new SessionsLifecycleTracker(this._storageService, sessionsWindowUsageService.windowOpenCount));
         this._typedCharactersTracker = this._register(( new SessionsTypedCharactersTracker(
@@ -69,7 +75,7 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
             this._storageService.onWillSaveState(() => this._typedCharactersTracker.flush())
         );
         this._register(this._sessionsManagementService.onWillSendRequest(session => {
-            this._startWorkspaceFileCountFetch(session.workspace.get());
+            void this._getWorkspaceFileCount(session.workspace.get());
         }));
         this._register(
             this._sessionsManagementService.onDidSendRequest(e => this._logRequestSent(e))
@@ -83,9 +89,11 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         this._register(
             this._sessionsManagementService.onDidDeleteSession(session => this._logSessionDeleted(session))
         );
-        this._register(
-            this._sessionsManagementService.onDidDeleteChat(session => this._logChatDeleted(session))
-        );
+        this._register(this._sessionsManagementService.onDidDeleteChat((
+            {
+                session
+            }
+        ) => this._logChatDeleted(session)));
         this._register(
             this._sessionsManagementService.onDidRenameChat(session => this._logChatRenamed(session))
         );
@@ -184,6 +192,7 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
             chat,
             isNewSession,
             isNewChat,
+            newSessionConfig,
             options
         } = e;
         if (isNewChat) {
@@ -203,22 +212,26 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         }
         const allSessions = this._sessionsManagementService.getSessions();
         const visibleSessionsCount = this._sessionsService.visibleSessions.get().filter(s => s !== undefined).length;
+        const nonArchivedSessionListCount = getNonArchivedSessionListCount(allSessions);
         const workspace = session.workspace.get();
+        const isolationKind = isNewSession ? newSessionConfig?.isolation : undefined;
         const requestCounters = isNewSession ? this._lifecycleTracker.incrementAndGetUserRequestCounters(session) : this._lifecycleTracker.getUserRequestCounters(session);
         const sync = {
+            ...( new EditorChatUsage(this._storageService)).getTelemetry(),
             isNewSession,
             isNewChat,
             visibleSessionsCount,
+            nonArchivedSessionListCount,
             ...this._getRequestFields(options),
             ...this._getSessionFields(session),
             ...this._getChatFields(chat),
             ...this._getAllSessionsFields(session, allSessions),
             ...requestCounters
         };
-        void this._getOrFetchWorkspaceFileCount(session.sessionId, workspace).then(workspaceFileCount => {
+        void this._getWorkspaceFileCount(workspace).then(workspaceFileCount => {
             this._telemetryService.publicLog2("agents/requestSent", {
                 ...sync,
-                ...this._getWorkspaceFields(workspace, workspaceFileCount),
+                ...this._getWorkspaceFields(workspace, workspaceFileCount, isolationKind),
                 ...this._getWorkspaceTopologyFields(workspace)
             });
         });
@@ -479,7 +492,10 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         }
     }
     _logSessionSummary(summary) {
-        this._telemetryService.publicLog2("agents/sessionSummary", summary);
+        this._telemetryService.publicLog2("agents/sessionSummary", {
+            ...summary,
+            copilotSku: getSessionsTelemetryCopilotSku(this._chatEntitlementService)
+        });
     }
     _recordTypedCharacters(entries) {
         const deferred = [];
@@ -508,7 +524,7 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         const workspace = session.workspace.get();
         const sessionFields = this._getSessionFields(session);
         const changesFields = this._getSessionChangesFields(session);
-        return this._getOrFetchWorkspaceFileCount(session.sessionId, workspace).then(workspaceFileCount => ({
+        return this._getWorkspaceFileCount(workspace).then(workspaceFileCount => ({
             ...sessionFields,
             ...this._getWorkspaceFields(workspace, workspaceFileCount),
             ...changesFields
@@ -516,6 +532,7 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
     }
     _getSessionFields(session) {
         return {
+            copilotSku: getSessionsTelemetryCopilotSku(this._chatEntitlementService),
             agentSessionId: hashSessionIdForTelemetry(session.sessionId),
             providerId: getSessionsTelemetryProviderId(session.providerId),
             providerType: session.sessionType,
@@ -535,7 +552,7 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         let sessionFilesChanged = 0;
         let sessionLinesAdded = 0;
         let sessionLinesDeleted = 0;
-        for (const change of session.changes.get()) {
+        for (const change of session.mainChat.get().changes.get()) {
             sessionFilesChanged++;
             sessionLinesAdded += change.insertions;
             sessionLinesDeleted += change.deletions;
@@ -551,19 +568,19 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
             chatModeKind: chat.mode.get()?.kind ?? ""
         };
     }
-    _getWorkspaceFields(workspace, workspaceFileCount) {
+    _getWorkspaceFields(workspace, workspaceFileCount, isolationKind) {
+        isolationKind ??= workspace?.folders.some(folder => folder.gitRepository?.workTreeUri !== undefined) ? "worktree" : "folder";
         if (!workspace) {
             return {
-                isolationKind: "folder",
+                isolationKind,
                 workspaceHash: "",
                 hasGitRepository: false,
                 isVirtualWorkspace: false,
                 workspaceFileCount
             };
         }
-        const hasWorktree = ( workspace.folders.some(folder => folder.gitRepository?.workTreeUri !== undefined));
         return {
-            isolationKind: hasWorktree ? "worktree" : "folder",
+            isolationKind,
             workspaceHash: ( hash(( workspace.uri.toString())).toString(16)),
             hasGitRepository: ( workspace.folders.some(folder => folder.gitRepository !== undefined)),
             isVirtualWorkspace: workspace.uri.scheme !== Schemas.file,
@@ -585,52 +602,42 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
             nonGitFolderCount
         };
     }
-    _getOrFetchWorkspaceFileCount(sessionId, workspace) {
-        const cached = this._workspaceFileCountCache.get(sessionId);
-        if (cached !== undefined) {
-            return Promise.resolve(cached);
-        }
-        const pending = this._startWorkspaceFileCountFetch(workspace);
-        if (!pending) {
+    _getWorkspaceFileCount(workspace) {
+        if (!workspace || workspace.folders.length === 0 || this._telemetryService.telemetryLevel < TelemetryLevel.USAGE) {
             return Promise.resolve(-1);
         }
-        return pending.then(count => {
-            this._workspaceFileCountCache.set(sessionId, count);
-            return count;
-        });
-    }
-    _startWorkspaceFileCountFetch(workspace) {
-        if (!workspace || workspace.folders.length === 0) {
-            return undefined;
-        }
-        const workspaceKey = ( workspace.uri.toString());
-        let pending = this._workspaceFileCountInFlight.get(workspaceKey);
-        if (!pending) {
-            pending = this._computeWorkspaceFileCount(workspace).then(count => {
-                this._workspaceFileCountInFlight.delete(workspaceKey);
-                return count;
-            }, () => {
-                this._workspaceFileCountInFlight.delete(workspaceKey);
-                return -1;
-            });
-            this._workspaceFileCountInFlight.set(workspaceKey, pending);
+        const extUri = this._uriIdentityService.extUri;
+        const workspaceKey = [workspace.uri, ...workspace.folders.map(folder => folder.root)].map(uri => extUri.getComparisonKey(uri)).join("\n");
+        let count = this._workspaceFileCounts.get(workspaceKey);
+        if (!count) {
+            count = this._computeWorkspaceFileCount(workspace).catch(() => -1);
+            this._workspaceFileCounts.set(workspaceKey, count);
         }
-        return pending;
+        return count;
     }
     async _computeWorkspaceFileCount(workspace) {
         const excludePattern = getExcludes(this._configurationService.getValue({
             resource: workspace.uri
         }));
-        const result = await this._searchService.fileSearch({
-            folderQueries: workspace.folders.map(folder => ({
-                folder: folder.root,
-                disregardIgnoreFiles: false
-            })),
-            type: QueryType.File,
-            filePattern: "",
-            excludePattern
-        });
-        return result.results.length;
+        let count = 0;
+        for (const folder of workspace.folders) {
+            const maxResults = MAX_WORKSPACE_FILE_COUNT - count;
+            const result = await this._searchService.fileSearch({
+                folderQueries: [{
+                    folder: folder.root,
+                    disregardIgnoreFiles: false
+                }],
+                type: QueryType.File,
+                filePattern: "",
+                excludePattern,
+                maxResults
+            });
+            count += Math.min(result.results.length, maxResults);
+            if (count >= MAX_WORKSPACE_FILE_COUNT) {
+                break;
+            }
+        }
+        return count;
     }
     _getRequestFields(options) {
         const attachments = options.attachedContext ?? [];
@@ -689,7 +696,7 @@ let SessionsTelemetryContribution = class SessionsTelemetryContribution extends
         };
     }
 };
-SessionsTelemetryContribution = ( __decorate([( __param(0, ISessionsManagementService)), ( __param(1, ISessionsService)), ( __param(2, ITelemetryService)), ( __param(3, IUriIdentityService)), ( __param(4, IStorageService)), ( __param(5, ISearchService)), ( __param(6, IConfigurationService)), ( __param(7, ICommandService)), ( __param(8, IAgentFeedbackService)), ( __param(9, ISessionsPartService)), ( __param(10, ISessionsProvidersService)), ( __param(11, ISessionsTasksService)), ( __param(12, IModelService)), ( __param(13, ISessionsWindowUsageService))], SessionsTelemetryContribution));
+SessionsTelemetryContribution = ( __decorate([( __param(0, ISessionsManagementService)), ( __param(1, ISessionsService)), ( __param(2, ITelemetryService)), ( __param(3, IUriIdentityService)), ( __param(4, IStorageService)), ( __param(5, ISearchService)), ( __param(6, IConfigurationService)), ( __param(7, ICommandService)), ( __param(8, IAgentFeedbackService)), ( __param(9, ISessionsPartService)), ( __param(10, ISessionsProvidersService)), ( __param(11, ISessionsTasksService)), ( __param(12, IModelService)), ( __param(13, ISessionsWindowUsageService)), ( __param(14, IChatEntitlementService))], SessionsTelemetryContribution));
 function countByStatus(sessions) {
     let inProgress = 0;
     let unread = 0;

package/vscode/src/vs/sessions/contrib/sessions/browser/sessionsTitleBarWidget.d.ts

@@ -22,11 +22,11 @@ export declare function registerBlockedSessionsHeaderActions(): IDisposable;
 /** Register the commands invoked by the blocked-sessions header toolbar. */
 export declare function registerBlockedSessionsHeaderCommands(): IDisposable;
 /**
- * Sessions Title Bar Widget - renders the active chat session
+ * Sessions Title Bar Widget - renders the active chat's workspace context
  * in the command center of the agent sessions workbench.
  *
- * Shows the current chat session as a clickable pill with its workspace icon
- * and folder name when available.
+ * Shows a clickable pill with the workspace icon and folder name when available,
+ * without the session or chat title.
  *
  * When at least one session is blocked (needs input or has failing CI checks),
  * the widget instead adopts an orange "N sessions require input" state and reveals those sessions as a
@@ -92,6 +92,7 @@ export declare class SessionsTitleBarWidget extends BaseActionViewItem {
      * sessions picker.
      */
     private _renderActiveSession;
+    private _getCommandCenterTitle;
     /**
      * Render the requires-input pill. Clicking toggles a dropdown that lists the
      * blocked sessions below the command center box.
@@ -148,3 +149,4 @@ export declare class SessionsTitleBarContribution extends Disposable implements
     static readonly ID = "workbench.contrib.agentSessionsTitleBar";
     constructor(actionViewItemService: IActionViewItemService, instantiationService: IInstantiationService, logService: ILogService);
 }
+export declare function registerSessionsTitleBarMenus(): IDisposable;

package/vscode/src/vs/sessions/contrib/sessions/browser/sessionsTitleBarWidget.js

@@ -4,6 +4,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as sessionsTitleBarWidget from './media/sessionsTitleBarWidget.css';
 import { reset, $, addDisposableGenericMouseDownListener, addDisposableListener, EventType, isAncestor, getDomNodePagePosition, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { combinedDisposable, DisposableStore, MutableDisposable, toDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
@@ -37,6 +38,7 @@ import { BlockedSessionsIndicatorModel } from './blockedSessionsIndicatorModel.j
 import { getSessionWorkspaceDisplayInfo } from '../../../browser/sessionWorkspace.js';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { isAgentHostProvider } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/agentHostSessionsProvider';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(sessionsTitleBarWidget, 1);
@@ -47,7 +49,7 @@ function registerBlockedSessionsHeaderActions() {
     return combinedDisposable(MenuRegistry.appendMenuItem(Menus.BlockedSessionsHeader, {
         command: {
             id: SHOW_ALL_SESSIONS_FROM_BLOCKED_LIST_COMMAND_ID,
-            title: ( localize(4712, "Show All Sessions")),
+            title: ( localize(5877, "Show All Sessions")),
             icon: Codicon.listSelection
         },
         group: "navigation",
@@ -55,7 +57,7 @@ function registerBlockedSessionsHeaderActions() {
     }), MenuRegistry.appendMenuItem(Menus.BlockedSessionsHeader, {
         command: {
             id: IGNORE_ALL_INPUT_NEEDED_COMMAND_ID,
-            title: ( localize(4713, "Ignore All Input Needed")),
+            title: ( localize(5878, "Ignore All Needs Attention Alerts")),
             icon: Codicon.bellSlash
         },
         group: "navigation",
@@ -63,7 +65,7 @@ function registerBlockedSessionsHeaderActions() {
     }), MenuRegistry.appendMenuItem(Menus.BlockedSessionsHeader, {
         command: {
             id: HIDE_BLOCKED_SESSIONS_COMMAND_ID,
-            title: ( localize(4714, "Close")),
+            title: ( localize(5879, "Close")),
             icon: Codicon.close
         },
         group: "z_close",
@@ -140,7 +142,10 @@ let SessionsTitleBarWidget = class SessionsTitleBarWidget extends BaseActionView
             }
             this._render();
         }));
-        this._register(this.sessionsManagementService.onDidChangeSessions(() => {
+        this._register(Event.any(
+            this.sessionsManagementService.onDidChangeSessions,
+            this.sessionsManagementService.onDidChangeSessionTypes
+        )(() => {
             this._lastRenderState = undefined;
             this._render();
         }));
@@ -180,7 +185,7 @@ let SessionsTitleBarWidget = class SessionsTitleBarWidget extends BaseActionView
             } else if (showRequiresInput) {
                 renderState = `blocked|${blockedCount}|${requiresInputKind ?? "mixed"}`;
             } else {
-                renderState = `normal|${this._workspaceInfo?.icon.id ?? ""}|${this._workspaceInfo?.label ?? ""}|${this._isQuickChat}`;
+                renderState = `normal|${this._workspaceInfo?.icon.id ?? ""}|${this._getCommandCenterTitle() ?? ""}|${this._workspaceInfo?.branch ?? ""}|${this._isQuickChat}`;
             }
             if (this._lastRenderState === renderState) {
                 return;
@@ -212,44 +217,59 @@ let SessionsTitleBarWidget = class SessionsTitleBarWidget extends BaseActionView
     }
     _renderActiveSession() {
         const container = this._container;
-        container.setAttribute("aria-label", this._sessionTitle ? ( localize(4715, "Show Sessions: {0}", this._sessionTitle)) : ( localize(4716, "Show Sessions")));
+        const contextTitle = this._getCommandCenterTitle();
         const workspaceInfo = this._workspaceInfo;
+        const accessibleTitleWithBranch = contextTitle && workspaceInfo?.branch ? ( localize(5880, "{0}, branch {1}", contextTitle, workspaceInfo.branch)) : contextTitle;
+        container.setAttribute("aria-label", accessibleTitleWithBranch ? ( localize(5881, "Show Sessions: {0}", accessibleTitleWithBranch)) : ( localize(5882, "Show Sessions")));
         const sessionPill = $("div.agent-sessions-titlebar-pill");
         const centerGroup = $("div.agent-sessions-titlebar-center");
-        if (workspaceInfo) {
-            const workspaceIconEl = $(
-                `div.agent-sessions-titlebar-workspace-icon${ThemeIcon.asCSSSelector(workspaceInfo.icon)}`,
-                {
-                    "aria-hidden": "true"
-                }
-            );
-            centerGroup.appendChild(workspaceIconEl);
+        if (contextTitle) {
+            const workspaceGroup = $("div.agent-sessions-titlebar-workspace-group");
+            if (workspaceInfo) {
+                const workspaceIconEl = $(
+                    `div.agent-sessions-titlebar-workspace-icon${ThemeIcon.asCSSSelector(workspaceInfo.icon)}`,
+                    {
+                        "aria-hidden": "true"
+                    }
+                );
+                workspaceGroup.appendChild(workspaceIconEl);
+            } else if (this._isQuickChat) {
+                const workspaceIconEl = $(
+                    `div.agent-sessions-titlebar-workspace-icon${ThemeIcon.asCSSSelector(Codicon.commentDiscussion)}`,
+                    {
+                        "aria-hidden": "true"
+                    }
+                );
+                workspaceGroup.appendChild(workspaceIconEl);
+            }
             const workspaceEl = $("div.agent-sessions-titlebar-workspace");
-            workspaceEl.textContent = this._sessionTitle ?? workspaceInfo.label;
-            centerGroup.appendChild(workspaceEl);
+            workspaceEl.textContent = contextTitle;
+            workspaceGroup.appendChild(workspaceEl);
+            centerGroup.appendChild(workspaceGroup);
             this._dynamicDisposables.add(this.hoverService.setupDelayedHover(workspaceEl, {
-                content: workspaceEl.textContent
+                content: contextTitle
             }));
-        } else if (this._isQuickChat) {
-            const workspaceIconEl = $(
-                `div.agent-sessions-titlebar-workspace-icon${ThemeIcon.asCSSSelector(Codicon.commentDiscussion)}`,
+        }
+        if (workspaceInfo?.branch) {
+            const separatorEl = $("span.agent-sessions-titlebar-separator", {
+                "aria-hidden": "true"
+            });
+            separatorEl.textContent = "·";
+            centerGroup.appendChild(separatorEl);
+            const branchGroup = $("div.agent-sessions-titlebar-branch-group");
+            const branchIconEl = $(
+                `div.agent-sessions-titlebar-branch-icon${ThemeIcon.asCSSSelector(Codicon.gitBranchCompact)}`,
                 {
                     "aria-hidden": "true"
                 }
             );
-            centerGroup.appendChild(workspaceIconEl);
-            const workspaceEl = $("div.agent-sessions-titlebar-workspace");
-            workspaceEl.textContent = this._sessionTitle ?? ( localize(4717, "No workspace"));
-            centerGroup.appendChild(workspaceEl);
-            this._dynamicDisposables.add(this.hoverService.setupDelayedHover(workspaceEl, {
-                content: workspaceEl.textContent
-            }));
-        } else if (this._sessionTitle) {
-            const titleElement = $("div.agent-sessions-titlebar-workspace");
-            titleElement.textContent = this._sessionTitle;
-            centerGroup.appendChild(titleElement);
-            this._dynamicDisposables.add(this.hoverService.setupDelayedHover(titleElement, {
-                content: this._sessionTitle
+            branchGroup.appendChild(branchIconEl);
+            const branchEl = $("div.agent-sessions-titlebar-branch");
+            branchEl.textContent = workspaceInfo.branch;
+            branchGroup.appendChild(branchEl);
+            centerGroup.appendChild(branchGroup);
+            this._dynamicDisposables.add(this.hoverService.setupDelayedHover(branchEl, {
+                content: workspaceInfo.branch
             }));
         }
         sessionPill.appendChild(centerGroup);
@@ -271,6 +291,15 @@ let SessionsTitleBarWidget = class SessionsTitleBarWidget extends BaseActionView
             }
         }));
     }
+    _getCommandCenterTitle() {
+        const title = this._sessionTitle ?? this._workspaceInfo?.label;
+        if (title || !this._isQuickChat) {
+            return title;
+        }
+        const session = this.sessionsService.activeSession.get();
+        const provider = session ? this.sessionsProvidersService.getProvider(session.providerId) : undefined;
+        return provider && isAgentHostProvider(provider) && provider.remoteAddress ? ( localize(5883, "No workspace [{0}]", provider.label)) : ( localize(5884, "No workspace"));
+    }
     _renderRequiresInput(count, kind, shouldBlink) {
         const container = this._container;
         const label = this._blockedIndicator.getRequiresInputLabel(count, kind);
@@ -302,7 +331,7 @@ let SessionsTitleBarWidget = class SessionsTitleBarWidget extends BaseActionView
     }
     _renderApproved(count) {
         const container = this._container;
-        const label = count === 1 ? ( localize(4718, "Approved 1 session")) : ( localize(4719, "Approved {0} sessions", count));
+        const label = count === 1 ? ( localize(5885, "Approved 1 session")) : ( localize(5886, "Approved {0} sessions", count));
         container.setAttribute("aria-label", label);
         const pill = $("div.agent-sessions-titlebar-pill");
         const labelEl = $("div.agent-sessions-titlebar-approved-label");
@@ -445,7 +474,8 @@ let SessionsTitleBarWidget = class SessionsTitleBarWidget extends BaseActionView
             if (session) {
                 this.sessionsService.openSessionToSide(session, {
                     preserveFocus,
-                    source: "sessionsList"
+                    source: "sessionsList",
+                    forceMainChat: true
                 }).catch(onUnexpectedError);
                 return;
             }
@@ -473,21 +503,7 @@ let SessionsTitleBarContribution = class SessionsTitleBarContribution extends Di
             undefined,
             undefined
         ));
-        this._register(MenuRegistry.appendMenuItem(Menus.CommandCenter, {
-            submenu: Menus.TitleBarSessionTitle,
-            title: ( localize(4720, "Agent Sessions")),
-            order: 101,
-            when: ( ContextKeyExpr.and(( IsAuxiliaryWindowContext.negate()), ( SessionsWelcomeVisibleContext.negate())))
-        }));
-        this._register(MenuRegistry.appendMenuItem(Menus.TitleBarSessionTitle, {
-            command: {
-                id: SHOW_SESSIONS_PICKER_COMMAND_ID,
-                title: ( localize(4721, "Show Sessions"))
-            },
-            group: "a_sessions",
-            order: 1,
-            when: ( IsAuxiliaryWindowContext.negate())
-        }));
+        this._register(registerSessionsTitleBarMenus());
         this._register(registerBlockedSessionsHeaderCommands());
         this._register(registerBlockedSessionsHeaderActions());
         this._register(registerBlockedSessionsItemActions());
@@ -509,6 +525,22 @@ let SessionsTitleBarContribution = class SessionsTitleBarContribution extends Di
     }
 };
 SessionsTitleBarContribution = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IInstantiationService)), ( __param(2, ILogService))], SessionsTitleBarContribution));
+function registerSessionsTitleBarMenus() {
+    return combinedDisposable(MenuRegistry.appendMenuItem(Menus.CommandCenter, {
+        submenu: Menus.TitleBarSessionTitle,
+        title: ( localize(5887, "Agent Sessions")),
+        order: 101,
+        when: ( ContextKeyExpr.and(( IsAuxiliaryWindowContext.negate()), ( SessionsWelcomeVisibleContext.negate())))
+    }), MenuRegistry.appendMenuItem(Menus.TitleBarSessionTitle, {
+        command: {
+            id: SHOW_SESSIONS_PICKER_COMMAND_ID,
+            title: ( localize(5888, "Show Sessions"))
+        },
+        group: "a_sessions",
+        order: 1,
+        when: ( IsAuxiliaryWindowContext.negate())
+    }));
+}
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: HIDE_BLOCKED_SESSIONS_COMMAND_ID,
     weight: KeybindingWeight.SessionsContrib + 100,
@@ -523,4 +555,4 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 
-export { SessionsTitleBarContribution, SessionsTitleBarWidget, registerBlockedSessionsHeaderActions, registerBlockedSessionsHeaderCommands };
+export { SessionsTitleBarContribution, SessionsTitleBarWidget, registerBlockedSessionsHeaderActions, registerBlockedSessionsHeaderCommands, registerSessionsTitleBarMenus };

package/vscode/src/vs/sessions/contrib/sessions/browser/sessionsWindowNotifier.d.ts

@@ -5,6 +5,7 @@ import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
+import { ISessionComparisonService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionComparison.service";
 import { ISessionsManagementService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service";
 export declare class SessionsWindowNotifier extends Disposable implements IWorkbenchContribution {
     private readonly _sessionsManagementService;
@@ -13,10 +14,11 @@ export declare class SessionsWindowNotifier extends Disposable implements IWorkb
     private readonly _configurationService;
     private readonly _chatService;
     private readonly _chatWidgetService;
+    private readonly _sessionComparisonService;
     static readonly ID = "workbench.contrib.sessionsWindowNotifier";
     private readonly _statusListeners;
     private readonly _activeNotifications;
-    constructor(_sessionsManagementService: ISessionsManagementService, _sessionsService: ISessionsService, _hostService: IHostService, _configurationService: IConfigurationService, _chatService: IChatService, _chatWidgetService: IChatWidgetService);
+    constructor(_sessionsManagementService: ISessionsManagementService, _sessionsService: ISessionsService, _hostService: IHostService, _configurationService: IConfigurationService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _sessionComparisonService: ISessionComparisonService);
     /**
      * Delay before a completed session is announced, to swallow the brief idle
      * gap between a turn ending and the next queued turn starting. A method
@@ -31,6 +33,8 @@ export declare class SessionsWindowNotifier extends Disposable implements IWorkb
     protected _getBackgroundNotificationDelay(): number;
     private _trackSession;
     private _notify;
+    private _isCoveredByChatNotifier;
+    private _shouldNotifyForInactivePane;
     private _getNotificationBody;
     private _sanitizeOSToastText;
     private _clearNotification;