@f5xc-salesdemos/xcsh 19.4.0 → 19.5.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "19.4.0",
+	"version": "19.5.1",
 	"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": "19.4.0",
-		"@f5xc-salesdemos/pi-agent-core": "19.4.0",
-		"@f5xc-salesdemos/pi-ai": "19.4.0",
-		"@f5xc-salesdemos/pi-natives": "19.4.0",
-		"@f5xc-salesdemos/pi-tui": "19.4.0",
-		"@f5xc-salesdemos/pi-utils": "19.4.0",
+		"@f5xc-salesdemos/xcsh-stats": "19.5.1",
+		"@f5xc-salesdemos/pi-agent-core": "19.5.1",
+		"@f5xc-salesdemos/pi-ai": "19.5.1",
+		"@f5xc-salesdemos/pi-natives": "19.5.1",
+		"@f5xc-salesdemos/pi-tui": "19.5.1",
+		"@f5xc-salesdemos/pi-utils": "19.5.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

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

@@ -323,13 +323,15 @@ export class MarketplaceManager {
 		const now = new Date().toISOString();
 		// Carry over enabled flag from existing entry — a disabled plugin must stay disabled after upgrade
 		const wasDisabled = existing?.some(e => e.enabled === false);
+		// Honor defaultEnabled from catalog — new installs with defaultEnabled: false start disabled
+		const defaultDisabled = !existing && pluginEntry.defaultEnabled === false;
 		const installedEntry: InstalledPluginEntry = {
 			scope,
 			installPath: cachePath,
 			version,
 			installedAt: now,
 			lastUpdated: now,
-			...(wasDisabled ? { enabled: false } : {}),
+			...(wasDisabled || defaultDisabled ? { enabled: false } : {}),
 		};
 
 		const freshInstReg = await readInstalledPluginsRegistry(registryPath);
@@ -719,7 +721,7 @@ export class MarketplaceManager {
 		} catch (err) {
 			if (isEnoent(err)) {
 				throw new Error(
-					`Marketplace catalog not found at ${entry.catalogPath}. Try: /marketplace update ${entry.name}`,
+					`Marketplace catalog not found at ${entry.catalogPath}. Try: /plugin marketplace update ${entry.name}`,
 				);
 			}
 			throw err;

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

@@ -76,6 +76,7 @@ export interface MarketplacePluginAuthor {
 
 export interface MarketplacePluginEntry {
 	name: string;
+	displayName?: string;
 	source: PluginSource;
 	description?: string;
 	version?: string;
@@ -87,6 +88,7 @@ export interface MarketplacePluginEntry {
 	category?: string;
 	tags?: string[];
 	strict?: boolean;
+	defaultEnabled?: boolean;
 	commands?: string | string[];
 	agents?: string | string[];
 	hooks?: string | Record<string, unknown>;

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.4.0",
-	"commit": "fd384b6c522bb33ac933274223d2c98d247737e2",
-	"shortCommit": "fd384b6",
+	"version": "19.5.1",
+	"commit": "9c15a98f105051030aa1e0f5376d315d0214e8fd",
+	"shortCommit": "9c15a98",
 	"branch": "main",
-	"tag": "v19.4.0",
-	"commitDate": "2026-06-04T16:08:47Z",
-	"buildDate": "2026-06-04T16:50:46.727Z",
+	"tag": "v19.5.1",
+	"commitDate": "2026-06-04T17:32:07Z",
+	"buildDate": "2026-06-04T17:56:43.676Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/fd384b6c522bb33ac933274223d2c98d247737e2",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v19.4.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/9c15a98f105051030aa1e0f5376d315d0214e8fd",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v19.5.1"
 };

package/src/main.ts

@@ -749,7 +749,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 					await mgr.upgradeAllPlugins();
 					logger.debug(`Auto-upgraded ${updates.length} marketplace plugin(s)`);
 				} else {
-					logger.debug(`${updates.length} marketplace plugin update(s) available \u2014 /marketplace upgrade`);
+					logger.debug(`${updates.length} marketplace plugin update(s) available \u2014 /plugin upgrade`);
 				}
 			} catch {
 				// Silently ignore — network failure, corrupt data, offline.

package/src/modes/components/plugin-selector.ts

@@ -54,7 +54,7 @@ export class PluginSelectorComponent extends Container {
 				label: "No plugins available",
 				description:
 					marketplaceCount === 0
-						? "Add a marketplace first: /marketplace add <source>"
+						? "Add a marketplace first: /plugin marketplace add <source>"
 						: "Configured marketplaces have no plugins",
 			});
 		}

package/src/modes/components/plugins/plugin-dashboard.ts

@@ -251,7 +251,7 @@ export class PluginDashboard extends Container {
 		if (!plugin) return;
 		const tabId = this.#activeTabId();
 
-		if (tabId === "available" && !plugin.installed) {
+		if (tabId === "discover" && !plugin.installed) {
 			await this.#installPlugin(plugin);
 		} else if (tabId === "updates" && plugin.hasUpdate) {
 			await this.#upgradePlugin(plugin);
@@ -320,7 +320,7 @@ export class PluginDashboard extends Container {
 	#getHelpText(): string {
 		const tabId = this.#activeTabId();
 		switch (tabId) {
-			case "available":
+			case "discover":
 				return " ↑/↓: navigate  Enter: install  Tab: next tab  Ctrl+R: reload  Esc: close";
 			case "updates":
 				return " ↑/↓: navigate  Enter: upgrade  Tab: next tab  Ctrl+R: reload  Esc: close";

package/src/modes/components/plugins/plugin-inspector-pane.ts

@@ -14,7 +14,7 @@ export class PluginInspectorPane implements Component {
 		const lines: string[] = [];
 		const p = this.plugin;
 
-		lines.push(theme.bold(theme.fg("contentAccent", replaceTabs(p.name))));
+		lines.push(theme.bold(theme.fg("contentAccent", replaceTabs(p.displayName || p.name))));
 		lines.push("");
 
 		lines.push(`${theme.fg("muted", "Source:")} ${p.source}`);

package/src/modes/components/plugins/plugin-list-pane.ts

@@ -22,7 +22,7 @@ export class PluginListPane implements Component {
 
 		if (this.plugins.length === 0) {
 			const msg =
-				this.activeTab === "available"
+				this.activeTab === "discover"
 					? "No plugins available. Add a marketplace first."
 					: this.activeTab === "updates"
 						? "All plugins are up to date."
@@ -71,7 +71,7 @@ export class PluginListPane implements Component {
 		}
 
 		parts.push(" ");
-		parts.push(plugin.name);
+		parts.push(plugin.displayName || plugin.name);
 
 		if (plugin.version) {
 			parts.push(theme.fg("dim", ` v${plugin.version}`));

package/src/modes/components/plugins/state-manager.ts

@@ -48,6 +48,7 @@ function catalogToDashboard(entry: MarketplacePluginEntry, marketplace: string):
 	return {
 		id: `${entry.name}@${marketplace}`,
 		name: normalizePluginDisplayName(entry.name),
+		displayName: entry.displayName,
 		marketplace,
 		source: "marketplace",
 		version: entry.version,
@@ -96,6 +97,7 @@ export async function loadAllPlugins(mgr: MarketplaceManager, npmMgr: PluginMana
 			if (installedIds.has(pluginId)) {
 				const existing = plugins.find(p => p.id === pluginId);
 				if (existing) {
+					existing.displayName = existing.displayName || entry.displayName;
 					existing.description = existing.description || entry.description;
 					existing.category = existing.category || entry.category;
 					existing.tags = existing.tags || entry.tags;
@@ -124,12 +126,12 @@ export async function loadAllPlugins(mgr: MarketplaceManager, npmMgr: PluginMana
 export function buildTabs(plugins: DashboardPlugin[]): PluginTab[] {
 	const tabs: PluginTab[] = [];
 	const installedCount = plugins.filter(p => p.installed).length;
-	const availableCount = plugins.filter(p => !p.installed).length;
+	const discoverCount = plugins.filter(p => !p.installed).length;
 	const updatesCount = plugins.filter(p => p.hasUpdate).length;
 
 	tabs.push({ id: "installed", label: "Installed", count: installedCount });
-	if (availableCount > 0) {
-		tabs.push({ id: "available", label: "Available", count: availableCount });
+	if (discoverCount > 0) {
+		tabs.push({ id: "discover", label: "Discover", count: discoverCount });
 	}
 	if (updatesCount > 0) {
 		tabs.push({ id: "updates", label: "Updates", count: updatesCount });
@@ -141,7 +143,7 @@ export function filterByTab(plugins: DashboardPlugin[], tabId: PluginTabId): Das
 	switch (tabId) {
 		case "installed":
 			return plugins.filter(p => p.installed);
-		case "available":
+		case "discover":
 			return plugins.filter(p => !p.installed);
 		case "updates":
 			return plugins.filter(p => p.hasUpdate);
@@ -155,6 +157,7 @@ export function applySearch(plugins: DashboardPlugin[], query: string): Dashboar
 	const q = query.toLowerCase();
 	return plugins.filter(p => {
 		if (p.name.toLowerCase().includes(q)) return true;
+		if (p.displayName?.toLowerCase().includes(q)) return true;
 		if (p.description?.toLowerCase().includes(q)) return true;
 		if (p.marketplace?.toLowerCase().includes(q)) return true;
 		if (p.category?.toLowerCase().includes(q)) return true;

package/src/modes/components/plugins/types.ts

@@ -1,6 +1,7 @@
 export interface DashboardPlugin {
 	id: string;
 	name: string;
+	displayName?: string;
 	marketplace?: string;
 	source: "npm" | "marketplace";
 	scope?: "user" | "project";
@@ -19,7 +20,7 @@ export interface DashboardPlugin {
 	updateVersion?: string;
 }
 
-export type PluginTabId = "installed" | "available" | "updates";
+export type PluginTabId = "installed" | "discover" | "updates";
 
 export interface PluginTab {
 	id: PluginTabId;

package/src/slash-commands/builtin-registry.ts

@@ -858,37 +858,60 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 		handle: shutdownHandler,
 	},
 	{
-		name: "marketplace",
-		description: "Manage marketplace plugin sources and installed plugins",
+		name: "plugin",
+		aliases: ["marketplace", "plugins"],
+		description: "Manage plugins and marketplace sources",
 		subcommands: [
-			{ name: "add", description: "Add a marketplace source", usage: "<source>" },
-			{ name: "remove", description: "Remove a marketplace source", usage: "<name>" },
-			{ name: "update", description: "Update marketplace catalog(s)", usage: "[name]" },
-			{ name: "list", description: "List configured marketplaces" },
-			{ name: "discover", description: "Browse available plugins", usage: "[marketplace]" },
+			{ name: "marketplace", description: "Manage marketplace sources (add, remove, update, list)" },
 			{
 				name: "install",
-				description: "Install a plugin (interactive browser if no args)",
-				usage: "[--force] [name@marketplace]",
+				description: "Install a plugin",
+				usage: "[--force] [--scope user|project] <name@marketplace>",
 			},
-			{ name: "uninstall", description: "Uninstall a plugin (selector if no args)", usage: "[name@marketplace]" },
-			{ name: "installed", description: "List installed marketplace plugins" },
-			{ name: "upgrade", description: "Upgrade outdated plugins", usage: "[name@marketplace]" },
+			{ name: "uninstall", description: "Uninstall a plugin", usage: "[--scope user|project] <name@marketplace>" },
+			{ name: "enable", description: "Enable a plugin", usage: "[--scope user|project] <name@marketplace>" },
+			{ name: "disable", description: "Disable a plugin", usage: "[--scope user|project] <name@marketplace>" },
+			{ name: "upgrade", description: "Upgrade plugins", usage: "[--scope user|project] [name@marketplace]" },
+			{ name: "discover", description: "Browse available plugins", usage: "[marketplace]" },
+			{ name: "list", description: "List all installed plugins" },
+			{ name: "validate", description: "Validate marketplace or plugin manifest", usage: "[path]" },
 			{ name: "help", description: "Show usage guide" },
 		],
 		allowArgs: true,
 		handle: async (command, runtime) => {
 			runtime.ctx.editor.setText("");
 			const args = command.args.trim().split(/\s+/);
-			const sub = args[0] || "install";
+			const sub = args[0] || "";
 			const rest = args.slice(1).join(" ").trim();
 
-			// /marketplace (no args) or /marketplace install (no args) → interactive browser
-			if ((sub === "install" && !rest) || (!args[0] && !command.args.trim())) {
+			// /plugin (no args) → open interactive dashboard
+			if (!sub) {
+				runtime.ctx.showPluginDashboard();
+				return;
+			}
+
+			// /plugin install (no args) → interactive browser
+			if (sub === "install" && !rest) {
 				try {
 					runtime.ctx.showPluginSelector("install");
 				} catch (err) {
-					runtime.ctx.showStatus(`Marketplace error: ${err}`);
+					runtime.ctx.showStatus(`Plugin error: ${err}`);
+				}
+				return;
+			}
+
+			// /plugin list (no args) → open interactive dashboard
+			if (sub === "list" && !rest) {
+				runtime.ctx.showPluginDashboard();
+				return;
+			}
+
+			// /plugin uninstall (no args) → interactive uninstall selector
+			if (sub === "uninstall" && !rest) {
+				try {
+					runtime.ctx.showPluginSelector("uninstall");
+				} catch (err) {
+					runtime.ctx.showStatus(`Plugin error: ${err}`);
 				}
 				return;
 			}
@@ -911,9 +934,63 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 
 			try {
 				switch (sub) {
+					// ── Marketplace management (/plugin marketplace add|remove|update|list) ──
+					case "marketplace": {
+						const mktArgs = rest.split(/\s+/);
+						const mktSub = mktArgs[0] || "";
+						const mktRest = mktArgs.slice(1).join(" ").trim();
+						switch (mktSub) {
+							case "add": {
+								if (!mktRest) {
+									runtime.ctx.showStatus("Usage: /plugin marketplace add <source>");
+									return;
+								}
+								const entry = await mgr.addMarketplace(mktRest);
+								runtime.ctx.showStatus(`Added marketplace: ${entry.name}`);
+								break;
+							}
+							case "remove":
+							case "rm": {
+								if (!mktRest) {
+									runtime.ctx.showStatus("Usage: /plugin marketplace remove <name>");
+									return;
+								}
+								await mgr.removeMarketplace(mktRest);
+								runtime.ctx.showStatus(`Removed marketplace: ${mktRest}`);
+								break;
+							}
+							case "update": {
+								if (mktRest) {
+									await mgr.updateMarketplace(mktRest);
+									runtime.ctx.showStatus(`Updated marketplace: ${mktRest}`);
+								} else {
+									const results = await mgr.updateAllMarketplaces();
+									runtime.ctx.showStatus(`Updated ${results.length} marketplace(s)`);
+								}
+								break;
+							}
+							case "list":
+							default: {
+								const marketplaces = await mgr.listMarketplaces();
+								if (marketplaces.length === 0) {
+									runtime.ctx.showStatus(
+										"No marketplaces configured.\n\nGet started:\n  /plugin marketplace add f5xc-salesdemos/marketplace",
+									);
+								} else {
+									const lines = marketplaces.map(m => `  ${m.name}  ${m.sourceUri}`);
+									runtime.ctx.showStatus(
+										`Marketplaces:\n${lines.join("\n")}\n\nUse /plugin discover to browse plugins`,
+									);
+								}
+								break;
+							}
+						}
+						break;
+					}
+					// ── Legacy shorthand: /marketplace add|remove|update → /plugin marketplace ──
 					case "add": {
 						if (!rest) {
-							runtime.ctx.showStatus("Usage: /marketplace add <source>");
+							runtime.ctx.showStatus("Usage: /plugin marketplace add <source>");
 							return;
 						}
 						const entry = await mgr.addMarketplace(rest);
@@ -923,7 +1000,7 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 					case "remove":
 					case "rm": {
 						if (!rest) {
-							runtime.ctx.showStatus("Usage: /marketplace remove <name>");
+							runtime.ctx.showStatus("Usage: /plugin marketplace remove <name>");
 							return;
 						}
 						await mgr.removeMarketplace(rest);
@@ -940,13 +1017,14 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						}
 						break;
 					}
+					// ── Plugin discovery ──
 					case "discover": {
 						const plugins = await mgr.listAvailablePlugins(rest || undefined);
 						if (plugins.length === 0) {
 							const marketplaces = await mgr.listMarketplaces();
 							if (marketplaces.length === 0) {
 								runtime.ctx.showStatus(
-									"No marketplaces configured. Try:\n  /marketplace add f5xc-salesdemos/marketplace",
+									"No marketplaces configured. Try:\n  /plugin marketplace add f5xc-salesdemos/marketplace",
 								);
 							} else {
 								runtime.ctx.showStatus("No plugins available in configured marketplaces");
@@ -960,8 +1038,8 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						}
 						break;
 					}
+					// ── Install ──
 					case "install": {
-						// Parse: /marketplace install [--force] [--scope user|project] name@marketplace
 						const parsed = parseMarketplaceInstallArgs(rest);
 						if ("error" in parsed) {
 							runtime.ctx.showStatus(parsed.error);
@@ -974,15 +1052,11 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						runtime.ctx.showStatus(`Installed ${name} from ${marketplace}`);
 						break;
 					}
+					// ── Uninstall ──
 					case "uninstall": {
-						if (!rest) {
-							// No args → open interactive uninstall selector
-							runtime.ctx.showPluginSelector("uninstall");
-							return;
-						}
 						const uninstArgs = parsePluginScopeArgs(
 							rest,
-							"Usage: /marketplace uninstall [--scope user|project] <name@marketplace>",
+							"Usage: /plugin uninstall [--scope user|project] <name@marketplace>",
 						);
 						if ("error" in uninstArgs) {
 							runtime.ctx.showStatus(uninstArgs.error);
@@ -992,23 +1066,28 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						runtime.ctx.showStatus(`Uninstalled ${uninstArgs.pluginId}`);
 						break;
 					}
-					case "installed": {
-						const installed = await mgr.listInstalledPlugins();
-						if (installed.length === 0) {
-							runtime.ctx.showStatus("No marketplace plugins installed");
-						} else {
-							const lines = installed.map(
-								p => `  ${p.id} [${p.scope}]${p.shadowedBy ? " [shadowed]" : ""} (${p.entries.length} entry)`,
-							);
-							runtime.ctx.showStatus(`Installed plugins:\n${lines.join("\n")}`);
+					// ── Enable / Disable ──
+					case "enable":
+					case "disable": {
+						const parsed = parsePluginScopeArgs(
+							rest ?? "",
+							`Usage: /plugin ${sub} [--scope user|project] <name@marketplace>`,
+						);
+						if ("error" in parsed) {
+							runtime.ctx.showStatus(parsed.error);
+							return;
 						}
+						const isEnable = sub === "enable";
+						await mgr.setPluginEnabled(parsed.pluginId, isEnable, parsed.scope);
+						runtime.ctx.showStatus(`${isEnable ? "Enabled" : "Disabled"} ${parsed.pluginId}`);
 						break;
 					}
+					// ── Upgrade ──
 					case "upgrade": {
 						if (rest) {
 							const upArgs = parsePluginScopeArgs(
 								rest,
-								"Usage: /marketplace upgrade [--scope user|project] <name@marketplace>",
+								"Usage: /plugin upgrade [--scope user|project] <name@marketplace>",
 							);
 							if ("error" in upArgs) {
 								runtime.ctx.showStatus(upArgs.error);
@@ -1019,7 +1098,7 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						} else {
 							const results = await mgr.upgradeAllPlugins();
 							if (results.length === 0) {
-								runtime.ctx.showStatus("All marketplace plugins are up to date");
+								runtime.ctx.showStatus("All plugins are up to date");
 							} else {
 								const lines = results.map(r => `  ${r.pluginId}: ${r.from} -> ${r.to}`);
 								runtime.ctx.showStatus(`Upgraded ${results.length} plugin(s):\n${lines.join("\n")}`);
@@ -1027,106 +1106,9 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						}
 						break;
 					}
-					case "help": {
-						runtime.ctx.showStatus(
-							[
-								"Marketplace commands:",
-								"  /marketplace                              Browse and install plugins",
-								"  /marketplace add <source>                  Add a marketplace (e.g. owner/repo)",
-								"  /marketplace remove <name>                 Remove a marketplace",
-								"  /marketplace update [name]                 Re-fetch catalog(s)",
-								"  /marketplace list                          List configured marketplaces",
-								"  /marketplace discover [marketplace]        Browse available plugins",
-								"  /marketplace install <name@marketplace>    Install a plugin",
-								"  /marketplace uninstall <name@marketplace>  Uninstall a plugin",
-								"  /marketplace installed                     List installed plugins",
-								"  /marketplace upgrade [name@marketplace]    Upgrade plugin(s)",
-								"",
-								"Quick start:",
-								"  /marketplace add f5xc-salesdemos/marketplace",
-								"  /marketplace                               (opens interactive browser)",
-							].join("\n"),
-						);
-						break;
-					}
-					default: {
-						const marketplaces = await mgr.listMarketplaces();
-						if (marketplaces.length === 0) {
-							runtime.ctx.showStatus(
-								"No marketplaces configured.\n\nGet started:\n  /marketplace add f5xc-salesdemos/marketplace\n\nThen browse plugins with /marketplace or /marketplace discover",
-							);
-						} else {
-							const lines = marketplaces.map(m => `  ${m.name}  ${m.sourceUri}`);
-							runtime.ctx.showStatus(
-								`Marketplaces:\n${lines.join("\n")}\n\nUse /marketplace discover to browse plugins, or /marketplace help for all commands`,
-							);
-						}
-						break;
-					}
-				}
-			} catch (err) {
-				const msg = err instanceof Error ? err.message : String(err);
-				runtime.ctx.showStatus(`Marketplace error: ${msg}`);
-			}
-		},
-	},
-	{
-		name: "plugins",
-		description: "View and manage installed plugins",
-		subcommands: [
-			{ name: "list", description: "List all installed plugins (npm + marketplace)" },
-			{ name: "enable", description: "Enable a marketplace plugin", usage: "<name@marketplace>" },
-			{ name: "disable", description: "Disable a marketplace plugin", usage: "<name@marketplace>" },
-		],
-		allowArgs: true,
-		handle: async (command, runtime) => {
-			runtime.ctx.editor.setText("");
-			const args = command.args.trim().split(/\s+/);
-			const sub = args[0] || "";
-			const rest = args.slice(1).join(" ").trim();
-
-			// No args or bare "list" with no further args → open interactive dashboard
-			if (!sub || (sub === "list" && !rest)) {
-				runtime.ctx.showPluginDashboard();
-				return;
-			}
-
-			try {
-				const mgr = new MarketplaceManager({
-					marketplacesRegistryPath: getMarketplacesRegistryPath(),
-					installedRegistryPath: getInstalledPluginsRegistryPath(),
-					projectInstalledRegistryPath: await resolveOrDefaultProjectRegistryPath(
-						runtime.ctx.sessionManager.getCwd(),
-					),
-					marketplacesCacheDir: getMarketplacesCacheDir(),
-					pluginsCacheDir: getPluginsCacheDir(),
-					clearPluginRootsCache: (extraPaths?: readonly string[]) => {
-						const home = os.homedir();
-						invalidateFsCache(path.join(home, getConfigDirName(), "plugins", "installed_plugins.json"));
-						for (const p of extraPaths ?? []) invalidateFsCache(p);
-						clearXcshPluginRootsCache();
-					},
-				});
-
-				switch (sub) {
-					case "enable":
-					case "disable": {
-						const parsed = parsePluginScopeArgs(
-							rest ?? "",
-							`Usage: /plugins ${sub} [--scope user|project] <name@marketplace>`,
-						);
-						if ("error" in parsed) {
-							runtime.ctx.showStatus(parsed.error);
-							return;
-						}
-						const isEnable = sub === "enable";
-						await mgr.setPluginEnabled(parsed.pluginId, isEnable, parsed.scope);
-						runtime.ctx.showStatus(`${isEnable ? "Enabled" : "Disabled"} ${parsed.pluginId}`);
-						break;
-					}
-					case "list": {
+					// ── Installed list ──
+					case "installed": {
 						const lines: string[] = [];
-
 						const npm = new PluginManager();
 						const npmPlugins = await npm.list();
 						if (npmPlugins.length > 0) {
@@ -1136,7 +1118,6 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 								lines.push(`  ${p.name}@${p.version}${status}`);
 							}
 						}
-
 						const mktPlugins = await mgr.listInstalledPlugins();
 						if (mktPlugins.length > 0) {
 							if (lines.length > 0) lines.push("");
@@ -1148,7 +1129,6 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 								lines.push(`  ${p.id} v${entry?.version ?? "?"}${status} [${p.scope}]${shadowed}`);
 							}
 						}
-
 						if (lines.length === 0) {
 							runtime.ctx.showStatus("No plugins installed");
 						} else {
@@ -1156,19 +1136,78 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 						}
 						break;
 					}
-					default: {
+					// ── Validate ──
+					case "validate": {
+						const targetPath = rest
+							? path.resolve(runtime.ctx.sessionManager.getCwd(), rest)
+							: runtime.ctx.sessionManager.getCwd();
+						const catalogPath = path.join(targetPath, ".xcsh-plugin", "marketplace.json");
+						const pluginPath = path.join(targetPath, ".xcsh-plugin", "plugin.json");
+						const { existsSync } = await import("node:fs");
+						if (existsSync(catalogPath)) {
+							const { parseMarketplaceCatalog } = await import("../extensibility/plugins/marketplace/fetcher");
+							const content = await Bun.file(catalogPath).text();
+							const catalog = parseMarketplaceCatalog(content, catalogPath);
+							runtime.ctx.showStatus(
+								`Marketplace "${catalog.name}" is valid (${catalog.plugins.length} plugin(s))`,
+							);
+						} else if (existsSync(pluginPath)) {
+							const content = await Bun.file(pluginPath).text();
+							const manifest = JSON.parse(content);
+							runtime.ctx.showStatus(`Plugin "${manifest.name ?? path.basename(targetPath)}" manifest is valid`);
+						} else {
+							runtime.ctx.showStatus(
+								`No .xcsh-plugin/marketplace.json or .xcsh-plugin/plugin.json found at ${targetPath}`,
+							);
+						}
+						break;
+					}
+					// ── Help ──
+					case "help": {
 						runtime.ctx.showStatus(
-							"Usage: /plugins [list|enable|disable]\n\n" +
-								"  /plugins              Open plugin dashboard\n" +
-								"  /plugins list <query> List plugins matching query\n" +
-								"  /plugins enable <id>  Enable a plugin\n" +
-								"  /plugins disable <id> Disable a plugin",
+							[
+								"Plugin commands:",
+								"  /plugin                                    Open plugin dashboard",
+								"  /plugin marketplace add <source>           Add a marketplace (e.g. owner/repo)",
+								"  /plugin marketplace remove <name>          Remove a marketplace",
+								"  /plugin marketplace update [name]          Re-fetch catalog(s)",
+								"  /plugin marketplace list                   List configured marketplaces",
+								"  /plugin discover [marketplace]             Browse available plugins",
+								"  /plugin install <name@marketplace>         Install a plugin",
+								"  /plugin uninstall <name@marketplace>       Uninstall a plugin",
+								"  /plugin enable <name@marketplace>          Enable a plugin",
+								"  /plugin disable <name@marketplace>         Disable a plugin",
+								"  /plugin upgrade [name@marketplace]         Upgrade plugin(s)",
+								"  /plugin list                               List installed plugins",
+								"  /plugin validate [path]                    Validate marketplace or plugin",
+								"",
+								"Quick start:",
+								"  /plugin marketplace add f5xc-salesdemos/marketplace",
+								"  /plugin                                    (opens plugin dashboard)",
+								"",
+								"Aliases: /marketplace, /plugins",
+							].join("\n"),
 						);
 						break;
 					}
+					default: {
+						const marketplaces = await mgr.listMarketplaces();
+						if (marketplaces.length === 0) {
+							runtime.ctx.showStatus(
+								"No marketplaces configured.\n\nGet started:\n  /plugin marketplace add f5xc-salesdemos/marketplace\n\nThen browse plugins with /plugin or /plugin discover",
+							);
+						} else {
+							const lines = marketplaces.map(m => `  ${m.name}  ${m.sourceUri}`);
+							runtime.ctx.showStatus(
+								`Marketplaces:\n${lines.join("\n")}\n\nUse /plugin discover to browse plugins, or /plugin help for all commands`,
+							);
+						}
+						break;
+					}
 				}
 			} catch (err) {
-				runtime.ctx.showStatus(`Plugin error: ${err}`);
+				const msg = err instanceof Error ? err.message : String(err);
+				runtime.ctx.showStatus(`Plugin error: ${msg}`);
 			}
 		},
 	},

package/src/slash-commands/marketplace-install-parser.ts

@@ -1,4 +1,4 @@
-const USAGE = "Usage: /marketplace install [--force] [--scope user|project] <name@marketplace>";
+const USAGE = "Usage: /plugin install [--force] [--scope user|project] <name@marketplace>";
 
 export interface MarketplaceInstallArgs {
 	force: boolean;