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

package/vscode/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.js

@@ -29,10 +29,10 @@ import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vs
 import { ChatViewContainerId, ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatViewPane } from './widgetHosts/viewPane/chatViewPane.js';
 
-const chatViewIcon = registerIcon("chat-view-icon", Codicon.chatSparkle, ( localize(6157, "View icon of the chat view.")));
+const chatViewIcon = registerIcon("chat-view-icon", Codicon.chatSparkle, ( localize(6221, "View icon of the chat view.")));
 const chatViewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: ChatViewContainerId,
-    title: ( localize2(6158, "Chat")),
+    title: ( localize2(6222, "Chat")),
     icon: chatViewIcon,
     ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [ChatViewContainerId, {
         mergeViewWithContainerWhenSingleView: true
@@ -49,13 +49,13 @@ const chatViewDescriptor = {
     containerIcon: chatViewContainer.icon,
     containerTitle: chatViewContainer.title.value,
     singleViewPaneContainerTitle: chatViewContainer.title.value,
-    name: ( localize2(6158, "Chat")),
+    name: ( localize2(6222, "Chat")),
     canToggleVisibility: false,
     canMoveView: true,
     openCommandActionDescriptor: {
         id: ChatViewContainerId,
         title: chatViewContainer.title,
-        mnemonicTitle: ( localize(6159, "&&Chat")),
+        mnemonicTitle: ( localize(6223, "&&Chat")),
         keybindings: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
             mac: {
@@ -65,13 +65,13 @@ const chatViewDescriptor = {
         order: 1
     },
     ctorDescriptor: ( new SyncDescriptor(ChatViewPane)),
-    when: ( ContextKeyExpr.or(( ContextKeyExpr.or(ChatContextKeys.Setup.hidden, ChatContextKeys.Setup.disabled))?.negate(), ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid))
+    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid))
 };
 ( Registry.as(Extensions.ViewsRegistry)).registerViews([chatViewDescriptor], chatViewContainer);
 const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatParticipants",
     jsonSchema: {
-        description: ( localize(6160, "Contributes a chat participant")),
+        description: ( localize(6224, "Contributes a chat participant")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -85,12 +85,12 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ["name", "id"],
             properties: {
                 id: {
-                    description: ( localize(6161, "A unique id for this chat participant.")),
+                    description: ( localize(6225, "A unique id for this chat participant.")),
                     type: "string"
                 },
                 name: {
                     description: ( localize(
-                        6162,
+                        6226,
                         "User-facing name for this chat participant. The user will use '@' with this name to invoke the participant. Name must not contain whitespace."
                     )),
                     type: "string",
@@ -98,37 +98,37 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 fullName: {
                     markdownDescription: ( localize(
-                        6163,
+                        6227,
                         "The full name of this chat participant, which is shown as the label for responses coming from this participant. If not provided, {0} is used.",
                         "`name`"
                     )),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(6164, "A description of this chat participant, shown in the UI.")),
+                    description: ( localize(6228, "A description of this chat participant, shown in the UI.")),
                     type: "string"
                 },
                 isSticky: {
                     description: ( localize(
-                        6165,
+                        6229,
                         "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."
                     )),
                     type: "boolean"
                 },
                 sampleRequest: {
                     description: ( localize(
-                        6166,
+                        6230,
                         "When the user clicks this participant in `/help`, this text will be submitted to the participant."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(6167, "A condition which must be true to enable this participant.")),
+                    description: ( localize(6231, "A condition which must be true to enable this participant.")),
                     type: "string"
                 },
                 disambiguation: {
                     description: ( localize(
-                        6168,
+                        6232,
                         "Metadata to help with automatically routing user questions to this chat participant."
                     )),
                     type: "array",
@@ -146,21 +146,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             category: {
                                 markdownDescription: ( localize(
-                                    6169,
+                                    6233,
                                     "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                 )),
                                 type: "string"
                             },
                             description: {
                                 description: ( localize(
-                                    6170,
+                                    6234,
                                     "A detailed description of the kinds of questions that are suitable for this chat participant."
                                 )),
                                 type: "string"
                             },
                             examples: {
                                 description: ( localize(
-                                    6171,
+                                    6235,
                                     "A list of representative example questions that are suitable for this chat participant."
                                 )),
                                 type: "array"
@@ -170,7 +170,7 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        6172,
+                        6236,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: "array",
@@ -187,36 +187,36 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             name: {
                                 description: ( localize(
-                                    6173,
+                                    6237,
                                     "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."
                                 )),
                                 type: "string"
                             },
                             description: {
-                                description: ( localize(6174, "A description of this command.")),
+                                description: ( localize(6238, "A description of this command.")),
                                 type: "string"
                             },
                             when: {
-                                description: ( localize(6175, "A condition which must be true to enable this command.")),
+                                description: ( localize(6239, "A condition which must be true to enable this command.")),
                                 type: "string"
                             },
                             sampleRequest: {
                                 description: ( localize(
-                                    6176,
+                                    6240,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: "string"
                             },
                             isSticky: {
                                 description: ( localize(
-                                    6165,
+                                    6229,
                                     "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."
                                 )),
                                 type: "boolean"
                             },
                             disambiguation: {
                                 description: ( localize(
-                                    6177,
+                                    6241,
                                     "Metadata to help with automatically routing user questions to this chat command."
                                 )),
                                 type: "array",
@@ -234,21 +234,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                                     properties: {
                                         category: {
                                             markdownDescription: ( localize(
-                                                6178,
+                                                6242,
                                                 "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                             )),
                                             type: "string"
                                         },
                                         description: {
                                             description: ( localize(
-                                                6179,
+                                                6243,
                                                 "A detailed description of the kinds of questions that are suitable for this chat command."
                                             )),
                                             type: "string"
                                         },
                                         examples: {
                                             description: ( localize(
-                                                6180,
+                                                6244,
                                                 "A list of representative example questions that are suitable for this chat command."
                                             )),
                                             type: "array"
@@ -399,9 +399,9 @@ let ChatCompatibilityNotifier = class ChatCompatibilityNotifier extends Disposab
             return;
         }
         this.registeredWelcomeView = true;
-        const showExtensionLabel = ( localize(6181, "Show Extension"));
+        const showExtensionLabel = ( localize(6245, "Show Extension"));
         const mainMessage = ( localize(
-            6182,
+            6246,
             "Chat failed to load because the installed version of the Copilot Chat extension is not compatible with this version of {0}. Please ensure that the Copilot Chat extension is up to date.",
             this.productService.nameLong
         ));
@@ -437,7 +437,7 @@ class ChatParticipantDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(6183, "Name")), ( localize(6184, "Full Name")), ( localize(6185, "Description")), ( localize(6186, "Commands"))];
+        const headers = [( localize(6247, "Name")), ( localize(6248, "Full Name")), ( localize(6249, "Description")), ( localize(6250, "Commands"))];
         const rows = ( nonDefaultContributions.map(d => {
             return [
                 "@" + d.name,
@@ -457,7 +457,7 @@ class ChatParticipantDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$1.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatParticipants",
-    label: ( localize(6187, "Chat Participants")),
+    label: ( localize(6251, "Chat Participants")),
     access: {
         canToggle: false
     },

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

@@ -127,13 +127,13 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         const registry = ( Registry.as(Extensions.Configuration));
         registry.registerConfiguration({
             id: "chatRepoInfo",
-            title: ( localize(6188, "Chat Repository Info")),
+            title: ( localize(6252, "Chat Repository Info")),
             type: "object",
             properties: {
                 [ChatConfiguration.RepoInfoEnabled]: {
                     type: "boolean",
                     description: ( localize(
-                        6189,
+                        6253,
                         "Controls whether lightweight repository metadata (branch, commit, remotes) is captured when a chat request is submitted for internal diagnostics."
                     )),
                     default: false

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

@@ -15,6 +15,7 @@ import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/p
 import { Action2, MenuId, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -51,7 +52,7 @@ import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_SUPPORT_ANONYMOUS_ACTIO
 import { ChatViewContainerId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { chatViewsWelcomeRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
-import { ChatSetupAnonymous } from './chatSetup.js';
+import { ChatSetupAnonymous } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
 import { ChatSetupController } from './chatSetupController.js';
 import { GrowthSessionController, registerGrowthSession } from './chatSetupGrowthSession.js';
 import { SetupAgent, AINewSymbolNamesProvider, ChatCodeActionsProvider, AICodeActionsHelper } from './chatSetupProviders.js';
@@ -114,7 +115,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         const codeActionsProviderDisposables = markAsSingleton(( new MutableDisposable()));
         const updateRegistration = () => {
             {
-                if (!context.state.hidden && !context.state.disabled) {
+                if (!context.state.hidden && !context.state.disabledInWorkspace) {
                     if (!defaultAgentDisposables.value) {
                         const disposables = defaultAgentDisposables.value = ( new DisposableStore());
                         const panelAgentDisposables = disposables.add(( new DisposableStore()));
@@ -162,7 +163,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                             controller
                         ).disposable);
                     }
-                    if ((!context.state.installed || context.state.entitlement === ChatEntitlement.Unknown || context.state.entitlement === ChatEntitlement.Unresolved) && !vscodeAgentDisposables.value) {
+                    if ((!context.state.completed || context.state.entitlement === ChatEntitlement.Unknown || context.state.entitlement === ChatEntitlement.Unresolved) && !vscodeAgentDisposables.value) {
                         const disposables = vscodeAgentDisposables.value = ( new DisposableStore());
                         disposables.add(
                             SetupAgent.registerBuiltInAgents(this.instantiationService, context, controller)
@@ -172,12 +173,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     defaultAgentDisposables.clear();
                     vscodeAgentDisposables.clear();
                 }
-                if (context.state.installed && !context.state.disabled) {
+                if (context.state.completed) {
                     vscodeAgentDisposables.clear();
                 }
             }
             {
-                if (!context.state.installed && !context.state.hidden && !context.state.disabled) {
+                if (!context.state.completed && !context.state.hidden && !context.state.disabledInWorkspace) {
                     if (!renameProviderDisposables.value) {
                         renameProviderDisposables.value = AINewSymbolNamesProvider.registerProvider(this.instantiationService, context, controller);
                     }
@@ -186,7 +187,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 }
             }
             {
-                if (!context.state.installed && !context.state.hidden && !context.state.disabled) {
+                if (!context.state.completed && !context.state.hidden && !context.state.disabledInWorkspace) {
                     if (!codeActionsProviderDisposables.value) {
                         codeActionsProviderDisposables.value = ChatCodeActionsProvider.registerProvider(this.instantiationService);
                     }
@@ -201,7 +202,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         const growthSessionDisposables = markAsSingleton(( new MutableDisposable()));
         const updateGrowthSession = () => {
             const experimentEnabled = this.configurationService.getValue(ChatConfiguration.GrowthNotificationEnabled) === true;
-            const shouldShow = experimentEnabled && !chatEntitlementService.sentiment.installed;
+            const shouldShow = experimentEnabled && !chatEntitlementService.sentiment.completed;
             if (shouldShow && !growthSessionDisposables.value) {
                 const disposables = ( new DisposableStore());
                 const controller = disposables.add(this.instantiationService.createInstance(GrowthSessionController));
@@ -224,7 +225,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
             static {
-                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6241, "Use AI Features with Copilot for free..."));
+                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6301, "Use AI Features with Copilot for free..."));
             }
             constructor() {
                 super({
@@ -234,9 +235,9 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     f1: true,
                     precondition: ( ContextKeyExpr.or(
                         ChatContextKeys.Setup.hidden,
-                        ChatContextKeys.Setup.disabled,
+                        ChatContextKeys.Setup.disabledInWorkspace,
                         ChatContextKeys.Setup.untrusted,
-                        ( ChatContextKeys.Setup.installed.negate()),
+                        ( ChatContextKeys.Setup.completed.negate()),
                         ChatContextKeys.Entitlement.canSignUp
                     ))
                 });
@@ -270,8 +271,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         confirmed
                     } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(6242, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(6243, "Retry"))
+                        message: ( localize(6302, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(6303, "Retry"))
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -305,7 +306,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupForceSignIn",
-                    title: ( localize2(6244, "Sign in to use AI features"))
+                    title: ( localize2(6304, "Sign in to use AI features"))
                 });
             }
             async run(accessor) {
@@ -343,11 +344,11 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupFromAccounts",
-                    title: ( localize2(6245, "Sign in to use AI features...")),
+                    title: ( localize2(6305, "Sign in to use AI features...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: "2_copilot",
-                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.installed.negate()), ChatContextKeys.Entitlement.signedOut))
+                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate()), ChatContextKeys.Entitlement.signedOut))
                     }
                 });
             }
@@ -368,12 +369,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: ChatSetupSignInTitleBarAction.ID,
-                    title: ( localize(6246, "Sign In")),
+                    title: ( localize(6306, "Sign In")),
                     f1: false,
                     menu: [{
                         id: MenuId.TitleBarAdjacentCenter,
                         order: 0,
-                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ( ContextKeyExpr.has(`config.${ChatConfiguration.SignInTitleBarEnabled}`)), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ( ContextKeyExpr.has("updateTitleBar")).negate())))
+                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ( ContextKeyExpr.has(`config.${ChatConfiguration.SignInTitleBarEnabled}`)), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ( ContextKeyExpr.has("updateTitleBar")).negate())))
                     }]
                 });
             }
@@ -392,10 +393,10 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.upgradePlan",
-                    title: ( localize2(6247, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(6248, "Chat")),
+                    title: ( localize2(6307, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(6308, "Chat")),
                     f1: true,
-                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ContextKeyExpr.or(
+                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
                         ChatContextKeys.Entitlement.planFree
                     )))),
@@ -434,10 +435,10 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.manageOverages",
-                    title: ( localize2(6249, "Manage GitHub Copilot Overages")),
-                    category: ( localize2(6248, "Chat")),
+                    title: ( localize2(6309, "Manage GitHub Copilot Overages")),
+                    category: ( localize2(6308, "Chat")),
                     f1: true,
-                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ContextKeyExpr.or(
+                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
                         ChatContextKeys.Entitlement.planProPlus,
                         ChatContextKeys.Entitlement.planEdu
@@ -509,11 +510,11 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         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.disabled.negate()), ( ChatContextKeys.Setup.installed.negate())));
+        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(6250, "Explain"))
+                title: ( localize(6310, "Explain"))
             },
             group: "1_chat",
             order: 4,
@@ -522,7 +523,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.fix",
-                title: ( localize(6251, "Fix"))
+                title: ( localize(6311, "Fix"))
             },
             group: "1_chat",
             order: 5,
@@ -531,7 +532,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.review",
-                title: ( localize(6252, "Code Review"))
+                title: ( localize(6312, "Code Review"))
             },
             group: "1_chat",
             order: 6,
@@ -559,7 +560,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 context.update({
                     installed: true,
                     disabled: false,
-                    untrusted: false
+                    untrusted: false,
+                    disabledInWorkspace: false
                 });
                 return;
             }
@@ -575,6 +577,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             const installed = !!defaultChatExtension?.local;
             let disabled;
             let untrusted = false;
+            let disabledInWorkspace = false;
             if (installed) {
                 disabled = !this.extensionEnablementService.isEnabled(defaultChatExtension.local);
                 if (disabled) {
@@ -582,6 +585,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                     if (state === EnablementState.DisabledByTrustRequirement) {
                         disabled = false;
                         untrusted = true;
+                    } else if (state === EnablementState.DisabledWorkspace) {
+                        disabledInWorkspace = true;
                     }
                 }
             } else {
@@ -590,7 +595,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             context.update({
                 installed,
                 disabled,
-                untrusted
+                untrusted,
+                disabledInWorkspace
             });
         }));
     }
@@ -692,7 +698,13 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId)
             );
             if (defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local)) {
-                this.configurationService.updateValue(ChatConfiguration.AIDisabled, false);
+                if (defaultChatExtension.enablementState === EnablementState.EnabledWorkspace) {
+                    if (this.configurationService.inspect(ChatConfiguration.AIDisabled).workspaceValue === true) {
+                        this.configurationService.updateValue(ChatConfiguration.AIDisabled, false, ConfigurationTarget.WORKSPACE);
+                    }
+                } else {
+                    this.configurationService.updateValue(ChatConfiguration.AIDisabled, false);
+                }
             }
         }));
     }
