dsh-image-gen 0.9.0 → 0.9.2

package/lib/index.js

@@ -5955,6 +5955,7 @@ const Config = z.object({
 	provider: volatile(z.union(IMAGE_PROVIDERS).default("google")),
 	googleModel: volatile(z.string().default(DEFAULT_GOOGLE_MODEL)),
 	googleEndpoint: volatile(z.string().default(DEFAULT_GOOGLE_ENDPOINT)),
+	googleNative: volatile(z.boolean().default(false)),
 	openaiBaseURL: volatile(z.string().default(DEFAULT_OPENAI_BASE_URL)),
 	openaiModel: volatile(z.string().default(DEFAULT_OPENAI_MODEL)),
 	openaiSizes: volatile(z.dict(z.dict(z.string())).default({})),
@@ -6090,6 +6091,7 @@ function resolveProvider(config) {
 			apiKeyEnv: GOOGLE_API_KEY_ENV,
 			model: config.googleModel ?? "gemini-3.1-flash-image",
 			endpoint: config.googleEndpoint ?? "https://generativelanguage.googleapis.com/v1beta/interactions",
+			native: config.googleNative === true,
 			aspectRatio: "1:1",
 			imageSize: "1K"
 		};
@@ -7382,6 +7384,81 @@ async function readBoundedBytes$2(response, maxBytes) {
 	return joined;
 }
 //#endregion
+//#region lib/types/fetch-diagnostics.js
+/**
+* Transport-failure diagnostics for provider fetches (#79).
+*
+* Node's undici reports the real reason behind a failed fetch (socket reset,
+* DNS, TLS, ...) only on `error.cause`, and the host's tool-error rendering
+* keeps just `.message` — so the conversation sees nothing but undici's bare
+* "fetch failed". These helpers rethrow transport failures with the failing
+* phase, elapsed seconds, and a bounded cause chain.
+*/
+/** Cap a single transport-failure description so diagnostics cannot flood the conversation. */
+const TRANSPORT_DETAIL_LIMIT = 600;
+/** How deep to walk `error.cause` chains; undici nests at most twice in practice. */
+const CAUSE_CHAIN_DEPTH = 3;
+/** Keep body reads tied to the same request timing, cancellation, and secrets. */
+const responseContexts = /* @__PURE__ */ new WeakMap();
+/**
+* Render one error plus its `cause` chain as a single line, e.g.
+* `TypeError: fetch failed <- Error [UND_ERR_SOCKET]: other side closed`.
+*/
+function describeErrorChain(error, depth = 0) {
+	if (depth >= CAUSE_CHAIN_DEPTH) return "...";
+	if (error === void 0 || error === null) return "unknown transport error";
+	if (typeof error === "object") {
+		const details = error;
+		if (error instanceof Error || typeof details.message === "string") {
+			const label = [typeof details.name === "string" ? details.name : "Error", typeof details.code === "string" && details.code.length > 0 ? `[${details.code}]` : ""].filter((part) => part.length > 0).join(" ");
+			const message = typeof details.message === "string" ? details.message : "";
+			const text = label.length > 0 && message.length > 0 ? `${label}: ${message}` : label || message;
+			return details.cause !== void 0 && details.cause !== null && depth + 1 < CAUSE_CHAIN_DEPTH ? `${text} <- ${describeErrorChain(details.cause, depth + 1)}` : text || "unknown transport error";
+		}
+		if (typeof details.kind === "string") return details.reason === void 0 || details.reason === null ? details.kind : `${details.kind}: ${describeErrorChain(details.reason, depth + 1)}`;
+	}
+	return String(error).trim() || "unknown transport error";
+}
+/** One line describing why a provider fetch failed: the abort reason when the caller cancelled, the cause chain otherwise. */
+function describeTransportFailure(error, signal) {
+	try {
+		if (signal?.aborted === true) return `aborted (${describeErrorChain(signal.reason ?? error)})`;
+		return describeErrorChain(error);
+	} catch {
+		return "unknown transport error";
+	}
+}
+async function withTransportDiagnostics(context, run) {
+	try {
+		return await run();
+	} catch (error) {
+		const elapsed = ((performance.now() - context.startedAt) / 1e3).toFixed(1);
+		const detail = redactSecrets(describeTransportFailure(error, context.signal), ...context.secrets).replace(/\s+/g, " ").slice(0, TRANSPORT_DETAIL_LIMIT);
+		throw new Error(`${context.label} failed after ${elapsed}s: ${detail}`, { cause: error });
+	}
+}
+/**
+* Await one provider fetch and rethrow transport failures as
+* `${label} failed after 12.3s: ${cause chain}`. The original error stays
+* reachable on `cause` for host-side error rendering.
+*/
+async function guardedFetch(label, signal, run, ...secrets) {
+	const context = {
+		label,
+		signal,
+		secrets,
+		startedAt: performance.now()
+	};
+	const response = await withTransportDiagnostics(context, run);
+	responseContexts.set(response, context);
+	return response;
+}
+/** Guard only body I/O; parsing, HTTP checks and size enforcement stay with the adapter. */
+function readResponseBody(response, read) {
+	const context = responseContexts.get(response);
+	return context === void 0 ? read() : withTransportDiagnostics(context, read);
+}
+//#endregion
 //#region lib/types/dashscope.js
 async function generateDashScopeImage(options) {
 	assertQwenImageModel(options.model);
@@ -7435,7 +7512,7 @@ function toDataUrl$3(image) {
 }
 async function requestQwenImage(options) {
 	const base = options.endpoint.replace(/\/+$/, "");
-	const response = await fetch(`${base}/services/aigc/multimodal-generation/generation`, {
+	const response = await guardedFetch(`DashScope image ${options.operation}`, options.signal, () => fetch(`${base}/services/aigc/multimodal-generation/generation`, {
 		method: "POST",
 		...options.signal ? { signal: options.signal } : {},
 		headers: {
@@ -7443,12 +7520,12 @@ async function requestQwenImage(options) {
 			authorization: `Bearer ${options.apiKey}`
 		},
 		body: JSON.stringify(options.requestBody)
-	});
+	}), options.apiKey);
 	if (!response.ok) {
-		const errorText = redactSecrets(await response.text(), options.apiKey);
+		const errorText = redactSecrets(await readResponseBody(response, () => response.text()), options.apiKey);
 		throw new Error(`DashScope image ${options.operation} failed (${String(response.status)}): ${errorText}`);
 	}
-	const payload = await response.json();
+	const payload = JSON.parse(await readResponseBody(response, () => response.text()));
 	const imageUrl = extractImageUrl(payload);
 	if (imageUrl === void 0) throw new Error(`DashScope image ${options.operation} returned no image URL: ${redactSecrets(payload.message ?? JSON.stringify(payload), options.apiKey)}`);
 	return downloadImageBlob(imageUrl, options);
@@ -7463,9 +7540,9 @@ function extractImageUrl(response) {
 	}
 }
 async function downloadImageBlob(imageUrl, options) {
-	const imageResponse = await fetch(imageUrl, { ...options.signal ? { signal: options.signal } : {} });
+	const imageResponse = await guardedFetch("DashScope image download", options.signal, () => fetch(imageUrl, { ...options.signal ? { signal: options.signal } : {} }), options.apiKey);
 	if (!imageResponse.ok) throw new Error(`Failed to fetch DashScope image from URL (${String(imageResponse.status)})`);
-	const buffer = await imageResponse.arrayBuffer();
+	const buffer = await readResponseBody(imageResponse, () => imageResponse.arrayBuffer());
 	if (buffer.byteLength > options.maxBytes) throw new Error(`DashScope generated image (${String(buffer.byteLength)} bytes) exceeds the ${String(options.maxBytes)} byte limit`);
 	const data = new Uint8Array(buffer);
 	const mediaType = detectImageMediaType(data) ?? imageMediaType$3(imageResponse.headers.get("content-type"));
@@ -7488,12 +7565,13 @@ function generateGoogleImage(input) {
 	return requestGoogleImage({
 		...input,
 		operation: "generation",
-		interactionInput: input.prompt
+		interactionInput: input.prompt,
+		nativeParts: [{ text: input.prompt }]
 	});
 }
 /** Send one native Google image-editing request using already-resolved bytes. */
 function editGoogleImage(input) {
-	const interactionInput = input.sourceImages.length === 1 ? [{
+	const interactionInput = input.native ? [] : input.sourceImages.length === 1 ? [{
 		type: "image",
 		mime_type: input.sourceImages[0].mediaType,
 		data: Buffer.from(input.sourceImages[0].data).toString("base64")
@@ -7514,13 +7592,41 @@ function editGoogleImage(input) {
 	return requestGoogleImage({
 		...input,
 		operation: "editing",
-		interactionInput
+		interactionInput,
+		nativeParts: input.native ? [...input.sourceImages.map((image) => ({ inlineData: {
+			mimeType: image.mediaType,
+			data: Buffer.from(image.data).toString("base64")
+		} })), { text: input.prompt }] : []
 	});
 }
 /** Shared Google request, response parsing, decoding, and size enforcement. */
 async function requestGoogleImage(input) {
 	const label = `Google image ${input.operation}`;
-	const response = await fetch(input.endpoint, {
+	const endpoint = input.native ? nativeGoogleUrl(input.endpoint, input.model).toString() : input.endpoint;
+	const body = input.native ? {
+		contents: [{
+			role: "user",
+			parts: input.nativeParts
+		}],
+		generationConfig: {
+			candidateCount: 1,
+			responseModalities: ["TEXT", "IMAGE"],
+			imageConfig: {
+				aspectRatio: input.aspectRatio,
+				imageSize: input.imageSize
+			}
+		}
+	} : {
+		model: input.model,
+		input: input.interactionInput,
+		response_format: {
+			type: "image",
+			mime_type: REQUESTED_MEDIA_TYPE,
+			aspect_ratio: input.aspectRatio,
+			image_size: input.imageSize
+		}
+	};
+	const response = await guardedFetch(`${label} request`, input.signal, () => fetch(endpoint, {
 		method: "POST",
 		redirect: "error",
 		signal: input.signal,
@@ -7528,17 +7634,8 @@ async function requestGoogleImage(input) {
 			"content-type": "application/json",
 			"x-goog-api-key": input.apiKey
 		},
-		body: JSON.stringify({
-			model: input.model,
-			input: input.interactionInput,
-			response_format: {
-				type: "image",
-				mime_type: REQUESTED_MEDIA_TYPE,
-				aspect_ratio: input.aspectRatio,
-				image_size: input.imageSize
-			}
-		})
-	});
+		body: JSON.stringify(body)
+	}), input.apiKey);
 	const text = await readBoundedText$2(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT$2, label);
 	if (!response.ok) throw new Error(`${label} failed (${response.status}): ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$2)}`);
 	let payload;
@@ -7547,7 +7644,7 @@ async function requestGoogleImage(input) {
 	} catch {
 		throw new Error(`${label} returned invalid JSON`);
 	}
-	const image = outputImage(payload);
+	const image = input.native ? nativeOutputImage(payload) : outputImage(payload);
 	if (image === void 0) throw new Error(`${label} returned no image: ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$2)}`);
 	const data = decodeBase64$2(image.data, label);
 	if (data.byteLength > input.maxBytes) throw new Error(`${label} exceeded the ${String(input.maxBytes)} byte image limit`);
@@ -7558,6 +7655,49 @@ async function requestGoogleImage(input) {
 		mediaType
 	};
 }
+/** Accept a versioned base, the existing interactions URL, or a full native URL. */
+function nativeGoogleUrl(endpoint, model) {
+	let url;
+	try {
+		url = new URL(endpoint);
+	} catch {
+		throw new Error("Google endpoint must be an absolute URL");
+	}
+	const base = url.pathname.replace(/\/+$/, "").replace(/\/(?:interactions|models(?:\/[^/]+:generateContent)?)$/, "");
+	url.pathname = `${base}/models${model === void 0 ? "" : `/${encodeURIComponent(model.replace(/^models\//, ""))}:generateContent`}`;
+	return url;
+}
+/** The settings probe and model picker use the same base as image requests. */
+function googleModelsEndpoint(endpoint, native) {
+	if (native) return nativeGoogleUrl(endpoint).toString();
+	let url;
+	try {
+		url = new URL(endpoint);
+	} catch {
+		throw new Error("Google endpoint must be an absolute URL");
+	}
+	const segments = url.pathname.split("/").filter(Boolean);
+	segments[segments.length - 1] = "models";
+	url.pathname = `/${segments.join("/")}`;
+	return url.toString();
+}
+function nativeOutputImage(value) {
+	const candidates = record$5(value)?.candidates;
+	if (!Array.isArray(candidates)) return void 0;
+	for (const candidate of candidates) {
+		const parts = record$5(record$5(candidate)?.content)?.parts;
+		if (!Array.isArray(parts)) continue;
+		for (const value of parts) {
+			const part = record$5(value);
+			if (part?.thought === true) continue;
+			const image = record$5(part?.inlineData ?? part?.inline_data);
+			if (typeof image?.data === "string") return {
+				data: image.data,
+				mime_type: image.mimeType ?? image.mime_type
+			};
+		}
+	}
+}
 function outputImage(value) {
 	const interaction = record$5(value);
 	if (interaction === void 0) return void 0;
@@ -7601,7 +7741,7 @@ async function readBoundedText$2(response, maxBytes, label) {
 	let bytes = 0;
 	try {
 		for (;;) {
-			const next = await reader.read();
+			const next = await readResponseBody(response, () => reader.read());
 			if (next.done) break;
 			bytes += next.value.byteLength;
 			if (bytes > maxBytes) throw new Error(`${label} response exceeded the ${String(maxBytes)} byte limit`);
@@ -8101,7 +8241,7 @@ function jsonError$4(res, status, code) {
 //#region lib/types/openai-compatible.js
 const ERROR_LIMIT$1 = 4096;
 async function generateOpenAICompatibleImage(input) {
-	return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "generations"), {
+	return parseImageResponse(await guardedFetch(`${input.provider} image request`, input.signal, () => fetch(imageEndpoint$1(input.baseURL, "generations"), {
 		method: "POST",
 		redirect: "error",
 		signal: input.signal,
@@ -8120,10 +8260,10 @@ async function generateOpenAICompatibleImage(input) {
 			} : {},
 			...input.extraBody ?? {}
 		})
-	}), input.provider, input);
+	}), input.apiKey), input.provider, input);
 }
 async function editOpenAICompatibleImage(input) {
-	if (input.editFormat === "qwenJson") return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "generations"), {
+	if (input.editFormat === "qwenJson") return parseImageResponse(await guardedFetch("openai-compat image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "generations"), {
 		method: "POST",
 		redirect: "error",
 		signal: input.signal,
@@ -8140,13 +8280,13 @@ async function editOpenAICompatibleImage(input) {
 			...input.editExtra ?? {},
 			...input.extraBody ?? {}
 		})
-	}), "openai-compat", input);
+	}), input.apiKey), "openai-compat", input);
 	if (input.editFormat === "xaiJson") {
 		const references = input.sourceImages.map((image) => ({
 			type: "image_url",
 			url: toDataUrl$2(image)
 		}));
-		return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "edits"), {
+		return parseImageResponse(await guardedFetch("xai image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "edits"), {
 			method: "POST",
 			redirect: "error",
 			signal: input.signal,
@@ -8161,7 +8301,7 @@ async function editOpenAICompatibleImage(input) {
 				...input.quality === void 0 ? {} : { quality: input.quality },
 				...input.extraBody ?? {}
 			})
-		}), "xai", input);
+		}), input.apiKey), "xai", input);
 	}
 	if (input.editFormat === "jsonImageUrlArray") {
 		const body = {
@@ -8175,7 +8315,7 @@ async function editOpenAICompatibleImage(input) {
 			...input.editExtra ?? {},
 			...input.extraBody ?? {}
 		};
-		return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "edits"), {
+		return parseImageResponse(await guardedFetch("openai image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "edits"), {
 			method: "POST",
 			redirect: "error",
 			signal: input.signal,
@@ -8184,7 +8324,7 @@ async function editOpenAICompatibleImage(input) {
 				"content-type": "application/json"
 			},
 			body: JSON.stringify(body)
-		}), "openai", input);
+		}), input.apiKey), "openai", input);
 	}
 	if (input.editFormat === "formReferenceImages") {
 		const form = new FormData();
@@ -8195,13 +8335,13 @@ async function editOpenAICompatibleImage(input) {
 		for (const [key, value] of Object.entries(input.extraBody ?? {})) form.append(key, String(value));
 		form.append("response_format", "b64_json");
 		form.append("reference_images", JSON.stringify(input.sourceImages.map((sourceImage) => Buffer.from(sourceImage.data).toString("base64"))));
-		return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "edits"), {
+		return parseImageResponse(await guardedFetch("openai image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "edits"), {
 			method: "POST",
 			redirect: "error",
 			signal: input.signal,
 			headers: { authorization: `Bearer ${input.apiKey}` },
 			body: form
-		}), "openai", input);
+		}), input.apiKey), "openai", input);
 	}
 	const form = new FormData();
 	const imageField = input.sourceImages.length > 1 ? "image[]" : "image";
