@codingame/monaco-vscode-workbench-service-override 37.6.0 → 38.0.0

package/vscode/src/vs/sessions/services/sessions/browser/visibleSessions.d.ts

@@ -4,6 +4,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 import { IChat, ISession, SessionStatus } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
+import { ISessionGridSlot } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService";
 /**
  * Wraps an {@link ISession} with an active chat observable to form an
  * {@link IActiveSession}. Delegates all {@link ISession} property accesses
@@ -62,6 +63,9 @@ export declare class VisibleSession extends Disposable implements IActiveSession
     get resource(): URI;
     get providerId(): string;
     get sessionType(): string;
+    get harness(): string;
+    get environment(): string;
+    get application(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionApplication>;
     get icon(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
     get createdAt(): Date;
     get workspace(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionWorkspace | undefined>;
@@ -77,16 +81,17 @@ export declare class VisibleSession extends Disposable implements IActiveSession
     get status(): IObservable<SessionStatus>;
     get completedStateIcon(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon | undefined> | undefined;
     get changesSummary(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionChangesSummary | undefined> | undefined;
-    get changesets(): IObservable<readonly import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionChangeset[] | undefined>;
-    get changes(): IObservable<readonly import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionFileChange[]>;
     get artifacts(): IObservable<readonly import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionArtifact[]> | undefined;
     get modelId(): IObservable<string | undefined>;
     get mode(): IObservable<{
         readonly id: string;
         readonly kind: string;
     } | undefined>;
+    get permissionLevel(): IObservable<string> | undefined;
+    get branch(): IObservable<string | undefined> | undefined;
     get loading(): IObservable<boolean>;
     get isNewSessionRequestInProgress(): IObservable<boolean> | undefined;
+    get preparationProgress(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session").ISessionPreparationProgress | undefined> | undefined;
     get isArchived(): IObservable<boolean>;
     get isRead(): IObservable<boolean>;
     get description(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent").IMarkdownString | undefined>;
@@ -120,6 +125,9 @@ export declare class VisibleSessions extends Disposable {
     private readonly _resolveInitialShownRelatedChats;
     private readonly _onSlotReplaced;
     private readonly _uriIdentityService;
+    private readonly _gridSlots;
+    getGridSlots(): readonly ISessionGridSlot[];
+    private transferGridSlot;
     private readonly _activeSession;
     readonly activeSession: IObservable<IActiveSession | undefined>;
     /**
@@ -200,7 +208,7 @@ export declare class VisibleSessions extends Disposable {
      * `targetSessionId` may be `undefined` to position relative to the empty
      * (new-session) slot. No-op if the target slot is not currently visible.
      */
-    insertAt(session: ISession | undefined, targetSessionId: string | undefined, side: "left" | "right", activate?: boolean): void;
+    insertAt(session: ISession | undefined, targetSessionId: string | undefined, side: "left" | "right" | "up" | "down", activate?: boolean): void;
     /**
      * Atomically (re)build the entire grid from a persisted snapshot.
      *
@@ -219,6 +227,7 @@ export declare class VisibleSessions extends Disposable {
     restoreGrid(slots: ReadonlyArray<{
         readonly session: ISession | undefined;
         readonly sticky: boolean;
+        readonly gridId?: string;
     }>, activeIndex: number): void;
     /**
      * The grid slot state of a currently visible session (or of the empty slot
@@ -285,7 +294,7 @@ export declare class VisibleSessions extends Disposable {
      * for the old session is disposed; a fresh wrapper is created for the
      * updated session. No-op if `session` is not currently in the grid.
      */
