@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.d.ts

@@ -7,6 +7,8 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IInlineCompletionsService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/inlineCompletionsService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 export declare class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
     private readonly chatEntitlementService;
     private readonly instantiationService;
@@ -15,14 +17,20 @@ export declare class ChatStatusBarEntry extends Disposable implements IWorkbench
     private readonly configurationService;
     private readonly completionsService;
     private readonly chatSessionsService;
+    private readonly hoverService;
+    private readonly contextKeyService;
     static readonly ID = "workbench.contrib.chatStatusBarEntry";
+    private static readonly TITLE_BAR_CONTEXT_KEYS;
     private entry;
     private readonly activeCodeEditorListener;
+    private readonly entryAnchor;
     private runningSessionsCount;
-    constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService);
+    constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService, hoverService: IHoverService, contextKeyService: IContextKeyService);
     private update;
     private registerListeners;
     private onDidActiveEditorChange;
     private getEntryProps;
+    private getSetupEntryProps;
+    private isSignInTitleBarAffordanceVisible;
     dispose(): void;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.js

@@ -16,17 +16,30 @@ import { IInlineCompletionsService } from '@codingame/monaco-vscode-api/vscode/v
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatStatusDashboard } from './chatStatusDashboard.js';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { disposableWindowInterval } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, disposableWindowInterval } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { isNewUser } from './chatStatus.js';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { isCompletionsEnabled } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/completionsEnablement';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { InEditorZenModeContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
+var ChatStatusBarEntry_1;
 registerCss(chatStatus);
 let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
+    static {
+        ChatStatusBarEntry_1 = this;
+    }
     static {
         this.ID = "workbench.contrib.chatStatusBarEntry";
     }
+    static {
+        this.TITLE_BAR_CONTEXT_KEYS = ( new Set(["updateTitleBar", InEditorZenModeContext.key]));
+    }
     constructor(
         chatEntitlementService,
         instantiationService,
@@ -34,7 +47,9 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         editorService,
         configurationService,
         completionsService,
-        chatSessionsService
+        chatSessionsService,
+        hoverService,
+        contextKeyService
     ) {
         super();
         this.chatEntitlementService = chatEntitlementService;
@@ -44,9 +59,43 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.configurationService = configurationService;
         this.completionsService = completionsService;
         this.chatSessionsService = chatSessionsService;
+        this.hoverService = hoverService;
+        this.contextKeyService = contextKeyService;
         this.entry = undefined;
         this.activeCodeEditorListener = this._register(( new MutableDisposable()));
+        this.entryAnchor = $("span");
         this.runningSessionsCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
+        this._register(
+            CommandsRegistry.registerCommand("workbench.action.chat.openCopilotStatus", () => {
+                const target = this.entryAnchor.parentElement;
+                if (!target) {
+                    return;
+                }
+                const store = ( new DisposableStore());
+                const content = ChatStatusDashboard.instantiateInContents(this.instantiationService, store, undefined);
+                const hover = this.hoverService.showInstantHover({
+                    content,
+                    target,
+                    persistence: {
+                        hideOnKeyDown: true,
+                        sticky: true
+                    },
+                    appearance: {
+                        maxHeightRatio: 0.9
+                    }
+                }, true);
+                if (hover) {
+                    store.add(hover);
+                    store.add(disposableWindowInterval(mainWindow, () => {
+                        if (!content.isConnected) {
+                            store.dispose();
+                        }
+                    }, 2000));
+                } else {
+                    store.dispose();
+                }
+            })
+        );
         this.update();
         this.registerListeners();
     }
@@ -74,6 +123,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.update()));
         this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.update()));
         this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.update()));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(ChatStatusBarEntry_1.TITLE_BAR_CONTEXT_KEYS)) {
+                this.update();
+            }
+        }));
         this._register(this.completionsService.onDidChangeIsSnoozing(() => this.update()));
         this._register(this.chatSessionsService.onDidChangeInProgress(() => {
             const oldSessionsCount = this.runningSessionsCount;
@@ -86,7 +140,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange())
         );
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(product.defaultChatAgent.completionsEnablementSetting) || e.affectsConfiguration(ChatConfiguration.SignInTitleBarEnabled)) {
+            if (e.affectsConfiguration(product.defaultChatAgent.completionsEnablementSetting) || e.affectsConfiguration(ChatConfiguration.TitleBarSignInEnabled)) {
                 this.update();
             }
         }));
@@ -103,53 +157,40 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = "$(copilot)";
-        let ariaLabel = ( localize(6436, "Copilot status"));
+        let ariaLabel = ( localize(6671, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
             if (
             this.chatEntitlementService.sentiment.later || entitlement === ChatEntitlement.Available || isProUser(entitlement) || entitlement === ChatEntitlement.Free) {
-                const finishSetup = ( localize(6437, "Finish Setup"));
-                text = `$(copilot) ${finishSetup}`;
-                ariaLabel = finishSetup;
-                kind = "prominent";
+                return this.getSetupEntryProps();
             }
         } else {
             const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
             const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6438, "Copilot disabled"));
