@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -3,7 +3,7 @@ import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IOpenEvent } from "@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService";
 import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
-import { AgentSessionListItem, IAgentSessionsFilter, IAgentSessionsSorterOptions } from "./agentSessionsViewer.js";
+import { AgentSessionListItem, IAgentSessionsFilter } from "./agentSessionsViewer.js";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
@@ -19,12 +19,12 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ISessionOpenOptions } from "./agentSessionsOpener.js";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-export interface IAgentSessionsControlOptions extends IAgentSessionsSorterOptions {
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+export interface IAgentSessionsControlOptions {
     readonly overrideStyles: IStyleOverride<IListStyles>;
     readonly filter: IAgentSessionsFilter;
     readonly source: string;
     readonly disableHover?: boolean;
-    readonly showIsolationIcon?: boolean;
     readonly enableApprovalRow?: boolean;
     getHoverPosition(): HoverPosition;
     trackActiveEditorSession(): boolean;
@@ -45,34 +45,46 @@ export declare class AgentSessionsControl extends Disposable implements IAgentSe
     private readonly agentSessionsService;
     private readonly telemetryService;
     private readonly editorService;
+    private readonly storageService;
     private sessionsContainer;
     get element(): HTMLElement | undefined;
     private emptyFilterMessage;
     private sessionsList;
+    private static readonly RECENT_SESSIONS_FOR_EXPAND;
     private sessionsListFindIsOpen;
+    private _isProgrammaticCollapseChange;
+    private readonly _recentRepositoryLabels;
     private readonly updateSessionsListThrottler;
     private readonly _onDidUpdate;
     readonly onDidUpdate: Event<void>;
     private visible;
     private focusedAgentSessionArchivedContextKey;
+    private focusedAgentSessionPinnedContextKey;
     private focusedAgentSessionReadContextKey;
     private focusedAgentSessionTypeContextKey;
     private hasMultipleAgentSessionsSelectedContextKey;
-    constructor(container: HTMLElement, options: IAgentSessionsControlOptions, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, commandService: ICommandService, menuService: IMenuService, agentSessionsService: IAgentSessionsService, telemetryService: ITelemetryService, editorService: IEditorService);
+    constructor(container: HTMLElement, options: IAgentSessionsControlOptions, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatSessionsService: IChatSessionsService, commandService: ICommandService, menuService: IMenuService, agentSessionsService: IAgentSessionsService, telemetryService: ITelemetryService, editorService: IEditorService, storageService: IStorageService);
     private registerListeners;
     private revealAndFocusActiveEditorSession;
     private create;
     private createEmptyFilterMessage;
+    private static readonly SECTION_COLLAPSE_STATE_KEY;
+    private getSavedCollapseState;
+    private saveSectionCollapseState;
+    resetSectionCollapseState(): void;
     private createList;
     private updateEmpty;
     private hasTodaySessions;
+    private computeRecentRepositoryLabels;
     private openAgentSession;
     private showContextMenu;
     private showAgentSessionSectionContextMenu;
     private showAgentSessionContextMenu;
     openFind(): void;
     private updateSectionCollapseStates;
+    private _updateSectionCollapseStatesCore;
     refresh(): Promise<void>;
+    collapseAllSections(): void;
     update(): Promise<void>;
     setVisible(visible: boolean): void;
     layout(height: number, width: number): void;

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

@@ -10,7 +10,8 @@ import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/ba
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isAgentSessionSection, AgentSessionSection, isAgentSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
-import { AgentSessionsSorter, AgentSessionRenderer, AgentSessionsDataSource, AgentSessionsListDelegate, AgentSessionsCompressionDelegate, AgentSessionSectionRenderer, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsIdentityProvider, AgentSessionsDragAndDrop, AgentSessionsAccessibilityProvider } from './agentSessionsViewer.js';
+import { AgentSessionsSorter, AgentSessionRenderer, AgentSessionsDataSource, AgentSessionsListDelegate, AgentSessionsCompressionDelegate, AgentSessionSectionRenderer, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsIdentityProvider, AgentSessionsDragAndDrop, AgentSessionsAccessibilityProvider, getRepositoryName, AgentSessionSectionLabels } from './agentSessionsViewer.js';
+import { AgentSessionsSorting, AgentSessionsGrouping } from './agentSessionsFilter.js';
 import { AgentSessionApprovalModel } from './agentSessionApprovalModel.js';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -20,20 +21,30 @@ import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { RenderIndentGuides, TreeFindMode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/abstractTree';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { getAgentSessionTime } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { openSession } from './agentSessionsOpener.js';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
+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';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
+var AgentSessionsControl_1;
 let AgentSessionsControl = class AgentSessionsControl extends Disposable {
+    static {
+        AgentSessionsControl_1 = this;
+    }
     get element() {
         return this.sessionsContainer;
     }
+    static {
+        this.RECENT_SESSIONS_FOR_EXPAND = 5;
+    }
     constructor(
         container,
         options,
@@ -45,7 +56,8 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         menuService,
         agentSessionsService,
         telemetryService,
-        editorService
+        editorService,
+        storageService
     ) {
         super();
         this.container = container;
@@ -59,12 +71,16 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         this.agentSessionsService = agentSessionsService;
         this.telemetryService = telemetryService;
         this.editorService = editorService;
+        this.storageService = storageService;
         this.sessionsListFindIsOpen = false;
+        this._isProgrammaticCollapseChange = false;
+        this._recentRepositoryLabels = ( new Set());
         this.updateSessionsListThrottler = this._register(( new Throttler()));
         this._onDidUpdate = this._register(( new Emitter()));
         this.onDidUpdate = this._onDidUpdate.event;
         this.visible = true;
         this.focusedAgentSessionArchivedContextKey = ChatContextKeys.isArchivedAgentSession.bindTo(this.contextKeyService);
+        this.focusedAgentSessionPinnedContextKey = ChatContextKeys.isPinnedAgentSession.bindTo(this.contextKeyService);
         this.focusedAgentSessionReadContextKey = ChatContextKeys.isReadAgentSession.bindTo(this.contextKeyService);
         this.focusedAgentSessionTypeContextKey = ChatContextKeys.agentSessionType.bindTo(this.contextKeyService);
         this.hasMultipleAgentSessionsSelectedContextKey = ChatContextKeys.hasMultipleAgentSessionsSelected.bindTo(this.contextKeyService);
@@ -103,9 +119,9 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         this.emptyFilterMessage = append(container, $(".agent-sessions-empty-filter-message"));
         hide(this.emptyFilterMessage);
         const span = append(this.emptyFilterMessage, $("span"));
-        span.textContent = `${( localize(5109, "No matching sessions"))} - `;
+        span.textContent = `${( localize(5154, "No matching sessions"))} - `;
         const link = append(this.emptyFilterMessage, $("span.reset-filter-link"));
-        link.textContent = ( localize(5110, "Reset Filter"));
+        link.textContent = ( localize(5155, "Reset Filter"));
         link.tabIndex = 0;
         link.setAttribute("role", "button");
         this._register(
@@ -119,9 +135,50 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
             }
         }));
     }
+    static {
+        this.SECTION_COLLAPSE_STATE_KEY = "agentSessions.sectionCollapseState";
+    }
+    getSavedCollapseState(section) {
+        const raw = this.storageService.get(AgentSessionsControl_1.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+        if (raw) {
+            try {
+                const state = JSON.parse(raw);
+                if (typeof state[section] === "boolean") {
+                    return state[section];
+                }
+            } catch {}
+        }
+        return undefined;
+    }
+    saveSectionCollapseState(section, collapsed) {
+        let state = {};
+        const raw = this.storageService.get(AgentSessionsControl_1.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+        if (raw) {
+            try {
+                const parsed = JSON.parse(raw);
+                if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+                    state = parsed;
+                }
+            } catch {}
+        }
+        state[section] = collapsed;
+        this.storageService.store(
+            AgentSessionsControl_1.SECTION_COLLAPSE_STATE_KEY,
+            JSON.stringify(state),
+            StorageScope.PROFILE,
+            StorageTarget.USER
+        );
+    }
+    resetSectionCollapseState() {
+        this.storageService.remove(AgentSessionsControl_1.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+    }
     createList(container) {
         const collapseByDefault = element => {
             if (isAgentSessionSection(element)) {
+                const saved = this.getSavedCollapseState(element.section);
+                if (saved !== undefined) {
+                    return saved;
+                }
                 if (element.section === AgentSessionSection.More && !this.options.filter.getExcludes().read) {
                     return true;
                 }
@@ -140,15 +197,21 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
                     if (element.section === AgentSessionSection.Yesterday && this.hasTodaySessions()) {
                         return true;
                     }
+                    if (element.section === AgentSessionSection.Repository && !( this._recentRepositoryLabels.has(element.label))) {
+                        return true;
+                    }
                 }
             }
             return false;
         };
-        const sorter = ( new AgentSessionsSorter(this.options));
+        const sorter = ( new AgentSessionsSorter(() => this.options.filter.sortResults?.() ?? AgentSessionsSorting.Created));
         const approvalModel = this.options.enableApprovalRow ? this._register(this.instantiationService.createInstance(AgentSessionApprovalModel)) : undefined;
-        const sessionRenderer = this._register(
-            this.instantiationService.createInstance(AgentSessionRenderer, this.options, approvalModel)
-        );
+        const activeSessionResource = observableValue(this, undefined);
+        const sessionRenderer = this._register(this.instantiationService.createInstance(AgentSessionRenderer, {
+            ...this.options,
+            isGroupedByRepository: () => this.options.filter.groupResults?.() === AgentSessionsGrouping.Repository,
+            isSortedByUpdated: () => this.options.filter.sortResults?.() === AgentSessionsSorting.Updated
+        }, approvalModel, activeSessionResource));
         const sessionFilter = this._register(( new AgentSessionsDataSource(this.options.filter, sorter)));
         const list = this.sessionsList = this._register(this.instantiationService.createInstance(
             WorkbenchCompressibleAsyncDataTree,
@@ -197,6 +260,7 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
                 this.update();
             }
         }));
+        this.computeRecentRepositoryLabels();
         list.setInput(model);
         this._register(list.onDidOpen(e => this.openAgentSession(e)));
         this._register(list.onContextMenu(e => this.showContextMenu(e)));
@@ -217,12 +281,16 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
             const focused = list.getFocus().at(0);
             if (focused && isAgentSession(focused)) {
                 this.focusedAgentSessionArchivedContextKey.set(focused.isArchived());
+                this.focusedAgentSessionPinnedContextKey.set(focused.isPinned());
                 this.focusedAgentSessionReadContextKey.set(focused.isRead());
                 this.focusedAgentSessionTypeContextKey.set(focused.providerType);
+                activeSessionResource.set(focused.resource, undefined);
             } else {
                 this.focusedAgentSessionArchivedContextKey.reset();
+                this.focusedAgentSessionPinnedContextKey.reset();
                 this.focusedAgentSessionReadContextKey.reset();
                 this.focusedAgentSessionTypeContextKey.reset();
+                activeSessionResource.set(undefined, undefined);
             }
             const selection = list.getSelection().filter(isAgentSession);
             this.hasMultipleAgentSessionsSelectedContextKey.set(selection.length > 1);
@@ -231,6 +299,15 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
             this.sessionsListFindIsOpen = open;
             this.updateSectionCollapseStates();
         }));
