@xiaoso/dsh-tool-plus 0.1.0-beta.2 → 0.1.0-beta.3

package/lib/google-gemini-cli-zJhiOcND.mjs

@@ -0,0 +1,211 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { P as $env } from "./src-DTid0g4K.mjs";
+import { c as OAuthError } from "./error-B3bevhrs.mjs";
+import { i as getGeminiCliHeaders } from "./gemini-headers-DKUShltF.mjs";
+import { n as runGoogleOAuthLogin, r as throwIfLoginCancelled, t as oauthFetch } from "./google-oauth-shared-CwNWYdmR.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/google-gemini-cli.ts
+/**
+* Gemini CLI OAuth flow (Google Cloud Code Assist)
+* Standard Gemini models only (gemini-2.0-flash, gemini-2.5-*)
+*/
+const decode = (s) => atob(s);
+const CLIENT_ID = decode("NjgxMjU1ODA5Mzk1LW9vOGZ0Mm9wcmRybnA5ZTNhcWY2YXYzaG1kaWIxMzVqLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29t");
+const CLIENT_SECRET = decode("R09DU1BYLTR1SGdNUG0tMW83U2stZ2VWNkN1NWNsWEZzeGw=");
+const CALLBACK_PORT = 8085;
+const CALLBACK_PATH = "/oauth2callback";
+const SCOPES = [
+	"https://www.googleapis.com/auth/cloud-platform",
+	"https://www.googleapis.com/auth/userinfo.email",
+	"https://www.googleapis.com/auth/userinfo.profile"
+];
+const AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
+const TOKEN_URL = "https://oauth2.googleapis.com/token";
+const CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com";
+const TIER_FREE = "free-tier";
+const TIER_LEGACY = "legacy-tier";
+const TIER_STANDARD = "standard-tier";
+function getDefaultTier(allowedTiers) {
+	if (!allowedTiers || allowedTiers.length === 0) return { id: TIER_LEGACY };
+	return allowedTiers.find((t) => t.isDefault) ?? { id: TIER_LEGACY };
+}
+function isVpcScAffectedUser(payload) {
+	if (!payload || typeof payload !== "object") return false;
+	if (!("error" in payload)) return false;
+	const error = payload.error;
+	if (!error?.details || !Array.isArray(error.details)) return false;
+	return error.details.some((detail) => detail.reason === "SECURITY_POLICY_VIOLATED");
+}
+/**
+* LRO poll cadence and bound. Cloud Code Assist project provisioning normally
+* completes within a handful of polls; the attempt cap converts a stuck
+* `done: false` operation (or a service incident) into a bounded login error
+* instead of the previous unbounded loop.
+*/
+const POLL_INTERVAL_MS = 5e3;
+async function pollOperation(operationName, headers, signal, onProgress) {
+	for (let attempt = 0; attempt < 24; attempt += 1) {
+		if (attempt > 0) {
+			onProgress?.(`Waiting for project provisioning (attempt ${attempt + 1}/24)...`);
+			throwIfLoginCancelled(signal);
+			await Bun.sleep(POLL_INTERVAL_MS);
+		}
+		throwIfLoginCancelled(signal);
+		const response = await oauthFetch(`${CODE_ASSIST_ENDPOINT}/v1internal/${operationName}`, {
+			method: "GET",
+			headers
+		}, {
+			provider: "google-gemini-cli",
+			signal
+		});
+		if (!response.ok) throw new OAuthError(`Failed to poll operation: ${response.status} ${response.statusText}`, {
+			kind: "polling",
+			provider: "google-gemini-cli",
+			status: response.status
+		});
+		const data = await response.json();
+		if (data.done) return data;
+	}
+	throw new OAuthError(`Project provisioning did not complete after 24 attempts`, {
+		kind: "timeout",
+		provider: "google-gemini-cli"
+	});
+}
+async function discoverProject(accessToken, onProgress, signal) {
+	const envProjectId = $env.GOOGLE_CLOUD_PROJECT || $env.GOOGLE_CLOUD_PROJECT_ID;
+	const headers = {
+		Authorization: `Bearer ${accessToken}`,
+		"Content-Type": "application/json",
+		...getGeminiCliHeaders()
+	};
+	onProgress?.("Checking for existing Cloud Code Assist project...");
+	const loadResponse = await oauthFetch(`${CODE_ASSIST_ENDPOINT}/v1internal:loadCodeAssist`, {
+		method: "POST",
+		headers,
+		body: JSON.stringify({
+			cloudaicompanionProject: envProjectId,
+			metadata: {
+				ideType: "IDE_UNSPECIFIED",
+				platform: "PLATFORM_UNSPECIFIED",
+				pluginType: "GEMINI",
+				duetProject: envProjectId
+			}
+		})
+	}, {
+		provider: "google-gemini-cli",
+		signal
+	});
+	let data;
+	if (!loadResponse.ok) {
+		let errorPayload;
+		try {
+			errorPayload = await loadResponse.clone().json();
+		} catch {
+			errorPayload = void 0;
+		}
+		if (isVpcScAffectedUser(errorPayload)) data = { currentTier: { id: TIER_STANDARD } };
+		else {
+			const errorText = await loadResponse.text();
+			throw new OAuthError(`loadCodeAssist failed: ${loadResponse.status} ${loadResponse.statusText}: ${errorText}`, {
+				kind: "discovery",
+				provider: "google-gemini-cli",
+				status: loadResponse.status
+			});
+		}
+	} else data = await loadResponse.json();
+	if (data.currentTier) {
+		if (data.cloudaicompanionProject) return data.cloudaicompanionProject;
+		if (envProjectId) return envProjectId;
+		throw new OAuthError("This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID environment variable. See https://goo.gle/gemini-cli-auth-docs#workspace-gca", {
+			kind: "configuration",
+			provider: "google-gemini-cli"
+		});
+	}
+	const tierId = getDefaultTier(data.allowedTiers)?.id ?? TIER_FREE;
+	if (tierId !== TIER_FREE && !envProjectId) throw new OAuthError("This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID environment variable. See https://goo.gle/gemini-cli-auth-docs#workspace-gca", {
+		kind: "configuration",
+		provider: "google-gemini-cli"
+	});
+	onProgress?.("Provisioning Cloud Code Assist project (this may take a moment)...");
+	const onboardBody = {
+		tierId,
+		metadata: {
+			ideType: "IDE_UNSPECIFIED",
+			platform: "PLATFORM_UNSPECIFIED",
+			pluginType: "GEMINI"
+		}
+	};
+	if (tierId !== TIER_FREE && envProjectId) {
+		onboardBody.cloudaicompanionProject = envProjectId;
+		onboardBody.metadata.duetProject = envProjectId;
+	}
+	const onboardResponse = await oauthFetch(`${CODE_ASSIST_ENDPOINT}/v1internal:onboardUser`, {
+		method: "POST",
+		headers,
+		body: JSON.stringify(onboardBody)
+	}, {
+		provider: "google-gemini-cli",
+		signal
+	});
+	if (!onboardResponse.ok) {
+		const errorText = await onboardResponse.text();
+		throw new OAuthError(`onboardUser failed: ${onboardResponse.status} ${onboardResponse.statusText}: ${errorText}`, {
+			kind: "provisioning",
+			provider: "google-gemini-cli",
+			status: onboardResponse.status
+		});
+	}
+	let lroData = await onboardResponse.json();
+	if (!lroData.done && lroData.name) lroData = await pollOperation(lroData.name, headers, signal, onProgress);
+	const projectId = lroData.response?.cloudaicompanionProject?.id;
+	if (projectId) return projectId;
+	if (envProjectId) return envProjectId;
+	throw new OAuthError("Could not discover or provision a Google Cloud project. Try setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID environment variable. See https://goo.gle/gemini-cli-auth-docs#workspace-gca", {
+		kind: "validation",
+		provider: "google-gemini-cli"
+	});
+}
+async function loginGeminiCli(ctrl) {
+	return runGoogleOAuthLogin(ctrl, {
+		provider: "google-gemini-cli",
+		clientId: CLIENT_ID,
+		clientSecret: CLIENT_SECRET,
+		authUrl: AUTH_URL,
+		tokenUrl: TOKEN_URL,
+		scopes: SCOPES,
+		callbackPort: CALLBACK_PORT,
+		callbackPath: CALLBACK_PATH,
+		discoverProject
+	});
+}
+/**
+* Refresh Google Cloud Code Assist token
+*/
+async function refreshGoogleCloudToken(refreshToken, projectId) {
+	const response = await fetch(TOKEN_URL, {
+		method: "POST",
+		headers: { "Content-Type": "application/x-www-form-urlencoded" },
+		body: new URLSearchParams({
+			client_id: CLIENT_ID,
+			client_secret: CLIENT_SECRET,
+			refresh_token: refreshToken,
+			grant_type: "refresh_token"
+		})
+	});
+	if (!response.ok) {
+		const error = await response.text();
+		throw new OAuthError(`Google Cloud token refresh failed: ${error}`, {
+			kind: "token-refresh",
+			provider: "google-gemini-cli"
+		});
+	}
+	const data = await response.json();
+	return {
+		refresh: data.refresh_token || refreshToken,
+		access: data.access_token,
+		expires: Date.now() + data.expires_in * 1e3 - 3e5,
+		projectId
+	};
+}
+//#endregion
+export { loginGeminiCli, refreshGoogleCloudToken };

