@f5xc-salesdemos/xcsh 18.91.2 → 18.91.4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "18.91.2",
+	"version": "18.91.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -50,12 +50,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "18.91.2",
-		"@f5xc-salesdemos/pi-agent-core": "18.91.2",
-		"@f5xc-salesdemos/pi-ai": "18.91.2",
-		"@f5xc-salesdemos/pi-natives": "18.91.2",
-		"@f5xc-salesdemos/pi-tui": "18.91.2",
-		"@f5xc-salesdemos/pi-utils": "18.91.2",
+		"@f5xc-salesdemos/xcsh-stats": "18.91.4",
+		"@f5xc-salesdemos/pi-agent-core": "18.91.4",
+		"@f5xc-salesdemos/pi-ai": "18.91.4",
+		"@f5xc-salesdemos/pi-natives": "18.91.4",
+		"@f5xc-salesdemos/pi-tui": "18.91.4",
+		"@f5xc-salesdemos/pi-utils": "18.91.4",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/scripts/generate-branding-index.ts

@@ -75,4 +75,5 @@ function generateTypeScript(config: BrandingConfig): string {
 const config = await loadBrandingYaml();
 const output = generateTypeScript(config);
 await fs.writeFile(OUTPUT_FILE, output, "utf-8");
+await Bun.$`bunx biome format --write ${OUTPUT_FILE}`.quiet();
 console.log(`Generated ${OUTPUT_FILE}`);

package/scripts/generate-terraform-index.ts

@@ -53,4 +53,5 @@ function generateTypeScript(data: unknown): string {
 const data = await loadTerraformIndex();
 const output = generateTypeScript(data);
 await fs.writeFile(OUTPUT_FILE, output, "utf-8");
+await Bun.$`bunx biome format --write ${OUTPUT_FILE}`.quiet();
 console.log(`Generated ${OUTPUT_FILE}`);

package/src/capability/context-file.ts

@@ -31,7 +31,7 @@ export const contextFileCapability = defineCapability<ContextFile>({
 	// Deduplicate by scope: one user-level file, and one project-level file per directory depth.
 	// Within each depth level, higher-priority providers shadow lower-priority ones.
 	// This supports monorepo hierarchies where AGENTS.md exists at multiple ancestor levels.
-	// Clamp depth >= 0: files inside config subdirectories of an ancestor (e.g. .claude/, .github/)
+	// Clamp depth >= 0: files inside config subdirectories of an ancestor (e.g. .xcsh/, .github/)
 	// are same-scope as the ancestor itself.
 	key: file => (file.level === "user" ? "user" : `project:${Math.max(0, file.depth ?? 0)}`),
 	toExtensionId: file => `context-file:${file.level}:${path.basename(file.path)}`,

package/src/capability/index.ts

@@ -208,11 +208,13 @@ async function loadImpl<T>(
  * Filter providers based on options and disabled state.
  */
 function filterProviders<T>(capability: Capability<T>, options: LoadOptions): Provider<T>[] {
-	let providers = (capability.providers as Provider<T>[]).filter(p => !disabledProviders.has(p.id));
+	let providers = capability.providers as Provider<T>[];
 
 	if (options.providers) {
 		const allowed = new Set(options.providers);
 		providers = providers.filter(p => allowed.has(p.id));
+	} else {
+		providers = providers.filter(p => !disabledProviders.has(p.id));
 	}
 	if (options.excludeProviders) {
 		const excluded = new Set(options.excludeProviders);

package/src/capability/types.ts

@@ -2,7 +2,7 @@
  * Core types for the capability-based config discovery system.
  *
  * This architecture inverts control: instead of callers knowing about paths like
- * `.claude`, `.codex`, `.gemini`, they simply ask for `load("mcps")` and get back
+ * `.xcsh`, `.codex`, `.gemini`, they simply ask for `load("mcps")` and get back
  * a unified array of MCP servers.
  */
 
@@ -37,7 +37,7 @@ export interface Provider<T> {
 	/** Human-readable name for UI display (e.g., "Claude Code", "OpenAI Codex") */
 	displayName: string;
 
-	/** Short description for settings UI (e.g., "Load config from ~/.claude and .claude/") */
+	/** Short description for settings UI (e.g., "Load config from ~/.xcsh/ and .xcsh/") */
 	description: string;
 
 	/**

package/src/config/settings-schema.ts

@@ -224,7 +224,25 @@ export const SETTINGS_SCHEMA = {
 
 	enabledModels: { type: "array", default: EMPTY_STRING_ARRAY },
 
-	disabledProviders: { type: "array", default: EMPTY_STRING_ARRAY },
+	disabledProviders: {
+		type: "array",
+		default: [
+			"claude",
+			"claude-plugins",
+			"codex",
+			"agents",
+			"agents-md",
+			"gemini",
+			"opencode",
+			"cursor",
+			"windsurf",
+			"cline",
+			"github",
+			"vscode",
+			"mcp-json",
+			"ssh-json",
+		] as string[],
+	},
 
 	disabledExtensions: { type: "array", default: EMPTY_STRING_ARRAY },
 
@@ -1627,7 +1645,7 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "tasks",
 			label: "Claude User Skills",
-			description: "Load skills from ~/.claude/skills/",
+			description: "Load skills from ~/.xcsh/agent/skills/ (legacy Claude Code compatibility)",
 		},
 	},
 
@@ -1637,7 +1655,7 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "tasks",
 			label: "Claude Project Skills",
-			description: "Load skills from .claude/skills/",
+			description: "Load skills from .xcsh/skills/ (legacy Claude Code compatibility)",
 		},
 	},
 
@@ -1647,7 +1665,7 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "tasks",
 			label: "Claude Marketplace Skills",
-			description: "Load skills from Claude Code marketplace plugins (~/.claude/plugins/cache/)",
+			description: "Load skills from marketplace plugins (~/.xcsh/plugins/cache/)",
 		},
 	},
 
@@ -1681,13 +1699,13 @@ export const SETTINGS_SCHEMA = {
 	"commands.enableClaudeUser": {
 		type: "boolean",
 		default: true,
-		ui: { tab: "tasks", label: "Claude User Commands", description: "Load commands from ~/.claude/commands/" },
+		ui: { tab: "tasks", label: "Claude User Commands", description: "Load commands from ~/.xcsh/agent/commands/" },
 	},
 
 	"commands.enableClaudeProject": {
 		type: "boolean",
 		default: true,
-		ui: { tab: "tasks", label: "Claude Project Commands", description: "Load commands from .claude/commands/" },
+		ui: { tab: "tasks", label: "Claude Project Commands", description: "Load commands from .xcsh/commands/" },
 	},
 
 	// ────────────────────────────────────────────────────────────────────────

package/src/config/settings.ts

@@ -116,7 +116,7 @@ export class Settings {
 
 	/** Global settings from config.yml */
 	#global: RawSettings = {};
-	/** Project settings from .claude/settings.yml etc */
+	/** Project settings from .xcsh/settings.yml etc */
 	#project: RawSettings = {};
 	/** Runtime overrides (not persisted) */
 	#overrides: RawSettings = {};

package/src/config.ts

@@ -17,7 +17,6 @@ import { expandTilde } from "./tools/path-utils";
 
 const priorityList = [
 	{ dir: CONFIG_DIR_NAME, globalAgentDir: getConfigAgentDirName },
-	{ dir: ".claude" },
 	{ dir: ".codex" },
 	{ dir: ".gemini" },
 ];
@@ -254,8 +253,8 @@ export class ConfigFile<T> implements IConfigFile<T> {
 
 /**
  * Config directory bases in priority order (highest first).
- * User-level: ~/.xcsh/agent, ~/.claude, ~/.codex, ~/.gemini
- * Project-level: .xcsh, .claude, .codex, .gemini
+ * User-level: ~/.xcsh/agent, ~/.codex, ~/.gemini
+ * Project-level: .xcsh, .codex, .gemini
  */
 const USER_CONFIG_BASES = priorityList.map(({ dir, globalAgentDir }) => ({
 	base: () => path.join(os.homedir(), globalAgentDir ? globalAgentDir() : dir),
@@ -269,7 +268,7 @@ const PROJECT_CONFIG_BASES = priorityList.map(({ dir }) => ({
 
 export interface ConfigDirEntry {
 	path: string;
-	source: string; // e.g., ".xcsh", ".claude"
+	source: string; // e.g., ".xcsh", ".codex"
 	level: "user" | "project";
 }
 
@@ -384,7 +383,7 @@ export function findConfigFileWithMeta(
 
 /**
  * Find all nearest config directories by walking up from cwd.
- * Returns one entry per config base (.xcsh, .claude) - the nearest one found.
+ * Returns one entry per config base (.xcsh, .codex, .gemini) - the nearest one found.
  * Results are in priority order (highest first).
  */
 export function findAllNearestProjectConfigDirs(subpath: string, cwd: string = getProjectDir()): ConfigDirEntry[] {

package/src/discovery/claude-plugins.ts

@@ -1,8 +1,8 @@
 /**
  * Claude Code Marketplace Plugin Provider
  *
- * Loads configuration from ~/.claude/plugins/cache/ based on installed_plugins.json registry.
- * Priority: 70 (below claude.ts at 80, so user overrides in .claude/ take precedence)
+ * Loads configuration from ~/.xcsh/plugins/cache/ based on installed_plugins.json registry.
+ * Priority: 70 (below claude.ts at 80, so user overrides in .xcsh/ take precedence)
  */
 import * as path from "node:path";
 import { logger } from "@f5xc-salesdemos/pi-utils";
@@ -26,7 +26,7 @@ import { substitutePluginRoot } from "./substitute-plugin-root";
 
 const PROVIDER_ID = "claude-plugins";
 const DISPLAY_NAME = "Claude Code Marketplace";
-const PRIORITY = 70; // Below claude.ts (80) so user .claude/ overrides win
+const PRIORITY = 70; // Below claude.ts (80) so user .xcsh/ overrides win
 
 // =============================================================================
 // Skills
@@ -258,7 +258,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 registerProvider<Skill>(skillCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load skills from Claude Code marketplace plugins (~/.claude/plugins/cache/)",
+	description: "Load skills from Claude Code marketplace plugins (~/.xcsh/plugins/cache/)",
 	priority: PRIORITY,
 	load: loadSkills,
 });

package/src/discovery/claude.ts

@@ -1,7 +1,7 @@
 /**
  * Claude Code Provider
  *
- * Loads configuration from .claude directories.
+ * Loads configuration from .xcsh directories.
  * Priority: 80 (tool-specific, below builtin but above shared standards)
  */
 import * as path from "node:path";
@@ -31,17 +31,17 @@ import {
 const PROVIDER_ID = "claude";
 const DISPLAY_NAME = "Claude Code";
 const PRIORITY = 80;
-const CONFIG_DIR = ".claude";
+const CONFIG_DIR = ".xcsh";
 
 /**
- * Get user-level .claude path.
+ * Get user-level .xcsh path.
  */
 function getUserClaude(ctx: LoadContext): string {
 	return path.join(ctx.home, CONFIG_DIR);
 }
 
 /**
- * Get project-level .claude path (cwd only).
+ * Get project-level .xcsh path (cwd only).
  */
 function getProjectClaude(ctx: LoadContext): string {
 	return path.join(ctx.cwd, CONFIG_DIR);
@@ -60,7 +60,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 	const warnings: string[] = [];
 
 	const userBase = getUserClaude(ctx);
-	const userClaudeJson = path.join(ctx.home, ".claude.json");
+	const userClaudeJson = path.join(ctx.home, ".xcsh.json");
 	const userMcpJson = path.join(userBase, "mcp.json");
 
 	const projectBase = path.join(ctx.cwd, CONFIG_DIR);
@@ -166,7 +166,7 @@ async function loadContextFiles(ctx: LoadContext): Promise<LoadResult<ContextFil
 async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const userSkillsDir = path.join(getUserClaude(ctx), "skills");
 
-	// Walk up from cwd finding .claude/skills/ in ancestors
+	// Walk up from cwd finding .xcsh/skills/ in ancestors
 	const projectScans: Promise<LoadResult<Skill>>[] = [];
 	let current = ctx.cwd;
 	while (true) {
@@ -473,7 +473,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 registerProvider<MCPServer>(mcpCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load MCP servers from .claude.json and .claude/mcp.json",
+	description: "Load MCP servers from .xcsh.json and .xcsh/mcp.json",
 	priority: PRIORITY,
 	load: loadMCPServers,
 });
@@ -481,7 +481,7 @@ registerProvider<MCPServer>(mcpCapability.id, {
 registerProvider<ContextFile>(contextFileCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load CLAUDE.md files from .claude/ directories",
+	description: "Load CLAUDE.md files from .xcsh/ directories",
 	priority: PRIORITY,
 	load: loadContextFiles,
 });
@@ -489,7 +489,7 @@ registerProvider<ContextFile>(contextFileCapability.id, {
 registerProvider<Skill>(skillCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load skills from .claude/skills/*/SKILL.md",
+	description: "Load skills from .xcsh/skills/*/SKILL.md",
 	priority: PRIORITY,
 	load: loadSkills,
 });
@@ -497,7 +497,7 @@ registerProvider<Skill>(skillCapability.id, {
 registerProvider<ExtensionModule>(extensionModuleCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load extension modules from .claude/extensions",
+	description: "Load extension modules from .xcsh/extensions",
 	priority: PRIORITY,
 	load: loadExtensionModules,
 });
@@ -505,7 +505,7 @@ registerProvider<ExtensionModule>(extensionModuleCapability.id, {
 registerProvider<SlashCommand>(slashCommandCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load slash commands from .claude/commands/*.md",
+	description: "Load slash commands from .xcsh/commands/*.md",
 	priority: PRIORITY,
 	load: loadSlashCommands,
 });
@@ -513,7 +513,7 @@ registerProvider<SlashCommand>(slashCommandCapability.id, {
 registerProvider<Hook>(hookCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load hooks from .claude/hooks/pre/ and .claude/hooks/post/",
+	description: "Load hooks from .xcsh/hooks/pre/ and .xcsh/hooks/post/",
 	priority: PRIORITY,
 	load: loadHooks,
 });
@@ -521,7 +521,7 @@ registerProvider<Hook>(hookCapability.id, {
 registerProvider<CustomTool>(toolCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load custom tools from .claude/tools/",
+	description: "Load custom tools from .xcsh/tools/",
 	priority: PRIORITY,
 	load: loadTools,
 });
@@ -529,7 +529,7 @@ registerProvider<CustomTool>(toolCapability.id, {
 registerProvider<Settings>(settingsCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load settings from .claude/settings.json",
+	description: "Load settings from .xcsh/settings.json",
 	priority: PRIORITY,
 	load: loadSettings,
 });
@@ -537,7 +537,7 @@ registerProvider<Settings>(settingsCapability.id, {
 registerProvider<SystemPrompt>(systemPromptCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,
-	description: "Load system prompt from .claude/SYSTEM.md",
+	description: "Load system prompt from .xcsh/SYSTEM.md",
 	priority: PRIORITY,
 	load: loadSystemPrompts,
 });

package/src/discovery/helpers.ts

@@ -31,11 +31,6 @@ export const SOURCE_PATHS = {
 		},
 		projectDir: CONFIG_DIR_NAME,
 	},
-	claude: {
-		userBase: ".claude",
-		userAgent: ".claude",
-		projectDir: ".claude",
-	},
 	codex: {
 		userBase: ".codex",
 		userAgent: ".codex",
@@ -719,9 +714,9 @@ export async function resolveOrDefaultProjectRegistryPath(cwd: string): Promise<
 const pluginRootsCache = new Map<string, { roots: ClaudePluginRoot[]; warnings: string[] }>();
 
 /**
- * List all installed Claude Code plugin roots from the plugin cache.
- * Reads ~/.claude/plugins/installed_plugins.json and ~/.xcsh/plugins/installed_plugins.json,
- * and optionally the nearest project-scoped registry resolved from `cwd`.
+ * List all installed marketplace plugin roots from the plugin cache.
+ * Reads ~/.xcsh/plugins/installed_plugins.json and optionally the nearest
+ * project-scoped registry resolved from `cwd`.
  *
  * Results are cached per `home:resolvedProjectPath` key to avoid repeated parsing.
  */
@@ -738,81 +733,30 @@ export async function listClaudePluginRoots(
 	const warnings: string[] = [];
 	const projectRoots: ClaudePluginRoot[] = [];
 
-	// ── Claude Code registry ──────────────────────────────────────────────────
-	const registryPath = path.join(home, ".claude", "plugins", "installed_plugins.json");
+	// ── Installed plugins registry ───────────────────────────────────────────
+	// Path derived from `home` (not os.homedir()) so test isolation works when home is overridden.
+	const registryPath = path.join(home, getConfigDirName(), "plugins", "installed_plugins.json");
 	const content = await readFile(registryPath);
-
 	if (content) {
 		const registry = parseClaudePluginsRegistry(content);
-		if (!registry) {
-			warnings.push(`Failed to parse Claude Code plugin registry: ${registryPath}`);
-		} else {
+		if (registry) {
 			for (const [pluginId, entries] of Object.entries(registry.plugins)) {
 				if (!Array.isArray(entries) || entries.length === 0) continue;
 
-				// Parse plugin ID format: "plugin-name@marketplace"
 				const atIndex = pluginId.lastIndexOf("@");
 				if (atIndex === -1) {
 					warnings.push(`Invalid plugin ID format (missing @marketplace): ${pluginId}`);
 					continue;
 				}
-
 				const pluginName = pluginId.slice(0, atIndex);
 				const marketplace = pluginId.slice(atIndex + 1);
 
-				// Process all valid entries, not just the first one.
-				// This handles plugins with multiple installs (different scopes/versions).
-				for (const entry of entries) {
-					if (!entry.installPath || typeof entry.installPath !== "string") {
-						warnings.push(`Plugin ${pluginId} entry has no installPath`);
-						continue;
-					}
-					if (entry.enabled === false) continue;
-
-					roots.push({
-						id: pluginId,
-						marketplace,
-						plugin: pluginName,
-						version: entry.version || "unknown",
-						path: entry.installPath,
-						scope: entry.scope || "user",
-					});
-				}
-			}
-		}
-	}
-
-	// ── OMP installed plugins registry ───────────────────────────────────────
-	// OMP registry is authoritative: its entries replace Claude's entries for the same plugin ID.
-	// Path derived from `home` (not os.homedir()) so test isolation works when home is overridden.
-	const ompRegistryPath = path.join(home, getConfigDirName(), "plugins", "installed_plugins.json");
-	const ompContent = await readFile(ompRegistryPath);
-	if (ompContent) {
-		const ompRegistry = parseClaudePluginsRegistry(ompContent);
-		if (ompRegistry) {
-			for (const [pluginId, entries] of Object.entries(ompRegistry.plugins)) {
-				if (!Array.isArray(entries) || entries.length === 0) continue;
-
-				const atIndex = pluginId.lastIndexOf("@");
-				if (atIndex === -1) {
-					warnings.push(`Invalid plugin ID format (missing @marketplace): ${pluginId}`);
-					continue;
-				}
-				const pluginName = pluginId.slice(0, atIndex);
-				const marketplace = pluginId.slice(atIndex + 1);
-
-				// OMP is authoritative: drop all Claude-sourced entries for this plugin ID
-				const filtered = roots.filter(r => r.id !== pluginId);
-				roots.length = 0;
-				roots.push(...filtered);
-
 				for (const entry of entries) {
 					if (!entry.installPath || typeof entry.installPath !== "string") {
 						warnings.push(`Plugin ${pluginId} entry has no installPath`);
 						continue;
 					}
 					if (entry.enabled === false) continue;
-					// Deduplicate by installPath within same ID
 					if (roots.some(r => r.id === pluginId && r.path === entry.installPath)) continue;
 
 					roots.push({
@@ -826,14 +770,15 @@ export async function listClaudePluginRoots(
 				}
 			}
 		} else {
-			warnings.push(`Failed to parse OMP plugin registry: ${ompRegistryPath}`);
+			warnings.push(`Failed to parse plugin registry: ${registryPath}`);
 		}
 	}
 
-	// ── Project-scoped OMP registry ────────────────────────────────────────
+	// ── Project-scoped registry ──────────────────────────────────────────
 	// Loaded from the nearest .xcsh/plugins/installed_plugins.json relative to cwd.
 	// Project entries take precedence over user entries for the same plugin ID.
-	if (resolvedProjectPath) {
+	// Skip if the project registry is the same file as the user registry (home === cwd).
+	if (resolvedProjectPath && resolvedProjectPath !== registryPath) {
 		const projectContent = await readFile(resolvedProjectPath);
 		if (projectContent) {
 			const projectRegistry = parseClaudePluginsRegistry(projectContent);
@@ -943,7 +888,7 @@ export async function injectPluginDirRoots(home: string, dirs: string[], cwd?: s
 		// Read plugin name from manifest
 		let pluginName = path.basename(resolved);
 		try {
-			const manifestPath = path.join(resolved, ".claude-plugin", "plugin.json");
+			const manifestPath = path.join(resolved, ".xcsh-plugin", "plugin.json");
 			const content = await Bun.file(manifestPath).text();
 			const manifest = JSON.parse(content);
 			if (typeof manifest.name === "string" && manifest.name) {

package/src/extensibility/plugins/marketplace/fetcher.ts

@@ -193,7 +193,7 @@ export function parseMarketplaceCatalog(content: string, filePath: string): Mark
 // ── fetchMarketplace ──────────────────────────────────────────────────
 
 /** Relative path from a marketplace root to its catalog file. */
-const CATALOG_RELATIVE_PATH = path.join(".claude-plugin", "marketplace.json");
+const CATALOG_RELATIVE_PATH = path.join(".xcsh-plugin", "marketplace.json");
 
 /**
  * Expand a `~/...` path to an absolute path using os.homedir().
@@ -229,7 +229,7 @@ export async function fetchMarketplace(source: string, cacheDir: string): Promis
 			if (isEnoent(err)) {
 				throw new Error(
 					`Marketplace catalog not found at "${catalogPath}". ` +
-						`Ensure the directory exists and contains a .claude-plugin/marketplace.json file.`,
+						`Ensure the directory exists and contains a .xcsh-plugin/marketplace.json file.`,
 				);
 			}
 			throw err;

package/src/extensibility/plugins/marketplace/manager.ts

@@ -257,7 +257,7 @@ export class MarketplaceManager {
 		}
 
 		// 4. Resolve source path.
-		// marketplaceClonePath is the marketplace root — the directory containing .claude-plugin/
+		// marketplaceClonePath is the marketplace root — the directory containing .xcsh-plugin/
 		// catalogPath is <marketplacesCacheDir>/<name>/marketplace.json, so the root is two levels up.
 		// For local sources the content was fetched from a local path; the stored catalog is a copy
 		// under marketplacesCacheDir. We need the original source root for resolving relative paths.
@@ -345,7 +345,7 @@ export class MarketplaceManager {
 	/**
 	 * Resolve plugin version from multiple sources:
 	 * 1. Catalog entry version (if set)
-	 * 2. Plugin manifest (.claude-plugin/plugin.json or package.json)
+	 * 2. Plugin manifest (.xcsh-plugin/plugin.json or package.json)
 	 * 3. Git SHA from source (truncated to 7 chars)
 	 * 4. Fallback "0.0.0"
 	 */
@@ -355,7 +355,7 @@ export class MarketplaceManager {
 
 		// 2. Plugin manifest
 		for (const manifestPath of [
-			path.join(sourcePath, ".claude-plugin", "plugin.json"),
+			path.join(sourcePath, ".xcsh-plugin", "plugin.json"),
 			path.join(sourcePath, "package.json"),
 		]) {
 			try {
@@ -730,7 +730,7 @@ export class MarketplaceManager {
 	 * Compute the marketplace root directory for source resolution.
 	 *
 	 * For local sources: sourceUri IS the local path, so resolve it directly.
-	 * This gives the directory containing `.claude-plugin/marketplace.json`,
+	 * This gives the directory containing `.xcsh-plugin/marketplace.json`,
 	 * which is what resolvePluginSource expects as `marketplaceClonePath`.
 	 *
 	 * For remote sources (git/github/url): the catalog was cloned into

package/src/extensibility/plugins/marketplace/source-resolver.ts

@@ -63,7 +63,7 @@ async function resolveRelativeSource(
 	const pluginRoot = context.catalogMetadata?.pluginRoot;
 	const relativePath = pluginRoot ? `./${path.join(pluginRoot, source.slice(2))}` : source;
 
-	// Resolve against marketplace root (not the .claude-plugin/ catalog subdirectory)
+	// Resolve against marketplace root (not the .xcsh-plugin/ catalog subdirectory)
 	const resolved = path.resolve(context.marketplaceClonePath, relativePath);
 
 	if (!pathIsWithin(context.marketplaceClonePath, resolved)) {