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

package/vscode/src/vs/sessions/browser/sessionsSetUpService.js

@@ -106,21 +106,28 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
             () => this._onAllowSignedOutWhenUsableChanged()
         ));
         this._register(
-            this.sessionsManagementService.onDidChangeSessionTypes(() => this._onSessionTypesChanged())
+            this.sessionsManagementService.onDidChangeSessionTypes(() => this._onProviderAvailabilityChanged())
         );
         this._start();
     }
-    _onSessionTypesChanged() {
+    _onAllowSignedOutWhenUsableChanged() {
         const signedIn = this.defaultAccountService.currentDefaultAccount !== null;
-        if (conditionalAuthState(this._accountResolved, signedIn) === ConditionalAuthState.SignedOut) {
-            this._reevaluateSignedOut();
+        if (conditionalAuthState(this._accountResolved, signedIn) !== ConditionalAuthState.SignedOut) {
+            return;
         }
+        this._reevaluateSignedOut();
     }
-    _onAllowSignedOutWhenUsableChanged() {
+    _onProviderAvailabilityChanged() {
         const signedIn = this.defaultAccountService.currentDefaultAccount !== null;
         if (conditionalAuthState(this._accountResolved, signedIn) !== ConditionalAuthState.SignedOut) {
             return;
         }
+        if (this._initialSetupFlow) {
+            if (this._canInitializeWithoutGitHub()) {
+                this.signInSetupCancellation.value?.cancel();
+            }
+            return;
+        }
         this._reevaluateSignedOut();
     }
     _start() {
@@ -137,6 +144,7 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
                 return;
             }
             this._accountResolved = true;
+            this._onProviderAvailabilityChanged();
             if (!this._initialSetupFlow && this._allowSignedOutWhenUsable.get()) {
                 this._onAllowSignedOutWhenUsableChanged();
             }
@@ -192,6 +200,10 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
             return;
         }
         if (!initialAccount) {
+            if (this._canInitializeWithoutGitHub()) {
+                await this._proceedWithoutGitHub();
+                return;
+            }
             const welcomeComplete = this.storageService.getBoolean(WELCOME_COMPLETE_KEY, StorageScope.APPLICATION, false);
             if (welcomeComplete && this._allowSignedOutWhenUsable.get()) {
                 await this._proceedWithoutGitHub();
@@ -228,15 +240,28 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
         return disposables;
     }
     _signedOutWindowGate() {
+        const sessionTypes = this.sessionsManagementService.getAllProviderSessionTypes().map((
+            {
+                sessionType
+            }
+        ) => sessionType);
         return resolveSignedOutWindowGate(
             this._allowSignedOutWhenUsable.get(),
-            this.sessionsManagementService.getAllProviderSessionTypes().map((
-                {
-                    sessionType
-                }
-            ) => sessionType.authRequirement)
+            sessionTypes.map(sessionType => sessionType.authRequirement),
+            this._canInitializeWithoutGitHub(sessionTypes)
         );
     }
+    _canInitializeWithoutGitHub(
+        sessionTypes = this.sessionsManagementService.getAllProviderSessionTypes().map((
+            {
+                sessionType
+            }
+        ) => sessionType)
+    ) {
+        return ( sessionTypes.some(
+            sessionType => sessionType.initializationOnSelection?.canInitializeWithoutGitHub === true
+        ));
+    }
     _reevaluateSignedOut() {
         if (this._initialSetupFlow) {
             return;
@@ -271,7 +296,7 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
         }
         this._proceedingSignedOut = true;
         this.logService.info(
-            "[sessions welcome] Proceeding without GitHub sign-in; signed-out operation is enabled"
+            "[sessions welcome] Proceeding without GitHub sign-in; a session type can initialize without GitHub or signed-out operation is enabled"
         );
         await this._ensureAIFeaturesEnabled();
         if (this._store.isDisposed) {
@@ -296,10 +321,10 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
         const welcomeVisibleKey = SessionsWelcomeVisibleContext.bindTo(this.contextKeyService);
         welcomeVisibleKey.set(true);
         disposables.add(toDisposable(() => welcomeVisibleKey.reset()));
-        const dialog = disposables.add(( new Dialog(this.layoutService.activeContainer, "", [( localize(3059, "Enable AI Features"))], createWorkbenchDialogOptions({
+        const dialog = disposables.add(( new Dialog(this.layoutService.activeContainer, "", [( localize(3464, "Enable AI Features"))], createWorkbenchDialogOptions({
             type: "none",
             extraClasses: ["chat-setup-dialog", "sessions-welcome-dialog"],
-            detail: ( localize(3060, "Enable AI features to continue using Agents.")),
+            detail: ( localize(3465, "Enable AI features to continue using Agents.")),
             icon: Codicon.agent,
             alignment: DialogContentsAlignment.Vertical,
             cancelId: 1,
@@ -363,9 +388,21 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
                 }
                 await this._showWelcomeDialog();
             } else {
+                if (this._canInitializeWithoutGitHub()) {
+                    this.storageService.store(
+                        WELCOME_COMPLETE_KEY,
+                        true,
+                        StorageScope.APPLICATION,
+                        StorageTarget.MACHINE
+                    );
+                    this.serviceMarkDone();
+                    this.dialogRef.clear();
+                    await this._proceedWithoutGitHub();
+                    return;
+                }
                 const allowContinueWithoutSignIn = this._allowSignedOutWhenUsable.get();
                 const continueWithoutSignIn = await this._showSignInDialog(allowContinueWithoutSignIn);
-                if (continueWithoutSignIn) {
+                if (continueWithoutSignIn || this._canInitializeWithoutGitHub()) {
                     this.storageService.store(
                         WELCOME_COMPLETE_KEY,
                         true,
@@ -389,7 +426,7 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
         const overlay = append(this.layoutService.mainContainer, $("div.sessions-loading-overlay"));
         overlay.setAttribute("role", "status");
         overlay.setAttribute("aria-busy", "true");
-        overlay.setAttribute("aria-label", ( localize(3061, "Loading")));
+        overlay.setAttribute("aria-label", ( localize(3466, "Loading")));
         append(overlay, $("div.sessions-loading-icon.codicon.codicon-agent"));
         return {
             element: overlay,
@@ -419,6 +456,7 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
             let success;
             try {
                 success = await this.commandService.executeCommand("workbench.action.chat.triggerSetup", undefined, {
+                    telemetrySource: "sessionsSetup",
                     ...createSessionsSignInDialogOptions(
                         this.commandService,
                         showReturnToVSCodeEditor,
@@ -471,8 +509,8 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
     async _showWelcomeDialog() {
         this.logService.info("[sessions welcome] Showing welcome dialog");
         const disposables = ( new DisposableStore());
-        const productName = ( localize(3062, "{0} - Agents", this.productService.nameLong));
-        const dialog = disposables.add(( new Dialog(this.layoutService.activeContainer, ( localize(3063, "Welcome to {0}", productName)), [( localize(3064, "Get Started"))], createWorkbenchDialogOptions({
+        const productName = ( localize(3467, "{0} - Agents", this.productService.nameLong));
+        const dialog = disposables.add(( new Dialog(this.layoutService.activeContainer, ( localize(3468, "Welcome to {0}", productName)), [( localize(3469, "Get Started"))], createWorkbenchDialogOptions({
             type: "none",
             extraClasses: [
                 "chat-setup-dialog",
@@ -480,7 +518,7 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
                 "sessions-main-welcome-dialog"
             ],
             detail: ( localize(
-                3065,
+                3470,
                 "Your AI-powered coding experience where agents explore, build, and iterate with you."
             )),
             icon: Codicon.agent,
@@ -507,8 +545,8 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
         const privacyUrl = defaultChatAgent?.privacyStatementUrl ?? "";
         const publicCodeUrl = defaultChatAgent?.publicCodeMatchesUrl ?? "";
         const settingsUrl = this.defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings);
-        const footer = ( localize(
-            3066,
+        const footer = settingsUrl ? ( localize(
+            3471,
             "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these [settings]({5}) anytime.",
             providerName,
             termsUrl,
@@ -516,6 +554,14 @@ let SessionsSetUpWidget = class SessionsSetUpWidget extends Disposable {
             providerName,
             publicCodeUrl,
             settingsUrl
+        )) : ( localize(
+            3472,
+            "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these settings anytime.",
+            providerName,
+            termsUrl,
+            privacyUrl,
+            providerName,
+            publicCodeUrl
         ));
         element.appendChild($(
             "p",

package/vscode/src/vs/sessions/browser/sessionsSignInDialog.d.ts

@@ -5,6 +5,7 @@ import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 export declare function createSessionsSignInDialogOptions(commandService: ICommandService, showReturnToVSCodeEditor: boolean, allowContinueWithoutSignIn?: boolean, onContinueWithoutSignIn?: () => void): {
     forceSignInDialog: boolean;
+    autoDismissOnSignIn: boolean;
     dialogIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
     dialogTitle: string;
     disableCloseButton: boolean;

package/vscode/src/vs/sessions/browser/sessionsSignInDialog.js

@@ -23,12 +23,13 @@ function createSessionsSignInDialogOptions(
 ) {
     return {
         forceSignInDialog: true,
+        autoDismissOnSignIn: true,
         dialogIcon: Codicon.agent,
-        dialogTitle: ( localize(3067, "Sign in to use Agents")),
+        dialogTitle: ( localize(3473, "Sign in to use Agents")),
         disableCloseButton: !allowContinueWithoutSignIn,
         dialogExtraClasses: ["sessions-welcome-dialog"],
         allowContinueWithoutSignIn,
-        renderDialogFooter: showReturnToVSCodeEditor ? footer => createDialogAction(footer, ( localize(3068, "Return to VS Code Editor")), () => {
+        renderDialogFooter: showReturnToVSCodeEditor ? footer => createDialogAction(footer, ( localize(3474, "Return to VS Code Editor")), () => {
             void commandService.executeCommand(RETURN_TO_VSCODE_EDITOR_COMMAND_ID).catch(onUnexpectedError);
         }) : undefined,
         onDidDismissDialog: allowContinueWithoutSignIn ? onContinueWithoutSignIn : undefined
@@ -40,11 +41,11 @@ let SessionsSigningInDialog = class SessionsSigningInDialog extends Disposable {
         this.onCancel = onCancel;
         this.isDisposed = false;
         this.didCancel = false;
-        this.dialog = this._register(( new Dialog(layoutService.activeContainer, ( localize(3069, "Signing in…")), [], createWorkbenchDialogOptions({
+        this.dialog = this._register(( new Dialog(layoutService.activeContainer, ( localize(3475, "Signing in…")), [], createWorkbenchDialogOptions({
             type: "none",
             extraClasses: ["chat-setup-dialog", "sessions-welcome-dialog"],
             modalBlockExtraClasses: ["sessions-signing-in-dialog-modal-block"],
-            detail: ( localize(3070, "Please complete sign-in in the browser.")),
+            detail: ( localize(3476, "Please complete sign-in in the browser.")),
             icon: Codicon.agent,
             alignment: DialogContentsAlignment.Vertical,
             cancelId: 0,

package/vscode/src/vs/sessions/browser/workbenchFactory.d.ts

@@ -0,0 +1,12 @@
+import { ServiceCollection } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { AgentWorkbenchLayout, IWorkbenchOptions, Workbench } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench";
+export declare function getSessionsWorkbenchLayout(viewportWidth: number, platform?: {
+    isWeb: boolean;
+    isMobile: boolean;
+}): AgentWorkbenchLayout;
+/**
+ * Creates the Agents window workbench. Non-phone windows always use the
+ * desktop variant; phones use the dedicated mobile workbench.
+ */
+export declare function createSessionsWorkbench(parent: HTMLElement, options: IWorkbenchOptions | undefined, serviceCollection: ServiceCollection, logService: ILogService): Workbench;

package/vscode/src/vs/sessions/browser/workbenchFactory.js

@@ -0,0 +1,17 @@
+
+import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { isMobile, isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { AgentWorkbenchLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
+import './desktopWorkbench.js';
+
+function getSessionsWorkbenchLayout(
+    viewportWidth,
+    platform = {
+        isWeb,
+        isMobile
+    }
+) {
+    return platform.isWeb && platform.isMobile && viewportWidth < 640 ? AgentWorkbenchLayout.Mobile : AgentWorkbenchLayout.Desktop;
+}
+
+export { getSessionsWorkbenchLayout };

package/vscode/src/vs/sessions/contrib/accountMenu/browser/account.contribution.d.ts

@@ -1,8 +1,92 @@
-import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable, DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IDefaultAccountService } from "@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service";
+import { BaseActionViewItem, IBaseActionViewItemOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems";
+import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
 import { IAccountTitleBarState } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/accountTitleBarState";
+import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IChatDashboardService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/chatDashboardService.service";
+import { ICodexAccountService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentHost/browser/codexAccountService.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { ICodexAccountRateLimitInfo } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/codexAccount";
 export declare function shouldShowAccountPanelSummary(state: Pick<IAccountTitleBarState, "source" | "kind">, hasCopilotDashboard: boolean, isAccountLoading: boolean): boolean;
+export declare function getChatGPTRateLimitResetHover(rateLimit: ICodexAccountRateLimitInfo): string | undefined;
+export declare class TitleBarAccountWidget extends BaseActionViewItem {
+    private readonly defaultAccountService;
+    private readonly authenticationService;
+    private readonly menuService;
+    private readonly contextKeyService;
+    private readonly hoverService;
+    private readonly instantiationService;
+    private readonly chatEntitlementService;
+    private readonly codexAccountService;
+    private readonly configurationService;
+    private readonly commandService;
+    private container;
+    private avatarElement;
+    private iconElement;
+    private codexPanelAvatarElement;
+    private codexPanelIconElement;
+    private labelElement;
+    private badgeElement;
+    private accountName;
+    private accountProviderId;
+    private accountProviderLabel;
+    private accountIcon;
+    private isAccountLoading;
+    private accountRequestCounter;
+    private avatarRequestCounter;
+    private currentAvatarUrl;
+    private loadedAvatarUrl;
+    private codexAvatarRequestCounter;
+    private currentCodexAvatarUrl;
+    private loadedCodexAvatarUrl;
+    private lastCodexAccount;
+    private lastState;
+    private isMenuVisible;
+    private lastBadgeKey;
+    private dismissedBadgeKey;
+    private readonly copilotDashboardStore;
+    private readonly clickPanelDisposable;
+    private readonly avatarLoadDisposable;
+    private readonly codexAvatarLoadDisposable;
+    /** Whether the conditional-auth opt-in permits signed-out operation. */
+    private readonly allowSignedOutWhenUsable;
+    constructor(action: IAction, options: IBaseActionViewItemOptions | undefined, defaultAccountService: IDefaultAccountService, authenticationService: IAuthenticationService, menuService: IMenuService, contextKeyService: IContextKeyService, hoverService: IHoverService, instantiationService: IInstantiationService, chatEntitlementService: ChatEntitlementService, codexAccountService: ICodexAccountService, configurationService: IConfigurationService, commandService: ICommandService);
+    setFocusable(_focusable: boolean): void;
+    render(container: HTMLElement): void;
+    onClick(): void;
+    private refreshAccount;
+    private renderState;
+    private getAvatarAltText;
+    private getCodexAvatarAltText;
+    private renderCodexPanelAvatar;
+    private refreshAvatar;
+    private refreshCodexAvatar;
+    private getHoverTarget;
+    private showCombinedPanel;
+    private createCombinedPanelContent;
+    private appendCopilotUsage;
+    private renderCopilotUsage;
+    private appendChatGPTUsage;
+    private getCopilotResetLabel;
+    private partitionMenuActions;
+    private getPanelHeaderLabel;
+    private getCopilotPlanLabel;
+    private shouldShowCopilotDashboardHover;
+    private createCopilotHoverContent;
+}
+export declare class AccountWidgetContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.sessionsWidget";
+    constructor(actionViewItemService: IActionViewItemService, instantiationService: IInstantiationService);
+}
 export declare class ChatDashboardServiceImpl implements IChatDashboardService {
     private readonly instantiationService;
     readonly _serviceBrand: undefined;