@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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

@@ -6,7 +6,7 @@ import { h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { NotSelectableGroupId } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/list/list';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { hasValidDiff, getAgentChangesSummary, isAgentSessionSection, isAgentSessionsModel, AgentSessionSection, isAgentSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
+import { hasValidDiff, getAgentChangesSummary, isAgentSessionSection, isAgentSession, isAgentSessionsModel, AgentSessionSection } 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';
@@ -19,6 +19,7 @@ import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arr
 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 { 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 { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 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';
@@ -26,12 +27,18 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/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/actions/chatContextKeys';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 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 { AgentSessionHoverWidget } from './agentSessionHoverWidget.js';
-import { AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { AgentSessionProviders, getAgentSessionTime } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { AgentSessionsGrouping } from './agentSessionsFilter.js';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
+import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isSessionInProgressStatus, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var AgentSessionRenderer_1, AgentSessionSectionRenderer_1;
 registerCss(agentsessionsviewer);
@@ -42,8 +49,22 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
     static {
         this.TEMPLATE_ID = "agent-session";
     }
+    static {
+        this.APPROVAL_ROW_MAX_LINES = 3;
+    }
+    static {
+        this._APPROVAL_ROW_LINE_HEIGHT = 18;
+    }
+    static {
+        this._APPROVAL_ROW_OVERHEAD = 14;
+    }
+    static getApprovalRowHeight(label) {
+        const lineCount = Math.min(label.split(/\r?\n/).length, AgentSessionRenderer_1.APPROVAL_ROW_MAX_LINES);
+        return lineCount * AgentSessionRenderer_1._APPROVAL_ROW_LINE_HEIGHT + AgentSessionRenderer_1._APPROVAL_ROW_OVERHEAD;
+    }
     constructor(
         options,
+        _approvalModel,
         markdownRendererService,
         productService,
         hoverService,
@@ -52,6 +73,7 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
     ) {
         super();
         this.options = options;
+        this._approvalModel = _approvalModel;
         this.markdownRendererService = markdownRendererService;
         this.productService = productService;
         this.hoverService = hoverService;
@@ -59,6 +81,8 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
         this.contextKeyService = contextKeyService;
         this.templateId = AgentSessionRenderer_1.TEMPLATE_ID;
         this.sessionHover = this._register(( new MutableDisposable()));
+        this._onDidChangeItemHeight = this._register(( new Emitter()));
+        this.onDidChangeItemHeight = this._onDidChangeItemHeight.event;
     }
     renderTemplate(container) {
         const disposables = ( new DisposableStore());
@@ -73,11 +97,18 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
                 [h("div.agent-session-diff-container@diffContainer", [
                     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@statusContainer", [
-                    h("span.agent-session-status-provider-icon@statusProviderIcon"),
-                    h("span.agent-session-status-time@statusTime")
+                ]), h("div.agent-session-description@description"), h("div.agent-session-details-right", [
+                    h("div.agent-session-badge@badge"),
+                    h("span.agent-session-separator@separator"),
+                    h("div.agent-session-status@statusContainer", [
+                        h("span.agent-session-status-provider-icon@statusProviderIcon"),
+                        h("span.agent-session-status-time@statusTime")
+                    ])
                 ])]
-            )])
+            ), h("div.agent-session-approval-row@approvalRow", [
+                h("span.agent-session-approval-label@approvalLabel"),
+                h("div.agent-session-approval-button@approvalButtonContainer")
+            ])])
         ]);
         const contextKeyService = disposables.add(this.contextKeyService.createScoped(elements.item));
         const scopedInstantiationService = disposables.add(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, contextKeyService]))));
@@ -104,10 +135,14 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
             diffAddedSpan: elements.addedSpan,
             diffRemovedSpan: elements.removedSpan,
             badge: elements.badge,
+            separator: elements.separator,
             description: elements.description,
             statusContainer: elements.statusContainer,
             statusProviderIcon: elements.statusProviderIcon,
             statusTime: elements.statusTime,
