@codingame/monaco-vscode-walkthrough-service-override 26.2.2 → 28.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-walkthrough-service-override",
-  "version": "26.2.2",
+  "version": "28.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - walkthrough service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.2",
-    "@codingame/monaco-vscode-katex-common": "26.2.2",
+    "@codingame/monaco-vscode-api": "28.0.0",
+    "@codingame/monaco-vscode-katex-common": "28.0.0",
     "marked": "14.0.0"
   },
   "main": "index.js",

package/vscode/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.d.ts

@@ -55,22 +55,22 @@ export declare class AgentSessionsWelcomePage extends EditorPane {
     private chatModelRef;
     private sessionsControl;
     private sessionsControlContainer;
-    private sessionsLoadingContainer;
     private readonly sessionsControlDisposables;
     private readonly contentDisposables;
     private contextService;
     private walkthroughs;
     private _selectedSessionProvider;
     private _selectedWorkspace;
-    private _recentWorkspaces;
+    private _recentTrustedWorkspaces;
     private _isEmptyWorkspace;
     private _workspaceKind;
-    private _storedInput;
     private _openedAt;
-    private _closedBy;
+    private _closedBy?;
+    private _storedInput;
     constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, layoutService: IWorkbenchLayoutService, commandService: ICommandService, editorService: IEditorService, agentSessionsService: IAgentSessionsService, configurationService: IConfigurationService, productService: IProductService, walkthroughsService: IWalkthroughsService, chatService: IChatService, chatEntitlementService: IChatEntitlementService, markdownRendererService: IMarkdownRendererService, workspaceContextService: IWorkspaceContextService, workspacesService: IWorkspacesService, hostService: IHostService, workspaceTrustManagementService: IWorkspaceTrustManagementService, viewDescriptorService: IViewDescriptorService, chatWidgetService: IChatWidgetService, logService: ILogService);
     protected createEditor(parent: HTMLElement): void;
     setInput(input: AgentSessionsWelcomeInput, options: AgentSessionsWelcomeEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    clearInput(): void;
     private buildContent;
     private buildStartEntries;
     private buildChatWidget;
@@ -83,8 +83,6 @@ export declare class AgentSessionsWelcomePage extends EditorPane {
      */
     private applyPrefillData;
     private buildSessionsOrPrompts;
-    private buildLoadingSkeleton;
-    private hideLoadingSkeleton;
     private buildSessionsGrid;
     private buildWalkthroughs;
     private static readonly PRIVACY_NOTICE_DISMISSED_KEY;
@@ -98,7 +96,7 @@ export declare class AgentSessionsWelcomePage extends EditorPane {
     private revealMaximizedChat;
     private openSessionInChat;
     private closeEditorAndMaximizeAuxiliaryBar;
-    dispose(): void;
+    private getRecentlyOpenedWorkspaces;
 }
 export declare class AgentSessionsWelcomeInputSerializer implements IEditorSerializer {
     canSerialize(editorInput: AgentSessionsWelcomeInput): boolean;

package/vscode/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.js

@@ -46,11 +46,13 @@ import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/wo
 import { AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import './agentSessionsWelcomeInput.js';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { ChatViewPaneTarget, ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { getResourceForNewChatSession, ChatSessionPosition } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { AgentSessionsControl } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl';
+import { AgentSessionsFilter } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter';
+import { AgentSessionsListDelegate } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IWalkthroughsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service';
 import { GettingStartedInput } from '../../welcomeGettingStarted/browser/gettingStartedInput.js';
@@ -58,7 +60,7 @@ import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { isRecentWorkspace, isRecentFolder } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces';
+import { isRecentFolder, isRecentWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces';
 import { IWorkspacesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
@@ -138,15 +140,14 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         this.contentDisposables = this._register(( new DisposableStore()));
         this.walkthroughs = [];
         this._selectedSessionProvider = AgentSessionProviders.Local;
-        this._recentWorkspaces = [];
+        this._recentTrustedWorkspaces = [];
         this._isEmptyWorkspace = false;
         this._workspaceKind = "empty";
         this._openedAt = 0;
-        this._closedBy = "unknown";
         this.container = $(".agentSessionsWelcome", {
             role: "document",
             tabindex: 0,
-            "aria-label": ( localize(13718, "Overview of agent sessions and how to get started."))
+            "aria-label": ( localize(14842, "Overview of agent sessions and how to get started."))
         });
         this.contextService = this._register(contextKeyService.createScoped(this.container));
         ChatContextKeys.inAgentSessionsWelcome.bindTo(this.contextService).set(true);
@@ -169,10 +170,23 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
     }
     async setInput(input, options, context, token) {
         this._storedInput = input;
+        this._openedAt = Date.now();
         await super.setInput(input, options, context, token);
         this._workspaceKind = input.workspaceKind ?? "empty";
         await this.buildContent();
     }
+    clearInput() {
+        if (this._openedAt > 0) {
+            const visibleDurationMs = Date.now() - this._openedAt;
+            this.telemetryService.publicLog2("agentSessionsWelcome.closed", {
+                visibleDurationMs,
+                closedBy: this._closedBy ?? "disposed"
+            });
+            this._openedAt = 0;
+            this._closedBy = undefined;
+        }
+        super.clearInput();
+    }
     async buildContent() {
         this.contentDisposables.clear();
         this.sessionsControlDisposables.clear();
@@ -180,24 +194,14 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         clearNode(this.contentContainer);
         this._isEmptyWorkspace = this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY;
         if (this._isEmptyWorkspace) {
-            const recentlyOpened = await this.workspacesService.getRecentlyOpened();
-            const trustInfoPromises = ( recentlyOpened.workspaces.map(async ws => {
-                const uri = isRecentWorkspace(ws) ? ws.workspace.configPath : ws.folderUri;
-                const trustInfo = await this.workspaceTrustManagementService.getUriTrustInfo(uri);
-                return {
-                    workspace: ws,
-                    trusted: trustInfo.trusted
-                };
-            }));
-            const trustInfoResults = await Promise.all(trustInfoPromises);
-            const filteredWorkspaces = ( trustInfoResults.filter(result => result.trusted).map(result => result.workspace));
-            this._recentWorkspaces = filteredWorkspaces.slice(0, MAX_REPO_PICKS);
+            const recentlyOpened = await this.getRecentlyOpenedWorkspaces(true);
+            this._recentTrustedWorkspaces = recentlyOpened.slice(0, MAX_REPO_PICKS);
         }
         this.walkthroughs = this.walkthroughsService.getWalkthroughs();
         const header = append(this.contentContainer, $(".agentSessionsWelcome-header"));
         append(header, $("h1.product-name", {}, this.productService.nameLong));
         const startEntries = append(header, $(".agentSessionsWelcome-startEntries"));
-        this.buildStartEntries(startEntries);
+        await this.buildStartEntries(startEntries);
         const chatSection = append(this.contentContainer, $(".agentSessionsWelcome-chatSection"));
         this.buildChatWidget(chatSection);
         const sessionsSection = append(this.contentContainer, $(".agentSessionsWelcome-sessionsSection"));
@@ -216,18 +220,24 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         }));
         this.scrollableElement?.scanDomNode();
     }
-    buildStartEntries(container) {
-        const entries = [{
+    async buildStartEntries(container) {
+        const workspaces = await this.getRecentlyOpenedWorkspaces(false);
+        const openEntry = workspaces.length > 0 ? {
             icon: Codicon.folderOpened,
-            label: ( localize(13719, "Open Recent...")),
+            label: ( localize(14843, "Open Recent...")),
             command: "workbench.action.openRecent"
-        }, {
+        } : {
+            icon: Codicon.folderOpened,
+            label: ( localize(14844, "Open Folder...")),
+            command: "workbench.action.files.openFolder"
+        };
+        const entries = [openEntry, {
             icon: Codicon.newFile,
-            label: ( localize(13720, "New file...")),
-            command: "workbench.action.files.newUntitledFile"
+            label: ( localize(14845, "New file...")),
+            command: "welcome.showNewFileEntries"
         }, {
             icon: Codicon.repoClone,
-            label: ( localize(13721, "Clone Git Repository...")),
+            label: ( localize(14846, "Clone Git Repository...")),
             command: "git.clone"
         }];
         for (const entry of entries) {
@@ -235,7 +245,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             button.appendChild(renderIcon(entry.icon));
             button.appendChild(document.createTextNode(entry.label));
             button.onclick = () => {
-                this.telemetryService.publicLog2("gettingStarted.ActionExecuted", {
+                this.telemetryService.publicLog2("agentSessionsWelcome.ActionExecuted", {
                     welcomeKind: "agentSessionsWelcomePage",
                     action: "executeCommand",
                     actionId: entry.command
@@ -258,8 +268,8 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
                 const newResource = getResourceForNewChatSession({
                     type: provider,
                     position: ChatSessionPosition.Sidebar});
-                const ref = await this.chatService.loadSessionForResource(newResource, ChatAgentLocation.Chat, CancellationToken.None);
-                this.chatModelRef = ref ?? this.chatService.startSession(ChatAgentLocation.Chat);
+                const ref = await this.chatService.acquireOrLoadSession(newResource, ChatAgentLocation.Chat, CancellationToken.None);
+                this.chatModelRef = ref ?? this.chatService.startNewLocalSession(ChatAgentLocation.Chat);
                 this.contentDisposables.add(this.chatModelRef);
                 if (this.chatModelRef.object) {
                     this.chatWidget.setModel(this.chatModelRef.object);
@@ -280,7 +290,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         const onDidChangeSelectedWorkspace = this.contentDisposables.add(( new Emitter()));
         const onDidChangeWorkspaces = this.contentDisposables.add(( new Emitter()));
         const workspacePickerDelegate = this._isEmptyWorkspace ? {
-            getWorkspaces: () => ( this._recentWorkspaces.map(w => ({
+            getWorkspaces: () => ( this._recentTrustedWorkspaces.map(w => ({
                 uri: this.getWorkspaceUri(w),
                 label: this.getWorkspaceLabel(w),
                 isFolder: isRecentFolder(w)
@@ -329,7 +339,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         this.contentDisposables.add(scheduleAtNextAnimationFrame(getWindow(chatWidgetContainer), () => {
             this.layoutChatWidget();
         }));
-        this.chatModelRef = this.chatService.startSession(ChatAgentLocation.Chat);
+        this.chatModelRef = this.chatService.startNewLocalSession(ChatAgentLocation.Chat);
         this.contentDisposables.add(this.chatModelRef);
         if (this.chatModelRef.object) {
             this.chatWidget.setModel(this.chatModelRef.object);
@@ -390,7 +400,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             StorageScope.APPLICATION,
             StorageTarget.MACHINE
         );
-        const workspace = this._recentWorkspaces.find(w => ( this.getWorkspaceUri(w).toString()) === this._selectedWorkspace?.uri.toString());
+        const workspace = this._recentTrustedWorkspaces.find(w => ( this.getWorkspaceUri(w).toString()) === this._selectedWorkspace?.uri.toString());
         if (workspace) {
             try {
                 if (isRecentFolder(workspace)) {
@@ -434,7 +444,6 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
     buildSessionsOrPrompts(container) {
         this.sessionsControlDisposables.clear();
         this.sessionsControl = undefined;
-        this.sessionsLoadingContainer = undefined;
         const sessions = this.agentSessionsService.model.sessions.filter(s => !s.isArchived());
         if (sessions.length > 0) {
             this.buildSessionsGrid(container, sessions);
@@ -442,60 +451,23 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             this.buildWalkthroughs(container);
         }
     }
-    buildLoadingSkeleton(container) {
-        const loadingContainer = append(container, $(".agentSessionsWelcome-sessionsLoading", {
-            "role": "status",
-            "aria-busy": "true",
-            "aria-label": ( localize(13722, "Loading sessions..."))
-        }));
-        for (let i = 0; i < MAX_SESSIONS; i++) {
-            const skeleton = append(loadingContainer, $(".agentSessionsWelcome-sessionSkeleton", {
-                "aria-hidden": "true"
-            }));
-            append(skeleton, $(".agentSessionsWelcome-sessionSkeleton-icon"));
-            const content = append(skeleton, $(".agentSessionsWelcome-sessionSkeleton-content"));
-            append(content, $(".agentSessionsWelcome-sessionSkeleton-title"));
-            append(content, $(".agentSessionsWelcome-sessionSkeleton-description"));
-        }
-        return loadingContainer;
-    }
-    hideLoadingSkeleton() {
-        if (this.sessionsLoadingContainer) {
-            this.sessionsLoadingContainer.style.display = "none";
-        }
-        if (this.sessionsControlContainer) {
-            this.sessionsControlContainer.style.display = "";
-            this.layoutSessionsControl();
-        }
-    }
     buildSessionsGrid(container, _sessions) {
-        this.sessionsLoadingContainer = this.buildLoadingSkeleton(container);
         this.sessionsControlContainer = append(container, $(".agentSessionsWelcome-sessionsGrid"));
-        this.sessionsControlContainer.style.display = "none";
-        const onDidChangeEmitter = this.sessionsControlDisposables.add(( new Emitter()));
-        const filter = {
-            onDidChange: onDidChangeEmitter.event,
-            limitResults: () => MAX_SESSIONS,
-            exclude: session => session.isArchived(),
-            getExcludes: () => ({
-                providers: [],
-                states: [],
-                archived: true,
-                read: false
-            })
-        };
         const options = {
             overrideStyles: getListStyles({
                 listBackground: editorBackground
             }),
-            filter,
+            filter: this.sessionsControlDisposables.add(this.instantiationService.createInstance(AgentSessionsFilter, {
+                limitResults: () => MAX_SESSIONS,
+                overrideExclude: session => session.isArchived() ? true : undefined
+            })),
             getHoverPosition: () => HoverPosition.BELOW,
             trackActiveEditorSession: () => false,
             source: "welcomeView",
             notifySessionOpened: () => {
-                this._closedBy = "sessionClicked";
                 const isProjectionEnabled = this.configurationService.getValue(ChatConfiguration.AgentSessionProjectionEnabled);
                 if (!isProjectionEnabled) {
+                    this._closedBy = "sessionClicked";
                     this.revealMaximizedChat();
                 }
             }
@@ -504,10 +476,10 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, options)
         );
         this.sessionsControlDisposables.add(this.agentSessionsService.model.onDidResolve(() => {
-            this.hideLoadingSkeleton();
+            this.layoutSessionsControl();
         }));
         if (this.agentSessionsService.model.resolved) {
-            this.hideLoadingSkeleton();
+            this.layoutSessionsControl();
         }
         this.sessionsControlDisposables.add(
             scheduleAtNextAnimationFrame(getWindow(this.sessionsControlContainer), () => {
@@ -515,7 +487,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             })
         );
         const openButton = append(container, $("button.agentSessionsWelcome-openSessionsButton"));
-        openButton.textContent = ( localize(13723, "View All Sessions"));
+        openButton.textContent = ( localize(14847, "View All Sessions"));
         openButton.onclick = () => {
             this._closedBy = "viewAllSessions";
             this.revealMaximizedChat();
@@ -535,10 +507,10 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         const navContainer = append(card, $(".agentSessionsWelcome-walkthroughCard-nav"));
         const prevButton = append(navContainer, $("button.nav-button"));
         prevButton.appendChild(renderIcon(Codicon.chevronLeft));
-        prevButton.title = ( localize(13724, "Previous"));
+        prevButton.title = ( localize(14848, "Previous"));
         const nextButton = append(navContainer, $("button.nav-button"));
         nextButton.appendChild(renderIcon(Codicon.chevronRight));
-        nextButton.title = ( localize(13725, "Next"));
+        nextButton.title = ( localize(14849, "Next"));
         const updateContent = () => {
             const walkthrough = activeWalkthroughs[currentIndex];
             clearNode(iconContainer);
@@ -553,7 +525,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         updateContent();
         card.onclick = () => {
             const walkthrough = activeWalkthroughs[currentIndex];
-            this.telemetryService.publicLog2("gettingStarted.ActionExecuted", {
+            this.telemetryService.publicLog2("agentSessionsWelcome.ActionExecuted", {
                 welcomeKind: "agentSessionsWelcomePage",
                 action: "openWalkthrough",
                 actionId: walkthrough.id
@@ -618,10 +590,10 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         iconContainer.appendChild(renderIcon(Codicon.chatSparkle));
         const content = append(tosCard, $(".agentSessionsWelcome-walkthroughCard-content"));
         const title = append(content, $(".agentSessionsWelcome-walkthroughCard-title"));
-        title.textContent = ( localize(13726, "Your GitHub Copilot trial is active"));
+        title.textContent = ( localize(14850, "Try GitHub Copilot for free, no sign-in required!"));
         const desc = append(content, $(".agentSessionsWelcome-walkthroughCard-description"));
         const descriptionMarkdown = ( new MarkdownString(( localize(
-            13727,
+            14851,
             "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
             providers.default.name,
             this.productService.defaultChatAgent.termsStatementUrl,
@@ -633,7 +605,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         desc.appendChild(renderedMarkdown.element);
         const dismissButton = append(tosCard, $("button.agentSessionsWelcome-tosCard-dismiss"));
         dismissButton.appendChild(renderIcon(Codicon.close));
-        dismissButton.title = ( localize(13728, "Dismiss"));
+        dismissButton.title = ( localize(14852, "Dismiss"));
         dismissButton.onclick = e => {
             e.stopPropagation();
             dismissNotice();
@@ -646,7 +618,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             icon: Codicon.check,
             actionClassName: "agentSessionsWelcome-checkbox",
             isChecked: this.configurationService.getValue(configurationKey) === "agentSessionsWelcomePage",
-            title: ( localize(13729, "When checked, this page will be shown on startup.")),
+            title: ( localize(14853, "When checked, this page will be shown on startup.")),
             ...getToggleStyles({
                 inputActiveOptionBackground: "var(--vscode-descriptionForeground)",
                 inputActiveOptionForeground: "var(--vscode-editor-background)",
@@ -656,7 +628,7 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         showOnStartupCheckbox.domNode.id = "showOnStartup";
         const showOnStartupLabel = $("label.caption", {
             for: "showOnStartup"
-        }, ( localize(13730, "Show welcome page on startup")));
+        }, ( localize(14854, "Show welcome page on startup")));
         const onShowOnStartupChanged = () => {
             if (showOnStartupCheckbox.checked) {
                 this.configurationService.updateValue(configurationKey, "agentSessionsWelcomePage");
@@ -697,9 +669,9 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             this.agentSessionsService.model.sessions.filter(s => !s.isArchived()).length,
             MAX_SESSIONS
         );
-        const sessionsHeight = visibleSessions * 52;
+        const sessionsHeight = visibleSessions * AgentSessionsListDelegate.ITEM_HEIGHT;
         this.sessionsControl.layout(sessionsHeight, sessionsWidth);
-        const marginOffset = Math.floor(visibleSessions / 2) * 52;
+        const marginOffset = Math.floor(visibleSessions / 2) * AgentSessionsListDelegate.ITEM_HEIGHT;
         this.sessionsControl.element.style.marginBottom = `-${marginOffset}px`;
     }
     focus() {
@@ -721,9 +693,18 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
         }
     }
     async closeEditorAndMaximizeAuxiliaryBar(sessionResource) {
-        await this.commandService.executeCommand("workbench.action.closeActiveEditor");
+        const editorToClose = this.input || this._storedInput;
+        if (editorToClose && this.group.contains(editorToClose)) {
+            await ( new Promise(resolve => {
+                const disposable = this.group.onDidActiveEditorChange(e => {
+                    disposable.dispose();
+                    resolve();
+                });
+                this.group.closeEditor(editorToClose);
+            }));
+        }
         if (sessionResource) {
-            await this.chatWidgetService.openSession(sessionResource, ChatViewPaneTarget);
+            await this.chatWidgetService.openSession(sessionResource);
         } else {
             await this.commandService.executeCommand("workbench.action.chat.open");
         }
@@ -732,15 +713,19 @@ let AgentSessionsWelcomePage = class AgentSessionsWelcomePage extends EditorPane
             this.layoutService.setAuxiliaryBarMaximized(true);
         }
     }
-    dispose() {
-        if (this._openedAt > 0) {
-            const visibleDurationMs = Date.now() - this._openedAt;
-            this.telemetryService.publicLog2("agentSessionsWelcome.closed", {
-                visibleDurationMs,
-                closedBy: this._closedBy
-            });
-        }
-        super.dispose();
+    async getRecentlyOpenedWorkspaces(onlyTrusted = false) {
+        const workspaces = await this.workspacesService.getRecentlyOpened();
+        const trustInfoPromises = ( workspaces.workspaces.map(async ws => {
+            const uri = isRecentWorkspace(ws) ? ws.workspace.configPath : ws.folderUri;
+            const trustInfo = await this.workspaceTrustManagementService.getUriTrustInfo(uri);
+            return {
+                workspace: ws,
+                trusted: trustInfo.trusted
+            };
+        }));
+        const trustInfoResults = await Promise.all(trustInfoPromises);
+        const filteredWorkspaces = ( trustInfoResults.filter(result => onlyTrusted ? result.trusted : true).map(result => result.workspace));
+        return filteredWorkspaces;
     }
 };
 AgentSessionsWelcomePage = AgentSessionsWelcomePage_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IStorageService)), ( __param(4, IInstantiationService)), ( __param(5, IContextKeyService)), ( __param(6, IWorkbenchLayoutService)), ( __param(7, ICommandService)), ( __param(8, IEditorService)), ( __param(9, IAgentSessionsService)), ( __param(10, IConfigurationService)), ( __param(11, IProductService)), ( __param(12, IWalkthroughsService)), ( __param(13, IChatService)), ( __param(14, IChatEntitlementService)), ( __param(15, IMarkdownRendererService)), ( __param(16, IWorkspaceContextService)), ( __param(17, IWorkspacesService)), ( __param(18, IHostService)), ( __param(19, IWorkspaceTrustManagementService)), ( __param(20, IViewDescriptorService)), ( __param(21, IChatWidgetService)), ( __param(22, ILogService))], AgentSessionsWelcomePage));

package/vscode/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcomeInput.js

@@ -46,7 +46,7 @@ class AgentSessionsWelcomeInput extends EditorInput {
         this._workspaceKind = options.workspaceKind;
     }
     getName() {
-        return localize(13731, "Welcome");
+        return localize(14855, "Welcome");
     }
     get showTelemetryNotice() {
         return this._showTelemetryNotice;

package/vscode/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css

@@ -168,31 +168,31 @@
  * Each pair forms a visual row.
  * Left column items need to move up by floor((index-1)/2) rows
  * Right column items need to move right and up by (index/2) rows
- * Row height is 52px.
+ * Row height is 54px (must match AgentSessionsListDelegate.ITEM_HEIGHT).
  */
 
 /* Left column items (odd positions): move up to form 2-column layout */
 /* Item 3: move up 1 row */
 .agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(3) {
-	transform: translateY(-52px);
+	transform: translateY(-54px);
 }
 /* Item 5: move up 2 rows */
 .agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(5) {
-	transform: translateY(-104px);
+	transform: translateY(-108px);
 }
 
 /* Right column items (even positions): move right and up */
 /* Item 2: move right, up 1 row */
 .agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(2) {
-	transform: translateX(100%) translateY(-52px);
+	transform: translateX(100%) translateY(-54px);
 }
 /* Item 4: move right, up 2 rows */
 .agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(4) {
-	transform: translateX(100%) translateY(-104px);
+	transform: translateX(100%) translateY(-108px);
 }
 /* Item 6: move right, up 3 rows */
 .agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(6) {
-	transform: translateX(100%) translateY(-156px);
+	transform: translateX(100%) translateY(-162px);
 }
 
 /* Style individual session items in the welcome page */
@@ -482,7 +482,7 @@
 	gap: 12px;
 	padding: 8px 12px 8px 8px;
 	border-radius: 4px;
-	height: 52px;
+	height: 44px;
 	box-sizing: border-box;
 }
 

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.js

@@ -40,7 +40,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.openWalkthrough",
-            title: ( localize2(13732, "Welcome")),
+            title: ( localize2(14856, "Welcome")),
             category: Categories.Help,
             f1: true,
             menu: {
@@ -49,7 +49,7 @@ registerAction2(class extends Action2 {
                 order: 1
             },
             metadata: {
-                description: ( localize2(13733, "Opens a Walkthrough to help you get started in VS Code."))
+                description: ( localize2(14857, "Opens a Walkthrough to help you get started in VS Code."))
             }
         });
     }
@@ -114,15 +114,15 @@ registerAction2(class extends Action2 {
 });
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(GettingStartedInput.ID, GettingStartedInputSerializer);
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localize(13734, "Welcome"))),
+    EditorPaneDescriptor.create(GettingStartedPage, GettingStartedPage.ID, ( localize(14858, "Welcome"))),
     [( new SyncDescriptor(GettingStartedInput))]
 );
-const category = ( localize2(13734, "Welcome"));
+const category = ( localize2(14858, "Welcome"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "welcome.goBack",
-            title: ( localize2(13735, "Go Back")),
+            title: ( localize2(14859, "Go Back")),
             category,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib,
@@ -157,7 +157,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "welcome.markStepComplete",
-            title: ( localize(13736, "Mark Step Complete")),
+            title: ( localize(14860, "Mark Step Complete")),
             category
         });
     }
@@ -173,7 +173,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "welcome.markStepIncomplete",
-            title: ( localize(13737, "Mark Step Incomplete")),
+            title: ( localize(14861, "Mark Step Incomplete")),
             category
         });
     }
@@ -189,7 +189,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "welcome.showAllWalkthroughs",
-            title: ( localize2(13738, "Open Walkthrough...")),
+            title: ( localize2(14862, "Open Walkthrough...")),
             category,
             f1: true,
             menu: {
@@ -219,7 +219,7 @@ registerAction2(class extends Action2 {
         quickPick.canSelectMany = false;
         quickPick.matchOnDescription = true;
         quickPick.matchOnDetail = true;
-        quickPick.placeholder = ( localize(13739, "Select a walkthrough to open"));
+        quickPick.placeholder = ( localize(14863, "Select a walkthrough to open"));
         quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
         quickPick.busy = true;
         disposables.add(quickPick.onDidAccept(() => {
@@ -250,7 +250,7 @@ CommandsRegistry.registerCommand({
     }
 });
 const WorkspacePlatform = ( new RawContextKey("workspacePlatform", undefined, ( localize(
-    13740,
+    14864,
     "The platform of the current workspace, which in remote or serverless contexts may be different from the platform of the UI"
 ))));
 let WorkspacePlatformContribution = class WorkspacePlatformContribution {
@@ -292,7 +292,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                13741,
+                14865,
                 "When enabled, an extension's walkthrough will open upon install of the extension."
             ))
         },
@@ -308,19 +308,22 @@ configurationRegistry.registerConfiguration({
                 "terminal",
                 "agentSessionsWelcomePage"
             ],
-            "enumDescriptions": [( localize(13742, "Start without an editor.")), ( localize(
-                13743,
+            "enumDescriptions": [( localize(14866, "Start without an editor.")), ( localize(
+                14867,
                 "Open the Welcome page, with content to aid in getting started with VS Code and extensions."
             )), ( localize(
-                13744,
+                14868,
                 "Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise. Note: This is only observed as a global configuration, it will be ignored if set in a workspace or folder configuration."
             )), ( localize(
-                13745,
+                14869,
                 "Open a new untitled text file (only applies when opening an empty window)."
-            )), ( localize(13746, "Open the Welcome page when opening an empty workbench.")), ( localize(13747, "Open a new terminal in the editor area.")), ( localize(13748, "Open the Agent Sessions Welcome page."))],
+            )), ( localize(14870, "Open the Welcome page when opening an empty workbench.")), ( localize(14871, "Open a new terminal in the editor area.")), ( localize(
+                14872,
+                "Open the Agent Sessions Welcome page. Will override the workbench secondary side bar visibility settings."
+            ))],
             "default": "welcomePage",
             "description": ( localize(
-                13749,
+                14873,
                 "Controls which editor is shown at startup, if none are restored from the previous session."
             )),
             "experiment": {
@@ -331,8 +334,8 @@ configurationRegistry.registerConfiguration({
             scope: ConfigurationScope.APPLICATION,
             type: "boolean",
             default: false,
-            deprecationMessage: ( localize(13750, "Deprecated, use the global `workbench.reduceMotion`.")),
-            description: ( localize(13751, "When enabled, reduce motion in welcome page."))
+            deprecationMessage: ( localize(14874, "Deprecated, use the global `workbench.reduceMotion`.")),
+            description: ( localize(14875, "When enabled, reduce motion in welcome page."))
         }
     }
 });