+        this._register(list.onDidChangeCollapseState(e => {
+            if (this._isProgrammaticCollapseChange) {
+                return;
+            }
+            const element = e.node.element?.element;
+            if (element && isAgentSessionSection(element)) {
+                this.saveSectionCollapseState(element.section, e.node.collapsed);
+            }
+        }));
     }
     updateEmpty(isEmpty) {
         if (!this.emptyFilterMessage || !this.sessionsList) {
@@ -245,9 +322,15 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
     }
     hasTodaySessions() {
         const startOfToday = ( new Date()).setHours(0, 0, 0, 0);
-        return ( this.agentSessionsService.model.sessions.some(
-            session => !session.isArchived() && getAgentSessionTime(session.timing) >= startOfToday
-        ));
+        return ( this.agentSessionsService.model.sessions.some(session => !session.isArchived() && session.timing.created >= startOfToday));
+    }
+    computeRecentRepositoryLabels() {
+        this._recentRepositoryLabels.clear();
+        const sessions = this.agentSessionsService.model.sessions.filter(s => !s.isArchived() && !s.isPinned()).sort((a, b) => b.timing.created - a.timing.created).slice(0, AgentSessionsControl_1.RECENT_SESSIONS_FOR_EXPAND);
+        for (const session of sessions) {
+            const name = getRepositoryName(session);
+            this._recentRepositoryLabels.add(name ?? AgentSessionSectionLabels[AgentSessionSection.Repository]);
+        }
     }
     async openAgentSession(e) {
         const element = e.element;
@@ -298,7 +381,7 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
                 shouldForwardArgs: true
             }).map(([, actions]) => actions))),
             getAnchor: () => anchor,
