@codingame/monaco-vscode-chat-service-override 32.0.1 → 33.0.4

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.js

@@ -106,7 +106,7 @@ let ChatSetupController = class ChatSetupController extends Disposable {
     }
     async setup(options = {}) {
         const watch = ( new StopWatch(false));
-        const title = ( localize(6561, "Getting chat ready..."));
+        const title = ( localize(6624, "Getting chat ready..."));
         const badge = this.activityService.showViewContainerActivity(ChatViewContainerId, {
             badge: ( new ProgressBadge(() => title))
         });
@@ -181,12 +181,12 @@ let ChatSetupController = class ChatSetupController extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity.Error,
                 message: ( localize(
-                    6562,
+                    6625,
                     "Failed to sign in to {0}. Would you like to try again?",
                     this.defaultAccountService.getDefaultAccountAuthenticationProvider().name
                 )),
-                detail: ( localize(6563, "You must be signed in to use AI features.")),
-                primaryButton: ( localize(6564, "Retry"))
+                detail: ( localize(6626, "You must be signed in to use AI features.")),
+                primaryButton: ( localize(6627, "Retry"))
             });
             if (confirmed) {
                 return this.signIn(options);
@@ -267,11 +267,11 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 } = await this.dialogService.confirm({
                     type: Severity.Error,
                     message: ( localize(
-                        6565,
+                        6628,
                         "An error occurred while setting up chat. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(6564, "Retry"))
+                    primaryButton: ( localize(6627, "Retry"))
                 });
                 if (confirmed) {
                     return this.doInstallWithRetry();
@@ -349,8 +349,8 @@ let ChatSetupController = class ChatSetupController extends Disposable {
         }
         let isSingleWord = false;
         const result = await this.quickInputService.input({
-            prompt: ( localize(6566, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(6567, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
+            prompt: ( localize(6629, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(6630, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
             ignoreFocusLost: true,
             value: uri,
             validateInput: async value => {
@@ -361,14 +361,14 @@ let ChatSetupController = class ChatSetupController extends Disposable {
                 if (domainRegEx.test(value)) {
                     isSingleWord = true;
                     return {
-                        content: ( localize(6568, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(6631, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            6569,
+                            6632,
                             "You must enter a valid {0} instance (i.e. \"octocat\" or \"https://octocat.ghe.com\")",
                             defaultChat.provider.enterprise.name
                         )),

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.js

@@ -62,8 +62,8 @@ let GrowthSessionController = class GrowthSessionController extends Disposable {
         }
         return [{
             resource: GrowthSessionController_1.SESSION_URI,
-            label: ( localize(6570, "Try Copilot")),
-            description: ( localize(6571, "GitHub Copilot is available. Try it for free.")),
+            label: ( localize(6633, "Try Copilot")),
+            description: ( localize(6634, "GitHub Copilot is available. Try it for free.")),
             status: ChatSessionStatus.NeedsInput,
             iconPath: Codicon.lightbulb,
             timing: {
@@ -103,9 +103,9 @@ class GrowthSessionOpenerParticipant {
             query: "",
             isPartialQuery: true,
             previousRequests: [{
-                request: ( localize(6572, "Tell me about GitHub Copilot!")),
+                request: ( localize(6635, "Tell me about GitHub Copilot!")),
                 response: ( localize(
-                    6573,
+                    6636,
                     "Welcome to GitHub Copilot, your AI coding assistant! Here are some things you can try:\n\n- 🐛 *\"Help me debug this error\"* — paste an error message and get a fix\n- 🧪 *\"Write tests for my function\"* — select code and ask for unit tests\n- 💡 *\"Explain this code\"* — highlight something unfamiliar and ask what it does\n- 🚀 *\"Scaffold a REST API\"* — describe what you want and let Agent mode build it\n- 🎨 *\"Refactor this to be more readable\"* — select messy code and clean it up\n\nType anything below to get started!"
                 ))
             }]
@@ -126,8 +126,8 @@ registerAction2(class ResetGrowthSessionAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.resetGrowthSession",
-            title: ( localize2(6574, "Reset Growth Session Notification")),
-            category: ( localize2(6575, "Developer")),
+            title: ( localize2(6637, "Reset Growth Session Notification")),
+            category: ( localize2(6638, "Developer")),
             f1: true
         });
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.js

@@ -138,7 +138,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(6576, "Ask questions about VS Code")).value,
+                ( localize2(6639, "Ask questions about VS Code")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -153,7 +153,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.workspace",
                 "workspace",
                 false,
-                ( localize2(6577, "Ask about your workspace")).value,
+                ( localize2(6640, "Ask about your workspace")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -168,7 +168,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.terminal.agent",
                 "terminal",
                 false,
-                ( localize2(6578, "Ask how to do something in the terminal")).value,
+                ( localize2(6641, "Ask how to do something in the terminal")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -179,9 +179,9 @@ let SetupAgent = class SetupAgent extends Disposable {
                 id: "setup_tools_createNewWorkspace",
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(6579, "New Workspace")),
+                displayName: ( localize(6642, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(6580, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(6643, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: "new",
                 when: ContextKeyExpr.true()
@@ -236,10 +236,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         };
     }
     static {
-        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6581, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6644, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6582, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6645, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -341,10 +341,11 @@ let SetupAgent = class SetupAgent extends Disposable {
         languageModelToolsService,
         defaultAccountService
     ) {
+        const hasByokModels = this.chatEntitlementService.hasByokModels;
         if (
-        !this.context.state.completed || this.context.state.disabled || this.context.state.untrusted || this.context.state.entitlement === ChatEntitlement.Available ||
+        (!this.context.state.completed && !hasByokModels) || this.context.state.disabled || this.context.state.untrusted || this.context.state.entitlement === ChatEntitlement.Available ||
         (
-        this.context.state.entitlement === ChatEntitlement.Unknown && !this.chatEntitlementService.anonymous)) {
+        this.context.state.entitlement === ChatEntitlement.Unknown && !this.chatEntitlementService.anonymous && !hasByokModels)) {
             return this.doInvokeWithSetup(
                 request,
                 progress,
@@ -382,7 +383,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(6583, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(6646, "Getting chat ready")))),
             shimmer: true
         });
         await this.forwardRequestToChat(
@@ -419,7 +420,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             this.logService.error("[chat setup] Failed to forward request to chat", error);
             progress({
                 kind: "warning",
-                content: ( new MarkdownString(( localize(6584, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(6647, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -488,7 +489,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6585, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(6648, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
@@ -505,7 +506,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     this.environmentService.remoteAuthority ? 60000  : 20000
                 ).then(() => "timedout"), this.whenPanelAgentHasGuidance(disposables).then(() => "panelGuidance"), allReady]);
                 if (ready === "panelGuidance") {
-                    const warningMessage = ( localize(6586, "Please try again."));
+                    const warningMessage = ( localize(6649, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -517,13 +518,13 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            6587,
+                            6650,
                             "Chat took too long to get ready. Please ensure that the extension `{0}` is installed and enabled. Click restart to try again if this issue persists.",
                             defaultChat.chatExtensionId
                         ));
                     } else {
                         warningMessage = ( localize(
-                            6588,
+                            6651,
                             "Chat took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled. Click restart to try again if this issue persists.",
                             defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
@@ -550,7 +551,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(6589, "Show Details"))
+                                title: ( localize(6652, "Show Details"))
                             }
                         });
                     } else {
@@ -561,7 +562,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(6590, "Restart")),
+                                title: ( localize(6653, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
@@ -739,7 +740,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        6591,
+                        6654,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -749,7 +750,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6592, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(6655, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -786,7 +787,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(6593, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(6656, "Chat setup failed."))))
                 });
             }
         }
@@ -940,13 +941,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(6594, "Generate"));
+                generateOrModifyTitle = ( localize(6657, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(6595, "Modify"));
+                generateOrModifyTitle = ( localize(6658, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -964,14 +965,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6596, "Fix")),
+                title: ( localize(6659, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6597, "Explain")),
+                title: ( localize(6660, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -994,7 +995,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6595, "Modify")),
+            title: ( localize(6658, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1005,7 +1006,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6594, "Generate")),
+            title: ( localize(6657, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1024,7 +1025,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(6597, "Explain")),
+            title: ( localize(6660, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1034,7 +1035,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(6596, "Fix")),
+            title: ( localize(6659, "Fix")),
             arguments: [{
                 message: `/fix ${( markers.map(marker => marker.message)).join(", ")}`,
                 initialSelection: this.rangeToSelection(range),

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.js

@@ -24,6 +24,7 @@ import { isProUser, ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatSetupStrategy, ChatSetupAnonymous } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
+import { GitHubPaths } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount';
 import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 
@@ -45,7 +46,6 @@ const defaultChat = {
             name: ""
         }
     },
-    manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? "",
     termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? "",
     privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ""
 };
@@ -128,7 +128,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(6598, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(6661, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -262,20 +262,20 @@ let ChatSetup = class ChatSetup {
         });
         let buttons;
         if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-            const defaultProviderButton = [( localize(6599, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(6662, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
             const defaultProviderLink = [
                 defaultProviderButton[0],
                 defaultProviderButton[1],
                 styleButton("link-button")
             ];
-            const enterpriseProviderButton = [( localize(6599, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(6662, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
             const enterpriseProviderLink = [
                 enterpriseProviderButton[0],
                 enterpriseProviderButton[1],
                 styleButton("link-button")
             ];
-            const googleProviderButton = [( localize(6599, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
-            const appleProviderButton = [( localize(6599, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            const googleProviderButton = [( localize(6662, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(6662, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -292,7 +292,7 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            buttons = [[( localize(6600, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(6663, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
         return buttons;
     }
@@ -302,22 +302,22 @@ let ChatSetup = class ChatSetup {
         }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(6601, "Start using AI Features");
+                return localize(6664, "Start using AI Features");
             } else {
-                return localize(6602, "Enable more AI features");
+                return localize(6665, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(6603, "Sign in to use AI Features");
+            return localize(6666, "Sign in to use AI Features");
         }
-        return localize(6601, "Start using AI Features");
+        return localize(6664, "Start using AI Features");
     }
     createDialogFooter(disposables, options) {
         const element = $(".chat-setup-dialog-footer");
         let footer;
         if (options?.forceAnonymous || this.telemetryService.telemetryLevel === TelemetryLevel.NONE) {
             footer = ( localize(
-                6604,
+                6667,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -325,14 +325,14 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                6605,
+                6668,
                 "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.",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
                 defaultChat.privacyStatementUrl,
                 defaultChat.provider.default.name,
                 defaultChat.publicCodeMatchesUrl,
-                defaultChat.manageSettingsUrl
+                this.defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings)
             ));
         }
         element.appendChild($(

package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommands.js

@@ -48,7 +48,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         this.environmentService = environmentService;
         this._store.add(slashCommandService.registerSlashCommand({
             command: "clear",
-            detail: ( localize(6606, "Start a new chat and archive the current one")),
+            detail: ( localize(6669, "Start a new chat and archive the current one")),
             sortText: "z2_clear",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
@@ -58,7 +58,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "hooks",
-            detail: ( localize(6607, "Configure hooks")),
+            detail: ( localize(6670, "Configure hooks")),
             sortText: "z3_hooks",
             executeImmediately: true,
             silent: true,
@@ -69,7 +69,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "models",
-            detail: ( localize(6608, "Open the model picker")),
+            detail: ( localize(6671, "Open the model picker")),
             sortText: "z3_models",
             executeImmediately: true,
             silent: true,
@@ -79,7 +79,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "tools",
-            detail: ( localize(6609, "Configure tools")),
+            detail: ( localize(6672, "Configure tools")),
             sortText: "z3_tools",
             executeImmediately: true,
             silent: true,
@@ -90,7 +90,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "plugins",
-            detail: ( localize(6610, "Manage plugins")),
+            detail: ( localize(6673, "Manage plugins")),
             sortText: "z3_plugins",
             executeImmediately: true,
             silent: true,
@@ -102,7 +102,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (!this.environmentService.isSessionsWindow) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "debug",
-                detail: ( localize(6611, "Show Chat Debug View")),
+                detail: ( localize(6674, "Show Chat Debug View")),
                 sortText: "z3_debug",
                 executeImmediately: true,
                 silent: true,
@@ -113,7 +113,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }
         this._store.add(slashCommandService.registerSlashCommand({
             command: "agents",
-            detail: ( localize(6612, "Configure custom agents")),
+            detail: ( localize(6675, "Configure custom agents")),
             sortText: "z3_agents",
             executeImmediately: true,
             silent: true,
@@ -124,7 +124,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "skills",
-            detail: ( localize(6613, "Configure skills")),
+            detail: ( localize(6676, "Configure skills")),
             sortText: "z3_skills",
             executeImmediately: true,
             silent: true,
@@ -135,7 +135,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "instructions",
-            detail: ( localize(6614, "Configure instructions")),
+            detail: ( localize(6677, "Configure instructions")),
             sortText: "z3_instructions",
             executeImmediately: true,
             silent: true,
@@ -146,7 +146,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "prompts",
-            detail: ( localize(6615, "Configure prompt files")),
+            detail: ( localize(6678, "Configure prompt files")),
             sortText: "z3_prompts",
             executeImmediately: true,
             silent: true,
@@ -157,7 +157,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "fork",
-            detail: ( localize(6616, "Fork conversation into a new chat session")),
+            detail: ( localize(6679, "Fork conversation into a new chat session")),
             sortText: "z2_fork",
             executeImmediately: true,
             silent: true,
@@ -168,7 +168,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "rename",
-            detail: ( localize(6617, "Rename this chat")),
+            detail: ( localize(6680, "Rename this chat")),
             sortText: "z2_rename",
             executeImmediately: false,
             silent: true,
@@ -190,7 +190,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (autoApprovePolicyValue !== false) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "autoApprove",
-                detail: ( localize(6618, "Set permissions to bypass approvals")),
+                detail: ( localize(6681, "Set permissions to bypass approvals")),
                 sortText: "z1_autoApprove",
                 executeImmediately: true,
                 silent: true,
@@ -201,7 +201,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableAutoApprove",
-                detail: ( localize(6619, "Set permissions back to default")),
+                detail: ( localize(6682, "Set permissions back to default")),
                 sortText: "z1_disableAutoApprove",
                 executeImmediately: true,
                 silent: true,
@@ -212,7 +212,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "yolo",
-                detail: ( localize(6620, "Set permissions to bypass approvals")),
+                detail: ( localize(6683, "Set permissions to bypass approvals")),
                 sortText: "z1_yolo",
                 executeImmediately: true,
                 silent: true,
@@ -223,7 +223,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableYolo",
-                detail: ( localize(6621, "Set permissions back to default")),
+                detail: ( localize(6684, "Set permissions back to default")),
                 sortText: "z1_disableYolo",
                 executeImmediately: true,
                 silent: true,
@@ -235,7 +235,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             if (configurationService.getValue(ChatConfiguration.AutopilotEnabled) !== false) {
                 this._store.add(slashCommandService.registerSlashCommand({
                     command: "autopilot",
-                    detail: ( localize(6622, "Set permissions to autopilot mode")),
+                    detail: ( localize(6685, "Set permissions to autopilot mode")),
                     sortText: "z1_autopilot",
                     executeImmediately: true,
                     silent: true,
@@ -246,7 +246,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
                 }));
                 this._store.add(slashCommandService.registerSlashCommand({
                     command: "exitAutopilot",
-                    detail: ( localize(6623, "Set permissions back to default")),
+                    detail: ( localize(6686, "Set permissions back to default")),
                     sortText: "z1_exitAutopilot",
                     executeImmediately: true,
                     silent: true,
@@ -378,7 +378,7 @@ let ChatSessionOptionSlashCommandsContribution = class ChatSessionOptionSlashCom
     registerOne(chatSessionType, group, item, name) {
         return this.slashCommandService.registerSlashCommand({
             command: name,
-            detail: item.description ?? ( localize(6624, "Switch to '{0}'", item.name)),
+            detail: item.description ?? ( localize(6687, "Switch to '{0}'", item.name)),
             sortText: `z1_${name}`,
             executeImmediately: true,
             silent: true,

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

@@ -14,6 +14,7 @@ import { ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IChatStatusItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service";
+import { IDefaultAccountService } from "@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service";
 export interface IChatStatusDashboardOptions {
     /** When true, disables the Inline Suggestions settings section (toggles for all files, language, next edit). */
     disableInlineSuggestionsSettings?: boolean;
@@ -25,8 +26,6 @@ export interface IChatStatusDashboardOptions {
     disableCompletionsSnooze?: boolean;
     /** When true, the Quick Settings region is rendered always-expanded without a collapsible header. */
     disableQuickSettingsCollapsible?: boolean;
-    /** When true, contributed sections are rendered always-expanded without a collapsible header button. */
-    disableContributedSectionsCollapsible?: boolean;
     /**
      * When provided, the title header (plan name + manage / CTA actions) is
      * rendered into this caller-owned container instead of inline at the top
@@ -34,6 +33,18 @@ export interface IChatStatusDashboardOptions {
      * without reaching into the dashboard's private DOM.
      */
     titleHeaderContainer?: HTMLElement;
+    /**
+     * When true, uses a compact 2x2 grid layout for quota indicators:
+     * plan name + percentage on the top row, reset date + label on the bottom.
+     * The separate header (plan name + manage action) is not rendered.
+     */
+    compactQuotaLayout?: boolean;
+    /**
+     * When provided, CTA buttons (Manage Budget, Upgrade) are rendered into
+     * this caller-owned container instead of the dashboard header. Use this
+     * in compact mode to place action buttons in the host header.
+     */
+    ctaButtonsContainer?: HTMLElement;
 }
 export declare class ChatStatusDashboard extends DomWidget {
     private readonly options;
@@ -52,14 +63,14 @@ export declare class ChatStatusDashboard extends DomWidget {
     private readonly languageFeaturesService;
     private readonly contextViewService;
     private readonly storageService;
+    private readonly defaultAccountService;
     private static readonly QUICK_SETTINGS_COLLAPSED_KEY;
-    private static readonly CONTRIBUTED_COLLAPSED_KEY_PREFIX;
     readonly element: HTMLElement;
     private readonly dateFormatter;
     private readonly timeFormatter;
     private readonly quotaPercentageFormatter;
     private readonly quotaCreditsFormatter;
-    constructor(options: IChatStatusDashboardOptions | undefined, chatEntitlementService: ChatEntitlementService, chatStatusItemService: IChatStatusItemService, commandService: ICommandService, configurationService: IConfigurationService, editorService: IEditorService, hoverService: IHoverService, languageService: ILanguageService, openerService: IOpenerService, telemetryService: ITelemetryService, textResourceConfigurationService: ITextResourceConfigurationService, inlineCompletionsService: IInlineCompletionsService, markdownRendererService: IMarkdownRendererService, languageFeaturesService: ILanguageFeaturesService, contextViewService: IContextViewService, storageService: IStorageService);
+    constructor(options: IChatStatusDashboardOptions | undefined, chatEntitlementService: ChatEntitlementService, chatStatusItemService: IChatStatusItemService, commandService: ICommandService, configurationService: IConfigurationService, editorService: IEditorService, hoverService: IHoverService, languageService: ILanguageService, openerService: IOpenerService, telemetryService: ITelemetryService, textResourceConfigurationService: ITextResourceConfigurationService, inlineCompletionsService: IInlineCompletionsService, markdownRendererService: IMarkdownRendererService, languageFeaturesService: ILanguageFeaturesService, contextViewService: IContextViewService, storageService: IStorageService, defaultAccountService: IDefaultAccountService);
     private render;
     private renderUsageContent;
     private renderInlineSuggestionsSection;