+            approvalRow: elements.approvalRow,
+            approvalLabel: elements.approvalLabel,
+            approvalButtonContainer: elements.approvalButtonContainer,
             contextKeyService,
             elementDisposable,
             disposables
@@ -146,16 +181,17 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
             hasAgentSessionChanges = hasDiff;
         }
         ChatContextKeys.hasAgentSessionChanges.bindTo(template.contextKeyService).set(hasAgentSessionChanges);
-        let hasBadge = false;
-        if (!isSessionInProgressStatus(session.element.status)) {
-            hasBadge = this.renderBadge(session, template);
-        }
+        const hasBadge = this.renderBadge(session, template);
         template.badge.classList.toggle("has-badge", hasBadge);
         if (!hasDiff) {
-            this.renderDescription(session, template, hasBadge);
+            this.renderDescription(session, template);
         }
+        template.separator.classList.toggle("has-separator", hasBadge);
         this.renderStatus(session, template);
         this.renderHover(session, template);
+        if (this._approvalModel) {
+            this.renderApprovalRow(session, template);
+        }
     }
     renderBadge(session, template) {
         const badge = session.element.badge;
@@ -209,35 +245,32 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
         }
         return Codicon.circleSmallFilled;
     }
-    renderDescription(session, template, hasBadge) {
+    renderDescription(session, template) {
         const description = session.element.description;
         if (description) {
             this.renderMarkdownOrText(description, template.description, template.elementDisposable);
+            return;
         }
-        else {
-            if (session.element.status === ChatSessionStatus.InProgress) {
-                template.description.textContent = ( localize(4990, "Working..."));
-            } else if (session.element.status === ChatSessionStatus.NeedsInput) {
-                template.description.textContent = ( localize(4991, "Input needed."));
-            } else if (hasBadge && session.element.status === ChatSessionStatus.Completed) {
-                template.description.textContent = "";
-            } else if (session.element.timing.lastRequestEnded && session.element.timing.lastRequestStarted && session.element.timing.lastRequestEnded > session.element.timing.lastRequestStarted) {
-                const duration = this.toDuration(
-                    session.element.timing.lastRequestStarted,
-                    session.element.timing.lastRequestEnded,
-                    false,
-                    true
-                );
-                template.description.textContent = session.element.status === ChatSessionStatus.Failed ? ( localize(4992, "Failed after {0}.", duration)) : ( localize(4993, "Completed in {0}.", duration));
-            } else {
-                template.description.textContent = session.element.status === ChatSessionStatus.Failed ? ( localize(4994, "Failed")) : ( localize(4995, "Completed"));
-            }
+        if (session.element.status === ChatSessionStatus.InProgress) {
+            template.description.textContent = ( localize(5126, "Working..."));
+        } else if (session.element.status === ChatSessionStatus.NeedsInput) {
+            template.description.textContent = ( localize(5127, "Input needed."));
+        } else if (session.element.timing.lastRequestEnded && session.element.timing.lastRequestStarted && session.element.timing.lastRequestEnded > session.element.timing.lastRequestStarted) {
+            const duration = this.toDuration(
+                session.element.timing.lastRequestStarted,
+                session.element.timing.lastRequestEnded,
+                false,
+                true
+            );
+            template.description.textContent = session.element.status === ChatSessionStatus.Failed ? ( localize(5128, "Failed after {0}", duration)) : ( localize(5129, "Completed in {0}", duration));
+        } else {
+            template.description.textContent = session.element.status === ChatSessionStatus.Failed ? ( localize(5130, "Failed")) : ( localize(5131, "Completed"));
         }
     }
     toDuration(startTime, endTime, useFullTimeWords, disallowNow) {
         const elapsed = Math.max(Math.round((endTime - startTime) / 1000) * 1000, 1000 );
         if (!disallowNow && elapsed < 60000) {
-            return localize(4996, "now");
+            return localize(5132, "now");
         }
         return getDurationString(elapsed, useFullTimeWords);
     }
@@ -248,17 +281,26 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
                 timeLabel = this.toDuration(session.timing.lastRequestStarted, Date.now(), false, false);
             }
             if (!timeLabel) {
-                const date = session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created;
+                const date = getAgentSessionTime(session.timing);
                 const seconds = Math.round((( new Date()).getTime() - date) / 1000);
                 if (seconds < 60) {
-                    timeLabel = ( localize(4996, "now"));
+                    timeLabel = ( localize(5132, "now"));
                 } else {
-                    timeLabel = fromNow(date, true);
+                    timeLabel = sessionDateFromNow(date);
                 }
             }
             return timeLabel;
         };