@@ -705,7 +717,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
         await this.extensionsWorkbenchService.updateRunningExtensions(
-            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6253, "Enabling AI features")) : ( localize(6254, "Disabling AI features"))
+            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6313, "Enabling AI features")) : ( localize(6314, "Disabling AI features"))
         );
     }
     maybeHideAuxiliaryBar() {
@@ -723,7 +735,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 this.ID = "workbench.action.chat.hideSetup";
             }
             static {
-                this.TITLE = ( localize2(6255, "Learn How to Hide AI Features"));
+                this.TITLE = ( localize2(6315, "Learn How to Hide AI Features"));
             }
             constructor() {
                 super({
@@ -731,12 +743,12 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                     title: ChatSetupHideAction.TITLE,
                     f1: true,
                     category: CHAT_CATEGORY,
-                    precondition: ( ChatContextKeys.Setup.hidden.negate()),
+                    precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
                     menu: {
                         id: MenuId.ChatTitleBarMenu,
                         group: "z_hide",
                         order: 1,
-                        when: ( ChatContextKeys.Setup.installed.negate())
+                        when: ( ChatContextKeys.Setup.completed.negate())
                     }
                 });
             }

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

@@ -3,7 +3,6 @@ import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -11,8 +10,9 @@ import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { ChatEntitlementContext, ChatEntitlementRequests } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
-import { ChatSetupAnonymous, ChatSetupStep, ChatSetupResultValue } from "./chatSetup.js";
+import { ChatSetupAnonymous, ChatSetupStep, ChatSetupResultValue } 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 { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 export interface IChatSetupControllerOptions {
     readonly forceSignIn?: boolean;
     readonly useSocialProvider?: string;
@@ -25,7 +25,6 @@ export declare class ChatSetupController extends Disposable {
     private readonly requests;
     private readonly telemetryService;
     private readonly extensionsWorkbenchService;
-    private readonly productService;
     private readonly logService;
     private readonly progressService;
     private readonly activityService;
@@ -35,11 +34,12 @@ export declare class ChatSetupController extends Disposable {
     private readonly lifecycleService;
     private readonly quickInputService;
     private readonly defaultAccountService;
+    private readonly productService;
     private readonly _onDidChange;
     readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private _step;
     get step(): ChatSetupStep;
-    constructor(context: ChatEntitlementContext, requests: ChatEntitlementRequests, telemetryService: ITelemetryService, extensionsWorkbenchService: IExtensionsWorkbenchService, productService: IProductService, logService: ILogService, progressService: IProgressService, activityService: IActivityService, commandService: ICommandService, dialogService: IDialogService, configurationService: IConfigurationService, lifecycleService: ILifecycleService, quickInputService: IQuickInputService, defaultAccountService: IDefaultAccountService);
+    constructor(context: ChatEntitlementContext, requests: ChatEntitlementRequests, telemetryService: ITelemetryService, extensionsWorkbenchService: IExtensionsWorkbenchService, logService: ILogService, progressService: IProgressService, activityService: IActivityService, commandService: ICommandService, dialogService: IDialogService, configurationService: IConfigurationService, lifecycleService: ILifecycleService, quickInputService: IQuickInputService, defaultAccountService: IDefaultAccountService, productService: IProductService);
     private registerListeners;
     private setStep;
     setup(options?: IChatSetupControllerOptions): Promise<ChatSetupResultValue>;