@f5-sales-demo/xcsh 19.85.2 → 19.85.4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "19.85.2",
+	"version": "19.85.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -56,13 +56,13 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5-sales-demo/xcsh-stats": "19.85.2",
-		"@f5-sales-demo/pi-agent-core": "19.85.2",
-		"@f5-sales-demo/pi-ai": "19.85.2",
-		"@f5-sales-demo/pi-natives": "19.85.2",
-		"@f5-sales-demo/pi-resource-management": "19.85.2",
-		"@f5-sales-demo/pi-tui": "19.85.2",
-		"@f5-sales-demo/pi-utils": "19.85.2",
+		"@f5-sales-demo/xcsh-stats": "19.85.4",
+		"@f5-sales-demo/pi-agent-core": "19.85.4",
+		"@f5-sales-demo/pi-ai": "19.85.4",
+		"@f5-sales-demo/pi-natives": "19.85.4",
+		"@f5-sales-demo/pi-resource-management": "19.85.4",
+		"@f5-sales-demo/pi-tui": "19.85.4",
+		"@f5-sales-demo/pi-utils": "19.85.4",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.20",

package/src/browser/chat-handler.ts

@@ -205,12 +205,16 @@ export class ChatHandler {
 			return;
 		}
 		if (event.type === "tool_execution_end" && "toolName" in event) {
+			// ToolExecutionEndEvent carries `isError` (NOT `error`) — checking the wrong
+			// field made this always ok:true, so errored tools rendered ✓ and "failed"
+			// never fired. Read the real field.
+			const failed = "isError" in event && Boolean(event.isError);
 			this.#server.send({
 				type: "chat_tool_notice",
 				id: chat.id,
 				tool: String(event.toolName),
-				ok: !("error" in event && event.error),
-				detail: `${event.toolName}: ${"error" in event && event.error ? "failed" : "done"}`,
+				ok: !failed,
+				detail: `${event.toolName}: ${failed ? "failed" : "done"}`,
 			});
 			return;
 		}

package/src/cli/classify-install-target.ts

@@ -2,11 +2,17 @@
  * Classify an install spec as a marketplace plugin reference or a plain npm package.
  *
  * Rules (applied in order):
+ *  0. `npm:<pkg>` prefix -> always npm (explicit escape hatch; the prefix is stripped).
  *  1. Starts with `@` (scoped npm) -> always npm.
  *  2. Contains `@` after the first character -> split on the LAST `@`.
  *     If the right-hand side is a known marketplace name, it's a marketplace ref.
  *     Otherwise it's an npm spec (e.g. `pkg@1.2.3`).