-        template.statusProviderIcon.className = `agent-session-status-provider-icon ${ThemeIcon.asClassName(session.element.icon)}`;
+        const isLocal = session.element.providerType === AgentSessionProviders.Local;
+        if (isLocal) {
+            template.statusProviderIcon.className = "";
+        } else if (this.options.showIsolationIcon && session.element.providerType === AgentSessionProviders.Background) {
+            const hasWorktree = typeof session.element.metadata?.worktreePath === "string";
+            const isolationIcon = hasWorktree ? Codicon.worktree : Codicon.folder;
+            template.statusProviderIcon.className = `agent-session-status-provider-icon ${ThemeIcon.asClassName(isolationIcon)}`;
+        } else {
+            template.statusProviderIcon.className = `agent-session-status-provider-icon ${ThemeIcon.asClassName(session.element.icon)}`;
+        }
         template.statusTime.textContent = getTimeLabel(session.element);
         const timer = template.elementDisposable.add(( new IntervalTimer()));
         timer.cancelAndSet(
@@ -267,6 +309,9 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
         );
     }
     renderHover(session, template) {
+        if (this.options.disableHover) {
+            return;
+        }
         if (!isSessionInProgressStatus(session.element.status) && session.element.isRead()) {
             return;
         }
@@ -293,6 +338,55 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
             }
         };
     }
+    renderApprovalRow(session, template) {
+        if (this._approvalModel === undefined) {
+            throw ( new BugIndicatingError("Approval model is required to render approval row"));
+        }
+        const approvalModel = this._approvalModel;
+        const initialInfo = approvalModel.getApproval(session.element.resource).get();
+        let wasVisible = !!initialInfo;
+        template.approvalRow.classList.toggle("visible", wasVisible);
+        const buttonStore = template.elementDisposable.add(( new DisposableStore()));
+        template.elementDisposable.add(autorun(reader => {
+            buttonStore.clear();
+            const info = approvalModel.getApproval(session.element.resource).read(reader);
+            const visible = !!info;
+            template.approvalRow.classList.toggle("visible", visible);
+            if (info) {
+                const lines = info.label.split("\n");
+                const maxLines = AgentSessionRenderer_1.APPROVAL_ROW_MAX_LINES;
+                const visibleLines = lines.slice(0, maxLines);
+                if (lines.length > maxLines) {
+                    visibleLines[maxLines - 1] = `${visibleLines[maxLines - 1]} \u2026`;
+                }
+                const langId = info.languageId ?? "json";
+                const labelContent = ( new MarkdownString());
+                for (const line of visibleLines) {
+                    labelContent.appendCodeblock(langId, line);
+                }
+                this.renderMarkdownOrText(labelContent, template.approvalLabel, buttonStore);
+                const fullContent = ( new MarkdownString()).appendCodeblock(info.languageId ?? "json", info.label);
+                buttonStore.add(this.hoverService.setupDelayedHover(template.approvalLabel, {
+                    content: fullContent,
+                    style: HoverStyle.Pointer,
+                    position: {
+                        hoverPosition: HoverPosition.BELOW
+                    }
+                }));
+                template.approvalButtonContainer.textContent = "";
+                const button = buttonStore.add(( new Button(template.approvalButtonContainer, {
+                    title: ( localize(5133, "Allow once")),
+                    ...defaultButtonStyles
+                })));
+                button.label = ( localize(5134, "Allow"));
+                buttonStore.add(button.onDidClick(() => info.confirm()));
+            }
+            if (wasVisible !== visible) {
+                wasVisible = visible;
+                this._onDidChangeItemHeight.fire(session.element);
+            }
+        }));
+    }
     renderCompressedElements(node, index, templateData, details) {
         throw ( new Error("Should never happen since session is incompressible"));
     }