-    updateSession(session: ISession, updatedSession: ISession): void;
+    updateSession(session: ISession, updatedSession: ISession, preserveFocus?: boolean): void;
     /**
      * Create a transient {@link ISession} that mirrors the given session but
      * exposes a different {@link ISession.resource}. The visibility model's

package/vscode/src/vs/sessions/services/sessions/browser/visibleSessions.js

@@ -4,6 +4,8 @@ import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/v
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ChatOriginKind, SessionStatus, ChatInteractivity } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -150,6 +152,15 @@ class VisibleSession extends Disposable {
     get sessionType() {
         return this._session.sessionType;
     }
+    get harness() {
+        return this._session.harness;
+    }
+    get environment() {
+        return this._session.environment;
+    }
+    get application() {
+        return this._session.application;
+    }
     get icon() {
         return this._session.icon;
     }
@@ -195,12 +206,6 @@ class VisibleSession extends Disposable {
     get changesSummary() {
         return this._session.changesSummary;
     }
-    get changesets() {
-        return this._session.changesets;
-    }
-    get changes() {
-        return this._session.changes;
-    }
     get artifacts() {
         return this._session.artifacts;
     }
@@ -210,12 +215,21 @@ class VisibleSession extends Disposable {
     get mode() {
         return this._activeChatMode;
     }
+    get permissionLevel() {
+        return this._session.permissionLevel;
+    }
+    get branch() {
+        return this._session.branch;
+    }
     get loading() {
         return this._session.loading;
     }
     get isNewSessionRequestInProgress() {
         return this._session.isNewSessionRequestInProgress;
     }
+    get preparationProgress() {
+        return this._session.preparationProgress;
+    }
     get isArchived() {
         return this._session.isArchived;
     }
@@ -255,6 +269,15 @@ class ResourceOverrideSession {
     get sessionType() {
         return this._session.sessionType;
     }
+    get harness() {
+        return this._session.harness;
+    }
+    get environment() {
+        return this._session.environment;
+    }
+    get application() {
+        return this._session.application;
+    }
     get icon() {
         return this._session.icon;
     }
@@ -300,12 +323,6 @@ class ResourceOverrideSession {
     get changesSummary() {
         return this._session.changesSummary;
     }
-    get changes() {
-        return this._session.changes;
-    }
-    get changesets() {
-        return this._session.changesets;
-    }
     get artifacts() {
         return this._session.artifacts;
     }
@@ -315,12 +332,21 @@ class ResourceOverrideSession {
     get mode() {
         return this._session.mode;
     }
+    get permissionLevel() {
+        return this._session.permissionLevel;
+    }
+    get branch() {
+        return this._session.branch;
+    }
     get loading() {
         return this._session.loading;
     }
     get isNewSessionRequestInProgress() {
         return this._session.isNewSessionRequestInProgress;
     }
+    get preparationProgress() {
+        return this._session.preparationProgress;
+    }
     get isArchived() {
         return this._session.isArchived;
     }
@@ -345,6 +371,25 @@ class ResourceOverrideSession {
 }
 const NO_RECENT = Symbol("no-recent");
 let VisibleSessions = class VisibleSessions extends Disposable {
+    getGridSlots() {
+        return (this._visibleList.length ? this._visibleList : [undefined]).map(id => {
+            let slot = this._gridSlots.get(id);
+            if (!slot) {
+                slot = {
+                    id: generateUuid()
+                };
+                this._gridSlots.set(id, slot);
+            }
+            return slot;
+        });
+    }
+    transferGridSlot(from, to) {
+        const slot = this._gridSlots.get(from);
+        this._gridSlots.delete(from);
+        if (slot) {
+            this._gridSlots.set(to, slot);
+        }
+    }
     constructor(
         _resolveInitialChat,
         _resolveInitialClosedChats,
@@ -358,6 +403,9 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         this._resolveInitialShownRelatedChats = _resolveInitialShownRelatedChats;
         this._onSlotReplaced = _onSlotReplaced;
         this._uriIdentityService = _uriIdentityService;
+        this._gridSlots = ( new Map([[undefined, {
+            id: "initial"
+        }]]));
         this._activeSession = observableValue(this, undefined);
         this.activeSession = this._activeSession;
         this._activePreserveFocus = observableValue(this, false);
@@ -388,6 +436,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
                 replaceSlot = this._findLastNonSticky();
             }
             if (replaceSlot !== NO_RECENT) {
+                this.transferGridSlot(replaceSlot, targetId);
                 const idx = this._visibleList.indexOf(replaceSlot);
                 this._visibleList.splice(idx, 1, targetId);
                 if (replaceSlot !== undefined) {
@@ -399,6 +448,9 @@ let VisibleSessions = class VisibleSessions extends Disposable {
                     }
                 }
             } else {
+                if (!this._visibleList.length) {
+                    this.transferGridSlot(undefined, targetId);
+                }
                 this._visibleList.push(targetId);
             }
             this._mostRecentNonStickySlot = targetId;
@@ -413,12 +465,27 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         return visibleSession;
     }
     insertAt(session, targetSessionId, side, activate = true) {
+        if (!this._visibleList.length && targetSessionId === undefined) {
+            this._visibleList.push(undefined);
+        }
         const id = session?.sessionId;
         const targetIdx = this._visibleList.indexOf(targetSessionId);
         if (targetIdx < 0) {
             return;
         }
-        let destIdx = side === "left" ? targetIdx : targetIdx + 1;
+        if (id === targetSessionId) {
+            return;
+        }
+        const reference = this.getGridSlots()[targetIdx].id;
+        const previous = this._gridSlots.get(id);
+        this._gridSlots.set(id, {
+            id: previous?.id ?? generateUuid(),
+            placement: {
+                reference,
+                direction: side === "left" ? Direction.Left : side === "right" ? Direction.Right : side === "up" ? Direction.Up : Direction.Down
+            }
+        });
+        let destIdx = side === "left" || side === "up" ? targetIdx : targetIdx + 1;
         const currentIdx = this._visibleList.indexOf(id);
         if (currentIdx >= 0) {
             if (currentIdx !== destIdx && currentIdx + 1 !== destIdx) {
@@ -457,6 +524,14 @@ let VisibleSessions = class VisibleSessions extends Disposable {
                 sticky
             } = slots[i];
             const id = session?.sessionId;
+            if (this._visibleList.includes(id)) {
+                continue;
+            }
+            if (slots[i].gridId) {
+                this._gridSlots.set(id, {
+                    id: slots[i].gridId
+                });
+            }
             this._visibleList.push(id);
             if (session) {
                 const wrapper = this._getOrCreateVisibleSession(session);
@@ -484,6 +559,12 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         });
     }
     getSlot(sessionId) {
+        if (!this._visibleList.length && sessionId === undefined) {
+            return {
+                index: 0,
+                sticky: false
+            };
+        }
         const index = this._visibleList.indexOf(sessionId);
         return index < 0 ? undefined : {
             index,
@@ -521,6 +602,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
             return undefined;
         }
         this._visibleList.splice(idx, 1, id);
+        this.transferGridSlot(slotId, id);
         if (slotId !== undefined) {
             this._stickyIds.delete(slotId);
             this._wrappers.deleteAndDispose(slotId);
@@ -596,7 +678,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
     openChat(session, chat) {
         this._wrappers.get(session.sessionId)?.openChat(chat);
     }
-    updateSession(session, updatedSession) {
+    updateSession(session, updatedSession, preserveFocus = false) {
         const fromId = session.sessionId;
         if (!this._visibleList.includes(fromId)) {
             return;
@@ -609,7 +691,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         transaction(tsx => {
             const visibleSession = this._getOrCreateVisibleSession(updatedSession);
             if (wasActive) {
-                this._setActiveSession(visibleSession, false, tsx);
+                this._setActiveSession(visibleSession, preserveFocus, tsx);
             }
             this._refresh(tsx);
         });
@@ -625,6 +707,7 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         }
         const idx = this._visibleList.indexOf(fromId);
         if (idx >= 0) {
+            this.transferGridSlot(fromId, toId);
             this._visibleList.splice(idx, 1, toId);
         }
         if (this._stickyIds.delete(fromId)) {
@@ -680,6 +763,13 @@ let VisibleSessions = class VisibleSessions extends Disposable {
         return changed;
     }
     _refresh(tsx) {
+        const ids = this._visibleList.length ? this._visibleList : [undefined];
+        for (const id of ( this._gridSlots.keys())) {
+            if (!ids.includes(id)) {
+                this._gridSlots.delete(id);
+            }
+        }
+        this.getGridSlots();
         const wrappers = [];
         for (const id of this._visibleList) {
             if (id === undefined) {

package/vscode/src/vs/sessions/services/sessions/common/sessionContextKeys.js

@@ -1,8 +1,8 @@
 
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { SessionHasSideChatsContext, SessionActiveChatIsDeletableContext, SessionActiveChatIsClosableContext, SessionHasMultipleOpenChatsContext, SessionShouldShowChatTabsContext, SessionHasMultipleCommittedChatsContext, SessionIsStickyContext, SessionIsCreatedContext, IsQuickChatSessionContext, SessionHasWorkspaceContext, SessionHasIssuesContext, SessionHasPullRequestContext, SessionHasCachedChangesContext, SessionHasChangesContext, SessionHasGitRepositoryContext, SessionWorkspaceIsVirtualContext, SessionSupportsDeleteContext, SessionSupportsRenameContext, SessionSupportsSideChatContext, SessionSupportsForkContext, SessionSupportsMultipleChatsContext, SessionIsReadContext, SessionIsActiveContext, SessionIsArchivedContext, SessionTypeContext, SessionProviderIdContext, SessionIdContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
-import { isActiveSessionStatus, SessionStatus, ChatOriginKind, getChatCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
-import { readSessionChangesStats } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache';
+import { SessionActiveChatHasSideChatsContext, SessionActiveChatResourceContext, SessionActiveChatIsUntitledContext, SessionActiveChatIsDeletableContext, SessionActiveChatCanArchiveContext, SessionActiveChatIsClosableContext, SessionHasMultipleOpenChatsContext, SessionShouldShowChatTabsContext, SessionHasMultipleCommittedChatsContext, SessionIsStickyContext, SessionIsCreatedContext, IsQuickChatSessionContext, SessionHasWorkspaceContext, SessionHasIssuesContext, SessionHasPullRequestContext, SessionHasCachedChangesContext, SessionHasChangesContext, SessionHasGitRepositoryContext, SessionWorkspaceIsVirtualContext, SessionSupportsDeleteContext, SessionSupportsRenameContext, SessionSupportsSideChatContext, SessionSupportsForkContext, SessionSupportsMultipleChatsContext, SessionIsReadContext, SessionIsActiveContext, SessionIsArchivedContext, SessionTypeContext, SessionProviderIdContext, SessionIdContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { isActiveSessionStatus, SessionStatus, ChatOriginKind, getChatCapabilities, isSideChatOf } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { readSessionChangesStats, readChatChangesStats } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache';
 
 const boundKeysByService = ( new WeakMap());
 function getBoundKeys(contextKeyService) {
@@ -34,21 +34,24 @@ function getBoundKeys(contextKeyService) {
             shouldShowChatTabs: SessionShouldShowChatTabsContext.bindTo(contextKeyService),
             hasMultipleOpenChats: SessionHasMultipleOpenChatsContext.bindTo(contextKeyService),
             activeChatIsClosable: SessionActiveChatIsClosableContext.bindTo(contextKeyService),
+            activeChatCanArchive: SessionActiveChatCanArchiveContext.bindTo(contextKeyService),
             activeChatIsDeletable: SessionActiveChatIsDeletableContext.bindTo(contextKeyService),
-            hasSideChats: SessionHasSideChatsContext.bindTo(contextKeyService)
+            activeChatIsUntitled: SessionActiveChatIsUntitledContext.bindTo(contextKeyService),
+            activeChatResource: SessionActiveChatResourceContext.bindTo(contextKeyService),
+            activeChatHasSideChats: SessionActiveChatHasSideChatsContext.bindTo(contextKeyService)
         };
         boundKeysByService.set(contextKeyService, keys);
     }
     return keys;
 }
-function setSessionContextKeys(session, contextKeyService, reader, changesStatsCache) {
+function setSessionContextKeysUnbuffered(session, contextKeyService, reader, changesStatsCache) {
     const keys = getBoundKeys(contextKeyService);
     keys.sessionId.set(session?.sessionId ?? "");
     keys.providerId.set(session?.providerId ?? "");
     keys.type.set(session?.sessionType ?? "");
     keys.isArchived.set(session?.isArchived.read(reader) ?? false);
     keys.isActive.set(session ? isActiveSessionStatus(session.status.read(reader)) : false);
-    keys.isRead.set(session?.isRead.read(reader) ?? true);
+    keys.isRead.set(session?.mainChat.read(reader).isRead.read(reader) ?? true);
     const capabilities = session?.capabilities.read(reader);
     keys.supportsMultipleChats.set(capabilities?.supportsMultipleChats ?? false);
     keys.supportsFork.set(capabilities?.supportsFork ?? false);
@@ -61,15 +64,11 @@ function setSessionContextKeys(session, contextKeyService, reader, changesStatsC
         session?.hasGitRepository?.read(reader) ?? workspace?.folders.some(folder => folder.gitRepository !== undefined) ?? false
     );
     const worktreePending = session?.worktreePending?.read(reader) ?? false;
-    const defaultChangeset = session?.changesets.read(reader)?.find(c => c.isDefault.read(reader));
-    let insertions = 0;
-    let deletions = 0;
-    for (const change of defaultChangeset?.changes.read(reader) ?? session?.changes.read(reader) ?? []) {
-        insertions += change.insertions;
-        deletions += change.deletions;
-    }
-    keys.hasChanges.set(!worktreePending && (insertions > 0 || deletions > 0));
-    const changesReported = session ? readSessionChangesStats(session, reader) !== undefined : true;
+    const changesStats = session ? readSessionChangesStats(session, reader) : undefined;
+    keys.hasChanges.set(
+        !worktreePending && !!changesStats && (changesStats.insertions > 0 || changesStats.deletions > 0)
+    );
+    const changesReported = changesStats !== undefined;
     const cachedFiles = !changesReported && session ? changesStatsCache?.get(session.sessionId, reader)?.files ?? 0 : 0;
     keys.hasCachedChanges.set(!worktreePending && cachedFiles > 0);
     const pullRequest = session?.workspace.read(reader)?.folders[0]?.gitRepository?.gitHubInfo.read(reader)?.pullRequest;
@@ -80,24 +79,44 @@ function setSessionContextKeys(session, contextKeyService, reader, changesStatsC
     keys.isQuickChat.set(!!session && (session.isQuickChat?.read(reader) ?? false));
 }
 function setActiveSessionContextKeys(session, contextKeyService, reader, changesStatsCache) {
-    setSessionContextKeys(session, contextKeyService, reader, changesStatsCache);
-    const keys = getBoundKeys(contextKeyService);
-    keys.isCreated.set(session?.isCreated.read(reader) ?? false);
-    keys.sticky.set(session?.sticky.read(reader) ?? false);
-    const committedChatCount = session?.chats.read(reader).reduce(
-        (count, chat) => chat.status.read(reader) === SessionStatus.Untitled || chat.origin?.kind === ChatOriginKind.Tool ? count : count + 1,
-        0
-    ) ?? 0;
-    keys.hasMultipleCommittedChats.set(committedChatCount > 1);
-    keys.shouldShowChatTabs.set(session?.shouldShowChatTabs.read(reader) ?? false);
-    keys.hasMultipleOpenChats.set((session?.visibleChatTabs.read(reader).length ?? 0) > 1);
-    const activeChat = session?.activeChat.read(reader);
-    const mainResource = session?.mainChat.read(reader).resource;
-    const isNonMainChat = !!activeChat && !!mainResource && !isEqual(activeChat.resource, mainResource);
-    keys.activeChatIsClosable.set(isNonMainChat);
-    keys.activeChatIsDeletable.set(!!activeChat && getChatCapabilities(activeChat, session, reader).canDelete);
-    const allChats = session?.chats.read(reader) ?? [];
-    keys.hasSideChats.set(( allChats.some(chat => chat.origin?.kind === ChatOriginKind.SideChat)));
+    contextKeyService.bufferChangeEvents(() => {
+        setSessionContextKeysUnbuffered(session, contextKeyService, reader, changesStatsCache);
+        const keys = getBoundKeys(contextKeyService);
+        keys.isCreated.set(session?.isCreated.read(reader) ?? false);
+        keys.sticky.set(session?.sticky.read(reader) ?? false);
+        const focusedChat = session?.activeChat.read(reader);
+        const activeChatStats = focusedChat ? readChatChangesStats(focusedChat, reader) : undefined;
+        const worktreePending = session?.worktreePending?.read(reader) ?? false;
+        keys.hasChanges.set(
+            !worktreePending && !!activeChatStats && (activeChatStats.insertions > 0 || activeChatStats.deletions > 0)
+        );
+        const mainChat = session?.mainChat?.read(reader);
+        const isMainChat = mainChat && focusedChat && isEqual(mainChat.resource, focusedChat.resource);
+        const cachedFiles = activeChatStats === undefined && isMainChat && session ? changesStatsCache?.get(session.sessionId, reader)?.files ?? 0 : 0;
+        keys.hasCachedChanges.set(!worktreePending && cachedFiles > 0);
+        const committedChatCount = session?.chats.read(reader).reduce(
+            (count, chat) => chat.status.read(reader) === SessionStatus.Untitled || chat.origin?.kind === ChatOriginKind.Tool ? count : count + 1,
+            0
+        ) ?? 0;
+        keys.hasMultipleCommittedChats.set(committedChatCount > 1);
+        keys.shouldShowChatTabs.set(session?.shouldShowChatTabs.read(reader) ?? false);
+        keys.hasMultipleOpenChats.set((session?.visibleChatTabs.read(reader).length ?? 0) > 1);
+        const activeChat = session?.activeChat.read(reader);
+        const mainResource = session?.mainChat.read(reader).resource;
+        keys.activeChatResource.set(activeChat?.resource.toString() ?? "");
+        const isNonMainChat = !!activeChat && !!mainResource && !isEqual(mainResource, activeChat.resource);
+        keys.activeChatIsClosable.set(isNonMainChat);
+        keys.activeChatCanArchive.set(
+            !!activeChat && !(activeChat.isArchived?.read(reader) ?? false) && getChatCapabilities(activeChat, session, reader).canArchive
+        );
+        keys.activeChatIsDeletable.set(!!activeChat && getChatCapabilities(activeChat, session, reader).canDelete);
+        keys.activeChatIsUntitled.set(activeChat?.status.read(reader) === SessionStatus.Untitled);
+        const workspace = activeChat?.workspace.read(reader);
+        keys.workspaceIsVirtual.set(workspace?.isVirtualWorkspace ?? true);
+        keys.hasWorkspace.set(!!workspace?.label);
+        const allChats = session?.chats.read(reader) ?? [];
+        keys.activeChatHasSideChats.set(!!activeChat && ( allChats.some(chat => isSideChatOf(chat, activeChat.resource))));
+    });
 }
 
-export { setActiveSessionContextKeys, setSessionContextKeys };
+export { setActiveSessionContextKeys };

package/vscode/src/vs/sessions/services/workspaceFolderLabel/browser/workspaceFolderLabelService.js

@@ -20,7 +20,7 @@ let SessionsWorkspaceFolderLabelService = class SessionsWorkspaceFolderLabelServ
         this.labelService = labelService;
     }
     getWorkspaceFolderLabel(workspaceFolder, verbose) {
-        const workspace = this.sessionsService.activeSession.get()?.workspace.get();
+        const workspace = this.sessionsService.activeSession.get()?.activeChat.get().workspace.get();
         const folder = workspace?.folders.find(folder => this.isWorkspaceFolder(folder, workspaceFolder)) ?? this.sessionsManagementService.getSessions().flatMap(session => session.workspace.get()?.folders ?? []).find(folder => this.isWorkspaceFolder(folder, workspaceFolder));
         if (folder) {
             const repositoryName = folder.name;

package/vscode/src/vs/workbench/browser/layout.d.ts

@@ -3,15 +3,13 @@ import { Direction, IViewSize } from "@codingame/monaco-vscode-api/vscode/vs/bas
 import { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, DisposableMap, DisposableStore, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-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 { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IPartVisibilityChangeEvent, MULTI_WINDOW_PARTS, PanelAlignment, Parts, Position, SINGLE_WINDOW_PARTS } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
-import { AbstractLayout } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/abstractlayout";
+import { IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
+import { Position, Parts, PanelAlignment, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS, IPartVisibilityChangeEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { ServicesAccessor, IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IPath } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";
+import { EditorGroupLayout } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { Part } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part";
-export * from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/abstractlayout";
 export interface ILayoutRuntimeState {
     activeContainerId: number;
     mainWindowFullscreen: boolean;
@@ -25,9 +23,40 @@ export interface ILayoutRuntimeState {
         readonly transitionDisposables: DisposableMap<string, IDisposable>;
     };
 }
+export interface IEditorToOpen {
+    readonly editor: IUntypedEditorInput;
+    readonly viewColumn?: number;
+}
+export interface ILayoutInitializationState {
+    readonly views: {
+        readonly defaults: string[] | undefined;
+        readonly containerToRestore: {
+            sideBar?: string;
+            panel?: string;
+            auxiliaryBar?: string;
+        };
+    };
+    readonly editor: {
+        readonly restoreEditors: boolean;
+        readonly editorsToOpen: Promise<IEditorToOpen[]>;
+    };
+    readonly layout?: {
+        readonly editors?: EditorGroupLayout;
+    };
+}
+export interface IPathToOpen extends IPath {
+    readonly viewColumn?: number;
+}
+export interface IInitialEditorsState {
+    readonly filesToOpenOrCreate?: IPathToOpen[];
+    readonly filesToDiff?: IPathToOpen[];
+    readonly filesToMerge?: IPathToOpen[];
+    readonly layout?: EditorGroupLayout;
+}
 export declare const TITLE_BAR_SETTINGS: string[];
-export declare abstract class Layout extends AbstractLayout {
+export declare abstract class Layout extends Disposable implements IWorkbenchLayoutService {
     protected readonly parent: HTMLElement;
+    private readonly layoutOptions?;
     readonly _serviceBrand: undefined;
     private readonly _onDidChangeZenMode;
     readonly onDidChangeZenMode: Event<boolean>;
@@ -118,7 +147,7 @@ export declare abstract class Layout extends AbstractLayout {
     constructor(parent: HTMLElement, layoutOptions?: {
         resetLayout?: boolean;
         customEditorRestore?: (accessor: ServicesAccessor, defaultLayout: boolean) => Promise<void>;
-    });
+    } | undefined);
     protected initLayout(accessor: ServicesAccessor): void;
     private registerLayoutListeners;
     private onMenubarToggled;
@@ -136,14 +165,20 @@ export declare abstract class Layout extends AbstractLayout {
     private setSideBarPosition;
     private updateWindowBorder;
     private initLayoutState;
+    private getDefaultLayoutViews;
+    private shouldRestoreEditors;
     protected willRestoreEditors(): boolean;
+    private resolveEditorsToOpen;
+    private _openedDefaultEditors;
+    get openedDefaultEditors(): boolean;
+    private getInitialEditorsState;
     private readonly whenReadyPromise;
     protected readonly whenReady: Promise<void>;
     private readonly whenRestoredPromise;
     readonly whenRestored: Promise<void>;
     private restored;
     isRestored(): boolean;
-    protected restoreParts(accessor: ServicesAccessor): void;
+    protected restoreParts(instantiationService: IInstantiationService): void;
     private openViewContainer;
     registerPart(part: Part): IDisposable;
     protected getPart(key: Parts): Part;
@@ -213,62 +248,3 @@ export declare abstract class Layout extends AbstractLayout {
     private createGridDescriptor;
     dispose(): void;
 }
-interface IWorkbenchLayoutStateKey {
-    readonly name: string;
-    readonly runtime: boolean;
-    readonly defaultValue: unknown;
-    readonly scope: StorageScope;
-    readonly target: StorageTarget;
-    readonly zenModeIgnore?: boolean;
-}
-type StorageKeyType = string | boolean | number | object;
-declare abstract class WorkbenchLayoutStateKey<T extends StorageKeyType> implements IWorkbenchLayoutStateKey {
-    readonly name: string;
-    readonly scope: StorageScope;
-    readonly target: StorageTarget;
-    defaultValue: T;
-    abstract readonly runtime: boolean;
-    constructor(name: string, scope: StorageScope, target: StorageTarget, defaultValue: T);
-}
-declare class RuntimeStateKey<T extends StorageKeyType> extends WorkbenchLayoutStateKey<T> {
-    readonly zenModeIgnore?: boolean | undefined;
-    readonly runtime = true;
-    constructor(name: string, scope: StorageScope, target: StorageTarget, defaultValue: T, zenModeIgnore?: boolean | undefined);
-}
-declare class InitializationStateKey<T extends StorageKeyType> extends WorkbenchLayoutStateKey<T> {
-    readonly runtime = false;
-}
-interface ILayoutStateChangeEvent<T extends StorageKeyType> {
-    readonly key: RuntimeStateKey<T>;
-    readonly value: T;
-}
-interface ILayoutStateLoadConfiguration {
-    readonly mainContainerDimension: IDimension;
-    readonly resetLayout: boolean;
-}
-export declare class LayoutStateModel extends Disposable {
-    private readonly storageService;
-    private readonly configurationService;
-    private readonly contextService;
-    static readonly STORAGE_PREFIX = "workbench.";
-    private readonly _onDidChangeState;
-    readonly onDidChangeState: Event<ILayoutStateChangeEvent<StorageKeyType>>;
-    private readonly stateCache;
-    private readonly isNew;
-    constructor(storageService: IStorageService, configurationService: IConfigurationService, contextService: IWorkspaceContextService);
-    private updateStateFromLegacySettings;
-    private updateLegacySettingsFromState;
-    load(configuration: ILayoutStateLoadConfiguration): void;
-    private applyOverrides;
-    private applyAuxiliaryBarMaximizedOverride;
-    private applyAuxiliaryBarHiddenOverride;
-    save(workspace: boolean, global: boolean): void;
-    getInitializationValue<T extends StorageKeyType>(key: InitializationStateKey<T>): T;
-    setInitializationValue<T extends StorageKeyType>(key: InitializationStateKey<T>, value: T): void;
-    getRuntimeValue<T extends StorageKeyType>(key: RuntimeStateKey<T>, fallbackToSetting?: boolean): T;
-    setRuntimeValue<T extends StorageKeyType>(key: RuntimeStateKey<T>, value: T): void;
-    private isActivityBarHidden;
-    private setRuntimeValueAndFire;
-    private saveKeyToStorage;
-    private loadKeyFromStorage;
-}