@f5-sales-demo/pi-ai 20.3.2 → 20.3.3

package/package.json

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

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

@@ -2,6 +2,9 @@
  * Antigravity OAuth flow (Gemini 3, Claude, GPT-OSS via Google Cloud)
  * Uses different OAuth credentials than google-gemini-cli for access to additional models.
  */
+import { readFile } from "node:fs/promises";
+import { homedir } from "node:os";
+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";
@@ -29,6 +32,9 @@ const CLOUD_CODE_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 const TIER_LEGACY = "legacy-tier";
 const PROJECT_ONBOARD_MAX_ATTEMPTS = 5;
 const PROJECT_ONBOARD_INTERVAL_MS = 2000;
+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");
 
 interface LoadCodeAssistPayload {
 	cloudaicompanionProject?: string | { id?: string };
@@ -54,6 +60,121 @@ interface AntigravityProjectRequest {
 	metadata: typeof ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA & { duetProject?: string };
 }
 
+interface ProjectEnvironment {
+	GOOGLE_CLOUD_PROJECT?: string;
+	GOOGLE_CLOUD_PROJECT_ID?: string;
+}
+
+interface GcloudProjectCommandResult {
+	exitCode: number;
+	stdout: string;
+}
+
+type GcloudProjectCommand = () => Promise<GcloudProjectCommandResult>;
+
+export interface AntigravityProjectSources {
+	environment?: ProjectEnvironment;
+	readAntigravityProjectId?: () => Promise<string | undefined>;
+	readGcloudProjectId?: () => Promise<string | undefined>;
+}
+
+export interface AntigravityLoginOptions {
+	projectSources?: AntigravityProjectSources;
+}
+
+function normalizeProjectId(value: unknown): string | undefined {
+	if (typeof value !== "string") return undefined;
+	const projectId = value.trim();
+	return PROJECT_ID_PATTERN.test(projectId) || PROJECT_NUMBER_PATTERN.test(projectId) ? projectId : undefined;
+}
+
+export async function readAntigravityCliProjectId(
+	metadataPath = ANTIGRAVITY_CLI_TOKEN_PATH,
+): Promise<string | undefined> {
+	try {
+		const metadata = JSON.parse(await readFile(metadataPath, "utf8")) as unknown;
+		if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) return undefined;
+		return normalizeProjectId((metadata as { project_id?: unknown }).project_id);
+	} catch {
+		return undefined;
+	}
+}
+
+async function runGcloudProjectCommand(): Promise<GcloudProjectCommandResult> {
+	const subprocess = Bun.spawn(["gcloud", "config", "get-value", "project"], {
+		stdin: "ignore",
+		stdout: "pipe",
+		stderr: "ignore",
+	});
+	const [stdout, exitCode] = await Promise.all([new Response(subprocess.stdout).text(), subprocess.exited]);
+	return { exitCode, stdout };
+}
+
+export async function readGcloudProjectId(
+	runCommand: GcloudProjectCommand = runGcloudProjectCommand,
+): Promise<string | undefined> {
+	try {
+		const result = await runCommand();
+		if (result.exitCode !== 0) return undefined;
+		return normalizeProjectId(result.stdout);
+	} catch {
+		return undefined;
+	}
+}
+
+async function readExternalProjectId(source: () => Promise<string | undefined>): Promise<string | undefined> {
+	try {
+		return normalizeProjectId(await source());
+	} catch {
+		return undefined;
+	}
+}
+
+export async function resolveAntigravityProjectId(
+	ctrl: OAuthController,
+	sources: AntigravityProjectSources = {},
+): Promise<string | undefined> {
+	const environment = sources.environment ?? {
+		GOOGLE_CLOUD_PROJECT: $env.GOOGLE_CLOUD_PROJECT,
+		GOOGLE_CLOUD_PROJECT_ID: $env.GOOGLE_CLOUD_PROJECT_ID,
+	};
+	const environmentProjectId =
+		normalizeProjectId(environment.GOOGLE_CLOUD_PROJECT) ?? normalizeProjectId(environment.GOOGLE_CLOUD_PROJECT_ID);
+	if (environmentProjectId) {
+		ctrl.onProgress?.("Using the Google Cloud project configured by the environment...");
+		return environmentProjectId;
+	}
+
+	const antigravityProjectId = await readExternalProjectId(
+		sources.readAntigravityProjectId ?? readAntigravityCliProjectId,
+	);
+	if (antigravityProjectId) {
+		ctrl.onProgress?.("Using the Google Cloud project configured by Antigravity CLI...");
+		return antigravityProjectId;
+	}
+
+	const gcloudProjectId = await readExternalProjectId(sources.readGcloudProjectId ?? readGcloudProjectId);
+	if (gcloudProjectId) {
+		ctrl.onProgress?.("Using the Google Cloud project configured by gcloud...");
+		return gcloudProjectId;
+	}
+
+	if (!ctrl.onPrompt) return undefined;
+	const input = await ctrl.onPrompt({
+		message: "Google Cloud project ID (leave blank to use individual-tier discovery):",
+		placeholder: "my-enterprise-project",
+		allowEmpty: true,
+	});
+	if (!input.trim()) return undefined;
+	const promptedProjectId = normalizeProjectId(input);
+	if (!promptedProjectId) {
+		throw new Error(
+			"Invalid Google Cloud project. Use a 6-30 character lowercase project ID or a 12-digit project number.",
+		);
+	}
+	return promptedProjectId;
+}
+
 function buildProjectRequest(configuredProjectId: string | undefined): AntigravityProjectRequest {
 	if (!configuredProjectId) {
 		return { metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA };
@@ -127,8 +248,11 @@ async function onboardProjectWithRetries(
 	);
 }
 
-async function discoverProject(accessToken: string, onProgress?: (message: string) => void): Promise<string> {
-	const configuredProjectId = $env.GOOGLE_CLOUD_PROJECT || $env.GOOGLE_CLOUD_PROJECT_ID;
+async function discoverProject(
+	accessToken: string,
+	configuredProjectId: string | undefined,
+	onProgress?: (message: string) => void,
+): Promise<string> {
 	const projectRequest = buildProjectRequest(configuredProjectId);
 	const headers = {
 		Authorization: `Bearer ${accessToken}`,
@@ -188,8 +312,11 @@ async function getUserEmail(accessToken: string): Promise<string | undefined> {
 }
 
 class AntigravityOAuthFlow extends OAuthCallbackFlow {
-	constructor(ctrl: OAuthController) {
+	#configuredProjectId: string | undefined;
+
+	constructor(ctrl: OAuthController, configuredProjectId: string | undefined) {
 		super(ctrl, CALLBACK_PORT, CALLBACK_PATH);
+		this.#configuredProjectId = configuredProjectId;
 	}
 
 	async generateAuthUrl(state: string, redirectUri: string): Promise<{ url: string; instructions?: string }> {
@@ -239,7 +366,7 @@ class AntigravityOAuthFlow extends OAuthCallbackFlow {
 
 		this.ctrl.onProgress?.("Getting user info...");
 		const email = await getUserEmail(tokenData.access_token);
-		const projectId = await discoverProject(tokenData.access_token, this.ctrl.onProgress);
+		const projectId = await discoverProject(tokenData.access_token, this.#configuredProjectId, this.ctrl.onProgress);
 
 		return {
 			refresh: tokenData.refresh_token,
@@ -254,8 +381,12 @@ class AntigravityOAuthFlow extends OAuthCallbackFlow {
 /**
  * Login with Antigravity OAuth
  */
-export async function loginAntigravity(ctrl: OAuthController): Promise<OAuthCredentials> {
-	const flow = new AntigravityOAuthFlow(ctrl);
+export async function loginAntigravity(
+	ctrl: OAuthController,
+	options: AntigravityLoginOptions = {},
+): Promise<OAuthCredentials> {
+	const configuredProjectId = await resolveAntigravityProjectId(ctrl, options.projectSources);
+	const flow = new AntigravityOAuthFlow(ctrl, configuredProjectId);
 	return flow.login();
 }