dsh-image-gen 0.8.6 → 0.8.7

package/lib/index.js

@@ -5581,6 +5581,111 @@ function toolAbortedBeforeDispatchResult(prior) {
 	};
 }
 //#endregion
+//#region lib/types/watermark.js
+const WATERMARK_OPTIONS = [
+	{
+		value: "default",
+		label: "渠道默认"
+	},
+	{
+		value: "off",
+		label: "关闭"
+	},
+	{
+		value: "on",
+		label: "开启"
+	}
+];
+function configuredField(extra) {
+	if (typeof extra?.watermark === "boolean") return "watermark";
+	if (typeof extra?.watermark_enabled === "boolean") return "watermark_enabled";
+	const parameters = extra?.parameters;
+	if (parameters && typeof parameters === "object" && !Array.isArray(parameters) && typeof parameters.watermark === "boolean") return "parameters.watermark";
+}
+/** Model names alone do not establish the protocol of an unknown relay. */
+function officialContract(config, mode) {
+	const model = (mode === "generate" ? config.openaiCompatExtraBody : config.openaiCompatEditExtra)?.model ?? config.openaiCompatModel;
+	if (typeof model !== "string") return void 0;
+	try {
+		const url = new URL(config.openaiCompatBaseURL ?? "");
+		if (url.protocol !== "https:" || url.port || url.search || url.hash) return void 0;
+		const path = url.pathname.replace(/\/+$/, "");
+		if (url.hostname === "token.sensenova.cn" && path === "/v1" && model === "sensenova-u1.5-lite") return "sensenova";
+		if (/^[a-z0-9-]+\.(?:cn-beijing|ap-southeast-1|us-east-1|eu-central-1|ap-northeast-1|cn-hongkong)\.maas\.aliyuncs\.com$/.test(url.hostname) && path === "/compatible-mode/v1" && /^qwen-image-(?:3\.0(?:-pro)?|2\.1-(?:pro|turbo))$/.test(model)) return "qwen";
+	} catch {}
+}
+/** Known official edit contracts take precedence over relay-specific format settings. */
+function compatEditFormat(config) {
+	const contract = officialContract(config, "edit");
+	if (contract === "sensenova") return "jsonImageUrlArray";
+	if (contract === "qwen") return "qwenJson";
+	return config.openaiCompatEditFormat ?? "multipart";
+}
+function compatWatermarkField(config, mode = "generate") {
+	if (officialContract(config, mode) !== void 0) return "watermark";
+	if (mode === "generate") return configuredField(config.openaiCompatExtraBody);
+	return compatEditFormat(config) === "jsonImageUrlArray" ? configuredField(config.openaiCompatEditExtra) : void 0;
+}
+function overrideField(extra, field, selected) {
+	const watermark = selected === "on";
+	return field === "parameters.watermark" ? {
+		...extra,
+		parameters: {
+			...extra?.parameters,
+			watermark
+		}
+	} : {
+		...extra,
+		[field]: watermark
+	};
+}
+/** Preserve all advanced fields; only an explicit workbench choice overrides its own watermark. */
+function compatGenerationExtraBody(config, selected) {
+	const extra = config.openaiCompatExtraBody;
+	if (selected === void 0 || selected === "default") return extra;
+	const field = compatWatermarkField(config);
+	if (field === void 0) throw new Error("该渠道尚未确认文生图水印支持，请刷新工作台");
+	return overrideField(extra, field, selected);
+}
+function compatEditExtraBody(config, selected) {
+	if (selected === void 0 || selected === "default") return void 0;
+	const field = compatWatermarkField(config, "edit");
+	if (field === void 0) throw new Error("该渠道尚未确认图生图水印支持，请刷新工作台");
+	return overrideField(config.openaiCompatEditExtra, field, selected);
+}
+function selectedWatermark(selected, channelDefault) {
+	return selected === "off" ? false : selected === "on" ? true : channelDefault;
+}
+function watermarkProfile(config, provider, model) {
+	const capability = (mode) => {
+		if (provider === "seedream" || provider === "dashscope" && /^qwen-image(?:$|-)/.test(model)) return { status: "supported" };
+		if (provider === "openai-compat") return compatWatermarkField(config, mode) === void 0 ? {
+			status: "unknown",
+			reason: mode === "edit" && configuredField(config.openaiCompatEditExtra) !== void 0 ? "edit-format" : "channel-unconfirmed"
+		} : { status: "supported" };
+		if (provider === "zhipu") return {
+			status: "unknown",
+			reason: "account-unconfirmed"
+		};
+		if (provider === "dashscope") return {
+			status: "unknown",
+			reason: "model-unconfirmed"
+		};
+		return {
+			status: "unavailable",
+			reason: "no-api-control"
+		};
+	};
+	const generate = capability("generate");
+	return {
+		watermarkCapabilities: {
+			generate,
+			edit: capability("edit")
+		},
+		...generate.status === "supported" ? { watermarkOptions: WATERMARK_OPTIONS } : {}
+	};
+}
+//#endregion
 //#region lib/types/shared.js
 /** Browser route used by the generated-image card. */
 const IMAGE_ROUTE = "/plugins/dsh-image-gen/image";
@@ -5717,6 +5822,17 @@ const SUBSCRIPTION_PROVIDER_DISPLAY_NAMES = {
 	"grok-sub": "Grok 订阅",
 	"google-sub": "Google 订阅"
 };
+const STUDIO_WATERMARK_VALUES = [
+	"default",
+	"off",
+	"on"
+];
+function studioWatermarkCapability(profile, mode) {
+	return profile?.watermarkCapabilities?.[mode] ?? (mode === "generate" && profile?.watermarkOptions?.length ? { status: "supported" } : {
+		status: "unknown",
+		reason: "channel-unconfirmed"
+	});
+}
 /** Default endpoints and base URLs. */
 const DEFAULT_GOOGLE_ENDPOINT = "https://generativelanguage.googleapis.com/v1beta/interactions";
 const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
