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

package/vscode/src/vs/sessions/browser/parts/chatGroupsView.js

@@ -2,7 +2,7 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatGroupsView from './media/chatGroupsView.css';
-import { $, isAncestorOfActiveElement, size } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, getActiveElement, isAncestorOfActiveElement, size } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { MutableDisposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -10,6 +10,9 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { SerializableGrid, Sizing, Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { LocalSelectionTransfer } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 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 '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
@@ -25,11 +28,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { Themable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { agentsPanelBorder } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/theme';
+import { agentsPanelBorder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/agentsColors';
+import { ChatOriginKind } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { ChatGroupView } from './chatGroupView.js';
 import { ChatGroupDropTarget } from './chatGroupDropTarget.js';
-import { isSessionChatDrag } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/dnd';
+import { SessionsDataTransfers, DraggedSessionIdentifier, getSessionChatDragData, isSessionChatDrag } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/dnd';
+import { SESSIONS_CHAT_TABS_SETTING, SESSIONS_CHAT_TABS_DEFAULT, SessionsChatTabsMode } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionConfig';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -47,7 +52,13 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
     get groupCount() {
         return this._groupCount;
     }
-    constructor(themeService, _instantiationService, _sessionsService, _storageService) {
+    constructor(
+        themeService,
+        _instantiationService,
+        _sessionsService,
+        _storageService,
+        configurationService
+    ) {
         super(themeService);
         this._instantiationService = _instantiationService;
         this._sessionsService = _sessionsService;
@@ -61,8 +72,19 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         this._sessionActive = true;
         this._sessionVisible = true;
         this._singleGroupTabsReplaceHeader = observableValue(this, false);
+        this._knownChatsByResource = ( new Map());
+        this._pendingNewGroupResourceIds = ( new Set());
         this._restorePending = false;
         this._gridDidLayout = false;
+        const chatTabsMode = observableConfigValue(
+            SESSIONS_CHAT_TABS_SETTING,
+            SESSIONS_CHAT_TABS_DEFAULT,
+            configurationService
+        );
+        this.showChatAsSessionView = derived(reader => chatTabsMode.read(reader) === SessionsChatTabsMode.Single);
+        this._showGroupChatHeaders = derived(
+            reader => this.showChatAsSessionView.read(reader) && this._groupCount.read(reader) > 1
+        );
     }
     setSingleGroupTabsReplaceHeader(enabled) {
         this._singleGroupTabsReplaceHeader.set(enabled, undefined);
@@ -84,6 +106,8 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         this._activeGroup = undefined;
         this._restoreAssignment = undefined;
         this._restoreOrder = undefined;
+        this._knownChatsByResource.clear();
+        this._pendingNewGroupResourceIds.clear();
         this._restorePending = false;
         this._lastSessionActiveChatId = undefined;
         this._setGroupCount(1);
@@ -97,8 +121,14 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         store.add(grid);
         this.element.replaceChildren(grid.element);
         store.add(toDisposable(() => grid.element.remove()));
+        const sessionTransfer = LocalSelectionTransfer.getInstance();
+        const isMainChatDrag = event => event.dataTransfer?.types.includes(SessionsDataTransfers.SESSION) === true && sessionTransfer.getData(DraggedSessionIdentifier.prototype)?.some(dragged => dragged.sessionId === session.sessionId) === true;
         const dropDelegate = {
-            isChatDrag: event => isSessionChatDrag(event, session.sessionId),
+            isChatDrag: event => isSessionChatDrag(event, session.sessionId) || isMainChatDrag(event),
+            getChatDragData: event => getSessionChatDragData(event) ?? (isMainChatDrag(event) ? {
+                sessionId: session.sessionId,
+                resource: ( session.mainChat.get().resource.toString())
+            } : undefined),
             findTargetGroup: child => this._findTargetGroup(child),
             onChatDrop: (groupId, zone, data) => {
                 this._onChatDrop(groupId, zone, data).catch(onUnexpectedError);
@@ -173,6 +203,9 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             if (g.activeResourceId) {
                 entry.activeResourceId.set(g.activeResourceId, undefined);
             }
+            if (g.pinnedResourceId && g.resourceIds.includes(g.pinnedResourceId)) {
+                entry.pinnedResourceId.set(g.pinnedResourceId, undefined);
+            }
         });
         this._groups = groups;
         this._restoreAssignment = assignment;
@@ -191,6 +224,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         this._groupDisposables.set(id, store);
         const resourceIds = observableValue(`chatGroup.${id}.resourceIds`, []);
         const activeResourceId = observableValue(`chatGroup.${id}.activeResourceId`, "");
+        const pinnedResourceId = observableValue(`chatGroup.${id}.pinnedResourceId`, undefined);
         const chats = derived(reader => {
             const all = session.visibleChatTabs.read(reader);
             const ids = resourceIds.read(reader);
@@ -204,7 +238,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             return result;
         });
         const tabsVisible = derived(reader => {
-            if (!session.isCreated.read(reader)) {
+            if (!session.isCreated.read(reader) || this.showChatAsSessionView.read(reader)) {
                 return false;
             }
             if (this._groupCount.read(reader) > 1) {
@@ -215,12 +249,14 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         const showSessionActions = derived(
             reader => this._singleGroupTabsReplaceHeader.read(reader) && this._groupCount.read(reader) === 1 && tabsVisible.read(reader)
         );
+        const activeChatIsPinned = derived(reader => pinnedResourceId.read(reader) === activeResourceId.read(reader));
         const view = store.add(this._instantiationService.createInstance(ChatGroupView));
         const entry = {
             id,
             view,
             resourceIds,
             activeResourceId,
+            pinnedResourceId,
             chats,
             tabsVisible
         };
@@ -232,7 +268,10 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             activeChatResource: activeResourceId,
             mainChatResource: this._mainChatResource,
             tabsVisible,
+            chatHeaderVisible: this._showGroupChatHeaders,
+            activeChatIsPinned,
             showSessionActions,
+            activate: () => this._setActiveGroup(entry),
             openChat: resource => this._openChat(entry, resource),
             onTabDragStart: () => {},
             onTabDragEnd: () => {}
@@ -247,22 +286,55 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         if (!session) {
             return;
         }
+        const catalogIds = ( new Set());
+        for (const chat of session.chats.read(reader)) {
+            const resourceId = ( chat.resource.toString());
+            catalogIds.add(resourceId);
+            this._knownChatsByResource.set(resourceId, chat);
+        }
         const chats = session.visibleChatTabs.read(reader);
-        const activeChat = session.activeChat.read(reader);
+        const sessionActiveChat = session.activeChat.read(reader);
         const orderedIds = chats.map(c => ( c.resource.toString()));
         const validIds = ( new Set(orderedIds));
+        const groupActiveResource = this._activeGroup?.activeResourceId.get();
+        const removedGroupActiveChat = groupActiveResource && !( validIds.has(groupActiveResource)) ? this._knownChatsByResource.get(groupActiveResource) : undefined;
+        const owningChat = this._activeGroup && removedGroupActiveChat ? this._getOwningChatToRestoreOnClose(this._activeGroup, removedGroupActiveChat) : undefined;
+        const owningChatToRestore = owningChat && ( validIds.has(( owningChat.resource.toString()))) ? owningChat : undefined;
+        for (const resourceId of ( this._knownChatsByResource.keys())) {
+            if (!( catalogIds.has(resourceId)) && !( validIds.has(resourceId))) {
+                this._knownChatsByResource.delete(resourceId);
+            }
+        }
+        const activeChat = owningChatToRestore ?? sessionActiveChat;
         const activeId = activeChat?.resource.toString();
         const hasUnassignedVisibleChats = ( orderedIds.some(id => !( this._groups.some(group => group.resourceIds.get().includes(id)))));
+        const activeChatChanged = !!activeId && activeId !== this._lastSessionActiveChatId;
+        const activeOwner = activeId ? this._groups.find(group => group.resourceIds.get().includes(activeId)) : undefined;
+        const activeParentResource = activeId ? activeChat?.origin?.parentChat : undefined;
+        const activeParentGroup = activeParentResource ? this._groups.find(group => group.resourceIds.get().includes(( activeParentResource.toString()))) : undefined;
+        const singleChatPresentation = this.showChatAsSessionView.read(reader);
+        const activeOpeningInNewGroup = !!activeId && ( this._pendingNewGroupResourceIds.has(activeId));
+        const activeOwnerPinnedResource = activeOwner?.pinnedResourceId.get();
+        const activeNeedsNewOwner = !this._restorePending && activeChatChanged && !!activeId && ((!activeOwner && this._activeGroup?.pinnedResourceId.get() !== undefined) || (!!activeOwnerPinnedResource && activeOwnerPinnedResource !== activeId));
+        const activeReplacesCurrentPeer = !this._restorePending && singleChatPresentation && activeChatChanged && !!activeId && !activeOwner && !activeParentResource && !activeOpeningInNewGroup && this._activeGroup?.pinnedResourceId.get() === undefined;
         if (!this._restorePending && !hasUnassignedVisibleChats) {
             this._removeGroupsWithoutVisibleChats(validIds);
         }
+        const activeTarget = activeNeedsNewOwner ? this._getOrCreateUnpinnedGroup(activeOwner, activeParentGroup) : activeReplacesCurrentPeer ? this._activeGroup : undefined;
         transaction(tx => {
+            if (activeReplacesCurrentPeer && activeTarget) {
+                activeTarget.resourceIds.set([], tx);
+            }
             for (const group of this._groups) {
                 const ids = group.resourceIds.get();
                 const pruned = ids.filter(id => ( validIds.has(id)));
                 if (pruned.length !== ids.length) {
                     group.resourceIds.set(pruned, tx);
                 }
+                const pinnedResource = group.pinnedResourceId.get();
+                if (pinnedResource && !( validIds.has(pinnedResource))) {
+                    group.pinnedResourceId.set(undefined, tx);
+                }
             }
             const assigned = ( new Set());
             for (const group of this._groups) {
@@ -275,7 +347,11 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
                     continue;
                 }
                 const savedGroupId = this._restoreAssignment?.get(id);
+                if (singleChatPresentation && savedGroupId === undefined && (id !== activeId || ( this._pendingNewGroupResourceIds.has(id)))) {
+                    continue;
+                }
                 let target = savedGroupId !== undefined ? this._groups.find(g => g.id === savedGroupId) : undefined;
+                target ??= id === activeId ? activeTarget : undefined;
                 const chat = chats.find(chat => ( chat.resource.toString()) === id);
                 const parentResource = id === activeId ? chat?.origin?.parentChat : undefined;
                 const parentGroup = parentResource ? this._groups.find(group => group.resourceIds.get().includes(( parentResource.toString()))) : undefined;
@@ -285,6 +361,15 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
                     target.resourceIds.set([...target.resourceIds.get(), id], tx);
                 }
             }
+            if (activeId && activeTarget) {
+                const owner = this._groups.find(group => group.resourceIds.get().includes(activeId));
+                if (owner && owner !== activeTarget) {
+                    this._detachChatFromGroup(owner, activeId, tx);
+                }
+                if (!activeTarget.resourceIds.get().includes(activeId)) {
+                    activeTarget.resourceIds.set([...activeTarget.resourceIds.get(), activeId], tx);
+                }
+            }
             if (this._restorePending && this._restoreOrder) {
                 const restoreOrder = this._restoreOrder;
                 for (const group of this._groups) {
@@ -307,7 +392,10 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             this._lastSessionActiveChatId = activeId;
             for (const group of this._groups) {
                 const ids = group.resourceIds.get();
-                if (ids.length && !ids.includes(group.activeResourceId.get())) {
+                const pinnedResource = group.pinnedResourceId.get();
+                if (pinnedResource && ids.includes(pinnedResource)) {
+                    group.activeResourceId.set(pinnedResource, tx);
+                } else if (ids.length && !ids.includes(group.activeResourceId.get())) {
                     group.activeResourceId.set(ids[0], tx);
                 }
             }
@@ -325,6 +413,9 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             this._removeEmptyGroups();
             this._persistLayout();
         }
+        if (owningChatToRestore && ( session.activeChat.get().resource.toString()) !== ( owningChatToRestore.resource.toString())) {
+            this._sessionsService.openChat(session, owningChatToRestore.resource).catch(onUnexpectedError);
+        }
     }
     _findTargetGroup(child) {
         for (const group of this._groups) {
@@ -353,6 +444,11 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             if (!( session.chats.get().some(chat => ( chat.resource.toString()) === id))) {
                 return;
             }
+            if (this.showChatAsSessionView.get() && zone !== "center" && target) {
+                const referenceId = target.activeResourceId.get();
+                await this._openChatInNewGroup(resource, referenceId ? ( URI.parse(referenceId)) : undefined, zone);
+                return;
+            }
             await this._sessionsService.openChat(session, resource);
             if (this._session !== session) {
                 return;
@@ -377,11 +473,15 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
     }
     _moveChatToGroup(resource, source, target) {
         const id = ( resource.toString());
+        const wasPinned = source.pinnedResourceId.get() === id;
         transaction(tx => {
             this._detachChatFromGroup(source, id, tx);
             if (!target.resourceIds.get().includes(id)) {
                 target.resourceIds.set([...target.resourceIds.get(), id], tx);
             }
+            if (target.pinnedResourceId.get() !== id) {
+                target.pinnedResourceId.set(wasPinned ? id : undefined, tx);
+            }
             target.activeResourceId.set(id, tx);
         });
         this._setActiveGroup(target);
@@ -394,6 +494,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             return;
         }
         const id = ( resource.toString());
+        const wasPinned = source.pinnedResourceId.get() === id;
         const newGroup = this._createGroupEntry(this._session);
         this._grid.addView(
             newGroup.view,
@@ -407,6 +508,9 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             this._detachChatFromGroup(source, id, tx);
             newGroup.resourceIds.set([id], tx);
             newGroup.activeResourceId.set(id, tx);
+            if (wasPinned) {
+                newGroup.pinnedResourceId.set(id, tx);
+            }
         });
         this._setActiveGroup(newGroup);
         await this._sessionsService.openChat(this._session, resource);
@@ -417,19 +521,73 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
     _detachChatFromGroup(group, id, tx) {
         const remaining = group.resourceIds.get().filter(x => x !== id);
         group.resourceIds.set(remaining, tx);
+        if (group.pinnedResourceId.get() === id) {
+            group.pinnedResourceId.set(undefined, tx);
+        }
         if (group.activeResourceId.get() === id && remaining.length) {
             group.activeResourceId.set(remaining[0], tx);
         }
     }
-    async openChatInNewGroup(resource) {
+    _getOrCreateUnpinnedGroup(excludedGroup, preferredGroup) {
+        if (preferredGroup && preferredGroup !== excludedGroup && preferredGroup.pinnedResourceId.get() === undefined) {
+            return preferredGroup;
+        }
+        const activeGroup = this._activeGroup;
+        if (activeGroup !== excludedGroup && activeGroup?.pinnedResourceId.get() === undefined) {
+            return activeGroup;
+        }
+        const existing = this._groups.find(
+            group => group !== excludedGroup && group.pinnedResourceId.get() === undefined
+        );
+        if (existing) {
+            return existing;
+        }
+        if (!this._grid || !this._currentSessionStore || !this._session) {
+            return undefined;
+        }
+        const reference = preferredGroup ?? excludedGroup ?? activeGroup ?? this._groups[this._groups.length - 1];
+        if (!reference) {
+            return undefined;
+        }
+        const newGroup = this._createGroupEntry(this._session);
+        this._grid.addView(newGroup.view, Sizing.Distribute, reference.view, Direction.Right);
+        this._insertGroup(newGroup, reference, "right");
+        this._setGroupCount(this._groups.length);
+        this._applyLayout();
+        return newGroup;
+    }
+    _toggleActiveChatPin(group) {
+        const activeResource = group.activeResourceId.get();
+        if (!activeResource) {
+            return;
+        }
+        group.pinnedResourceId.set(
+            group.pinnedResourceId.get() === activeResource ? undefined : activeResource,
+            undefined
+        );
+        this._persistLayout();
+    }
+    async openChatInNewGroup(resource, referenceChatResource) {
+        await this._openChatInNewGroup(resource, referenceChatResource, "right");
+        if (referenceChatResource && this._session?.sessionId === this._sessionsService.activeSession.get()?.sessionId && this._activeGroup?.activeResourceId.get() === ( resource.toString())) {
+            this._activeGroup.view.focus();
+        }
+    }
+    async _openChatInNewGroup(resource, referenceChatResource, zone) {
         if (!this._session || !this._grid || !this._currentSessionStore) {
             return;
         }
         const id = ( resource.toString());
+        const referenceId = referenceChatResource?.toString();
+        const findReferenceGroup = () => referenceId && referenceId !== id ? this._groups.find(group => group.resourceIds.get().includes(referenceId)) : undefined;
+        const referenceGroup = findReferenceGroup();
+        if (referenceGroup && referenceId) {
+            referenceGroup.activeResourceId.set(referenceId, undefined);
+        }
         const existing = this._groups.find(g => g.resourceIds.get().includes(id));
         if (existing) {
             if (existing.resourceIds.get().length > 1) {
-                await this._splitChatIntoNewGroup(resource, existing, existing, "right");
+                await this._splitChatIntoNewGroup(resource, existing, referenceGroup ?? existing, "right");
                 return;
             }
             existing.activeResourceId.set(id, undefined);
@@ -437,24 +595,41 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             await this._sessionsService.openChat(this._session, resource);
             return;
         }
-        const reference = this._activeGroup ?? this._groups[0];
-        if (!reference) {
+        const initialReference = referenceGroup ?? this._activeGroup ?? this._groups[0];
+        if (!initialReference) {
             return;
         }
         const session = this._session;
-        await this._sessionsService.openChat(session, resource);
+        this._pendingNewGroupResourceIds.add(id);
+        try {
+            await this._sessionsService.openChat(session, resource);
+        } finally {
+            this._pendingNewGroupResourceIds.delete(id);
+        }
         if (this._session !== session || !( session.visibleChatTabs.get().some(chat => ( chat.resource.toString()) === id))) {
             return;
         }
+        const reference = referenceChatResource ? findReferenceGroup() ?? this._activeGroup ?? this._groups[0] : this._groups.includes(initialReference) ? initialReference : this._activeGroup ?? this._groups[0];
+        if (!reference) {
+            return;
+        }
         const newGroup = this._createGroupEntry(session);
-        this._grid.addView(newGroup.view, Sizing.Distribute, reference.view, Direction.Right);
-        this._insertGroup(newGroup, reference, "right");
+        this._grid.addView(
+            newGroup.view,
+            Sizing.Distribute,
+            reference.view,
+            this._zoneToDirection(zone)
+        );
+        this._insertGroup(newGroup, reference, zone);
         this._setGroupCount(this._groups.length);
         transaction(tx => {
             const assignedGroup = this._groups.find(group => group !== newGroup && group.resourceIds.get().includes(id));
             if (assignedGroup) {
                 this._detachChatFromGroup(assignedGroup, id, tx);
             }
+            if (referenceId && reference.resourceIds.get().includes(referenceId)) {
+                reference.activeResourceId.set(referenceId, tx);
+            }
             newGroup.resourceIds.set([id], tx);
             newGroup.activeResourceId.set(id, tx);
         });
@@ -514,7 +689,7 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             if (this._groups.length <= 1) {
                 break;
             }
-            const hadFocus = group.view.element.contains(group.view.element.ownerDocument.activeElement);
+            const hadFocus = group.view.element.contains(getActiveElement(group.view.element.ownerDocument));
             this._grid.removeView(group.view, Sizing.Distribute);
             this._groups = this._groups.filter(g => g !== group);
             if (this._activeGroup === group) {
@@ -546,6 +721,63 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         const activeResource = group.activeResourceId.get();
         return group.chats.get().find(chat => ( chat.resource.toString()) === activeResource);
     }
+    getActiveChat() {
+        const activeResource = this._activeGroup?.activeResourceId.get();
+        return activeResource ? this._activeGroup?.chats.get().find(chat => ( chat.resource.toString()) === activeResource) : undefined;
+    }
+    toggleActiveChatPin() {
+        if (this._activeGroup) {
+            this._toggleActiveChatPin(this._activeGroup);
+        }
+    }
+    async closeChatGroup(chatResource) {
+        const session = this._session;
+        if (!session || !this.showChatAsSessionView.get()) {
+            return false;
+        }
+        const resourceId = ( chatResource.toString());
+        const source = this._groups.find(group => group.activeResourceId.get() === resourceId);
+        if (!source) {
+            return false;
+        }
+        if (this._groups.length === 1) {
+            this._sessionsService.closeSession(session);
+            return true;
+        }
+        const target = this._findAdjacentGroup(source);
+        const targetResourceId = target?.activeResourceId.get();
+        if (!target || !targetResourceId) {
+            return false;
+        }
+        if (( session.activeChat.get().resource.toString()) !== targetResourceId) {
+            await this._sessionsService.openChat(session, ( URI.parse(targetResourceId)));
+        }
+        if (this._session !== session || !this._groups.includes(source) || !this._groups.includes(target)) {
+            return false;
+        }
+        this._setActiveGroup(target);
+        this._removeGroups(group => group === source);
+        this._applyLayout();
+        this._persistLayout();
+        return true;
+    }
+    _getOwningChatToRestoreOnClose(group, chat) {
+        if ((chat.origin?.kind !== ChatOriginKind.SideChat && chat.origin?.kind !== ChatOriginKind.Tool) || !chat.origin.parentChat) {
+            return undefined;
+        }
+        const parentResource = ( chat.origin.parentChat.toString());
+        if (group.activeResourceId.get() !== ( chat.resource.toString()) || !group.resourceIds.get().includes(parentResource)) {
+            return undefined;
+        }
+        return group.chats.get().find(candidate => ( candidate.resource.toString()) === parentResource);
+    }
+    startFocusedChatTitleEditing() {
+        return this._getFocusedGroup()?.view.startFocusedChatTitleEditing() ?? false;
+    }
+    startChatTitleEditing(chatResource) {
+        const group = this._groups.find(group => ( group.chats.get().some(chat => ( chat.resource.toString()) === ( chatResource.toString()))));
+        return group?.view.startChatTitleEditing(chatResource) ?? false;
+    }
     _getFocusedGroup() {
         return this._groups.find(group => isAncestorOfActiveElement(group.view.element));
     }
@@ -583,7 +815,13 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         this._groups.forEach((group, index) => group.view.setGroupPosition(index, count));
     }
     _openChat(entry, resource) {
-        entry.activeResourceId.set(( resource.toString()), undefined);
+        const resourceId = ( resource.toString());
+        transaction(tx => {
+            if (entry.pinnedResourceId.get() !== resourceId) {
+                entry.pinnedResourceId.set(undefined, tx);
+            }
+            entry.activeResourceId.set(resourceId, tx);
+        });
         this._setActiveGroup(entry);
         if (this._session) {
             this._sessionsService.openChat(this._session, resource).catch(onUnexpectedError);
@@ -656,8 +894,8 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
     selectWorkspace(folderUri, options) {
         return this._activeGroup?.view.selectWorkspace(folderUri, options) ?? "notReady";
     }
-    selectNoWorkspace() {
-        this._activeGroup?.view.selectNoWorkspace();
+    selectNoWorkspace(options) {
+        this._activeGroup?.view.selectNoWorkspace(options);
     }
     prefillInput(text) {
         this._activeGroup?.view.prefillInput(text);
@@ -724,7 +962,8 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
             grid: this._grid.serialize(),
             groups: this._groups.map(group => ({
                 resourceIds: group.resourceIds.get(),
-                activeResourceId: group.activeResourceId.get()
+                activeResourceId: group.activeResourceId.get(),
+                pinnedResourceId: group.pinnedResourceId.get()
             })),
             activeGroupIndex: Math.max(0, this._groups.indexOf(this._activeGroup))
         };
@@ -766,6 +1005,6 @@ let ChatGroupsView = class ChatGroupsView extends Themable {
         super.dispose();
     }
 };
-ChatGroupsView = ChatGroupsView_1 = ( __decorate([( __param(0, IThemeService)), ( __param(1, IInstantiationService)), ( __param(2, ISessionsService)), ( __param(3, IStorageService))], ChatGroupsView));
+ChatGroupsView = ChatGroupsView_1 = ( __decorate([( __param(0, IThemeService)), ( __param(1, IInstantiationService)), ( __param(2, ISessionsService)), ( __param(3, IStorageService)), ( __param(4, IConfigurationService))], ChatGroupsView));
 
 export { ChatGroupsView };

package/vscode/src/vs/sessions/browser/parts/chatHeader.d.ts

@@ -0,0 +1,25 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
+import { IChat } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
+export interface IChatHeaderContext {
+    readonly session: IActiveSession;
+    readonly chat: IObservable<IChat | undefined>;
+    readonly activate: () => void;
+}
+/**
+ * Header for one chat group. Its title and actions target that group's chat.
+ */
+export declare class ChatHeader extends Disposable {
+    private readonly _bar;
+    get element(): HTMLElement;
+    get visible(): boolean;
+    get height(): number;
+    get onDidChangeVisibility(): Event<boolean>;
+    get onDidChangeHeight(): Event<void>;
+    constructor(instantiationService: IInstantiationService);
+    setChat(context: IChatHeaderContext | undefined): void;
+    setVisible(visible: boolean): void;
+}

package/vscode/src/vs/sessions/browser/parts/chatHeader.js

@@ -0,0 +1,42 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { SessionHeaderBar } from './sessionHeaderBar.js';
+
+let ChatHeader = class ChatHeader extends Disposable {
+    get element() {
+        return this._bar.element;
+    }
+    get visible() {
+        return this._bar.visible;
+    }
+    get height() {
+        return this._bar.height;
+    }
+    get onDidChangeVisibility() {
+        return this._bar.onDidChangeVisibility;
+    }
+    get onDidChangeHeight() {
+        return this._bar.onDidChangeHeight;
+    }
+    constructor(instantiationService) {
+        super();
+        this._bar = this._register(instantiationService.createInstance(SessionHeaderBar, undefined));
+        this._bar.element.draggable = false;
+    }
+    setChat(context) {
+        this._bar.setContext(context ? {
+            session: context.session,
+            chat: context.chat,
+            actionsTargetChat: true,
+            activateChatGroup: context.activate
+        } : undefined);
+    }
+    setVisible(visible) {
+        this._bar.setVisible(visible);
+    }
+};
+ChatHeader = ( __decorate([( __param(0, IInstantiationService))], ChatHeader));
+
+export { ChatHeader };

package/vscode/src/vs/sessions/browser/parts/customViewGridPart.js

@@ -13,6 +13,7 @@ import { Part } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/p
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { applyAgentsPartCardStyles, getAgentsPartCardContentSize } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/agentsPartCard';
 import { CustomViewNode } from './customViewNode.js';
+import { isPhoneLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/mobile/mobileLayout';
 import { IAgentWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service';
 
 registerCss(customViewGridPart, 0);
@@ -83,7 +84,14 @@ let CustomViewGridPart = class CustomViewGridPart extends Part {
         if (!this.layoutService.isVisible(Parts.CUSTOM_VIEW_GRID_PART)) {
             return;
         }
-        const cardSize = getAgentsPartCardContentSize(width, height, this.agentWorkbenchLayoutService.isEditorPaneVisible());
+        const cardSize = getAgentsPartCardContentSize(
+            width,
+            height,
+            this.agentWorkbenchLayoutService.isEditorPaneVisible(),
+            this.layoutService.isVisible(Parts.SIDEBAR_PART),
+            isPhoneLayout(this.layoutService),
+            this.layoutService.isModernUICompact()
+        );
         const {
             contentSize
         } = this.layoutContents(cardSize.width, cardSize.height);

package/vscode/src/vs/sessions/browser/parts/customViewNode.js

@@ -12,7 +12,7 @@ import { MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import { AGENTS_CENTERED_CONTENT_MAX_WIDTH } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/layoutConstants';
-import { activeSessionViewBackground, activeSessionViewForeground } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/theme';
+import { activeSessionViewBackground, activeSessionViewForeground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/agentsColors';
 import { ChatPillActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/chatPills';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 

package/vscode/src/vs/sessions/browser/parts/{singlePaneAuxiliaryBarPart.d.ts → desktopAuxiliaryBarPart.d.ts}

@@ -1,11 +1,11 @@
 import { AuxiliaryBarPart } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/auxiliaryBarPart";
 /**
- * Single-pane variant of the auxiliary bar. In the single-pane layout the
+ * Desktop variant of the auxiliary bar. In the desktop layout the
  * auxiliary bar is docked inside the editor part as a contextual detail panel:
- * it has no title/composite bar, shares the editor background so the pane reads
- * as one card, and fills the exact rectangle the workbench positions it in.
+ * it has no title/composite bar, uses the editor background by default, and
+ * fills the exact rectangle the workbench positions it in.
  */
-export declare class SinglePaneAuxiliaryBarPart extends AuxiliaryBarPart {
+export declare class DesktopAuxiliaryBarPart extends AuxiliaryBarPart {
     create(parent: HTMLElement): void;
     protected shouldShowCompositeBar(): boolean;
     protected getPartBackgroundColor(): string;