@f5-sales-demo/xcsh 22.2.1 → 22.3.1

package/CHANGELOG.md

@@ -42,6 +42,9 @@
 
 ### Changed
 
+- Allowed explicit `xcsh plugin setup <plugin> --force` runs to refresh dynamic setup plans even
+  when the current integration receipt is already ready ([#4516](https://github.com/f5-sales-demo/xcsh/issues/4516)).
+
 - Made standalone executable and schema-v2 receipt updates transactional, canonicalized receipt paths,
   removed unused adjacent native payloads from standalone installs, and added published installer
   qualification on Linux, macOS, and Windows ([#4510](https://github.com/f5-sales-demo/xcsh/issues/4510)).

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "22.2.1",
+	"version": "22.3.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": "22.2.1",
-		"@f5-sales-demo/pi-ai": "22.2.1",
-		"@f5-sales-demo/pi-natives": "22.2.1",
-		"@f5-sales-demo/pi-resource-management": "22.2.1",
-		"@f5-sales-demo/pi-tui": "22.2.1",
-		"@f5-sales-demo/pi-utils": "22.2.1",
-		"@f5-sales-demo/xcsh-stats": "22.2.1",
+		"@f5-sales-demo/pi-agent-core": "22.3.1",
+		"@f5-sales-demo/pi-ai": "22.3.1",
+		"@f5-sales-demo/pi-natives": "22.3.1",
+		"@f5-sales-demo/pi-resource-management": "22.3.1",
+		"@f5-sales-demo/pi-tui": "22.3.1",
+		"@f5-sales-demo/pi-utils": "22.3.1",
+		"@f5-sales-demo/xcsh-stats": "22.3.1",
 		"@mozilla/readability": "^0.6",
 		"@resvg/resvg-wasm": "2.6.2",
 		"@sinclair/typebox": "0.34.52",

package/src/cli/plugin-cli.ts

@@ -28,7 +28,7 @@ import {
 	executeInstallAuthorizedSetup,
 	executeReviewedSetup,
 } from "../integrations/setup";
-import type { IntegrationHandle } from "../integrations/types";
+import type { IntegrationHandle, IntegrationState } from "../integrations/types";
 import { theme } from "../modes/theme/theme";
 import { personProfileService } from "../person-profile/service";
 import { ContextError, ContextService, type XCSHContext } from "../services/xcsh-context";
@@ -336,11 +336,18 @@ async function handleIntegrationStatus(args: string[], flags: { json?: boolean;
 	});
 }
 
-export async function reviewAndExecuteIntegrationSetup(handle: IntegrationHandle<unknown>) {
+export function shouldSkipIntegrationSetup(state: IntegrationState, force = false): boolean {
+	return state === "ready" && !force;
+}
+
+export async function reviewAndExecuteIntegrationSetup(
+	handle: IntegrationHandle<unknown>,
+	options: { force?: boolean } = {},
+) {
 	const plan = handle.setupPlan;
 	if (!plan) throw new Error(`Integration ${handle.id} does not declare setup`);
 	const current = await handle.get();
-	if (current.state === "ready") return current;
+	if (shouldSkipIntegrationSetup(current.state, options.force)) return current;
 	if (plan.guidedAction?.kind === "context_wizard")
 		throw new Error(
 			`Plugin ${handle.plugin ?? handle.id} setup requires interactive xcsh; run /plugin setup ${handle.plugin ?? handle.id} in the xcsh TUI.`,
@@ -358,19 +365,22 @@ export async function reviewAndExecuteIntegrationSetup(handle: IntegrationHandle
 	return result;
 }
 
-async function handleIntegrationSetup(args: string[], flags: { json?: boolean; context?: string }): Promise<void> {
+async function handleIntegrationSetup(
+	args: string[],
+	flags: { json?: boolean; context?: string; force?: boolean },
+): Promise<void> {
 	if (flags.json) throw new CliUsageError("plugin setup is human-only and does not accept --json");
-	if (args.length !== 1) throw new Error(`Usage: ${APP_NAME} plugin setup <plugin> [--context <name>]`);
+	if (args.length !== 1) throw new Error(`Usage: ${APP_NAME} plugin setup <plugin> [--context <name>] [--force]`);
 	if (!process.stdin.isTTY || !process.stdout.isTTY) throw new Error("Plugin setup requires an interactive terminal");
 	const handles = await loadIntegrationHandles();
 	await withPluginContext(flags.context, async () => {
 		const handle = selectSetupIntegration(handles, args[0]);
 		const current = await handle.get();
-		if (current.state === "ready") {
+		if (shouldSkipIntegrationSetup(current.state, flags.force)) {
 			process.stdout.write(`${handle.plugin ?? handle.id}: ready (setup is not required)\n`);
 			return;
 		}
-		const result = await reviewAndExecuteIntegrationSetup(handle);
+		const result = await reviewAndExecuteIntegrationSetup(handle, { force: flags.force });
 		process.stdout.write(
 			`${handle.plugin ?? handle.id}: ${result.state}${result.reason ? ` (${result.reason})` : ""}\n`,
 		);

package/src/cli/update-recommendation.ts

@@ -119,13 +119,7 @@ function receiptIsValid(
 		return false;
 	}
 	if (receipt.channel === "standalone") return deps.platform !== "win32";
-	if (deps.platform !== "win32") return false;
-	const localAppData = deps.env.LOCALAPPDATA;
-	if (!localAppData) return false;
-	return (
-		comparablePath(resolvedExecPath, deps.platform) ===
-		comparablePath(path.win32.join(localAppData, "xcsh", "xcsh.exe"), deps.platform)
-	);
+	return deps.platform === "win32";
 }
 
 async function defaultRun(command: string, args: string[]): Promise<CommandResult> {