- *  3. No `@` -> npm.
+ *  3. Bare name (no `@`) -> look it up against the marketplace catalog index:
+ *       - exactly one marketplace publishes it -> marketplace ref;
+ *       - more than one -> ambiguous (caller errors and asks for `name@marketplace`);
+ *       - none (or no index supplied) -> npm.
+ *     This is what makes `xcsh plugin install azure` resolve to the marketplace
+ *     `azure` plugin rather than the public npm package of the same name.
  */
 // Common npm dist-tags that should never be interpreted as marketplace names
 const NPM_DIST_TAGS = new Set([
@@ -25,10 +31,19 @@ const NPM_DIST_TAGS = new Set([
 // Semver-like: starts with digit, or contains version range prefixes
 const LOOKS_LIKE_VERSION = /^[\d~^>=<]/;
 
+export type InstallTarget =
+	| { type: "marketplace"; name: string; marketplace: string }
+	| { type: "ambiguous"; name: string; marketplaces: string[] }
+	| { type: "npm"; spec: string };
+
 export function classifyInstallTarget(
 	spec: string,
 	knownMarketplaces: Set<string>,
-): { type: "marketplace"; name: string; marketplace: string } | { type: "npm"; spec: string } {
+	/** plugin name -> marketplaces whose catalog publishes a plugin with that name */
+	catalogIndex?: Map<string, string[]>,
+): InstallTarget {
+	// Rule 0: explicit npm escape hatch — force npm even if a marketplace shares the name.
+	if (spec.startsWith("npm:")) return { type: "npm", spec: spec.slice("npm:".length) };
 	// Rule 1: scoped npm package — @ at position 0 is never a marketplace separator.
 	if (spec.startsWith("@")) return { type: "npm", spec };
 	// Rule 2: @ somewhere after the first character.
@@ -45,6 +60,14 @@ export function classifyInstallTarget(
 		// Not a known marketplace — treat as npm version specifier.
 		return { type: "npm", spec };
 	}
-	// Rule 3: no @ at all.
+	// Rule 3: bare name — resolve against the marketplace catalog index before npm.
+	const sources = catalogIndex?.get(spec);
+	if (sources && sources.length === 1) {
+		return { type: "marketplace", name: spec, marketplace: sources[0] };
+	}
+	if (sources && sources.length > 1) {
+		return { type: "ambiguous", name: spec, marketplaces: sources };
+	}
+	// Rule 4: no marketplace publishes this name — plain npm package.
 	return { type: "npm", spec };
 }

package/src/cli/plugin-cli.ts

@@ -311,10 +311,10 @@ async function handleUpgrade(args: string[], flags: PluginCommandArgs["flags"]):
 	try {
 		if (pluginId) {
 			if (flags.scope) {
-				const result = await manager.upgradePlugin(pluginId, flags.scope);
+				const result = await manager.upgradePlugin(pluginId, flags.scope, { refresh: true });
 				console.log(chalk.green(`Upgraded ${pluginId} (${flags.scope}) to ${result.version}`));
 			} else {
-				const entries = await manager.upgradePluginAcrossScopes(pluginId);
+				const entries = await manager.upgradePluginAcrossScopes(pluginId, { refresh: true });
 				for (const entry of entries) {
 					console.log(chalk.green(`Upgraded ${pluginId} (${entry.scope}) to ${entry.version}`));
 				}
@@ -327,7 +327,7 @@ async function handleUpgrade(args: string[], flags: PluginCommandArgs["flags"]):
 					),
 				);
 			}
-			const results = await manager.upgradeAllPlugins();
+			const results = await manager.upgradeAllPlugins({ refresh: true });
 			if (results.length === 0) {
 				console.log("All marketplace plugins are up to date.");
 			} else {
@@ -355,12 +355,39 @@ async function handleInstall(
 		process.exit(1);
 	}
 
-	// Build known marketplace set for classification
+	// Build classification inputs: known marketplace names, plus a catalog index
+	// (plugin name -> marketplaces that publish it) so a bare name resolves to the
+	// marketplace plugin instead of a same-named public npm package.
 	const mktMgr = await makeMarketplaceManager();
-	const knownMarketplaces = new Set((await mktMgr.listMarketplaces()).map(m => m.name));
+	const marketplaces = await mktMgr.listMarketplaces();
+	const knownMarketplaces = new Set(marketplaces.map(m => m.name));
+	const catalogIndex = new Map<string, string[]>();
+	for (const mp of marketplaces) {
+		let plugins: Awaited<ReturnType<typeof mktMgr.listAvailablePlugins>>;
+		try {
+			plugins = await mktMgr.listAvailablePlugins(mp.name);
+		} catch {
+			continue; // a broken/uncloned catalog must not block installs from others
+		}
+		for (const p of plugins) {
+			const sources = catalogIndex.get(p.name) ?? [];
+			if (!sources.includes(mp.name)) sources.push(mp.name);
+			catalogIndex.set(p.name, sources);
+		}
+	}
 
 	for (const spec of packages) {
-		const target = classifyInstallTarget(spec, knownMarketplaces);
+		const target = classifyInstallTarget(spec, knownMarketplaces, catalogIndex);
+
+		if (target.type === "ambiguous") {
+			console.error(
+				chalk.red(
+					`${theme.status.error} "${target.name}" is published by multiple marketplaces: ${target.marketplaces.join(", ")}.`,
+				),
+			);
+			console.error(chalk.dim(`Disambiguate with ${target.name}@<marketplace>.`));
+			process.exit(1);
+		}
 
 		if (target.type === "marketplace") {
 			try {

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

@@ -563,9 +563,13 @@ export class MarketplaceManager {
 	// Compare installed plugin versions against their catalog entries.
 	// Returns one entry per (pluginId, scope) pair where the catalog declares a newer version.
 	// Catalog entries without a version field are skipped.
-	async checkForUpdates(): Promise<
-		Array<{ pluginId: string; scope: "user" | "project" | "local"; from: string; to: string }>
-	> {
+	async checkForUpdates(opts?: {
+		refresh?: boolean;
+	}): Promise<Array<{ pluginId: string; scope: "user" | "project" | "local"; from: string; to: string }>> {
+		// Explicit upgrade flows pass refresh:true to re-fetch catalogs from source before
+		// comparing, so freshly-published versions are seen. Passive callers (startup notify,
+		// dashboard poll) omit it and rely on the 24h TTL (refreshStaleMarketplaces).
+		if (opts?.refresh) await this.updateAllMarketplaces();
 		const mktReg = await readMarketplacesRegistry(this.#opts.marketplacesRegistryPath);
 		const updates: Array<{ pluginId: string; scope: "user" | "project" | "local"; from: string; to: string }> = [];
 
@@ -620,7 +624,12 @@ export class MarketplaceManager {
 	}
 
 	// Re-install a specific plugin at the latest catalog version (force-overwrites).
-	async upgradePlugin(pluginId: string, scope?: "user" | "project" | "local"): Promise<InstalledPluginEntry> {
+	async upgradePlugin(
+		pluginId: string,
+		scope?: "user" | "project" | "local",
+		opts?: { refresh?: boolean },
+	): Promise<InstalledPluginEntry> {
+		if (opts?.refresh) await this.updateAllMarketplaces();
 		const parsed = parsePluginId(pluginId);
 		if (!parsed) {
 			throw new Error(`Invalid plugin ID: "${pluginId}". Expected "name@marketplace".`);
@@ -656,7 +665,8 @@ export class MarketplaceManager {
 
 	// Upgrade a plugin across all scopes where it is installed.
 	// Returns one entry per scope upgraded (0–2 entries).
-	async upgradePluginAcrossScopes(pluginId: string): Promise<InstalledPluginEntry[]> {
+	async upgradePluginAcrossScopes(pluginId: string, opts?: { refresh?: boolean }): Promise<InstalledPluginEntry[]> {
+		if (opts?.refresh) await this.updateAllMarketplaces();
 		const parsed = parsePluginId(pluginId);
 		if (!parsed) {
 			throw new Error(`Invalid plugin ID: "${pluginId}". Expected "name@marketplace".`);
@@ -688,10 +698,10 @@ export class MarketplaceManager {
 	// Upgrade every (pluginId, scope) pair that checkForUpdates reports as outdated.
 	// Only stale scopes are touched; a current user install is not re-installed when only
 	// the project scope is stale. Per-entry failures are skipped — partial success is returned.
-	async upgradeAllPlugins(): Promise<
-		Array<{ pluginId: string; scope: "user" | "project" | "local"; from: string; to: string }>
-	> {
-		const updates = await this.checkForUpdates();
+	async upgradeAllPlugins(opts?: {
+		refresh?: boolean;
+	}): Promise<Array<{ pluginId: string; scope: "user" | "project" | "local"; from: string; to: string }>> {
+		const updates = await this.checkForUpdates(opts);
 		const results: Array<{ pluginId: string; scope: "user" | "project" | "local"; from: string; to: string }> = [];
 		for (const update of updates) {
 			try {

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.85.2",
-	"commit": "a068b469d7c985c518847bf2862acabc1605f490",
-	"shortCommit": "a068b46",
+	"version": "19.85.4",
+	"commit": "d014668cc60902dc4545082fc2c4c2062dff4046",
+	"shortCommit": "d014668",
 	"branch": "main",
-	"tag": "v19.85.2",
-	"commitDate": "2026-07-23T18:30:49Z",
-	"buildDate": "2026-07-23T18:54:23.656Z",
+	"tag": "v19.85.4",
+	"commitDate": "2026-07-23T21:02:17Z",
+	"buildDate": "2026-07-23T21:25:20.917Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5-sales-demo/xcsh",
 	"repoSlug": "f5-sales-demo/xcsh",
-	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/a068b469d7c985c518847bf2862acabc1605f490",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.85.2"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/d014668cc60902dc4545082fc2c4c2062dff4046",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v19.85.4"
 };

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

@@ -353,7 +353,7 @@ export class PluginDashboard extends Container {
 		this.#rebuildAndRender();
 
 		try {
-			await this.#mgr.upgradePlugin(plugin.id, plugin.scope);
+			await this.#mgr.upgradePlugin(plugin.id, plugin.scope, { refresh: true });
 			this.#state.notice = t("plugins.dashboard.upgraded", { name: plugin.name });
 			await this.#reloadData();
 		} catch (error) {

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

@@ -1144,12 +1144,12 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 								runtime.ctx.showStatus(upArgs.error);
 								return;
 							}
-							const result = await mgr.upgradePlugin(upArgs.pluginId, upArgs.scope);
+							const result = await mgr.upgradePlugin(upArgs.pluginId, upArgs.scope, { refresh: true });
 							runtime.ctx.showStatus(
 								t("commands.plugin.upgraded", { pluginId: upArgs.pluginId, version: result.version }),
 							);
 						} else {
-							const results = await mgr.upgradeAllPlugins();
+							const results = await mgr.upgradeAllPlugins({ refresh: true });
 							if (results.length === 0) {
 								runtime.ctx.showStatus(t("commands.plugin.allUpToDate"));
 							} else {