@xiaoso/dsh-tool-plus 0.1.5 → 0.1.7-beta.0

package/lib/google-antigravity-z-5KsEci.mjs

@@ -0,0 +1,252 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { f as OAuthError, m as LoginCancelledError } from "./error-CORgGg5a.mjs";
+import { n as raceWithSignal } from "./abort-Caqff3M6.mjs";
+import { n as getAntigravityUserAgent } from "./gemini-headers-Co9cVvex.mjs";
+import { n as formatGoogleValidationRequiredMessage, t as extractGoogleValidationUrl } from "./google-validation-BEkNs-Bx.mjs";
+import { n as throwIfLoginCancelled, t as oauthFetch } from "./google-oauth-shared-DhMllAkt.mjs";
+import { type } from "@oh-my-pi/omptype";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/google-antigravity.ts
+/**
+* Antigravity OAuth flow (Gemini 3, Claude, GPT-OSS via Google Cloud)
+* Uses different OAuth credentials than google-gemini-cli for access to additional models.
+*/
+const CLOUD_CODE_ASSIST_ENDPOINT = "https://daily-cloudcode-pa.googleapis.com";
+const LOAD_CODE_ASSIST_URL = `${CLOUD_CODE_ASSIST_ENDPOINT}/v1internal:loadCodeAssist`;
+const ONBOARD_USER_URL = `${CLOUD_CODE_ASSIST_ENDPOINT}/v1internal:onboardUser`;
+const OPERATIONS_URL = `${CLOUD_CODE_ASSIST_ENDPOINT}/v1internal`;
+const FREE_TIER_ID = "free-tier";
+const ONBOARD_TIMEOUT_MS = 3e4;
+const ONBOARD_POLL_INTERVAL_MS = 1e3;
+const PROVIDER = "google-antigravity";
+/** Cloud Code Assist metadata sent by native Antigravity control-plane requests. */
+const ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA = Object.freeze({ ideType: "ANTIGRAVITY" });
+const userTierSchema = type({ "id?": "string" });
+const ineligibleTierSchema = type({
+	"tierId?": "string",
+	"reasonMessage?": "string",
+	"validationUrl?": "string"
+});
+const loadCodeAssistResponseSchema = type({
+	"currentTier?": userTierSchema.or("null"),
+	"paidTier?": userTierSchema.or("null"),
+	"allowedTiers?": userTierSchema.array(),
+	"ineligibleTiers?": ineligibleTierSchema.array(),
+	"cloudaicompanionProject?": "string"
+});
+const operationErrorSchema = type({
+	"code?": "number",
+	"message?": "string"
+});
+const onboardUserResponseSchema = type({
+	"@type": "string",
+	"cloudaicompanionProject?": "string"
+});
+const onboardOperationSchema = type({
+	"name?": "string",
+	"done?": "boolean",
+	"error?": operationErrorSchema.or("null"),
+	"response?": onboardUserResponseSchema.or("null")
+});
+function parseLoadCodeAssistResponse(payload) {
+	const result = loadCodeAssistResponseSchema(payload);
+	if (result instanceof type.errors) throw new OAuthError(`failed to unmarshal LoadCodeAssistResponse: ${result.summary}`, {
+		kind: "provisioning",
+		provider: PROVIDER
+	});
+	return result;
+}
+function parseOnboardOperation(payload) {
+	const result = onboardOperationSchema(payload);
+	if (result instanceof type.errors) throw new OAuthError(`failed to unmarshal OnboardUser operation: ${result.summary}`, {
+		kind: "provisioning",
+		provider: PROVIDER
+	});
+	return result;
+}
+function extractProjectId(payload) {
+	const projectId = payload.cloudaicompanionProject;
+	return projectId && projectId.length > 0 ? projectId : void 0;
+}
+function hasMessageField(payload, field) {
+	return payload[field] !== void 0 && payload[field] !== null;
+}
+function isFreeTierAllowed(payload) {
+	return payload.allowedTiers?.some((tier) => tier.id === FREE_TIER_ID) === true;
+}
+function getFreeTierIneligibility(payload) {
+	const tier = payload.ineligibleTiers?.find((candidate) => candidate.tierId === FREE_TIER_ID);
+	if (!tier?.reasonMessage) return void 0;
+	return {
+		reasonMessage: tier.reasonMessage,
+		validationUrl: tier.validationUrl && tier.validationUrl.length > 0 ? tier.validationUrl : void 0
+	};
+}
+function assertFreeTierEligible(payload) {
+	if (isFreeTierAllowed(payload)) return;
+	const ineligibility = getFreeTierIneligibility(payload);
+	if (!ineligibility) return;
+	const validation = ineligibility.validationUrl ? `\n${ineligibility.validationUrl}` : "";
+	throw new OAuthError(`${ineligibility.reasonMessage}${validation}`, {
+		kind: "provisioning",
+		provider: PROVIDER
+	});
+}
+async function requestCloudCodeAssist({ label, url, method, headers, body, signal, timeoutMs }) {
+	throwIfLoginCancelled(signal);
+	const response = await oauthFetch(url, body === void 0 ? {
+		method,
+		headers
+	} : {
+		method,
+		headers,
+		body
+	}, {
+		provider: PROVIDER,
+		signal,
+		timeoutMs
+	});
+	if (response.status !== 200) {
+		const errorText = await response.text();
+		throw new OAuthError(`${label} failed: ${response.status} ${response.statusText}: ${errorText}`, {
+			kind: "provisioning",
+			provider: PROVIDER,
+			status: response.status
+		});
+	}
+	return response.json();
+}
+async function postLoadCodeAssist(context, body) {
+	return parseLoadCodeAssistResponse(await requestCloudCodeAssist({
+		...context,
+		label: "loadCodeAssist",
+		url: LOAD_CODE_ASSIST_URL,
+		method: "POST",
+		body: JSON.stringify(body)
+	}));
+}
+async function loadCodeAssist(context) {
+	let payload = await postLoadCodeAssist(context, { metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA });
+	const projectId = extractProjectId(payload);
+	if (!hasMessageField(payload, "paidTier") && projectId) payload = await postLoadCodeAssist(context, {
+		cloudaicompanionProject: projectId,
+		metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA
+	});
+	return payload;
+}
+function remainingOnboardTime(deadline) {
+	const remaining = deadline - Date.now();
+	if (remaining > 0) return remaining;
+	throw new OAuthError(`onboardUser timed out after ${ONBOARD_TIMEOUT_MS}ms`, {
+		kind: "timeout",
+		provider: PROVIDER
+	});
+}
+function describeOperationError(error) {
+	if (error.message) return typeof error.code === "number" ? `${error.code}: ${error.message}` : error.message;
+	return JSON.stringify(error) ?? String(error);
+}
+async function onboardUser(context) {
+	const deadline = Date.now() + ONBOARD_TIMEOUT_MS;
+	let operation = parseOnboardOperation(await requestCloudCodeAssist({
+		...context,
+		label: "onboardUser",
+		url: ONBOARD_USER_URL,
+		method: "POST",
+		body: JSON.stringify({
+			tierId: FREE_TIER_ID,
+			metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA
+		}),
+		timeoutMs: remainingOnboardTime(deadline)
+	}));
+	while (true) {
+		if (operation.done === true) {
+			if (operation.error !== void 0 && operation.error !== null) throw new OAuthError(`OnboardUser operation failed: ${describeOperationError(operation.error)}`, {
+				kind: "provisioning",
+				provider: PROVIDER
+			});
+			if (operation.response === void 0 || operation.response === null) throw new OAuthError("failed to unmarshal OnboardUserResponse", {
+				kind: "provisioning",
+				provider: PROVIDER
+			});
+			return;
+		}
+		await raceWithSignal(Bun.sleep(Math.min(ONBOARD_POLL_INTERVAL_MS, remainingOnboardTime(deadline))), context.signal);
+		throwIfLoginCancelled(context.signal);
+		const operationName = operation.name ?? "";
+		if (operationName.length === 0) throw new OAuthError("onboardUser returned an operation without a name", {
+			kind: "provisioning",
+			provider: PROVIDER
+		});
+		operation = parseOnboardOperation(await requestCloudCodeAssist({
+			...context,
+			label: "onboardUser operation",
+			url: `${OPERATIONS_URL}/${operationName}`,
+			method: "GET",
+			timeoutMs: remainingOnboardTime(deadline)
+		}));
+	}
+}
+async function discoverProject(accessToken, onProgress, signal) {
+	const context = {
+		headers: {
+			Authorization: `Bearer ${accessToken}`,
+			"Content-Type": "application/json",
+			"User-Agent": getAntigravityUserAgent()
+		},
+		signal
+	};
+	onProgress?.("Checking Cloud Code Assist account status...");
+	try {
+		const initial = await loadCodeAssist(context);
+		assertFreeTierEligible(initial);
+		if (!hasMessageField(initial, "currentTier")) {
+			onProgress?.("Provisioning the Antigravity free tier...");
+			await onboardUser(context);
+		}
+		onProgress?.("Refreshing Cloud Code Assist project...");
+		const projectId = extractProjectId(await loadCodeAssist(context));
+		if (projectId) return projectId;
+		throw new OAuthError("loadCodeAssist did not return a cloudaicompanionProject", {
+			kind: "provisioning",
+			provider: PROVIDER
+		});
+	} catch (error) {
+		throwIfLoginCancelled(signal);
+		if (error instanceof LoginCancelledError || error instanceof OAuthError) throw error;
+		throw new OAuthError(`Could not discover an Antigravity project. ${error instanceof Error ? error.message : String(error)}`, {
+			kind: "discovery",
+			provider: PROVIDER,
+			cause: error
+		});
+	}
+}
+/** Resolves the Antigravity project after login and preserves it across refresh responses. */
+const googleAntigravityProjectHook = async (credentials, context) => {
+	if (context.phase === "refresh") return context.stored?.projectId ? {
+		...credentials,
+		projectId: context.stored.projectId
+	} : credentials;
+	const raw = context.raw;
+	if (raw === null || typeof raw !== "object" || typeof raw.refresh_token !== "string" || raw.refresh_token === "") throw new OAuthError("No refresh token received. Please try again.", {
+		kind: "validation",
+		provider: context.provider
+	});
+	let projectId;
+	try {
+		projectId = await discoverProject(credentials.access, context.onProgress, context.signal);
+	} catch (error) {
+		const validationUrl = extractGoogleValidationUrl(error instanceof Error ? error.message : String(error));
+		if (!validationUrl) throw error;
+		throw new OAuthError(formatGoogleValidationRequiredMessage(validationUrl, "sign in again", credentials.email), {
+			kind: "validation",
+			provider: context.provider
+		});
+	}
+	return {
+		...credentials,
+		projectId
+	};
+};
+//#endregion
+export { googleAntigravityProjectHook };

