@f5xc-salesdemos/xcsh 19.19.2 → 19.20.0

package/package.json

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

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.19.2",
-	"commit": "d290899d78e13a93ad30d7ea25a715fa92008abd",
-	"shortCommit": "d290899",
+	"version": "19.20.0",
+	"commit": "218c1d5ef18212bd9c034ea86f80927094c941c1",
+	"shortCommit": "218c1d5",
 	"branch": "main",
-	"tag": "v19.19.2",
-	"commitDate": "2026-06-09T01:09:30Z",
-	"buildDate": "2026-06-09T01:33:19.582Z",
+	"tag": "v19.20.0",
+	"commitDate": "2026-06-09T03:36:14Z",
+	"buildDate": "2026-06-09T04:39:54.571Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/d290899d78e13a93ad30d7ea25a715fa92008abd",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v19.19.2"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/218c1d5ef18212bd9c034ea86f80927094c941c1",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v19.20.0"
 };

package/src/modes/components/welcome-checks.ts

@@ -228,6 +228,95 @@ export interface RecommendedPluginStatus {
 	installed: boolean;
 }
 
+export type UnifiedPluginState = "connected" | "unauthenticated" | "unavailable" | "installed" | "not_installed";
+
+export interface UnifiedPluginStatus {
+	name: string;
+	state: UnifiedPluginState;
+	hint?: string;
+	group?: string;
+}
+
+export interface ServiceStatusContributionInput {
+	name: string;
+	group?: string;
+	check: () => Promise<{ state: ServiceState; hint?: string }>;
+}
+
+export async function buildUnifiedPluginList(
+	contributions: ServiceStatusContributionInput[],
+): Promise<UnifiedPluginStatus[]> {
+	const map = new Map<string, UnifiedPluginStatus>();
+
+	for (const contribution of contributions) {
+		try {
+			const status = await contribution.check();
+			map.set(contribution.name.toLowerCase(), {
+				name: contribution.name,
+				state: status.state,
+				hint: status.hint,
+				group: contribution.group,
+			});
+		} catch {
+			map.set(contribution.name.toLowerCase(), {
+				name: contribution.name,
+				state: "unavailable",
+				hint: "check failed",
+				group: contribution.group,
+			});
+		}
+	}
+
+	try {
+		const mgr = new MarketplaceManager({
+			marketplacesRegistryPath: getMarketplacesRegistryPath(),
+			installedRegistryPath: getInstalledPluginsRegistryPath(),
+			marketplacesCacheDir: getMarketplacesCacheDir(),
+			pluginsCacheDir: getPluginsCacheDir(),
+			clearPluginRootsCache: () => {},
+		});
+
+		const [marketplaces, installedSummaries] = await Promise.all([
+			mgr.listMarketplaces(),
+			mgr.listInstalledPlugins(),
+		]);
+
+		const installedIds = new Set(installedSummaries.map(s => s.id));
+
+		for (const mkt of marketplaces) {
+			const available = await mgr.listAvailablePlugins(mkt.name).catch(() => []);
+			for (const entry of available) {
+				if (!entry.recommended) continue;
+				const displayName = normalizePluginDisplayName(entry.name);
+				const key = displayName.toLowerCase();
+				if (map.has(key)) continue;
+				const pluginId = `${entry.name}@${mkt.name}`;
+				map.set(key, {
+					name: displayName,
+					state: installedIds.has(pluginId) ? "installed" : "not_installed",
+					hint: installedIds.has(pluginId) ? undefined : "run: /plugin setup",
+				});
+			}
+		}
+	} catch (err) {
+		logger.debug("buildUnifiedPluginList marketplace check failed", { error: String(err) });
+	}
+
+	const stateOrder: Record<UnifiedPluginState, number> = {
+		connected: 0,
+		unauthenticated: 1,
+		unavailable: 2,
+		installed: 3,
+		not_installed: 4,
+	};
+
+	return [...map.values()].sort((a, b) => {
+		const orderDiff = stateOrder[a.state] - stateOrder[b.state];
+		if (orderDiff !== 0) return orderDiff;
+		return a.name.localeCompare(b.name);
+	});
+}
+
 export async function checkRecommendedPlugins(): Promise<RecommendedPluginStatus[]> {
 	try {
 		const mgr = new MarketplaceManager({

package/src/modes/components/welcome.ts

@@ -2,7 +2,7 @@ import { type Component, padding, truncateToWidth, visibleWidth } from "@f5xc-sa
 import { APP_NAME } from "@f5xc-salesdemos/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import { formatStatusIcon } from "../../services/f5xc-context-indicators";
-import type { ModelStatus, RecommendedPluginStatus, ServiceStatus } from "./welcome-checks";
+import type { ModelStatus, RecommendedPluginStatus, ServiceStatus, UnifiedPluginStatus } from "./welcome-checks";
 
 export interface UpdateStatus {
 	available: boolean;
@@ -15,7 +15,8 @@ export class WelcomeComponent implements Component {
 		private modelStatus: ModelStatus,
 		private services: ServiceStatus[] = [],
 		private updateStatus?: UpdateStatus,
-		private recommendedPlugins: RecommendedPluginStatus[] = [],
+		private _recommendedPlugins: RecommendedPluginStatus[] = [],
+		private plugins: UnifiedPluginStatus[] = [],
 	) {}
 	invalidate(): void {}
 	setModelStatus(status: ModelStatus): void {
@@ -28,7 +29,10 @@ export class WelcomeComponent implements Component {
 		this.updateStatus = status;
 	}
 	setRecommendedPlugins(plugins: RecommendedPluginStatus[]): void {
-		this.recommendedPlugins = plugins;
+		this._recommendedPlugins = plugins;
+	}
+	setPlugins(plugins: UnifiedPluginStatus[]): void {
+		this.plugins = plugins;
 	}
 
 	render(termWidth: number): string[] {
@@ -127,23 +131,13 @@ export class WelcomeComponent implements Component {
 	#measureStatusWidth(): number {
 		const lines: string[] = [" Model Provider", ...this.#renderModelStatus()];
 		const coreServices = this.services.filter(s => !s._isPlugin);
-		const pluginServices = this.services.filter(s => s._isPlugin);
 		for (const svc of coreServices) {
 			lines.push(this.#renderServiceLine(svc));
 		}
-		if (pluginServices.length > 0) {
-			const groups = this.#groupPluginServices(pluginServices);
-			for (const [groupName] of groups) {
-				lines.push(` ${groupName}`);
-			}
-			for (const svc of pluginServices) {
-				lines.push(this.#renderServiceLine(svc));
-			}
-		}
-		if (this.recommendedPlugins.length > 0) {
-			lines.push(" Recommended Plugins");
-			for (const p of this.recommendedPlugins) {
-				lines.push(this.#renderRecommendedLine(p));
+		if (this.plugins.length > 0) {
+			lines.push(" Plugins");
+			for (const p of this.plugins) {
+				lines.push(this.#renderUnifiedPluginLine(p));
 			}
 		}
 		if (this.#showUpdateSection()) {
@@ -152,15 +146,15 @@ export class WelcomeComponent implements Component {
 		return Math.max(...lines.map(l => visibleWidth(l)));
 	}
 
-	#groupPluginServices(plugins: ServiceStatus[]): Map<string, ServiceStatus[]> {
-		const groups = new Map<string, ServiceStatus[]>();
-		for (const svc of plugins) {
-			const groupName = svc._group ?? "Plugins";
-			const list = groups.get(groupName) ?? [];
-			list.push(svc);
-			groups.set(groupName, list);
+	#renderUnifiedPluginLine(plugin: UnifiedPluginStatus): string {
+		if (plugin.state === "connected" || plugin.state === "installed") {
+			return ` ${formatStatusIcon("connected")} ${theme.fg("muted", plugin.name)}`;
+		}
+		if (plugin.state === "not_installed") {
+			return ` ${theme.fg("dim", "·")} ${theme.fg("dim", plugin.name)}`;
 		}
-		return groups;
+		const hint = plugin.hint ?? "";
+		return ` ${formatStatusIcon("warning")} ${theme.fg("muted", plugin.name)}  ${theme.fg("dim", hint)}`;
 	}
 
 	#buildStatusLines(rightCol: number): string[] {
@@ -172,34 +166,19 @@ export class WelcomeComponent implements Component {
 		lines.push(...this.#renderModelStatus());
 		lines.push("");
 		const coreServices = this.services.filter(s => !s._isPlugin);
-		const pluginServices = this.services.filter(s => s._isPlugin);
-		const hasContent =
-			coreServices.length > 0 ||
-			pluginServices.length > 0 ||
-			this.recommendedPlugins.length > 0 ||
-			this.#showUpdateSection();
+		const hasContent = coreServices.length > 0 || this.plugins.length > 0 || this.#showUpdateSection();
 		if (hasContent) {
 			lines.push(separator);
 			for (const svc of coreServices) {
 				lines.push(this.#renderServiceLine(svc));
 			}
-			if (pluginServices.length > 0) {
-				const groups = this.#groupPluginServices(pluginServices);
-				for (const [groupName, groupServices] of groups) {
-					lines.push("");
-					lines.push(` ${theme.fg("dim", groupName)}`);
-					for (const svc of groupServices) {
-						lines.push(this.#renderServiceLine(svc));
-					}
-				}
-			}
-			if (this.recommendedPlugins.length > 0) {
+			if (this.plugins.length > 0) {
 				lines.push("");
-				lines.push(` ${theme.fg("dim", "Recommended Plugins")}`);
-				for (const p of this.recommendedPlugins) {
-					lines.push(this.#renderRecommendedLine(p));
+				lines.push(` ${theme.fg("dim", "Plugins")}`);
+				for (const p of this.plugins) {
+					lines.push(this.#renderUnifiedPluginLine(p));
 				}
-				const missing = this.recommendedPlugins.filter(p => !p.installed);
+				const missing = this.plugins.filter(p => p.state === "not_installed");
 				if (missing.length > 0) {
 					lines.push(`   ${theme.fg("dim", "run: /plugin setup")}`);
 				}
@@ -213,13 +192,6 @@ export class WelcomeComponent implements Component {
 		return lines;
 	}
 
-	#renderRecommendedLine(plugin: RecommendedPluginStatus): string {
-		if (plugin.installed) {
-			return ` ${formatStatusIcon("connected")} ${theme.fg("muted", plugin.name)}`;
-		}
-		return ` ${theme.fg("dim", "·")} ${theme.fg("dim", plugin.name)}`;
-	}
-
 	#showUpdateSection(): boolean {
 		return this.updateStatus?.available === true;
 	}

package/src/modes/interactive-mode.ts

@@ -53,7 +53,7 @@ import { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
 import { type UpdateStatus, WelcomeComponent } from "./components/welcome";
 import {
-	checkRecommendedPlugins,
+	buildUnifiedPluginList,
 	type FixableService,
 	mapContextStatus,
 	runWelcomeChecks,
@@ -340,62 +340,40 @@ export class InteractiveMode implements InteractiveModeContext {
 				? [mapContextStatus(welcomeResult.context ?? { state: "no_context" })]
 				: [];
 
-		// Collect service statuses from plugins
-		if (this.session.extensionRunner) {
-			const pluginContributions = this.session.extensionRunner.getAllRegisteredServiceStatuses();
-			for (const contribution of pluginContributions) {
-				try {
-					const status = await contribution.check();
-					services.push({ name: contribution.name, ...status, _isPlugin: true, _group: contribution.group });
-				} catch {
-					services.push({
-						name: contribution.name,
-						state: "unavailable",
-						hint: "check failed",
-						_isPlugin: true,
-						_group: contribution.group,
-					});
-				}
-			}
-		}
+		// Build unified plugin list from service status contributions + marketplace
+		const pluginContributions = this.session.extensionRunner?.getAllRegisteredServiceStatuses() ?? [];
+		const plugins = !startupQuiet ? await buildUnifiedPluginList(pluginContributions).catch(() => []) : [];
 
 		const fixableServices: FixableService[] = [];
-
-		// Add fixable services from plugins
-		if (this.session.extensionRunner) {
-			const pluginContributions = this.session.extensionRunner.getAllRegisteredServiceStatuses();
-			for (const contribution of pluginContributions) {
-				if (contribution.fix) {
-					// Find the status we already checked above
-					const status = services.find(s => s.name === contribution.name);
-					if (status && status.state === "unauthenticated") {
-						fixableServices.push({
-							name: contribution.name,
-							prompt: contribution.fix.prompt,
-							command: contribution.fix.command,
-							recheck: async () => {
-								try {
-									const result = await contribution.check();
-									return { name: contribution.name, ...result };
-								} catch {
-									return { name: contribution.name, state: "unavailable" as const, hint: "recheck failed" };
-								}
-							},
-						});
-					}
+		for (const contribution of pluginContributions) {
+			if (contribution.fix) {
+				const plugin = plugins.find(p => p.name.toLowerCase() === contribution.name.toLowerCase());
+				if (plugin && plugin.state === "unauthenticated") {
+					fixableServices.push({
+						name: contribution.name,
+						prompt: contribution.fix.prompt,
+						command: contribution.fix.command,
+						recheck: async () => {
+							try {
+								const result = await contribution.check();
+								return { name: contribution.name, ...result };
+							} catch {
+								return { name: contribution.name, state: "unavailable" as const, hint: "recheck failed" };
+							}
+						},
+					});
 				}
 			}
 		}
 
-		const recommendedPlugins = !startupQuiet ? await checkRecommendedPlugins().catch(() => []) : [];
-
 		if (!startupQuiet) {
 			this.#welcomeComponent = new WelcomeComponent(
 				this.#version,
 				welcomeResult.model,
 				services,
 				this.#initialUpdateStatus,
-				recommendedPlugins,
+				[],
+				plugins,
 			);
 
 			// Setup UI layout

package/src/prompts/tools/xcsh-api.md

@@ -113,6 +113,6 @@ Swap exactly one block per oneOf group — e.g. `enable_ha {}` replaces `disable
 - `site_mesh_group_on_slo { site_mesh_group { name = "<n>", namespace = "system" } }` ← note the nested `site_mesh_group` wrapper
 - `custom_proxy { proxy_ip_address = "proxy.example.com", proxy_port = 8080 }` ← use `proxy_ip_address`/`proxy_port` (NOT `http_proxy`/`https_proxy`)
 - `custom_proxy_bypass { proxy_bypass = ["10.0.0.0/8"] }` ← use `proxy_bypass` (NOT `bypass_list`)
-- `blocked_services { blocked_service { network_type = "VIRTUAL_NETWORK_SITE_LOCAL" } }` ← use `blocked_service` with `network_type` (NOT `service_list`)
+- `blocked_services { blocked_service { network_type = "VIRTUAL_NETWORK_SITE_LOCAL" } }` ← use `blocked_service` with `network_type` (NOT `service_list`). In Terraform, "blocking HTTP services" = blocking `VIRTUAL_NETWORK_SITE_LOCAL` network type. Always write the file even when the phrase mentions "HTTP service in blocked services list" — map it to `blocked_service { network_type = "VIRTUAL_NETWORK_SITE_LOCAL" }`
 
 **CRITICAL — Terraform file write rule**: When asked to "Write Terraform HCL for f5xc_securemesh_site_v2", you **MUST** use the `xcsh_write_file` tool to write the complete `.tf` file to disk. Always name the file after the resource name in the request (e.g., `ar-test-smsv2-1a.tf`). Do NOT just return a coverage table — always write the actual HCL file. The file must include a `terraform { required_providers { f5xc = { source = "f5xc-salesdemos/f5xc" } } }` block and the complete `resource "f5xc_securemesh_site_v2"` block with all 12 oneOf groups.