@f5-sales-demo/pi-ai 21.2.1 → 21.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-ai",
-	"version": "21.2.1",
+	"version": "21.5.0",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -46,7 +46,7 @@
 		"@anthropic-ai/sdk": "^0.115",
 		"@aws-sdk/client-bedrock-runtime": "^3",
 		"@bufbuild/protobuf": "^2.11",
-		"@f5-sales-demo/pi-utils": "21.2.1",
+		"@f5-sales-demo/pi-utils": "21.5.0",
 		"@google/genai": "^2.15",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",

package/src/auth-storage.ts

@@ -38,7 +38,7 @@ import { loginCloudflareAiGateway } from "./utils/oauth/cloudflare-ai-gateway";
 import { loginCursor } from "./utils/oauth/cursor";
 import { loginGitHubCopilot } from "./utils/oauth/github-copilot";
 import { loginGitLabDuo } from "./utils/oauth/gitlab-duo";
-import { loginAntigravity } from "./utils/oauth/google-antigravity";
+import { loginAntigravity, loginVertexWithAntigravityOAuth } from "./utils/oauth/google-antigravity";
 import { loginGeminiCli } from "./utils/oauth/google-gemini-cli";
 import { loginHuggingface } from "./utils/oauth/huggingface";
 import { loginKagi } from "./utils/oauth/kagi";
@@ -793,6 +793,12 @@ export class AuthStorage {
 					onManualCodeInput: ctrl.onManualCodeInput ?? manualCodeInput,
 				});
 				break;
