@f5-sales-demo/xcsh 21.50.0 → 22.0.1

package/README.md

@@ -10,9 +10,6 @@ For installation, setup, provider configuration, model roles, slash commands, an
 Package-specific references:
 
 - [CHANGELOG](./CHANGELOG.md)
-- [MCP configuration guide](../../docs/mcp-config.md)
-- [MCP runtime lifecycle](../../docs/mcp-runtime-lifecycle.md)
-- [MCP server/tool authoring](../../docs/mcp-server-tool-authoring.md)
 - [Remote-control implementation](./src/remote-control/IMPLEMENTATION.md)
 - [Remote-control acceptance](./src/remote-control/ACCEPTANCE.md)
 - [CONTRIBUTING](../../CONTRIBUTING.md)

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "21.50.0",
+	"version": "22.0.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -67,13 +67,13 @@
 	},
 	"dependencies": {
 		"@agentclientprotocol/sdk": "1.4.0",
-		"@f5-sales-demo/pi-agent-core": "21.50.0",
-		"@f5-sales-demo/pi-ai": "21.50.0",
-		"@f5-sales-demo/pi-natives": "21.50.0",
-		"@f5-sales-demo/pi-resource-management": "21.50.0",
-		"@f5-sales-demo/pi-tui": "21.50.0",
-		"@f5-sales-demo/pi-utils": "21.50.0",
-		"@f5-sales-demo/xcsh-stats": "21.50.0",
+		"@f5-sales-demo/pi-agent-core": "22.0.1",
+		"@f5-sales-demo/pi-ai": "22.0.1",
+		"@f5-sales-demo/pi-natives": "22.0.1",
+		"@f5-sales-demo/pi-resource-management": "22.0.1",
+		"@f5-sales-demo/pi-tui": "22.0.1",
+		"@f5-sales-demo/pi-utils": "22.0.1",
+		"@f5-sales-demo/xcsh-stats": "22.0.1",
 		"@mozilla/readability": "^0.6",
 		"@resvg/resvg-wasm": "2.6.2",
 		"@sinclair/typebox": "0.34.52",

package/src/browser/headless-bridge.ts

@@ -180,7 +180,6 @@ export async function startHeadlessChatBridge(
 					hasUI: false,
 					toolNames: [...new Set([...BROWSER_TOOL_NAMES, ...EXTENSION_AGENT_TOOL_NAMES])],
 					customTools: createExtensionBridgeTools(bridge),
-					enableMCP: false,
 					enableLsp: false,
 					disableExtensionDiscovery: true,
 					...(process.env.XCSH_BENCH_EXTENSION
@@ -201,7 +200,6 @@ export async function startHeadlessChatBridge(
 				sessionManager: SessionManager.inMemory(cwd),
 				toolNames: [...OFFICE_TOOL_NAMES],
 				customTools: [],
-				enableMCP: false,
 				enableLsp: false,
 				disableExtensionDiscovery: true,
 				bundledExtensions: ["sandbox-guard"],

package/src/browser/host-profiles.ts

@@ -102,7 +102,7 @@ SAFETY — NEVER DO THESE:
 const OFFICE_NATIVE_TOOLS_NOTE = `
 NATIVE TOOLS: Beyond the document host tools, you have xcsh's full local toolset — \`bash\` (run shell commands, including CLIs like \`az\`, \`gh\`, \`terraform\`, \`git\` when installed and authenticated), file tools (\`read\`/\`write\`/\`edit\`), and \`grep\` — plus any skills available in this workspace. Reach for them when the task genuinely needs them (pull live data with a CLI, read a local file the user points you at). Prefer the document host tools for document work. Your file tools and shell are confined to the folder xcsh was launched from.
 
-This pane runs NO MCP servers and exposes NO plugin-provided TOOLS — the tools listed above (plus the document host tools) are everything you can call. To use a cloud or SCM CLI, invoke it directly with \`bash\` (e.g. \`az account show\`, \`gh repo view\`) rather than hunting for an MCP server that would provide it. The user sees your narration, so don't describe a missing MCP tool as a failure — just use the CLI.
+This pane exposes no plugin-provided tools — the tools listed above (plus the document host tools) are everything you can call. To use a cloud or SCM CLI, invoke it directly with \`bash\` (e.g. \`az account show\`, \`gh repo view\`).
 
 Plugin RESOURCES are a different thing and they ARE available to you: an installed plugin's skills, slash commands, schemas, templates and engines. Read them through \`xcsh://plugin/<name>\` (summary), \`xcsh://plugin/<name>/<key>\` (a declared resource such as \`schema\`), or \`xcsh://plugin/<name>/file/<path>\` (any file in the plugin), and run a plugin's engine with \`bash\` (e.g. \`bun xcsh://plugin/<name>/file/engine/cli.ts <command>\`). When a plugin declares a deterministic engine, use it — never recompute by hand what the engine computes.
 

package/src/capability/extension.ts

@@ -1,10 +1,9 @@
 /**
  * Extensions Capability
  *
- * Gemini-style extensions that provide MCP servers, tools, and context.
+ * Gemini-style extensions that provide tools and context.
  */
 import { defineCapability } from ".";
-import type { MCPServer } from "./mcp";
 import type { SourceMeta } from "./types";
 
 /**
@@ -13,7 +12,6 @@ import type { SourceMeta } from "./types";
 export interface ExtensionManifest {
 	name?: string;
 	description?: string;
-	mcpServers?: Record<string, Omit<MCPServer, "name" | "_source">>;
 	tools?: unknown[];
 	context?: unknown;
 }
@@ -37,7 +35,7 @@ export interface Extension {
 export const extensionCapability = defineCapability<Extension>({
 	id: "extensions",
 	displayName: "Extensions",
-	description: "Gemini-style extensions providing MCP servers, tools, and context",
+	description: "Gemini-style extensions providing tools and context",
 	key: ext => ext.name,
 	validate: ext => {
 		if (!ext.name) return "Missing extension name";

package/src/capability/types.ts

@@ -2,8 +2,8 @@
  * Core types for the capability-based config discovery system.
  *
  * This architecture inverts control: instead of callers knowing about paths like
- * `.xcsh`, `.codex`, `.gemini`, they simply ask for `load("mcps")` and get back
- * a unified array of MCP servers.
+ * `.xcsh`, `.codex`, `.gemini`, they simply ask for a capability and get back
+ * a unified array of items.
  */
 
 /**
@@ -33,7 +33,7 @@ export interface LoadResult<T> {
  * A provider that can load items for a capability.
  */
 export interface Provider<T> {
-	/** Unique provider ID (e.g., "xcsh", "mcp-json", "agents-md") */
+	/** Unique provider ID (e.g., "xcsh", "codex", "agents-md") */
 	id: string;
 
 	/** Human-readable name for UI display (e.g., "xcsh", "OpenAI Codex") */
@@ -47,7 +47,7 @@ export interface Provider<T> {
 	 * Suggested ranges:
 	 *   100+ : Primary providers (xcsh, pi)
 	 *   50-99: Tool-specific providers (claude, codex, gemini)
-	 *   1-49 : Shared standards (mcp-json, agents-md)
+	 *   1-49 : Shared standards (agents-md)
 	 */
 	priority: number;
 
@@ -110,10 +110,10 @@ export interface CapabilityResult<T> {
  * Definition of a capability.
  */
 export interface Capability<T> {
-	/** Capability ID (e.g., "mcps", "skills", "context-files") */
+	/** Capability ID (e.g., "skills", "context-files") */
 	id: string;
 
-	/** Human-readable name for UI display (e.g., "MCP Servers", "Skills") */
+	/** Human-readable name for UI display (e.g., "Skills", "Context Files") */
 	displayName: string;
 
 	/** Short description for settings/status UI */

package/src/cli/args.ts

@@ -3,7 +3,6 @@
  */
 import { type Effort, THINKING_EFFORTS } from "@f5-sales-demo/pi-ai";
 import { APP_NAME, CONFIG_DIR_NAME, logger } from "@f5-sales-demo/pi-utils";
-import { CliUsageError } from "@f5-sales-demo/pi-utils/cli";
 import chalk from "chalk";
 import { parseEffort } from "../thinking";
 import {
@@ -50,8 +49,6 @@ export interface Args {
 	models?: string[];
 	tools?: string[];
 	noTools?: boolean;
-	mcp?: boolean;
-	noMcp?: boolean;
 	noLsp?: boolean;
 	noPty?: boolean;
 	hooks?: string[];
@@ -161,12 +158,6 @@ const APPLY: Record<LaunchFlagName, (result: Args, value: string | true) => void
 	"no-tools": r => {
 		r.noTools = true;
 	},
-	mcp: r => {
-		r.mcp = true;
-	},
-	"no-mcp": r => {
-		r.noMcp = true;
-	},
 	"no-lsp": r => {
 		r.noLsp = true;
 	},
@@ -404,8 +395,6 @@ export function parseArgs(args: string[], extensionFlags?: ExtensionFlagRegistry
 		result.unrecognizedFlags.push({ token, name: name ?? token.replace(/^-+/, "") });
 	}
 
-	if (result.mcp && result.noMcp) throw new CliUsageError("--mcp cannot be combined with --no-mcp");
-	if (result.mcp && result.noTools) throw new CliUsageError("--mcp cannot be combined with --no-tools");
 	return result;
 }
 

package/src/cli/flag-spec.ts

@@ -79,8 +79,6 @@ export const LAUNCH_FLAGS = defineFlags({
 	"provider-session-id": { arity: "value", description: "Resume a provider-side session", hidden: true },
 	models: { arity: "value", description: "Comma-separated model patterns for Ctrl+P cycling" },
 	"no-tools": { arity: "boolean", description: "Disable all built-in tools" },
-	mcp: { arity: "boolean", description: "Enable MCP servers for this run" },
-	"no-mcp": { arity: "boolean", description: "Disable MCP server discovery and tools" },
 	"no-lsp": { arity: "boolean", description: "Disable LSP tools, formatting, and diagnostics" },
 	"no-pty": { arity: "boolean", description: "Disable PTY-based interactive bash execution" },
 	tools: { arity: "value", description: "Comma-separated list of tools to enable (default: all)" },

package/src/commit/agentic/agent.ts

@@ -63,7 +63,6 @@ export async function runCommitAgentSession(input: CommitAgentInput): Promise<Co
 		systemPrompt,
 		customTools: tools,
 		enableLsp: false,
-		enableMCP: false,
 		hasUI: false,
 		spawns,
 		toolNames: ["__none__"],

package/src/config/settings-schema.ts

@@ -267,7 +267,6 @@ export const SETTINGS_SCHEMA = {
 			"cline",
 			"github",
 			"vscode",
-			"mcp-json",
 			"ssh-json",
 		] as string[],
 	},
@@ -1774,60 +1773,6 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
-	// MCP
-	"mcp.enabled": {
-		type: "boolean",
-		default: false,
-		scope: "user",
-		ui: { tab: "tools", label: "MCP", description: "Enable MCP servers for new sessions" },
-	},
-
-	"mcp.enableProjectConfig": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "MCP Project Config", description: "Load .mcp.json/mcp.json from project root" },
-	},
-
-	"mcp.discoveryMode": {
-		type: "boolean",
-		default: false,
-		ui: {
-			tab: "tools",
-			label: "MCP Tool Discovery",
-			description: "Hide MCP tools by default and expose them through a tool discovery tool",
-		},
-	},
-
-	"mcp.discoveryDefaultServers": {
-		type: "array",
-		default: [] as string[],
-		ui: {
-			tab: "tools",
-			label: "MCP Discovery Default Servers",
-			description: "Keep MCP tools from these servers visible while discovery mode hides other MCP tools",
-		},
-	},
-
-	"mcp.notifications": {
-		type: "boolean",
-		default: false,
-		ui: {
-			tab: "tools",
-			label: "MCP Update Injection",
-			description: "Inject MCP resource updates into the agent conversation",
-		},
-	},
-
-	"mcp.notificationDebounceMs": {
-		type: "number",
-		default: 500,
-		ui: {
-			tab: "tools",
-			label: "MCP Notification Debounce",
-			description: "Debounce window for MCP resource update notifications before injecting into conversation",
-		},
-	},
-
 	// ────────────────────────────────────────────────────────────────────────
 	// Tasks
 	// ────────────────────────────────────────────────────────────────────────

package/src/cursor.ts

@@ -8,8 +8,8 @@ import type {
 	AgentToolUpdateCallback,
 } from "@f5-sales-demo/pi-agent-core";
 import type {
-	CursorMcpCall,
 	CursorShellStreamCallbacks,
+	CursorToolCall,
 	CursorExecHandlers as ICursorExecHandlers,
 	ToolResultMessage,
 } from "@f5-sales-demo/pi-ai";
@@ -145,7 +145,7 @@ function decodeToolCallId(toolCallId?: string): string {
 	return toolCallId && toolCallId.length > 0 ? toolCallId : randomUUID();
 }
 
-function decodeMcpArgs(rawArgs: Record<string, Uint8Array>): Record<string, unknown> {
+function decodeGenericToolArgs(rawArgs: Record<string, Uint8Array>): Record<string, unknown> {
 	const decoded: Record<string, unknown> = {};
 	for (const [key, value] of Object.entries(rawArgs)) {
 		const text = new TextDecoder().decode(value);
@@ -158,11 +158,6 @@ function decodeMcpArgs(rawArgs: Record<string, Uint8Array>): Record<string, unkn
 	return decoded;
 }
 
-function formatMcpToolErrorMessage(toolName: string, availableTools: string[]): string {
-	const list = availableTools.length > 0 ? availableTools.join(", ") : "none";
-	return `MCP tool "${toolName}" not found. Available tools: ${list}`;
-}
-
 export class CursorExecHandlers implements ICursorExecHandlers {
 	constructor(private options: CursorExecBridgeOptions) {}
 
@@ -298,26 +293,10 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 		return toolResultMessage;
 	}
 
-	async mcp(call: CursorMcpCall) {
+	async tool(call: CursorToolCall) {
 		const toolName = call.toolName || call.name;
 		const toolCallId = decodeToolCallId(call.toolCallId);
-		const tool = this.options.tools.get(toolName);
-		if (!tool) {
-			const availableTools = Array.from(this.options.tools.keys()).filter(name => name.startsWith("mcp_"));
-			const message = formatMcpToolErrorMessage(toolName, availableTools);
-			const toolResult: ToolResultMessage = {
-				role: "toolResult",
-				toolCallId,
-				toolName,
-				content: [{ type: "text", text: message }],
-				isError: true,
-				timestamp: Date.now(),
-			};
-			return toolResult;
-		}
-
-		const args = Object.keys(call.args ?? {}).length > 0 ? call.args : decodeMcpArgs(call.rawArgs ?? {});
-		const toolResultMessage = await executeTool(this.options, toolName, toolCallId, args);
-		return toolResultMessage;
+		const args = Object.keys(call.args).length > 0 ? call.args : decodeGenericToolArgs(call.rawArgs);
+		return executeTool(this.options, toolName, toolCallId, args);
 	}
 }

package/src/discovery/builtin.ts

@@ -4,7 +4,7 @@
  * Primary provider for OMP native configs. Supports all capabilities.
  */
 import * as path from "node:path";
-import { logger, parseFrontmatter, tryParseJson } from "@f5-sales-demo/pi-utils";
+import { parseFrontmatter, tryParseJson } from "@f5-sales-demo/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
@@ -12,7 +12,6 @@ import { type ExtensionModule, extensionModuleCapability } from "../capability/e
 import { readDirEntries, readFile } from "../capability/fs";
 import { type Hook, hookCapability } from "../capability/hook";
 import { type Instruction, instructionCapability } from "../capability/instruction";
-import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Prompt, promptCapability } from "../capability/prompt";
 import { type Rule, ruleCapability } from "../capability/rule";
 import { type Settings, settingsCapability } from "../capability/settings";
@@ -26,7 +25,6 @@ import {
 	buildRuleFromMarkdown,
 	createSourceMeta,
 	discoverExtensionModulePaths,
-	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
 	SOURCE_PATHS,
@@ -93,133 +91,6 @@ async function findNearestProjectConfigDir(
 	return null;
 }
 
-// MCP
-async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	const parseMcpServers = (content: string, path: string, level: "user" | "project"): MCPServer[] => {
-		const result: MCPServer[] = [];
-		const data = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
-		if (!data?.mcpServers) return result;
-
-		const expanded = expandEnvVarsDeep(data.mcpServers);
-		for (const [serverName, config] of Object.entries(expanded)) {
-			const serverConfig = config as Record<string, unknown>;
-
-			// Validate enabled: coerce string "true"/"false", warn on other types
-			let enabled: boolean | undefined;
-			if (serverConfig.enabled === undefined || serverConfig.enabled === null) {
-				enabled = undefined;
-			} else if (typeof serverConfig.enabled === "boolean") {
-				enabled = serverConfig.enabled;
-			} else if (typeof serverConfig.enabled === "string") {
-				const lower = serverConfig.enabled.toLowerCase();
-				if (lower === "false" || lower === "0") enabled = false;
-				else if (lower === "true" || lower === "1") enabled = true;
-				else {
-					logger.warn(`MCP server "${serverName}": invalid enabled value "${serverConfig.enabled}", ignoring`);
-					enabled = undefined;
-				}
-			} else {
-				logger.warn(`MCP server "${serverName}": invalid enabled type ${typeof serverConfig.enabled}, ignoring`);
-				enabled = undefined;
-			}
-
-			// Validate timeout: coerce numeric strings, warn on invalid
-			let timeout: number | undefined;
-			if (serverConfig.timeout === undefined || serverConfig.timeout === null) {
-				timeout = undefined;
-			} else if (typeof serverConfig.timeout === "number") {
-				if (Number.isFinite(serverConfig.timeout) && serverConfig.timeout > 0) {
-					timeout = serverConfig.timeout;
-				} else {
-					logger.warn(`MCP server "${serverName}": invalid timeout ${serverConfig.timeout}, ignoring`);
-					timeout = undefined;
-				}
-			} else if (typeof serverConfig.timeout === "string") {
-				const parsed = Number(serverConfig.timeout);
-				if (Number.isFinite(parsed) && parsed > 0) {
-					timeout = parsed;
-				} else {
-					logger.warn(`MCP server "${serverName}": invalid timeout "${serverConfig.timeout}", ignoring`);
-					timeout = undefined;
-				}
-			} else {
-				logger.warn(`MCP server "${serverName}": invalid timeout type ${typeof serverConfig.timeout}, ignoring`);
-				timeout = undefined;
-			}
-
-			result.push({
-				name: serverName,
-				enabled,
-				timeout,
-				command: serverConfig.command as string | undefined,
-				args: serverConfig.args as string[] | undefined,
-				env: serverConfig.env as Record<string, string> | undefined,
-				cwd: serverConfig.cwd as string | undefined,
-				url: serverConfig.url as string | undefined,
-				headers: serverConfig.headers as Record<string, string> | undefined,
-				auth: serverConfig.auth as
-					| {
-							type: "oauth" | "apikey";
-							credentialId?: string;
-							tokenUrl?: string;
-							clientId?: string;
-							clientSecret?: string;
-					  }
-					| undefined,
-				oauth: serverConfig.oauth as
-					| {
-							clientId?: string;
-							clientSecret?: string;
-							redirectUri?: string;
-							callbackPort?: number;
-							callbackPath?: string;
-					  }
-					| undefined,
-				transport: serverConfig.type as "stdio" | "sse" | "http" | undefined,
-				_source: createSourceMeta(PROVIDER_ID, path, level),
-			});
-		}
-		return result;
-	};
-
-	const paths = [
-		{ path: path.join(ctx.cwd, PATHS.projectDir, "mcp.json"), level: "project" as const },
-		{ path: path.join(ctx.cwd, PATHS.projectDir, ".mcp.json"), level: "project" as const },
-		{ path: path.join(ctx.home, PATHS.userAgent, "mcp.json"), level: "user" as const },
-		{ path: path.join(ctx.home, PATHS.userAgent, ".mcp.json"), level: "user" as const },
-	];
-
-	const contents = await Promise.allSettled(
-		paths.map(async p => {
-			const content = await readFile(p.path);
-			if (content) {
-				return { path: p.path, content, level: p.level };
-			}
-			return null;
-		}),
-	);
-
-	for (const result of contents) {
-		if (result.status === "fulfilled" && result.value) {
-			const { path, content, level } = result.value;
-			items.push(...parseMcpServers(content, path, level));
-		}
-	}
-
-	return { items, warnings };
-}
-
-registerProvider<MCPServer>(mcpCapability.id, {
-	id: PROVIDER_ID,
-	displayName: SOURCE_LABEL,
-	description: DESCRIPTION,
-	priority: PRIORITY,
-	load: loadMCPServers,
-});
-
 // System Prompt (SYSTEM.md)
 async function loadSystemPrompt(ctx: LoadContext): Promise<LoadResult<SystemPrompt>> {
 	const items: SystemPrompt[] = [];

package/src/discovery/claude-plugins.ts

@@ -5,25 +5,13 @@
  * Priority: 70 (below claude.ts at 80, so user overrides in .xcsh/ take precedence)
  */
 import * as path from "node:path";
-import { logger } from "@f5-sales-demo/pi-utils";
 import { registerProvider } from "../capability";
-import { readFile } from "../capability/fs";
 import { type Hook, hookCapability } from "../capability/hook";
-import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Skill, skillCapability } from "../capability/skill";
 import { type SlashCommand, slashCommandCapability } from "../capability/slash-command";
 import { type CustomTool, toolCapability } from "../capability/tool";
 import type { LoadContext, LoadResult } from "../capability/types";
-import {
-	createSourceMeta,
-	listXcshPluginRoots,
-	loadFilesFromDir,
-	scanSkillsFromDir,
-	scopeToLevel,
-	type XcshPluginRoot,
-} from "./helpers";
-
-import { substitutePluginRoot } from "./substitute-plugin-root";
+import { listXcshPluginRoots, loadFilesFromDir, scanSkillsFromDir, scopeToLevel, type XcshPluginRoot } from "./helpers";
 
 const PROVIDER_ID = "xcsh-plugins";
 const SOURCE_LABEL = "xcsh Marketplace";
@@ -186,73 +174,6 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 	return { items, warnings };
 }
 
-// =============================================================================
-// MCP Servers
-// =============================================================================
-
-async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	const { roots, warnings: rootWarnings } = await listXcshPluginRoots(ctx.home, ctx.cwd);
-	warnings.push(...rootWarnings);
-
-	for (const root of roots) {
-		const mcpPath = path.join(root.path, ".mcp.json");
-		const raw = await readFile(mcpPath);
-		if (raw === null) continue; // file absent — skip silently
-
-		let parsed: unknown;
-		try {
-			parsed = JSON.parse(raw);
-		} catch {
-			warnings.push(`[claude-plugins] Invalid JSON in ${mcpPath}`);
-			logger.warn(`[claude-plugins] Invalid JSON in ${mcpPath}`);
-			continue;
-		}
-
-		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) continue;
-		const config = parsed as { mcpServers?: Record<string, unknown> };
-		if (!config.mcpServers || typeof config.mcpServers !== "object") continue;
-
-		for (const [serverName, serverCfg] of Object.entries(config.mcpServers)) {
-			if (!serverCfg || typeof serverCfg !== "object" || Array.isArray(serverCfg)) continue;
-			const raw = serverCfg as {
-				enabled?: boolean;
-				timeout?: number;
-				command?: string;
-				args?: string[];
-				env?: Record<string, string>;
-				cwd?: string;
-				url?: string;
-				headers?: Record<string, string>;
-				auth?: MCPServer["auth"];
-				oauth?: MCPServer["oauth"];
-				type?: string;
-			};
-			const namespacedName = root.plugin ? `${root.plugin}:${serverName}` : serverName;
-			const server: MCPServer = {
-				name: namespacedName,
-				...(raw.enabled !== undefined && { enabled: raw.enabled }),
-				...(raw.timeout !== undefined && { timeout: raw.timeout }),
-				...(raw.command !== undefined && { command: substitutePluginRoot(raw.command, root.path) }),
-				...(raw.args !== undefined && { args: substitutePluginRoot(raw.args, root.path) }),
-				...(raw.env !== undefined && { env: substitutePluginRoot(raw.env, root.path) }),
-				...(raw.cwd !== undefined && { cwd: substitutePluginRoot(raw.cwd, root.path) }),
-				...(raw.url !== undefined && { url: raw.url }),
-				...(raw.headers !== undefined && { headers: raw.headers }),
-				...(raw.auth !== undefined && { auth: raw.auth }),
-				...(raw.oauth !== undefined && { oauth: raw.oauth }),
-				...(raw.type !== undefined && { transport: raw.type as MCPServer["transport"] }),
-				_source: createSourceMeta(PROVIDER_ID, mcpPath, scopeToLevel(root.scope)),
-			};
-			items.push(server);
-		}
-	}
-
-	return { items, warnings };
-}
-
 // =============================================================================
 // Provider Registration
 // =============================================================================
@@ -288,11 +209,3 @@ registerProvider<CustomTool>(toolCapability.id, {
 	priority: PRIORITY,
 	load: loadTools,
 });
-
-registerProvider<MCPServer>(mcpCapability.id, {
-	id: PROVIDER_ID,
-	displayName: SOURCE_LABEL,
-	description: "Load MCP servers from marketplace plugin .mcp.json files",
-	priority: PRIORITY,
-	load: loadMCPServers,
-});