@codingame/monaco-vscode-katex-common 27.0.0 → 28.0.1

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, 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());
@@ -81,7 +105,10 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
                         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]))));
@@ -113,6 +140,9 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
             statusContainer: elements.statusContainer,
             statusProviderIcon: elements.statusProviderIcon,
             statusTime: elements.statusTime,
+            approvalRow: elements.approvalRow,
+            approvalLabel: elements.approvalLabel,
+            approvalButtonContainer: elements.approvalButtonContainer,
             contextKeyService,
             elementDisposable,
             disposables
@@ -159,6 +189,9 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
         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;
@@ -219,9 +252,9 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
             return;
         }
         if (session.element.status === ChatSessionStatus.InProgress) {
-            template.description.textContent = ( localize(5104, "Working..."));
+            template.description.textContent = ( localize(5126, "Working..."));
         } else if (session.element.status === ChatSessionStatus.NeedsInput) {
-            template.description.textContent = ( localize(5105, "Input needed."));
+            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,
@@ -229,15 +262,15 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
                 false,
                 true
             );
-            template.description.textContent = session.element.status === ChatSessionStatus.Failed ? ( localize(5106, "Failed after {0}", duration)) : ( localize(5107, "Completed in {0}", duration));
+            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(5108, "Failed")) : ( localize(5109, "Completed"));
+            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(5110, "now");
+            return localize(5132, "now");
         }
         return getDurationString(elapsed, useFullTimeWords);
     }
@@ -251,7 +284,7 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
                 const date = getAgentSessionTime(session.timing);
                 const seconds = Math.round((( new Date()).getTime() - date) / 1000);
                 if (seconds < 60) {
-                    timeLabel = ( localize(5110, "now"));
+                    timeLabel = ( localize(5132, "now"));
                 } else {
                     timeLabel = sessionDateFromNow(date);
                 }
@@ -259,7 +292,15 @@ let AgentSessionRenderer = class AgentSessionRenderer extends Disposable {
             return timeLabel;
         };
         const isLocal = session.element.providerType === AgentSessionProviders.Local;
-        template.statusProviderIcon.className = isLocal ? "" : `agent-session-status-provider-icon ${ThemeIcon.asClassName(session.element.icon)}`;
+        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(
@@ -297,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"));
     }
@@ -307,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(5111, "Needs Input"));
+        statusLabel = ( localize(5135, "Needs Input"));
         break;
     case ChatSessionStatus.InProgress:
-        statusLabel = ( localize(5112, "In Progress"));
+        statusLabel = ( localize(5136, "In Progress"));
         break;
     case ChatSessionStatus.Failed:
-        statusLabel = ( localize(5113, "Failed"));
+        statusLabel = ( localize(5137, "Failed"));
         break;
     default:
-        statusLabel = ( localize(5114, "Completed"));
+        statusLabel = ( localize(5138, "Completed"));
     }
     return statusLabel;
 }
@@ -385,11 +475,22 @@ class AgentSessionsListDelegate {
     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)) {
@@ -406,14 +507,14 @@ class AgentSessionsAccessibilityProvider {
         return "listitem";
     }
     getWidgetAriaLabel() {
-        return localize(5115, "Agent Sessions");
+        return localize(5139, "Agent Sessions");
     }
     getAriaLabel(element) {
         if (isAgentSessionSection(element)) {
-            return localize(5116, "{0} sessions section", element.label);
+            return localize(5140, "{0} sessions section", element.label);
         }
         return localize(
-            5117,
+            5141,
             "{0} session {1} ({2}), created {3}",
             element.providerLabel,
             element.label,
@@ -422,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)) {
@@ -452,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);
             }
@@ -515,12 +620,12 @@ class AgentSessionsDataSource {
     }
 }
 const AgentSessionSectionLabels = {
-    [AgentSessionSection.Today]: ( localize(5118, "Today")),
-    [AgentSessionSection.Yesterday]: ( localize(5119, "Yesterday")),
-    [AgentSessionSection.Week]: ( localize(5120, "Last 7 days")),
-    [AgentSessionSection.Older]: ( localize(5121, "Older")),
-    [AgentSessionSection.Archived]: ( localize(5122, "Archived")),
-    [AgentSessionSection.More]: ( localize(5123, "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;
@@ -578,10 +683,10 @@ function sessionDateFromNow(sessionTime) {
     const startOfYesterday = startOfToday - DAY_THRESHOLD;
     const startOfTwoDaysAgo = startOfYesterday - DAY_THRESHOLD;
     if (sessionTime < startOfToday && sessionTime >= startOfYesterday) {
-        return localize(5124, "1 day");
+        return localize(5148, "1 day");
     }
     if (sessionTime < startOfYesterday && sessionTime >= startOfTwoDaysAgo) {
-        return localize(5125, "2 days");
+        return localize(5149, "2 days");
     }
     return fromNow(sessionTime, false);
 }
@@ -669,7 +774,7 @@ let AgentSessionsDragAndDrop = class AgentSessionsDragAndDrop extends Disposable
         if (sessions.length === 1) {
             return sessions[0].label;
         }
-        return localize(5126, "{0} agent sessions", sessions.length);
+        return localize(5150, "{0} agent sessions", sessions.length);
     }
     onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         return false;

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css

@@ -251,6 +251,53 @@
 				}
 			}
 		}
+		.agent-session-approval-row {
+			display: none;
+			align-items: flex-end;
+			gap: 8px;
+			margin-top: 4px;
+			padding: 4px 8px;
+			box-sizing: border-box;
+			border: 1px solid var(--vscode-contrastBorder, var(--vscode-widget-border, transparent));
+			border-radius: 4px;
+			background-color: var(--vscode-editor-background);
+			color: var(--vscode-editor-foreground);
+
+			&.visible {
+				display: flex;
+			}
+
+			.agent-session-approval-label {
+				flex: 1;
+				overflow: hidden;
+				min-width: 0;
+
+				& > .rendered-markdown,
+				& > .rendered-markdown > .code,
+				& > .rendered-markdown > .code > span {
+					display: block;
+					overflow: hidden;
+				}
+
+				.monaco-tokenized-source {
+					display: block;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-size: 12px;
+				}
+			}
+
+			.agent-session-approval-button {
+				flex-shrink: 0;
+
+				.monaco-button {
+					padding: 2px 10px;
+					font-size: 12px;
+					white-space: nowrap;
+				}
+			}
+		}
 	}
 
 	.agent-session-section {
@@ -297,4 +344,26 @@
 	.monaco-list:not(:focus) .monaco-list-row.selected .agent-session-section-label {
 		color: var(--vscode-list-inactiveSelectionForeground);
 	}
+
+	.agent-sessions-empty-filter-message {
+		padding: 8px 12px;
+		font-size: 12px;
+		color: var(--vscode-descriptionForeground);
+
+		.reset-filter-link {
+			color: var(--vscode-textLink-foreground);
+			cursor: pointer;
+			text-decoration: none;
+
+			&:hover {
+				text-decoration: underline;
+			}
+
+			&:focus-visible {
+				text-decoration: underline;
+				outline: 1px solid var(--vscode-focusBorder);
+				outline-offset: 1px;
+			}
+		}
+	}
 }