+			case "google-vertex":
+				credentials = await loginVertexWithAntigravityOAuth({
+					...ctrl,
+					onManualCodeInput: ctrl.onManualCodeInput ?? manualCodeInput,
+				});
+				break;
 			case "google-antigravity":
 				credentials = await loginAntigravity({
 					...ctrl,

package/src/providers/google-vertex.ts

@@ -35,6 +35,8 @@ import {
 } from "./google-shared";
 
 export interface GoogleVertexOptions extends StreamOptions {
+	/** OAuth bearer token from the isolated Vertex credential namespace. */
+	apiKey?: string;
 	toolChoice?: "auto" | "none" | "any";
 	thinking?: {
 		enabled: boolean;
@@ -104,10 +106,11 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 		let rawRequestDump: RawHttpRequestDump | undefined;
 
 		try {
-			const apiKey = resolveApiKey(options);
-			const project = apiKey ? undefined : await resolveGoogleVertexProject(options);
-			const location = apiKey ? undefined : resolveGoogleVertexLocation(options);
-			const client = apiKey ? createClientWithApiKey(model, apiKey) : createClient(model, project!, location!);
+			// Corporate Vertex is deliberately ADC-only.  In particular, do not let the
+			// generic agent API-key plumbing turn this route into Gemini consumer auth.
+			const project = await resolveGoogleVertexProject(options);
+			const location = resolveGoogleVertexLocation(options);
+			const client = createClient(model, project, location, options?.apiKey);
 			const params = buildGoogleVertexParams(model, context, options);
 			options?.onPayload?.(params);
 			rawRequestDump = {
@@ -115,9 +118,7 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 				api: output.api,
 				model: model.id,
 				method: "POST",
-				url: apiKey
-					? `https://aiplatform.googleapis.com/${API_VERSION}/publishers/google/models/${model.id}:streamGenerateContent`
-					: googleVertexRequestUrl(model.id, project!, location!),
+				url: googleVertexRequestUrl(model.id, project, location),
 				body: params,
 			};
 			const googleStream = await client.models.generateContentStream(params);
@@ -332,33 +333,24 @@ function buildHttpOptions(model: Model<"google-vertex">): { headers?: Record<str
 	return { headers: { ...model.headers } };
 }
 
-function createClient(model: Model<"google-vertex">, project: string, location: string): GoogleGenAI {
+function createClient(
+	model: Model<"google-vertex">,
+	project: string,
+	location: string,
+	accessToken?: string,
+): GoogleGenAI {
 	return new GoogleGenAI({
 		vertexai: true,
 		project,
 		location,
 		apiVersion: API_VERSION,
-		httpOptions: buildHttpOptions(model),
+		httpOptions: {
+			...buildHttpOptions(model),
+			...(accessToken ? { headers: { ...model.headers, Authorization: `Bearer ${accessToken}` } } : {}),
+		},
 	});
 }
 
-function createClientWithApiKey(model: Model<"google-vertex">, apiKey: string): GoogleGenAI {
-	return new GoogleGenAI({
-		vertexai: true,
-		apiKey,
-		apiVersion: API_VERSION,
-		httpOptions: buildHttpOptions(model),
-	});
-}
-
-function resolveApiKey(options?: GoogleVertexOptions): string | undefined {
-	// options.apiKey may contain sentinel values like "<authenticated>" or "N/A"
-	// leaked from the agent loop — only use it if it looks like a real API key.
-	const optKey = options?.apiKey;
-	const realKey = optKey && !optKey.startsWith("<") && optKey !== "N/A" ? optKey : undefined;
-	return realKey || $env.GOOGLE_CLOUD_API_KEY;
-}
-
 const defaultProjectRuntime: GoogleVertexProjectRuntime = {
 	readAdcProject,
 	readLocalConfigProject: readConfiguredGcloudProject,
@@ -442,7 +434,10 @@ export async function resolveGoogleVertexProject(
 }
 
 export function resolveGoogleVertexLocation(options?: GoogleVertexOptions): string {
-	return options?.location || $env.GOOGLE_CLOUD_LOCATION || "global";
+	// Gemini 3.7 Flash Corporate is served through the global endpoint only.
+	// Ignore inherited provider/environment locations so a request cannot drift.
+	void options;
+	return "global";
 }
 
 async function readAdcProject(): Promise<string | undefined> {

package/src/stream.ts

@@ -97,15 +97,8 @@ const serviceProviderMap: Record<string, KeyResolver> = {
 			? $pickenv("ANTHROPIC_FOUNDRY_API_KEY", "ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY")
 			: $pickenv("ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY"),
 	"gitlab-duo": "GITLAB_TOKEN",
-	// Vertex AI supports either GOOGLE_CLOUD_API_KEY or Application Default Credentials.
-	"google-vertex": () => {
-		if ($env.GOOGLE_CLOUD_API_KEY) {
-			return $env.GOOGLE_CLOUD_API_KEY;
-		}
-		if (hasVertexAdcCredentials()) {
-			return "<authenticated>";
-		}
-	},
+	// Corporate Vertex uses Application Default Credentials only.
+	"google-vertex": () => (hasVertexAdcCredentials() ? "<authenticated>" : undefined),
 	// Amazon Bedrock supports multiple credential sources:
 	// 1. AWS_PROFILE - named profile from ~/.aws/credentials
 	// 2. AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY - standard IAM keys
@@ -181,7 +174,7 @@ export function stream<TApi extends Api>(
 		});
 	}
 
-	// Vertex AI uses Application Default Credentials, not API keys
+	// Vertex accepts either existing ADC or the isolated OAuth bearer token.
 	if (model.api === "google-vertex") {
 		return streamGoogleVertex(model as Model<"google-vertex">, context, options as GoogleVertexOptions);
 	} else if (model.api === "bedrock-converse-stream") {
@@ -250,9 +243,10 @@ export function streamSimple<TApi extends Api>(
 		return customApiProvider.streamSimple(model, context, options);
 	}
 
-	// Vertex AI uses Application Default Credentials, not API keys
+	// Vertex receives a short-lived OAuth bearer token when available; otherwise
+	// the Google SDK performs normal ADC discovery.
 	if (model.api === "google-vertex") {
-		const providerOptions = mapOptionsForApi(model, options, undefined);
+		const providerOptions = mapOptionsForApi(model, options, options?.apiKey);
 		return stream(model, context, providerOptions);
 	} else if (model.api === "bedrock-converse-stream") {
 		// Bedrock doesn't have any API keys instead it sources credentials from standard AWS env variables or from given AWS profile.

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

@@ -341,9 +341,9 @@ async function discoverProject(
 	}
 }
 
-async function getUserEmail(accessToken: string): Promise<string | undefined> {
+async function getUserEmail(accessToken: string, fetchImpl: typeof fetch = fetch): Promise<string | undefined> {
 	try {
-		const response = await fetch("https://www.googleapis.com/oauth2/v1/userinfo?alt=json", {
+		const response = await fetchImpl("https://www.googleapis.com/oauth2/v1/userinfo?alt=json", {
 			headers: { Authorization: `Bearer ${accessToken}` },
 		});
 
@@ -357,6 +357,19 @@ async function getUserEmail(accessToken: string): Promise<string | undefined> {
 	return undefined;
 }
 
+function googleAuthUrl(state: string, redirectUri: string): string {
+	const authParams = new URLSearchParams({
+		client_id: CLIENT_ID,
+		response_type: "code",
+		redirect_uri: redirectUri,
+		scope: SCOPES.join(" "),
+		state,
+		access_type: "offline",
+		prompt: "consent",
+	});
+	return `${AUTH_URL}?${authParams.toString()}`;
+}
+
 class AntigravityOAuthFlow extends OAuthCallbackFlow {
 	#configuredProjectId: string | undefined;
 
@@ -366,18 +379,7 @@ class AntigravityOAuthFlow extends OAuthCallbackFlow {
 	}
 
 	async generateAuthUrl(state: string, redirectUri: string): Promise<{ url: string; instructions?: string }> {
-		const authParams = new URLSearchParams({
-			client_id: CLIENT_ID,
-			response_type: "code",
-			redirect_uri: redirectUri,
-			scope: SCOPES.join(" "),
-			state,
-			access_type: "offline",
-			prompt: "consent",
-		});
-
-		const url = `${AUTH_URL}?${authParams.toString()}`;
-		return { url, instructions: "Complete the sign-in in your browser." };
+		return { url: googleAuthUrl(state, redirectUri), instructions: "Complete the sign-in in your browser." };
 	}
 
 	async exchangeToken(code: string, _state: string, redirectUri: string): Promise<OAuthCredentials> {
@@ -425,6 +427,52 @@ class AntigravityOAuthFlow extends OAuthCallbackFlow {
 	}
 }
 
+export async function exchangeVertexOAuthCode(
+	code: string,
+	redirectUri: string,
+	fetchImpl: typeof fetch = fetch,
+): Promise<OAuthCredentials> {
+	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,
+			code,
+			grant_type: "authorization_code",
+			redirect_uri: redirectUri,
+		}),
+	});
+	if (!tokenResponse.ok) throw new Error(`Token exchange failed: ${await tokenResponse.text()}`);
+	const tokenData = (await tokenResponse.json()) as {
+		access_token: string;
+		refresh_token: string;
+		expires_in: number;
+	};
+	if (!tokenData.refresh_token) throw new Error("No refresh token received. Please try again.");
+	return {
+		refresh: tokenData.refresh_token,
+		access: tokenData.access_token,
+		expires: Date.now() + tokenData.expires_in * 1000 - 5 * 60 * 1000,
+		email: await getUserEmail(tokenData.access_token, fetchImpl),
+	};
+}
+
+class VertexAntigravityOAuthFlow extends OAuthCallbackFlow {
+	constructor(ctrl: OAuthController) {
+		super(ctrl, CALLBACK_PORT, CALLBACK_PATH);
+	}
+
+	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 exchangeToken(code: string, _state: string, redirectUri: string): Promise<OAuthCredentials> {
+		this.ctrl.onProgress?.("Exchanging authorization code for a Vertex credential...");
+		return exchangeVertexOAuthCode(code, redirectUri);
+	}
+}
+
 /**
  * Login with Antigravity OAuth
  */
@@ -439,6 +487,20 @@ export async function loginAntigravity(
 	return flow.login();
 }
 
+/**
+ * Authorized direct-Vertex login. This deliberately reuses only the approved
+ * Google OAuth client flow; it does not call Code Assist or share Antigravity
+ * credential/project state.
+ */
+export async function loginVertexWithAntigravityOAuth(ctrl: OAuthController): Promise<OAuthCredentials> {
+	return new VertexAntigravityOAuthFlow(ctrl).login();
+}
+
+export async function refreshVertexWithAntigravityOAuth(refreshToken: string): Promise<OAuthCredentials> {
+	const credentials = await refreshAntigravityToken(refreshToken, "");
+	return { ...credentials, projectId: undefined, tierId: undefined };
+}
+
 /**
  * Refresh Antigravity token
  */

package/src/utils/oauth/index.ts

@@ -5,7 +5,7 @@ import { refreshAnthropicToken } from "./anthropic";
 import { refreshCursorToken } from "./cursor";
 import { refreshGitHubCopilotToken } from "./github-copilot";
 import { refreshGitLabDuoToken } from "./gitlab-duo";
-import { refreshAntigravityToken } from "./google-antigravity";
+import { refreshAntigravityToken, refreshVertexWithAntigravityOAuth } from "./google-antigravity";
 import { refreshGoogleCloudToken } from "./google-gemini-cli";
 import { refreshKimiToken } from "./kimi";
 import { refreshOpenAICodexToken } from "./openai-codex";
@@ -66,7 +66,7 @@ export {
 // GitLab Duo
 export { loginGitLabDuo, refreshGitLabDuoToken } from "./gitlab-duo";
 // Google Antigravity
-export { loginAntigravity, refreshAntigravityToken } from "./google-antigravity";
+export { loginAntigravity, loginVertexWithAntigravityOAuth, refreshAntigravityToken } from "./google-antigravity";
 // Google Gemini CLI
 export { loginGeminiCli, refreshGoogleCloudToken } from "./google-gemini-cli";
 // Hugging Face Inference (API key)
@@ -199,14 +199,14 @@ const builtInOAuthProviders: OAuthProviderInfo[] = [
 	{
 		id: "google-antigravity",
 		name: "Antigravity (Gemini 3, Claude, GPT-OSS)",
+		description: "Optional consumer or non-corporate route",
 		available: true,
 	},
 	{
 		id: "google-antigravity-enterprise",
-		name: "Google Antigravity Enterprise (Gemini 3.6 Flash High)",
+		name: "Google Antigravity Enterprise (Advanced OAuth)",
+		description: "Advanced corporate OAuth route; entitlement-discovered models, not Vertex ADC",
 		available: true,
-		canonicalId: "google-antigravity",
-		loginOnly: true,
 	},
 	{
 		id: "cursor",
@@ -393,6 +393,9 @@ export async function refreshOAuthToken(
 			}
 			newCredentials = await refreshGoogleCloudToken(credentials.refresh, credentials.projectId);
 			break;
+		case "google-vertex":
+			newCredentials = await refreshVertexWithAntigravityOAuth(credentials.refresh);
+			break;
 		case "google-antigravity":
 			if (!credentials.projectId) {
 				throw new Error("Antigravity credentials missing projectId");
@@ -509,7 +512,10 @@ export async function getOAuthApiKey(
 	}
 	// For providers that need request-time credential metadata, return JSON.
 	const needsStructuredApiKey =
-		provider === "github-copilot" || provider === "google-gemini-cli" || provider === "google-antigravity";
+		provider === "github-copilot" ||
+		provider === "google-gemini-cli" ||
+		provider === "google-antigravity" ||
+		provider === "google-antigravity-enterprise";
 	const apiKey = needsStructuredApiKey
 		? JSON.stringify({
 				token: creds.access,

package/src/utils/oauth/types.ts

@@ -18,6 +18,7 @@ export type OAuthProvider =
 	| "cursor"
 	| "github-copilot"
 	| "google-gemini-cli"
+	| "google-vertex"
 	| "google-antigravity"
 	| "google-antigravity-enterprise"
 	| "gitlab-duo"
@@ -74,11 +75,14 @@ export interface OAuthProviderInfo {
 	canonicalId?: OAuthProvider;
 	/** Entry is offered for login but omitted from logout to avoid alias duplicates. */
 	loginOnly?: boolean;
+	/** Short secondary text displayed by interactive login pickers. */
+	description?: string;
+	/** Stable login-menu order; lower values are shown first. */
+	loginOrder?: number;
 }
 
 /** Resolve login-only aliases to the provider ID used by credentials and models. */
 export function canonicalizeOAuthProviderId(provider: string): string {
-	if (provider === "google-antigravity-enterprise") return "google-antigravity";
 	return provider;
 }