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

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

@@ -9,22 +9,6 @@ var MarketplaceReferenceKind;
     MarketplaceReferenceKind["LocalFileUri"] = "localFileUri";
 })(MarketplaceReferenceKind || (MarketplaceReferenceKind = {}));
 const _githubShorthandRe = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+(?:#.+)?$/;
-function extraKnownMarketplacesToConfigDict(entries) {
-    if (!entries?.length) {
-        return undefined;
-    }
-    const obj = {};
-    for (const entry of entries) {
-        if (typeof entry === "string") {
-            obj[entry] = entry;
-        } else {
-            const s = entry.source;
-            const base = s.source === "github" ? s.repo : s.url;
-            obj[entry.name] = s.ref ? `${base}#${s.ref}` : base;
-        }
-    }
-    return obj;
-}
 function readConfiguredMarketplaces(configurationService) {
     const userValues = configurationService.getValue(ChatConfiguration.PluginMarketplaces) ?? [];
     const extraObj = configurationService.getValue(ChatConfiguration.ExtraMarketplaces) ?? {};
@@ -277,4 +261,4 @@ function sanitizePathSegment(value) {
     return value.replace(/[\\/:*?"<>|]/g, "_");
 }
 
-export { MarketplaceReferenceKind, deduplicateMarketplaceReferences, extraKnownMarketplacesToConfigDict, parseMarketplaceObjectEntry, parseMarketplaceReference, parseMarketplaceReferences, readConfiguredMarketplaces };
+export { MarketplaceReferenceKind, deduplicateMarketplaceReferences, parseMarketplaceObjectEntry, parseMarketplaceReference, parseMarketplaceReferences, readConfiguredMarketplaces };

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.d.ts

@@ -130,6 +130,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     addInstalledPlugin(pluginUri: URI, plugin: IMarketplacePlugin): void;
     removeInstalledPlugin(pluginUri: URI): void;
     isMarketplaceTrusted(ref: IMarketplaceReference): boolean;
+    isStrictMarketplacePolicyActive(): boolean;
     /**
      * Hydrates installed entries from marketplace metadata. Entries written
      * by current builds include the marketplace plugin name, which is enough
@@ -158,6 +159,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     private _fetchFromClonedRepo;
     readPluginsFromDirectory(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin[]>;
     readSinglePluginManifest(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin | undefined>;
+    isPluginDirectory(repoDir: URI): Promise<boolean>;
     private _readPluginsFromDirectory;
     /**
      * Iterates over {@link MARKETPLACE_DEFINITIONS} paths, calling

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

@@ -27,7 +27,7 @@ import { FileBackedInstalledPluginsStore } from './fileBackedInstalledPluginsSto
 import { IWorkspacePluginSettingsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { readConfiguredMarketplaces, parseMarketplaceReferences, deduplicateMarketplaceReferences, parseMarketplaceReference, parseMarketplaceObjectEntry, MarketplaceReferenceKind } from './marketplaceReference.js';
-export { extraKnownMarketplacesToConfigDict } from './marketplaceReference.js';
+import { getStrictKnownMarketplaces, isMarketplaceReferenceAllowed } from './strictKnownMarketplaces.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -400,12 +400,15 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         this._installedPluginsStore.set(current.filter(e => !isEqual(e.pluginUri, pluginUri)), undefined);
     }
     isMarketplaceTrusted(ref) {
-        if (this._configurationService.getValue(ChatConfiguration.StrictMarketplaces)) {
-            const refs = parseMarketplaceReferences(readConfiguredMarketplaces(this._configurationService).extraValues);
-            return ( refs.some(r => r.canonicalId === ref.canonicalId));
+        const allowlist = getStrictKnownMarketplaces(this._configurationService.getValue(ChatConfiguration.StrictMarketplaces));
+        if (allowlist !== undefined) {
+            return isMarketplaceReferenceAllowed(allowlist, ref);
         }
         return this._trustedMarketplacesStore.get().includes(ref.canonicalId);
     }
+    isStrictMarketplacePolicyActive() {
+        return getStrictKnownMarketplaces(this._configurationService.getValue(ChatConfiguration.StrictMarketplaces)) !== undefined;
+    }
     async _hydratePluginMetadata(entries) {
         let hydrated = 0;
         for (const entry of entries) {
@@ -486,7 +489,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         }
     }
     _isAutoUpdateEnabled() {
-        return this._extensionsWorkbenchService.getAutoUpdateValue() === true;
+        return this._extensionsWorkbenchService.getAutoUpdateValue() !== "off";
     }
     _scheduleUpdateCheck() {
         if (this._updateCheckTimer !== undefined) {
@@ -605,6 +608,14 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         );
         return undefined;
     }
+    async isPluginDirectory(repoDir) {
+        for (const def of SINGLE_PLUGIN_MANIFEST_DEFINITIONS) {
+            if (await this._fileService.exists(joinPath(repoDir, def.path))) {
+                return true;
+            }
+        }
+        return false;
+    }
     async _readPluginsFromDirectory(repoDir, reference, token) {
         return this._readPluginsFromDefinitions(reference, async defPath => {
             if (token?.isCancellationRequested) {

package/vscode/src/vs/workbench/contrib/chat/common/plugins/strictKnownMarketplaces.d.ts

@@ -0,0 +1,31 @@
+import { IStrictMarketplaceSource } from "@codingame/monaco-vscode-api/vscode/vs/base/common/managedSettings";
+import { IMarketplaceReference } from "./marketplaceReference.js";
+/**
+ * The allowlist entry type for `chat.plugins.strictMarketplaces`. Re-exported
+ * from `base/common` so chat plugin code can import it alongside the matcher it
+ * operates with; the same type is consumed by the managed-settings adapter.
+ */
+export type { IStrictMarketplaceSource };
+/**
+ * The value of the `chat.plugins.strictMarketplaces` allowlist.
+ * - `undefined`: no restrictions — all marketplaces are allowed.
+ * - `[]`: complete lockdown — no marketplace is allowed.
+ * - non-empty array: only marketplaces matching an entry are allowed.
+ */
+export type StrictKnownMarketplaces = readonly IStrictMarketplaceSource[];
+/**
+ * Coerces a resolved configuration value into a {@link StrictKnownMarketplaces}
+ * allowlist. Returns `undefined` (meaning "no restrictions") when the value is
+ * not an array — which is also how an unset policy surfaces (the registered
+ * `null` default). Malformed entries (non-objects or entries without a string
+ * `source`) are dropped so a bad managed-settings payload degrades to "no match"
+ * rather than throwing during matching.
+ */
+export declare function getStrictKnownMarketplaces(value: unknown): StrictKnownMarketplaces | undefined;
+/**
+ * Checks whether a marketplace reference is allowed by the strict allowlist.
+ *
+ * @param allowlist `undefined` allows everything, `[]` blocks everything,
+ * otherwise the reference must match at least one entry.
+ */
+export declare function isMarketplaceReferenceAllowed(allowlist: StrictKnownMarketplaces | undefined, ref: IMarketplaceReference): boolean;

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

@@ -0,0 +1,122 @@
+
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { MarketplaceReferenceKind, parseMarketplaceReference } from './marketplaceReference.js';
+
+function getStrictKnownMarketplaces(value) {
+    if (!Array.isArray(value)) {
+        return undefined;
+    }
+    return value.filter(
+        entry => typeof entry === "object" && entry !== null && typeof entry.source === "string"
+    );
+}
+function isMarketplaceReferenceAllowed(allowlist, ref) {
+    if (allowlist === undefined) {
+        return true;
+    }
+    if (allowlist.length === 0) {
+        return false;
+    }
+    return ( allowlist.some(entry => matchesAllowlistEntry(entry, ref)));
+}
+function matchesAllowlistEntry(entry, ref) {
+    switch (entry.source) {
+    case "github":
+        {
+            if (typeof entry.repo !== "string" || entry.path !== undefined) {
+                return false;
+            }
+            const candidate = parseMarketplaceReference(appendRef(entry.repo, entry.ref));
+            return !!candidate && candidate.canonicalId === ref.canonicalId;
+        }
+    case "git":
+        {
+            if (typeof entry.url !== "string" || entry.path !== undefined) {
+                return false;
+            }
+            const candidate = parseMarketplaceReference(appendRef(entry.url, entry.ref));
+            return !!candidate && candidate.canonicalId === ref.canonicalId;
+        }
+    case "url":
+        {
+            if (typeof entry.url !== "string") {
+                return false;
+            }
+            const candidate = parseMarketplaceReference(appendRef(entry.url, entry.ref));
+            return !!candidate && candidate.canonicalId === ref.canonicalId;
+        }
+    case "npm":
+        {
+            return false;
+        }
+    case "file":
+    case "directory":
+        {
+            if (ref.kind !== MarketplaceReferenceKind.LocalFileUri || !ref.localRepositoryUri || typeof entry.path !== "string") {
+                return false;
+            }
+            return isEqual(ref.localRepositoryUri, URI.file(entry.path));
+        }
+    case "hostPattern":
+        {
+            if (typeof entry.hostPattern !== "string") {
+                return false;
+            }
+            const host = extractHost(ref);
+            return !!host && testPattern(entry.hostPattern, host);
+        }
+    case "pathPattern":
+        {
+            if (typeof entry.pathPattern !== "string" || ref.kind !== MarketplaceReferenceKind.LocalFileUri || !ref.localRepositoryUri) {
+                return false;
+            }
+            return testPattern(entry.pathPattern, ref.localRepositoryUri.fsPath);
+        }
+    default:
+        return false;
+    }
+}
+function appendRef(value, ref) {
+    if (!ref) {
+        return value;
+    }
+    const fragmentIndex = value.indexOf("#");
+    const base = fragmentIndex === -1 ? value : value.slice(0, fragmentIndex);
+    return `${base}#${ref}`;
+}
+function extractHost(ref) {
+    if (ref.kind === MarketplaceReferenceKind.GitHubShorthand) {
+        return "github.com";
+    }
+    if (ref.kind !== MarketplaceReferenceKind.GitUri) {
+        return undefined;
+    }
+    const scpMatch = /^[\w._-]+@([\w.-]+):/.exec(ref.cloneUrl);
+    if (scpMatch) {
+        return scpMatch[1].toLowerCase();
+    }
+    try {
+        let authority = ( URI.parse(ref.cloneUrl)).authority.toLowerCase();
+        const at = authority.lastIndexOf("@");
+        if (at !== -1) {
+            authority = authority.slice(at + 1);
+        }
+        const colon = authority.indexOf(":");
+        if (colon !== -1) {
+            authority = authority.slice(0, colon);
+        }
+        return authority || undefined;
+    } catch {
+        return undefined;
+    }
+}
+function testPattern(pattern, value) {
+    try {
+        return ( new RegExp(pattern)).test(value);
+    } catch {
+        return false;
+    }
+}
+
+export { getStrictKnownMarketplaces, isMarketplaceReferenceAllowed };

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(7994, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(8600, "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(
-                            7995,
+                            8601,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(7996, "Path to the file relative to the extension root.")),
+                        )) : ( localize(8602, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(7997, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(7998, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(8603, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(8604, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(7999, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(8000, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(8605, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(8606, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(8001, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(8607, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
                     },
                     sessionTypes: {
                         description: ( localize(
-                            8002,
+                            8608,
                             "(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(
-                            8003,
+                            8609,
                             "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(
-                            8004,
+                            8610,
                             "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(
-                            8005,
+                            8611,
                             "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(
-                            8006,
+                            8612,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -196,6 +196,12 @@ CommandsRegistry.registerCommand("_listExtensionPromptFiles", async accessor =>
                 type: file.type,
                 extensionId: file.extension.identifier.value
             });
+        } else if (file.storage === PromptsStorage.plugin) {
+            result.push({
+                uri: file.uri.toJSON(),
+                type: file.type,
+                extensionId: ( file.pluginUri.toString())
+            });
         }
     }
     return result;
@@ -220,7 +226,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(8007, "Name")), ( localize(8008, "Description")), ( localize(8009, "Path"))];
+        const headers = [( localize(8613, "Name")), ( localize(8614, "Description")), ( localize(8615, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -235,7 +241,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(8010, "Chat Prompt Files")),
+    label: ( localize(8616, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -243,7 +249,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(8011, "Chat Instructions")),
+    label: ( localize(8617, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -251,7 +257,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(8012, "Chat Agents")),
+    label: ( localize(8618, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -259,7 +265,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(8013, "Chat Skills")),
+    label: ( localize(8619, "Chat Skills")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.d.ts

@@ -20,6 +20,9 @@ export declare class PromptCodeActionProvider implements CodeActionProvider {
     provideCodeActions(model: ITextModel, range: Range | Selection, context: CodeActionContext, token: CancellationToken): Promise<CodeActionList | undefined>;
     private getMarkers;
     private createCodeAction;
+    private getEnableMcpServerCodeActions;
+    private getMarkerCode;
+    private getMarkersInRange;
     private getUpdateModeCodeActions;
     private getMigrateModeFileCodeActions;
     private getUpdateToolsCodeActions;

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

@@ -9,7 +9,7 @@ import { PromptHeaderAttributes, parseCommaSeparatedList } from '@codingame/mona
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { LEGACY_MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { MARKERS_OWNER_ID } from './promptValidator.js';
+import { MARKERS_OWNER_ID, PromptValidatorMarkerCode } from './promptValidator.js';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { CodeActionKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/common/types';
 import { getTarget, isVSCodeOrDefaultTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptFileAttributes';
@@ -32,11 +32,13 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
         switch (promptType) {
         case PromptsType.agent:
             this.getUpdateToolsCodeActions(promptAST, promptType, model, range, result);
+            this.getEnableMcpServerCodeActions(model, range, result);
             await this.getMigrateModeFileCodeActions(model, result);
             break;
         case PromptsType.prompt:
             this.getUpdateModeCodeActions(promptAST, model, range, result);
             this.getUpdateToolsCodeActions(promptAST, promptType, model, range, result);
+            this.getEnableMcpServerCodeActions(model, range, result);
             break;
         }
         if (result.length === 0) {
@@ -54,17 +56,118 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
         });
         return markers.filter(marker => range.containsRange(marker));
     }
-    createCodeAction(model, range, title, edits) {
+    createCodeAction(model, range, title, edits, command) {
         return {
             title,
-            edit: {
-                edits
-            },
+            ...(edits ? {
+                edit: {
+                    edits
+                }
+            } : {}),
+            ...(command ? {
+                command
+            } : {}),
             ranges: [range],
             diagnostics: this.getMarkers(model, range),
             kind: CodeActionKind.QuickFix.value
         };
     }
+    getEnableMcpServerCodeActions(model, range, result) {
+        const markersInRange = this.getMarkersInRange(model, range);
+        for (const marker of markersInRange) {
+            const markerCode = this.getMarkerCode(marker);
+            if (markerCode === PromptValidatorMarkerCode.MissingGithubMcpServer) {
+                result.push(this.createCodeAction(model, range, ( localize(8672, "Enable Built-in GitHub MCP Server")), undefined, {
+                    id: "workbench.action.openSettings",
+                    title: "",
+                    arguments: ["@id:github.copilot.chat.githubMcpServer.enabled"]
+                }));
+                result.push(this.createCodeAction(model, range, ( localize(8673, "Install GitHub MCP Server from Marketplace")), undefined, {
+                    id: "workbench.extensions.search",
+                    title: "",
+                    arguments: ["@mcp github"]
+                }));
+            } else if (markerCode === PromptValidatorMarkerCode.MissingPlaywrightMcpServer) {
+                result.push(this.createCodeAction(model, range, ( localize(8674, "Install Playwright MCP Server from Marketplace")), undefined, {
+                    id: "workbench.extensions.search",
+                    title: "",
+                    arguments: ["@mcp playwright"]
+                }));
+            } else if (markerCode === PromptValidatorMarkerCode.UnknownExtensionReference) {
+                const reference = model.getValueInRange(( new Range(
+                    marker.startLineNumber,
+                    marker.startColumn,
+                    marker.endLineNumber,
+                    marker.endColumn
+                ))).trim();
+                const extensionId = reference.split("/")[0].replace(/^['"]|['"]$/g, "");
+                if (extensionId) {
+                    result.push(this.createCodeAction(model, range, ( localize(8675, "Search Marketplace for Extension '{0}'", extensionId)), undefined, {
+                        id: "workbench.extensions.search",
+                        title: "",
+                        arguments: [`@id:${extensionId}`]
+                    }));
+                }
+            } else if (markerCode === PromptValidatorMarkerCode.UnknownMcpServerReference) {
+                const reference = model.getValueInRange(( new Range(
+                    marker.startLineNumber,
+                    marker.startColumn,
+                    marker.endLineNumber,
+                    marker.endColumn
+                ))).trim();
+                const serverId = reference.replace(/^['"]|['"]$/g, "");
+                if (serverId) {
+                    result.push(this.createCodeAction(model, range, ( localize(8676, "Search Marketplace for MCP Server '{0}'", serverId)), undefined, {
+                        id: "workbench.extensions.search",
+                        title: "",
+                        arguments: [`@mcp ${serverId}`]
+                    }));
+                }
+            } else {
+                const reference = model.getValueInRange(( new Range(
+                    marker.startLineNumber,
+                    marker.startColumn,
+                    marker.endLineNumber,
+                    marker.endColumn
+                ))).trim();
+                if (reference) {
+                    const extensionId = reference.split("/")[0].replace(/^['"]|['"]$/g, "");
+                    result.push(this.createCodeAction(model, range, ( localize(8677, "Search Marketplace for Extension '{0}'", extensionId)), undefined, {
+                        id: "workbench.extensions.search",
+                        title: "",
+                        arguments: [`@id:${extensionId}`]
+                    }));
+                    const serverId = reference.replace(/^['"]|['"]$/g, "");
+                    result.push(this.createCodeAction(model, range, ( localize(8678, "Search Marketplace for MCP Server '{0}'", serverId)), undefined, {
+                        id: "workbench.extensions.search",
+                        title: "",
+                        arguments: [`@mcp ${serverId}`]
+                    }));
+                }
+            }
+        }
+    }
+    getMarkerCode(marker) {
+        if (!marker.code) {
+            return undefined;
+        }
+        return typeof marker.code === "string" ? marker.code : marker.code.value;
+    }
+    getMarkersInRange(model, range) {
+        const markers = this.markerService.read({
+            resource: model.uri,
+            owner: MARKERS_OWNER_ID
+        });
+        return markers.filter(marker => {
+            const markerRange = ( new Range(
+                marker.startLineNumber,
+                marker.startColumn,
+                marker.endLineNumber,
+                marker.endColumn
+            ));
+            return markerRange.intersectRanges(range);
+        });
+    }
     getUpdateModeCodeActions(promptFile, model, range, result) {
         const modeAttr = promptFile.header?.getAttribute(PromptHeaderAttributes.mode);
         if (!modeAttr?.range.containsRange(range)) {
@@ -76,7 +179,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
             modeAttr.range.startLineNumber,
             modeAttr.range.startColumn + modeAttr.key.length
         ));
-        result.push(this.createCodeAction(model, keyRange, ( localize(8066, "Rename to 'agent'")), [asWorkspaceTextEdit(model, {
+        result.push(this.createCodeAction(model, keyRange, ( localize(8679, "Rename to 'agent'")), [asWorkspaceTextEdit(model, {
             range: keyRange,
             text: "agent"
         })]));
@@ -93,7 +196,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                         copy: false
                     }
                 };
-                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(8067, "Migrate to custom agent file")), [edit]));
+                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(8680, "Migrate to custom agent file")), [edit]));
             }
         }
     }
@@ -140,7 +243,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                     };
                     edits.push(edit);
                     if (item.range.containsRange(range)) {
-                        result.push(this.createCodeAction(model, item.range, ( localize(8068, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
+                        result.push(this.createCodeAction(model, item.range, ( localize(8681, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
                     }
                 } else {
                     const newNamesArray = Array.from(newNames).sort((a, b) => a.localeCompare(b));
@@ -159,13 +262,13 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                     };
                     edits.push(edit);
                     if (item.range.containsRange(range)) {
-                        result.push(this.createCodeAction(model, item.range, ( localize(8069, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
+                        result.push(this.createCodeAction(model, item.range, ( localize(8682, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
                     }
                 }
             }
         }
         if (edits.length && result.length === 0 || edits.length > 1) {
-            result.push(this.createCodeAction(model, value.range, ( localize(8070, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
+            result.push(this.createCodeAction(model, value.range, ( localize(8683, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
         }
     }
 };

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

@@ -44,7 +44,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         if (/^\s*$/.test(model.getValue())) {
             return {
                 suggestions: [{
-                    label: ( localize(8149, "Add Prompt Header")),
+                    label: ( localize(8762, "Add Prompt Header")),
                     kind: CompletionItemKind.Snippet,
                     insertText: [`---`, `description: $1`, `---`, `$0`].join("\n"),
                     insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
@@ -234,7 +234,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                 "    send: true"
             ].join("\n");
             const item = {
-                label: ( localize(8150, "Handoff Example")),
+                label: ( localize(8763, "Handoff Example")),
                 kind: CompletionItemKind.Value,
                 insertText: whilespaceAfterColon === 0 ? ` ${value}` : value,
                 range: ( new Range(
@@ -249,7 +249,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         if (attribute.key === PromptHeaderAttributes.hooks && promptType === PromptsType.agent) {
             const hookSnippet = ["", "  ${1|" + ( Object.keys(HOOKS_BY_TARGET[target] ?? HOOKS_BY_TARGET[Target.Undefined])).join(",") + "|}:", "    - type: command", "      command: \"$2\""].join("\n");
             const item = {
-                label: ( localize(8151, "New Hook")),
+                label: ( localize(8764, "New Hook")),
                 kind: CompletionItemKind.Snippet,
                 insertText: whilespaceAfterColon === 0 ? ` ${hookSnippet}` : hookSnippet,
                 insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
@@ -276,8 +276,8 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                 const commandSnippet = ["", "  - type: command", "    command: \"$1\""].join("\n");
                 return {
                     suggestions: [{
-                        label: ( localize(8152, "New Command")),
-                        documentation: ( localize(8153, "Add a new command entry to this hook.")),
+                        label: ( localize(8765, "New Command")),
+                        documentation: ( localize(8766, "Add a new command entry to this hook.")),
                         kind: CompletionItemKind.Snippet,
                         insertText: whilespaceAfterColon === 0 ? ` ${commandSnippet}` : commandSnippet,
                         insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,