@@ -8216,13 +8356,13 @@ async function editOpenAICompatibleImage(input) {
 	if (input.size !== void 0 && input.size.length > 0) form.append("size", input.size);
 	if (input.quality !== void 0) form.append("quality", input.quality);
 	for (const [key, value] of Object.entries(input.extraBody ?? {})) form.append(key, String(value));
-	return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "edits"), {
+	return parseImageResponse(await guardedFetch("openai image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "edits"), {
 		method: "POST",
 		redirect: "error",
 		signal: input.signal,
 		headers: { authorization: `Bearer ${input.apiKey}` },
 		body: form
-	}), "openai", input);
+	}), input.apiKey), "openai", input);
 }
 async function parseImageResponse(response, provider, input) {
 	const text = await readBoundedText$1(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT$1);
@@ -8282,15 +8422,15 @@ async function downloadImage$1(url, provider, input) {
 			mediaType: detectImageMediaType(data) ?? imageMediaType$2(parsed.mediaType) ?? "image/png"
 		};
 	}
-	let response = await fetch(url, {
+	let response = await guardedFetch(`${provider} image download`, input.signal, () => fetch(url, {
 		redirect: "follow",
 		signal: input.signal,
 		...input.apiKey === void 0 ? {} : { headers: { authorization: `Bearer ${input.apiKey}` } }
-	});
-	if (!response.ok && input.apiKey !== void 0) response = await fetch(url, {
+	}), input.apiKey);
+	if (!response.ok && input.apiKey !== void 0) response = await guardedFetch(`${provider} image download`, input.signal, () => fetch(url, {
 		redirect: "follow",
 		signal: input.signal
-	});
+	}), input.apiKey);
 	if (!response.ok) throw new Error(`${provider} image download failed (${response.status})`);
 	const data = await readBoundedBytes$1(response, input.maxBytes);
 	const mediaType = detectImageMediaType(data) ?? imageMediaType$2(response.headers.get("content-type"));
