@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.1

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

@@ -42,6 +42,7 @@ import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { ExtensionUrlHandlerOverrideRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { CONTEXT_DEFAULT_ACCOUNT_STATE, DefaultAccountStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/accounts/browser/defaultAccount';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
@@ -228,7 +229,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
             static {
-                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6721, "Use AI Features with Copilot for free..."));
+                this.CHAT_SETUP_ACTION_LABEL = ( localize2(7226, "Use AI Features with Copilot for free..."));
             }
             constructor() {
                 super({
@@ -279,8 +280,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         confirmed
                     } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(6722, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(6723, "Retry"))
+                        message: ( localize(7227, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(7228, "Retry"))
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -325,7 +326,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupForceSignIn",
-                    title: ( localize2(6724, "Sign in to use GitHub Copilot"))
+                    title: ( localize2(7229, "Sign in to use GitHub Copilot"))
                 });
             }
             async run(accessor) {
@@ -363,11 +364,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupFromAccounts",
-                    title: ( localize2(6725, "Sign in to use GitHub Copilot...")),
+                    title: ( localize2(7230, "Sign in to use GitHub Copilot...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: "2_copilot",
-                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate()), ChatContextKeys.Entitlement.signedOut))
+                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( CONTEXT_DEFAULT_ACCOUNT_STATE.notEqualsTo(DefaultAccountStatus.Available)), (
+                        ChatContextKeys.Setup.completed.negate()), ChatContextKeys.Entitlement.signedOut))
                     }
                 });
             }
@@ -388,12 +390,13 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: ChatSetupSignInTitleBarAction.ID,
-                    title: ( localize(6726, "Sign In")),
+                    title: ( localize(7231, "Sign In")),
                     f1: false,
                     menu: [{
                         id: MenuId.TitleBarAdjacentCenter,
                         order: 0,
-                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatEntitlementContextKeys.hasByokModels.negate()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( ( ContextKeyExpr.has("updateTitleBar")).negate()), ( InEditorZenModeContext.negate())))
+                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( CONTEXT_DEFAULT_ACCOUNT_STATE.notEqualsTo(DefaultAccountStatus.Available)), (
+                        ChatEntitlementContextKeys.hasByokModels.negate()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( ( ContextKeyExpr.has("updateTitleBar")).negate()), ( InEditorZenModeContext.negate())))
                     }]
                 });
             }
@@ -409,7 +412,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ToggleSignInTitleBarAction extends ToggleTitleBarConfigAction {
             constructor() {
-                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(6727, "Copilot Sign In")), ( localize(6728, "Toggle visibility of the Copilot Sign In button in title bar")), 3, ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))));
+                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(7232, "Copilot Sign In")), ( localize(7233, "Toggle visibility of the Copilot Sign In button in title bar")), 3, ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))));
             }
         }
         const windowFocusListener = this._register(( new MutableDisposable()));
@@ -417,8 +420,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.upgradePlan",
-                    title: ( localize2(6729, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(6730, "Chat")),
+                    title: ( localize2(7234, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(7235, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
@@ -468,8 +471,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.manageAdditionalSpend",
-                    title: ( localize2(6731, "Manage GitHub Copilot Budget")),
-                    category: ( localize2(6730, "Chat")),
+                    title: ( localize2(7236, "Manage GitHub Copilot Budget")),
+                    category: ( localize2(7235, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
@@ -541,22 +544,17 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         }
                         break;
                     }
-                case "chat.internal.codeReview.run":
-                    {
-                        return commandService.executeCommand(actualCommand, ...args);
-                    }
                 }
             });
         }
         registerGenerateCodeCommand("chat.internal.explain", "github.copilot.chat.explain");
         registerGenerateCodeCommand("chat.internal.fix", "github.copilot.chat.fix");
         registerGenerateCodeCommand("chat.internal.review", "github.copilot.chat.review");
-        registerGenerateCodeCommand("chat.internal.codeReview.run", "github.copilot.chat.codeReview.run");
         const internalGenerateCodeContext = ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate())));
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.explain",
-                title: ( localize(6732, "Explain"))
+                title: ( localize(7237, "Explain"))
             },
             group: "1_chat",
             order: 4,
@@ -565,7 +563,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.fix",
-                title: ( localize(6733, "Fix"))
+                title: ( localize(7238, "Fix"))
             },
             group: "1_chat",
             order: 5,
