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

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-ai",
-	"version": "21.2.1",
+	"version": "21.4.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.4.0",
 		"@google/genai": "^2.15",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",

package/src/providers/google-vertex.ts

@@ -104,10 +104,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);
 			const params = buildGoogleVertexParams(model, context, options);
 			options?.onPayload?.(params);
 			rawRequestDump = {
@@ -115,9 +116,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);
@@ -342,23 +341,6 @@ function createClient(model: Model<"google-vertex">, project: string, location:
 	});
 }
 
-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 +424,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

package/src/utils/oauth/index.ts

@@ -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",
@@ -509,7 +509,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

@@ -74,11 +74,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;
 }