@f5xc-salesdemos/xcsh 17.4.1 → 17.4.2

package/package.json

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

package/src/config/auto-config.ts

@@ -15,7 +15,7 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { $env, logger } from "@f5xc-salesdemos/pi-utils";
+import { $env, logger, readProviderFromModelsYml } from "@f5xc-salesdemos/pi-utils";
 
 /** Current config schema version. Bump when the generated format changes. */
 export const CURRENT_CONFIG_VERSION = 2;
@@ -89,60 +89,28 @@ export interface LiteLLMConfig {
  * Read existing models.yml and extract the anthropic provider's base URL and API key.
  *
  * - baseUrl: strips `/anthropic` suffix to recover the root proxy URL
- * - apiKey: if it matches /^[A-Z][A-Z0-9_]+$/ (env var name pattern), resolves via
- *   process.env; otherwise uses the literal value
- * - Falls back to getLiteLLMBaseUrl() for baseUrl and $env.LITELLM_API_KEY for apiKey
- *   when the file is missing or the anthropic block is incomplete
+ * - apiKey: env var name → process.env lookup; shell-backed → fall back to env;
+ *   otherwise literal
+ * - Falls back to getLiteLLMBaseUrl() and $env.LITELLM_API_KEY when the file is
+ *   missing or the anthropic block is incomplete
  */
 export function readLiteLLMConfig(modelsPath: string): LiteLLMConfig | undefined {
 	if (!fs.existsSync(modelsPath)) return undefined;
 
-	let rawBaseUrl: string | undefined;
-	let rawApiKey: string | undefined;
+	const block = readProviderFromModelsYml("anthropic", modelsPath);
 
-	// Line-by-line state machine: locate the anthropic provider block
-	const content = fs.readFileSync(modelsPath, "utf8");
-	const lines = content.split("\n");
-	let inAnthropicBlock = false;
+	const resolvedBaseUrl = block?.baseUrl ? block.baseUrl.replace(/\/anthropic\/?$/, "") : getLiteLLMBaseUrl();
 
-	for (const line of lines) {
-		// Detect entry into anthropic provider block
-		if (/^\s{2}anthropic\s*:/.test(line)) {
-			inAnthropicBlock = true;
-			continue;
-		}
-		// Detect leaving the block: a new sibling provider key (2-space indent, non-empty)
-		if (inAnthropicBlock && /^\s{2}\S/.test(line)) {
-			inAnthropicBlock = false;
-		}
-
-		if (inAnthropicBlock) {
-			const baseUrlMatch = line.match(/^\s+baseUrl\s*:\s*"?([^"]+)"?\s*$/);
-			if (baseUrlMatch) {
-				rawBaseUrl = baseUrlMatch[1].trim();
-			}
-			const apiKeyMatch = line.match(/^\s+apiKey\s*:\s*(.+)\s*$/);
-			if (apiKeyMatch) {
-				rawApiKey = apiKeyMatch[1].trim().replace(/^["']|["']$/g, "");
-			}
-		}
-	}
-
-	// Resolve base URL: strip /anthropic suffix
-	const resolvedBaseUrl = rawBaseUrl ? rawBaseUrl.replace(/\/anthropic\/?$/, "") : getLiteLLMBaseUrl();
-
-	// Resolve API key: env var name → process.env lookup; command-backed → skip; otherwise literal
 	let resolvedApiKey: string | undefined;
-	if (!rawApiKey) {
+	const apiKey = block?.apiKey;
+	if (!apiKey) {
 		resolvedApiKey = $env.LITELLM_API_KEY;
-	} else if (/^[A-Z][A-Z0-9_]+$/.test(rawApiKey)) {
-		// Looks like an env var name — resolve it
-		resolvedApiKey = process.env[rawApiKey] ?? $env.LITELLM_API_KEY;
-	} else if (rawApiKey.startsWith("!")) {
-		// Command-backed secrets (e.g. "!command ...") can't be resolved here — fall back to env
+	} else if (apiKey.kind === "envVar") {
+		resolvedApiKey = process.env[apiKey.name] ?? $env.LITELLM_API_KEY;
+	} else if (apiKey.kind === "shellSecret") {
 		resolvedApiKey = $env.LITELLM_API_KEY;
 	} else {
-		resolvedApiKey = rawApiKey;
+		resolvedApiKey = apiKey.value;
 	}
 
 	if (!resolvedBaseUrl || !resolvedApiKey) return undefined;
@@ -159,6 +127,7 @@ export function generateConfigYml(): string {
 		"",
 		"providers:",
 		"  image: openai",
+		"  webSearch: anthropic",
 		"",
 		"generate_image:",
 		"  enabled: true",
@@ -200,31 +169,18 @@ export function healConfigYmlModelRoles(configPath: string): void {
 // ---------------------------------------------------------------------------
 
 /**
- * Extract a quoted literal API key from an existing models.yml file.
- * Only looks within the anthropic or litellm provider blocks to avoid
- * accidentally picking up keys from unrelated providers.
- * Returns undefined if the file uses an env var reference (unquoted) or doesn't exist.
+ * Extract a double-quoted literal API key from an existing models.yml file.
+ * Checks the anthropic and litellm provider blocks; returns undefined if
+ * neither has a literal (e.g., both use env var references) or the file is
+ * missing.
  */
 export function readApiKeyLiteral(modelsPath: string): string | undefined {
-	try {
-		const content = fs.readFileSync(modelsPath, "utf-8");
-		const lines = content.split("\n");
-		let inTargetBlock = false;
-
-		for (const line of lines) {
-			if (/^\s{2}(?:anthropic|litellm)\s*:/.test(line)) {
-				inTargetBlock = true;
-				continue;
-			}
-			if (inTargetBlock && /^\s{2}\S/.test(line)) {
-				inTargetBlock = false;
-			}
-			if (inTargetBlock) {
-				const match = line.match(/^\s+apiKey:\s*"([^"]+)"/);
-				if (match) return match[1].replace(/\\"/g, '"').replace(/\\\\/g, "\\");
-			}
+	for (const name of ["anthropic", "litellm"]) {
+		const block = readProviderFromModelsYml(name, modelsPath);
+		if (block?.apiKey?.kind === "literal" && block.apiKey.wasQuoted) {
+			return block.apiKey.value;
 		}
-	} catch {}
+	}
 	return undefined;
 }
 

package/src/config/settings-schema.ts

@@ -662,12 +662,6 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
-	collapseChangelog: {
-		type: "boolean",
-		default: true,
-		ui: { tab: "interaction", label: "Collapse Changelog", description: "Show condensed changelog after updates" },
-	},
-
 	// Notifications
 	"completion.notify": {
 		type: "enum",

package/src/main.ts

@@ -144,10 +144,12 @@ export async function submitInteractiveInput(
 	}
 }
 
+const INITIAL_UPDATE_CHECK_TIMEOUT_MS = 500;
+
 async function runInteractiveMode(
 	session: AgentSession,
 	version: string,
-	changelogMarkdown: string | undefined,
+	changelogStatus: { hasNew: boolean; version: string } | undefined,
 	notifs: (InteractiveModeNotify | null)[],
 	versionCheckPromise: Promise<string | undefined>,
 	initialMessages: string[],
@@ -158,10 +160,19 @@ async function runInteractiveMode(
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 ): Promise<void> {
+	const initialUpdateVersion = await Promise.race([
+		versionCheckPromise.catch(() => undefined),
+		new Promise<string | undefined>(resolve => setTimeout(() => resolve(undefined), INITIAL_UPDATE_CHECK_TIMEOUT_MS)),
+	]);
+	const initialUpdateStatus = initialUpdateVersion
+		? { available: true, latestVersion: initialUpdateVersion }
+		: undefined;
+
 	const mode = new InteractiveMode(
 		session,
 		version,
-		changelogMarkdown,
+		changelogStatus,
+		initialUpdateStatus,
 		setExtensionUIContext,
 		lspServers,
 		mcpManager,
@@ -170,16 +181,18 @@ async function runInteractiveMode(
 
 	await mode.init();
 
-	versionCheckPromise
-		.then(newVersion => {
-			if (!settings.get("startup.checkUpdate")) {
-				return;
-			}
-			if (newVersion) {
-				mode.showNewVersionNotification(newVersion);
-			}
-		})
-		.catch(() => {});
+	if (!initialUpdateVersion) {
+		versionCheckPromise
+			.then(newVersion => {
+				if (!settings.get("startup.checkUpdate")) {
+					return;
+				}
+				if (newVersion) {
+					mode.setUpdateStatus({ available: true, latestVersion: newVersion });
+				}
+			})
+			.catch(() => {});
+	}
 
 	mode.renderInitialMessages();
 
@@ -243,7 +256,7 @@ async function promptForkSession(session: SessionInfo): Promise<boolean> {
 	}
 }
 
-async function getChangelogForDisplay(parsed: Args): Promise<string | undefined> {
+async function getChangelogForDisplay(parsed: Args): Promise<{ hasNew: boolean; version: string } | undefined> {
 	if (parsed.continue || parsed.resume) {
 		return undefined;
 	}
@@ -255,13 +268,13 @@ async function getChangelogForDisplay(parsed: Args): Promise<string | undefined>
 	if (!lastVersion) {
 		if (entries.length > 0) {
 			settings.set("lastChangelogVersion", VERSION);
-			return entries.map(e => e.content).join("\n\n");
+			return { hasNew: true, version: VERSION };
 		}
 	} else {
 		const newEntries = getNewEntries(entries, lastVersion);
 		if (newEntries.length > 0) {
 			settings.set("lastChangelogVersion", VERSION);
-			return newEntries.map(e => e.content).join("\n\n");
+			return { hasNew: true, version: VERSION };
 		}
 	}
 
@@ -877,7 +890,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 	} else if (isInteractive) {
 		const versionCheckPromise = checkForNewVersion(VERSION).catch(() => undefined);
 		logger.time("main:getChangelogForDisplay");
-		const changelogMarkdown = await getChangelogForDisplay(parsedArgs);
+		const changelogStatus = await getChangelogForDisplay(parsedArgs);
 
 		const scopedModelsForDisplay = sessionOptions.scopedModels ?? scopedModels;
 		if (scopedModelsForDisplay.length > 0) {
@@ -901,7 +914,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		await runInteractiveMode(
 			session,
 			VERSION,
-			changelogMarkdown,
+			changelogStatus,
 			notifs,
 			versionCheckPromise,
 			parsedArgs.messages,

package/src/modes/components/welcome.ts

@@ -3,11 +3,23 @@ import { APP_NAME } from "@f5xc-salesdemos/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import type { ModelStatus, WelcomeProfileStatus } from "./welcome-checks";
 
+export interface UpdateStatus {
+	available: boolean;
+	latestVersion?: string;
+}
+
+export interface ChangelogStatus {
+	hasNew: boolean;
+	version: string;
+}
+
 export class WelcomeComponent implements Component {
 	constructor(
 		private readonly version: string,
 		private modelStatus: ModelStatus,
 		private profileStatus?: WelcomeProfileStatus,
+		private updateStatus?: UpdateStatus,
+		private changelogStatus?: ChangelogStatus,
 	) {}
 	invalidate(): void {}
 	setModelStatus(status: ModelStatus): void {
@@ -16,6 +28,12 @@ export class WelcomeComponent implements Component {
 	setProfileStatus(status: WelcomeProfileStatus | undefined): void {
 		this.profileStatus = status;
 	}
+	setUpdateStatus(status: UpdateStatus | undefined): void {
+		this.updateStatus = status;
+	}
+	setChangelogStatus(status: ChangelogStatus | undefined): void {
+		this.changelogStatus = status;
+	}
 
 	render(termWidth: number): string[] {
 		const minLeftCol = 48;
@@ -111,26 +129,72 @@ export class WelcomeComponent implements Component {
 		if (this.profileStatus) {
 			lines.push(" F5 XC Profile", ...this.#renderProfileStatus());
 		}
+		if (this.#showUpdateSection()) {
+			lines.push(" Update Available", ...this.#renderUpdateStatus());
+		}
+		if (this.#showChangelogSection()) {
+			lines.push(" What's New", ...this.#renderChangelogStatus());
+		}
 		return Math.max(...lines.map(l => visibleWidth(l)));
 	}
 
 	#buildStatusLines(rightCol: number): string[] {
 		const lines: string[] = [];
 		const separatorWidth = Math.max(0, rightCol - 2);
+		const separator = ` ${theme.fg("muted", theme.boxRound.horizontal.repeat(separatorWidth))}`;
 		lines.push("");
 		lines.push(` ${theme.bold(theme.fg("contentAccent", "Model Provider"))}`);
 		lines.push(...this.#renderModelStatus());
 		lines.push("");
 		if (this.profileStatus) {
-			lines.push(` ${theme.fg("muted", theme.boxRound.horizontal.repeat(separatorWidth))}`);
+			lines.push(separator);
 			lines.push("");
 			lines.push(` ${theme.bold(theme.fg("contentAccent", "F5 XC Profile"))}`);
 			lines.push(...this.#renderProfileStatus());
 			lines.push("");
 		}
+		if (this.#showUpdateSection()) {
+			lines.push(separator);
+			lines.push("");
+			lines.push(` ${theme.bold(theme.fg("contentAccent", "Update Available"))}`);
+			lines.push(...this.#renderUpdateStatus());
+			lines.push("");
+		}
+		if (this.#showChangelogSection()) {
+			lines.push(separator);
+			lines.push("");
+			lines.push(` ${theme.bold(theme.fg("contentAccent", "What's New"))}`);
+			lines.push(...this.#renderChangelogStatus());
+			lines.push("");
+		}
 		return lines;
 	}
 
+	#showUpdateSection(): boolean {
+		return this.updateStatus?.available === true;
+	}
+
+	#showChangelogSection(): boolean {
+		return this.changelogStatus?.hasNew === true;
+	}
+
+	#renderUpdateStatus(): string[] {
+		const latest = this.updateStatus?.latestVersion;
+		const label = latest ? `v${latest}` : "new version";
+		return [
+			` ${theme.fg("warning", "\u2191")} ${theme.fg("muted", label)}`,
+			`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "xcsh update")}`,
+		];
+	}
+
+	#renderChangelogStatus(): string[] {
+		const v = this.changelogStatus?.version ?? this.version;
+		return [
+			` ${theme.fg("success", "\u2605")} ${theme.fg("muted", `v${v}`)}`,
+			`   ${theme.fg("dim", "Run")} ${theme.fg("contentAccent", "/changelog")}`,
+		];
+	}
+
 	#renderModelStatus(): string[] {
 		const { state, provider, latencyMs } = this.modelStatus;
 		const p = provider ?? "unknown";

package/src/modes/interactive-mode.ts

@@ -49,7 +49,7 @@ import type { HookSelectorComponent } from "./components/hook-selector";
 import type { PythonExecutionComponent } from "./components/python-execution";
 import { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
-import { WelcomeComponent } from "./components/welcome";
+import { type ChangelogStatus, type UpdateStatus, WelcomeComponent } from "./components/welcome";
 import { runWelcomeChecks } from "./components/welcome-checks";
 import { BtwController } from "./controllers/btw-controller";
 import { CommandController } from "./controllers/command-controller";
@@ -161,7 +161,8 @@ export class InteractiveMode implements InteractiveModeContext {
 	#pendingSlashCommands: SlashCommand[] = [];
 	#cleanupUnsubscribe?: () => void;
 	readonly #version: string;
-	readonly #changelogMarkdown: string | undefined;
+	readonly #changelogStatus: ChangelogStatus | undefined;
+	readonly #initialUpdateStatus: UpdateStatus | undefined;
 	#planModePreviousTools: string[] | undefined;
 	#planModePreviousModelState: { model: Model; thinkingLevel?: ThinkingLevel } | undefined;
 	#pendingModelSwitch: { model: Model; thinkingLevel?: ThinkingLevel } | undefined;
@@ -192,7 +193,8 @@ export class InteractiveMode implements InteractiveModeContext {
 	constructor(
 		session: AgentSession,
 		version: string,
-		changelogMarkdown: string | undefined = undefined,
+		changelogStatus: ChangelogStatus | undefined = undefined,
+		initialUpdateStatus: UpdateStatus | undefined = undefined,
 		setToolUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void = () => {},
 		lspServers?: import("../tools").LspStartupServerInfo[],
 		mcpManager?: import("../mcp").MCPManager,
@@ -204,7 +206,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.keybindings = KeybindingsManager.inMemory();
 		this.agent = session.agent;
 		this.#version = version;
-		this.#changelogMarkdown = changelogMarkdown;
+		this.#changelogStatus = changelogStatus;
+		this.#initialUpdateStatus = initialUpdateStatus;
 		this.#toolUiContextSetter = setToolUIContext;
 		this.lspServers = lspServers;
 		this.mcpManager = mcpManager;
@@ -321,28 +324,19 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		if (!startupQuiet) {
-			// Add welcome header
-			this.#welcomeComponent = new WelcomeComponent(this.#version, welcomeResult.model, welcomeResult.profile);
+			// Welcome box owns all startup notifications (model, profile, update, changelog)
+			this.#welcomeComponent = new WelcomeComponent(
+				this.#version,
+				welcomeResult.model,
+				welcomeResult.profile,
+				this.#initialUpdateStatus,
+				this.#changelogStatus,
+			);
 
 			// Setup UI layout
 			this.ui.addChild(new Spacer(1));
 			this.ui.addChild(this.#welcomeComponent);
 			this.ui.addChild(new Spacer(1));
-
-			// Add changelog if provided
-			if (this.#changelogMarkdown) {
-				this.ui.addChild(new DynamicBorder());
-				if (settings.get("collapseChangelog")) {
-					const condensedText = `Updated to v${this.#version}. Use ${theme.bold("/changelog")} to view full changelog.`;
-					this.ui.addChild(new Text(condensedText, 1, 0));
-				} else {
-					this.ui.addChild(new Text(theme.bold(theme.fg("contentAccent", "What's New")), 1, 0));
-					this.ui.addChild(new Spacer(1));
-					this.ui.addChild(new Markdown(this.#changelogMarkdown.trim(), 1, 0, getMarkdownTheme()));
-					this.ui.addChild(new Spacer(1));
-				}
-				this.ui.addChild(new DynamicBorder());
-			}
 		}
 
 		this.ui.addChild(this.chatContainer);
@@ -1130,8 +1124,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.setWorkingMessage(message);
 	}
 
-	showNewVersionNotification(newVersion: string): void {
-		this.#uiHelpers.showNewVersionNotification(newVersion);
+	setUpdateStatus(status: UpdateStatus | undefined): void {
+		this.#welcomeComponent?.setUpdateStatus(status);
+		this.ui.requestRender();
 	}
 
 	clearEditor(): void {

package/src/modes/types.ts

@@ -137,7 +137,6 @@ export interface InteractiveModeContext {
 	showStatus(message: string, options?: { dim?: boolean }): void;
 	showError(message: string): void;
 	showWarning(message: string): void;
-	showNewVersionNotification(newVersion: string): void;
 	clearEditor(): void;
 	updatePendingMessagesDisplay(): void;
 	queueCompactionMessage(text: string, mode: "steer" | "followUp"): void;

package/src/modes/utils/ui-helpers.ts

@@ -7,7 +7,6 @@ import { BashExecutionComponent } from "../../modes/components/bash-execution";
 import { BranchSummaryMessageComponent } from "../../modes/components/branch-summary-message";
 import { CompactionSummaryMessageComponent } from "../../modes/components/compaction-summary-message";
 import { CustomMessageComponent } from "../../modes/components/custom-message";
-import { DynamicBorder } from "../../modes/components/dynamic-border";
 import {
 	createSystemGutter,
 	createTextGutter,
@@ -456,23 +455,6 @@ export class UiHelpers {
 		this.ctx.ui.requestRender();
 	}
 
-	showNewVersionNotification(newVersion: string): void {
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new DynamicBorder(text => theme.fg("warning", text)));
-		this.ctx.chatContainer.addChild(
-			new Text(
-				theme.bold(theme.fg("warning", "Update Available")) +
-					"\n" +
-					theme.fg("muted", `New version ${newVersion} is available. Run: `) +
-					theme.fg("contentAccent", "xcsh update"),
-				1,
-				0,
-			),
-		);
-		this.ctx.chatContainer.addChild(new DynamicBorder(text => theme.fg("warning", text)));
-		this.ctx.ui.requestRender();
-	}
-
 	updatePendingMessagesDisplay(): void {
 		this.ctx.pendingMessagesContainer.clear();
 		const queuedMessages = this.ctx.session.getQueuedMessages() as QueuedMessages;