@f5xc-salesdemos/xcsh 18.65.1 → 18.66.1

package/package.json

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

package/scripts/generate-api-spec-index.ts

@@ -90,6 +90,35 @@ const REPO = "f5xc-salesdemos/api-specs-enriched";
 const outputPath = path.resolve(import.meta.dir, "../src/internal-urls/api-spec-index.generated.ts");
 const catalogOutputPath = path.resolve(import.meta.dir, "../src/internal-urls/api-catalog-index.generated.ts");
 
+const MAX_RETRIES = 3;
+const INITIAL_BACKOFF_MS = 2000;
+
+async function fetchWithRetry(url: string, init?: RequestInit): Promise<Response> {
+	let lastError: Error | null = null;
+	for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+		if (attempt > 0) {
+			const delay = INITIAL_BACKOFF_MS * 2 ** (attempt - 1);
+			console.warn(`  Retry ${attempt}/${MAX_RETRIES} after ${delay}ms...`);
+			await Bun.sleep(delay);
+		}
+		try {
+			const response = await fetch(url, init);
+			if (response.status === 403 || response.status === 429) {
+				const retryAfter = response.headers.get("retry-after");
+				const waitMs = retryAfter ? Number.parseInt(retryAfter, 10) * 1000 : INITIAL_BACKOFF_MS * 2 ** attempt;
+				console.warn(`  Rate limited (${response.status}), waiting ${waitMs}ms...`);
+				await Bun.sleep(waitMs);
+				continue;
+			}
+			return response;
+		} catch (err) {
+			lastError = err instanceof Error ? err : new Error(String(err));
+			console.warn(`  Fetch failed: ${lastError.message}`);
+		}
+	}
+	throw lastError ?? new Error(`Failed to fetch ${url} after ${MAX_RETRIES} retries`);
+}
+
 function githubHeaders(): Record<string, string> {
 	const headers: Record<string, string> = { Accept: "application/vnd.github+json" };
 	const token = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
@@ -98,7 +127,7 @@ function githubHeaders(): Record<string, string> {
 }
 
 async function resolveLatestTag(): Promise<string> {
-	const response = await fetch(`https://api.github.com/repos/${REPO}/releases/latest`, {
+	const response = await fetchWithRetry(`https://api.github.com/repos/${REPO}/releases/latest`, {
 		headers: githubHeaders(),
 	});
 	if (!response.ok) {
@@ -119,7 +148,7 @@ async function downloadFromRelease(): Promise<string> {
 	const downloadUrl = `https://github.com/${REPO}/releases/download/${tag}/${zipName}`;
 
 	console.log(`Downloading API specs from ${downloadUrl}...`);
-	const response = await fetch(downloadUrl, { redirect: "follow" });
+	const response = await fetchWithRetry(downloadUrl, { redirect: "follow" });
 	if (!response.ok) {
 		throw new Error(`Failed to download release: ${response.status} ${response.statusText}`);
 	}
@@ -172,7 +201,7 @@ async function downloadCatalog(specsDir: string): Promise<Record<string, unknown
 	const catalogUrl = `https://github.com/${REPO}/releases/download/${catalogTag}/api-catalog.json`;
 	console.log(`Downloading API catalog from ${catalogUrl}...`);
 	try {
-		const response = await fetch(catalogUrl, { redirect: "follow" });
+		const response = await fetchWithRetry(catalogUrl, { redirect: "follow" });
 		if (!response.ok) {
 			console.warn(`api-catalog.json not found (${response.status}), skipping catalog generation`);
 			return null;
@@ -192,6 +221,11 @@ function serializeEnrichment(key: string, value: unknown): string | undefined {
 
 let downloadedTmpDir: string | null = null;
 
+if (fs.existsSync(outputPath) && fs.existsSync(catalogOutputPath) && process.env.CI) {
+	console.log("Generated spec files already exist in CI — skipping regeneration.");
+	process.exit(0);
+}
+
 const specsDir = await findSpecsDir();
 console.log(`Reading specs from: ${specsDir}`);
 

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "18.65.1",
-	"commit": "cde21a9824f2077e0f4124b57d49c7a3edcd4815",
-	"shortCommit": "cde21a9",
+	"version": "18.66.1",
+	"commit": "90d34ed7bee228bbc7e09126b5e9e71aee873861",
+	"shortCommit": "90d34ed",
 	"branch": "main",
-	"tag": "v18.65.1",
-	"commitDate": "2026-05-17T16:52:00Z",
-	"buildDate": "2026-05-17T17:11:40.789Z",
-	"dirty": true,
+	"tag": "v18.66.1",
+	"commitDate": "2026-05-18T06:44:43Z",
+	"buildDate": "2026-05-18T07:08:42.105Z",
+	"dirty": false,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/cde21a9824f2077e0f4124b57d49c7a3edcd4815",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.65.1"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/90d34ed7bee228bbc7e09126b5e9e71aee873861",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.66.1"
 };

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

@@ -1,6 +1,6 @@
 import type { Model } from "@f5xc-salesdemos/pi-ai";
 import { validateApiKeyAgainstModelsEndpoint } from "@f5xc-salesdemos/pi-ai/utils/oauth/api-key-validation";
-import { $which, logger } from "@f5xc-salesdemos/pi-utils";
+import { $which, getProjectDir, logger } from "@f5xc-salesdemos/pi-utils";
 import { $ } from "bun";
 import { loadProfile } from "../../internal-urls/user-profile";
 import { type AuthStatus, ContextService } from "../../services/f5xc-context";
@@ -595,3 +595,72 @@ export async function checkProfileStatus(): Promise<WelcomeProfileStatus | undef
 		return { state: "missing" };
 	}
 }
+
+export interface FixableService {
+	name: string;
+	prompt: string;
+	command: string[];
+	recheck: () => Promise<ServiceStatus>;
+}
+
+export function getFixableServices(statuses: {
+	aws: WelcomeAwsStatus | undefined;
+	azure: WelcomeAzureStatus | undefined;
+	gcloud: WelcomeGcloudStatus | undefined;
+	github: WelcomeGitHubStatus | undefined;
+	gitlab: WelcomeGitLabStatus | undefined;
+	salesforce: WelcomeSalesforceStatus | undefined;
+}): FixableService[] {
+	const fixable: FixableService[] = [];
+
+	if (statuses.gitlab?.state === "auth_error") {
+		fixable.push({
+			name: "GitLab",
+			prompt: "GitLab not authenticated",
+			command: ["glab", "auth", "login"],
+			recheck: async () => mapGitLabStatus(await checkGitLabStatus(getProjectDir())),
+		});
+	}
+	if (statuses.github?.state === "auth_error") {
+		fixable.push({
+			name: "GitHub",
+			prompt: "GitHub not authenticated",
+			command: ["gh", "auth", "login"],
+			recheck: async () => mapGitHubStatus(await checkGitHubStatus()),
+		});
+	}
+	if (statuses.salesforce?.state === "session_expired") {
+		fixable.push({
+			name: "Salesforce",
+			prompt: "Salesforce session expired",
+			command: ["sf", "org", "login", "web"],
+			recheck: async () => mapSalesforceStatus(await checkSalesforceStatus(getProjectDir())),
+		});
+	}
+	if (statuses.azure?.state === "auth_error") {
+		fixable.push({
+			name: "Azure",
+			prompt: "Azure session expired",
+			command: ["az", "login", "--use-device-code"],
+			recheck: async () => mapAzureStatus(await checkAzureStatus()),
+		});
+	}
+	if (statuses.aws?.state === "sso_expired") {
+		fixable.push({
+			name: "AWS",
+			prompt: "AWS SSO session expired",
+			command: ["aws", "sso", "login"],
+			recheck: async () => mapAwsStatus(await checkAwsStatus()),
+		});
+	}
+	if (statuses.gcloud?.state === "token_expired") {
+		fixable.push({
+			name: "Google Cloud",
+			prompt: "Google Cloud token expired",
+			command: ["gcloud", "auth", "login"],
+			recheck: async () => mapGcloudStatus(await checkGcloudStatus()),
+		});
+	}
+
+	return fixable;
+}

package/src/modes/interactive-mode.ts

@@ -60,6 +60,8 @@ import {
 	checkGitHubStatus,
 	checkGitLabStatus,
 	checkSalesforceStatus,
+	type FixableService,
+	getFixableServices,
 	mapAwsStatus,
 	mapAzureStatus,
 	mapContextStatus,
@@ -68,6 +70,7 @@ import {
 	mapGitLabStatus,
 	mapSalesforceStatus,
 	runWelcomeChecks,
+	type ServiceStatus,
 } from "./components/welcome-checks";
 import { BtwController } from "./controllers/btw-controller";
 import { CommandController } from "./controllers/command-controller";
@@ -358,20 +361,32 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.ui.addChild(new Spacer(1));
 		}
 
+		const services =
+			!startupQuiet && welcomeResult.model.state === "connected"
+				? [
+						mapContextStatus(welcomeResult.context ?? { state: "no_context" }),
+						mapGitLabStatus(gitlabStatus),
+						mapGitHubStatus(githubStatus),
+						mapSalesforceStatus(salesforceStatus),
+						mapAzureStatus(azureStatus),
+						mapAwsStatus(awsStatus),
+						mapGcloudStatus(gcloudStatus),
+					]
+				: [];
+
+		const fixableServices =
+			!startupQuiet && welcomeResult.model.state === "connected"
+				? getFixableServices({
+						aws: awsStatus,
+						azure: azureStatus,
+						gcloud: gcloudStatus,
+						github: githubStatus,
+						gitlab: gitlabStatus,
+						salesforce: salesforceStatus,
+					})
+				: [];
+
 		if (!startupQuiet) {
-			// Welcome box owns all startup notifications (model, services, update)
-			const services =
-				welcomeResult.model.state === "connected"
-					? [
-							mapContextStatus(welcomeResult.context ?? { state: "no_context" }),
-							mapGitLabStatus(gitlabStatus),
-							mapGitHubStatus(githubStatus),
-							mapSalesforceStatus(salesforceStatus),
-							mapAzureStatus(azureStatus),
-							mapAwsStatus(awsStatus),
-							mapGcloudStatus(gcloudStatus),
-						]
-					: [];
 			this.#welcomeComponent = new WelcomeComponent(
 				this.#version,
 				welcomeResult.model,
@@ -423,6 +438,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		// Initialize hooks with TUI-based UI context
 		await this.initHooksAndCustomTools();
 
+		// Offer to fix expired cloud credentials before entering the main loop
+		if (fixableServices.length > 0) {
+			await this.#offerCredentialFixes(fixableServices, services);
+		}
+
 		// Restore mode from session (e.g. plan mode on resume)
 		await this.#restoreModeFromSession();
 
@@ -913,6 +933,40 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 	}
 
+	async #offerCredentialFixes(fixable: FixableService[], currentServices: ServiceStatus[]): Promise<void> {
+		for (const service of fixable) {
+			const confirmed = await this.#extensionUiController.showHookConfirm(
+				`${service.name} login`,
+				`${service.prompt}. Fix now?`,
+			);
+			if (!confirmed) continue;
+
+			this.ui.stop();
+			try {
+				const proc = Bun.spawn(service.command, {
+					stdin: "inherit",
+					stdout: "inherit",
+					stderr: "inherit",
+				});
+				await proc.exited;
+			} catch (error) {
+				logger.warn(`Auto-fix for ${service.name} failed`, { error: String(error) });
+			} finally {
+				const clearScreen = settings.get("startup.clearScreen");
+				this.ui.start(clearScreen);
+				this.ui.requestRender(true);
+			}
+
+			const updated = await service.recheck();
+			const idx = currentServices.findIndex(s => s.name === service.name);
+			if (idx !== -1) {
+				currentServices[idx] = updated;
+				this.#welcomeComponent?.setServices([...currentServices]);
+				this.ui.requestRender();
+			}
+		}
+	}
+
 	async #approvePlan(
 		planContent: string,
 		options: { planFilePath: string; finalPlanFilePath: string },

package/src/tools/xcsh-api-renderer.ts

@@ -4,7 +4,7 @@ import { Text } from "@f5xc-salesdemos/pi-tui";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme, ThemeColor } from "../modes/theme/theme";
 import { highlightCode } from "../modes/theme/theme";
-import { CachedOutputBlock, renderStatusLine } from "../tui";
+import { CachedOutputBlock, F5_TOOL_BORDER_COLOR, renderStatusLine } from "../tui";
 import { formatErrorMessage, replaceTabs } from "./render-utils";
 import type { XcshApiToolDetails } from "./xcsh-api";
 
@@ -209,7 +209,7 @@ export const xcshApiToolRenderer = {
 				render(width: number): string[] {
 					const state = options.isPartial ? "pending" : "success";
 					return batchBlock.render(
-						{ header: batchHeader, state, sections: batchSections, width, borderColor: "border" },
+						{ header: batchHeader, state, sections: batchSections, width, borderColor: F5_TOOL_BORDER_COLOR },
 						uiTheme,
 					);
 				},
@@ -383,7 +383,10 @@ export const xcshApiToolRenderer = {
 		return {
 			render(width: number): string[] {
 				const state = options.isPartial ? "pending" : isError ? "error" : "success";
-				return outputBlock.render({ header, state, sections, width, borderColor: "border" }, uiTheme);
+				return outputBlock.render(
+					{ header, state, sections, width, borderColor: isError ? undefined : F5_TOOL_BORDER_COLOR },
+					uiTheme,
+				);
 			},
 			invalidate() {
 				outputBlock.invalidate();

package/src/tui/output-block.ts

@@ -8,6 +8,12 @@ import type { State } from "./types";
 import type { RenderCache } from "./utils";
 import { getStateBgColor, Hasher, padToWidth, truncateToWidth } from "./utils";
 
+/**
+ * Border color override for F5-branded tool renderers.
+ * Pass as `borderColor` in OutputBlockOptions to apply F5 red framing regardless of tool state.
+ */
+export const F5_TOOL_BORDER_COLOR: ThemeColor = "border";
+
 export interface OutputBlockOptions {
 	header?: string;
 	headerMeta?: string;
@@ -33,17 +39,12 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 	const v = theme.boxSharp.vertical;
 	const cap = h.repeat(3);
 	const lineWidth = Math.max(0, width);
-	// Border colors: running/pending use accent, success uses dim (gray), error/warning keep their colors.
-	// borderColorOverride (from options) takes precedence for branded core tools (e.g. XC-API).
+	// Border colors: running/pending use accent, everything else uses dim (gray).
+	// Error state uses dim — the red toolErrorBg background is the error signal; no red border on generic tools.
+	// borderColorOverride (from options) takes precedence for F5-branded tools (e.g. XC-API); use F5_TOOL_BORDER_COLOR.
 	const resolvedBorderColor: ThemeColor =
 		borderColorOverride ??
-		(state === "error"
-			? "error"
-			: state === "warning"
-				? "warning"
-				: state === "running" || state === "pending"
-					? "spinnerAccent"
-					: "dim");
+		(state === "warning" ? "warning" : state === "running" || state === "pending" ? "spinnerAccent" : "dim");
 	const border = (text: string) => theme.fg(resolvedBorderColor, text);
 	const bgFn = (() => {
 		if (!state || !applyBg) return undefined;