package/lib/google-oauth-shared-CwNWYdmR.mjs

@@ -0,0 +1,147 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { c as OAuthError, h as LoginCancelledError } from "./error-B3bevhrs.mjs";
+import { t as OAuthCallbackFlow } from "./callback-server-BEFNf-jf.mjs";
+import { n as formatGoogleValidationRequiredMessage, t as extractGoogleValidationUrl } from "./google-validation-Cgbn3tWJ.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/google-oauth-shared.ts
+/**
+* Shared OAuth flow for Google-style providers (Gemini CLI, Antigravity).
+*
+* Both providers use the same authorization-code flow shape; only the client
+* credentials, scopes, endpoint constants, and project-discovery logic differ.
+*/
+/**
+* Per-request timeout for the post-callback provisioning phase (token exchange,
+* user-info, project discovery/onboarding, LRO polling). These Cloud Code
+* Assist calls normally settle in well under this window; a longer stall means
+* a hung endpoint that must surface a login error instead of hanging forever.
+* The callback server's own 300s deadline covers only the browser-callback wait
+* ({@link OAuthCallbackFlow}) and does not gate this phase.
+*/
+const OAUTH_REQUEST_TIMEOUT_MS = 3e4;
+/**
+* Throw {@link AIError.LoginCancelledError} when the controller signal has
+* already aborted. Gates each provisioning round-trip, which the callback-wait
+* cancellation checks in {@link OAuthCallbackFlow} do not reach.
+*/
+function throwIfLoginCancelled(signal) {
+	if (signal?.aborted) throw new LoginCancelledError(`OAuth login cancelled: ${String(signal.reason)}`);
+}
+/**
+* `fetch` for the provisioning phase: composes the controller signal with a
+* per-request timeout so a stalled endpoint aborts instead of hanging login,
+* and user cancellation aborts the in-flight request. Cancellation surfaces as
+* {@link AIError.LoginCancelledError}; a timeout surfaces as an
+* {@link AIError.OAuthError} with `kind: "timeout"`.
+*/
+async function oauthFetch(url, init, { provider, signal, timeoutMs = OAUTH_REQUEST_TIMEOUT_MS }) {
+	const timeoutSignal = AbortSignal.timeout(timeoutMs);
+	const requestSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+	try {
+		return await fetch(url, {
+			...init,
+			signal: requestSignal
+		});
+	} catch (err) {
+		if (signal?.aborted) throw new LoginCancelledError(`OAuth login cancelled: ${String(signal.reason)}`);
+		if (timeoutSignal.aborted) throw new OAuthError(`Timed out after ${timeoutMs}ms waiting for ${url}`, {
+			kind: "timeout",
+			provider
+		});
+		throw err;
+	}
+}
+async function getUserEmail(accessToken, provider, signal) {
+	try {
+		const response = await oauthFetch("https://www.googleapis.com/oauth2/v1/userinfo?alt=json", { headers: { Authorization: `Bearer ${accessToken}` } }, {
+			provider,
+			signal
+		});
+		if (response.ok) return (await response.json()).email;
+	} catch {}
+}
+var GoogleOAuthFlow = class extends OAuthCallbackFlow {
+	config;
+	constructor(ctrl, config) {
+		super(ctrl, {
+			preferredPort: config.callbackPort,
+			callbackPath: config.callbackPath,
+			callbackHostname: "127.0.0.1"
+		});
+		this.config = config;
+	}
+	async generateAuthUrl(state, redirectUri) {
+		const authParams = new URLSearchParams({
+			client_id: this.config.clientId,
+			response_type: "code",
+			redirect_uri: redirectUri,
+			scope: this.config.scopes.join(" "),
+			state,
+			access_type: "offline",
+			prompt: "consent"
+		});
+		return {
+			url: `${this.config.authUrl}?${authParams.toString()}`,
+			instructions: "Complete the sign-in in your browser."
+		};
+	}
+	async exchangeToken(code, _state, redirectUri) {
+		const { provider } = this.config;
+		const signal = this.ctrl.signal;
+		throwIfLoginCancelled(signal);
+		this.ctrl.onProgress?.("Exchanging authorization code for tokens...");
+		const tokenResponse = await oauthFetch(this.config.tokenUrl, {
+			method: "POST",
+			headers: { "Content-Type": "application/x-www-form-urlencoded" },
+			body: new URLSearchParams({
+				client_id: this.config.clientId,
+				client_secret: this.config.clientSecret,
+				code,
+				grant_type: "authorization_code",
+				redirect_uri: redirectUri
+			})
+		}, {
+			provider,
+			signal
+		});
+		if (!tokenResponse.ok) {
+			const error = await tokenResponse.text();
+			throw new OAuthError(`Token exchange failed: ${error}`, {
+				kind: "token-exchange",
+				provider
+			});
+		}
+		const tokenData = await tokenResponse.json();
+		if (!tokenData.refresh_token) throw new OAuthError("No refresh token received. Please try again.", {
+			kind: "validation",
+			provider
+		});
+		throwIfLoginCancelled(signal);
+		this.ctrl.onProgress?.("Getting user info...");
+		const email = await getUserEmail(tokenData.access_token, provider, signal);
+		throwIfLoginCancelled(signal);
+		let projectId;
+		try {
+			projectId = await this.config.discoverProject(tokenData.access_token, this.ctrl.onProgress, signal);
+		} catch (err) {
+			const validationUrl = extractGoogleValidationUrl(err instanceof Error ? err.message : String(err));
+			if (!validationUrl) throw err;
+			throw new OAuthError(formatGoogleValidationRequiredMessage(validationUrl, "sign in again", email), {
+				kind: "validation",
+				provider
+			});
+		}
+		return {
+			refresh: tokenData.refresh_token,
+			access: tokenData.access_token,
+			expires: Date.now() + tokenData.expires_in * 1e3 - 3e5,
+			projectId,
+			email
+		};
+	}
+};
+async function runGoogleOAuthLogin(ctrl, config) {
+	return new GoogleOAuthFlow(ctrl, config).login();
+}
+//#endregion
+export { runGoogleOAuthLogin as n, throwIfLoginCancelled as r, oauthFetch as t };