+                ariaLabel = ( localize(6672, "Copilot disabled"));
             }
             else if (this.runningSessionsCount > 0) {
                 text = "$(copilot-in-progress)";
                 if (this.runningSessionsCount > 1) {
-                    ariaLabel = ( localize(6439, "{0} agent sessions in progress", this.runningSessionsCount));
+                    ariaLabel = ( localize(6673, "{0} agent sessions in progress", this.runningSessionsCount));
                 } else {
-                    ariaLabel = ( localize(6440, "1 agent session in progress"));
+                    ariaLabel = ( localize(6674, "1 agent session in progress"));
                 }
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-                const signInExperiment = this.configurationService.getValue(ChatConfiguration.SignInTitleBarEnabled);
-                if (signInExperiment) {
-                    const signIn = ( localize(6441, "Sign In"));
-                    text = `$(copilot) ${signIn}`;
-                    ariaLabel = signIn;
-                } else {
-                    const signedOut = ( localize(6442, "Signed out"));
-                    text = `${this.chatEntitlementService.anonymous ? "$(copilot)" : "$(copilot-not-connected)"} ${signedOut}`;
-                    ariaLabel = signedOut;
-                    kind = "prominent";
-                }
+                return this.getSetupEntryProps();
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(6443, "Chat quota reached"));
+                    quotaWarning = ( localize(6675, "Chat quota reached"));
                 } else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(6444, "Inline suggestions quota reached"));
+                    quotaWarning = ( localize(6676, "Inline suggestions quota reached"));
                 } else {
-                    quotaWarning = ( localize(6445, "Quota reached"));
+                    quotaWarning = ( localize(6677, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
@@ -157,20 +198,21 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6446, "Inline suggestions disabled"));
+                ariaLabel = ( localize(6678, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = "$(copilot-snooze)";
-                ariaLabel = ( localize(6447, "Inline suggestions snoozed"));
+                ariaLabel = ( localize(6679, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(6448, "Copilot Status")),
+            name: ( localize(6680, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
             showInAllWindows: true,
             kind,
+            content: this.entryAnchor,
             tooltip: {
                 element: token => {
                     const store = ( new DisposableStore());
@@ -189,12 +231,46 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         };
         return baseResult;
     }
+    getSetupEntryProps() {
+        const showSignInLabel = !this.isSignInTitleBarAffordanceVisible();
+        const signInLabel = ( localize(6681, "Sign In"));
+        return {
+            name: ( localize(6680, "Copilot Status")),
+            text: showSignInLabel ? `$(copilot) ${signInLabel}` : "$(copilot)",
+            ariaLabel: showSignInLabel ? signInLabel : ( localize(6671, "Copilot status")),
+            command: CHAT_SETUP_ACTION_ID,
+            showInAllWindows: true,
+            kind: undefined,
+            content: this.entryAnchor
+        };
+    }
+    isSignInTitleBarAffordanceVisible() {
+        if (isWeb) {
+            return false;
+        }
+        if (this.chatEntitlementService.entitlement !== ChatEntitlement.Unknown) {
+            return false;
+        }
+        if (this.chatEntitlementService.sentiment.hidden || this.chatEntitlementService.sentiment.disabledInWorkspace) {
+            return false;
+        }
+        const hasTitleBarUpdate = Boolean(this.contextKeyService.getContextKeyValue("updateTitleBar"));
+        if (hasTitleBarUpdate) {
+            return false;
+        }
+        const inZenMode = Boolean(this.contextKeyService.getContextKeyValue(InEditorZenModeContext.key));
+        if (inZenMode) {
+            return false;
+        }
+        const signInTitleBarEnabled = this.configurationService.getValue(ChatConfiguration.TitleBarSignInEnabled) !== false;
+        return signInTitleBarEnabled;
+    }
     dispose() {
         super.dispose();
         this.entry?.dispose();
         this.entry = undefined;
     }
 };
-ChatStatusBarEntry = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IInstantiationService)), ( __param(2, IStatusbarService)), ( __param(3, IEditorService)), ( __param(4, IConfigurationService)), ( __param(5, IInlineCompletionsService)), ( __param(6, IChatSessionsService))], ChatStatusBarEntry));
+ChatStatusBarEntry = ChatStatusBarEntry_1 = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IInstantiationService)), ( __param(2, IStatusbarService)), ( __param(3, IEditorService)), ( __param(4, IConfigurationService)), ( __param(5, IInlineCompletionsService)), ( __param(6, IChatSessionsService)), ( __param(7, IHoverService)), ( __param(8, IContextKeyService))], ChatStatusBarEntry));
 
 export { ChatStatusBarEntry };

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.d.ts

@@ -7,6 +7,7 @@ export type ChatStatusEntry = {
     label: string | {
         label: string;
         link: string;
+        helpText?: string;
     };
     description: string;
     detail: string | undefined;