@f5-sales-demo/pi-ai 21.5.1 → 21.5.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-ai",
-	"version": "21.5.1",
+	"version": "21.5.3",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -46,12 +46,13 @@
 		"@anthropic-ai/sdk": "^0.115",
 		"@aws-sdk/client-bedrock-runtime": "^3",
 		"@bufbuild/protobuf": "^2.11",
-		"@f5-sales-demo/pi-utils": "21.5.1",
+		"@f5-sales-demo/pi-utils": "21.5.3",
 		"@google/genai": "^2.15",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",
 		"ajv": "^8.20",
 		"ajv-formats": "^3.0",
+		"google-auth-library": "^10.3",
 		"openai": "^6.25",
 		"partial-json": "^0.1",
 		"zod": "^4.3"

package/src/providers/google-vertex.ts

@@ -6,10 +6,12 @@ import {
 	type GenerateContentConfig,
 	type GenerateContentParameters,
 	GoogleGenAI,
+	type GoogleGenAIOptions,
 	type ThinkingConfig,
 	ThinkingLevel,
 } from "@google/genai";
 import { $ } from "bun";
+import { OAuth2Client } from "google-auth-library";
 import { calculateCost } from "../models";
 import type {
 	Api,
@@ -37,7 +39,7 @@ import {
 export interface GoogleVertexOptions extends StreamOptions {
 	/** OAuth bearer token from the isolated Vertex credential namespace. */
 	apiKey?: string;
-	toolChoice?: "auto" | "none" | "any";
+	toolChoice?: "auto" | "none" | "any" | { name: string };
 	thinking?: {
 		enabled: boolean;
 		budgetTokens?: number; // -1 for dynamic, 0 to disable
@@ -339,16 +341,30 @@ function createClient(
 	location: string,
 	accessToken?: string,
 ): GoogleGenAI {
-	return new GoogleGenAI({
+	return new GoogleGenAI(buildGoogleVertexClientOptions(model, project, location, accessToken));
+}
+
+export function buildGoogleVertexClientOptions(
+	model: Model<"google-vertex">,
+	project: string,
+	location: string,
+	accessToken?: string,
+): GoogleGenAIOptions {
+	return {
 		vertexai: true,
 		project,
 		location,
 		apiVersion: API_VERSION,
-		httpOptions: {
-			...buildHttpOptions(model),
-			...(accessToken ? { headers: { ...model.headers, Authorization: `Bearer ${accessToken}` } } : {}),
-		},
-	});
+		googleAuthOptions: accessToken ? { authClient: createGoogleVertexAuthClient(accessToken) } : undefined,
+		httpOptions: buildHttpOptions(model),
+	};
+}
+
+/** Create an explicit auth client so standalone OAuth never invokes ambient ADC discovery. */
+export function createGoogleVertexAuthClient(accessToken: string): OAuth2Client {
+	const authClient = new OAuth2Client();
+	authClient.setCredentials({ access_token: accessToken });
+	return authClient;
 }
 
 const defaultProjectRuntime: GoogleVertexProjectRuntime = {
@@ -500,9 +516,11 @@ export function buildGoogleVertexParams(
 	};
 
 	if (context.tools && context.tools.length > 0 && options.toolChoice) {
+		const forcedToolName = typeof options.toolChoice === "string" ? undefined : options.toolChoice.name;
 		config.toolConfig = {
 			functionCallingConfig: {
-				mode: mapToolChoice(options.toolChoice),
+				mode: mapToolChoice(typeof options.toolChoice === "string" ? options.toolChoice : "any"),
+				...(forcedToolName && { allowedFunctionNames: [forcedToolName] }),
 			},
 		};
 	} else {

package/src/stream.ts

@@ -339,9 +339,7 @@ export function mapAnthropicToolChoice(choice?: ToolChoice): AnthropicOptions["t
 	return undefined;
 }
 
-function mapGoogleToolChoice(
-	choice?: ToolChoice,
-): GoogleOptions["toolChoice"] | GoogleGeminiCliOptions["toolChoice"] | GoogleVertexOptions["toolChoice"] {
+function mapGoogleToolChoice(choice?: ToolChoice): GoogleOptions["toolChoice"] | GoogleGeminiCliOptions["toolChoice"] {
 	if (!choice) return undefined;
 	if (typeof choice === "string") {
 		if (choice === "required") return "any";
@@ -351,6 +349,17 @@ function mapGoogleToolChoice(
 	return "any";
 }
 
+function mapGoogleVertexToolChoice(choice?: ToolChoice): GoogleVertexOptions["toolChoice"] {
+	if (!choice) return undefined;
+	if (typeof choice === "string") {
+		if (choice === "required") return "any";
+		if (choice === "auto" || choice === "none" || choice === "any") return choice;
+		return undefined;
+	}
+	const name = choice.type === "function" && "function" in choice ? choice.function.name : choice.name;
+	return name ? { name } : undefined;
+}
+
 function mapOpenAiToolChoice(choice?: ToolChoice): OpenAICompletionsOptions["toolChoice"] {
 	if (!choice) return undefined;
 	if (typeof choice === "string") {
@@ -637,7 +646,7 @@ export function mapOptionsForApi<TApi extends Api>(
 				return castApi<"google-vertex">({
 					...vertexBase,
 					thinking: { enabled: false },
-					toolChoice: mapGoogleToolChoice(options?.toolChoice),
+					toolChoice: mapGoogleVertexToolChoice(options?.toolChoice),
 				});
 			}
 
@@ -652,7 +661,7 @@ export function mapOptionsForApi<TApi extends Api>(
 						enabled: true,
 						level: mapEffortToGoogleThinkingLevel(geminiModel, effort),
 					},
-					toolChoice: mapGoogleToolChoice(options?.toolChoice),
+					toolChoice: mapGoogleVertexToolChoice(options?.toolChoice),
 				});
 			}
 
@@ -662,7 +671,7 @@ export function mapOptionsForApi<TApi extends Api>(
 					enabled: true,
 					budgetTokens: getGoogleBudget(geminiModel, effort, options?.thinkingBudgets),
 				},
-				toolChoice: mapGoogleToolChoice(options?.toolChoice),
+				toolChoice: mapGoogleVertexToolChoice(options?.toolChoice),
 			});
 		}
 

package/src/utils/oauth/callback-server.ts

@@ -30,6 +30,10 @@ export interface OAuthCallbackFlowOptions {
 	callbackHostname?: string;
 	/** Exact redirect URI advertised to the provider; disables port fallback. */
 	redirectUri?: string;
+	/** Hosted callback returns a code for manual entry; do not bind a local listener. */
+	manualOnly?: boolean;
+	/** Maximum time to wait for the provider callback or manual authorization code. */
+	timeoutMs?: number;
 }
 
 /**
@@ -41,6 +45,8 @@ export abstract class OAuthCallbackFlow {
 	callbackPath: string;
 	callbackHostname: string;
 	redirectUri?: string;
+	manualOnly: boolean = false;
+	timeoutMs: number = DEFAULT_TIMEOUT;
 	#callbackResolve?: (result: CallbackResult) => void;
 	#callbackReject?: (error: string) => void;
 
@@ -61,6 +67,8 @@ export abstract class OAuthCallbackFlow {
 		this.callbackPath = preferredPortOrOptions.callbackPath ?? CALLBACK_PATH;
 		this.callbackHostname = preferredPortOrOptions.callbackHostname ?? DEFAULT_HOSTNAME;
 		this.redirectUri = preferredPortOrOptions.redirectUri;
+		this.manualOnly = preferredPortOrOptions.manualOnly ?? false;
+		this.timeoutMs = preferredPortOrOptions.timeoutMs ?? DEFAULT_TIMEOUT;
 	}
 
 	/**
@@ -95,6 +103,9 @@ export abstract class OAuthCallbackFlow {
 	 * Execute the OAuth login flow.
 	 */
 	async login(): Promise<OAuthCredentials> {
+		if (this.manualOnly && !this.ctrl.onManualCodeInput) {
+			throw new Error("Manual-only OAuth flow requires an authorization-code input handler");
+		}
 		const state = this.generateState();
 
 		// Start callback server first to get actual redirect URI
@@ -123,6 +134,13 @@ export abstract class OAuthCallbackFlow {
 	 * Start callback server, trying preferred port first, falling back to random.
 	 */
 	async #startCallbackServer(expectedState: string): Promise<{ server: CallbackServer; redirectUri: string }> {
+		if (this.manualOnly) {
+			if (!this.redirectUri) throw new Error("Manual-only OAuth flow requires an exact redirect URI");
+			return {
+				server: { port: 0, stop: () => {} },
+				redirectUri: this.redirectUri,
+			};
+		}
 		try {
 			const server = this.#createServer(this.preferredPort, expectedState);
 			if (this.redirectUri) {
@@ -241,7 +259,7 @@ export abstract class OAuthCallbackFlow {
 	 * Wait for OAuth callback or manual input (whichever comes first).
 	 */
 	#waitForCallback(expectedState: string): Promise<CallbackResult> {
-		const timeoutSignal = AbortSignal.timeout(DEFAULT_TIMEOUT);
+		const timeoutSignal = AbortSignal.timeout(this.timeoutMs);
 		const signal = this.ctrl.signal ? AbortSignal.any([this.ctrl.signal, timeoutSignal]) : timeoutSignal;
 
 		const callbackPromise = new Promise<CallbackResult>((resolve, reject) => {

package/src/utils/oauth/google-antigravity.ts

@@ -8,6 +8,7 @@ import { join } from "node:path";
 import { $env } from "@f5-sales-demo/pi-utils";
 import { getAntigravityAuthHeaders } from "../../providers/google-gemini-cli";
 import { OAuthCallbackFlow } from "./callback-server";
+import { generatePKCE } from "./pkce";
 import type { OAuthController, OAuthCredentials } from "./types";
 
 const decode = (s: string) => atob(s);
@@ -28,6 +29,9 @@ const SCOPES = [
 
 const AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
 const TOKEN_URL = "https://oauth2.googleapis.com/token";
+const VERTEX_AUTH_URL = "https://accounts.google.com/o/oauth2/auth";
+export const VERTEX_OAUTH_REDIRECT_URI = "https://antigravity.google/oauth-callback";
+const VERTEX_OAUTH_TIMEOUT_MS = 15 * 60 * 1000;
 const CLOUD_CODE_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 const TIER_LEGACY = "legacy-tier";
 const TIER_STANDARD = "standard-tier";
@@ -37,6 +41,23 @@ const PROJECT_ID_PATTERN = /^[a-z][a-z0-9-]{4,28}[a-z0-9]$/;
 const PROJECT_NUMBER_PATTERN = /^\d{12}$/;
 const ANTIGRAVITY_CLI_TOKEN_PATH = join(homedir(), ".gemini", "antigravity-cli", "antigravity-oauth-token");
 
+declare const PI_VERTEX_OAUTH_CLIENT_ID: string | undefined;
+declare const PI_VERTEX_OAUTH_CLIENT_SECRET: string | undefined;
+
+function resolveVertexOAuthClient(): { clientId: string; clientSecret: string } {
+	const compiledClientId = typeof PI_VERTEX_OAUTH_CLIENT_ID === "string" ? PI_VERTEX_OAUTH_CLIENT_ID.trim() : "";
+	const compiledClientSecret =
+		typeof PI_VERTEX_OAUTH_CLIENT_SECRET === "string" ? PI_VERTEX_OAUTH_CLIENT_SECRET.trim() : "";
+	const clientId = compiledClientId || Bun.env.XCSH_VERTEX_OAUTH_CLIENT_ID?.trim();
+	const clientSecret = compiledClientSecret || Bun.env.XCSH_VERTEX_OAUTH_CLIENT_SECRET?.trim();
+	if (!clientId || !clientSecret) {
+		throw new Error(
+			"Corporate Vertex OAuth credentials are unavailable in this build. Install an official xcsh binary or provide the licensed build credentials when running from source.",
+		);
+	}
+	return { clientId, clientSecret };
+}
+
 interface LoadCodeAssistPayload {
 	cloudaicompanionProject?: string | { id?: string };
 	currentTier?: { id?: string };
@@ -429,18 +450,20 @@ class AntigravityOAuthFlow extends OAuthCallbackFlow {
 
 export async function exchangeVertexOAuthCode(
 	code: string,
-	redirectUri: string,
+	verifier: string,
 	fetchImpl: typeof fetch = fetch,
 ): Promise<OAuthCredentials> {
+	const { clientId, clientSecret } = resolveVertexOAuthClient();
 	const tokenResponse = await fetchImpl(TOKEN_URL, {
 		method: "POST",
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
 		body: new URLSearchParams({
-			client_id: CLIENT_ID,
-			client_secret: CLIENT_SECRET,
+			client_id: clientId,
+			client_secret: clientSecret,
 			code,
+			code_verifier: verifier,
 			grant_type: "authorization_code",
-			redirect_uri: redirectUri,
+			redirect_uri: VERTEX_OAUTH_REDIRECT_URI,
 		}),
 	});
 	if (!tokenResponse.ok) throw new Error(`Token exchange failed: ${await tokenResponse.text()}`);
@@ -458,18 +481,46 @@ export async function exchangeVertexOAuthCode(
 	};
 }
 
+export function createVertexAuthorizationUrl(state: string, challenge: string): string {
+	const { clientId } = resolveVertexOAuthClient();
+	const params = new URLSearchParams({
+		access_type: "offline",
+		client_id: clientId,
+		code_challenge: challenge,
+		code_challenge_method: "S256",
+		prompt: "consent",
+		redirect_uri: VERTEX_OAUTH_REDIRECT_URI,
+		response_type: "code",
+		scope: [...SCOPES, "openid"].join(" "),
+		state,
+	});
+	return `${VERTEX_AUTH_URL}?${params.toString()}`;
+}
+
 class VertexAntigravityOAuthFlow extends OAuthCallbackFlow {
-	constructor(ctrl: OAuthController) {
-		super(ctrl, CALLBACK_PORT, CALLBACK_PATH);
+	constructor(
+		ctrl: OAuthController,
+		private readonly verifier: string,
+		private readonly challenge: string,
+	) {
+		super(ctrl, {
+			preferredPort: CALLBACK_PORT,
+			redirectUri: VERTEX_OAUTH_REDIRECT_URI,
+			manualOnly: true,
+			timeoutMs: VERTEX_OAUTH_TIMEOUT_MS,
+		});
 	}
 
-	async generateAuthUrl(state: string, redirectUri: string): Promise<{ url: string; instructions?: string }> {
-		return { url: googleAuthUrl(state, redirectUri), instructions: "Complete the sign-in in your browser." };
+	async generateAuthUrl(state: string, _redirectUri: string): Promise<{ url: string; instructions?: string }> {
+		return {
+			url: createVertexAuthorizationUrl(state, this.challenge),
+			instructions: "Complete sign-in, then enter the authorization code shown by Antigravity.",
+		};
 	}
 
-	async exchangeToken(code: string, _state: string, redirectUri: string): Promise<OAuthCredentials> {
+	async exchangeToken(code: string, _state: string, _redirectUri: string): Promise<OAuthCredentials> {
 		this.ctrl.onProgress?.("Exchanging authorization code for a Vertex credential...");
-		return exchangeVertexOAuthCode(code, redirectUri);
+		return exchangeVertexOAuthCode(code, this.verifier);
 	}
 }
 
@@ -493,12 +544,36 @@ export async function loginAntigravity(
  * credential/project state.
  */
 export async function loginVertexWithAntigravityOAuth(ctrl: OAuthController): Promise<OAuthCredentials> {
-	return new VertexAntigravityOAuthFlow(ctrl).login();
+	const pkce = await generatePKCE();
+	return new VertexAntigravityOAuthFlow(ctrl, pkce.verifier, pkce.challenge).login();
 }
 
-export async function refreshVertexWithAntigravityOAuth(refreshToken: string): Promise<OAuthCredentials> {
-	const credentials = await refreshAntigravityToken(refreshToken, "");
-	return { ...credentials, projectId: undefined, tierId: undefined };
+export async function refreshVertexWithAntigravityOAuth(
+	refreshToken: string,
+	fetchImpl: typeof fetch = fetch,
+): Promise<OAuthCredentials> {
+	const { clientId, clientSecret } = resolveVertexOAuthClient();
+	const response = await fetchImpl(TOKEN_URL, {
+		method: "POST",
+		headers: { "Content-Type": "application/x-www-form-urlencoded" },
+		body: new URLSearchParams({
+			client_id: clientId,
+			client_secret: clientSecret,
+			refresh_token: refreshToken,
+			grant_type: "refresh_token",
+		}),
+	});
+	if (!response.ok) throw new Error(`Vertex token refresh failed: ${await response.text()}`);
+	const data = (await response.json()) as {
+		access_token: string;
+		expires_in: number;
+		refresh_token?: string;
+	};
+	return {
+		refresh: data.refresh_token || refreshToken,
+		access: data.access_token,
+		expires: Date.now() + data.expires_in * 1000 - 5 * 60 * 1000,
+	};
 }
 
 /**