@@ -8336,7 +8476,7 @@ async function readBoundedBytes$1(response, maxBytes) {
 	let bytes = 0;
 	try {
 		for (;;) {
-			const next = await reader.read();
+			const next = await readResponseBody(response, () => reader.read());
 			if (next.done) break;
 			bytes += next.value.byteLength;
 			if (bytes > maxBytes) throw new Error(`Image response exceeded the ${String(maxBytes)} byte limit`);
@@ -8358,7 +8498,7 @@ async function readBoundedBytes$1(response, maxBytes) {
 const ERROR_LIMIT = 4096;
 /** Edit one image through Ark ImageGenerations using a data-URL reference. */
 async function editSeedreamImage(input) {
-	const response = await fetch(imageEndpoint(input.baseURL), {
+	const response = await guardedFetch("seedream image editing", input.signal, () => fetch(imageEndpoint(input.baseURL), {
 		method: "POST",
 		redirect: "error",
 		signal: input.signal,
@@ -8374,7 +8514,7 @@ async function editSeedreamImage(input) {
 			...arkOutputBody(input.arkOptions),
 			response_format: "b64_json"
 		})
-	});
+	}), input.apiKey);
 	const text = await readBoundedText(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT);
 	if (!response.ok) throw new Error(`seedream image editing failed (${response.status}): ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT)}`);
 	let payload;
@@ -8423,10 +8563,10 @@ function firstImage(value) {
 }
 async function downloadImage(url, input) {
 	if (url === void 0) throw new Error("seedream image editing returned no image data");
-	const response = await fetch(url, {
+	const response = await guardedFetch("seedream image download", input.signal, () => fetch(url, {
 		redirect: "follow",
 		signal: input.signal
-	});
+	}), input.apiKey);
 	if (!response.ok) throw new Error(`seedream image download failed (${response.status})`);
 	const mediaType = imageMediaType$1(response.headers.get("content-type"));
 	if (mediaType === void 0) throw new Error("seedream image download returned unsupported content type");
@@ -8456,7 +8596,7 @@ async function readBoundedBytes(response, maxBytes) {
 	let bytes = 0;
 	try {
 		for (;;) {
-			const next = await reader.read();
+			const next = await readResponseBody(response, () => reader.read());
 			if (next.done) break;
 			bytes += next.value.byteLength;
 			if (bytes > maxBytes) throw new Error(`Image response exceeded the ${String(maxBytes)} byte limit`);
@@ -8937,20 +9077,24 @@ function getAntigravityVersion() {
 	return antigravityVersion ?? ANTIGRAVITY_VERSION_FALLBACK;
 }
 /** Fetch and cache the current version once; failures keep the fallback. */
-async function initAntigravityVersion() {
+async function initAntigravityVersion(signal) {
+	signal?.throwIfAborted();
 	if (antigravityVersion !== void 0) return;
-	const parsed = await fetchVersionText(VERSION_URL) ?? await fetchVersionText(CHANGELOG_URL, CHANGELOG_SCAN_CHARS);
+	const parsed = await fetchVersionText(VERSION_URL, void 0, signal) ?? await fetchVersionText(CHANGELOG_URL, CHANGELOG_SCAN_CHARS, signal);
+	signal?.throwIfAborted();
 	if (parsed !== void 0) antigravityVersion = parsed;
 }
-async function fetchVersionText(url, maxChars) {
+async function fetchVersionText(url, maxChars, signal) {
 	try {
-		const response = await fetch(url, { signal: AbortSignal.timeout(VERSION_FETCH_TIMEOUT_MS) });
+		const timeout = AbortSignal.timeout(VERSION_FETCH_TIMEOUT_MS);
+		const response = await fetch(url, { signal: signal === void 0 ? timeout : AbortSignal.any([signal, timeout]) });
 		if (!response.ok) return void 0;
 		let text = await response.text();
 		if (maxChars !== void 0) text = text.slice(0, maxChars);
 		const match = text.match(VERSION_REGEX);
 		return match === null ? void 0 : match[0];
-	} catch {
+	} catch (error) {
+		if (signal?.aborted === true) throw error;
 		return;
 	}
 }
@@ -9016,16 +9160,19 @@ function antigravityAuthorizeUrl(cfg, pkce) {
 	});
 }
 /**
-* Headers for project discovery (loadCodeAssist): the reference keeps the
-* plain SDK identity here, mirroring its project.js loadHeaders.
+* Preserve the SDK discovery identity first. A no-project UNSUPPORTED_CLIENT
+* response can be retried with the same Antigravity identity as generation.
 */
-function loadHeaders(projectId) {
+function loadHeaders(projectId, identity) {
 	return {
-		"User-Agent": "google-api-nodejs-client/9.15.1",
+		"User-Agent": identity === "antigravity" ? antigravityUserAgent() : "google-api-nodejs-client/9.15.1",
 		"X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",
 		"Client-Metadata": JSON.stringify(clientMetadata(projectId))
 	};
 }
+function antigravityUserAgent() {
+	return `Mozilla/5.0 (${process.platform === "darwin" ? "Macintosh; Intel Mac OS X 10_15_7" : "Windows NT 10.0; Win64; x64"}) AppleWebKit/537.36 (KHTML, like Gecko) Antigravity/${getAntigravityVersion()} Chrome/138.0.7204.235 Electron/37.3.1 Safari/537.36`;
+}
 /**
 * Headers for content requests (image generation): the full Electron
 * browser User-Agent with the Antigravity client version, matching the
@@ -9034,7 +9181,7 @@ function loadHeaders(projectId) {
 */
 function contentHeaders(projectId) {
 	return {
-		"User-Agent": `Mozilla/5.0 (${process.platform === "darwin" ? "Macintosh; Intel Mac OS X 10_15_7" : "Windows NT 10.0; Win64; x64"}) AppleWebKit/537.36 (KHTML, like Gecko) Antigravity/${getAntigravityVersion()} Chrome/138.0.7204.235 Electron/37.3.1 Safari/537.36`,
+		"User-Agent": antigravityUserAgent(),
 		"X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",
 		"Client-Metadata": JSON.stringify(clientMetadata(projectId))
 	};
@@ -9100,40 +9247,50 @@ async function antigravityResolveProjectContext(blob, signal) {
 	signal?.throwIfAborted();
 	const metadata = clientMetadata("");
 	const diagnostics = [];
-	for (const base of LOAD_ENDPOINTS) {
-		const label = `loadCodeAssist ${new URL(base).hostname}`;
-		try {
-			const response = await fetch(`${base}/v1internal:loadCodeAssist`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					Authorization: `Bearer ${blob.accessToken}`,
-					...loadHeaders("")
-				},
-				body: JSON.stringify({ metadata }),
-				signal: signal === void 0 ? AbortSignal.timeout(25e3) : AbortSignal.any([signal, AbortSignal.timeout(25e3)])
-			});
-			if (!response.ok) {
-				diagnostics.push(`${label}: ${httpDiagnostic(response.status, await response.text().catch(() => ""), blob)}`);
-				continue;
-			}
-			const payload = recordOf(await response.json().catch(() => null));
-			if (payload === void 0) {
-				diagnostics.push(`${label}: HTTP ${String(response.status)}, invalid response`);
-				continue;
+	const identityRetryEndpoints = [];
+	for (const identity of ["sdk", "antigravity"]) {
+		const endpoints = identity === "sdk" ? LOAD_ENDPOINTS : identityRetryEndpoints;
+		if (identity === "antigravity") {
+			if (endpoints.length === 0) break;
+			await initAntigravityVersion(signal);
+		}
+		for (const base of endpoints) {
+			signal?.throwIfAborted();
+			const label = `loadCodeAssist ${new URL(base).hostname}${identity === "antigravity" ? ` [Antigravity/${getAntigravityVersion()}]` : ""}`;
+			try {
+				const response = await fetch(`${base}/v1internal:loadCodeAssist`, {
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+						Authorization: `Bearer ${blob.accessToken}`,
+						...loadHeaders("", identity)
+					},
+					body: JSON.stringify({ metadata }),
+					signal: signal === void 0 ? AbortSignal.timeout(25e3) : AbortSignal.any([signal, AbortSignal.timeout(25e3)])
+				});
+				if (!response.ok) {
+					diagnostics.push(`${label}: ${httpDiagnostic(response.status, await response.text().catch(() => ""), blob)}`);
+					continue;
+				}
+				const payload = recordOf(await response.json().catch(() => null));
+				if (payload === void 0) {
+					diagnostics.push(`${label}: HTTP ${String(response.status)}, invalid response`);
+					continue;
+				}
+				const project = payload.cloudaicompanionProject;
+				const projectRecord = recordOf(project);
+				const id = typeof project === "string" ? project : typeof projectRecord?.id === "string" ? projectRecord.id : "";
+				if (id.trim().length > 0) return {
+					projectId: id.trim(),
+					source: "account",
+					diagnostics
+				};
+				diagnostics.push(`${label}: HTTP ${String(response.status)}, ${missingProjectDiagnostic(payload, blob)}`);
+				if (identity === "sdk" && Array.isArray(payload.ineligibleTiers) && payload.ineligibleTiers.some((tier) => recordOf(tier)?.reasonCode === "UNSUPPORTED_CLIENT")) identityRetryEndpoints.push(base);
+			} catch (error) {
+				if (signal?.aborted === true) throw error;
+				diagnostics.push(`${label}: ${diagnosticText(error instanceof Error ? error.message : "request failed", blob)}`);
 			}
-			const project = payload.cloudaicompanionProject;
-			const projectRecord = recordOf(project);
-			const id = typeof project === "string" ? project : typeof projectRecord?.id === "string" ? projectRecord.id : "";
-			if (id.trim().length > 0) return {
-				projectId: id.trim(),
-				source: "account",
-				diagnostics
-			};
-			diagnostics.push(`${label}: HTTP ${String(response.status)}, ${missingProjectDiagnostic(payload, blob)}`);
-		} catch (error) {
-			if (signal?.aborted === true) throw error;
-			diagnostics.push(`${label}: ${diagnosticText(error instanceof Error ? error.message : "request failed", blob)}`);
 		}
 	}
 	return {
@@ -9250,7 +9407,7 @@ function antigravityEnvelope(projectId, request) {
 */
 async function antigravityGenerateImage(options) {
 	options.signal?.throwIfAborted();
-	await initAntigravityVersion();
+	await initAntigravityVersion(options.signal);
 	const inner = antigravityImageBody({
 		prompt: options.prompt,
 		...options.aspectRatio !== void 0 ? { aspectRatio: options.aspectRatio } : {},
@@ -27679,6 +27836,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			generated = input.mode === "edit" ? await editGoogleImage({
 				apiKey: credential,
 				endpoint: wired.endpoint,
+				native: wired.native,
 				model: wired.model,
 				prompt: input.prompt,
 				sourceImages,
@@ -27689,6 +27847,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			}) : await generateGoogleImage({
 				apiKey: credential,
 				endpoint: wired.endpoint,
+				native: wired.native,
 				model: wired.model,
 				prompt: input.prompt,
 				aspectRatio,
@@ -28321,15 +28480,7 @@ function googleModelsUrl(config) {
 	const endpoint = config.googleEndpoint;
 	const fallback = "https://generativelanguage.googleapis.com/v1beta/models";
 	if (typeof endpoint !== "string" || endpoint.trim().length === 0) return fallback;
-	try {
-		const url = new URL(endpoint);
-		const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
-		segments[segments.length - 1] = "models";
-		url.pathname = `/${segments.join("/")}`;
-		return url.toString();
-	} catch {
-		throw new Error("Google endpoint must be an absolute URL");
-	}
+	return googleModelsEndpoint(endpoint, config.googleNative === true);
 }
 function joinUrl(base, path) {
 	return new URL(path, base.endsWith("/") ? base : `${base}/`).toString();
@@ -28834,6 +28985,7 @@ function apply(ctx, config = {}) {
 			return saveGenerated(ctx, await generateGoogleImage({
 				apiKey: credential,
 				endpoint: active.endpoint,
+				native: active.native,
 				model: active.model,
 				prompt: args.prompt,
 				aspectRatio,
@@ -29341,6 +29493,7 @@ function apply(ctx, config = {}) {
 				return saveGenerated(ctx, await editGoogleImage({
 					apiKey: credential,
 					endpoint: active.endpoint,
+					native: active.native,
 					model: active.model,
 					prompt: args.prompt,
 					sourceImages,

package/lib/types/client/index.d.ts

@@ -17,6 +17,7 @@ interface ImageSettings {
     provider?: Provider;
     googleModel?: string;
     googleEndpoint?: string;
+    googleNative?: boolean;
     openaiBaseURL?: string;
     openaiModel?: string;
     openaiSizes?: Record<string, Record<string, string>>;