@f5-sales-demo/pi-ai 20.2.7 → 20.3.0

package/CHANGELOG.md

@@ -1,6 +1,25 @@
+<!-- markdownlint-configure-file { "MD024": { "siblings_only": true } } -->
+
 # Changelog
 
-## [Unreleased]
+## [20.3.0] - 2026-08-04
+
+### Changed
+
+- Changed the LiteLLM provider fallback default to GPT-5.6 Sol ([#2886](https://github.com/f5-sales-demo/xcsh/issues/2886))
+- Updated the default Antigravity client version to 2.4.3 for current Google Cloud Code Assist compatibility ([#2874](https://github.com/f5-sales-demo/xcsh/issues/2874))
+- Updated the Google GenAI SDK to 2.15.0 ([#2874](https://github.com/f5-sales-demo/xcsh/issues/2874))
+
+### Added
+
+- Added Gemini 3.6 Flash through Google Vertex AI with ADC project discovery, gcloud project fallback, and a global location default ([#2874](https://github.com/f5-sales-demo/xcsh/issues/2874))
+
+### Fixed
+
+- Preserved native Gemini finish reasons in Google provider errors instead of reporting an unknown error ([#2874](https://github.com/f5-sales-demo/xcsh/issues/2874))
+
+<!-- markdownlint-disable MD024 -->
+<!-- textlint-disable terminology -->
 
 ## [19.105.1] - 2026-07-31
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-ai",
-	"version": "20.2.7",
+	"version": "20.3.0",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -32,9 +32,11 @@
 		"pi-ai": "./src/cli.ts"
 	},
 	"scripts": {
+		"precheck": "bun ../../scripts/check-installed-dependencies.ts",
 		"check": "biome check . && bun run check:types",
 		"check:types": "tsgo -p tsconfig.json --noEmit",
 		"lint": "biome lint .",
+		"pretest": "bun ../../scripts/check-installed-dependencies.ts",
 		"test": "bun test",
 		"fix": "biome check --write --unsafe .",
 		"fmt": "biome format --write .",
@@ -44,8 +46,8 @@
 		"@anthropic-ai/sdk": "^0.115",
 		"@aws-sdk/client-bedrock-runtime": "^3",
 		"@bufbuild/protobuf": "^2.11",
-		"@google/genai": "^2.13",
-		"@f5-sales-demo/pi-utils": "20.2.7",
+		"@f5-sales-demo/pi-utils": "20.3.0",
+		"@google/genai": "^2.15",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",
 		"ajv": "^8.20",

package/src/models.json

@@ -6707,6 +6707,31 @@
 				"maxLevel": "high"
 			}
 		},
+		"gemini-3.6-flash-high": {
+			"id": "gemini-3.6-flash-high",
+			"name": "Gemini 3.6 Flash (High) (Antigravity)",
+			"api": "google-gemini-cli",
+			"provider": "google-antigravity",
+			"baseUrl": "https://daily-cloudcode-pa.sandbox.googleapis.com",
+			"reasoning": true,
+			"input": [
+				"text",
+				"image"
+			],
+			"cost": {
+				"input": 0,
+				"output": 0,
+				"cacheRead": 0,
+				"cacheWrite": 0
+			},
+			"contextWindow": 1048576,
+			"maxTokens": 65536,
+			"thinking": {
+				"mode": "google-level",
+				"minLevel": "minimal",
+				"maxLevel": "high"
+			}
+		},
 		"gemini-3-pro-high": {
 			"id": "gemini-3-pro-high",
 			"name": "Gemini 3 Pro (High) (Antigravity)",
@@ -7005,6 +7030,31 @@
 		}
 	},
 	"google-vertex": {
+		"gemini-3.6-flash": {
+			"id": "gemini-3.6-flash",
+			"name": "Gemini 3.6 Flash",
+			"api": "google-vertex",
+			"provider": "google-vertex",
+			"baseUrl": "https://{location}-aiplatform.googleapis.com",
+			"reasoning": true,
+			"input": [
+				"text",
+				"image"
+			],
+			"cost": {
+				"input": 0,
+				"output": 0,
+				"cacheRead": 0,
+				"cacheWrite": 0
+			},
+			"contextWindow": 1048576,
+			"maxTokens": 65536,
+			"thinking": {
+				"mode": "google-level",
+				"minLevel": "low",
+				"maxLevel": "high"
+			}
+		},
 		"gemini-1.5-flash": {
 			"id": "gemini-1.5-flash",
 			"name": "Gemini 1.5 Flash",
@@ -16561,8 +16611,8 @@
 			"maxTokens": 128000,
 			"thinking": {
 				"mode": "effort",
-				"minLevel": "high",
-				"maxLevel": "high"
+				"minLevel": "low",
+				"maxLevel": "xhigh"
 			},
 			"compat": {
 				"supportsTemperature": false

package/src/provider-models/descriptors.ts

@@ -216,7 +216,7 @@ export const PROVIDER_DESCRIPTORS: readonly ProviderDescriptor[] = [
 	),
 	catalogDescriptor(
 		"litellm",
-		"claude-opus-4-6",
+		"gpt-5.6-sol",
 		config => litellmModelManagerOptions(config),
 		catalog("LiteLLM", ["LITELLM_API_KEY"], { allowUnauthenticated: true }),
 	),

package/src/providers/google-gemini-cli.ts

@@ -76,7 +76,7 @@ export function getGeminiCliUserAgent(modelId = "gemini-3.1-pro-preview"): strin
 }
 
 const ANTIGRAVITY_USER_AGENT = (() => {
-	const DEFAULT_ANTIGRAVITY_VERSION = "1.104.0";
+	const DEFAULT_ANTIGRAVITY_VERSION = "2.4.3";
 	const version = process.env.PI_AI_ANTIGRAVITY_VERSION || DEFAULT_ANTIGRAVITY_VERSION;
 	// Map Node.js platform/arch to Antigravity's expected format.
 	// Verified against Antigravity source: _qn() and wqn() in main.js.
@@ -646,6 +646,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 				};
 				output.stopReason = "stop";
 				output.errorMessage = undefined;
+				output.rawStopReason = undefined;
 				output.timestamp = Date.now();
 				started = false;
 			};
@@ -794,6 +795,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 					}
 
 					if (candidate?.finishReason) {
+						output.rawStopReason = candidate.finishReason;
 						output.stopReason = mapStopReasonString(candidate.finishReason);
 						if (output.content.some(b => b.type === "toolCall")) {
 							output.stopReason = "toolUse";
@@ -902,7 +904,9 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 			}
 
 			if (output.stopReason === "aborted" || output.stopReason === "error") {
-				throw new Error("An unknown error occurred");
+				throw new Error(
+					output.rawStopReason ? `Gemini stopped with ${output.rawStopReason}` : "An unknown error occurred",
+				);
 			}
 
 			output.duration = Date.now() - startTime;

package/src/providers/google-vertex.ts

@@ -1,4 +1,6 @@
-import { $env } from "@f5-sales-demo/pi-utils";
+import * as os from "node:os";
+import * as path from "node:path";
+import { $env, $which, isEnoent } from "@f5-sales-demo/pi-utils";
 import {
 	type GenerateContentConfig,
 	type GenerateContentParameters,
@@ -6,6 +8,7 @@ import {
 	type ThinkingConfig,
 	ThinkingLevel,
 } from "@google/genai";
+import { $ } from "bun";
 import { calculateCost } from "../models";
 import type {
 	Api,
@@ -41,6 +44,12 @@ export interface GoogleVertexOptions extends StreamOptions {
 	location?: string;
 }
 
+export interface GoogleVertexProjectRuntime {
+	readAdcProject(): Promise<string | undefined>;
+	findGcloud(): string | null;
+	readConfiguredProject(gcloud: string): Promise<string | undefined>;
+}
+
 interface GoogleVertexSamplingConfig extends GenerateContentConfig {
 	topP?: number;
 	topK?: number;
@@ -94,8 +103,8 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 
 		try {
 			const apiKey = resolveApiKey(options);
-			const project = apiKey ? undefined : resolveProject(options);
-			const location = apiKey ? undefined : resolveLocation(options);
+			const project = apiKey ? undefined : await resolveGoogleVertexProject(options);
+			const location = apiKey ? undefined : resolveGoogleVertexLocation(options);
 			const client = apiKey ? createClientWithApiKey(model, apiKey) : createClient(model, project!, location!);
 			const params = buildParams(model, context, options);
 			options?.onPayload?.(params);
@@ -106,7 +115,7 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 				method: "POST",
 				url: apiKey
 					? `https://aiplatform.googleapis.com/${API_VERSION}/publishers/google/models/${model.id}:streamGenerateContent`
-					: `https://${location}-aiplatform.googleapis.com/${API_VERSION}/projects/${project}/locations/${location}/publishers/google/models/${model.id}:streamGenerateContent`,
+					: googleVertexRequestUrl(model.id, project!, location!),
 				body: params,
 			};
 			const googleStream = await client.models.generateContentStream(params);
@@ -212,7 +221,7 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 								type: "toolCall",
 								id: toolCallId,
 								name: part.functionCall.name || "",
-								arguments: part.functionCall.args as Record<string, any>,
+								arguments: (part.functionCall.args ?? {}) as Record<string, unknown>,
 								...(part.thoughtSignature && { thoughtSignature: part.thoughtSignature }),
 							};
 
@@ -230,6 +239,7 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 				}
 
 				if (candidate?.finishReason) {
+					output.rawStopReason = candidate.finishReason;
 					output.stopReason = mapStopReason(candidate.finishReason);
 					if (output.content.some(b => b.type === "toolCall")) {
 						output.stopReason = "toolUse";
@@ -285,7 +295,9 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 			}
 
 			if (output.stopReason === "aborted" || output.stopReason === "error") {
-				throw new Error("An unknown error occurred");
+				throw new Error(
+					output.rawStopReason ? `Gemini stopped with ${output.rawStopReason}` : "An unknown error occurred",
+				);
 			}
 
 			output.duration = Date.now() - startTime;
@@ -345,22 +357,64 @@ function resolveApiKey(options?: GoogleVertexOptions): string | undefined {
 	return realKey || $env.GOOGLE_CLOUD_API_KEY;
 }
 
-function resolveProject(options?: GoogleVertexOptions): string {
+const defaultProjectRuntime: GoogleVertexProjectRuntime = {
+	readAdcProject,
+	findGcloud: () => $which("gcloud"),
+	readConfiguredProject: async gcloud => {
+		const result = await $`${gcloud} config get-value project`.quiet().nothrow();
+		const configuredProject = result.text().trim();
+		if (result.exitCode !== 0 || !configuredProject || configuredProject === "(unset)") {
+			return undefined;
+		}
+		return configuredProject;
+	},
+};
+
+export async function resolveGoogleVertexProject(
+	options?: GoogleVertexOptions,
+	runtime: GoogleVertexProjectRuntime = defaultProjectRuntime,
+): Promise<string> {
 	const project = options?.project || $env.GOOGLE_CLOUD_PROJECT || $env.GCLOUD_PROJECT;
-	if (!project) {
-		throw new Error(
-			"Vertex AI requires a project ID. Set GOOGLE_CLOUD_PROJECT/GCLOUD_PROJECT or pass project in options.",
-		);
+	if (project) return project;
+
+	const adcProject = await runtime.readAdcProject();
+	if (adcProject) return adcProject;
+
+	const gcloud = runtime.findGcloud();
+	if (gcloud) {
+		const configuredProject = await runtime.readConfiguredProject(gcloud);
+		if (configuredProject) return configuredProject;
 	}
-	return project;
+
+	throw new Error(
+		"Vertex AI requires a project ID. Set GOOGLE_CLOUD_PROJECT/GCLOUD_PROJECT, run `gcloud config set project PROJECT_ID`, or pass project in options.",
+	);
+}
+
+export function resolveGoogleVertexLocation(options?: GoogleVertexOptions): string {
+	return options?.location || $env.GOOGLE_CLOUD_LOCATION || "global";
 }
 
-function resolveLocation(options?: GoogleVertexOptions): string {
-	const location = options?.location || $env.GOOGLE_CLOUD_LOCATION;
-	if (!location) {
-		throw new Error("Vertex AI requires a location. Set GOOGLE_CLOUD_LOCATION or pass location in options.");
+async function readAdcProject(): Promise<string | undefined> {
+	const credentialsPath =
+		$env.GOOGLE_APPLICATION_CREDENTIALS ||
+		path.join(os.homedir(), ".config", "gcloud", "application_default_credentials.json");
+	try {
+		const credentials = (await Bun.file(credentialsPath).json()) as {
+			project_id?: unknown;
+		};
+		if (typeof credentials.project_id === "string" && credentials.project_id.length > 0) {
+			return credentials.project_id;
+		}
+	} catch (error) {
+		if (!isEnoent(error)) throw error;
 	}
-	return location;
+	return undefined;
+}
+
+export function googleVertexRequestUrl(modelId: string, project: string, location: string): string {
+	const host = location === "global" ? "aiplatform.googleapis.com" : `${location}-aiplatform.googleapis.com`;
+	return `https://${host}/${API_VERSION}/projects/${project}/locations/${location}/publishers/google/models/${modelId}:streamGenerateContent`;
 }
 
 function buildParams(

package/src/providers/google.ts

@@ -192,7 +192,7 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 								type: "toolCall",
 								id: toolCallId,
 								name: part.functionCall.name || "",
-								arguments: (part.functionCall.args ?? {}) as Record<string, any>,
+								arguments: (part.functionCall.args ?? {}) as Record<string, unknown>,
 								...(part.thoughtSignature && { thoughtSignature: part.thoughtSignature }),
 							};
 
@@ -210,6 +210,7 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 				}
 
 				if (candidate?.finishReason) {
+					output.rawStopReason = candidate.finishReason;
 					output.stopReason = mapStopReason(candidate.finishReason);
 					if (output.content.some(b => b.type === "toolCall")) {
 						output.stopReason = "toolUse";
@@ -265,7 +266,9 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 			}
 
 			if (output.stopReason === "aborted" || output.stopReason === "error") {
-				throw new Error("An unknown error occurred");
+				throw new Error(
+					output.rawStopReason ? `Gemini stopped with ${output.rawStopReason}` : "An unknown error occurred",
+				);
 			}
 
 			output.duration = Date.now() - startTime;

package/src/stream.ts

@@ -102,10 +102,7 @@ const serviceProviderMap: Record<string, KeyResolver> = {
 		if ($env.GOOGLE_CLOUD_API_KEY) {
 			return $env.GOOGLE_CLOUD_API_KEY;
 		}
-		const hasCredentials = hasVertexAdcCredentials();
-		const hasProject = !!($env.GOOGLE_CLOUD_PROJECT || $env.GCLOUD_PROJECT);
-		const hasLocation = !!$env.GOOGLE_CLOUD_LOCATION;
-		if (hasCredentials && hasProject && hasLocation) {
+		if (hasVertexAdcCredentials()) {
 			return "<authenticated>";
 		}
 	},

package/src/types.ts

@@ -366,6 +366,8 @@ export interface AssistantMessage {
 	usage: Usage;
 	stopReason: StopReason;
 	errorMessage?: string;
+	/** Provider-native completion reason retained for diagnostics and transport-specific recovery. */
+	rawStopReason?: string;
 	/** Provider-specific opaque payload used to reconstruct transport-native history. */
 	providerPayload?: ProviderPayload;
 	timestamp: number; // Unix timestamp in milliseconds

package/src/utils/anthropic-auth.ts

@@ -16,7 +16,6 @@ import {
 	buildAnthropicHeaders as buildProviderAnthropicHeaders,
 	normalizeAnthropicBaseUrl,
 } from "../providers/anthropic";
-import { getEnvApiKey } from "../stream";
 
 /** Auth configuration for Anthropic */
 export interface AnthropicAuthConfig {
@@ -25,6 +24,14 @@ export interface AnthropicAuthConfig {
 	isOAuth: boolean;
 }
 
+export type AnthropicAuthEnvironment = Readonly<Record<string, string | undefined>>;
+
+export interface FindAnthropicAuthOptions {
+	store?: AuthCredentialStore;
+	environment?: AnthropicAuthEnvironment;
+	modelsYmlPath?: string;
+}
+
 /** OAuth credential for Anthropic API access */
 export interface AnthropicOAuthCredential {
 	type: "oauth";
@@ -36,8 +43,8 @@ export interface AnthropicOAuthCredential {
 
 const DEFAULT_BASE_URL = "https://api.anthropic.com";
 
-function isFoundryEnabled(): boolean {
-	const value = $env.CLAUDE_CODE_USE_FOUNDRY;
+function isFoundryEnabled(environment: AnthropicAuthEnvironment): boolean {
+	const value = environment.CLAUDE_CODE_USE_FOUNDRY;
 	if (!value) return false;
 	const normalized = value.trim().toLowerCase();
 	return normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "on";
@@ -47,15 +54,24 @@ function normalizeBaseUrl(baseUrl: string | undefined): string | undefined {
 	const trimmed = baseUrl?.trim();
 	return trimmed ? trimmed.replace(/\/+$/, "") : undefined;
 }
-function resolveAnthropicBaseUrlFromEnv(): string | undefined {
-	if (isFoundryEnabled()) {
-		const foundryBaseUrl = normalizeBaseUrl($env.FOUNDRY_BASE_URL);
+function resolveAnthropicBaseUrlFromEnv(environment: AnthropicAuthEnvironment): string | undefined {
+	if (isFoundryEnabled(environment)) {
+		const foundryBaseUrl = normalizeBaseUrl(environment.FOUNDRY_BASE_URL);
 		if (foundryBaseUrl) return foundryBaseUrl;
 	}
-	const anthropicBaseUrl = normalizeBaseUrl($env.ANTHROPIC_BASE_URL);
+	const anthropicBaseUrl = normalizeBaseUrl(environment.ANTHROPIC_BASE_URL);
 	return anthropicBaseUrl || undefined;
 }
 
+function resolveGenericAnthropicApiKey(environment: AnthropicAuthEnvironment): string | undefined {
+	if (isFoundryEnabled(environment)) {
+		return (
+			environment.ANTHROPIC_FOUNDRY_API_KEY ?? environment.ANTHROPIC_OAUTH_TOKEN ?? environment.ANTHROPIC_API_KEY
+		);
+	}
+	return environment.ANTHROPIC_OAUTH_TOKEN ?? environment.ANTHROPIC_API_KEY;
+}
+
 /**
  * Checks if a token is an OAuth token by looking for sk-ant-oat prefix.
  * @param apiKey - The API key to check
@@ -112,14 +128,17 @@ async function readAnthropicOAuthCredentials(store?: AuthCredentialStore): Promi
  * Skips shell-backed secrets, which this tier cannot resolve.
  * @returns AnthropicAuthConfig or null if unavailable
  */
-function readAnthropicAuthFromModelsYml(): AnthropicAuthConfig | null {
-	const block = readProviderFromModelsYml("anthropic");
+function readAnthropicAuthFromModelsYml(
+	environment: AnthropicAuthEnvironment,
+	modelsYmlPath?: string,
+): AnthropicAuthConfig | null {
+	const block = readProviderFromModelsYml("anthropic", modelsYmlPath);
 	if (!block?.baseUrl || !block.apiKey) return null;
 
 	let apiKey: string | undefined;
 	switch (block.apiKey.kind) {
 		case "envVar":
-			apiKey = process.env[block.apiKey.name];
+			apiKey = environment[block.apiKey.name];
 			break;
 		case "literal":
 			apiKey = block.apiKey.value;
@@ -159,13 +178,16 @@ export function normalizeLitellmBase(url: string): string {
  *   5. ANTHROPIC_API_KEY / ANTHROPIC_BASE_URL fallback
  *   6. Anthropic provider credentials from models.yml
  *   7. LiteLLM passthrough (LITELLM_BASE_URL / LITELLM_API_KEY)
- * @param store - Optional credential store (creates one from default db path if not provided)
+ * @param options - Injectable auth inputs. Production callers normally omit this;
+ * tests and embedded callers can provide an isolated environment, models path,
+ * and credential store without mutating process-global state.
  * @returns The first valid auth configuration found, or null if none available
  */
-export async function findAnthropicAuth(store?: AuthCredentialStore): Promise<AnthropicAuthConfig | null> {
+export async function findAnthropicAuth(options: FindAnthropicAuthOptions = {}): Promise<AnthropicAuthConfig | null> {
+	const environment = options.environment ?? $env;
 	// 1. Explicit search-specific env vars
-	const searchApiKey = $env.ANTHROPIC_SEARCH_API_KEY;
-	const searchBaseUrl = $env.ANTHROPIC_SEARCH_BASE_URL;
+	const searchApiKey = environment.ANTHROPIC_SEARCH_API_KEY;
+	const searchBaseUrl = environment.ANTHROPIC_SEARCH_BASE_URL;
 	if (searchApiKey) {
 		return {
 			apiKey: searchApiKey,
@@ -175,11 +197,11 @@ export async function findAnthropicAuth(store?: AuthCredentialStore): Promise<An
 	}
 
 	// 2. Foundry explicit env override
-	const foundryApiKey = isFoundryEnabled() ? $env.ANTHROPIC_FOUNDRY_API_KEY?.trim() : undefined;
+	const foundryApiKey = isFoundryEnabled(environment) ? environment.ANTHROPIC_FOUNDRY_API_KEY?.trim() : undefined;
 	if (foundryApiKey) {
 		return {
 			apiKey: foundryApiKey,
-			baseUrl: resolveAnthropicBaseUrlFromEnv() ?? DEFAULT_BASE_URL,
+			baseUrl: resolveAnthropicBaseUrlFromEnv(environment) ?? DEFAULT_BASE_URL,
 			isOAuth: isOAuthToken(foundryApiKey),
 		};
 	}
@@ -189,8 +211,8 @@ export async function findAnthropicAuth(store?: AuthCredentialStore): Promise<An
 	// env-var fallback tiers from running.
 	let storeError: unknown;
 	try {
-		const ownsStore = !store;
-		const effectiveStore = store ?? (await AuthCredentialStore.open(getAgentDbPath()));
+		const ownsStore = !options.store;
+		const effectiveStore = options.store ?? (await AuthCredentialStore.open(getAgentDbPath()));
 		try {
 			// 3. OAuth credentials in agent.db (with 5-minute expiry buffer)
 			const expiryBuffer = 5 * 60 * 1000; // 5 minutes
@@ -212,7 +234,7 @@ export async function findAnthropicAuth(store?: AuthCredentialStore): Promise<An
 			if (storedApiKey) {
 				return {
 					apiKey: storedApiKey,
-					baseUrl: resolveAnthropicBaseUrlFromEnv() ?? DEFAULT_BASE_URL,
+					baseUrl: resolveAnthropicBaseUrlFromEnv(environment) ?? DEFAULT_BASE_URL,
 					isOAuth: isOAuthToken(storedApiKey),
 				};
 			}
@@ -228,8 +250,8 @@ export async function findAnthropicAuth(store?: AuthCredentialStore): Promise<An
 	}
 
 	// 5. Generic ANTHROPIC_API_KEY fallback
-	const apiKey = getEnvApiKey("anthropic");
-	const baseUrl = resolveAnthropicBaseUrlFromEnv();
+	const apiKey = resolveGenericAnthropicApiKey(environment);
+	const baseUrl = resolveAnthropicBaseUrlFromEnv(environment);
 	if (apiKey) {
 		return {
 			apiKey,
@@ -240,15 +262,15 @@ export async function findAnthropicAuth(store?: AuthCredentialStore): Promise<An
 
 	// 6. Anthropic provider credentials from models.yml
 	try {
-		const modelsYmlAuth = readAnthropicAuthFromModelsYml();
+		const modelsYmlAuth = readAnthropicAuthFromModelsYml(environment, options.modelsYmlPath);
 		if (modelsYmlAuth) return modelsYmlAuth;
 	} catch {
 		/* Best-effort — don't block env-var fallback */
 	}
 
 	// 7. Derive from litellm passthrough credentials
-	const litellmBaseUrl = $env.LITELLM_BASE_URL;
-	const litellmApiKey = $env.LITELLM_API_KEY;
+	const litellmBaseUrl = environment.LITELLM_BASE_URL;
+	const litellmApiKey = environment.LITELLM_API_KEY;
 	if (litellmBaseUrl && litellmApiKey) {
 		return {
 			apiKey: litellmApiKey,