@@ -574,7 +572,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.review",
-                title: ( localize(6734, "Code Review"))
+                title: ( localize(7239, "Code Review"))
             },
             group: "1_chat",
             order: 6,
@@ -697,8 +695,8 @@ let ChatSetupExtensionUrlHandler = class ChatSetupExtensionUrlHandler {
         this.chatInputNotificationService.setNotification({
             id: ChatSetupExtensionUrlHandler_1.UPGRADE_SUCCESS_NOTIFICATION_ID,
             severity: ChatInputNotificationSeverity.Info,
-            message: ( localize(6735, "Upgrade Successful")),
-            description: ( localize(6736, "Please wait up to 10 minutes for your new plan to apply.")),
+            message: ( localize(7240, "Upgrade Successful")),
+            description: ( localize(7241, "Please wait up to 10 minutes for your new plan to apply.")),
             actions: [],
             dismissible: true,
             autoDismissOnMessage: true
@@ -786,7 +784,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
         await this.extensionsWorkbenchService.updateRunningExtensions(
-            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6737, "Enabling AI features")) : ( localize(6738, "Disabling AI features"))
+            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(7242, "Enabling AI features")) : ( localize(7243, "Disabling AI features"))
         );
     }
     maybeHideAuxiliaryBar() {
@@ -804,7 +802,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 this.ID = "workbench.action.chat.hideSetup";
             }
             static {
-                this.TITLE = ( localize2(6739, "Learn How to Hide AI Features"));
+                this.TITLE = ( localize2(7244, "Learn How to Hide AI Features"));
             }
             constructor() {
                 super({

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(6740, "Getting chat ready..."));
+        const title = ( localize(7245, "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(
-                    6741,
+                    7246,
                     "Failed to sign in to {0}. Would you like to try again?",
                     this.defaultAccountService.getDefaultAccountAuthenticationProvider().name
                 )),
-                detail: ( localize(6742, "You must be signed in to use AI features.")),
-                primaryButton: ( localize(6743, "Retry"))
+                detail: ( localize(7247, "You must be signed in to use AI features.")),
+                primaryButton: ( localize(7248, "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(
-                        6744,
+                        7249,
                         "An error occurred while setting up chat. Would you like to try again?"
                     )),
                     detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-                    primaryButton: ( localize(6743, "Retry"))
+                    primaryButton: ( localize(7248, "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(6745, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(6746, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
+            prompt: ( localize(7250, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
+            placeHolder: ( localize(7251, "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(6747, "Will resolve to {0}", `https://${value}.ghe.com`)),
+                        content: ( localize(7252, "Will resolve to {0}", `https://${value}.ghe.com`)),
                         severity: Severity.Info
                     };
                 }
                 if (!fullUriRegEx.test(value)) {
                     return {
                         content: ( localize(
-                            6748,
+                            7253,
                             "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(6749, "Try Copilot")),
-            description: ( localize(6750, "GitHub Copilot is available. Try it for free.")),
+            label: ( localize(7254, "Try Copilot")),
+            description: ( localize(7255, "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(6751, "Tell me about GitHub Copilot!")),
+                request: ( localize(7256, "Tell me about GitHub Copilot!")),
                 response: ( localize(
-                    6752,
+                    7257,
                     "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(6753, "Reset Growth Session Notification")),
-            category: ( localize2(6754, "Developer")),
+            title: ( localize2(7258, "Reset Growth Session Notification")),
+            category: ( localize2(7259, "Developer")),
             f1: true
         });
     }

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

@@ -19,7 +19,7 @@ import { nullExtensionDescription } from '@codingame/monaco-vscode-api/vscode/vs
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
-import { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { chatRequiresSetup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
@@ -138,7 +138,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(6755, "Ask questions about VS Code")).value,
+                ( localize2(7260, "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(6756, "Ask about your workspace")).value,
+                ( localize2(7261, "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(6757, "Ask how to do something in the terminal")).value,
+                ( localize2(7262, "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(6758, "New Workspace")),
+                displayName: ( localize(7263, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(6759, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(7264, "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(6760, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(7265, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6761, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(7266, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -341,11 +341,14 @@ let SetupAgent = class SetupAgent extends Disposable {
         languageModelToolsService,
         defaultAccountService
     ) {
-        const hasByokModels = this.chatEntitlementService.hasByokModels;
-        if (
-        (!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 && !hasByokModels)) {
+        if (chatRequiresSetup({
+            completed: !!this.context.state.completed,
+            disabled: !!this.context.state.disabled,
+            untrusted: !!this.context.state.untrusted,
+            entitlement: this.context.state.entitlement,
+            anonymous: this.chatEntitlementService.anonymous,
+            hasByokModels: this.chatEntitlementService.hasByokModels
+        })) {
             return this.doInvokeWithSetup(
                 request,
                 progress,
@@ -383,7 +386,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(6762, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(7267, "Getting chat ready")))),
             shimmer: true
         });
         await this.forwardRequestToChat(
@@ -420,7 +423,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(6763, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(7268, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -489,7 +492,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6764, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(7269, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
@@ -506,7 +509,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(6765, "Please try again."));
+                    const warningMessage = ( localize(7270, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -518,13 +521,13 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            6766,
+                            7271,
                             "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(
-                            6767,
+                            7272,
                             "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
@@ -551,7 +554,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(6768, "Show Details"))
+                                title: ( localize(7273, "Show Details"))
                             }
                         });
                     } else {
@@ -562,7 +565,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(6769, "Restart")),
+                                title: ( localize(7274, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
@@ -740,7 +743,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        6770,
+                        7275,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -750,7 +753,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6771, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(7276, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -787,7 +790,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(6772, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(7277, "Chat setup failed."))))
                 });
             }
         }
@@ -941,13 +944,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(6773, "Generate"));
+                generateOrModifyTitle = ( localize(7278, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(6774, "Modify"));
+                generateOrModifyTitle = ( localize(7279, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -965,14 +968,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6775, "Fix")),
+                title: ( localize(7280, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6776, "Explain")),
+                title: ( localize(7281, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -995,7 +998,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6774, "Modify")),
+            title: ( localize(7279, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1006,7 +1009,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6773, "Generate")),
+            title: ( localize(7278, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1025,7 +1028,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(6776, "Explain")),
+            title: ( localize(7281, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1035,7 +1038,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(6775, "Fix")),
+            title: ( localize(7280, "Fix")),
             arguments: [{
                 message: `/fix ${( markers.map(marker => marker.message)).join(", ")}`,
                 initialSelection: this.rangeToSelection(range),

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

@@ -1,10 +1,21 @@
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { Lazy } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lazy";
+import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ChatEntitlementContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
+import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IWorkspaceTrustRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
+import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { ChatEntitlementContext, ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { ChatSetupController } from "./chatSetupController.js";
 import { IChatSetupResult, ChatSetupAnonymous, ChatSetupStrategy } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup";
+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";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 export declare class ChatSetup {
     private readonly context;
     private readonly controller;
@@ -18,11 +29,13 @@ export declare class ChatSetup {
     private readonly markdownRendererService;
     private readonly defaultAccountService;
     private readonly hostService;
+    private readonly extensionService;
+    private readonly workspaceTrustManagementService;
     private static instance;
     static getInstance(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): ChatSetup;
     private pendingRun;
     private skipDialogOnce;
-    private constructor();
+    constructor(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>, telemetryService: ITelemetryService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, chatEntitlementService: ChatEntitlementService, logService: ILogService, widgetService: IChatWidgetService, workspaceTrustRequestService: IWorkspaceTrustRequestService, markdownRendererService: IMarkdownRendererService, defaultAccountService: IDefaultAccountService, hostService: IHostService, extensionService: IExtensionService, workspaceTrustManagementService: IWorkspaceTrustManagementService);
     skipDialog(): void;
     run(options?: {
         disableChatViewReveal?: boolean;
@@ -36,6 +49,17 @@ export declare class ChatSetup {
         onSignInStarted?: () => void;
     }): Promise<IChatSetupResult>;
     private doRun;
+    /**
+     * Whether the default chat extension has finished activating. `activationTimes`
+     * is only set once activation completes, so `undefined` means "not yet active".
+     */
+    private isChatExtensionActivated;
+    /**
+     * Resolves once the default chat extension has finished activating (bounded by
+     * a timeout). Detection relies only on the extension lifecycle, so it never
+     * touches the user's authentication session.
+     */
+    private whenChatExtensionActivated;
     private showDialog;
     private getButtons;
     private getDialogTitle;