package/lib/{google-auth-DYJLM792.mjs → google-auth-ieLBaneO.mjs}

@@ -1,12 +1,12 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { F as $envpos, S as debug, y as isEnoent } from "./src-BcD0_rQR.mjs";
-import { c as OAuthError, g as MissingApiKeyError, t as ConfigurationError } from "./error-C-f_Wnw4.mjs";
-import { n as raceWithSignal } from "./abort-Cwwm4Err.mjs";
+import { $ as isEnoent, P as $envpos, b as debug } from "./src-BwW51vA5.mjs";
+import { f as OAuthError, h as MissingApiKeyError, t as ConfigurationError } from "./error-CORgGg5a.mjs";
+import { n as raceWithSignal } from "./abort-Caqff3M6.mjs";
 import * as path from "node:path";
 import * as os from "node:os";
 import { Buffer } from "node:buffer";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/providers/google-auth.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/google-auth.ts
 /**
 * Application Default Credentials (ADC) resolution for Vertex AI.
 *

package/lib/{google-gemini-cli-8BT513Ul.mjs → google-gemini-cli-C6NE5mWz.mjs}

@@ -1,26 +1,15 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { P as $env } from "./src-BcD0_rQR.mjs";
-import { c as OAuthError } from "./error-C-f_Wnw4.mjs";
-import { i as getGeminiCliHeaders } from "./gemini-headers-DKUShltF.mjs";
-import { n as runGoogleOAuthLogin, r as throwIfLoginCancelled, t as oauthFetch } from "./google-oauth-shared-BLVTvokk.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
+import { N as $env } from "./src-BwW51vA5.mjs";
+import { f as OAuthError } from "./error-CORgGg5a.mjs";
+import { r as getGeminiCliHeaders } from "./gemini-headers-Co9cVvex.mjs";
+import { n as formatGoogleValidationRequiredMessage, t as extractGoogleValidationUrl } from "./google-validation-BEkNs-Bx.mjs";
+import { n as throwIfLoginCancelled, t as oauthFetch } from "./google-oauth-shared-DhMllAkt.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/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";
@@ -165,47 +154,32 @@ async function discoverProject(accessToken, onProgress, signal) {
 		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"
-		})
+/** Resolves the project after login and preserves it across refresh responses. */
+const googleGeminiCliProjectHook = async (credentials, context) => {
+	if (context.phase === "refresh") return context.stored?.projectId ? {
+		...credentials,
+		projectId: context.stored.projectId
+	} : credentials;
+	const raw = context.raw;
+	if (raw === null || typeof raw !== "object" || typeof raw.refresh_token !== "string" || raw.refresh_token === "") throw new OAuthError("No refresh token received. Please try again.", {
+		kind: "validation",
+		provider: context.provider
 	});
-	if (!response.ok) {
-		const error = await response.text();
-		throw new OAuthError(`Google Cloud token refresh failed: ${error}`, {
-			kind: "token-refresh",
-			provider: "google-gemini-cli"
+	let projectId;
+	try {
+		projectId = await discoverProject(credentials.access, context.onProgress, context.signal);
+	} catch (error) {
+		const validationUrl = extractGoogleValidationUrl(error instanceof Error ? error.message : String(error));
+		if (!validationUrl) throw error;
+		throw new OAuthError(formatGoogleValidationRequiredMessage(validationUrl, "sign in again", credentials.email), {
+			kind: "validation",
+			provider: context.provider
 		});
 	}
-	const data = await response.json();
 	return {
-		refresh: data.refresh_token || refreshToken,
-		access: data.access_token,
-		expires: Date.now() + data.expires_in * 1e3 - 3e5,
+		...credentials,
 		projectId
 	};
-}
+};
 //#endregion
-export { loginGeminiCli, refreshGoogleCloudToken };
+export { googleGeminiCliProjectHook };

package/lib/{google-gemini-cli-D6cSmfvB.mjs → google-gemini-cli-CAIPSl7e.mjs}

@@ -1,22 +1,22 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { o as readSseJson } from "./src-BcD0_rQR.mjs";
-import { G as fetchWithRetry, L as GeminiCliApiError, S as classify, W as extractHttpStatusFromError, a as isTransientStatus, c as OAuthError, j as retriable, l as finalize, n as StreamTimeoutError, r as ValidationError, s as ProviderResponseError, t as ConfigurationError, v as AbortError } from "./error-C-f_Wnw4.mjs";
-import { M as normalizeSchemaForCCA, a as normalizeSystemPrompts } from "./utils-Cp2Mxf_U.mjs";
-import { t as calculateCost } from "./models-DRA2c_8U.mjs";
-import { t as AssistantMessageEventStream } from "./event-stream-Dh2guZxS.mjs";
-import { i as getGeminiCliHeaders, n as getAntigravityUserAgent, t as getAntigravityModelWireProfile } from "./gemini-headers-DKUShltF.mjs";
-import { i as getStreamFirstEventTimeoutMs, o as iterateWithIdleTimeout, t as armPreResponseTimeout } from "./idle-iterator-CYAxUkSD.mjs";
-import { t as StreamMarkupHealing } from "./stream-markup-healing-DZ6bVDxH.mjs";
-import { n as formatGoogleValidationRequiredMessage, t as extractGoogleValidationUrl } from "./google-validation-Cgbn3tWJ.mjs";
-import { a as isThinkingPart, c as nextToolCallId, d as retainThoughtSignature, f as startTextOrThinkingBlock, i as hasMeaningfulGoogleContent, l as pushBlockEndEvent, n as convertMessages, o as mapStopReasonString, r as convertTools, s as mapToolChoice, u as pushToolCallEvents } from "./google-shared-CVbHK5vZ.mjs";
+import { o as readSseJson } from "./src-BwW51vA5.mjs";
+import { C as classify, G as fetchWithRetry, L as GeminiCliApiError, W as extractHttpStatusFromError, _ as AbortError, a as isTransientStatus, c as finalize, f as OAuthError, j as retriable, n as StreamTimeoutError, r as ValidationError, s as ProviderResponseError, t as ConfigurationError } from "./error-CORgGg5a.mjs";
+import { N as normalizeSchemaForCCA, o as normalizeSystemPrompts } from "./utils-CUPhpw9A.mjs";
+import { t as calculateCost } from "./models-DnXMYGcJ.mjs";
+import { t as AssistantMessageEventStream } from "./event-stream-ulcDenZD.mjs";
+import { n as getAntigravityUserAgent, r as getGeminiCliHeaders, t as getAntigravityModelWireProfile } from "./gemini-headers-Co9cVvex.mjs";
+import { i as getStreamFirstEventTimeoutMs, o as iterateWithIdleTimeout, t as armPreResponseTimeout } from "./idle-iterator-DlUkEfzW.mjs";
+import { t as StreamMarkupHealing } from "./stream-markup-healing-DKT1lnkW.mjs";
+import { n as formatGoogleValidationRequiredMessage, t as extractGoogleValidationUrl } from "./google-validation-BEkNs-Bx.mjs";
+import { a as isThinkingPart, c as nextToolCallId, d as retainThoughtSignature, f as startTextOrThinkingBlock, i as hasMeaningfulGoogleContent, l as pushBlockEndEvent, n as convertMessages, o as mapStopReasonString, r as convertTools, s as mapToolChoice, u as pushToolCallEvents } from "./google-shared-B0aNCYEH.mjs";
 import { scheduler } from "node:timers/promises";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { type } from "@oh-my-pi/omptype";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/providers/google-antigravity-forced-tool.md
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/google-antigravity-forced-tool.md
 var google_antigravity_forced_tool_default = "TOOL-ONLY TURN. This turn accepts a tool call and nothing else; a text reply here is discarded unread and you will be re-prompted. Emit the tool call now.\n";
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/providers/google-gemini-cli.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/google-gemini-cli.ts
 /**
 * Google Gemini CLI / Antigravity provider.
 * Shared implementation for both google-gemini-cli and google-antigravity providers.
@@ -168,19 +168,12 @@ const ANTIGRAVITY_DAILY_ENDPOINT = "https://daily-cloudcode-pa.googleapis.com";
 const ANTIGRAVITY_SANDBOX_ENDPOINT = "https://daily-cloudcode-pa.sandbox.googleapis.com";
 const ANTIGRAVITY_ENDPOINT_FALLBACKS = [ANTIGRAVITY_DAILY_ENDPOINT, ANTIGRAVITY_SANDBOX_ENDPOINT];
 const BASE_DELAY_MS = 1e3;
-const FLASH_FIRST_EVENT_TIMEOUT_MS = 6e4;
 const DEFAULT_FIRST_EVENT_TIMEOUT_MS = 3e5;
 const FIRST_EVENT_TIMEOUT_ERROR = "Cloud Code Assist stream timed out while waiting for the first event";
 const RATE_LIMIT_BUDGET_MS = 3e5;
 const CLAUDE_THINKING_BETA_HEADER = "interleaved-thinking-2025-05-14";
 const GOOGLE_GEMINI_REFRESH_SKEW_MS = 6e4;
 const ANTIGRAVITY_REFRESH_SKEW_MS = 6e4;
-function isClaudeModel(modelId) {
-	return modelId.toLowerCase().includes("claude");
-}
-function needsClaudeThinkingBetaHeader(model) {
-	return model.provider === "google-antigravity" && model.id.startsWith("claude-") && model.reasoning;
-}
 const optionalCredentialString = type("unknown").pipe((raw) => {
 	const out = type("string")(raw);
 	return out instanceof type.errors ? void 0 : out;
@@ -308,8 +301,8 @@ const streamGoogleGeminiCli = (model, context, options) => {
 				"Content-Type": "application/json",
 				Accept: "text/event-stream",
 				...headers,
-				...needsClaudeThinkingBetaHeader(model) ? { "anthropic-beta": CLAUDE_THINKING_BETA_HEADER } : {},
-				...options?.headers ?? {}
+				...model.compat.claudeThinkingBetaHeader && model.identity.class === "anthropic" && model.reasoning ? { "anthropic-beta": CLAUDE_THINKING_BETA_HEADER } : {},
+				...options?.headers
 			};
 			const requestBodyJson = JSON.stringify(requestBody);
 			rawRequestDump = {
@@ -320,10 +313,10 @@ const streamGoogleGeminiCli = (model, context, options) => {
 				body: requestBody,
 				headers: requestHeaders
 			};
-			const firstEventTimeoutMs = options?.streamFirstEventTimeoutMs ?? getStreamFirstEventTimeoutMs(void 0, model.id.includes("flash") ? FLASH_FIRST_EVENT_TIMEOUT_MS : DEFAULT_FIRST_EVENT_TIMEOUT_MS);
+			const firstEventTimeoutMs = options?.streamFirstEventTimeoutMs ?? getStreamFirstEventTimeoutMs(void 0, model.compat.streamFirstEventTimeoutMs ?? DEFAULT_FIRST_EVENT_TIMEOUT_MS);
 			const callerSignal = options?.signal;
 			const toolNames = new Set(context.tools?.map((t) => t.name) ?? []);
-			const isFlashLeakModel = model.id.includes("flash");
+			const isFlashLeakModel = model.compat.flashStreamLeakWorkaround;
 			let started = false;
 			let sawFinishReason = false;
 			let lastResponseId;
@@ -547,7 +540,7 @@ const streamGoogleGeminiCli = (model, context, options) => {
 								total: 0
 							}
 						};
-						calculateCost(model, output.usage);
+						calculateCost(model, output.usage, output.timestamp);
 					}
 				}
 				if (isBuffering && textBuffer !== "") {
@@ -761,15 +754,16 @@ function buildAntigravityRequestEnvelope(model, context, wireModelId, state) {
 	const sessionId = state?.sessionId ?? deriveAntigravitySessionId(context);
 	const step = state?.stepIndex ?? 2;
 	const requestId = `agent/${agentId}/${Date.now()}/${trajectoryId}/${step}`;
-	const isClaude = isClaudeModel(model.id);
+	const isClaude = model.identity.class === "anthropic";
 	const profile = getAntigravityModelWireProfile(wireModelId);
 	const labels = {};
 	if (state?.lastExecutionId) labels.last_execution_id = state.lastExecutionId;
 	labels.last_step_index = String(step - 1);
 	if (profile?.modelEnum !== void 0) labels.model_enum = profile.modelEnum;
 	labels.trajectory_id = trajectoryId;
-	labels.used_claude = String(isClaude);
-	labels.used_claude_conservative = String(isClaude);
+	const usageLabel = model.compat.antigravityUsageLabel ?? String(isClaude);
+	labels.used_claude = usageLabel;
+	labels.used_claude_conservative = usageLabel;
 	return {
 		sessionId,
 		requestId,
@@ -814,14 +808,14 @@ function buildRequest(model, context, projectId, options = {}, isAntigravity = f
 				mode: "ANY",
 				allowedFunctionNames: [...choice.allowedFunctionNames]
 			} };
-			if (isAntigravity && !isClaudeModel(model.id) && request.toolConfig?.functionCallingConfig.mode === "ANY") contents.push({
+			if (isAntigravity && model.identity.class !== "anthropic" && request.toolConfig?.functionCallingConfig.mode === "ANY") contents.push({
 				role: "user",
 				parts: [{ text: google_antigravity_forced_tool_default }]
 			});
 		}
 		if (isAntigravity && !request.toolConfig) request.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
 	}
-	if (isAntigravity && isClaudeModel(model.id)) request.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
+	if (isAntigravity && model.identity.class === "anthropic" && model.compat.antigravityClaudeToolMode) request.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
 	const wireModelId = options.requestModelId ?? model.requestModelId ?? model.id;
 	if (isAntigravity) {
 		const profile = getAntigravityModelWireProfile(wireModelId);

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

@@ -0,0 +1,53 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { f as OAuthError, m as LoginCancelledError } from "./error-CORgGg5a.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/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;
+	}
+}
+//#endregion
+export { throwIfLoginCancelled as n, oauthFetch as t };