-            getActionsContext: () => section
+            getActionsContext: () => this
         });
         menu.dispose();
     }
@@ -306,6 +389,7 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         this.chatSessionsService.activateChatSessionItemProvider(session.providerType);
         const contextOverlay = [];
         contextOverlay.push([ChatContextKeys.isArchivedAgentSession.key, session.isArchived()]);
+        contextOverlay.push([ChatContextKeys.isPinnedAgentSession.key, session.isPinned()]);
         contextOverlay.push([ChatContextKeys.isReadAgentSession.key, session.isRead()]);
         contextOverlay.push([ChatContextKeys.agentSessionType.key, session.providerType]);
         const menu = this.menuService.createMenu(
@@ -332,6 +416,17 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         this.sessionsList?.openFind();
     }
     updateSectionCollapseStates() {
+        if (!this.sessionsList) {
+            return;
+        }
+        this._isProgrammaticCollapseChange = true;
+        try {
+            this._updateSectionCollapseStatesCore();
+        } finally {
+            this._isProgrammaticCollapseChange = false;
+        }
+    }
+    _updateSectionCollapseStatesCore() {
         if (!this.sessionsList) {
             return;
         }
@@ -365,8 +460,20 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
     refresh() {
         return this.agentSessionsService.model.resolve(undefined);
     }
+    collapseAllSections() {
+        if (!this.sessionsList) {
+            return;
+        }
+        const model = this.agentSessionsService.model;
+        for (const child of this.sessionsList.getNode(model).children) {
+            if (isAgentSessionSection(child.element) && !child.collapsed) {
+                this.sessionsList.collapse(child.element);
+            }
+        }
+    }
     async update() {
         return this.updateSessionsListThrottler.queue(async () => {
+            this.computeRecentRepositoryLabels();
             await this.sessionsList?.updateChildren();
             this._onDidUpdate.fire();
         });
@@ -418,6 +525,6 @@ let AgentSessionsControl = class AgentSessionsControl extends Disposable {
         return true;
     }
 };
-AgentSessionsControl = ( __decorate([( __param(2, IContextMenuService)), ( __param(3, IContextKeyService)), ( __param(4, IInstantiationService)), ( __param(5, IChatSessionsService)), ( __param(6, ICommandService)), ( __param(7, IMenuService)), ( __param(8, IAgentSessionsService)), ( __param(9, ITelemetryService)), ( __param(10, IEditorService))], AgentSessionsControl));
+AgentSessionsControl = AgentSessionsControl_1 = ( __decorate([( __param(2, IContextMenuService)), ( __param(3, IContextKeyService)), ( __param(4, IInstantiationService)), ( __param(5, IChatSessionsService)), ( __param(6, ICommandService)), ( __param(7, IMenuService)), ( __param(8, IAgentSessionsService)), ( __param(9, ITelemetryService)), ( __param(10, IEditorService)), ( __param(11, IStorageService))], AgentSessionsControl));
 
 export { AgentSessionsControl };

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

@@ -7,7 +7,12 @@ import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { IAgentSessionsFilter, IAgentSessionsFilterExcludes } from "./agentSessionsViewer.js";
 export declare enum AgentSessionsGrouping {
     Capped = "capped",
-    Date = "date"
+    Date = "date",
+    Repository = "repository"
+}
+export declare enum AgentSessionsSorting {
+    Created = "created",
+    Updated = "updated"
 }
 export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilter> {
     readonly filterMenuId?: MenuId;
@@ -24,6 +29,7 @@ export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilte
     readonly limitResults?: () => number | undefined;
     notifyResults?(count: number): void;
     readonly groupResults?: () => AgentSessionsGrouping | undefined;
+    readonly sortResults?: () => AgentSessionsSorting | undefined;
     overrideExclude?(session: IAgentSession): boolean | undefined;
 }
 export declare class AgentSessionsFilter extends Disposable implements Required<IAgentSessionsFilter> {
@@ -35,6 +41,7 @@ export declare class AgentSessionsFilter extends Disposable implements Required<
     readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     readonly limitResults: () => number | undefined;
     readonly groupResults: () => AgentSessionsGrouping | undefined;
+    readonly sortResults: () => AgentSessionsSorting | undefined;
     private excludes;
     private isStoringExcludes;
     private readonly actionDisposables;

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

@@ -17,7 +17,13 @@ var AgentSessionsGrouping;
 (function(AgentSessionsGrouping) {
     AgentSessionsGrouping["Capped"] = "capped";
     AgentSessionsGrouping["Date"] = "date";
+    AgentSessionsGrouping["Repository"] = "repository";
 })(AgentSessionsGrouping || (AgentSessionsGrouping = {}));
+var AgentSessionsSorting;
+(function(AgentSessionsSorting) {
+    AgentSessionsSorting["Created"] = "created";
+    AgentSessionsSorting["Updated"] = "updated";
+})(AgentSessionsSorting || (AgentSessionsSorting = {}));
 const DEFAULT_EXCLUDES = ( Object.freeze({
     providers: [],
     states: [],
@@ -35,6 +41,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
         this.onDidChange = this._onDidChange.event;
         this.limitResults = () => this.options.limitResults?.();
         this.groupResults = () => this.options.groupResults?.();
+        this.sortResults = () => this.options.sortResults?.();
         this.excludes = DEFAULT_EXCLUDES;
         this.isStoringExcludes = false;
         this.actionDisposables = this._register(( new DisposableStore()));
@@ -166,16 +173,16 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
     registerStateActions(disposables, menuId) {
         const states = [{
             id: ChatSessionStatus.Completed,
-            label: ( localize(5111, "Completed"))
+            label: ( localize(5156, "Completed"))
         }, {
             id: ChatSessionStatus.InProgress,
-            label: ( localize(5112, "In Progress"))
+            label: ( localize(5157, "In Progress"))
         }, {
             id: ChatSessionStatus.NeedsInput,
-            label: ( localize(5113, "Input Needed"))
+            label: ( localize(5158, "Input Needed"))
         }, {
             id: ChatSessionStatus.Failed,
-            label: ( localize(5114, "Failed"))
+            label: ( localize(5159, "Failed"))
         }];
         const that = this;
         let counter = 0;
@@ -212,7 +219,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             constructor() {
                 super({
                     id: `agentSessions.filter.toggleExcludeArchived.${menuId.id.toLowerCase()}`,
-                    title: ( localize(5115, "Archived")),
+                    title: ( localize(5160, "Archived")),
                     menu: {
                         id: menuId,
                         group: "3_props",
@@ -235,7 +242,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             constructor() {
                 super({
                     id: `agentSessions.filter.toggleExcludeRead.${menuId.id.toLowerCase()}`,
-                    title: ( localize(5116, "Read")),
+                    title: ( localize(5161, "Read")),
                     menu: {
                         id: menuId,
                         group: "3_props",
@@ -258,7 +265,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             constructor() {
                 super({
                     id: `agentSessions.filter.resetExcludes.${menuId.id.toLowerCase()}`,
-                    title: ( localize(5117, "Reset")),
+                    title: ( localize(5162, "Reset")),
                     menu: {
                         id: menuId,
                         group: "4_reset",
@@ -310,4 +317,4 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
 };
 AgentSessionsFilter = ( __decorate([( __param(1, IChatSessionsService)), ( __param(2, IStorageService))], AgentSessionsFilter));
 
-export { AgentSessionsFilter, AgentSessionsGrouping };
+export { AgentSessionsFilter, AgentSessionsGrouping, AgentSessionsSorting };

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

@@ -81,7 +81,7 @@ async function openSessionDefault(accessor, session, openOptions) {
         }
         return await chatWidgetService.openSession(session.resource, target, options);
     } catch (error) {
-        notificationService.error(( localize(5119, "Failed to open chat session: {0}", toErrorMessage(error))));
+        notificationService.error(( localize(5164, "Failed to open chat session: {0}", toErrorMessage(error))));
         return undefined;
     }
 }

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

@@ -19,7 +19,9 @@ import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { MenuWorkbenchToolBar } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { AgentSessionsGrouping } from "./agentSessionsFilter.js";
+import { AgentSessionsGrouping, AgentSessionsSorting } from "./agentSessionsFilter.js";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { AgentSessionApprovalModel } from "./agentSessionApprovalModel.js";
 export type AgentSessionListItem = IAgentSession | IAgentSessionSection;
 interface IAgentSessionItemTemplate {
@@ -27,7 +29,6 @@ interface IAgentSessionItemTemplate {
     readonly icon: HTMLElement;
     readonly title: IconLabel;
     readonly statusContainer: HTMLElement;
-    readonly statusProviderIcon: HTMLElement;
     readonly statusTime: HTMLElement;
     readonly titleToolbar: MenuWorkbenchToolBar;
     readonly diffContainer: HTMLElement;
@@ -45,12 +46,14 @@ interface IAgentSessionItemTemplate {
 }
 export interface IAgentSessionRendererOptions {
     readonly disableHover?: boolean;
-    readonly showIsolationIcon?: boolean;
     getHoverPosition(): HoverPosition;
+    isGroupedByRepository?(): boolean;
+    isSortedByUpdated?(): boolean;
 }
 export declare class AgentSessionRenderer extends Disposable implements ICompressibleTreeRenderer<IAgentSession, FuzzyScore, IAgentSessionItemTemplate> {
     private readonly options;
     private readonly _approvalModel;
+    private readonly _activeSessionResource;
     private readonly markdownRendererService;
     private readonly productService;
     private readonly hoverService;
@@ -65,10 +68,11 @@ export declare class AgentSessionRenderer extends Disposable implements ICompres
     private readonly sessionHover;
     private readonly _onDidChangeItemHeight;
     readonly onDidChangeItemHeight: Event<IAgentSession>;
-    constructor(options: IAgentSessionRendererOptions, _approvalModel: AgentSessionApprovalModel | undefined, markdownRendererService: IMarkdownRendererService, productService: IProductService, hoverService: IHoverService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService);
+    constructor(options: IAgentSessionRendererOptions, _approvalModel: AgentSessionApprovalModel | undefined, _activeSessionResource: IObservable<URI | undefined>, markdownRendererService: IMarkdownRendererService, productService: IProductService, hoverService: IHoverService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService);
     renderTemplate(container: HTMLElement): IAgentSessionItemTemplate;
     renderElement(session: ITreeNode<IAgentSession, FuzzyScore>, index: number, template: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void;
     private renderBadge;
+    private stripCodicons;
     private renderMarkdownOrText;
     private renderDiff;
     private getIcon;
@@ -86,6 +90,7 @@ export declare function toStatusLabel(status: AgentSessionStatus): string;
 interface IAgentSessionSectionTemplate {
     readonly container: HTMLElement;
     readonly label: HTMLSpanElement;
+    readonly count: HTMLSpanElement;
     readonly toolbar: MenuWorkbenchToolBar;
     readonly contextKeyService: IContextKeyService;
     readonly disposables: IDisposable;
@@ -138,6 +143,11 @@ export interface IAgentSessionsFilter {
      * When undefined, sessions are shown as a flat list.
      */
     readonly groupResults?: () => AgentSessionsGrouping | undefined;
+    /**
+     * The field to sort sessions by.
+     * Defaults to created date when undefined.
+     */
+    readonly sortResults?: () => AgentSessionsSorting | undefined;
     /**
      * A callback to notify the filter about the number of
      * results after filtering.
@@ -172,17 +182,26 @@ export declare class AgentSessionsDataSource extends Disposable implements IAsyn
     private groupSessionsIntoSections;
     private groupSessionsCapped;
     private groupSessionsByDate;
-}
+    private groupSessionsByRepository;
+}
+/**
+ * Extracts the repository name for an agent session from its metadata or badge.
+ * Used for grouping sessions by repository and for determining whether a badge
+ * is redundant with the section header.
+ */
+export declare function getRepositoryName(session: IAgentSession): string | undefined;
 export declare const AgentSessionSectionLabels: {
+    pinned: string;
     today: string;
     yesterday: string;
     week: string;
     older: string;
     archived: string;
     more: string;
+    repository: string;
 };
-export declare function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSessionSection, IAgentSessionSection>;
-export declare function sessionDateFromNow(sessionTime: number): string;
+export declare function groupAgentSessionsByDate(sessions: IAgentSession[], sortBy?: AgentSessionsSorting): Map<AgentSessionSection, IAgentSessionSection>;
+export declare function sessionDateFromNow(sessionTime: number, appendAgoLabel?: boolean): string;
 export declare class AgentSessionsIdentityProvider implements IIdentityProvider<IAgentSessionsModel | AgentSessionListItem> {
     getId(element: IAgentSessionsModel | AgentSessionListItem): string;
     getGroupId(element: IAgentSessionsModel | AgentSessionListItem): number | NotSelectableGroupIdType;
@@ -190,13 +209,10 @@ export declare class AgentSessionsIdentityProvider implements IIdentityProvider<
 export declare class AgentSessionsCompressionDelegate implements ITreeCompressionDelegate<AgentSessionListItem> {
     isIncompressible(element: AgentSessionListItem): boolean;
 }
-export interface IAgentSessionsSorterOptions {
-    overrideCompare?(sessionA: IAgentSession, sessionB: IAgentSession): number | undefined;
-}
 export declare class AgentSessionsSorter implements ITreeSorter<IAgentSession> {
-    private readonly options?;
-    constructor(options?: IAgentSessionsSorterOptions | undefined);
-    compare(sessionA: IAgentSession, sessionB: IAgentSession): number;
+    private readonly getSortBy;
+    constructor(getSortBy?: () => AgentSessionsSorting);
+    compare(sessionA: IAgentSession, sessionB: IAgentSession, prioritizeActiveSessions?: boolean): number;
 }
 export declare class AgentSessionsKeyboardNavigationLabelProvider implements ICompressibleKeyboardNavigationLabelProvider<AgentSessionListItem> {
     getKeyboardNavigationLabel(element: AgentSessionListItem): string;