@f5xc-salesdemos/xcsh 18.65.0 → 18.66.0

package/package.json

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

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "18.65.0",
-	"commit": "35c77b050317137efe631106d543647195229000",
-	"shortCommit": "35c77b0",
+	"version": "18.66.0",
+	"commit": "e018080e23d781f41f31f5fddb031abf40358670",
+	"shortCommit": "e018080",
 	"branch": "main",
-	"tag": "v18.65.0",
-	"commitDate": "2026-05-17T08:48:25Z",
-	"buildDate": "2026-05-17T09:14:22.007Z",
-	"dirty": true,
+	"tag": "v18.66.0",
+	"commitDate": "2026-05-17T18:46:03Z",
+	"buildDate": "2026-05-17T19:10:23.269Z",
+	"dirty": false,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/35c77b050317137efe631106d543647195229000",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.65.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/e018080e23d781f41f31f5fddb031abf40358670",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.66.0"
 };

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";
@@ -461,6 +461,7 @@ export function classifyAwsError(stderr: string): AwsCheckState {
 	if (
 		s.includes("sso session") ||
 		s.includes("sso token") ||
+		(s.includes("token from sso") && (s.includes("expired") || s.includes("refresh failed"))) ||
 		s.includes("expiredtokenexception") ||
 		s.includes("expiredtoken")
 	) {
@@ -594,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 },