@@ -5841,8 +5957,18 @@ const Config = z.object({
 	googleEndpoint: volatile(z.string().default(DEFAULT_GOOGLE_ENDPOINT)),
 	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({})),
 	openaiCompatBaseURL: volatile(z.string().default("")),
 	openaiCompatModel: volatile(z.string().default("")),
+	openaiCompatQuality: volatile(z.string().default("")),
+	openaiCompatQualityOptions: volatile(z.array(z.string()).default([
+		"auto",
+		"low",
+		"medium",
+		"high"
+	])),
+	openaiCompatExtraBody: volatile(z.dict(z.any()).default({})),
+	openaiCompatEditSizeMode: volatile(z.union(["auto", "selected"]).default("auto")),
 	openaiCompatEditFormat: volatile(z.union([
 		z.const("multipart"),
 		z.const("jsonImageUrlArray"),
@@ -5896,7 +6022,7 @@ function resolveProvider(config) {
 				model,
 				baseURL,
 				imageSize: "1024x1024",
-				editFormat: config.openaiCompatEditFormat ?? "multipart",
+				editFormat: compatEditFormat(config),
 				editExtra: config.openaiCompatEditExtra ?? {}
 			};
 		}
@@ -7268,7 +7394,10 @@ async function generateDashScopeImage(options) {
 				role: "user",
 				content: [{ text: options.prompt }]
 			}] },
-			parameters: { ...formattedSize === void 0 ? {} : { size: formattedSize } }
+			parameters: {
+				...formattedSize === void 0 ? {} : { size: formattedSize },
+				...options.watermark === void 0 ? {} : { watermark: options.watermark }
+			}
 		},
 		operation: "generation"
 	});
@@ -7287,7 +7416,8 @@ async function editDashScopeImage(options) {
 			}] },
 			parameters: {
 				prompt_extend: true,
-				...formattedSize === void 0 ? {} : { size: formattedSize }
+				...formattedSize === void 0 ? {} : { size: formattedSize },
+				...options.watermark === void 0 ? {} : { watermark: options.watermark }
 			}
 		},
 		operation: "editing"
