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

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

@@ -6,11 +6,10 @@ import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { untildify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { cloneAndChange, equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import { joinPath, normalizePath, isEqualOrParent, basename, extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { joinPath, basename, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -21,7 +20,6 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { McpServerType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
@@ -29,13 +27,14 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { detectPluginFormat, parseComponentPathConfig, resolveComponentDirs, readMarkdownComponents, readSkills, parseMcpServerDefinitionMap } from '../../../../../platform/agentPlugins/common/pluginParsers.js';
+export { convertBareEnvVarsToVsCodeSyntax, resolveMcpServersMap, shellQuotePluginRootInCommand } from '../../../../../platform/agentPlugins/common/pluginParsers.js';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { EnablementModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
-import { parseClaudeHooks } from '../promptSyntax/hookClaudeCompat.js';
-import { parseCopilotHooks } from '../promptSyntax/hookCompatibility.js';
+import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { agentPluginDiscoveryRegistry } from './agentPluginService.js';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
@@ -45,265 +44,20 @@ import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/bas
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
 import { observableSignal } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignal';
 
-const COMMAND_FILE_SUFFIX = ".md";
-const RULE_FILE_SUFFIXES = [".instructions.md", ".mdc", ".md"];
-var AgentPluginFormat;
-(function(AgentPluginFormat) {
-    AgentPluginFormat[AgentPluginFormat["Copilot"] = 0] = "Copilot";
-    AgentPluginFormat[AgentPluginFormat["Claude"] = 1] = "Claude";
-    AgentPluginFormat[AgentPluginFormat["OpenPlugin"] = 2] = "OpenPlugin";
-})(AgentPluginFormat || (AgentPluginFormat = {}));
-function mapParsedHooks(uri, parsed) {
-    return ( [...parsed.entries()].map((
-        [type, {
-            hooks,
-            originalId
-        }]
-    ) => ({
-        type,
-        uri,
-        hooks,
-        originalId
+function toAgentPluginHooks(groups) {
+    return ( groups.filter(g => ( Object.values(HookType)).includes(g.type)).map(g => ({
+        type: g.type,
+        hooks: g.commands,
+        uri: g.uri,
+        originalId: g.originalId
     })));
 }
+const RULE_FILE_SUFFIXES = [".instructions.md", ".mdc", ".md"];
 function resolveWorkspaceRoot(pluginUri, workspaceContextService) {
     const defaultFolder = workspaceContextService.getWorkspace().folders[0];
     const folder = workspaceContextService.getWorkspaceFolder(pluginUri) ?? defaultFolder;
     return folder?.uri;
 }
-let CopilotPluginFormatAdapter = class CopilotPluginFormatAdapter {
-    constructor(_workspaceContextService) {
-        this._workspaceContextService = _workspaceContextService;
-        this.format = AgentPluginFormat.Copilot;
-        this.manifestPath = "plugin.json";
-        this.hookConfigPath = "hooks.json";
-        this.pluginRootToken = undefined;
-        this.pluginRootEnvVar = undefined;
-    }
-    parseHooks(hookURI, json, pluginUri, userHome) {
-        const workspaceRoot = resolveWorkspaceRoot(pluginUri, this._workspaceContextService);
-        return mapParsedHooks(hookURI, parseCopilotHooks(json, workspaceRoot, userHome));
-    }
-};
-CopilotPluginFormatAdapter = ( __decorate([( __param(0, IWorkspaceContextService))], CopilotPluginFormatAdapter));
-const shellUnsafeChars = /[\s&|<>()^;!`"']/;
-function shellQuotePluginRootInCommand(command, fsPath, token) {
-    if (!command.includes(token)) {
-        return command;
-    }
-    if (!shellUnsafeChars.test(fsPath)) {
-        return command.replaceAll(token, fsPath);
-    }
-    const escapedToken = escapeRegExpCharacters(token);
-    const pattern = ( new RegExp(
-    `(["']?)` + escapedToken + `([\\w./\\\\~:-]*)`, "g"));
-    return command.replace(pattern, (_match, leadingQuote, suffix) => {
-        const fullPath = fsPath + suffix;
-        if (leadingQuote) {
-            return leadingQuote + fullPath;
-        }
-        return "\"" + fullPath.replace(/"/g, "\\\"") + "\"";
-    });
-}
-function resolveMcpServersMap(raw) {
-    if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-        return undefined;
-    }
-    const obj = raw;
-    return Object.hasOwn(obj, "mcpServers") ? obj.mcpServers : obj;
-}
-function interpolateMcpPluginRoot(def, fsPath, token, envVar) {
-    const replace = s => s.replaceAll(token, fsPath);
-    const config = def.configuration;
-    let interpolated;
-    if (config.type === McpServerType.LOCAL) {
-        const local = {
-            ...config
-        };
-        local.command = replace(local.command);
-        if (local.args) {
-            local.args = ( local.args.map(replace));
-        }
-        if (local.cwd) {
-            local.cwd = replace(local.cwd);
-        }
-        local.env = {
-            ...local.env
-        };
-        for (const [k, v] of Object.entries(local.env)) {
-            if (typeof v === "string") {
-                local.env[k] = replace(v);
-            }
-        }
-        local.env[envVar] = fsPath;
-        if (local.envFile) {
-            local.envFile = replace(local.envFile);
-        }
-        interpolated = local;
-    } else {
-        const remote = {
-            ...config
-        };
-        remote.url = replace(remote.url);
-        if (remote.headers) {
-            remote.headers = Object.fromEntries(( Object.entries(remote.headers).map(([k, v]) => [k, replace(v)])));
-        }
-        interpolated = remote;
-    }
-    return {
-        name: def.name,
-        configuration: interpolated,
-        uri: def.uri
-    };
-}
-const BARE_ENV_VAR_RE = /\$\{(?![A-Za-z]+:)([A-Z_][A-Z0-9_]*)\}/g;
-function convertBareEnvVarsToVsCodeSyntax(def) {
-    return cloneAndChange(def, value => {
-        if (URI.isUri(value)) {
-            return value;
-        }
-        if (typeof value === "string") {
-            const replaced = value.replace(BARE_ENV_VAR_RE, "${env:$1}");
-            return replaced !== value ? replaced : undefined;
-        }
-        return undefined;
-    });
-}
-function parsePluginRootHooks(hookURI, json, pluginUri, userHome, workspaceContextService, token, envVar) {
-    const fsPath = pluginUri.fsPath;
-    const typedJson = json;
-    const mutateHookCommand = hook => {
-        for (const field of ["command", "windows", "linux", "osx"]) {
-            if (typeof hook[field] === "string") {
-                hook[field] = shellQuotePluginRootInCommand(hook[field], fsPath, token);
-            }
-        }
-        hook.env ??= {};
-        hook.env[envVar] = fsPath;
-    };
-    for (const lifecycle of ( Object.values(typedJson.hooks ?? {}))) {
-        if (!Array.isArray(lifecycle)) {
-            continue;
-        }
-        for (const lifecycleEntry of lifecycle) {
-            if (!lifecycleEntry || typeof lifecycleEntry !== "object") {
-                continue;
-            }
-            const entry = lifecycleEntry;
-            if (Array.isArray(entry.hooks)) {
-                for (const hook of entry.hooks) {
-                    mutateHookCommand(hook);
-                }
-            } else {
-                mutateHookCommand(entry);
-            }
-        }
-    }
-    const replacer = v => {
-        return typeof v === "string" ? v.replaceAll(token, pluginUri.fsPath) : undefined;
-    };
-    const workspaceRoot = resolveWorkspaceRoot(pluginUri, workspaceContextService);
-    const {
-        hooks,
-        disabledAllHooks
-    } = parseClaudeHooks(cloneAndChange(json, replacer), workspaceRoot, userHome);
-    if (disabledAllHooks) {
-        return [];
-    }
-    return mapParsedHooks(hookURI, hooks);
-}
-let ClaudePluginFormatAdapter = class ClaudePluginFormatAdapter {
-    constructor(_workspaceContextService) {
-        this._workspaceContextService = _workspaceContextService;
-        this.format = AgentPluginFormat.Claude;
-        this.manifestPath = ".claude-plugin/plugin.json";
-        this.hookConfigPath = "hooks/hooks.json";
-        this.pluginRootToken = "${CLAUDE_PLUGIN_ROOT}";
-        this.pluginRootEnvVar = "CLAUDE_PLUGIN_ROOT";
-    }
-    parseHooks(hookURI, json, pluginUri, userHome) {
-        return parsePluginRootHooks(
-            hookURI,
-            json,
-            pluginUri,
-            userHome,
-            this._workspaceContextService,
-            "${CLAUDE_PLUGIN_ROOT}",
-            "CLAUDE_PLUGIN_ROOT"
-        );
-    }
-};
-ClaudePluginFormatAdapter = ( __decorate([( __param(0, IWorkspaceContextService))], ClaudePluginFormatAdapter));
-let OpenPluginFormatAdapter = class OpenPluginFormatAdapter {
-    constructor(_workspaceContextService) {
-        this._workspaceContextService = _workspaceContextService;
-        this.format = AgentPluginFormat.OpenPlugin;
-        this.manifestPath = ".plugin/plugin.json";
-        this.hookConfigPath = "hooks/hooks.json";
-        this.pluginRootToken = "${PLUGIN_ROOT}";
-        this.pluginRootEnvVar = "PLUGIN_ROOT";
-    }
-    parseHooks(hookURI, json, pluginUri, userHome) {
-        return parsePluginRootHooks(
-            hookURI,
-            json,
-            pluginUri,
-            userHome,
-            this._workspaceContextService,
-            "${PLUGIN_ROOT}",
-            "PLUGIN_ROOT"
-        );
-    }
-};
-OpenPluginFormatAdapter = ( __decorate([( __param(0, IWorkspaceContextService))], OpenPluginFormatAdapter));
-const emptyComponentPathConfig = {
-    paths: [],
-    exclusive: false
-};
-function parseComponentPathConfig(raw) {
-    if (raw === undefined || raw === null) {
-        return emptyComponentPathConfig;
-    }
-    if (typeof raw === "string") {
-        const trimmed = raw.trim();
-        return trimmed ? {
-            paths: [trimmed],
-            exclusive: false
-        } : emptyComponentPathConfig;
-    }
-    if (Array.isArray(raw)) {
-        const paths = ( raw.filter(v => typeof v === "string").map(v => v.trim())).filter(v => v.length > 0);
-        return {
-            paths,
-            exclusive: false
-        };
-    }
-    if (typeof raw === "object") {
-        const obj = raw;
-        if (Array.isArray(obj["paths"])) {
-            const paths = ( obj["paths"].filter(v => typeof v === "string").map(v => v.trim())).filter(v => v.length > 0);
-            const exclusive = obj["exclusive"] === true;
-            return {
-                paths,
-                exclusive
-            };
-        }
-    }
-    return emptyComponentPathConfig;
-}
-function resolveComponentDirs(pluginUri, defaultDir, config) {
-    const dirs = [];
-    if (!config.exclusive) {
-        dirs.push(joinPath(pluginUri, defaultDir));
-    }
-    for (const p of config.paths) {
-        const resolved = normalizePath(joinPath(pluginUri, p));
-        if (isEqualOrParent(resolved, pluginUri)) {
-            dirs.push(resolved);
-        }
-    }
-    return dirs;
-}
 let AgentPluginService = class AgentPluginService extends Disposable {
     constructor(instantiationService, configurationService, storageService) {
         super();
@@ -339,12 +93,12 @@ let AgentPluginService = class AgentPluginService extends Disposable {
 };
 AgentPluginService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IConfigurationService)), ( __param(2, IStorageService))], AgentPluginService));
 class AbstractAgentPluginDiscovery extends Disposable {
-    constructor(_fileService, _pathService, _logService, _instantiationService) {
+    constructor(_fileService, _pathService, _logService, _workspaceContextService) {
         super();
         this._fileService = _fileService;
         this._pathService = _pathService;
         this._logService = _logService;
-        this._instantiationService = _instantiationService;
+        this._workspaceContextService = _workspaceContextService;
         this._pluginEntries = ( new Map());
         this._plugins = observableValue("discoveredAgentPlugins", []);
         this.plugins = this._plugins;
@@ -366,9 +120,9 @@ class AbstractAgentPluginDiscovery extends Disposable {
             const key = ( source.uri.toString());
             if (!( seenPluginUris.has(key))) {
                 seenPluginUris.add(key);
-                const adapter = await this._detectPluginFormatAdapter(source.uri);
+                const format = await detectPluginFormat(source.uri, this._fileService);
                 plugins.push(
-                    this._toPlugin(source.uri, adapter, source.fromMarketplace, () => source.remove())
+                    this._toPlugin(source.uri, format, source.fromMarketplace, () => source.remove())
                 );
             }
         }
@@ -376,16 +130,6 @@ class AbstractAgentPluginDiscovery extends Disposable {
         plugins.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
         return plugins;
     }
-    async _detectPluginFormatAdapter(pluginUri) {
-        if (await this._pathExists(joinPath(pluginUri, ".plugin", "plugin.json"))) {
-            return this._instantiationService.createInstance(OpenPluginFormatAdapter);
-        }
-        const isInClaudeDirectory = pluginUri.path.split("/").includes(".claude");
-        if (isInClaudeDirectory || (await this._pathExists(joinPath(pluginUri, ".claude-plugin", "plugin.json")))) {
-            return this._instantiationService.createInstance(ClaudePluginFormatAdapter);
-        }
-        return this._instantiationService.createInstance(CopilotPluginFormatAdapter);
-    }
     async _pathExists(resource) {
         try {
             await this._fileService.resolve(resource);
@@ -394,11 +138,11 @@ class AbstractAgentPluginDiscovery extends Disposable {
             return false;
         }
     }
-    _toPlugin(uri, adapter, fromMarketplace, removeCallback) {
+    _toPlugin(uri, format, fromMarketplace, removeCallback) {
         const key = ( uri.toString());
         const existing = this._pluginEntries.get(key);
         if (existing) {
-            if (existing.adapter.format !== adapter.format) {
+            if (existing.format.format !== format.format) {
                 existing.store.dispose();
                 this._pluginEntries.delete(key);
             } else {
@@ -453,30 +197,31 @@ class AbstractAgentPluginDiscovery extends Disposable {
             const result = ( promised.map((w, r) => w.read(r)?.data ?? Iterable.empty()));
             return result.recomputeInitiallyAndOnChange(store);
         };
-        const manifestUri = joinPath(uri, adapter.manifestPath);
-        const commands = observeComponent("commands", d => this._readMarkdownComponents(d));
-        const skills = observeComponent("skills", d => this._readSkills(uri, d));
-        const agents = observeComponent("agents", d => this._readMarkdownComponents(d));
+        const manifestUri = joinPath(uri, format.manifestPath);
+        const commands = observeComponent("commands", d => readMarkdownComponents(d, this._fileService));
+        const skills = observeComponent("skills", d => readSkills(uri, d, this._fileService));
+        const agents = observeComponent("agents", d => readMarkdownComponents(d, this._fileService));
         const instructions = observeComponent("rules", d => this._readRules(d));
         const hooks = observeComponent(
             "hooks",
-            paths => this._readHooksFromPaths(uri, paths, adapter),
+            paths => this._readHooksFromPaths(uri, paths, format),
             async section => {
                 const userHome = (await this._pathService.userHome()).fsPath;
-                return adapter.parseHooks(manifestUri, section, uri, userHome);
+                const workspaceRoot = resolveWorkspaceRoot(uri, this._workspaceContextService);
+                return toAgentPluginHooks(format.parseHooks(manifestUri, section, uri, workspaceRoot, userHome));
             },
-            adapter.hookConfigPath
+            format.hookConfigPath
         );
         const mcpServerDefinitions = observeComponent(
             "mcpServers",
-            paths => this._readMcpDefinitionsFromPaths(paths, uri.fsPath, adapter),
-            async section => this._parseMcpServerDefinitionMap(manifestUri, {
+            paths => this._readMcpDefinitionsFromPaths(paths, uri.fsPath, format),
+            async section => parseMcpServerDefinitionMap(manifestUri, {
                 mcpServers: section
-            }, uri.fsPath, adapter),
+            }, uri.fsPath, format),
             ".mcp.json"
         );
         const readManifest = async () => {
-            manifest.set(await this._readManifest(uri, adapter), undefined);
+            manifest.set(await this._readManifest(uri, format), undefined);
         };
         const manifestWatcher = this._fileService.createWatcher(manifestUri, {
             recursive: false,
@@ -501,24 +246,25 @@ class AbstractAgentPluginDiscovery extends Disposable {
         this._pluginEntries.set(key, {
             store,
             plugin,
-            adapter
+            format
         });
         return plugin;
     }
-    async _readManifest(pluginUri, adapter) {
-        const json = await this._readJsonFile(joinPath(pluginUri, adapter.manifestPath));
+    async _readManifest(pluginUri, format) {
+        const json = await this._readJsonFile(joinPath(pluginUri, format.manifestPath));
         if (json && typeof json === "object") {
             return json;
         }
         return undefined;
     }
-    async _readHooksFromPaths(pluginUri, paths, adapter) {
+    async _readHooksFromPaths(pluginUri, paths, format) {
         const userHome = (await this._pathService.userHome()).fsPath;
+        const workspaceRoot = resolveWorkspaceRoot(pluginUri, this._workspaceContextService);
         for (const hookPath of paths) {
             const json = await this._readJsonFile(hookPath);
             if (json) {
                 try {
-                    return adapter.parseHooks(hookPath, json, pluginUri, userHome);
+                    return toAgentPluginHooks(format.parseHooks(hookPath, json, pluginUri, workspaceRoot, userHome));
                 } catch (e) {
                     this._logService.info(`[AgentPluginDiscovery] Failed to parse hooks from ${( hookPath.toString())}:`, e);
                 }
@@ -526,11 +272,11 @@ class AbstractAgentPluginDiscovery extends Disposable {
         }
         return [];
     }
-    async _readMcpDefinitionsFromPaths(paths, pluginFsPath, adapter) {
+    async _readMcpDefinitionsFromPaths(paths, pluginFsPath, format) {
         const merged = ( new Map());
         for (const mcpPath of paths) {
             const json = await this._readJsonFile(mcpPath);
-            for (const def of this._parseMcpServerDefinitionMap(mcpPath, json, pluginFsPath, adapter)) {
+            for (const def of parseMcpServerDefinitionMap(mcpPath, json, pluginFsPath, format)) {
                 if (!( merged.has(def.name))) {
                     merged.set(def.name, def);
                 }
@@ -538,76 +284,6 @@ class AbstractAgentPluginDiscovery extends Disposable {
         }
         return [...( merged.values())].sort((a, b) => a.name.localeCompare(b.name));
     }
-    _parseMcpServerDefinitionMap(definitionURI, raw, pluginFsPath, adapter) {
-        const mcpServers = resolveMcpServersMap(raw);
-        if (!mcpServers) {
-            return [];
-        }
-        const definitions = [];
-        for (const [name, configValue] of Object.entries(mcpServers)) {
-            const configuration = this._normalizeMcpServerConfiguration(configValue);
-            if (!configuration) {
-                continue;
-            }
-            let def = {
-                name,
-                configuration,
-                uri: definitionURI
-            };
-            if (adapter.pluginRootToken && adapter.pluginRootEnvVar) {
-                def = interpolateMcpPluginRoot(def, pluginFsPath, adapter.pluginRootToken, adapter.pluginRootEnvVar);
-            }
-            def = convertBareEnvVarsToVsCodeSyntax(def);
-            definitions.push(def);
-        }
-        return definitions;
-    }
-    _normalizeMcpServerConfiguration(rawConfig) {
-        if (!rawConfig || typeof rawConfig !== "object") {
-            return undefined;
-        }
-        const candidate = rawConfig;
-        const type = typeof candidate["type"] === "string" ? candidate["type"] : undefined;
-        const command = typeof candidate["command"] === "string" ? candidate["command"] : undefined;
-        const url = typeof candidate["url"] === "string" ? candidate["url"] : undefined;
-        const args = Array.isArray(candidate["args"]) ? candidate["args"].filter(value => typeof value === "string") : undefined;
-        const env = candidate["env"] && typeof candidate["env"] === "object" ? Object.fromEntries(( Object.entries(candidate["env"]).filter(
-            ([, value]) => typeof value === "string" || typeof value === "number" || value === null
-        ).map(([key, value]) => [key, value]))) : undefined;
-        const envFile = typeof candidate["envFile"] === "string" ? candidate["envFile"] : undefined;
-        const cwd = typeof candidate["cwd"] === "string" ? candidate["cwd"] : undefined;
-        const headers = candidate["headers"] && typeof candidate["headers"] === "object" ? Object.fromEntries(( Object.entries(candidate["headers"]).filter(([, value]) => typeof value === "string").map(([key, value]) => [key, value]))) : undefined;
-        const dev = candidate["dev"] && typeof candidate["dev"] === "object" ? candidate["dev"] : undefined;
-        if (type === "ws") {
-            return undefined;
-        }
-        if (type === McpServerType.LOCAL || (!type && command)) {
-            if (!command) {
-                return undefined;
-            }
-            return {
-                type: McpServerType.LOCAL,
-                command,
-                args,
-                env,
-                envFile,
-                cwd,
-                dev
-            };
-        }
-        if (type === McpServerType.REMOTE || type === "sse" || (!type && url)) {
-            if (!url) {
-                return undefined;
-            }
-            return {
-                type: McpServerType.REMOTE,
-                url,
-                headers,
-                dev
-            };
-        }
-        return undefined;
-    }
     async _readJsonFile(uri) {
         try {
             const fileContents = await this._fileService.readFile(uri);
@@ -616,49 +292,6 @@ class AbstractAgentPluginDiscovery extends Disposable {
             return undefined;
         }
     }
-    async _readSkills(pluginRoot, dirs) {
-        const seen = ( new Set());
-        const skills = [];
-        const addSkill = (name, skillMd) => {
-            if (!( seen.has(name))) {
-                seen.add(name);
-                skills.push({
-                    uri: skillMd,
-                    name
-                });
-            }
-        };
-        for (const dir of dirs) {
-            const skillMd = URI.joinPath(dir, "SKILL.md");
-            if (await this._pathExists(skillMd)) {
-                addSkill(basename(dir), skillMd);
-                continue;
-            }
-            let stat;
-            try {
-                stat = await this._fileService.resolve(dir);
-            } catch {
-                continue;
-            }
-            if (!stat.isDirectory || !stat.children) {
-                continue;
-            }
-            for (const child of stat.children) {
-                const childSkillMd = URI.joinPath(child.resource, "SKILL.md");
-                if (await this._pathExists(childSkillMd)) {
-                    addSkill(basename(child.resource), childSkillMd);
-                }
-            }
-        }
-        if (skills.length === 0) {
-            const rootSkillMd = URI.joinPath(pluginRoot, "SKILL.md");
-            if (await this._pathExists(rootSkillMd)) {
-                addSkill(basename(pluginRoot), rootSkillMd);
-            }
-        }
-        skills.sort((a, b) => a.name.localeCompare(b.name));
-        return skills;
-    }
     async _readRules(dirs) {
         const seen = ( new Set());
         const items = [];
@@ -705,45 +338,6 @@ class AbstractAgentPluginDiscovery extends Disposable {
         items.sort((a, b) => a.name.localeCompare(b.name));
         return items;
     }
-    async _readMarkdownComponents(dirs) {
-        const seen = ( new Set());
-        const items = [];
-        const addItem = (name, uri) => {
-            if (!( seen.has(name))) {
-                seen.add(name);
-                items.push({
-                    uri,
-                    name
-                });
-            }
-        };
-        for (const dir of dirs) {
-            let stat;
-            try {
-                stat = await this._fileService.resolve(dir);
-            } catch {
-                continue;
-            }
-            if (stat.isFile && extname(dir).toLowerCase() === COMMAND_FILE_SUFFIX) {
-                addItem(basename(dir).slice(0, -COMMAND_FILE_SUFFIX.length), dir);
-                continue;
-            }
-            if (!stat.isDirectory || !stat.children) {
-                continue;
-            }
-            for (const child of stat.children) {
-                if (!child.isFile || extname(child.resource).toLowerCase() !== COMMAND_FILE_SUFFIX) {
-                    continue;
-                }
-                addItem(
-                    basename(child.resource).slice(0, -COMMAND_FILE_SUFFIX.length),
-                    child.resource
-                );
-            }
-        }
-        items.sort((a, b) => a.name.localeCompare(b.name));
-        return items;
-    }
     _disposePluginEntriesExcept(keep) {
         for (const [key, entry] of this._pluginEntries) {
             if (!( keep.has(key))) {
@@ -762,15 +356,13 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
         _configurationService,
         fileService,
         _pluginMarketplaceService,
-        _workspaceContextService,
+        workspaceContextService,
         pathService,
-        logService,
-        instantiationService
+        logService
     ) {
-        super(fileService, pathService, logService, instantiationService);
+        super(fileService, pathService, logService, workspaceContextService);
         this._configurationService = _configurationService;
         this._pluginMarketplaceService = _pluginMarketplaceService;
-        this._workspaceContextService = _workspaceContextService;
         this._pluginLocationsConfig = observableConfigValue(ChatConfiguration.PluginLocations, {}, _configurationService);
     }
     start(enablementModel) {
@@ -854,7 +446,7 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
         }
     }
 };
-ConfiguredAgentPluginDiscovery = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IPluginMarketplaceService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IPathService)), ( __param(5, ILogService)), ( __param(6, IInstantiationService))], ConfiguredAgentPluginDiscovery));
+ConfiguredAgentPluginDiscovery = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IPluginMarketplaceService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IPathService)), ( __param(5, ILogService))], ConfiguredAgentPluginDiscovery));
 let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
     constructor(
         _pluginMarketplaceService,
@@ -862,9 +454,9 @@ let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery exte
         fileService,
         pathService,
         logService,
-        instantiationService
+        workspaceContextService
     ) {
-        super(fileService, pathService, logService, instantiationService);
+        super(fileService, pathService, logService, workspaceContextService);
         this._pluginMarketplaceService = _pluginMarketplaceService;
         this._pluginRepositoryService = _pluginRepositoryService;
     }
@@ -915,11 +507,11 @@ let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery exte
         return sources;
     }
 };
-MarketplaceAgentPluginDiscovery = ( __decorate([( __param(0, IPluginMarketplaceService)), ( __param(1, IAgentPluginRepositoryService)), ( __param(2, IFileService)), ( __param(3, IPathService)), ( __param(4, ILogService)), ( __param(5, IInstantiationService))], MarketplaceAgentPluginDiscovery));
+MarketplaceAgentPluginDiscovery = ( __decorate([( __param(0, IPluginMarketplaceService)), ( __param(1, IAgentPluginRepositoryService)), ( __param(2, IFileService)), ( __param(3, IPathService)), ( __param(4, ILogService)), ( __param(5, IWorkspaceContextService))], MarketplaceAgentPluginDiscovery));
 const epPlugins = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatPlugins",
     jsonSchema: {
-        description: ( localize(7305, "Contributes agent plugins for chat.")),
+        description: ( localize(7423, "Contributes agent plugins for chat.")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -933,13 +525,13 @@ const epPlugins = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 path: {
                     description: ( localize(
-                        7306,
+                        7424,
                         "Path to the agent plugin root directory relative to the extension root."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(7307, "(Optional) A condition which must be true to enable this plugin.")),
+                    description: ( localize(7425, "(Optional) A condition which must be true to enable this plugin.")),
                     type: "string"
                 }
             }
@@ -954,9 +546,9 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
         fileService,
         pathService,
         logService,
-        instantiationService
+        workspaceContextService
     ) {
-        super(fileService, pathService, logService, instantiationService);
+        super(fileService, pathService, logService, workspaceContextService);
         this._commandService = _commandService;
         this._contextKeyService = _contextKeyService;
         this._dialogService = _dialogService;
@@ -976,7 +568,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7308,
+                            7426,
                             "Extension '{0}' cannot register a chatPlugins entry without a path.",
                             ext.description.identifier.value
                         )));
@@ -985,7 +577,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                     const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7309,
+                            7427,
                             "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.",
                             ext.description.identifier.value,
                             raw.path
@@ -997,7 +589,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                         whenExpr = ContextKeyExpr.deserialize(raw.when);
                         if (!whenExpr) {
                             ext.collector.error(( localize(
-                                7310,
+                                7428,
                                 "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.",
                                 ext.description.identifier.value,
                                 raw.path,
@@ -1068,7 +660,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                7311,
+                7429,
                 "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?",
                 extensionId
             ))
@@ -1078,7 +670,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
         }
     }
 };
-ExtensionAgentPluginDiscovery = ( __decorate([( __param(0, ICommandService)), ( __param(1, IContextKeyService)), ( __param(2, IDialogService)), ( __param(3, IFileService)), ( __param(4, IPathService)), ( __param(5, ILogService)), ( __param(6, IInstantiationService))], ExtensionAgentPluginDiscovery));
+ExtensionAgentPluginDiscovery = ( __decorate([( __param(0, ICommandService)), ( __param(1, IContextKeyService)), ( __param(2, IDialogService)), ( __param(3, IFileService)), ( __param(4, IPathService)), ( __param(5, ILogService)), ( __param(6, IWorkspaceContextService))], ExtensionAgentPluginDiscovery));
 function extensionPluginKey(extensionId, path) {
     return `${extensionId.value}/${path}`;
 }
@@ -1101,7 +693,7 @@ class ChatPluginsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7312, "Path")), ( localize(7313, "When"))];
+        const headers = [( localize(7430, "Path")), ( localize(7431, "When"))];
         const rows = ( contributions.map(d => [d.path, d.when ?? "-"]));
         return {
             data: {
@@ -1114,11 +706,11 @@ class ChatPluginsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatPlugins",
-    label: ( localize(7314, "Chat Plugins")),
+    label: ( localize(7432, "Chat Plugins")),
     access: {
         canToggle: false
     },
     renderer: ( new SyncDescriptor(ChatPluginsDataRenderer))
 });
 
-export { AbstractAgentPluginDiscovery, AgentPluginService, ConfiguredAgentPluginDiscovery, ExtensionAgentPluginDiscovery, MarketplaceAgentPluginDiscovery, convertBareEnvVarsToVsCodeSyntax, resolveMcpServersMap, shellQuotePluginRootInCommand };
+export { AbstractAgentPluginDiscovery, AgentPluginService, ConfiguredAgentPluginDiscovery, ExtensionAgentPluginDiscovery, MarketplaceAgentPluginDiscovery };