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

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

@@ -5,51 +5,42 @@ import * as agentsessionsviewer from './media/agentsessionsviewer.css';
 import { h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { hasValidDiff, getAgentChangesSummary, isAgentSessionsModel, isAgentSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
+import { hasValidDiff, getAgentChangesSummary, isAgentSessionSection, isAgentSessionsModel, AgentSessionSection, isAgentSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { IconLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { getDurationString, fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { createMatches } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
-import { allowedChatMarkdownHtmlTags } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatContentMarkdownRenderer';
+import { allowedChatMarkdownHtmlTags } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { fillEditorsDragData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/dnd';
-import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
-import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
-import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
-import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
-import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { AGENT_SESSIONS_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { IntervalTimer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { isSessionInProgressStatus, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 
-var AgentSessionRenderer_1;
+var AgentSessionRenderer_1, AgentSessionSectionRenderer_1;
 registerCss(agentsessionsviewer);
 let AgentSessionRenderer = class AgentSessionRenderer {
     static { AgentSessionRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'agent-session'; }
-    constructor(markdownRendererService, productService, layoutService, viewDescriptorService, hoverService, instantiationService, contextKeyService, chatSessionsService) {
+    constructor(options, markdownRendererService, productService, hoverService, instantiationService, contextKeyService) {
+        this.options = options;
         this.markdownRendererService = markdownRendererService;
         this.productService = productService;
-        this.layoutService = layoutService;
-        this.viewDescriptorService = viewDescriptorService;
         this.hoverService = hoverService;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
-        this.chatSessionsService = chatSessionsService;
         this.templateId = AgentSessionRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
@@ -70,6 +61,7 @@ let AgentSessionRenderer = class AgentSessionRenderer {
                         h('span.agent-session-diff-added@addedSpan'),
                         h('span.agent-session-diff-removed@removedSpan')
                     ]),
+                    h('div.agent-session-badge@badge'),
                     h('div.agent-session-description@description'),
                     h('div.agent-session-status@status')
                 ])
@@ -90,6 +82,7 @@ let AgentSessionRenderer = class AgentSessionRenderer {
             diffFilesSpan: elements.filesSpan,
             diffAddedSpan: elements.addedSpan,
             diffRemovedSpan: elements.removedSpan,
+            badge: elements.badge,
             description: elements.description,
             status: elements.status,
             contextKeyService,
@@ -102,6 +95,7 @@ let AgentSessionRenderer = class AgentSessionRenderer {
         template.diffFilesSpan.textContent = '';
         template.diffAddedSpan.textContent = '';
         template.diffRemovedSpan.textContent = '';
+        template.badge.textContent = '';
         template.description.textContent = '';
         template.element.classList.toggle('archived', session.element.isArchived());
         template.icon.className = `agent-session-icon ${ThemeIcon.asClassName(this.getIcon(session.element))}`;
@@ -109,27 +103,57 @@ let AgentSessionRenderer = class AgentSessionRenderer {
         template.title.setLabel(renderAsPlaintext(markdownTitle), undefined, { matches: createMatches(session.filterData) });
         ChatContextKeys.isArchivedAgentSession.bindTo(template.contextKeyService).set(session.element.isArchived());
         ChatContextKeys.isReadAgentSession.bindTo(template.contextKeyService).set(session.element.isRead());
+        ChatContextKeys.agentSessionType.bindTo(template.contextKeyService).set(session.element.providerType);
         template.titleToolbar.context = session.element;
+        let hasDiff = false;
         const { changes: diff } = session.element;
-        if (!this.chatSessionsService.isChatSessionInProgressStatus(session.element.status) && diff && hasValidDiff(diff)) {
+        if (!isSessionInProgressStatus(session.element.status) && diff && hasValidDiff(diff)) {
             if (this.renderDiff(session, template)) {
-                template.diffContainer.classList.add('has-diff');
+                hasDiff = true;
             }
         }
-        else {
-            template.diffContainer.classList.remove('has-diff');
-            this.renderDescription(session, template);
+        template.diffContainer.classList.toggle('has-diff', hasDiff);
+        let hasBadge = false;
+        if (!isSessionInProgressStatus(session.element.status)) {
+            hasBadge = this.renderBadge(session, template);
+        }
+        template.badge.classList.toggle('has-badge', hasBadge);
+        if (!hasDiff) {
+            this.renderDescription(session, template, hasBadge);
         }
         this.renderStatus(session, template);
         this.renderHover(session, template);
     }
+    renderBadge(session, template) {
+        const badge = session.element.badge;
+        if (badge) {
+            this.renderMarkdownOrText(badge, template.badge, template.elementDisposable);
+        }
+        return !!badge;
+    }
+    renderMarkdownOrText(content, container, disposables) {
+        if (typeof content === 'string') {
+            container.textContent = content;
+        }
+        else {
+            disposables.add(this.markdownRendererService.render(content, {
+                sanitizerConfig: {
+                    replaceWithPlaintext: true,
+                    allowedTags: {
+                        override: allowedChatMarkdownHtmlTags,
+                    },
+                    allowedLinkSchemes: { augment: [this.productService.urlProtocol] }
+                },
+            }, container));
+        }
+    }
     renderDiff(session, template) {
         const diff = getAgentChangesSummary(session.element.changes);
         if (!diff) {
             return false;
         }
         if (diff.files > 0) {
-            template.diffFilesSpan.textContent = diff.files === 1 ? ( localize(4866, "1 file")) : ( localize(4867, "{0} files", diff.files));
+            template.diffFilesSpan.textContent = diff.files === 1 ? ( localize(4909, "1 file")) : ( localize(4910, "{0} files", diff.files));
         }
         if (diff.insertions >= 0 ) {
             template.diffAddedSpan.textContent = `+${diff.insertions}`;
@@ -154,55 +178,48 @@ let AgentSessionRenderer = class AgentSessionRenderer {
         }
         return Codicon.circleSmallFilled;
     }
-    renderDescription(session, template) {
+    renderDescription(session, template, hasBadge) {
         const description = session.element.description;
         if (description) {
-            if (typeof description === 'string') {
-                template.description.textContent = description;
-            }
-            else {
-                template.elementDisposable.add(this.markdownRendererService.render(description, {
-                    sanitizerConfig: {
-                        replaceWithPlaintext: true,
-                        allowedTags: {
-                            override: allowedChatMarkdownHtmlTags,
-                        },
-                        allowedLinkSchemes: { augment: [this.productService.urlProtocol] }
-                    },
-                }, template.description));
-            }
+            this.renderMarkdownOrText(description, template.description, template.elementDisposable);
         }
         else {
-            if (this.chatSessionsService.isChatSessionInProgressStatus(session.element.status)) {
-                template.description.textContent = ( localize(4868, "Working..."));
+            if (session.element.status === ChatSessionStatus.InProgress) {
+                template.description.textContent = ( localize(4911, "Working..."));
+            }
+            else if (session.element.status === ChatSessionStatus.NeedsInput) {
+                template.description.textContent = ( localize(4912, "Input needed."));
+            }
+            else if (hasBadge && session.element.status === ChatSessionStatus.Completed) {
+                template.description.textContent = '';
             }
             else if (session.element.timing.finishedOrFailedTime &&
                 session.element.timing.inProgressTime &&
                 session.element.timing.finishedOrFailedTime > session.element.timing.inProgressTime) {
-                const duration = this.toDuration(session.element.timing.inProgressTime, session.element.timing.finishedOrFailedTime);
+                const duration = this.toDuration(session.element.timing.inProgressTime, session.element.timing.finishedOrFailedTime, false);
                 template.description.textContent = session.element.status === ChatSessionStatus.Failed ?
-                    ( localize(4869, "Failed after {0}.", duration ?? '1s')) :
-                    ( localize(4870, "Finished in {0}.", duration ?? '1s'));
+                    ( localize(4913, "Failed after {0}.", duration ?? '1s')) :
+                    ( localize(4914, "Completed in {0}.", duration ?? '1s'));
             }
             else {
                 template.description.textContent = session.element.status === ChatSessionStatus.Failed ?
-                    ( localize(4871, "Failed")) :
-                    ( localize(4872, "Finished"));
+                    ( localize(4915, "Failed")) :
+                    ( localize(4916, "Completed"));
             }
         }
     }
-    toDuration(startTime, endTime) {
+    toDuration(startTime, endTime, useFullTimeWords) {
         const elapsed = Math.round((endTime - startTime) / 1000) * 1000;
         if (elapsed < 1000) {
             return undefined;
         }
-        return getDurationString(elapsed);
+        return getDurationString(elapsed, useFullTimeWords);
     }
     renderStatus(session, template) {
         const getStatus = (session) => {
             let timeLabel;
-            if (this.chatSessionsService.isChatSessionInProgressStatus(session.status) && session.timing.inProgressTime) {
-                timeLabel = this.toDuration(session.timing.inProgressTime, Date.now());
+            if (session.status === ChatSessionStatus.InProgress && session.timing.inProgressTime) {
+                timeLabel = this.toDuration(session.timing.inProgressTime, Date.now(), false);
             }
             if (!timeLabel) {
                 timeLabel = fromNow(session.timing.endTime || session.timing.startTime);
@@ -211,30 +228,67 @@ let AgentSessionRenderer = class AgentSessionRenderer {
         };
         template.status.textContent = getStatus(session.element);
         const timer = template.elementDisposable.add(( new IntervalTimer()));
-        timer.cancelAndSet(() => template.status.textContent = getStatus(session.element), this.chatSessionsService.isChatSessionInProgressStatus(session.element.status) ? 1000  : 60 * 1000 );
+        timer.cancelAndSet(() => template.status.textContent = getStatus(session.element), session.element.status === ChatSessionStatus.InProgress ? 1000  : 60 * 1000 );
     }
     renderHover(session, template) {
-        const tooltip = session.element.tooltip;
-        if (tooltip) {
-            template.elementDisposable.add(this.hoverService.setupDelayedHover(template.element, () => ({
-                content: tooltip,
-                style: HoverStyle.Pointer,
-                position: {
-                    hoverPosition: (() => {
-                        const sideBarPosition = this.layoutService.getSideBarPosition();
-                        const viewLocation = this.viewDescriptorService.getViewLocationById(AGENT_SESSIONS_VIEW_ID);
-                        switch (viewLocation) {
-                            case ViewContainerLocation.Sidebar:
-                                return sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
-                            case ViewContainerLocation.AuxiliaryBar:
-                                return sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
-                            default:
-                                return HoverPosition.RIGHT;
-                        }
-                    })()
-                }
-            }), { groupId: 'agent.sessions' }));
+        template.elementDisposable.add(this.hoverService.setupDelayedHover(template.element, () => ({
+            content: this.buildTooltip(session.element),
+            style: HoverStyle.Pointer,
+            position: {
+                hoverPosition: this.options.getHoverPosition()
+            }
+        }), { groupId: 'agent.sessions' }));
+    }
+    buildTooltip(session) {
+        const lines = [];
+        lines.push(`**${session.label}**`);
+        if (session.tooltip) {
+            const tooltip = typeof session.tooltip === 'string' ? session.tooltip : session.tooltip.value;
+            lines.push(tooltip);
+        }
+        else {
+            if (session.description) {
+                const description = typeof session.description === 'string' ? session.description : session.description.value;
+                lines.push(description);
+            }
+            if (session.badge) {
+                const badge = typeof session.badge === 'string' ? session.badge : session.badge.value;
+                lines.push(badge);
+            }
+        }
+        const details = [];
+        details.push(toStatusLabel(session.status));
+        details.push(session.providerLabel);
+        if (session.timing.finishedOrFailedTime && session.timing.inProgressTime) {
+            const duration = this.toDuration(session.timing.inProgressTime, session.timing.finishedOrFailedTime, true);
+            if (duration) {
+                details.push(duration);
+            }
+        }
+        else {
+            details.push(fromNow(session.timing.startTime, true, true));
+        }
+        lines.push(details.join(' • '));
+        const diff = getAgentChangesSummary(session.changes);
+        if (diff && hasValidDiff(session.changes)) {
+            const diffParts = [];
+            if (diff.files > 0) {
+                diffParts.push(diff.files === 1 ? ( localize(4917, "1 file")) : ( localize(4918, "{0} files", diff.files)));
+            }
+            if (diff.insertions > 0) {
+                diffParts.push(`+${diff.insertions}`);
+            }
+            if (diff.deletions > 0) {
+                diffParts.push(`-${diff.deletions}`);
+            }
+            if (diffParts.length > 0) {
+                lines.push(`$(diff) ${diffParts.join(', ')}`);
+            }
         }
+        if (session.isArchived()) {
+            lines.push(`$(archive) ${( localize(4919, "Archived"))}`);
+        }
+        return ( new MarkdownString(lines.join('\n\n'), { supportThemeIcons: true }));
     }
     renderCompressedElements(node, index, templateData, details) {
         throw ( new Error('Should never happen since session is incompressible'));
@@ -247,30 +301,107 @@ let AgentSessionRenderer = class AgentSessionRenderer {
     }
 };
 AgentSessionRenderer = AgentSessionRenderer_1 = ( __decorate([
-    ( __param(0, IMarkdownRendererService)),
-    ( __param(1, IProductService)),
-    ( __param(2, IWorkbenchLayoutService)),
-    ( __param(3, IViewDescriptorService)),
-    ( __param(4, IHoverService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IChatSessionsService))
+    ( __param(1, IMarkdownRendererService)),
+    ( __param(2, IProductService)),
+    ( __param(3, IHoverService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IContextKeyService))
 ], AgentSessionRenderer));
+function toStatusLabel(status) {
+    let statusLabel;
+    switch (status) {
+        case ChatSessionStatus.NeedsInput:
+            statusLabel = ( localize(4920, "Needs Input"));
+            break;
+        case ChatSessionStatus.InProgress:
+            statusLabel = ( localize(4921, "In Progress"));
+            break;
+        case ChatSessionStatus.Failed:
+            statusLabel = ( localize(4922, "Failed"));
+            break;
+        default:
+            statusLabel = ( localize(4923, "Completed"));
+    }
+    return statusLabel;
+}
+let AgentSessionSectionRenderer = class AgentSessionSectionRenderer {
+    static { AgentSessionSectionRenderer_1 = this; }
+    static { this.TEMPLATE_ID = 'agent-session-section'; }
+    constructor(instantiationService, contextKeyService) {
+        this.instantiationService = instantiationService;
+        this.contextKeyService = contextKeyService;
+        this.templateId = AgentSessionSectionRenderer_1.TEMPLATE_ID;
+    }
+    renderTemplate(container) {
+        const disposables = ( new DisposableStore());
+        const elements = h('div.agent-session-section@container', [
+            h('span.agent-session-section-label@label'),
+            h('div.agent-session-section-toolbar@toolbar')
+        ]);
+        const contextKeyService = disposables.add(this.contextKeyService.createScoped(elements.container));
+        const scopedInstantiationService = disposables.add(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, contextKeyService]))));
+        const toolbar = disposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, elements.toolbar, MenuId.AgentSessionSectionToolbar, {
+            menuOptions: { shouldForwardArgs: true },
+        }));
+        container.appendChild(elements.container);
+        return {
+            container: elements.container,
+            label: elements.label,
+            toolbar,
+            contextKeyService,
+            disposables
+        };
+    }
+    renderElement(element, index, template, details) {
+        template.label.textContent = element.element.label;
+        ChatContextKeys.agentSessionSection.bindTo(template.contextKeyService).set(element.element.section);
+        template.toolbar.context = element.element;
+    }
+    renderCompressedElements(node, index, templateData, details) {
+        throw ( new Error('Should never happen since section header is incompressible'));
+    }
+    disposeElement(element, index, template, details) {
+    }
+    disposeTemplate(templateData) {
+        templateData.disposables.dispose();
+    }
+};
+AgentSessionSectionRenderer = AgentSessionSectionRenderer_1 = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IContextKeyService))
+], AgentSessionSectionRenderer));
 class AgentSessionsListDelegate {
     static { this.ITEM_HEIGHT = 52; }
+    static { this.SECTION_HEIGHT = 26; }
     getHeight(element) {
+        if (isAgentSessionSection(element)) {
+            return AgentSessionsListDelegate.SECTION_HEIGHT;
+        }
         return AgentSessionsListDelegate.ITEM_HEIGHT;
     }
     getTemplateId(element) {
+        if (isAgentSessionSection(element)) {
+            return AgentSessionSectionRenderer.TEMPLATE_ID;
+        }
         return AgentSessionRenderer.TEMPLATE_ID;
     }
 }
 class AgentSessionsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(4873, "Agent Sessions");
+        return localize(4924, "Agent Sessions");
     }
     getAriaLabel(element) {
-        return element.label;
+        if (isAgentSessionSection(element)) {
+            return localize(4925, "{0} sessions section", element.label);
+        }
+        return localize(
+            4926,
+            "{0} session {1} ({2}), created {3}",
+            element.providerLabel,
+            element.label,
+            toStatusLabel(element.status),
+            ( new Date(element.timing.startTime)).toLocaleString()
+        );
     }
 }
 class AgentSessionsDataSource {
@@ -279,24 +410,110 @@ class AgentSessionsDataSource {
         this.sorter = sorter;
     }
     hasChildren(element) {
-        return isAgentSessionsModel(element);
+        if (isAgentSessionsModel(element)) {
+            return true;
+        }
+        else if (isAgentSessionSection(element)) {
+            return element.sessions.length > 0;
+        }
+        else {
+            return false;
+        }
     }
     getChildren(element) {
-        if (!isAgentSessionsModel(element)) {
+        if (isAgentSessionsModel(element)) {
+            let filteredSessions = element.sessions.filter(session => !this.filter?.exclude(session));
+            const limitResultsCount = this.filter?.limitResults?.();
+            if (!this.filter?.groupResults?.() || typeof limitResultsCount === 'number') {
+                filteredSessions.sort(this.sorter.compare.bind(this.sorter));
+            }
+            if (typeof limitResultsCount === 'number') {
+                filteredSessions = filteredSessions.slice(0, limitResultsCount);
+            }
+            this.filter?.notifyResults?.(filteredSessions.length);
+            if (this.filter?.groupResults?.()) {
+                return this.groupSessionsIntoSections(filteredSessions);
+            }
+            return filteredSessions;
+        }
+        else if (isAgentSessionSection(element)) {
+            return element.sessions;
+        }
+        else {
             return [];
         }
-        let filteredSessions = element.sessions.filter(session => !this.filter?.exclude?.(session));
-        const limitResultsCount = this.filter?.limitResults?.();
-        if (typeof limitResultsCount === 'number') {
-            filteredSessions.sort(this.sorter.compare.bind(this.sorter));
-            filteredSessions = filteredSessions.slice(0, limitResultsCount);
+    }
+    groupSessionsIntoSections(sessions) {
+        const result = [];
+        const sortedSessions = sessions.sort(this.sorter.compare.bind(this.sorter));
+        const groupedSessions = groupAgentSessions(sortedSessions);
+        for (const { sessions, section, label } of ( groupedSessions.values())) {
+            if (sessions.length === 0) {
+                continue;
+            }
+            result.push({ section, label, sessions });
         }
-        this.filter?.notifyResults?.(filteredSessions.length);
-        return filteredSessions;
+        return result;
     }
 }
+const DAY_THRESHOLD = 24 * 60 * 60 * 1000;
+const WEEK_THRESHOLD = 7 * DAY_THRESHOLD;
+const AgentSessionSectionLabels = {
+    [AgentSessionSection.InProgress]: ( localize(4927, "In Progress")),
+    [AgentSessionSection.Today]: ( localize(4928, "Today")),
+    [AgentSessionSection.Yesterday]: ( localize(4929, "Yesterday")),
+    [AgentSessionSection.Week]: ( localize(4930, "Last Week")),
+    [AgentSessionSection.Older]: ( localize(4931, "Older")),
+    [AgentSessionSection.Archived]: ( localize(4932, "Archived")),
+};
+function groupAgentSessions(sessions) {
+    const now = Date.now();
+    const startOfToday = ( new Date(now)).setHours(0, 0, 0, 0);
+    const startOfYesterday = startOfToday - DAY_THRESHOLD;
+    const weekThreshold = now - WEEK_THRESHOLD;
+    const inProgressSessions = [];
+    const todaySessions = [];
+    const yesterdaySessions = [];
+    const weekSessions = [];
+    const olderSessions = [];
+    const archivedSessions = [];
+    for (const session of sessions) {
+        if (isSessionInProgressStatus(session.status)) {
+            inProgressSessions.push(session);
+        }
+        else if (session.isArchived()) {
+            archivedSessions.push(session);
+        }
+        else {
+            const sessionTime = session.timing.endTime || session.timing.startTime;
+            if (sessionTime >= startOfToday) {
+                todaySessions.push(session);
+            }
+            else if (sessionTime >= startOfYesterday) {
+                yesterdaySessions.push(session);
+            }
+            else if (sessionTime >= weekThreshold) {
+                weekSessions.push(session);
+            }
+            else {
+                olderSessions.push(session);
+            }
+        }
+    }
+    return ( new Map([
+        [AgentSessionSection.InProgress, { section: AgentSessionSection.InProgress, label: AgentSessionSectionLabels[AgentSessionSection.InProgress], sessions: inProgressSessions }],
+        [AgentSessionSection.Today, { section: AgentSessionSection.Today, label: AgentSessionSectionLabels[AgentSessionSection.Today], sessions: todaySessions }],
+        [AgentSessionSection.Yesterday, { section: AgentSessionSection.Yesterday, label: AgentSessionSectionLabels[AgentSessionSection.Yesterday], sessions: yesterdaySessions }],
+        [AgentSessionSection.Week, { section: AgentSessionSection.Week, label: AgentSessionSectionLabels[AgentSessionSection.Week], sessions: weekSessions }],
+        [AgentSessionSection.Older, { section: AgentSessionSection.Older, label: AgentSessionSectionLabels[AgentSessionSection.Older], sessions: olderSessions }],
+        [AgentSessionSection.Archived, { section: AgentSessionSection.Archived, label: AgentSessionSectionLabels[AgentSessionSection.Archived], sessions: archivedSessions }],
+    ]));
+}
 class AgentSessionsIdentityProvider {
     getId(element) {
+        if (isAgentSessionSection(element)) {
+            return `section-${element.section}`;
+        }
         if (isAgentSession(element)) {
             return ( element.resource.toString());
         }
@@ -308,13 +525,21 @@ class AgentSessionsCompressionDelegate {
         return true;
     }
 }
-let AgentSessionsSorter = class AgentSessionsSorter {
-    constructor(chatSessionsService) {
-        this.chatSessionsService = chatSessionsService;
+class AgentSessionsSorter {
+    constructor(options) {
+        this.options = options;
     }
     compare(sessionA, sessionB) {
-        const aInProgress = this.chatSessionsService.isChatSessionInProgressStatus(sessionA.status);
-        const bInProgress = this.chatSessionsService.isChatSessionInProgressStatus(sessionB.status);
+        const aNeedsInput = sessionA.status === ChatSessionStatus.NeedsInput;
+        const bNeedsInput = sessionB.status === ChatSessionStatus.NeedsInput;
+        if (aNeedsInput && !bNeedsInput) {
+            return -1;
+        }
+        if (!aNeedsInput && bNeedsInput) {
+            return 1;
+        }
+        const aInProgress = sessionA.status === ChatSessionStatus.InProgress;
+        const bInProgress = sessionB.status === ChatSessionStatus.InProgress;
         if (aInProgress && !bInProgress) {
             return -1;
         }
@@ -329,14 +554,18 @@ let AgentSessionsSorter = class AgentSessionsSorter {
         if (aArchived && !bArchived) {
             return 1;
         }
+        const override = this.options?.overrideCompare?.(sessionA, sessionB);
+        if (typeof override === 'number') {
+            return override;
+        }
         return (sessionB.timing.endTime || sessionB.timing.startTime) - (sessionA.timing.endTime || sessionA.timing.startTime);
     }
-};
-AgentSessionsSorter = ( __decorate([
-    ( __param(0, IChatSessionsService))
-], AgentSessionsSorter));
+}
 class AgentSessionsKeyboardNavigationLabelProvider {
     getKeyboardNavigationLabel(element) {
+        if (isAgentSessionSection(element)) {
+            return element.label;
+        }
         return element.label;
     }
     getCompressedNodeKeyboardNavigationLabel(elements) {
@@ -349,18 +578,22 @@ let AgentSessionsDragAndDrop = class AgentSessionsDragAndDrop extends Disposable
         this.instantiationService = instantiationService;
     }
     onDragStart(data, originalEvent) {
-        const elements = data.getData();
+        const elements = data.getData().filter(e => isAgentSession(e));
         const uris = coalesce(( elements.map(e => e.resource)));
         this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, uris, originalEvent));
     }
     getDragURI(element) {
+        if (isAgentSessionSection(element)) {
+            return null;
+        }
         return ( element.resource.toString());
     }
     getDragLabel(elements, originalEvent) {
-        if (elements.length === 1) {
-            return elements[0].label;
+        const sessions = elements.filter(e => isAgentSession(e));
+        if (sessions.length === 1) {
+            return sessions[0].label;
         }
-        return localize(4874, "{0} agent sessions", elements.length);
+        return localize(4933, "{0} agent sessions", sessions.length);
     }
     onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         return false;
@@ -371,4 +604,4 @@ AgentSessionsDragAndDrop = ( __decorate([
     ( __param(0, IInstantiationService))
 ], AgentSessionsDragAndDrop));
 
-export { AgentSessionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionsSorter };
+export { AgentSessionRenderer, AgentSessionSectionLabels, AgentSessionSectionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionsSorter, groupAgentSessions };

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

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatSessionItem, IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 export declare class LocalAgentsSessionsProvider extends Disposable implements IChatSessionItemProvider, IWorkbenchContribution {
@@ -16,8 +16,9 @@ export declare class LocalAgentsSessionsProvider extends Disposable implements I
     readonly onDidChangeChatSessionItems: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     constructor(chatService: IChatService, chatSessionsService: IChatSessionsService);
     private registerListeners;
-    private modelToStatus;
     provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]>;
     private getHistoryItems;
     private toChatSessionItem;
+    private modelToStatus;
+    private chatResponseStateToStatus;
 }