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

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js

@@ -561,7 +561,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(7518, "Install Chat Extensions..."));
+                const label = ( localize(7604, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -709,7 +709,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(7519, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(7605, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -737,15 +737,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(7520, "Prompt Resource"))
+                            name: ( localize(7606, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(7521, "Prompt Image")),
-                        fullName: ( localize(7521, "Prompt Image")),
+                        name: ( localize(7607, "Prompt Image")),
+                        fullName: ( localize(7607, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -1042,7 +1042,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 result.suggestions.push({
                     label: {
                         label: sessionPrefix,
-                        description: ( localize(7522, "Attach a chat session"))
+                        description: ( localize(7608, "Attach a chat session"))
                     },
                     filterText: sessionPrefix,
                     insertText: `${sessionPrefix}:`,
@@ -1128,7 +1128,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(7523, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(7609, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1180,7 +1180,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7524, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7610, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1369,7 +1369,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(7525, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(7611, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.js

@@ -366,7 +366,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 promptHoverMessage.appendText("\n");
             }
             promptHoverMessage.appendText(( localize(
-                7526,
+                7612,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.js

@@ -62,7 +62,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(7527, "There is a chat agent hover part here.");
+        return localize(7613, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    7568,
+                    7654,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js

@@ -182,7 +182,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(7569, "Loading..."));
+            const loadingMessage = ( localize(7655, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.js

@@ -73,6 +73,7 @@ import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { AgentSessionsFilter, AgentSessionsGrouping } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
+import { ChatEntitlementContextKeys } 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 { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
@@ -338,7 +339,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const sessionsContainer = this.sessionsContainer = parent.appendChild($(".agent-sessions-container"));
         const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $(".agent-sessions-title-container"));
         const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $("span.agent-sessions-title"));
-        sessionsTitle.textContent = ( localize(7588, "Sessions"));
+        sessionsTitle.textContent = ( localize(7674, "Sessions"));
         this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
             this.sessionsControl?.scrollToTop();
             this.sessionsControl?.focus();
@@ -366,7 +367,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             ...defaultButtonStyles,
             secondary: true
         })));
-        newSessionButton.label = ( localize(7589, "New Session"));
+        newSessionButton.label = ( localize(7675, "New Session"));
         this._register(
             newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT))
         );
@@ -456,7 +457,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         } else {
             if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
                 newSessionsContainerVisible =
-                !!this.chatEntitlementService.sentiment.completed && (!this._widget || (this._widget.isEmpty() && !!this._widget.viewModel && !this._widget.viewModel.model.title)) && !this.welcomeController?.isShowingWelcome.get();
+                (!!this.chatEntitlementService.sentiment.completed || this.chatEntitlementService.hasByokModels) && (!this._widget || (this._widget.isEmpty() && !!this._widget.viewModel && !this._widget.viewModel.model.title)) && !this.welcomeController?.isShowingWelcome.get();
             }
             else {
                 newSessionsContainerVisible =
@@ -538,12 +539,17 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }));
     }
     registerControlsListeners(sessionsControl, chatWidget, welcomeController) {
+        const hasByokModelsContextKeys = ( new Set([ChatEntitlementContextKeys.hasByokModels.key]));
         this._register(Event.any(
             chatWidget.onDidChangeEmptyState,
             Event.fromObservable(welcomeController.isShowingWelcome),
             Event.filter(
                 this.configurationService.onDidChangeConfiguration,
                 e => e.affectsConfiguration(ChatConfiguration.ChatViewSessionsEnabled)
+            ),
+            Event.filter(
+                this.contextKeyService.onDidChangeContext,
+                e => e.affectsSome(hasByokModelsContextKeys)
             )
         )(() => {
             if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
@@ -608,7 +614,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 progressBadgeDisposables.value.add(autorun(reader => {
                     if (model.requestInProgress.read(reader)) {
                         this.activityBadge.value = this.activityService.showViewActivity(this.id, {
-                            badge: ( new ProgressBadge(() => ( localize(7590, "Agent Session in Progress"))))
+                            badge: ( new ProgressBadge(() => ( localize(7676, "Agent Session in Progress"))))
                         });
                     } else {
                         this.activityBadge.clear();
@@ -684,10 +690,13 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.titleControl?.update(model);
         this.updateActions();
         if (oldModelResource) {
-            const oldSession = this.agentSessionsService.model.getSession(oldModelResource);
-            if (oldSession && !oldSession.isMarkedUnread()) {
-                oldSession.setRead(true);
-            }
+            const capturedOldResource = oldModelResource;
+            this._register(disposableTimeout(() => {
+                const oldSession = this.agentSessionsService.model.getSession(capturedOldResource);
+                if (oldSession && !oldSession.isMarkedUnread()) {
+                    oldSession.setRead(true);
+                }
+            }, 0));
         }
         return model;
     }
@@ -772,7 +781,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                     return undefined;
                 }
                 this.logService.error(`Failed to load chat session '${( sessionResource.toString())}'`, err);
-                this.notificationService.error(( localize(7591, "Failed to open chat session: {0}", toErrorMessage(err))));
+                this.notificationService.error(( localize(7677, "Failed to open chat session: {0}", toErrorMessage(err))));
                 const result = await this.showModel(token, undefined);
                 this.logService.trace(
                     `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())} error=true`

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js

@@ -23,7 +23,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         ChatViewTitleControl_1 = this;
     }
     static {
-        this.DEFAULT_TITLE = ( localize(7592, "Chat"));
+        this.DEFAULT_TITLE = ( localize(7678, "Chat"));
     }
     static {
         this.PICK_AGENT_SESSION_ACTION_ID = "workbench.action.chat.pickAgentSession";
@@ -48,7 +48,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
             constructor() {
                 super({
                     id: ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID,
-                    title: ( localize(7593, "Pick Agent Session")),
+                    title: ( localize(7679, "Pick Agent Session")),
                     f1: false,
                     menu: [{
                         id: MenuId.ChatViewSessionTitleNavigationToolbar,

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.js

@@ -249,6 +249,9 @@ let ChatService = class ChatService extends Disposable {
         this._chatSessionStore.storeSessionsMetadataOnly(liveNonLocalChats);
     }
     shouldStoreSession(session) {
+        if (session.isDeleted) {
+            return false;
+        }
         if (!LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
             return false;
         }
@@ -372,10 +375,14 @@ let ChatService = class ChatService extends Disposable {
         return undefined;
     }
     shouldBeInHistory(entry) {
-        return !entry.isImported && !!LocalChatSessionUri.parseLocalSessionId(entry.sessionResource) && entry.initialLocation === ChatAgentLocation.Chat;
+        return !entry.isImported && !entry.isDeleted && !!LocalChatSessionUri.parseLocalSessionId(entry.sessionResource) && entry.initialLocation === ChatAgentLocation.Chat;
     }
     async removeHistoryEntry(sessionResource) {
         await this._chatSessionStore.deleteSession(this.toLocalSessionId(sessionResource));
+        const model = this._sessionModels.get(sessionResource);
+        if (model) {
+            model.markDeleted();
+        }
         this._onDidDisposeSession.fire({
             sessionResources: [sessionResource],
             reason: "cleared"
@@ -842,7 +849,8 @@ let ChatService = class ChatService extends Disposable {
                 const newItem = await this.chatSessionService.createNewChatSessionItem(getChatSessionType(sessionResource), {
                     prompt: requestText,
                     command: commandPart?.text,
-                    initialSessionOptions
+                    initialSessionOptions,
+                    untitledResource: sessionResource
                 }, CancellationToken.None);
                 if (newItem) {
                     this.chatSessionService.registerSessionResourceAlias(sessionResource, newItem.resource);
@@ -1041,7 +1049,7 @@ let ChatService = class ChatService extends Disposable {
                         model.acceptResponseProgress(request, {
                             kind: "markdownContent",
                             content: ( new MarkdownString(( localize(
-                                7699,
+                                7786,
                                 "The `{0}` skill requires `{1}` to be enabled. After enabling, reload the window to apply. [Enable in Settings](command:workbench.action.openSettings?{2})",
                                 TROUBLESHOOT_COMMAND_NAME,
                                 AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING,
@@ -1343,7 +1351,7 @@ let ChatService = class ChatService extends Disposable {
                         );
                         rawResult = {
                             errorDetails: {
-                                message: ( localize(7700, "Provider returned null response"))
+                                message: ( localize(7787, "Provider returned null response"))
                             }
                         };
                     }
@@ -1827,7 +1835,7 @@ let ChatService = class ChatService extends Disposable {
 };
 ChatService = ( __decorate([( __param(0, IStorageService)), ( __param(1, ILogService)), ( __param(2, ITelemetryService)), ( __param(3, IExtensionService)), ( __param(4, IInstantiationService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IChatSlashCommandService)), ( __param(7, IChatAgentService)), ( __param(8, IConfigurationService)), ( __param(9, IChatTransferService)), ( __param(10, IChatSessionsService)), ( __param(11, IMcpService)), ( __param(12, IPromptsService)), ( __param(13, IChatEntitlementService)), ( __param(14, ILanguageModelsService)), ( __param(15, IChatDebugService))], ChatService));
 async function chatModelToChatDetail(model) {
-    const title = model.title || ( localize(7701, "New Chat"));
+    const title = model.title || ( localize(7788, "New Chat"));
     return {
         sessionResource: model.sessionResource,
         title,

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.js

@@ -8,7 +8,7 @@ import { ChatAgentVoteDirection, ChatCopyKind } from '@codingame/monaco-vscode-a
 import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { getChatSessionType, chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { chatSessionResourceToId, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 let ChatServiceTelemetry = class ChatServiceTelemetry {
     constructor(telemetryService) {
@@ -135,7 +135,7 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
             model: this.resolveModelId(this.opts.options?.userSelectedModelId),
             permissionLevel: this.opts.options?.modeInfo?.kind === ChatModeKind.Ask ? undefined : this.opts.options?.modeInfo?.permissionLevel,
             chatMode: this.opts.options?.modeInfo?.modeName ?? this.opts.options?.modeInfo?.modeId,
-            sessionType: getChatSessionType(this.opts.sessionResource)
+            sessionType: getChatSessionTypeForTelemetry(this.opts.sessionResource)
         });
     }
     attachmentKindsForTelemetry(variableData) {
@@ -178,5 +178,9 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
     }
 };
 ChatRequestTelemetry = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, ILanguageModelsService))], ChatRequestTelemetry));
+function getChatSessionTypeForTelemetry(sessionResource) {
+    const sessionType = getChatSessionType(sessionResource);
+    return sessionType.startsWith("remote-") ? "remote-agent-host" : sessionType;
+}
 
 export { ChatRequestTelemetry, ChatServiceTelemetry };

package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionStore.js

@@ -98,7 +98,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: "join.chatSessionStore",
-                label: ( localize(7738, "Saving chat history"))
+                label: ( localize(7823, "Saving chat history"))
             });
         }));
     }
@@ -356,14 +356,14 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
                             this._didReportIssue = true;
                             this.dialogService.prompt({
                                 custom: true,
-                                title: ( localize(7739, "Error saving chat session")),
+                                title: ( localize(7824, "Error saving chat session")),
                                 message: ( localize(
-                                    7740,
+                                    7825,
                                     "Error serializing chat session for storage. The session will be lost if the window is closed. Please report this issue to the VS Code team:\n\n{0}",
                                     e.stack || toErrorMessage(e)
                                 )),
                                 buttons: [{
-                                    label: ( localize(7741, "Report Issue")),
+                                    label: ( localize(7826, "Report Issue")),
                                     run: () => this.openerService.open("https://github.com/microsoft/vscode/issues/new?template=bug_report.md")
                                 }]
                             });
@@ -724,7 +724,7 @@ function getSessionMetadataSync(session) {
     } : undefined;
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(7742, "New Chat")),
+        title: title || ( localize(7827, "New Chat")),
         lastMessageDate: session.lastMessageDate,
         timing: session.timing,
         initialLocation: session.initialLocation,
@@ -746,7 +746,7 @@ async function getSessionMetadata(session) {
     const lastMessageDate = session.requests.at(-1)?.timestamp ?? session.creationDate;
     return {
         sessionId: session.sessionId,
-        title: session.customTitle || ( localize(7742, "New Chat")),
+        title: session.customTitle || ( localize(7827, "New Chat")),
         lastMessageDate,
         timing: {
             created: session.creationDate,

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.js

@@ -121,7 +121,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
             if (!( seenPluginUris.has(key))) {
                 seenPluginUris.add(key);
                 const format = await detectPluginFormat(source.uri, this._fileService);
-                plugins.push(this._toPlugin(
+                plugins.push(await this._toPlugin(
                     source.uri,
                     format,
                     source.fromMarketplace,
@@ -142,7 +142,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
             return false;
         }
     }
-    _toPlugin(uri, format, fromMarketplace, repositoryUri, removeCallback) {
+    async _toPlugin(uri, format, fromMarketplace, repositoryUri, removeCallback) {
         const key = ( uri.toString());
         const existing = this._pluginEntries.get(key);
         if (existing) {
@@ -155,7 +155,8 @@ class AbstractAgentPluginDiscovery extends Disposable {
         }
         const store = ( new DisposableStore());
         const enablement = derived(r => this._enablementModel.readEnabled(key, r));
-        const manifest = observableValue("agentPluginManifest", undefined);
+        const initialManifest = await this._readManifest(uri, format);
+        const manifest = observableValue("agentPluginManifest", initialManifest);
         const observeComponent = (prop, doRead, tryReadEmbedded, defaultPath = prop) => {
             const secondObs = derivedOpts({
                 equalsFn: equals
@@ -233,10 +234,10 @@ class AbstractAgentPluginDiscovery extends Disposable {
         });
         store.add(manifestWatcher);
         store.add(manifestWatcher.onDidChange(() => readManifest()));
-        readManifest();
+        const manifestName = typeof initialManifest?.name === "string" && initialManifest.name.trim() ? initialManifest.name.trim() : undefined;
         const plugin = {
             uri,
-            label: fromMarketplace?.name ?? basename(uri),
+            label: fromMarketplace?.name ?? manifestName ?? basename(uri),
             enablement,
             remove: removeCallback,
             hooks,
@@ -256,7 +257,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
     }
     async _readManifest(pluginUri, format) {
         const json = await this._readJsonFile(joinPath(pluginUri, format.manifestPath));
-        if (json && typeof json === "object") {
+        if (json && typeof json === "object" && !Array.isArray(json)) {
             return json;
         }
         return undefined;
@@ -634,13 +635,13 @@ let CopilotCliAgentPluginDiscovery = class CopilotCliAgentPluginDiscovery extend
         const {
             confirmed
         } = await this._dialogService.confirm({
-            message: ( localize(7743, "This plugin was installed by the Copilot CLI. Remove it from disk?")),
+            message: ( localize(7828, "This plugin was installed by the Copilot CLI. Remove it from disk?")),
             detail: ( localize(
-                7744,
+                7829,
                 "The plugin directory '{0}' will be moved to the trash. You can reinstall it later via the Copilot CLI.",
                 resource.fsPath
             )),
-            primaryButton: ( localize(7745, "Remove"))
+            primaryButton: ( localize(7830, "Remove"))
         });
         if (!confirmed) {
             return;
@@ -660,7 +661,7 @@ CopilotCliAgentPluginDiscovery = ( __decorate([( __param(0, IFileService)), ( __
 const epPlugins = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatPlugins",
     jsonSchema: {
-        description: ( localize(7746, "Contributes agent plugins for chat.")),
+        description: ( localize(7831, "Contributes agent plugins for chat.")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -674,13 +675,13 @@ const epPlugins = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 path: {
                     description: ( localize(
-                        7747,
+                        7832,
                         "Path to the agent plugin root directory relative to the extension root."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(7748, "(Optional) A condition which must be true to enable this plugin.")),
+                    description: ( localize(7833, "(Optional) A condition which must be true to enable this plugin.")),
                     type: "string"
                 }
             }
@@ -717,7 +718,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7749,
+                            7834,
                             "Extension '{0}' cannot register a chatPlugins entry without a path.",
                             ext.description.identifier.value
                         )));
@@ -726,7 +727,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                     const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7750,
+                            7835,
                             "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.",
                             ext.description.identifier.value,
                             raw.path
@@ -738,7 +739,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                         whenExpr = ContextKeyExpr.deserialize(raw.when);
                         if (!whenExpr) {
                             ext.collector.error(( localize(
-                                7751,
+                                7836,
                                 "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.",
                                 ext.description.identifier.value,
                                 raw.path,
@@ -809,7 +810,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                7752,
+                7837,
                 "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?",
                 extensionId
             ))
@@ -842,7 +843,7 @@ class ChatPluginsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7753, "Path")), ( localize(7754, "When"))];
+        const headers = [( localize(7838, "Path")), ( localize(7839, "When"))];
         const rows = ( contributions.map(d => [d.path, d.when ?? "-"]));
         return {
             data: {
@@ -855,7 +856,7 @@ class ChatPluginsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatPlugins",
-    label: ( localize(7755, "Chat Plugins")),
+    label: ( localize(7840, "Chat Plugins")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.js

@@ -25,7 +25,7 @@ function registerChatFilesExtensionPoint(point) {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: point,
         jsonSchema: {
-            description: ( localize(7756, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(7841, "Contributes {0} for chat prompts.", point)),
             type: "array",
             items: {
                 additionalProperties: false,
@@ -39,28 +39,28 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     path: {
                         description: point === ChatContributionPoint.chatSkills ? ( localize(
-                            7757,
+                            7842,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(7758, "Path to the file relative to the extension root.")),
+                        )) : ( localize(7843, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(7759, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(7760, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(7844, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(7845, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(7761, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(7762, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(7846, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(7847, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(7763, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(7848, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
                     },
                     sessionTypes: {
                         description: ( localize(
-                            7764,
+                            7849,
                             "(Optional) The chat session types where this entry should be offered."
                         )),
                         type: "array",
@@ -116,7 +116,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7765,
+                            7850,
                             "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
                             contributionPoint
@@ -126,7 +126,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7766,
+                            7851,
                             "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -136,7 +136,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (raw.when && !ContextKeyExpr.deserialize(raw.when)) {
                         ext.collector.error(( localize(
-                            7767,
+                            7852,
                             "Extension '{0}' {1} entry '{2}' has an invalid when clause: '{3}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -159,7 +159,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     } catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            7768,
+                            7853,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -220,7 +220,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7769, "Name")), ( localize(7770, "Description")), ( localize(7771, "Path"))];
+        const headers = [( localize(7854, "Name")), ( localize(7855, "Description")), ( localize(7856, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -235,7 +235,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(7772, "Chat Prompt Files")),
+    label: ( localize(7857, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -243,7 +243,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(7773, "Chat Instructions")),
+    label: ( localize(7858, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -251,7 +251,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(7774, "Chat Agents")),
+    label: ( localize(7859, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -259,7 +259,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(7775, "Chat Skills")),
+    label: ( localize(7860, "Chat Skills")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/PromptHeaderDefinitionProvider.js

@@ -2,7 +2,6 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
@@ -25,7 +24,7 @@ let PromptHeaderDefinitionProvider = class PromptHeaderDefinitionProvider {
         }
         const agentAttr = header.getAttribute(PromptHeaderAttributes.agent) ?? header.getAttribute(PromptHeaderAttributes.mode);
         if (agentAttr && agentAttr.value.type === "scalar" && agentAttr.range.containsPosition(position)) {
-            const agent = (await this.chatModeService.awaitModes(localChatSessionType)).findModeByName(agentAttr.value.value);
+            const agent = (await this.chatModeService.getLocalModes()).findModeByName(agentAttr.value.value);
             if (agent && agent.uri) {
                 return {
                     uri: agent.uri.get(),