@@ -303,21 +397,21 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
         templateData.disposables.dispose();
     }
 };
-AgentSessionRenderer = AgentSessionRenderer_1 = ( __decorate([( __param(1, IMarkdownRendererService)), ( __param(2, IProductService)), ( __param(3, IHoverService)), ( __param(4, IInstantiationService)), ( __param(5, IContextKeyService))], AgentSessionRenderer));
+AgentSessionRenderer = AgentSessionRenderer_1 = ( __decorate([( __param(2, IMarkdownRendererService)), ( __param(3, IProductService)), ( __param(4, IHoverService)), ( __param(5, IInstantiationService)), ( __param(6, IContextKeyService))], AgentSessionRenderer));
 function toStatusLabel(status) {
     let statusLabel;
     switch (status) {
     case ChatSessionStatus.NeedsInput:
-        statusLabel = ( localize(4997, "Needs Input"));
+        statusLabel = ( localize(5135, "Needs Input"));
         break;
     case ChatSessionStatus.InProgress:
-        statusLabel = ( localize(4998, "In Progress"));
+        statusLabel = ( localize(5136, "In Progress"));
         break;
     case ChatSessionStatus.Failed:
-        statusLabel = ( localize(4999, "Failed"));
+        statusLabel = ( localize(5137, "Failed"));
         break;
     default:
-        statusLabel = ( localize(5000, "Completed"));
+        statusLabel = ( localize(5138, "Completed"));
     }
     return statusLabel;
 }
