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

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

@@ -128,7 +128,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(6353, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(6587, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -158,6 +158,9 @@ let ChatSetup = class ChatSetup {
         if (setupStrategy === ChatSetupStrategy.DefaultSetup && this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
             setupStrategy = ChatSetupStrategy.SetupWithEnterpriseProvider;
         }
+        if (setupStrategy !== ChatSetupStrategy.Canceled) {
+            options?.onSignInStarted?.();
+        }
         if (setupStrategy !== ChatSetupStrategy.Canceled && !options?.disableChatViewReveal) {
             this.widgetService.revealWidget();
         }
@@ -242,7 +245,7 @@ let ChatSetup = class ChatSetup {
                 icon: options?.dialogIcon ?? Codicon.copilotLarge,
                 alignment: DialogContentsAlignment.Vertical,
                 cancelId: buttons.length,
-                disableCloseButton: false,
+                disableCloseButton: options?.disableCloseButton ?? false,
                 renderFooter: footer => footer.appendChild(this.createDialogFooter(disposables, options)),
                 buttonOptions: ( buttons.map(button => button[2]))
             }, this.keybindingService, this.layoutService, this.hostService)
@@ -259,20 +262,20 @@ let ChatSetup = class ChatSetup {
         });
         let buttons;
         if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-            const defaultProviderButton = [( localize(6354, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(6588, "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(6354, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(6588, "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(6354, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
-            const appleProviderButton = [( localize(6354, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            const googleProviderButton = [( localize(6588, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(6588, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -289,7 +292,7 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            buttons = [[( localize(6355, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(6589, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
         return buttons;
     }
@@ -299,22 +302,22 @@ let ChatSetup = class ChatSetup {
         }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(6356, "Start using AI Features");
+                return localize(6590, "Start using AI Features");
             } else {
-                return localize(6357, "Enable more AI features");
+                return localize(6591, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(6358, "Sign in to use AI Features");
+            return localize(6592, "Sign in to use AI Features");
         }
-        return localize(6356, "Start using AI Features");
+        return localize(6590, "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(
-                6359,
+                6593,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -322,7 +325,7 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                6360,
+                6594,
                 "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,

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

@@ -2,9 +2,11 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
@@ -13,3 +15,21 @@ export declare class ChatSlashCommandsContribution extends Disposable {
     static readonly ID = "workbench.contrib.chatSlashCommands";
     constructor(slashCommandService: IChatSlashCommandService, commandService: ICommandService, chatAgentService: IChatAgentService, instantiationService: IInstantiationService, agentSessionsService: IAgentSessionsService, chatService: IChatService, configurationService: IConfigurationService, chatWidgetService: IChatWidgetService, environmentService: IWorkbenchEnvironmentService);
 }
+/**
+ * Registers slash commands declared by chat session providers via
+ * {@link IChatSessionProviderOptionItem.slashCommand}. Each slash command is
+ * scoped to its contributing session type via a `chatSessionType == X` `when`
+ * clause, executes immediately, and updates the session option corresponding
+ * to its declaring item — so e.g. `/yolo` switches the active permission mode
+ * without sending a chat request.
+ */
+export declare class ChatSessionOptionSlashCommandsContribution extends Disposable {
+    private readonly chatSessionsService;
+    private readonly slashCommandService;
+    private readonly logService;
+    static readonly ID = "workbench.contrib.chatSessionOptionSlashCommands";
+    private readonly _registrationsByType;
+    constructor(chatSessionsService: IChatSessionsService, slashCommandService: IChatSlashCommandService, logService: ILogService);
+    private refreshForSessionType;
+    private registerOne;
+}

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

@@ -2,15 +2,18 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { SessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatAgentLocation, ChatConfiguration, ChatPermissionLevel, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { OpenModelPickerAction, OpenModePickerAction, ChatSubmitAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
@@ -23,7 +26,6 @@ import { CONFIGURE_PROMPTS_ACTION_ID } from './promptSyntax/runPromptAction.js';
 import { CONFIGURE_SKILLS_ACTION_ID } from './promptSyntax/skillActions.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownDecorationsRenderer';
-import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 
@@ -46,7 +48,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         this.environmentService = environmentService;
         this._store.add(slashCommandService.registerSlashCommand({
             command: "clear",
-            detail: ( localize(6361, "Start a new chat and archive the current one")),
+            detail: ( localize(6595, "Start a new chat and archive the current one")),
             sortText: "z2_clear",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
@@ -56,18 +58,18 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "hooks",
-            detail: ( localize(6362, "Configure hooks")),
+            detail: ( localize(6596, "Configure hooks")),
             sortText: "z3_hooks",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await instantiationService.invokeFunction(showConfigureHooksQuickPick);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "models",
-            detail: ( localize(6363, "Open the model picker")),
+            detail: ( localize(6597, "Open the model picker")),
             sortText: "z3_models",
             executeImmediately: true,
             silent: true,
@@ -77,30 +79,30 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "tools",
-            detail: ( localize(6364, "Configure tools")),
+            detail: ( localize(6598, "Configure tools")),
             sortText: "z3_tools",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await commandService.executeCommand(ConfigureToolsAction.ID);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "plugins",
-            detail: ( localize(6365, "Manage plugins")),
+            detail: ( localize(6599, "Manage plugins")),
             sortText: "z3_plugins",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await commandService.executeCommand(ManagePluginsAction.ID);
         }));
         if (!this.environmentService.isSessionsWindow) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "debug",
-                detail: ( localize(6366, "Show Chat Debug View")),
+                detail: ( localize(6600, "Show Chat Debug View")),
                 sortText: "z3_debug",
                 executeImmediately: true,
                 silent: true,
@@ -111,51 +113,51 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }
         this._store.add(slashCommandService.registerSlashCommand({
             command: "agents",
-            detail: ( localize(6367, "Configure custom agents")),
+            detail: ( localize(6601, "Configure custom agents")),
             sortText: "z3_agents",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await commandService.executeCommand(OpenModePickerAction.ID);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "skills",
-            detail: ( localize(6368, "Configure skills")),
+            detail: ( localize(6602, "Configure skills")),
             sortText: "z3_skills",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await commandService.executeCommand(CONFIGURE_SKILLS_ACTION_ID);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "instructions",
-            detail: ( localize(6369, "Configure instructions")),
+            detail: ( localize(6603, "Configure instructions")),
             sortText: "z3_instructions",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await commandService.executeCommand(CONFIGURE_INSTRUCTIONS_ACTION_ID);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "prompts",
-            detail: ( localize(6370, "Configure prompt files")),
+            detail: ( localize(6604, "Configure prompt files")),
             sortText: "z3_prompts",
             executeImmediately: true,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async () => {
             await commandService.executeCommand(CONFIGURE_PROMPTS_ACTION_ID);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "fork",
-            detail: ( localize(6371, "Fork conversation into a new chat session")),
+            detail: ( localize(6605, "Fork conversation into a new chat session")),
             sortText: "z2_fork",
             executeImmediately: true,
             silent: true,
@@ -166,12 +168,12 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "rename",
-            detail: ( localize(6372, "Rename this chat")),
+            detail: ( localize(6606, "Rename this chat")),
             sortText: "z2_rename",
             executeImmediately: false,
             silent: true,
             locations: [ChatAgentLocation.Chat],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async (prompt, _progress, _history, _location, sessionResource) => {
             const title = prompt.trim();
             if (title) {
@@ -188,68 +190,68 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         if (autoApprovePolicyValue !== false) {
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "autoApprove",
-                detail: ( localize(6373, "Set permissions to bypass approvals")),
+                detail: ( localize(6607, "Set permissions to bypass approvals")),
                 sortText: "z1_autoApprove",
                 executeImmediately: true,
                 silent: true,
                 locations: [ChatAgentLocation.Chat],
-                targets: [Target.VSCode, Target.GitHubCopilot]
+                sessionTypes: [SessionType.Local, SessionType.CopilotCLI]
             }, async (_prompt, _progress, _history, _location, sessionResource) => {
                 setPermissionLevelForSession(sessionResource, ChatPermissionLevel.AutoApprove);
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableAutoApprove",
-                detail: ( localize(6374, "Set permissions back to default")),
+                detail: ( localize(6608, "Set permissions back to default")),
                 sortText: "z1_disableAutoApprove",
                 executeImmediately: true,
                 silent: true,
                 locations: [ChatAgentLocation.Chat],
-                targets: [Target.VSCode, Target.GitHubCopilot]
+                sessionTypes: [SessionType.Local, SessionType.CopilotCLI]
             }, async (_prompt, _progress, _history, _location, sessionResource) => {
                 setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Default);
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "yolo",
-                detail: ( localize(6375, "Set permissions to bypass approvals")),
+                detail: ( localize(6609, "Set permissions to bypass approvals")),
                 sortText: "z1_yolo",
                 executeImmediately: true,
                 silent: true,
                 locations: [ChatAgentLocation.Chat],
-                targets: [Target.VSCode, Target.GitHubCopilot]
+                sessionTypes: [SessionType.Local, SessionType.CopilotCLI]
             }, async (_prompt, _progress, _history, _location, sessionResource) => {
                 setPermissionLevelForSession(sessionResource, ChatPermissionLevel.AutoApprove);
             }));
             this._store.add(slashCommandService.registerSlashCommand({
                 command: "disableYolo",
-                detail: ( localize(6376, "Set permissions back to default")),
+                detail: ( localize(6610, "Set permissions back to default")),
                 sortText: "z1_disableYolo",
                 executeImmediately: true,
                 silent: true,
                 locations: [ChatAgentLocation.Chat],
-                targets: [Target.VSCode, Target.GitHubCopilot]
+                sessionTypes: [SessionType.Local, SessionType.CopilotCLI]
             }, async (_prompt, _progress, _history, _location, sessionResource) => {
                 setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Default);
             }));
             if (configurationService.getValue(ChatConfiguration.AutopilotEnabled) !== false) {
                 this._store.add(slashCommandService.registerSlashCommand({
                     command: "autopilot",
-                    detail: ( localize(6377, "Set permissions to autopilot mode")),
+                    detail: ( localize(6611, "Set permissions to autopilot mode")),
                     sortText: "z1_autopilot",
                     executeImmediately: true,
                     silent: true,
                     locations: [ChatAgentLocation.Chat],
-                    targets: [Target.VSCode, Target.GitHubCopilot]
+                    sessionTypes: [SessionType.Local, SessionType.CopilotCLI]
                 }, async (_prompt, _progress, _history, _location, sessionResource) => {
                     setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Autopilot);
                 }));
                 this._store.add(slashCommandService.registerSlashCommand({
                     command: "exitAutopilot",
-                    detail: ( localize(6378, "Set permissions back to default")),
+                    detail: ( localize(6612, "Set permissions back to default")),
                     sortText: "z1_exitAutopilot",
                     executeImmediately: true,
                     silent: true,
                     locations: [ChatAgentLocation.Chat],
-                    targets: [Target.VSCode, Target.GitHubCopilot]
+                    sessionTypes: [SessionType.Local, SessionType.CopilotCLI]
                 }, async (_prompt, _progress, _history, _location, sessionResource) => {
                     setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Default);
                 }));
@@ -262,7 +264,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat],
             modes: [ChatModeKind.Ask],
-            targets: [Target.VSCode]
+            sessionTypes: [SessionType.Local]
         }, async (prompt, progress, _history, _location, sessionResource) => {
             const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Chat);
             const agents = chatAgentService.getAgents();
@@ -323,5 +325,73 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
     }
 };
 ChatSlashCommandsContribution = ( __decorate([( __param(0, IChatSlashCommandService)), ( __param(1, ICommandService)), ( __param(2, IChatAgentService)), ( __param(3, IInstantiationService)), ( __param(4, IAgentSessionsService)), ( __param(5, IChatService)), ( __param(6, IConfigurationService)), ( __param(7, IChatWidgetService)), ( __param(8, IWorkbenchEnvironmentService))], ChatSlashCommandsContribution));
+let ChatSessionOptionSlashCommandsContribution = class ChatSessionOptionSlashCommandsContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.chatSessionOptionSlashCommands";
+    }
+    constructor(chatSessionsService, slashCommandService, logService) {
+        super();
+        this.chatSessionsService = chatSessionsService;
+        this.slashCommandService = slashCommandService;
+        this.logService = logService;
+        this._registrationsByType = this._register(( new DisposableMap()));
+        this._register(this.chatSessionsService.onDidChangeOptionGroups(chatSessionType => {
+            this.refreshForSessionType(chatSessionType);
+        }));
+    }
+    refreshForSessionType(chatSessionType) {
+        this._registrationsByType.deleteAndDispose(chatSessionType);
+        const groups = this.chatSessionsService.getOptionGroupsForSessionType(chatSessionType);
+        if (!groups || groups.length === 0) {
+            return;
+        }
+        const store = ( new DisposableStore());
+        const seen = ( new Set());
+        for (const group of groups) {
+            for (const item of group.items) {
+                const name = item.slashCommand?.trim();
+                if (!name) {
+                    continue;
+                }
+                if (( seen.has(name))) {
+                    this.logService.warn(
+                        `[ChatSessionOptionSlashCommands] Skipping duplicate slash command '${name}' contributed by session type '${chatSessionType}'.`
+                    );
+                    continue;
+                }
+                if (this.slashCommandService.hasCommand(name, chatSessionType)) {
+                    this.logService.warn(
+                        `[ChatSessionOptionSlashCommands] Slash command '${name}' contributed by session type '${chatSessionType}' is already registered; skipping.`
+                    );
+                    continue;
+                }
+                seen.add(name);
+                store.add(this.registerOne(chatSessionType, group, item, name));
+            }
+        }
+        if (store.isDisposed || seen.size === 0) {
+            store.dispose();
+            return;
+        }
+        this._registrationsByType.set(chatSessionType, store);
+    }
+    registerOne(chatSessionType, group, item, name) {
+        return this.slashCommandService.registerSlashCommand({
+            command: name,
+            detail: item.description ?? ( localize(6613, "Switch to '{0}'", item.name)),
+            sortText: `z1_${name}`,
+            executeImmediately: true,
+            silent: true,
+            locations: [ChatAgentLocation.Chat],
+            sessionTypes: [chatSessionType]
+        }, async (_prompt, _progress, _history, _location, sessionResource) => {
+            if (!sessionResource) {
+                return;
+            }
+            this.chatSessionsService.setSessionOption(sessionResource, group.id, item);
+        });
+    }
+};
+ChatSessionOptionSlashCommandsContribution = ( __decorate([( __param(0, IChatSessionsService)), ( __param(1, IChatSlashCommandService)), ( __param(2, ILogService))], ChatSessionOptionSlashCommandsContribution));
 
-export { ChatSlashCommandsContribution };
+export { ChatSessionOptionSlashCommandsContribution, ChatSlashCommandsContribution };

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

@@ -2,7 +2,7 @@ import { IInlineCompletionsService } from "@codingame/monaco-vscode-api/vscode/v
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
 import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
-import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 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";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
@@ -12,6 +12,7 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { DomWidget } from "../../../../../platform/domWidget/browser/domWidget.js";
 import { ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
 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";
 export interface IChatStatusDashboardOptions {
     /** When true, disables the Inline Suggestions settings section (toggles for all files, language, next edit). */
@@ -22,6 +23,17 @@ export interface IChatStatusDashboardOptions {
     disableProviderOptions?: boolean;
     /** When true, disables the completions snooze button. */
     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
+     * of the dashboard. Use this to embed the title header in a host layout
+     * without reaching into the dashboard's private DOM.
+     */
+    titleHeaderContainer?: HTMLElement;
 }
 export declare class ChatStatusDashboard extends DomWidget {
     private readonly options;
@@ -38,28 +50,34 @@ export declare class ChatStatusDashboard extends DomWidget {
     private readonly inlineCompletionsService;
     private readonly markdownRendererService;
     private readonly languageFeaturesService;
-    private readonly quickInputService;
+    private readonly contextViewService;
+    private readonly storageService;
+    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 quotaOverageFormatter;
-    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, quickInputService: IQuickInputService);
+    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);
     private render;
     private renderUsageContent;
+    private renderInlineSuggestionsSection;
+    private renderContributedSections;
+    private renderSetupSection;
     private renderInlineSuggestionsContent;
     private canUseChat;
     private renderHeader;
-    private renderContributedChatStatusItem;
     private renderTextPlus;
     private runCommandAndClose;
+    private formatResetAtLabel;
     private createQuotaIndicator;
+    private createGlobalQuotaCallout;
     private createSettings;
     private createSetting;
     private createInlineSuggestionsSetting;
+    private createTriStateLanguageSetting;
     private getCompletionsSettingAccessor;
     private createNextEditSuggestionsSetting;
     private createCompletionsSnooze;
-    private showModelPicker;
-    private showProviderOptionPicker;
 }