@f5xc-salesdemos/xcsh 15.9.0 → 15.9.2

package/package.json

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

package/src/config/auto-config.ts

@@ -458,6 +458,18 @@ export function startupHealthCheck(
 
 		const expectedUrl = `${envBaseUrl}/anthropic`;
 		if (anthropicConfig.baseUrl !== expectedUrl) {
+			// Only auto-fix configs that were generated by xcsh (they contain the
+			// literal string "apiKey: LITELLM_API_KEY"). User-written configs with a
+			// custom proxy URL must never be silently overwritten.
+			let isAutoGenerated = false;
+			try {
+				const content = fs.readFileSync(modelsPath, "utf-8");
+				isAutoGenerated = content.includes("apiKey: LITELLM_API_KEY");
+			} catch {
+				// File unreadable — skip, don't block startup
+			}
+			if (!isAutoGenerated) return false;
+
 			logger.warn("LiteLLM config drift detected — auto-fixing", {
 				configured: anthropicConfig.baseUrl,
 				expected: expectedUrl,
@@ -530,6 +542,12 @@ export async function probeAndUpgradeLiteLLMConfig(
 		return false;
 	}
 
+	// Only upgrade configs that were auto-generated by xcsh. User-written configs
+	// with custom proxy URLs must never be silently overwritten by LiteLLM probing.
+	if (!content.includes("apiKey: LITELLM_API_KEY")) {
+		return false;
+	}
+
 	// Probe the proxy to find the working API base path
 	const probe = await probeLiteLLMConnection(baseUrl, apiKey, { fetch: options?.fetch });
 	if (!probe.reachable) {

package/src/config/model-registry.ts

@@ -25,7 +25,7 @@ import {
 	unregisterCustomApis,
 	unregisterOAuthProviders,
 } from "@f5xc-salesdemos/pi-ai";
-import { isRecord, logger } from "@f5xc-salesdemos/pi-utils";
+import { $env, isRecord, logger } from "@f5xc-salesdemos/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { type ConfigError, ConfigFile } from "../config";
 import { hasLiteLLMEnv, probeAndUpgradeLiteLLMConfig, startupHealthCheck } from "../config/auto-config";
@@ -1307,12 +1307,20 @@ export class ModelRegistry {
 		// Skip providers already handled by configured discovery (e.g. user-configured ollama with discovery.type)
 		const configuredDiscoveryProviders = new Set(this.#discoverableProviders.map(p => p.provider));
 
-		// When a LiteLLM proxy is configured, providers with overridden baseUrls are
-		// proxied through it. Their built-in discovery would query the proxy's model
-		// listing endpoint, which may return model IDs the proxy can't serve for chat.
-		// Skip them — the litellm discovery provider handles model listing instead.
-		const proxiedProviders = hasLiteLLMEnv()
-			? new Set([...this.#providerOverrides.keys()].filter(id => this.#providerOverrides.get(id)?.baseUrl))
+		// When a LiteLLM proxy is configured, providers whose baseUrl points to the
+		// LiteLLM proxy are proxied through it. Their built-in discovery would query
+		// the proxy's model listing endpoint, which may return model IDs the proxy
+		// can't serve for chat. Skip them — the litellm discovery provider handles
+		// model listing instead. Providers with other custom baseUrls (not LiteLLM)
+		// still need built-in discovery to discover new models at their endpoint.
+		const liteLLMBaseUrl = hasLiteLLMEnv() ? $env.LITELLM_BASE_URL?.trim().replace(/\/+$/, "") : undefined;
+		const proxiedProviders = liteLLMBaseUrl
+			? new Set(
+					[...this.#providerOverrides.keys()].filter(id => {
+						const override = this.#providerOverrides.get(id);
+						return override?.baseUrl?.startsWith(liteLLMBaseUrl);
+					}),
+				)
 			: new Set<string>();
 
 		const managerOptions = (await this.#collectBuiltInModelManagerOptions()).filter(opts => {

package/src/services/f5xc-table.ts

@@ -44,18 +44,23 @@ export interface TableOptions {
 	dividerBefore?: number; // insert ├──┤ divider before this row index
 }
 
+// Measures the visible terminal column width of a string.
+// Delegates to Bun.stringWidth() which strips ANSI escape sequences and handles
+// Unicode wide characters — the same underlying function used by @f5xc-salesdemos/pi-tui.
+const visibleWidth = (s: string): number => (s ? Bun.stringWidth(s) : 0);
+
 export function renderF5XCTable(title: string, rows: TableRow[], options?: TableOptions): string {
-	// Calculate column widths from visible text (strip ANSI for width calc)
-	const stripAnsi = (s: string) => s.replace(/\x1b\[[0-9;]*m/g, "");
-	const maxKey = Math.max(...rows.map(row => stripAnsi(row.key).length), 0);
-	const maxVal = Math.max(...rows.map(row => stripAnsi(row.value).length), 0);
-	const innerWidth = Math.max(maxKey + maxVal + 3, stripAnsi(title).length + 2, 40);
+	// Calculate column widths using visibleWidth (handles ANSI and Unicode)
+	const maxKey = Math.max(...rows.map(row => visibleWidth(row.key)), 0);
+	const maxVal = Math.max(...rows.map(row => visibleWidth(row.value)), 0);
+	// innerWidth = space + maxKey + 2-space separator + maxVal + space = maxKey + maxVal + 4
+	const innerWidth = Math.max(maxKey + maxVal + 4, visibleWidth(title) + 2, 40);
 
 	const lines: string[] = [];
 
 	// Top border: ╭─ title ──────╮
 	const titleText = ` ${title} `;
-	const titlePad = innerWidth - stripAnsi(titleText).length - 1;
+	const titlePad = innerWidth - visibleWidth(titleText) - 1;
 	lines.push(`${r(BOX.tl + BOX.h)}${BOLD}${titleText}${RESET}${r(BOX.h.repeat(Math.max(0, titlePad)) + BOX.tr)}`);
 
 	// Rows
@@ -63,13 +68,13 @@ export function renderF5XCTable(title: string, rows: TableRow[], options?: Table
 		// Optional divider
 		if (options?.dividerBefore === i) {
 			const divLabel = " Environment ";
-			const divPad = innerWidth - stripAnsi(divLabel).length - 1;
+			const divPad = innerWidth - visibleWidth(divLabel) - 1;
 			lines.push(`${r(BOX.lt + BOX.h)}${BOLD}${divLabel}${RESET}${r(BOX.h.repeat(Math.max(0, divPad)) + BOX.rt)}`);
 		}
 
 		const { key, value } = rows[i];
-		const keyPad = maxKey - stripAnsi(key).length;
-		const valPad = innerWidth - maxKey - stripAnsi(value).length - 3;
+		const keyPad = maxKey - visibleWidth(key);
+		const valPad = innerWidth - maxKey - visibleWidth(value) - 4;
 		lines.push(`${r(BOX.v)} ${key}${" ".repeat(keyPad)}  ${value}${" ".repeat(Math.max(0, valPad))} ${r(BOX.v)}`);
 	}