@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.0

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

@@ -12,8 +12,8 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 function createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription) {
     return {
         modelIds: [""],
-        modelLabels: [defaultEntryLabel ?? ( localize(6791, "Auto (Vendor Default)"))],
-        modelDescriptions: [defaultEntryDescription ?? ( localize(6792, "Use the vendor's default model"))]
+        modelLabels: [defaultEntryLabel ?? ( localize(6910, "Auto (Vendor Default)"))],
+        modelDescriptions: [defaultEntryDescription ?? ( localize(6911, "Use the vendor's default model"))]
     };
 }
 let DefaultModelContribution = class DefaultModelContribution extends Disposable {
@@ -48,8 +48,8 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
             modelLabels.length = 0;
             modelDescriptions.length = 0;
             modelIds.push("");
-            modelLabels.push(defaultEntryLabel ?? ( localize(6791, "Auto (Vendor Default)")));
-            modelDescriptions.push(defaultEntryDescription ?? ( localize(6792, "Use the vendor's default model")));
+            modelLabels.push(defaultEntryLabel ?? ( localize(6910, "Auto (Vendor Default)")));
+            modelDescriptions.push(defaultEntryDescription ?? ( localize(6911, "Use the vendor's default model")));
             const models = [];
             const allModelIds = this._languageModelsService.getLanguageModelIds();
             for (const modelId of allModelIds) {
@@ -119,7 +119,7 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
                     }
                     modelIds.push(storedId);
                     modelLabels.push(( localize(
-                        6793,
+                        6912,
                         "{0} ({1})",
                         model.metadata.name,
                         vendorDisplayName ?? model.metadata.vendor

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

@@ -5,16 +5,16 @@ import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { ContributionEnablementState, isContributionDisabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 
 function createEnablementActions(key, enablementModel, idPrefix) {
-    return [( new Action(`${idPrefix}.enable`, ( localize(6794, "Enable")), undefined, true, () => {
+    return [( new Action(`${idPrefix}.enable`, ( localize(6913, "Enable")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.EnabledProfile);
         return Promise.resolve();
-    })), ( new Action(`${idPrefix}.enableForWorkspace`, ( localize(6795, "Enable (Workspace)")), undefined, true, () => {
+    })), ( new Action(`${idPrefix}.enableForWorkspace`, ( localize(6914, "Enable (Workspace)")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.EnabledWorkspace);
         return Promise.resolve();
-    })), ( new Action(`${idPrefix}.disable`, ( localize(6796, "Disable")), undefined, true, () => {
+    })), ( new Action(`${idPrefix}.disable`, ( localize(6915, "Disable")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.DisabledProfile);
         return Promise.resolve();
-    })), ( new Action(`${idPrefix}.disableForWorkspace`, ( localize(6797, "Disable (Workspace)")), undefined, true, () => {
+    })), ( new Action(`${idPrefix}.disableForWorkspace`, ( localize(6916, "Disable (Workspace)")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.DisabledWorkspace);
         return Promise.resolve();
     }))];

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

@@ -46,8 +46,8 @@ let EnablementStatusWidget = class EnablementStatusWidget extends Disposable {
 };
 EnablementStatusWidget = ( __decorate([( __param(3, IMarkdownRendererService))], EnablementStatusWidget));
 const pluginEnablementLabels = {
-    disabledProfile: ( localize(6798, "This plugin is disabled.")),
-    disabledWorkspace: ( localize(6799, "This plugin is disabled for this workspace."))
+    disabledProfile: ( localize(6917, "This plugin is disabled.")),
+    disabledWorkspace: ( localize(6918, "This plugin is disabled for this workspace."))
 };
 
 export { EnablementStatusWidget, pluginEnablementLabels };

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

@@ -4,7 +4,7 @@ import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { joinPath, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { isSuccess, isClientError, asJson } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
+import { retryAfterFromHeaders, isSuccess, isClientError, asJson, readHeader } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
 
 const GITHUB_HOSTS = ( new Set(["github.com", "www.github.com"]));
 function parseGitHubCloneUrl(cloneUrl) {
@@ -115,24 +115,6 @@ function isRateLimited(headers) {
     }
     return readHeader(headers, "retry-after") !== undefined;
 }
-function retryAfterFromHeaders(headers) {
-    if (!headers) {
-        return undefined;
-    }
-    const value = readHeader(headers, "retry-after");
-    if (!value) {
-        return undefined;
-    }
-    const parsed = parseInt(value, 10);
-    return Number.isFinite(parsed) ? parsed : undefined;
-}
-function readHeader(headers, name) {
-    const value = headers[name] ?? headers[name.toLowerCase()];
-    if (Array.isArray(value)) {
-        return value[0];
-    }
-    return value;
-}
 async function fetchAndExtractGitHubRepo(
     requestService,
     fileService,

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

@@ -8,30 +8,19 @@ import { ILanguageModelsConfigurationService } from "@codingame/monaco-vscode-ap
 /**
  * Owns the `github.copilot.hasByokModels` context key. The key is true iff:
  *  - `github.copilot.clientByokEnabled` is true (set by `ChatEntitlementService` + Copilot extension),
- *  - `chat.offlineByok` is enabled and `chat.aiDisabled` is off, and
- *  - the `LanguageModelsService` has at least one resolved, user-selectable non-Copilot model
- *    (signalled by the `chatNonCopilotModelsAreUserSelectable` context key).
+ *  - `chat.aiDisabled` is off, and
+ *  - the language-models configuration has at least one non-Copilot vendor group (at any time),
+ *    or — pre extension scan — the `chatNonCopilotModelsAreUserSelectable` signal is on.
  *
- * Verifying the last condition is expensive: it requires activating each BYOK-contributing
- * extension and round-tripping into its provider. To avoid paying that cost just to gate UI,
- * this contribution never triggers such activations itself. The strategy is:
+ * Strategy (avoids activating BYOK extensions just to gate UI):
+ *  1. Restore the last persisted answer for correct warm-reload UI.
+ *  2. Configured non-Copilot vendor groups are a positive signal at any time.
+ *  3. Pre-registration only, also trust the `chatNonCopilotModelsAreUserSelectable` signal
+ *     (post-registration it can be stale — model cache lags behind group removal).
+ *  4. Only persist `false` after both extension scan and first config load complete, so startup
+ *     latency doesn't clobber a previously-true answer.
  *
- *  1. On startup, optimistically restore the last persisted answer from
- *     `chat.hasByokModels.lastKnown` so UI surfaces gated by this key are correct on warm
- *     reload before anything else runs.
- *  2. Whenever the `chatNonCopilotModelsAreUserSelectable` signal flips on — which happens
- *     naturally when something else resolves a BYOK vendor (notably `ChatInputPart`, which
- *     activates the previously selected model's vendor when restoring its persisted selection) —
- *     record `true` and persist it.
- *  3. Once extensions are fully scanned, if there are no configured non-Copilot vendors in the
- *     language-models configuration, override a stale optimistic `true` with `false`. Same on
- *     runtime removal of all groups, and when the feature flag flips off.
- *
- * The trade-off is the first-time experience: a brand-new user must pick a BYOK model once
- * before this contribution observes the signal and persists the answer. From then on, the
- * answer survives reloads without any activation cost — users without BYOK pay nothing.
- *
- * Eager so the key is bound at workbench startup before any sign-in UI surfaces render.
+ * Eager so the key is bound before any sign-in UI renders.
  */
 export declare class HasByokModelsContribution extends Disposable implements IWorkbenchContribution {
     private readonly _languageModelsConfigurationService;
@@ -43,6 +32,7 @@ export declare class HasByokModelsContribution extends Disposable implements IWo
     private static readonly TRACKED_KEYS;
     private readonly _hasByokModels;
     private _extensionsRegistered;
+    private _configurationLoaded;
     constructor(_languageModelsConfigurationService: ILanguageModelsConfigurationService, _contextKeyService: IContextKeyService, _configurationService: IConfigurationService, _storageService: IStorageService, extensionService: IExtensionService);
     private _isFeatureEnabled;
     private _restore;

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

@@ -43,6 +43,7 @@ let HasByokModelsContribution = class HasByokModelsContribution extends Disposab
         this._configurationService = _configurationService;
         this._storageService = _storageService;
         this._extensionsRegistered = false;
+        this._configurationLoaded = false;
         this._hasByokModels = ChatEntitlementContextKeys.hasByokModels.bindTo(this._contextKeyService);
         this._restore();
         this._update();
@@ -52,16 +53,22 @@ let HasByokModelsContribution = class HasByokModelsContribution extends Disposab
                 this._update();
             }
         });
+        this._languageModelsConfigurationService.whenReady.then(() => {
+            if (!this._store.isDisposed) {
+                this._configurationLoaded = true;
+                this._update();
+            }
+        });
         this._register(Event.any(Event.filter(
             this._configurationService.onDidChangeConfiguration,
-            e => e.affectsConfiguration(ChatConfiguration.OfflineByok) || e.affectsConfiguration(ChatConfiguration.AIDisabled)
+            e => e.affectsConfiguration(ChatConfiguration.AIDisabled)
         ), Event.filter(
             this._contextKeyService.onDidChangeContext,
             e => e.affectsSome(HasByokModelsContribution_1.TRACKED_KEYS)
         ), this._languageModelsConfigurationService.onDidChangeLanguageModelGroups)(() => this._update()));
     }
     _isFeatureEnabled() {
-        return !this._configurationService.getValue(ChatConfiguration.AIDisabled) && !!this._configurationService.getValue(ChatConfiguration.OfflineByok) && !!this._contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.clientByokEnabled.key);
+        return !this._configurationService.getValue(ChatConfiguration.AIDisabled) && !!this._contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.clientByokEnabled.key);
     }
     _restore() {
         if (!this._isFeatureEnabled()) {
@@ -88,15 +95,16 @@ let HasByokModelsContribution = class HasByokModelsContribution extends Disposab
             this._setResult(false);
             return;
         }
-        if (this._contextKeyService.getContextKeyValue(ChatContextKeys.nonCopilotLanguageModelsAreUserSelectable.key)) {
+        const hasByokVendor = ( this._languageModelsConfigurationService.getLanguageModelsProviderGroups().some(g => g.vendor !== COPILOT_VENDOR_ID));
+        if (hasByokVendor) {
             this._setResult(true);
             return;
         }
-        if (!this._extensionsRegistered) {
+        if (!this._extensionsRegistered && this._contextKeyService.getContextKeyValue(ChatContextKeys.nonCopilotLanguageModelsAreUserSelectable.key)) {
+            this._setResult(true);
             return;
         }
-        const hasByokVendor = ( this._languageModelsConfigurationService.getLanguageModelsProviderGroups().some(g => g.vendor !== COPILOT_VENDOR_ID));
-        if (!hasByokVendor) {
+        if (this._extensionsRegistered && this._configurationLoaded) {
             this._setResult(false);
         }
     }

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

@@ -4,8 +4,8 @@ import { Mutable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/type
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { ITextEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textEditorService.service";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
@@ -20,14 +20,17 @@ export declare class LanguageModelsConfigurationService extends Disposable imple
     private readonly textFileService;
     private readonly textModelService;
     private readonly editorService;
-    private readonly textEditorService;
+    private readonly editorGroupsService;
     _serviceBrand: undefined;
     private readonly modelsConfigurationFile;
     get configurationFile(): URI;
     private readonly _onDidChangeLanguageModelGroups;
     readonly onDidChangeLanguageModelGroups: Event<readonly ILanguageModelsProviderGroup[]>;
     private languageModelsProviderGroups;
-    constructor(fileService: IFileService, textFileService: ITextFileService, textModelService: ITextModelService, editorService: IEditorService, textEditorService: ITextEditorService, userDataProfileService: IUserDataProfileService, uriIdentityService: IUriIdentityService);
+    /** Resolved once the first config-file load attempt completes; assigned exactly once in the ctor. Rejections are swallowed so consumers can treat readiness as "first load attempted". */
+    private readonly _whenReady;
+    get whenReady(): Promise<void>;
+    constructor(fileService: IFileService, textFileService: ITextFileService, textModelService: ITextModelService, editorService: IEditorService, editorGroupsService: IEditorGroupsService, userDataProfileService: IUserDataProfileService, uriIdentityService: IUriIdentityService);
     private setLanguageModelsConfiguration;
     private updateLanguageModelsConfiguration;
     getLanguageModelsProviderGroups(): readonly ILanguageModelsProviderGroup[];

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

@@ -6,8 +6,9 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { MODAL_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ITextEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textEditorService.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { visit } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
@@ -19,17 +20,21 @@ import { ILanguageModelsConfigurationService } from '@codingame/monaco-vscode-ap
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
+import { DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 
 let LanguageModelsConfigurationService = class LanguageModelsConfigurationService extends Disposable {
     get configurationFile() {
         return this.modelsConfigurationFile;
     }
+    get whenReady() {
+        return this._whenReady;
+    }
     constructor(
         fileService,
         textFileService,
         textModelService,
         editorService,
-        textEditorService,
+        editorGroupsService,
         userDataProfileService,
         uriIdentityService
     ) {
@@ -38,12 +43,12 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         this.textFileService = textFileService;
         this.textModelService = textModelService;
         this.editorService = editorService;
-        this.textEditorService = textEditorService;
+        this.editorGroupsService = editorGroupsService;
         this._onDidChangeLanguageModelGroups = this._register(( new Emitter()));
         this.onDidChangeLanguageModelGroups = this._onDidChangeLanguageModelGroups.event;
         this.languageModelsProviderGroups = [];
-        this.modelsConfigurationFile = uriIdentityService.extUri.joinPath(userDataProfileService.currentProfile.location, "chatLanguageModels.json");
-        this.updateLanguageModelsConfiguration();
+        this.modelsConfigurationFile = userDataProfileService.currentProfile.languageModelsResource;
+        this._whenReady = this.updateLanguageModelsConfiguration().catch(() => {});
         this._register(
             fileService.watch(uriIdentityService.extUri.dirname(this.modelsConfigurationFile))
         );
@@ -139,9 +144,13 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         await this.updateLanguageModelsConfiguration();
     }
     async configureLanguageModels(options) {
-        const editor = await this.editorService.openEditor(this.textEditorService.createTextEditor({
-            resource: this.modelsConfigurationFile
-        }));
+        const preferredGroup = this.editorGroupsService.getPart(this.editorGroupsService.activeGroup) === this.editorGroupsService.activeModalEditorPart ? MODAL_GROUP : undefined;
+        const editor = await this.editorService.openEditor({
+            resource: this.modelsConfigurationFile,
+            options: {
+                override: DEFAULT_EDITOR_ASSOCIATION.id
+            }
+        }, preferredGroup);
         if (!editor || !options?.group) {
             return;
         }
@@ -149,25 +158,35 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         if (!codeEditor) {
             return;
         }
-        if (!options.group.range) {
-            return;
-        }
         if (options.snippet) {
             const model = codeEditor.getModel();
             if (!model) {
                 return;
             }
-            const lastPropertyLine = options.group.range.endLineNumber - 1;
-            const lastPropertyLineLength = model.getLineLength(lastPropertyLine);
-            const insertPosition = {
+            const targetRange = options.snippetTarget === "models" ? options.group.modelsRange : options.group.range;
+            if (!targetRange) {
+                return;
+            }
+            const models = options.group.models;
+            const isModelsArray = options.snippetTarget === "models" && Array.isArray(models);
+            const emptyModelsArray = isModelsArray && models.length === 0;
+            const insertBeforeModelsArrayEnd = emptyModelsArray || (isModelsArray && targetRange.startLineNumber === targetRange.endLineNumber);
+            const lastPropertyLine = targetRange.endLineNumber - 1;
+            const insertPosition = insertBeforeModelsArrayEnd ? {
+                lineNumber: targetRange.endLineNumber,
+                column: targetRange.endColumn - 1
+            } : {
                 lineNumber: lastPropertyLine,
-                column: lastPropertyLineLength + 1
+                column: model.getLineLength(lastPropertyLine) + 1
             };
             codeEditor.setPosition(insertPosition);
             codeEditor.revealPositionNearTop(insertPosition);
             codeEditor.focus();
-            SnippetController2.get(codeEditor)?.insert(",\n" + options.snippet);
+            SnippetController2.get(codeEditor)?.insert(emptyModelsArray ? options.snippet : ",\n" + options.snippet);
         } else {
+            if (!options.group.range) {
+                return;
+            }
             const position = {
                 lineNumber: options.group.range.startLineNumber,
                 column: options.group.range.startColumn
@@ -195,6 +214,7 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
             const updatedLanguageModelsProviderGroups = await update(languageModelsProviderGroups);
             for (const group of updatedLanguageModelsProviderGroups) {
                 delete group.range;
+                delete group.modelsRange;
             }
             model.setValue(JSON.stringify(updatedLanguageModelsProviderGroups, undefined, "\t"));
             await this.textFileService.save(this.modelsConfigurationFile);
@@ -204,7 +224,7 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         }
     }
 };
-LanguageModelsConfigurationService = ( __decorate([( __param(0, IFileService)), ( __param(1, ITextFileService)), ( __param(2, ITextModelService)), ( __param(3, IEditorService)), ( __param(4, ITextEditorService)), ( __param(5, IUserDataProfileService)), ( __param(6, IUriIdentityService))], LanguageModelsConfigurationService));
+LanguageModelsConfigurationService = ( __decorate([( __param(0, IFileService)), ( __param(1, ITextFileService)), ( __param(2, ITextModelService)), ( __param(3, IEditorService)), ( __param(4, IEditorGroupsService)), ( __param(5, IUserDataProfileService)), ( __param(6, IUriIdentityService))], LanguageModelsConfigurationService));
 function parseLanguageModelsProviderGroups(model) {
     const configuration = [];
     let currentProperty = null;
@@ -264,6 +284,18 @@ function parseLanguageModelsProviderGroups(model) {
                 return;
             }
             const array = [];
+            const parent = currentParent;
+            if (currentProperty === "models" && parent.range) {
+                const start = model.getPositionAt(offset);
+                const end = model.getPositionAt(offset + length);
+                parent.modelsRange = {
+                    startLineNumber: start.lineNumber,
+                    startColumn: start.column,
+                    endLineNumber: end.lineNumber,
+                    endColumn: end.column
+                };
+                array._parentModelsRange = parent.modelsRange;
+            }
             onValue(array);
             previousParents.push(currentParent);
             currentParent = array;
@@ -277,6 +309,12 @@ function parseLanguageModelsProviderGroups(model) {
                 parent._parentConfigurationRange.endColumn = end.column;
                 delete parent._parentConfigurationRange;
             }
+            if (parent._parentModelsRange) {
+                const end = model.getPositionAt(offset + length);
+                parent._parentModelsRange.endLineNumber = end.lineNumber;
+                parent._parentModelsRange.endColumn = end.column;
+                delete parent._parentModelsRange;
+            }
             currentParent = previousParents.pop();
         },
         onLiteralValue: (value, offset, length) => {
@@ -342,7 +380,7 @@ let ChatLanguageModelsDataContribution = class ChatLanguageModelsDataContributio
                     },
                     settings: {
                         type: "object",
-                        description: ( localize(6800, "Per-model settings"))
+                        description: ( localize(6919, "Per-model settings"))
                     }
                 },
                 allOf: [...( vendors.map(vendor => ({

package/vscode/src/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackEditorActions.js

@@ -34,7 +34,7 @@ class NavigatePlanReviewFeedbackAction extends Action2 {
     constructor(_next) {
         super({
             id: _next ? navigateNextPlanReviewFeedbackActionId : navigatePreviousPlanReviewFeedbackActionId,
-            title: _next ? ( localize2(6801, "Go to Next Feedback Comment")) : ( localize2(6802, "Go to Previous Feedback Comment")),
+            title: _next ? ( localize2(6920, "Go to Next Feedback Comment")) : ( localize2(6921, "Go to Previous Feedback Comment")),
             icon: _next ? Codicon.arrowDown : Codicon.arrowUp,
             category: CHAT_CATEGORY,
             f1: true,
@@ -73,8 +73,8 @@ class ClearAllPlanReviewFeedbackAction extends Action2 {
     constructor() {
         super({
             id: clearAllPlanReviewFeedbackActionId,
-            title: ( localize2(6803, "Clear")),
-            tooltip: ( localize2(6804, "Clear All Feedback")),
+            title: ( localize2(6922, "Clear")),
+            tooltip: ( localize2(6923, "Clear All Feedback")),
             icon: Codicon.clearAll,
             category: CHAT_CATEGORY,
             f1: true,
@@ -111,7 +111,7 @@ function registerPlanReviewFeedbackEditorActions() {
     MenuRegistry.appendMenuItem(PlanReviewFeedbackMenuId, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(6805, "Navigation Status")),
+            title: ( localize(6924, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

package/vscode/src/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackEditorContribution.js

@@ -52,7 +52,7 @@ class PlanReviewFeedbackInputWidget {
         this._domNode.style.display = "none";
         this._inputElement = createElement("textarea");
         this._inputElement.rows = 1;
-        this._inputElement.placeholder = ( localize(6806, "Add Feedback"));
+        this._inputElement.placeholder = ( localize(6925, "Add Feedback"));
         this._domNode.appendChild(this._inputElement);
         this._measureElement = createElement("span");
         this._measureElement.classList.add("plan-review-feedback-input-measure");
@@ -60,7 +60,7 @@ class PlanReviewFeedbackInputWidget {
         const actionsContainer = createElement("div");
         actionsContainer.classList.add("plan-review-feedback-input-actions");
         this._domNode.appendChild(actionsContainer);
-        this._addAction = ( new Action("planReviewFeedback.add", ( localize(6807, "Add Feedback (Enter)")), ThemeIcon.asClassName(Codicon.plus), false, () => {
+        this._addAction = ( new Action("planReviewFeedback.add", ( localize(6926, "Add Feedback (Enter)")), ThemeIcon.asClassName(Codicon.plus), false, () => {
             this._onDidTriggerAdd.fire();
             return Promise.resolve();
         }));
@@ -68,7 +68,7 @@ class PlanReviewFeedbackInputWidget {
         this._actionBar.push(this._addAction, {
             icon: true,
             label: false,
-            keybinding: ( localize(6808, "Enter"))
+            keybinding: ( localize(6927, "Enter"))
         });
         this._inputElement.style.lineHeight = `${this._lineHeight}px`;
     }
@@ -197,9 +197,9 @@ class PlanReviewFeedbackOverlayWidget {
                                     } = that._navigationBearings.read(r);
                                     if (totalCount > 0) {
                                         const current = activeIdx === -1 ? 1 : activeIdx + 1;
-                                        this.label.innerText = ( localize(6809, "{0}/{1}", current, totalCount));
+                                        this.label.innerText = ( localize(6928, "{0}/{1}", current, totalCount));
                                     } else {
-                                        this.label.innerText = ( localize(6810, "0/0"));
+                                        this.label.innerText = ( localize(6929, "0/0"));
                                     }
                                 }));
                             }

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
 /**
@@ -29,10 +29,10 @@ import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/v
 export declare class PluginAutoUpdate extends Disposable implements IWorkbenchContribution {
     private readonly _pluginMarketplaceService;
     private readonly _pluginInstallService;
-    private readonly _configurationService;
+    private readonly _extensionsWorkbenchService;
     private readonly _logService;
     static readonly ID = "workbench.contrib.pluginAutoUpdate";
     private _updateInFlight;
-    constructor(_pluginMarketplaceService: IPluginMarketplaceService, _pluginInstallService: IPluginInstallService, _configurationService: IConfigurationService, _logService: ILogService);
+    constructor(_pluginMarketplaceService: IPluginMarketplaceService, _pluginInstallService: IPluginInstallService, _extensionsWorkbenchService: IExtensionsWorkbenchService, _logService: ILogService);
     private _triggerAutoUpdate;
 }

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

@@ -3,9 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { AutoUpdateConfigurationKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -17,13 +16,13 @@ let PluginAutoUpdate = class PluginAutoUpdate extends Disposable {
     constructor(
         _pluginMarketplaceService,
         _pluginInstallService,
-        _configurationService,
+        _extensionsWorkbenchService,
         _logService
     ) {
         super();
         this._pluginMarketplaceService = _pluginMarketplaceService;
         this._pluginInstallService = _pluginInstallService;
-        this._configurationService = _configurationService;
+        this._extensionsWorkbenchService = _extensionsWorkbenchService;
         this._logService = _logService;
         this._updateInFlight = false;
         this._register(autorun(reader => {
@@ -37,7 +36,7 @@ let PluginAutoUpdate = class PluginAutoUpdate extends Disposable {
         if (this._updateInFlight) {
             return;
         }
-        const autoUpdate = this._configurationService.getValue(AutoUpdateConfigurationKey);
+        const autoUpdate = this._extensionsWorkbenchService.getAutoUpdateValue();
         if (autoUpdate !== true) {
             return;
         }
@@ -54,6 +53,6 @@ let PluginAutoUpdate = class PluginAutoUpdate extends Disposable {
         }
     }
 };
-PluginAutoUpdate = ( __decorate([( __param(0, IPluginMarketplaceService)), ( __param(1, IPluginInstallService)), ( __param(2, IConfigurationService)), ( __param(3, ILogService))], PluginAutoUpdate));
+PluginAutoUpdate = ( __decorate([( __param(0, IPluginMarketplaceService)), ( __param(1, IPluginInstallService)), ( __param(2, IExtensionsWorkbenchService)), ( __param(3, ILogService))], PluginAutoUpdate));
 
 export { PluginAutoUpdate };

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

@@ -75,7 +75,7 @@ let BrowserPluginGitCommandService = class BrowserPluginGitCommandService {
         }
         if (lastErr instanceof GitHubAuthRequiredError) {
             throw ( new Error(( localize(
-                6811,
+                6930,
                 "GitHub authentication is required to install '{0}'. Sign in with an account that has access to this repository, then try again.",
                 `${repo.owner}/${repo.repo}`
             ))));
@@ -181,7 +181,7 @@ let BrowserPluginGitCommandService = class BrowserPluginGitCommandService {
         const parsed = parseGitHubCloneUrl(cloneUrl);
         if (!parsed) {
             throw ( new Error(( localize(
-                6812,
+                6931,
                 "Agent plugins in the browser can only be installed from GitHub HTTPS URLs. To install '{0}', use the desktop application or connect to a remote agent host.",
                 cloneUrl
             ))));
@@ -232,7 +232,7 @@ let BrowserPluginGitCommandService = class BrowserPluginGitCommandService {
         } catch (err) {
             this._logService.trace("[BrowserPluginGitCommandService] GitHub session request failed:", err);
             throw ( new Error(( localize(
-                6813,
+                6932,
                 "Sign in to GitHub with an account that has access to '{0}' to install this plugin.",
                 `${repo.owner}/${repo.repo}`
             ))));