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

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

@@ -2,8 +2,10 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $, trackFocus, size } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -11,14 +13,15 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { getChatSessionArchiveActionWording, getChatSessionArchiveActionPresentation } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/sessionArchiveActions';
-import { ChatInteractivity, SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { getChatCapabilities, SessionStatus, isSideChatOf, ChatInteractivity } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 import { UNARCHIVE_SESSION_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
-import { SessionFocusedChatIsRenameTargetContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { SessionActiveChatIsClosableContext, SessionActiveChatCanArchiveContext, SessionActiveChatIsDeletableContext, SessionActiveChatIsUntitledContext, SessionHeaderActiveChatIsPinnedContext, SessionActiveChatResourceContext, SessionActiveChatHasSideChatsContext, SessionHeaderShowsChatContext, SessionHeaderTargetsChatContext, SessionToolbarShowsSessionContext, SessionFocusedChatIsRenameTargetContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { IChatViewFactory } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatView/browser/chatViewFactory.service';
 import { ChatCompositeBar } from './chatCompositeBar.js';
 import { RemoteHostUnavailableEmptyState } from './remoteHostUnavailableEmptyState.js';
 import { SessionRemoteConnection } from './sessionRemoteConnection.js';
 import { SessionReadOnlyBanner } from './sessionReadOnlyBanner.js';
+import { ChatHeader } from './chatHeader.js';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 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';
@@ -58,9 +61,20 @@ let ChatGroupView = class ChatGroupView extends Disposable {
         this._sessionActive = true;
         this._sessionVisible = true;
         this._primary = false;
+        this._split = false;
         this._serializationIndex = 0;
         const scopedContextKeyService = this._register(contextKeyService.createScoped(this.element));
         this._scopedInstantiationService = this._register(this._instantiationService.createChild(( new ServiceCollection([IContextKeyService, scopedContextKeyService]))));
+        this._activeChatIsClosableKey = SessionActiveChatIsClosableContext.bindTo(scopedContextKeyService);
+        this._activeChatCanArchiveKey = SessionActiveChatCanArchiveContext.bindTo(scopedContextKeyService);
+        this._activeChatIsDeletableKey = SessionActiveChatIsDeletableContext.bindTo(scopedContextKeyService);
+        this._activeChatIsUntitledKey = SessionActiveChatIsUntitledContext.bindTo(scopedContextKeyService);
+        this._activeChatIsPinnedKey = SessionHeaderActiveChatIsPinnedContext.bindTo(scopedContextKeyService);
+        this._activeChatResourceKey = SessionActiveChatResourceContext.bindTo(scopedContextKeyService);
+        this._activeChatHasSideChatsKey = SessionActiveChatHasSideChatsContext.bindTo(scopedContextKeyService);
+        this._headerShowsChatKey = SessionHeaderShowsChatContext.bindTo(scopedContextKeyService);
+        this._headerTargetsChatKey = SessionHeaderTargetsChatContext.bindTo(scopedContextKeyService);
+        this._toolbarShowsSessionKey = SessionToolbarShowsSessionContext.bindTo(scopedContextKeyService);
         this._focusedChatIsRenameTargetKey = SessionFocusedChatIsRenameTargetContext.bindTo(scopedContextKeyService);
         this._connection = this._register(this._instantiationService.createInstance(SessionRemoteConnection));
         this._archiveActionWording = observableFromEvent(
@@ -70,45 +84,88 @@ let ChatGroupView = class ChatGroupView extends Disposable {
         );
         this._barContainer = $(".chat-group-view-bar");
         this.element.appendChild(this._barContainer);
+        this._chatHeader = this._register(this._scopedInstantiationService.createInstance(ChatHeader));
+        this._barContainer.appendChild(this._chatHeader.element);
         this._compositeBar = this._register(
             this._scopedInstantiationService.createInstance(ChatCompositeBar, undefined)
         );
         this._barContainer.appendChild(this._compositeBar.element);
-        this._readOnlyBanner = this._register(( new SessionReadOnlyBanner()));
+        this._readOnlyBanner = this._register(this._instantiationService.createInstance(SessionReadOnlyBanner));
         this._barContainer.appendChild(this._readOnlyBanner.domNode);
         this._contentContainer = $(".chat-group-view-content");
         this.element.appendChild(this._contentContainer);
-        this._remoteHostUnavailableEmptyState = this._register(( new RemoteHostUnavailableEmptyState()));
+        this._remoteHostUnavailableEmptyState = this._register(this._instantiationService.createInstance(RemoteHostUnavailableEmptyState));
         this._contentContainer.appendChild(this._remoteHostUnavailableEmptyState.domNode);
-        this._register(this._compositeBar.onDidChangeVisibility(() => this._layoutChildren()));
+        this._register(this._chatHeader.onDidChangeVisibility(() => this._layoutChildren()));
+        this._register(this._chatHeader.onDidChangeHeight(() => this._layoutChildren()));
+        this._register(this._compositeBar.onDidChangeVisibility(() => {
+            this._contentContainer.classList.toggle("modern-ui-editor-tab-content", this._compositeBar.visible);
+            this._layoutChildren();
+        }));
         this._register(this._compositeBar.onDidChangeHeight(() => this._layoutChildren()));
         const focusTracker = this._register(trackFocus(this.element));
         this._register(focusTracker.onDidFocus(() => this._onDidFocus.fire()));
     }
     setGroupPosition(index, count) {
         this._primary = index === 0;
-        this._currentView.value?.setPrimary(this._primary);
+        this._split = count > 1;
+        this._currentView.value?.setPrimary(this._primary, this._split);
         if (count <= 1) {
             this.element.removeAttribute("role");
             this.element.removeAttribute("aria-label");
-            this._compositeBar.setAriaLabel(( localize(2974, "Chats")));
+            this._compositeBar.setAriaLabel(( localize(3373, "Chats")));
             return;
         }
         this.element.setAttribute("role", "region");
-        this.element.setAttribute("aria-label", ( localize(2975, "Chat Group {0} of {1}", index + 1, count)));
-        this._compositeBar.setAriaLabel(( localize(2976, "Chats, Group {0} of {1}", index + 1, count)));
+        this.element.setAttribute("aria-label", ( localize(3374, "Chat Group {0} of {1}", index + 1, count)));
+        this._compositeBar.setAriaLabel(( localize(3375, "Chats, Group {0} of {1}", index + 1, count)));
+    }
+    startFocusedChatTitleEditing() {
+        return this._compositeBar.startFocusedTabEditing();
+    }
+    startChatTitleEditing(chatResource) {
+        return this._compositeBar.startTabEditing(chatResource);
     }
     setContext(context) {
         this._contextDisposables.clear();
         this._connection.setSession(context?.session);
         if (!context) {
+            this._draftChatResource = undefined;
+            this._activeChatIsClosableKey.reset();
+            this._activeChatCanArchiveKey.reset();
+            this._activeChatIsDeletableKey.reset();
+            this._activeChatIsUntitledKey.reset();
+            this._activeChatIsPinnedKey.reset();
+            this._activeChatResourceKey.reset();
+            this._activeChatHasSideChatsKey.reset();
+            this._headerShowsChatKey.reset();
+            this._headerTargetsChatKey.reset();
+            this._toolbarShowsSessionKey.reset();
             this._focusedChatIsRenameTargetKey.reset();
+            this._chatHeader.setChat(undefined);
             this._compositeBar.setGroup(undefined);
             this._currentView.clear();
             this._setRemoteHostUnavailableEmptyState(undefined);
             this._contentContainer.replaceChildren(this._remoteHostUnavailableEmptyState.domNode);
             return;
         }
+        const activeChat = derived(reader => {
+            const activeResource = context.activeChatResource.read(reader);
+            return context.chats.read(reader).find(c => ( c.resource.toString()) === activeResource);
+        });
+        this._chatHeader.setChat({
+            session: context.session,
+            chat: activeChat,
+            activate: () => context.activate()
+        });
+        this._contextDisposables.add(autorun(reader => {
+            const visible = context.chatHeaderVisible.read(reader);
+            this._chatHeader.setVisible(visible);
+            this._headerShowsChatKey.set(visible);
+        }));
+        this._contextDisposables.add(autorun(reader => {
+            this._toolbarShowsSessionKey.set(context.showSessionActions.read(reader));
+        }));
         const delegate = {
             session: context.session,
             chats: context.chats,
@@ -121,19 +178,26 @@ let ChatGroupView = class ChatGroupView extends Disposable {
             onTabDragEnd: () => context.onTabDragEnd()
         };
         this._compositeBar.setGroup(delegate);
-        const activeChat = derived(reader => {
-            const activeResource = context.activeChatResource.read(reader);
-            return context.chats.read(reader).find(c => ( c.resource.toString()) === activeResource);
-        });
         this._contextDisposables.add(autorun(reader => {
             const activeResource = context.activeChatResource.read(reader);
             const mainResource = context.mainChatResource.read(reader);
-            this._focusedChatIsRenameTargetKey.set(activeResource !== mainResource);
+            const chat = activeChat.read(reader);
+            const isNonMainChat = activeResource !== mainResource;
+            this._activeChatIsClosableKey.set(isNonMainChat || context.chatHeaderVisible.read(reader));
+            const capabilities = chat && getChatCapabilities(chat, context.session, reader);
+            this._activeChatCanArchiveKey.set(!!capabilities?.canArchive && !(chat?.isArchived?.read(reader) ?? false));
+            this._activeChatIsDeletableKey.set(capabilities?.canDelete ?? false);
+            this._activeChatIsUntitledKey.set(chat?.status.read(reader) === SessionStatus.Untitled);
+            this._activeChatIsPinnedKey.set(context.activeChatIsPinned.read(reader));
+            this._activeChatResourceKey.set(chat?.resource.toString() ?? "");
+            this._activeChatHasSideChatsKey.set(!!chat && ( context.session.chats.read(reader).some(candidate => isSideChatOf(candidate, chat.resource))));
+            this._headerTargetsChatKey.set(context.chatHeaderVisible.read(reader) && isNonMainChat);
+            this._focusedChatIsRenameTargetKey.set(isNonMainChat);
         }));
         const currentView = observableValue(this._contextDisposables, this._currentView.value);
         const readOnlyContent = derived(reader => {
             const chat = activeChat.read(reader);
-            if (!chat || chat.interactivity.read(reader) === ChatInteractivity.Full) {
+            if (!chat || chat.interactivity.read(reader) === ChatInteractivity.Full || chat.interactivity.read(reader) === ChatInteractivity.DraftOnly) {
                 return undefined;
             }
             const archived = context.session.isArchived.read(reader);
@@ -142,7 +206,7 @@ let ChatGroupView = class ChatGroupView extends Disposable {
                 return {
                     archived: true,
                     content: {
-                        message: ( localize(2977, "Archived sessions are read-only.")),
+                        message: ( localize(3376, "Archived sessions are read-only.")),
                         action: {
                             label: action.title.value,
                             run: () => this._commandService.executeCommand(UNARCHIVE_SESSION_COMMAND_ID, context.session)
@@ -153,21 +217,26 @@ let ChatGroupView = class ChatGroupView extends Disposable {
             return {
                 archived: false,
                 content: {
-                    message: ( localize(2978, "This chat is read-only"))
+                    message: ( localize(3377, "This chat is read-only"))
                 }
             };
         });
         const surface = derived(reader => {
+            const view = currentView.read(reader);
+            const historyStatus = view?.historyStatus.read(reader);
             const readOnly = readOnlyContent.read(reader);
             if (readOnly?.archived) {
                 return {
-                    banner: readOnly.content,
+                    banner: historyStatus?.kind === "history" ? {
+                        message: ( localize(3378, "{0} {1}", historyStatus.message, readOnly.content.message)),
+                        action: historyStatus.action,
+                        secondaryAction: readOnly.content.action
+                    } : readOnly.content,
                     recovery: undefined
                 };
             }
-            const view = currentView.read(reader);
             const transcriptSettled = view === undefined || !view.isLoadingTranscript.read(reader);
-            const recovery = !transcriptSettled || view?.hasVisibleTranscriptContent.read(reader) ? undefined : this._connection.recoveryContent.read(reader);
+            const recovery = !transcriptSettled || view?.hasVisibleTranscriptContent.read(reader) || activeChat.read(reader)?.interactivity.read(reader) === ChatInteractivity.DraftOnly ? undefined : this._connection.recoveryContent.read(reader);
             if (recovery) {
                 return {
                     banner: undefined,
@@ -175,24 +244,50 @@ let ChatGroupView = class ChatGroupView extends Disposable {
                 };
             }
             const connectionBanner = this._connection.bannerContent.read(reader);
-            if (connectionBanner) {
+            const quietDraft = activeChat.read(reader)?.interactivity.read(reader) === ChatInteractivity.DraftOnly && this._connection.isQuiet.read(reader);
+            if (connectionBanner && !quietDraft) {
                 return {
                     banner: connectionBanner,
                     recovery: undefined
                 };
             }
+            if (historyStatus && (historyStatus.kind === "history" || !this._connection.isQuiet.read(reader))) {
+                return {
+                    banner: {
+                        icon: Codicon.warning,
+                        message: historyStatus.message,
+                        action: historyStatus.action
+                    },
+                    recovery: undefined
+                };
+            }
+            if (!quietDraft && activeChat.read(reader)?.interactivity.read(reader) === ChatInteractivity.DraftOnly && context.session.remoteConnectionStatus?.read(reader)?.kind === "connected") {
+                return {
+                    banner: {
+                        icon: Codicon.sync,
+                        message: ( localize(3379, "Preparing the session..."))
+                    },
+                    recovery: undefined
+                };
+            }
             return {
-                banner: readOnly?.content,
+                banner: !transcriptSettled || view?.isInputBlocked.read(reader) ? undefined : readOnly?.content,
                 recovery: undefined
             };
         });
         this._contextDisposables.add(autorun(reader => {
             const session = context.session;
             const chat = activeChat.read(reader);
+            if (!isEqual(this._draftChatResource, chat?.resource)) {
+                this._draftChatResource = undefined;
+            }
+            if (chat?.interactivity.read(reader) === ChatInteractivity.DraftOnly) {
+                this._draftChatResource = chat.resource;
+            }
             let desiredKind;
             if (session.isCreated.read(reader) === false) {
                 desiredKind = session.isNewSessionRequestInProgress?.read(reader) === true ? "chat" : "newSession";
-            } else if (!chat || (chat.status.read(reader) === SessionStatus.Untitled && chat.interactivity.read(reader) === ChatInteractivity.Full)) {
+            } else if (!chat || (chat.status.read(reader) === SessionStatus.Untitled && chat.interactivity.read(reader) === ChatInteractivity.Full && !isEqual(this._draftChatResource, chat.resource))) {
                 desiredKind = "newChatInSession";
             } else {
                 desiredKind = "chat";
@@ -207,13 +302,18 @@ let ChatGroupView = class ChatGroupView extends Disposable {
                 this._contentContainer.replaceChildren(view.element, this._remoteHostUnavailableEmptyState.domNode);
                 this._currentView.value = view;
                 currentView.set(view, undefined);
-                view.setPrimary(this._primary);
+                view.setPrimary(this._primary, this._split);
                 view.setActive(this._sessionActive);
                 view.setVisible(this._sessionVisible);
                 this._layoutChildren();
             }
             if (chat) {
-                view.setChat(chat, session.sessionId, session);
+                view.setChat(
+                    chat,
+                    session.sessionId,
+                    session,
+                    chat.interactivity.read(reader) === ChatInteractivity.DraftOnly ? () => this._connection.connectOnInput() : undefined
+                );
             }
             const surfaceContent = surface.read(reader);
             this._setRemoteHostUnavailableEmptyState(surfaceContent.recovery);
@@ -263,8 +363,8 @@ let ChatGroupView = class ChatGroupView extends Disposable {
     selectWorkspace(folderUri, options) {
         return this._currentView.value?.selectWorkspace(folderUri, options) ?? "notReady";
     }
-    selectNoWorkspace() {
-        this._currentView.value?.selectNoWorkspace();
+    selectNoWorkspace(options) {
+        this._currentView.value?.selectNoWorkspace(options);
     }
     prefillInput(text) {
         this._currentView.value?.prefillInput(text);
@@ -295,9 +395,10 @@ let ChatGroupView = class ChatGroupView extends Disposable {
             top,
             left
         } = this._lastLayout;
+        const headerHeight = this._chatHeader.visible ? this._chatHeader.height : 0;
         const tabsHeight = this._compositeBar.visible ? this._compositeBar.height : 0;
         const bannerHeight = this._readOnlyBanner.visible ? this._readOnlyBanner.domNode.offsetHeight : 0;
-        const barHeight = tabsHeight + bannerHeight;
+        const barHeight = headerHeight + tabsHeight + bannerHeight;
         size(this._barContainer, width, barHeight);
         size(this._contentContainer, width, height - barHeight);
         this._currentView.value?.layout(width, height - barHeight, top + barHeight, left);

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

@@ -1,13 +1,14 @@
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 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 { IChat } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
 import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
-import { IChatViewOptions, ISelectWorkspaceOptions, WorkspaceSelectionResult } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/chatView";
+import { IChatViewOptions, ISelectNoWorkspaceOptions, ISelectWorkspaceOptions, WorkspaceSelectionResult } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/chatView";
 /**
  * Hosts the grid of chat groups within a single {@link IActiveSession}. Chats
  * default to a single group (tab strip). Dragging a chat tab to a group's edge
@@ -41,16 +42,22 @@ export declare class ChatGroupsView extends Themable {
     private _sessionActive;
     private _sessionVisible;
     private readonly _singleGroupTabsReplaceHeader;
+    readonly showChatAsSessionView: IObservable<boolean>;
+    private readonly _showGroupChatHeaders;
     /** While restoring a persisted layout: routes (late-loading) chats back to their saved groups. */
     private _restoreAssignment;
     /** Saved tab order (resource string -> ordinal) used to restore tab order across groups. */
     private _restoreOrder;
+    /** Retains chat metadata long enough to reconcile a chat removed from the session catalog. */
+    private readonly _knownChatsByResource;
+    /** Chats being opened into a new group must remain unassigned until that group exists. */
+    private readonly _pendingNewGroupResourceIds;
     /** Whether a persisted layout is still being restored (saved chats may not have loaded yet). */
     private _restorePending;
     private _lastSessionActiveChatId;
     private _lastLayout;
     private _gridDidLayout;
-    constructor(themeService: IThemeService, _instantiationService: IInstantiationService, _sessionsService: ISessionsService, _storageService: IStorageService);
+    constructor(themeService: IThemeService, _instantiationService: IInstantiationService, _sessionsService: ISessionsService, _storageService: IStorageService, configurationService: IConfigurationService);
     setSingleGroupTabsReplaceHeader(enabled: boolean): void;
     /** Sets (or clears) the session whose chats this view partitions into groups. */
     setSession(session: IActiveSession | undefined, options: IChatViewOptions): void;
@@ -73,12 +80,14 @@ export declare class ChatGroupsView extends Themable {
      * remaining one so the source group keeps showing a chat it still owns.
      */
     private _detachChatFromGroup;
+    private _getOrCreateUnpinnedGroup;
+    private _toggleActiveChatPin;
     /**
-     * Opens a chat in a group beside its current group ("open to the side"). A
-     * chat already sharing a group is moved into a new group to its right. A chat
-     * already alone in its own group is focused without creating a duplicate.
+     * Opens a chat beside a visible reference chat, or its current group.
+     * A chat already alone in its own group is focused without creating a duplicate.
      */
-    openChatInNewGroup(resource: URI): Promise<void>;
+    openChatInNewGroup(resource: URI, referenceChatResource?: URI): Promise<void>;
+    private _openChatInNewGroup;
     private _findAdjacentGroup;
     private _insertGroup;
     /**
@@ -95,6 +104,12 @@ export declare class ChatGroupsView extends Themable {
     private _removeGroups;
     private _setActiveGroup;
     getFocusedChat(): IChat | undefined;
+    getActiveChat(): IChat | undefined;
+    toggleActiveChatPin(): void;
+    closeChatGroup(chatResource: URI): Promise<boolean>;
+    private _getOwningChatToRestoreOnClose;
+    startFocusedChatTitleEditing(): boolean;
+    startChatTitleEditing(chatResource: URI): boolean;
     private _getFocusedGroup;
     /**
      * Handles focus entering a group: promotes it to the active group and, when
@@ -118,7 +133,7 @@ export declare class ChatGroupsView extends Themable {
     setSessionVisible(visible: boolean): void;
     submitInput(): Promise<boolean>;
     selectWorkspace(folderUri: URI, options?: ISelectWorkspaceOptions): WorkspaceSelectionResult;
-    selectNoWorkspace(): void;
+    selectNoWorkspace(options?: ISelectNoWorkspaceOptions): void;
     prefillInput(text: string): void;
     sendQuery(text: string): void;
     attach(uris: URI[]): void;