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

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-ai",
-	"version": "21.5.2",
+	"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,7 +46,7 @@
 		"@anthropic-ai/sdk": "^0.115",
 		"@aws-sdk/client-bedrock-runtime": "^3",
 		"@bufbuild/protobuf": "^2.11",
-		"@f5-sales-demo/pi-utils": "21.5.2",
+		"@f5-sales-demo/pi-utils": "21.5.3",
 		"@google/genai": "^2.15",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",

package/src/providers/google-vertex.ts

@@ -39,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
@@ -516,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/google-antigravity.ts

@@ -29,12 +29,6 @@ const SCOPES = [
 
 const AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
 const TOKEN_URL = "https://oauth2.googleapis.com/token";
-// Split the licensed public desktop identifier so secret scanners do not mistake
-// the complete client ID for a user credential.
-const VERTEX_CLIENT_ID =
-	decode("ODg0MzU0OTE5MDUyLTM2dHJjMWpqYjN0Z3VpYWMzMm92NmNvZA==") +
-	decode("MjY4YzVibGguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20=");
-const VERTEX_CLIENT_SECRET = decode("R09DU1BYLTlZUVdwRjdS") + decode("V0RDMFFUZGotWXhLTXdSMFp0c1g=");
 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;
@@ -47,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 };
@@ -442,12 +453,13 @@ export async function exchangeVertexOAuthCode(
 	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: VERTEX_CLIENT_ID,
-			client_secret: VERTEX_CLIENT_SECRET,
+			client_id: clientId,
+			client_secret: clientSecret,
 			code,
 			code_verifier: verifier,
 			grant_type: "authorization_code",
@@ -470,9 +482,10 @@ export async function exchangeVertexOAuthCode(
 }
 
 export function createVertexAuthorizationUrl(state: string, challenge: string): string {
+	const { clientId } = resolveVertexOAuthClient();
 	const params = new URLSearchParams({
 		access_type: "offline",
-		client_id: VERTEX_CLIENT_ID,
+		client_id: clientId,
 		code_challenge: challenge,
 		code_challenge_method: "S256",
 		prompt: "consent",
@@ -539,12 +552,13 @@ 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: VERTEX_CLIENT_ID,
-			client_secret: VERTEX_CLIENT_SECRET,
+			client_id: clientId,
+			client_secret: clientSecret,
 			refresh_token: refreshToken,
 			grant_type: "refresh_token",
 		}),