@@ -376,16 +470,27 @@ let AgentSessionSectionRenderer = class AgentSessionSectionRenderer {
 AgentSessionSectionRenderer = AgentSessionSectionRenderer_1 = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IContextKeyService))], AgentSessionSectionRenderer));
 class AgentSessionsListDelegate {
     static {
-        this.ITEM_HEIGHT = 52;
+        this.ITEM_HEIGHT = 54;
     }
     static {
         this.SECTION_HEIGHT = 26;
     }
+    constructor(_approvalModel) {
+        this._approvalModel = _approvalModel;
+    }
     getHeight(element) {
         if (isAgentSessionSection(element)) {
             return AgentSessionsListDelegate.SECTION_HEIGHT;
         }
-        return AgentSessionsListDelegate.ITEM_HEIGHT;
+        let height = AgentSessionsListDelegate.ITEM_HEIGHT;
+        const approval = this._approvalModel?.getApproval(element.resource).get();
+        if (approval) {
+            height += AgentSessionRenderer.getApprovalRowHeight(approval.label);
+        }
+        return height;
+    }
+    hasDynamicHeight(element) {
+        return !!this._approvalModel && isAgentSession(element);
     }
     getTemplateId(element) {
         if (isAgentSessionSection(element)) {
@@ -402,14 +507,14 @@ class AgentSessionsAccessibilityProvider {
         return "listitem";
     }
     getWidgetAriaLabel() {
-        return localize(5001, "Agent Sessions");
+        return localize(5139, "Agent Sessions");
     }
     getAriaLabel(element) {
         if (isAgentSessionSection(element)) {
-            return localize(5002, "{0} sessions section", element.label);
+            return localize(5140, "{0} sessions section", element.label);
         }
         return localize(
-            5003,
+            5141,
             "{0} session {1} ({2}), created {3}",
             element.providerLabel,
             element.label,
@@ -418,13 +523,16 @@ class AgentSessionsAccessibilityProvider {
         );
     }
 }
-class AgentSessionsDataSource {
+class AgentSessionsDataSource extends Disposable {
     static {
         this.CAPPED_SESSIONS_LIMIT = 3;
     }
     constructor(filter, sorter) {
+        super();
         this.filter = filter;
         this.sorter = sorter;
+        this._onDidGetChildren = this._register(( new Emitter()));
+        this.onDidGetChildren = this._onDidGetChildren.event;
     }
     hasChildren(element) {
         if (isAgentSessionsModel(element)) {
@@ -448,6 +556,7 @@ class AgentSessionsDataSource {
                 filteredSessions = filteredSessions.slice(0, limitResultsCount);
             }
             this.filter?.notifyResults?.(filteredSessions.length);
+            this._onDidGetChildren.fire(filteredSessions.length);
             if (this.filter?.groupResults?.()) {
                 return this.groupSessionsIntoSections(filteredSessions);
             }
@@ -463,6 +572,9 @@ class AgentSessionsDataSource {
     groupSessionsIntoSections(sessions) {
         const sortedSessions = sessions.sort(this.sorter.compare.bind(this.sorter));
         if (this.filter?.groupResults?.() === AgentSessionsGrouping.Capped) {
+            if (this.filter?.getExcludes().read) {
+                return sortedSessions;
+            }
             return this.groupSessionsCapped(sortedSessions);
         } else {
             return this.groupSessionsByDate(sortedSessions);
@@ -481,7 +593,7 @@ class AgentSessionsDataSource {
         if (othersSessions.length > 0) {
             result.push({
                 section: AgentSessionSection.More,
-                label: ( localize(5004, "More ({0})", othersSessions.length)),
+                label: AgentSessionSectionLabels[AgentSessionSection.More],
                 sessions: othersSessions
             });
         }
@@ -507,23 +619,21 @@ class AgentSessionsDataSource {
         return result;
     }
 }
-const DAY_THRESHOLD = 24 * 60 * 60 * 1000;
-const WEEK_THRESHOLD = 7 * DAY_THRESHOLD;
 const AgentSessionSectionLabels = {
-    [AgentSessionSection.InProgress]: ( localize(5005, "In Progress")),
-    [AgentSessionSection.Today]: ( localize(5006, "Today")),
-    [AgentSessionSection.Yesterday]: ( localize(5007, "Yesterday")),
-    [AgentSessionSection.Week]: ( localize(5008, "Last Week")),
-    [AgentSessionSection.Older]: ( localize(5009, "Older")),
-    [AgentSessionSection.Archived]: ( localize(5010, "Archived")),
-    [AgentSessionSection.More]: ( localize(5011, "More"))
+    [AgentSessionSection.Today]: ( localize(5142, "Today")),
+    [AgentSessionSection.Yesterday]: ( localize(5143, "Yesterday")),
+    [AgentSessionSection.Week]: ( localize(5144, "Last 7 days")),
+    [AgentSessionSection.Older]: ( localize(5145, "Older")),
+    [AgentSessionSection.Archived]: ( localize(5146, "Archived")),
+    [AgentSessionSection.More]: ( localize(5147, "More"))
 };
+const DAY_THRESHOLD = 24 * 60 * 60 * 1000;
+const WEEK_THRESHOLD = 7 * DAY_THRESHOLD;
 function groupAgentSessionsByDate(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 = [];
@@ -532,10 +642,8 @@ function groupAgentSessionsByDate(sessions) {
     for (const session of sessions) {
         if (session.isArchived()) {
             archivedSessions.push(session);
-        } else if (isSessionInProgressStatus(session.status)) {
-            inProgressSessions.push(session);
         } else {
-            const sessionTime = session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created;
+            const sessionTime = getAgentSessionTime(session.timing);
             if (sessionTime >= startOfToday) {
                 todaySessions.push(session);
             } else if (sessionTime >= startOfYesterday) {
@@ -547,11 +655,7 @@ function groupAgentSessionsByDate(sessions) {
             }
         }
     }
-    return (new Map([[AgentSessionSection.InProgress, {
-        section: AgentSessionSection.InProgress,
-        label: AgentSessionSectionLabels[AgentSessionSection.InProgress],
-        sessions: inProgressSessions
-    }], [AgentSessionSection.Today, {
+    return ( new Map([[AgentSessionSection.Today, {
         section: AgentSessionSection.Today,
         label: AgentSessionSectionLabels[AgentSessionSection.Today],
         sessions: todaySessions
@@ -569,10 +673,23 @@ function groupAgentSessionsByDate(sessions) {
         sessions: olderSessions
     }], [AgentSessionSection.Archived, {
         section: AgentSessionSection.Archived,
-        label: ( localize(5012, "Archived ({0})", archivedSessions.length)),
+        label: AgentSessionSectionLabels[AgentSessionSection.Archived],
         sessions: archivedSessions
     }]]));
 }
+function sessionDateFromNow(sessionTime) {
+    const now = Date.now();
+    const startOfToday = ( new Date(now)).setHours(0, 0, 0, 0);
+    const startOfYesterday = startOfToday - DAY_THRESHOLD;
+    const startOfTwoDaysAgo = startOfYesterday - DAY_THRESHOLD;
+    if (sessionTime < startOfToday && sessionTime >= startOfYesterday) {
+        return localize(5148, "1 day");
+    }
+    if (sessionTime < startOfYesterday && sessionTime >= startOfTwoDaysAgo) {
+        return localize(5149, "2 days");
+    }
+    return fromNow(sessionTime, false);
+}
 class AgentSessionsIdentityProvider {
     getId(element) {
         if (isAgentSessionSection(element)) {
@@ -608,14 +725,6 @@ class AgentSessionsSorter {
         if (!aNeedsInput && bNeedsInput) {
             return 1;
         }
-        const aInProgress = sessionA.status === ChatSessionStatus.InProgress;
-        const bInProgress = sessionB.status === ChatSessionStatus.InProgress;
-        if (aInProgress && !bInProgress) {
-            return -1;
-        }
-        if (!aInProgress && bInProgress) {
-            return 1;
-        }
         const aArchived = sessionA.isArchived();
         const bArchived = sessionB.isArchived();
         if (!aArchived && bArchived) {
@@ -628,8 +737,8 @@ class AgentSessionsSorter {
         if (typeof override === "number") {
             return override;
         }
-        const timeA = sessionA.timing.lastRequestEnded ?? sessionA.timing.lastRequestStarted ?? sessionA.timing.created;
-        const timeB = sessionB.timing.lastRequestEnded ?? sessionB.timing.lastRequestStarted ?? sessionB.timing.created;
+        const timeA = getAgentSessionTime(sessionA.timing);
+        const timeB = getAgentSessionTime(sessionB.timing);
         return timeB - timeA;
     }
 }
@@ -665,7 +774,7 @@ let AgentSessionsDragAndDrop = class AgentSessionsDragAndDrop extends Disposable
         if (sessions.length === 1) {
             return sessions[0].label;
         }
-        return localize(5013, "{0} agent sessions", sessions.length);
+        return localize(5150, "{0} agent sessions", sessions.length);
     }
     onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         return false;
@@ -674,4 +783,4 @@ let AgentSessionsDragAndDrop = class AgentSessionsDragAndDrop extends Disposable
 };
 AgentSessionsDragAndDrop = ( __decorate([( __param(0, IInstantiationService))], AgentSessionsDragAndDrop));
 
-export { AgentSessionRenderer, AgentSessionSectionLabels, AgentSessionSectionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionsSorter, groupAgentSessionsByDate, toStatusLabel };
+export { AgentSessionRenderer, AgentSessionSectionLabels, AgentSessionSectionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionsSorter, groupAgentSessionsByDate, sessionDateFromNow, toStatusLabel };