@@ -7993,6 +8123,24 @@ async function generateOpenAICompatibleImage(input) {
 	}), input.provider, input);
 }
 async function editOpenAICompatibleImage(input) {
+	if (input.editFormat === "qwenJson") return parseImageResponse(await fetch(imageEndpoint$1(input.baseURL, "generations"), {
+		method: "POST",
+		redirect: "error",
+		signal: input.signal,
+		headers: {
+			authorization: `Bearer ${input.apiKey}`,
+			"content-type": "application/json"
+		},
+		body: JSON.stringify({
+			model: input.model,
+			prompt: input.prompt,
+			image: input.sourceImages.map(toDataUrl$2),
+			...input.size === void 0 ? {} : { size: input.size },
+			...input.quality === void 0 ? {} : { quality: input.quality },
+			...input.editExtra ?? {},
+			...input.extraBody ?? {}
+		})
+	}), "openai-compat", input);
 	if (input.editFormat === "xaiJson") {
 		const references = input.sourceImages.map((image) => ({
 			type: "image_url",
@@ -8021,7 +8169,7 @@ async function editOpenAICompatibleImage(input) {
 			images: input.sourceImages.map((sourceImage) => ({ image_url: toDataUrl$2(sourceImage) })),
 			prompt: input.prompt,
 			n: 1,
-			size: "auto",
+			size: input.editSizeMode === "selected" ? input.size ?? "auto" : "auto",
 			response_format: "url",
 			...input.quality === void 0 ? {} : { quality: input.quality },
 			...input.editExtra ?? {},
@@ -8749,19 +8897,22 @@ const ANTIGRAVITY_CLIENT_ID = "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.ap
 const ANTIGRAVITY_CLIENT_SECRET = "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";
 const ANTIGRAVITY_REDIRECT_URI = "http://localhost:51121/oauth-callback";
 /**
-* Endpoint fallback order for generation, mirroring the reference (daily
-* sandbox first, then autopush, then prod).
+* Preserve the working sandbox routes, then try ordinary daily (consumer
+* accounts) before the production compatibility fallback. A Gmail address
+* alone does not establish which backend an account can use.
 */
 const ANTIGRAVITY_ENDPOINTS = [
 	"https://daily-cloudcode-pa.sandbox.googleapis.com",
 	"https://autopush-cloudcode-pa.sandbox.googleapis.com",
+	"https://daily-cloudcode-pa.googleapis.com",
 	"https://cloudcode-pa.googleapis.com"
 ];
 /** loadCodeAssist is best supported on prod; discovery tries prod first. */
 const LOAD_ENDPOINTS = [
 	"https://cloudcode-pa.googleapis.com",
 	"https://daily-cloudcode-pa.sandbox.googleapis.com",
-	"https://autopush-cloudcode-pa.sandbox.googleapis.com"
+	"https://autopush-cloudcode-pa.sandbox.googleapis.com",
+	"https://daily-cloudcode-pa.googleapis.com"
 ];
 /** The image model served through this channel: Nano Banana 2. */
 const ANTIGRAVITY_IMAGE_MODEL = DEFAULT_SUBSCRIPTION_MODELS["google-sub"];
@@ -8803,7 +8954,7 @@ async function fetchVersionText(url, maxChars) {
 		return;
 	}
 }
-/** Hardcoded fallback project when Antigravity returns none (workspace accounts). */
+/** Legacy compatibility project: not an account project or proof of entitlement. */
 const DEFAULT_PROJECT_ID = "rising-fact-p41fc";
 /** Generation timeout mirroring the reference implementation. */
 const IMAGE_TIMEOUT_MS = 12e4;
@@ -8869,16 +9020,10 @@ function antigravityAuthorizeUrl(cfg, pkce) {
 * plain SDK identity here, mirroring its project.js loadHeaders.
 */
 function loadHeaders(projectId) {
-	const platform = process.platform === "win32" ? "WINDOWS" : process.platform === "darwin" ? "MACOS" : "LINUX";
 	return {
 		"User-Agent": "google-api-nodejs-client/9.15.1",
 		"X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",
-		"Client-Metadata": JSON.stringify({
-			ideType: "ANTIGRAVITY",
-			platform,
-			pluginType: "GEMINI",
-			...projectId.length > 0 ? { duetProject: projectId } : {}
-		})
+		"Client-Metadata": JSON.stringify(clientMetadata(projectId))
 	};
 }
 /**
@@ -8888,17 +9033,10 @@ function loadHeaders(projectId) {
 * SDK UA here is what produced 403 #3501 on personal accounts.
 */
 function contentHeaders(projectId) {
-	const uaPlatform = process.platform === "darwin" ? "Macintosh; Intel Mac OS X 10_15_7" : "Windows NT 10.0; Win64; x64";
-	const platform = process.platform === "win32" ? "WINDOWS" : process.platform === "darwin" ? "MACOS" : "LINUX";
 	return {
-		"User-Agent": `Mozilla/5.0 (${uaPlatform}) AppleWebKit/537.36 (KHTML, like Gecko) Antigravity/${getAntigravityVersion()} Chrome/138.0.7204.235 Electron/37.3.1 Safari/537.36`,
+		"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`,
 		"X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",
-		"Client-Metadata": JSON.stringify({
-			ideType: "ANTIGRAVITY",
-			platform,
-			pluginType: "GEMINI",
-			...projectId.length > 0 ? { duetProject: projectId } : {}
-		})
+		"Client-Metadata": JSON.stringify(clientMetadata(projectId))
 	};
 }
 function tokenBlobFromOAuth(json) {
@@ -8953,41 +9091,113 @@ async function antigravityRefresh(blob) {
 	};
 }
 /**
-* Resolve the managed project id for the logged-in account. Most accounts
-* have one; when loadCodeAssist reports none, the hardcoded fallback keeps
-* generation working (mirrors the reference's ensureProjectContext).
-* Returns '' only when every endpoint fails, letting generate() throw then.
+* Discover an actual account project, preserving HTTP and eligibility failures.
+* Keep the legacy fallback for accounts whose image route still accepts it;
+* UNSUPPORTED_CLIENT here describes Code Assist, not a universal image ban.
+* Do not invoke onboarding or accept account terms during image generation.
 */
-async function antigravityResolveProject(blob) {
-	const metadata = {
+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 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 {
+		projectId: DEFAULT_PROJECT_ID,
+		source: "fallback",
+		diagnostics
+	};
+}
+/** Google ClientMetadata.Platform enum, shared by request body and headers. */
+function platformOf() {
+	if (process.platform === "win32" && process.arch === "x64") return "WINDOWS_AMD64";
+	if (process.platform === "darwin" && process.arch === "x64") return "DARWIN_AMD64";
+	if (process.platform === "darwin" && process.arch === "arm64") return "DARWIN_ARM64";
+	if (process.platform === "linux" && process.arch === "x64") return "LINUX_AMD64";
+	if (process.platform === "linux" && process.arch === "arm64") return "LINUX_ARM64";
+	return "PLATFORM_UNSPECIFIED";
+}
+function clientMetadata(projectId) {
+	return {
 		ideType: "ANTIGRAVITY",
 		platform: platformOf(),
-		pluginType: "GEMINI"
+		pluginType: "GEMINI",
+		...projectId.length > 0 ? { duetProject: projectId } : {}
 	};
-	for (const base of LOAD_ENDPOINTS) 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: AbortSignal.timeout(25e3)
-		});
-		if (!response.ok) continue;
-		const payload = await response.json().catch(() => null);
-		if (payload === null) continue;
-		const project = payload.cloudaicompanionProject;
-		const id = typeof project === "string" ? project : typeof project === "object" && project !== null && typeof project.id === "string" ? project.id : "";
-		if (id.length > 0) return id;
-	} catch {}
-	return DEFAULT_PROJECT_ID;
 }
-function platformOf() {
-	if (process.platform === "win32") return "WINDOWS";
-	if (process.platform === "darwin") return "MACOS";
-	return "LINUX";
+function recordOf(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+/** Upstream errors may echo request identity; redact before bounding the text. */
+function diagnosticText(value, blob) {
+	let text = typeof value === "string" ? value : "";
+	for (const secret of [
+		blob.accessToken,
+		blob.refreshToken,
+		blob.accountId,
+		blob.email
+	]) if (secret.length > 0) text = text.replaceAll(secret, "[redacted]");
+	return text.replace(/Bearer\s+\S+/gi, "Bearer [redacted]").replace(/\s+/g, " ").trim().slice(0, 200);
+}
+function httpDiagnostic(status, text, blob) {
+	let detail = text;
+	try {
+		const error = recordOf(recordOf(JSON.parse(text))?.error);
+		if (typeof error?.message === "string") detail = `${typeof error.status === "string" ? `${error.status}: ` : ""}${error.message}`;
+	} catch {}
+	const safe = diagnosticText(detail, blob);
+	return `HTTP ${String(status)}${safe.length > 0 ? `: ${safe}` : ""}`;
+}
+function missingProjectDiagnostic(payload, blob) {
+	const reasons = Array.isArray(payload.ineligibleTiers) ? payload.ineligibleTiers.flatMap((value) => {
+		const tier = recordOf(value);
+		return typeof tier?.reasonCode === "string" ? [`${tier.reasonCode}${typeof tier.reasonMessage === "string" ? `: ${tier.reasonMessage}` : ""}`] : [];
+	}) : [];
+	const allowed = Array.isArray(payload.allowedTiers) ? payload.allowedTiers.flatMap((value) => {
+		const tier = recordOf(value);
+		return typeof tier?.id === "string" ? [tier.id] : [];
+	}) : [];
+	const current = recordOf(payload.paidTier)?.id ?? recordOf(payload.currentTier)?.id;
+	const detail = [
+		...reasons,
+		...typeof current === "string" ? [`tier=${current}`] : [],
+		...allowed.length > 0 ? [`allowedTiers=${allowed.join(",")}`] : []
+	];
+	return `未返回账号项目${detail.length > 0 ? `; ${diagnosticText(detail.join("; "), blob)}` : ""}`;
 }
 /**
 * Build the streamGenerateContent request body for one image generation.
@@ -9039,6 +9249,7 @@ function antigravityEnvelope(projectId, request) {
 * parse the SSE stream for the inlineData image part.
 */
 async function antigravityGenerateImage(options) {
+	options.signal?.throwIfAborted();
 	await initAntigravityVersion();
 	const inner = antigravityImageBody({
 		prompt: options.prompt,
@@ -9047,7 +9258,7 @@ async function antigravityGenerateImage(options) {
 		...options.referenceImages !== void 0 ? { referenceImages: options.referenceImages } : {}
 	});
 	const body = antigravityEnvelope(options.projectId, inner);
-	let lastError = "no endpoint succeeded";
+	const failures = [];
 	for (const base of ANTIGRAVITY_ENDPOINTS) {
 		const url = `${base}/v1internal:streamGenerateContent?alt=sse`;
 		const timeoutSignal = AbortSignal.timeout(IMAGE_TIMEOUT_MS);
@@ -9066,23 +9277,23 @@ async function antigravityGenerateImage(options) {
 			});
 			if (!response.ok) {
 				const text = await response.text().catch(() => "");
-				lastError = `HTTP ${String(response.status)}: ${text.slice(0, 200)}`;
-				if (response.status === 403 || response.status === 404 || response.status === 429 || response.status >= 500) continue;
-				throw new Error(`antigravity ${lastError}`);
+				failures.push(`${new URL(base).hostname}: ${httpDiagnostic(response.status, text, options.blob)}`);
+				continue;
 			}
 			const text = await response.text();
 			const parsed = parseSseImage(text);
 			if (parsed !== void 0) return parsed;
 			const reason = parseSseError(text);
-			lastError = reason !== void 0 ? reason : "response contained no image";
+			failures.push(`${new URL(base).hostname}: ${diagnosticText(reason ?? "response contained no image", options.blob)}`);
 			continue;
 		} catch (error) {
 			if (options.signal?.aborted === true) throw error;
-			lastError = error instanceof Error ? error.message : String(error);
+			failures.push(`${new URL(base).hostname}: ${diagnosticText(error instanceof Error ? error.message : "request failed", options.blob)}`);
 			continue;
 		}
 	}
-	throw new Error(`antigravity image generation failed: ${lastError}`);
+	const discovery = options.projectContext?.source === "fallback" ? ["项目发现未返回账号项目，已尝试兼容项目。", ...options.projectContext.diagnostics] : [];
+	throw new Error(`antigravity image generation failed: ${[...discovery, ...failures].join(" | ")}`);
 }
 /** Scan an SSE body for the first image part in any data: line. */
 function parseSseImage(text) {
@@ -9310,11 +9521,12 @@ var SubscriptionManager = class {
 		const references = options.referenceImages ?? [];
 		if (references.length > 5) throw new Error(`订阅生图最多支持 ${String(5)} 张参考图，当前 ${String(references.length)} 张`);
 		if (vendor === "antigravity") {
-			const projectId = await this.ensureAntigravityProject(session);
+			const projectContext = await this.ensureAntigravityProject(session, options.signal);
 			const aspectRatio = antigravityAspectRatioOf(options.size);
 			return [{ b64_json: (await antigravityGenerateImage({
 				blob: session,
-				projectId,
+				projectId: projectContext.projectId,
+				projectContext,
 				prompt: text,
 				...aspectRatio !== void 0 ? { aspectRatio } : {},
 				hd: options.quality === "hd" || options.quality === "high",
@@ -9376,13 +9588,13 @@ var SubscriptionManager = class {
 	* Antigravity generation envelope needs. Re-resolved when the account
 	* signs out or a different account logs in.
 	*/
-	async ensureAntigravityProject(blob) {
+	async ensureAntigravityProject(blob, signal) {
 		const cacheKey = blob.refreshToken.length > 0 ? blob.refreshToken : blob.accessToken.slice(0, 32);
 		const cached = this.projectCache.get(cacheKey);
 		if (cached !== void 0) return cached;
-		const projectId = await antigravityResolveProject(blob);
-		this.projectCache.set(cacheKey, projectId);
-		return projectId;
+		const context = await antigravityResolveProjectContext(blob, signal);
+		if (context.source === "account") this.projectCache.set(cacheKey, context);
+		return context;
 	}
 };
 /** The private Codex backend can ignore size while following a canvas ratio in
@@ -27187,6 +27399,103 @@ async function clearDiskCache() {
 	} catch {}
 }
 //#endregion
+//#region lib/types/openai-output.js
+const PROVIDER_DEFAULT_QUALITY = "__default__";
+const DEFAULT_COMPAT_QUALITIES = [
+	"auto",
+	"low",
+	"medium",
+	"high"
+];
+const LEGACY_SIZES = [
+	"1024x1024",
+	"1536x1024",
+	"1024x1536"
+];
+const OPENAI_SIZES = {
+	"1:1": {
+		"1K": "1024x1024",
+		"2K": "2048x2048"
+	},
+	"3:2": {
+		"1K": "1536x1024",
+		"2K": "2304x1536"
+	},
+	"2:3": {
+		"1K": "1024x1536",
+		"2K": "1536x2304"
+	},
+	"4:3": {
+		"1K": "1152x864",
+		"2K": "2048x1536"
+	},
+	"3:4": {
+		"1K": "864x1152",
+		"2K": "1536x2048"
+	},
+	"16:9": {
+		"1K": "1536x864",
+		"2K": "2048x1152",
+		"4K": "3840x2160"
+	},
+	"9:16": {
+		"1K": "864x1536",
+		"2K": "1152x2048",
+		"4K": "2160x3840"
+	}
+};
+function flexibleSizeModel(model) {
+	return /^gpt-image-2(?:$|[-.])/.test(model);
+}
+function officialSizeTable(config, model) {
+	if (config.openaiSizes && Object.keys(config.openaiSizes).length > 0) return config.openaiSizes;
+	if (flexibleSizeModel(model)) return OPENAI_SIZES;
+	return {
+		"1:1": { "1K": LEGACY_SIZES[0] },
+		"3:2": { "1K": LEGACY_SIZES[1] },
+		"2:3": { "1K": LEGACY_SIZES[2] }
+	};
+}
+/** Check the official model contract before spending a request. Relays own their size contract. */
+function validateOfficialSize(model, size) {
+	if (size === "auto") return;
+	if (!flexibleSizeModel(model)) {
+		if (!LEGACY_SIZES.includes(size)) throw new Error(`模型 ${model} 不支持尺寸 ${size}；请使用 1024x1024、1536x1024 或 1024x1536`);
+		return;
+	}
+	const match = /^(\d+)x(\d+)$/.exec(size);
+	const width = Number(match?.[1]);
+	const height = Number(match?.[2]);
+	const pixels = width * height;
+	if (!match || width % 16 !== 0 || height % 16 !== 0 || Math.max(width, height) > 3840 || pixels < 655360 || pixels > 8294400 || Math.max(width, height) > 3 * Math.min(width, height)) throw new Error(`OpenAI 尺寸 ${size} 无效：边长须为 16 的倍数且不超过 3840，比例在 1:3 到 3:1，像素数在 655360 到 8294400`);
+}
+function officialQualityOptions(model) {
+	return [
+		"auto",
+		"low",
+		"medium",
+		"high",
+		.../^gpt-image-2\.5-(sunburst|flare)(?:$|-)/.test(model) ? ["xhigh", "max"] : []
+	].map((value) => ({
+		value,
+		label: value === "auto" ? "自动" : value
+	}));
+}
+function compatQualityOptions(config) {
+	const values = [...new Set([...config.openaiCompatQualityOptions ?? DEFAULT_COMPAT_QUALITIES, config.openaiCompatQuality ?? ""].map((value) => value.trim()).filter((value) => value && value !== "__default__"))];
+	return [{
+		value: PROVIDER_DEFAULT_QUALITY,
+		label: "渠道默认（不发送）"
+	}, ...values.map((value) => ({
+		value,
+		label: value
+	}))];
+}
+function compatRequestQuality(config, selected) {
+	const value = (selected ?? config.openaiCompatQuality)?.trim();
+	return value && value !== "__default__" ? value : void 0;
+}
+//#endregion
 //#region lib/types/studio.js
 const LEGACY_OPENAI_TABLE = {
 	"1:1": { "1K": "1024x1024" },
@@ -27333,7 +27642,8 @@ function subscriptionStudioProfile(provider, signedIn) {
 		ratioOptions: cap.ratioOptions,
 		qualityOptions: cap.qualityOptions,
 		defaultRatio: cap.defaultRatio,
-		defaultQuality: cap.defaultQuality
+		defaultQuality: cap.defaultQuality,
+		...watermarkProfile({}, provider, DEFAULT_SUBSCRIPTION_MODELS[provider])
 	};
 }
 /** Short display names for the workbench subscription rows. */
@@ -27352,6 +27662,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 	assertAllowed(studioProfile(config, input.provider, true), input);
 	const active = resolveProvider(withProviderOverrides(config, input.provider, input.model));
 	if (active.provider === "comfyui") throw new Error("ComfyUI 暂未接入工作台");
+	if (isSubscriptionProvider(active.provider)) throw new Error("订阅生图应通过订阅渠道执行");
 	const wired = active;
 	const credential = await requireApiKey(ctx, input.provider);
 	const rawRefs = input.references ?? (input.reference ? [input.reference] : []);
@@ -27388,12 +27699,16 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			output = `${aspectRatio}, ${imageSize}`;
 		} else if (wired.provider === "openai" || wired.provider === "openai-compat" || wired.provider === "xai" || wired.provider === "zhipu") {
 			const p = wired.provider;
-			const size = p === "openai-compat" ? openAIRequestSize(config, input.ratio, input.quality) : p === "xai" ? void 0 : CLOUD_CAPABILITIES[p].sizeFor?.(input.ratio, input.quality);
-			const quality = p === "openai" ? input.quality === "auto" ? void 0 : input.quality : p === "zhipu" ? "hd" : void 0;
+			const officialTable = p === "openai" ? officialSizeTable(config, wired.model) : void 0;
+			const officialResolution = input.resolution ?? (officialTable ? openAICompatTable({ openaiCompatSizes: officialTable }).find((group) => group.ratio === input.ratio)?.tiers[0]?.tier : void 0) ?? "1K";
+			const size = p === "openai-compat" ? openAIRequestSize(config, input.ratio, input.resolution ?? input.quality) : p === "openai" ? openAIRequestSize({ openaiCompatSizes: officialTable }, input.ratio, officialResolution) : p === "xai" ? void 0 : CLOUD_CAPABILITIES[p].sizeFor?.(input.ratio, input.quality);
+			if (p === "openai" && size !== void 0) validateOfficialSize(wired.model, size);
+			const requestedQuality = input.generationQuality ?? input.quality;
+			const quality = p === "openai" ? requestedQuality === "auto" ? void 0 : requestedQuality : p === "openai-compat" ? compatRequestQuality(config, input.generationQuality) : p === "zhipu" ? "hd" : void 0;
 			const extraBody = p === "xai" ? {
 				aspect_ratio: input.ratio,
 				resolution: input.quality
-			} : void 0;
+			} : p === "openai-compat" ? input.mode === "generate" ? compatGenerationExtraBody(config, input.watermark) : compatEditExtraBody(config, input.watermark) : void 0;
 			generated = input.mode === "edit" ? await editOpenAICompatibleImage({
 				apiKey: credential,
 				baseURL: wired.baseURL,
@@ -27407,7 +27722,8 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				...extraBody === void 0 ? {} : { extraBody },
 				...p === "openai-compat" ? {
 					editFormat: wired.editFormat,
-					editExtra: wired.editExtra
+					editExtra: wired.editExtra,
+					editSizeMode: config.openaiCompatEditSizeMode ?? "auto"
 				} : p === "xai" ? { editFormat: "xaiJson" } : {}
 			}) : await generateOpenAICompatibleImage({
 				provider: p,
@@ -27424,6 +27740,10 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			output = size ?? `${input.ratio}, ${input.quality}`;
 		} else if (wired.provider === "seedream") {
 			const size = CLOUD_CAPABILITIES.seedream.sizeFor?.(input.ratio, input.quality) ?? input.quality;
+			const arkOptions = {
+				...wired.arkOptions,
+				watermark: selectedWatermark(input.watermark, wired.arkOptions.watermark)
+			};
 			generated = input.mode === "edit" ? await editSeedreamImage({
 				apiKey: credential,
 				baseURL: wired.baseURL,
@@ -27433,7 +27753,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal,
-				arkOptions: wired.arkOptions
+				arkOptions
 			}) : await generateOpenAICompatibleImage({
 				provider: "seedream",
 				apiKey: credential,
@@ -27443,12 +27763,13 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 				signal,
-				arkOptions: wired.arkOptions
+				arkOptions
 			});
 			output = size;
-		} else {
+		} else if (wired.provider === "dashscope") {
 			if (input.mode === "edit" && sourceImages.length > 3) throw new Error("DashScope (通义万相) 图生图目前最多支持 3 张参考图，请精简后重试");
 			const size = CLOUD_CAPABILITIES.dashscope.sizeFor?.(input.ratio, input.quality) ?? "1024x1024";
+			const watermark = selectedWatermark(input.watermark);
 			generated = input.mode === "edit" ? await editDashScopeImage({
 				apiKey: credential,
 				endpoint: wired.endpoint,
@@ -27457,7 +27778,8 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				sourceImages,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal
+				signal,
+				...watermark === void 0 ? {} : { watermark }
 			}) : await generateDashScopeImage({
 				apiKey: credential,
 				endpoint: wired.endpoint,
@@ -27465,10 +27787,11 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				prompt: input.prompt,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal
+				signal,
+				...watermark === void 0 ? {} : { watermark }
 			});
 			output = size;
-		}
+		} else throw new Error("当前渠道未接入 API 工作台");
 		if (!ctx.attachments.imageLimits.mediaTypes.includes(generated.mediaType)) throw new Error(`当前 DSH 不支持保存 ${generated.mediaType} 图片`);
 		return {
 			attachment: await ctx.attachments.saveImage({
@@ -27639,18 +27962,19 @@ function subscriptionResponse(input, startedAt, requestedCount, failedCount, ite
 	};
 }
 function studioProfile(config, provider, configured) {
+	const result = cloudStudioProfile(config, provider, configured);
+	return {
+		...result,
+		...watermarkProfile(config, provider, result.model)
+	};
+}
+function cloudStudioProfile(config, provider, configured) {
 	let active;
 	try {
 		active = resolveProvider(withProviderOverrides(config, provider));
-	} catch {
-		return profile(provider, "", configured, [
-			"1:1",
-			"3:2",
-			"2:3"
-		].map(option), [{
-			value: "standard",
-			label: "标准（推荐）"
-		}], "1:1", "standard");
+	} catch (cause) {
+		if (provider !== "openai-compat") throw cause;
+		return compatibleStudioProfile(config, "", false);
 	}
 	if (active.provider === "comfyui") throw new Error("Invalid cloud provider profile");
 	const model = active.model;
@@ -27658,19 +27982,55 @@ function studioProfile(config, provider, configured) {
 		const cap = CLOUD_CAPABILITIES.google;
 		return profile(provider, model, configured, cap.ratioOptions, cap.qualityOptions, cap.defaultRatio, cap.defaultQuality);
 	}
-	if (provider === "openai-compat") {
-		if (config.openaiCompatSizes === void 0 || Object.keys(config.openaiCompatSizes).length === 0) return profile(provider, model, configured, [
+	if (provider === "openai-compat") return compatibleStudioProfile(config, model, configured);
+	if (provider === "openai") {
+		const table = officialSizeTable(config, model);
+		const order = Object.keys(table);
+		const groups = openAICompatTable({ openaiCompatSizes: table }).sort((a, b) => order.indexOf(a.ratio) - order.indexOf(b.ratio));
+		const resolutionOptions = Object.fromEntries(groups.map((group) => [group.ratio, group.tiers.map((entry) => ({
+			value: entry.tier,
+			label: `${entry.tier} · ${entry.size}`
+		}))]));
+		const defaultRatio = groups.some((group) => group.ratio === "1:1") ? "1:1" : groups[0]?.ratio ?? "1:1";
+		return {
+			...profile(provider, model, configured, groups.map((group) => option(group.ratio)), officialQualityOptions(model), defaultRatio, "auto"),
+			resolutionOptions,
+			defaultResolution: resolutionOptions[defaultRatio]?.[0]?.value ?? "1K"
+		};
+	}
+	const cap = CLOUD_CAPABILITIES[provider];
+	return profile(provider, model, configured, cap.ratioOptions, cap.qualityOptions, cap.defaultRatio, cap.defaultQuality);
+}
+/** Output capabilities remain visible before credentials, address or model are configured. */
+function compatibleStudioProfile(config, model, configured) {
+	const groups = openAICompatTable(config);
+	const qualityProfile = {
+		generationQualityOptions: compatQualityOptions(config),
+		defaultGenerationQuality: compatRequestQuality(config) ?? "__default__",
+		resolutionOptions: Object.fromEntries(groups.map((group) => [group.ratio, group.tiers.map((entry) => ({
+			value: entry.tier,
+			label: `${entry.tier} · ${entry.size}`
+		}))]))
+	};
+	if (config.openaiCompatSizes === void 0 || Object.keys(config.openaiCompatSizes).length === 0) return {
+		...profile("openai-compat", model, configured, [
 			"1:1",
 			"3:2",
 			"2:3"
 		].map(option), [{
 			value: "standard",
 			label: "标准（推荐）"
-		}], "1:1", "standard");
-		return openAICompatStudioProfile(config, model, configured);
-	}
-	const cap = CLOUD_CAPABILITIES[provider];
-	return profile(provider, model, configured, cap.ratioOptions, cap.qualityOptions, cap.defaultRatio, cap.defaultQuality);
+		}], "1:1", "standard"),
+		...qualityProfile,
+		resolutionOptions: Object.fromEntries(groups.map((group) => [group.ratio, [{
+			value: "standard",
+			label: `标准 · ${group.tiers[0].size}`
+		}]]))
+	};
+	return {
+		...openAICompatStudioProfile(config, model, configured),
+		...qualityProfile
+	};
 }
 function profile(provider, model, configured, ratioOptions, qualityOptions, defaultRatio, defaultQuality) {
 	return {
@@ -27704,7 +28064,12 @@ function option(value) {
 function assertAllowed(profile, input) {
 	if (input.model !== profile.model) throw new Error("模型配置已变化，请刷新工作台后重试");
 	if (!profile.ratioOptions.some((option) => option.value === input.ratio)) throw new Error("该 Provider 不支持所选比例");
-	if (!profile.qualityOptions.some((option) => option.value === input.quality)) throw new Error("该 Provider 不支持所选清晰度");
+	const selectedQuality = input.provider === "openai" ? input.generationQuality ?? input.quality : input.resolution ?? input.quality;
+	if (!profile.qualityOptions.some((option) => option.value === selectedQuality)) throw new Error("该 Provider 不支持所选清晰度");
+	if (input.resolution !== void 0 && profile.resolutionOptions !== void 0 && !profile.resolutionOptions[input.ratio]?.some((option) => option.value === input.resolution)) throw new Error("该比例不支持所选分辨率");
+	if (input.generationQuality !== void 0 && input.provider === "openai-compat" && !profile.generationQualityOptions?.some((option) => option.value === input.generationQuality)) throw new Error("该 Provider 不支持所选生成质量");
+	if ((input.resolution !== void 0 || input.generationQuality !== void 0) && input.provider !== "openai" && input.provider !== "openai-compat") throw new Error("该 Provider 不支持独立的 OpenAI 输出参数");
+	if (input.watermark !== void 0 && input.watermark !== "default" && studioWatermarkCapability(profile, input.mode).status !== "supported") throw new Error("该渠道尚未确认当前操作的水印控制，请刷新工作台");
 	if (input.mode === "edit" && !profile.supportsEditing) throw new Error("该 Provider 暂不支持图生图");
 }
 async function readStudioReference(ctx, reference, signal) {
@@ -27808,6 +28173,10 @@ function parseStudioGenerateRequest(value) {
 	const model = requiredText(input.model, "请选择模型", 200);
 	const ratio = requiredText(input.ratio, "请选择比例", 32);
 	const quality = requiredText(input.quality, "请选择清晰度", 32);
+	const resolution = input.resolution === void 0 ? void 0 : requiredText(input.resolution, "请选择分辨率", 32);
+	const generationQuality = input.generationQuality === void 0 ? void 0 : requiredText(input.generationQuality, "请选择生成质量", 100);
+	const watermark = input.watermark === void 0 ? void 0 : STUDIO_WATERMARK_VALUES.find((value) => value === input.watermark);
+	if (input.watermark !== void 0 && watermark === void 0) throw new Error("请选择有效的水印选项");
 	const references = (Array.isArray(input.references) ? input.references : input.reference !== void 0 ? [input.reference] : []).map(parseReference);
 	if (input.mode === "edit" && references.length === 0) throw new Error("图生图需要至少一张参考图");
 	if (references.length > 5) throw new Error("最多支持上传 5 张参考图");
@@ -27824,6 +28193,9 @@ function parseStudioGenerateRequest(value) {
 		prompt,
 		ratio,
 		quality,
+		...resolution === void 0 ? {} : { resolution },
+		...generationQuality === void 0 ? {} : { generationQuality },
+		...watermark === void 0 ? {} : { watermark },
 		...count !== void 0 ? { count } : {},
 		...references.length > 0 ? {
 			references,
@@ -28501,6 +28873,9 @@ function apply(ctx, config = {}) {
 		}
 		const size = args.size ?? active.imageSize;
 		const arkOptions = active.provider === "seedream" ? active.arkOptions : void 0;
+		if (active.provider === "openai") validateOfficialSize(active.model, size);
+		const quality = active.provider === "openai-compat" ? compatRequestQuality(current(), args.quality) : active.provider === "openai" ? args.quality : void 0;
+		if (active.provider === "openai" && quality !== void 0 && !officialQualityOptions(active.model).some((option) => option.value === quality)) throw new Error("该 OpenAI 模型不支持所选生成质量");
 		return saveGenerated(ctx, await generateOpenAICompatibleImage({
 			provider: active.provider,
 			apiKey: credential,
@@ -28510,8 +28885,10 @@ function apply(ctx, config = {}) {
 			size,
 			maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 			signal: exec.signal,
+			...quality === void 0 ? {} : { quality },
+			...active.provider === "openai-compat" ? { extraBody: current().openaiCompatExtraBody ?? {} } : {},
 			...arkOptions === void 0 ? {} : { arkOptions }
-		}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
+		}), active.provider, active.model, quality === void 0 ? size : `${size}, quality=${quality}`, current(), exec, knownWorkspaceRoots);
 	};
 	ctx.tools.register(defineTool({
 		name: "generate_image",
@@ -28572,6 +28949,10 @@ function apply(ctx, config = {}) {
 				type: "string",
 				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok."
 			},
+			quality: {
+				type: "string",
+				description: "Optional generation quality for OpenAI or compatible APIs, independent of pixel size (e.g. auto, low, medium, high). Omit to use the configured default."
+			},
 			workflow: {
 				type: "string",
 				description: "Optional name of the ComfyUI workflow to run; omit to use the active workflow from settings. Only meaningful when the ComfyUI provider is selected."
@@ -28643,6 +29024,10 @@ function apply(ctx, config = {}) {
 				type: "string",
 				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok."
 			},
+			quality: {
+				type: "string",
+				description: "Optional OpenAI or compatible generation quality, applied to every item independently of size."
+			},
 			workflow: {
 				type: "string",
 				description: "Optional name of the ComfyUI workflow to run; omit to use the active workflow from settings."
@@ -28780,6 +29165,7 @@ function apply(ctx, config = {}) {
 						...args.aspect_ratio !== void 0 ? { aspect_ratio: args.aspect_ratio } : {},
 						...args.image_size !== void 0 ? { image_size: args.image_size } : {},
 						...args.size !== void 0 ? { size: args.size } : {},
+						...args.quality !== void 0 ? { quality: args.quality } : {},
 						...args.workflow !== void 0 ? { workflow: args.workflow } : {}
 					}, exec);
 					images.push({
@@ -28883,6 +29269,10 @@ function apply(ctx, config = {}) {
 				type: "string",
 				description: "Optional output size for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok."
 			},
+			quality: {
+				type: "string",
+				description: "Optional generation quality for OpenAI or compatible edits, independent of size."
+			},
 			workflow: {
 				type: "string",
 				description: "Optional name of the ComfyUI workflow to run; omit to use the active workflow from settings. Only meaningful when the ComfyUI provider is selected."
@@ -28962,6 +29352,9 @@ function apply(ctx, config = {}) {
 			}
 			const size = args.size ?? active.imageSize;
 			if (active.provider === "openai" || active.provider === "openai-compat" || active.provider === "xai" || active.provider === "zhipu") {
+				if (active.provider === "openai") validateOfficialSize(active.model, size);
+				const quality = active.provider === "openai-compat" ? compatRequestQuality(current(), args.quality) : active.provider === "openai" ? args.quality : void 0;
+				if (active.provider === "openai" && quality !== void 0 && !officialQualityOptions(active.model).some((option) => option.value === quality)) throw new Error("该 OpenAI 模型不支持所选生成质量");
 				const xaiExtraBody = active.provider === "xai" ? xaiToolParameters({
 					...args.aspect_ratio !== void 0 ? { aspectRatio: args.aspect_ratio } : {},
 					...args.image_size !== void 0 ? { imageSize: args.image_size } : {},
@@ -28974,16 +29367,18 @@ function apply(ctx, config = {}) {
 					prompt: args.prompt,
 					sourceImages,
 					...active.provider === "xai" ? {} : { size },
+					...quality === void 0 ? {} : { quality },
 					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
 					signal: exec.signal,
 					...active.provider === "openai-compat" ? {
 						editFormat: active.editFormat,
-						editExtra: active.editExtra
+						editExtra: active.editExtra,
+						editSizeMode: current().openaiCompatEditSizeMode ?? "auto"
 					} : active.provider === "xai" ? {
 						editFormat: "xaiJson",
 						...xaiExtraBody === void 0 ? {} : { extraBody: xaiExtraBody }
 					} : {}
-				}), active.provider, active.model, active.provider === "xai" ? xaiExtraBody?.aspect_ratio ?? "auto" : size, current(), exec, knownWorkspaceRoots);
+				}), active.provider, active.model, active.provider === "xai" ? xaiExtraBody?.aspect_ratio ?? "auto" : quality === void 0 ? size : `${size}, quality=${quality}`, current(), exec, knownWorkspaceRoots);
 			}
 			if (active.provider === "seedream") return saveGenerated(ctx, await editSeedreamImage({
 				apiKey: credential,