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

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

@@ -9,7 +9,7 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 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 { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { AgentSessionProviders, getAgentSessionProviderName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { getAgentSessionProvider, getAgentSessionProviderName, AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 
@@ -30,6 +30,7 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
         this.options = options;
         this.chatSessionsService = chatSessionsService;
         this.storageService = storageService;
+        this.STORAGE_KEY = `agentSessions.filterExcludes.agentsessionsviewerfiltersubmenu`;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this.limitResults = () => this.options.limitResults?.();
@@ -37,7 +38,6 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
         this.excludes = DEFAULT_EXCLUDES;
         this.isStoringExcludes = false;
         this.actionDisposables = this._register(( new DisposableStore()));
-        this.STORAGE_KEY = `agentSessions.filterExcludes.${this.options.filterMenuId.id.toLowerCase()}`;
         this.updateExcludes(false);
         this.registerListeners();
     }
@@ -94,25 +94,45 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
     }
     updateFilterActions() {
         this.actionDisposables.clear();
-        this.registerProviderActions(this.actionDisposables);
-        this.registerStateActions(this.actionDisposables);
-        this.registerArchivedActions(this.actionDisposables);
-        this.registerReadActions(this.actionDisposables);
-        this.registerResetAction(this.actionDisposables);
+        const menuId = this.options.filterMenuId;
+        if (!menuId) {
+            return;
+        }
+        this.registerProviderActions(this.actionDisposables, menuId);
+        this.registerStateActions(this.actionDisposables, menuId);
+        this.registerArchivedActions(this.actionDisposables, menuId);
+        this.registerReadActions(this.actionDisposables, menuId);
+        this.registerResetAction(this.actionDisposables, menuId);
     }
-    registerProviderActions(disposables) {
-        const providers = ( ( Object.values(AgentSessionProviders)).map(provider => ({
-            id: provider,
-            label: getAgentSessionProviderName(provider)
-        })));
-        for (const provider of this.chatSessionsService.getAllChatSessionContributions()) {
-            if (providers.find(p => p.id === provider.type)) {
-                continue;
+    registerProviderActions(disposables, menuId) {
+        const labelOverrides = this.options.providerLabelOverrides;
+        const resolveLabel = id => {
+            if (labelOverrides?.has(id)) {
+                return labelOverrides.get(id);
+            }
+            const knownProvider = getAgentSessionProvider(id);
+            return knownProvider ? getAgentSessionProviderName(knownProvider) : id;
+        };
+        let providers;
+        if (this.options.allowedProviders) {
+            providers = ( this.options.allowedProviders.map(id => ({
+                id,
+                label: resolveLabel(id)
+            })));
+        } else {
+            providers = [{
+                id: AgentSessionProviders.Local,
+                label: resolveLabel(AgentSessionProviders.Local)
+            }];
+            for (const contribution of this.chatSessionsService.getAllChatSessionContributions()) {
+                if (providers.find(p => p.id === contribution.type)) {
+                    continue;
+                }
+                providers.push({
+                    id: contribution.type,
+                    label: resolveLabel(contribution.type)
+                });
             }
-            providers.push({
-                id: provider.type,
-                label: provider.name
-            });
         }
         const that = this;
         let counter = 0;
@@ -120,10 +140,10 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             disposables.add(registerAction2(class extends Action2 {
                 constructor() {
                     super({
-                        id: `agentSessions.filter.toggleExclude:${provider.id}.${that.options.filterMenuId.id.toLowerCase()}`,
+                        id: `agentSessions.filter.toggleExclude:${provider.id}.${menuId.id.toLowerCase()}`,
                         title: provider.label,
                         menu: {
-                            id: that.options.filterMenuId,
+                            id: menuId,
                             group: "1_providers",
                             order: counter++
                         },
@@ -143,19 +163,19 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             }));
         }
     }
-    registerStateActions(disposables) {
+    registerStateActions(disposables, menuId) {
         const states = [{
             id: ChatSessionStatus.Completed,
-            label: ( localize(4975, "Completed"))
+            label: ( localize(5111, "Completed"))
         }, {
             id: ChatSessionStatus.InProgress,
-            label: ( localize(4976, "In Progress"))
+            label: ( localize(5112, "In Progress"))
         }, {
             id: ChatSessionStatus.NeedsInput,
-            label: ( localize(4977, "Input Needed"))
+            label: ( localize(5113, "Input Needed"))
         }, {
             id: ChatSessionStatus.Failed,
-            label: ( localize(4978, "Failed"))
+            label: ( localize(5114, "Failed"))
         }];
         const that = this;
         let counter = 0;
@@ -163,10 +183,10 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             disposables.add(registerAction2(class extends Action2 {
                 constructor() {
                     super({
-                        id: `agentSessions.filter.toggleExcludeState:${state.id}.${that.options.filterMenuId.id.toLowerCase()}`,
+                        id: `agentSessions.filter.toggleExcludeState:${state.id}.${menuId.id.toLowerCase()}`,
                         title: state.label,
                         menu: {
-                            id: that.options.filterMenuId,
+                            id: menuId,
                             group: "2_states",
                             order: counter++
                         },
@@ -186,15 +206,15 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             }));
         }
     }
-    registerArchivedActions(disposables) {
+    registerArchivedActions(disposables, menuId) {
         const that = this;
         disposables.add(registerAction2(class extends Action2 {
             constructor() {
                 super({
-                    id: `agentSessions.filter.toggleExcludeArchived.${that.options.filterMenuId.id.toLowerCase()}`,
-                    title: ( localize(4979, "Archived")),
+                    id: `agentSessions.filter.toggleExcludeArchived.${menuId.id.toLowerCase()}`,
+                    title: ( localize(5115, "Archived")),
                     menu: {
-                        id: that.options.filterMenuId,
+                        id: menuId,
                         group: "3_props",
                         order: 1000
                     },
@@ -209,15 +229,15 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             }
         }));
     }
-    registerReadActions(disposables) {
+    registerReadActions(disposables, menuId) {
         const that = this;
         disposables.add(registerAction2(class extends Action2 {
             constructor() {
                 super({
-                    id: `agentSessions.filter.toggleExcludeRead.${that.options.filterMenuId.id.toLowerCase()}`,
-                    title: ( localize(4980, "Read")),
+                    id: `agentSessions.filter.toggleExcludeRead.${menuId.id.toLowerCase()}`,
+                    title: ( localize(5116, "Read")),
                     menu: {
-                        id: that.options.filterMenuId,
+                        id: menuId,
                         group: "3_props",
                         order: 0
                     },
@@ -232,24 +252,22 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
             }
         }));
     }
-    registerResetAction(disposables) {
+    registerResetAction(disposables, menuId) {
         const that = this;
         disposables.add(registerAction2(class extends Action2 {
             constructor() {
                 super({
-                    id: `agentSessions.filter.resetExcludes.${that.options.filterMenuId.id.toLowerCase()}`,
-                    title: ( localize(4981, "Reset")),
+                    id: `agentSessions.filter.resetExcludes.${menuId.id.toLowerCase()}`,
+                    title: ( localize(5117, "Reset")),
                     menu: {
-                        id: that.options.filterMenuId,
+                        id: menuId,
                         group: "4_reset",
                         order: 0
                     }
                 });
             }
             run() {
-                that.storeExcludes({
-                    ...DEFAULT_EXCLUDES
-                });
+                that.reset();
             }
         }));
     }
@@ -264,6 +282,9 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
         if (typeof overrideExclude === "boolean") {
             return overrideExclude;
         }
+        if (this.options.allowedProviders && !this.options.allowedProviders.includes(session.providerType)) {
+            return true;
+        }
         if (this.excludes.read && session.isRead()) {
             return true;
         }
@@ -281,6 +302,11 @@ let AgentSessionsFilter = class AgentSessionsFilter extends Disposable {
     notifyResults(count) {
         this.options.notifyResults?.(count);
     }
+    reset() {
+        this.storeExcludes({
+            ...DEFAULT_EXCLUDES
+        });
+    }
 };
 AgentSessionsFilter = ( __decorate([( __param(1, IChatSessionsService)), ( __param(2, IStorageService))], AgentSessionsFilter));
 

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

@@ -72,7 +72,7 @@ async function openSessionDefault(accessor, session, openOptions) {
             target = ChatViewPaneTarget;
         }
         const isLocalChatSession = session.resource.scheme === Schemas.vscodeChatEditor || session.resource.scheme === Schemas.vscodeLocalChatSession;
-        if (!isLocalChatSession && !(await chatSessionsService.canResolveChatSession(session.resource))) {
+        if (!isLocalChatSession && !(await chatSessionsService.canResolveChatSession(session.resource.scheme))) {
             target = openOptions?.sideBySide ? SIDE_GROUP : ACTIVE_GROUP;
             options = {
                 ...options,
@@ -81,7 +81,7 @@ async function openSessionDefault(accessor, session, openOptions) {
         }
         return await chatWidgetService.openSession(session.resource, target, options);
     } catch (error) {
-        notificationService.error(( localize(4983, "Failed to open chat session: {0}", toErrorMessage(error))));
+        notificationService.error(( localize(5119, "Failed to open chat session: {0}", toErrorMessage(error))));
         return undefined;
     }
 }

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

@@ -20,38 +20,52 @@ import { MenuWorkbenchToolBar } from "@codingame/monaco-vscode-api/vscode/vs/pla
 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 { AgentSessionApprovalModel } from "./agentSessionApprovalModel.js";
 export type AgentSessionListItem = IAgentSession | IAgentSessionSection;
 interface IAgentSessionItemTemplate {
     readonly element: HTMLElement;
     readonly icon: HTMLElement;
     readonly title: IconLabel;
+    readonly statusContainer: HTMLElement;
+    readonly statusProviderIcon: HTMLElement;
+    readonly statusTime: HTMLElement;
     readonly titleToolbar: MenuWorkbenchToolBar;
     readonly diffContainer: HTMLElement;
     readonly diffAddedSpan: HTMLSpanElement;
     readonly diffRemovedSpan: HTMLSpanElement;
     readonly badge: HTMLElement;
+    readonly separator: HTMLElement;
     readonly description: HTMLElement;
-    readonly statusContainer: HTMLElement;
-    readonly statusProviderIcon: HTMLElement;
-    readonly statusTime: HTMLElement;
+    readonly approvalRow: HTMLElement;
+    readonly approvalLabel: HTMLElement;
+    readonly approvalButtonContainer: HTMLElement;
     readonly contextKeyService: IContextKeyService;
     readonly elementDisposable: DisposableStore;
     readonly disposables: IDisposable;
 }
 export interface IAgentSessionRendererOptions {
+    readonly disableHover?: boolean;
+    readonly showIsolationIcon?: boolean;
     getHoverPosition(): HoverPosition;
 }
 export declare class AgentSessionRenderer extends Disposable implements ICompressibleTreeRenderer<IAgentSession, FuzzyScore, IAgentSessionItemTemplate> {
     private readonly options;
+    private readonly _approvalModel;
     private readonly markdownRendererService;
     private readonly productService;
     private readonly hoverService;
     private readonly instantiationService;
     private readonly contextKeyService;
     static readonly TEMPLATE_ID = "agent-session";
+    static readonly APPROVAL_ROW_MAX_LINES = 3;
+    private static readonly _APPROVAL_ROW_LINE_HEIGHT;
+    private static readonly _APPROVAL_ROW_OVERHEAD;
+    static getApprovalRowHeight(label: string): number;
     readonly templateId = "agent-session";
     private readonly sessionHover;
-    constructor(options: IAgentSessionRendererOptions, markdownRendererService: IMarkdownRendererService, productService: IProductService, hoverService: IHoverService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService);
+    private readonly _onDidChangeItemHeight;
+    readonly onDidChangeItemHeight: Event<IAgentSession>;
+    constructor(options: IAgentSessionRendererOptions, _approvalModel: AgentSessionApprovalModel | 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;
@@ -63,6 +77,7 @@ export declare class AgentSessionRenderer extends Disposable implements ICompres
     private renderStatus;
     private renderHover;
     private buildHoverContent;
+    private renderApprovalRow;
     renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IAgentSession>, FuzzyScore>, index: number, templateData: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void;
     disposeElement(element: ITreeNode<IAgentSession, FuzzyScore>, index: number, template: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void;
     disposeTemplate(templateData: IAgentSessionItemTemplate): void;
@@ -88,9 +103,12 @@ export declare class AgentSessionSectionRenderer implements ICompressibleTreeRen
     disposeTemplate(templateData: IAgentSessionSectionTemplate): void;
 }
 export declare class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSessionListItem> {
-    static readonly ITEM_HEIGHT = 52;
+    private readonly _approvalModel?;
+    static readonly ITEM_HEIGHT = 54;
     static readonly SECTION_HEIGHT = 26;
+    constructor(_approvalModel?: AgentSessionApprovalModel | undefined);
     getHeight(element: AgentSessionListItem): number;
+    hasDynamicHeight(element: AgentSessionListItem): boolean;
     getTemplateId(element: AgentSessionListItem): string;
 }
 export declare class AgentSessionsAccessibilityProvider implements IListAccessibilityProvider<AgentSessionListItem> {
@@ -133,11 +151,21 @@ export interface IAgentSessionsFilter {
      * Get the current filter excludes for display in the UI.
      */
     getExcludes(): IAgentSessionsFilterExcludes;
+    /**
+     * Whether the filter is at its default state (no custom filters applied).
+     */
+    isDefault(): boolean;
+    /**
+     * Reset the filter to its default state.
+     */
+    reset(): void;
 }
-export declare class AgentSessionsDataSource implements IAsyncDataSource<IAgentSessionsModel, AgentSessionListItem> {
+export declare class AgentSessionsDataSource extends Disposable implements IAsyncDataSource<IAgentSessionsModel, AgentSessionListItem> {
     private readonly filter;
     private readonly sorter;
     private static readonly CAPPED_SESSIONS_LIMIT;
+    private readonly _onDidGetChildren;
+    readonly onDidGetChildren: Event<number>;
     constructor(filter: IAgentSessionsFilter | undefined, sorter: ITreeSorter<IAgentSession>);
     hasChildren(element: IAgentSessionsModel | AgentSessionListItem): boolean;
     getChildren(element: IAgentSessionsModel | AgentSessionListItem): Iterable<AgentSessionListItem>;
@@ -146,7 +174,6 @@ export declare class AgentSessionsDataSource implements IAsyncDataSource<IAgentS
     private groupSessionsByDate;
 }
 export declare const AgentSessionSectionLabels: {
-    inProgress: string;
     today: string;
     yesterday: string;
     week: string;
@@ -155,6 +182,7 @@ export declare const AgentSessionSectionLabels: {
     more: string;
 };
 export declare function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSessionSection, IAgentSessionSection>;
+export declare function sessionDateFromNow(sessionTime: number): string;
 export declare class AgentSessionsIdentityProvider implements IIdentityProvider<IAgentSessionsModel | AgentSessionListItem> {
     getId(element: IAgentSessionsModel | AgentSessionListItem): string;
     getGroupId(element: IAgentSessionsModel | AgentSessionListItem): number | NotSelectableGroupIdType;